Decompile 31_Shop/Actor/ActorTetra (45%)

config/eur/arm9/overlays/ov000/symbols.txt

@@ -338,12 +338,12 @@ _ZN7MapBase8vfunc_48Ev kind:function(arm,size=0x1c) addr:0x0207e46c
 _ZN7MapBase8vfunc_50Ev kind:function(arm,size=0x8) addr:0x0207e488
 _ZN7MapBase8vfunc_54EP7TilePos kind:function(arm,size=0x8) addr:0x0207e490
 _ZN7MapBase8vfunc_58EP7TilePosi kind:function(arm,size=0x8) addr:0x0207e498
-_ZN7MapBase8vfunc_5cEv kind:function(arm,size=0x8) addr:0x0207e4a0
+_ZN7MapBase8vfunc_5cEP7TilePos kind:function(arm,size=0x8) addr:0x0207e4a0
 _ZN7MapBase8vfunc_60EP7TilePos kind:function(arm,size=0x8) addr:0x0207e4a8
 _ZN7MapBase8vfunc_64Ev kind:function(arm,size=0x8) addr:0x0207e4b0
 _ZN7MapBase8vfunc_68EP5Vec3pb kind:function(arm,size=0x488) addr:0x0207e4b8
-_ZN7MapBase18func_ov00_0207e940EPc kind:function(arm,size=0x28) addr:0x0207e940
-_ZN7MapBase18func_ov00_0207e968Ev kind:function(arm,size=0x4) addr:0x0207e968
+_ZN26MapBase_func_ov00_0207e940D1Ev kind:function(arm,size=0x28) addr:0x0207e940
+_ZN26MapBase_func_ov00_0207e968D1Ev kind:function(arm,size=0x4) addr:0x0207e968
 _ZN7MapBase18func_ov00_0207e96cEv kind:function(arm,size=0x4) addr:0x0207e96c
 _ZN7MapBase8vfunc_6cEP5Vec3pPiS1_ kind:function(arm,size=0x4a4) addr:0x0207e970
 _ZN7MapBase8vfunc_70EP5Vec3p kind:function(arm,size=0x1e0) addr:0x0207ee14
@@ -420,9 +420,9 @@ _ZN7MapBase18func_ov00_02080a78EP5Vec3p kind:function(arm,size=0x58) addr:0x0208
 _ZN12MapBase_Unk218func_ov00_02080ad0EPP11TriggerBaseS2_S2_ kind:function(arm,size=0x54) addr:0x02080ad0
 _ZN7MapBase18func_ov00_02080b24EP7TilePos kind:function(arm,size=0x1e4) addr:0x02080b24
 _ZN7MapBase18func_ov00_02080d08EP7TilePos kind:function(arm,size=0x6c) addr:0x02080d08
-_ZN7MapBase8vfunc_bcEv kind:function(arm,size=0x4) addr:0x02080d74
+_ZN7MapBase8vfunc_bcEP7TilePosi kind:function(arm,size=0x4) addr:0x02080d74
 _ZN7MapBase8vfunc_98EP7TilePosii kind:function(arm,size=0x4) addr:0x02080d78
-_ZN7MapBase8vfunc_c0Ev kind:function(arm,size=0x4) addr:0x02080d7c
+_ZN7MapBase8vfunc_c0EP7TilePosi kind:function(arm,size=0x4) addr:0x02080d7c
 _ZN7MapBase22TriggerOfType_vfunc_10Ei kind:function(arm,size=0x5c) addr:0x02080d80
 _ZN11TriggerBase8vfunc_10Ev kind:function(arm,size=0x8) addr:0x02080ddc
 _ZN7MapBase18func_ov00_02080de4Ev kind:function(arm,size=0x4) addr:0x02080de4

config/eur/arm9/overlays/ov014/symbols.txt

@@ -1132,7 +1132,7 @@ _ZN14ActorCharacter8vfunc_f0Ebi kind:function(arm,size=0x1c) addr:0x02145900
 _ZN14ActorCharacter19func_ov014_0214591cEv kind:function(arm,size=0x58) addr:0x0214591c
 _ZN14ActorCharacter15IsHitboxTouchedEb kind:function(arm,size=0x100) addr:0x02145974
 _ZN18ActorCharacter_1d819func_ov014_02145a74Eii kind:function(arm,size=0x74) addr:0x02145a74
-func_ov014_02145ae8 kind:function(arm,size=0x30) addr:0x02145ae8
+_ZN18ActorCharacter_1d819func_ov014_02145ae8EiPiS0_ kind:function(arm,size=0x30) addr:0x02145ae8
 func_ov014_02145b18 kind:function(arm,size=0xb4) addr:0x02145b18
 func_ov014_02145bcc kind:function(arm,size=0xb0) addr:0x02145bcc
 func_ov014_02145c7c kind:function(arm,size=0x30) addr:0x02145c7c
@@ -1141,7 +1141,7 @@ _ZN18ActorCharacter_1d819func_ov014_02145e48Ei kind:function(arm,size=0xc4) addr
 _ZN18ActorCharacter_1d819func_ov014_02145f0cEi kind:function(arm,size=0x1ac) addr:0x02145f0c
 func_ov014_021460b8 kind:function(arm,size=0x54) addr:0x021460b8
 func_ov014_0214610c kind:function(arm,size=0x14) addr:0x0214610c
-func_ov014_02146120 kind:function(arm,size=0x74) addr:0x02146120
+_ZN18ActorCharacter_1d819func_ov014_02146120Ei kind:function(arm,size=0x74) addr:0x02146120
 func_ov014_02146194 kind:function(arm,size=0x4) addr:0x02146194
 func_ov014_02146198 kind:function(arm,size=0x30) addr:0x02146198
 func_ov014_021461c8 kind:function(arm,size=0x3c) addr:0x021461c8
@@ -1193,8 +1193,8 @@ _ZN21ActorGenericCharacter19func_ov014_02147ba0Ev kind:function(arm,size=0x10) a
 _ZN21ActorGenericCharacter19func_ov014_02147bb0Ev kind:function(arm,size=0x28) addr:0x02147bb0
 _ZN21ActorGenericCharacter19func_ov014_02147bd8Ev kind:function(arm,size=0x28) addr:0x02147bd8
 _ZN21ActorGenericCharacter19func_ov014_02147c00Ev kind:function(arm,size=0x64) addr:0x02147c00
-_ZN21ActorGenericCharacterD1Ev kind:function(arm,size=0x1c) addr:0x02147c64
-_ZN21ActorGenericCharacterD0Ev kind:function(arm,size=0x14) addr:0x02147c80
+_ZN21ActorGenericCharacterD0Ev kind:function(arm,size=0x1c) addr:0x02147c64
+_ZN21ActorGenericCharacterD1Ev kind:function(arm,size=0x14) addr:0x02147c80
 _ZN21ActorGenericCharacter8vfunc_f8Ev kind:function(arm,size=0x4) addr:0x02147c94
 _ZN21ActorGenericCharacter19func_ov014_02147c98Ev kind:function(arm,size=0x50) addr:0x02147c98
 _ZN21ActorGenericCharacter19func_ov014_02147ce8Ei kind:function(arm,size=0x5c) addr:0x02147ce8

config/eur/arm9/overlays/ov031/relocs.txt

@@ -822,7 +822,7 @@ from:0x0218143c kind:arm_call to:0x0217cfb0 module:overlay(31)
 from:0x02181460 kind:arm_call to:0x0202e9dc module:main
 from:0x0218146c kind:arm_call to:0x021476d0 module:overlay(14)
 from:0x021814ac kind:load to:0x027e0fe0 module:dtcm
-from:0x021814b4 kind:load to:0x02183d7c module:overlay(31)
+from:0x021814b4 kind:load to:0x02183d74 module:overlay(31) add:0x8
 from:0x021814d0 kind:arm_call to:0x02097760 module:overlay(0)
 from:0x021814f0 kind:arm_call to:0x02145a74 module:overlay(14)
 from:0x02181504 kind:arm_call to:0x02145ae8 module:overlay(14)

config/eur/arm9/overlays/ov031/symbols.txt

@@ -286,8 +286,8 @@ _ZN10ActorTetra8vfunc_c4Ev kind:function(arm,size=0x28) addr:0x021815b8
 _ZN10ActorTetra8vfunc_20Eb kind:function(arm,size=0x30) addr:0x021815e0
 _ZN14ActorTetra_4b019func_ov031_02181610Eiiiit kind:function(arm,size=0x188) addr:0x02181610
 _ZN14ActorTetra_4b019func_ov031_02181798Ev kind:function(arm,size=0xd4) addr:0x02181798
-_ZN10ActorTetraD1Ev kind:function(arm,size=0x1c) addr:0x0218186c
-_ZN10ActorTetraD0Ev kind:function(arm,size=0x14) addr:0x02181888
+_ZN10ActorTetraD0Ev kind:function(arm,size=0x1c) addr:0x0218186c
+_ZN10ActorTetraD1Ev kind:function(arm,size=0x14) addr:0x02181888
 _ZN10ActorTetra8vfunc_f8Ev kind:function(arm,size=0x4) addr:0x0218189c
 sShopItemActorTypes kind:data(any) addr:0x021818a0 local
 sShopItemBaseNames kind:data(any) addr:0x021818e8 local
@@ -427,7 +427,7 @@ data_ov031_02183c1c kind:data(any) addr:0x02183c1c
 data_ov031_02183c48 kind:data(any) addr:0x02183c48
 data_ov031_02183d68 kind:data(any) addr:0x02183d68
 data_ov031_02183d6c kind:data(any) addr:0x02183d6c
-data_ov031_02183d7c kind:data(any) addr:0x02183d7c
+_ZTV10ActorTetra kind:data(any) addr:0x02183d74
 data_ov031_02183e80 kind:bss addr:0x02183e80
 sCurrentSeller kind:bss addr:0x02183e84 local
 @792 kind:bss addr:0x02183e88 local

config/eur/arm9/symbols.txt

@@ -2295,7 +2295,7 @@ strlen kind:function(arm,size=0x1c) addr:0x02047008
 strcpy kind:function(arm,size=0xc8) addr:0x02047024
 strncpy kind:function(arm,size=0x50) addr:0x020470ec
 strcat kind:function(arm,size=0x30) addr:0x0204713c
-strcmp kind:function(arm,size=0x114) addr:0x0204716c
+_Z6strcmpPcS_ kind:function(arm,size=0x114) addr:0x0204716c
 strncmp kind:function(arm,size=0x34) addr:0x02047280
 strchr kind:function(arm,size=0x3c) addr:0x020472b4
 strstr kind:function(arm,size=0x6c) addr:0x020472f0

config/usa/arm9/overlays/ov000/symbols.txt

@@ -338,12 +338,12 @@ _ZN7MapBase8vfunc_48Ev kind:function(arm,size=0x1c) addr:0x0207e40c
 _ZN7MapBase8vfunc_50Ev kind:function(arm,size=0x8) addr:0x0207e428
 _ZN7MapBase8vfunc_54EP7TilePos kind:function(arm,size=0x8) addr:0x0207e430
 _ZN7MapBase8vfunc_58EP7TilePosi kind:function(arm,size=0x8) addr:0x0207e438
-_ZN7MapBase8vfunc_5cEv kind:function(arm,size=0x8) addr:0x0207e440
+_ZN7MapBase8vfunc_5cEP7TilePos kind:function(arm,size=0x8) addr:0x0207e440
 _ZN7MapBase8vfunc_60EP7TilePos kind:function(arm,size=0x8) addr:0x0207e448
 _ZN7MapBase8vfunc_64Ev kind:function(arm,size=0x8) addr:0x0207e450
 _ZN7MapBase8vfunc_68EP5Vec3pb kind:function(arm,size=0x488) addr:0x0207e458
-_ZN7MapBase18func_ov00_0207e940EPc kind:function(arm,size=0x28) addr:0x0207e8e0
-_ZN7MapBase18func_ov00_0207e968Ev kind:function(arm,size=0x4) addr:0x0207e908
+_ZN26MapBase_func_ov00_0207e940D1Ev kind:function(arm,size=0x28) addr:0x0207e8e0
+_ZN26MapBase_func_ov00_0207e968D1Ev kind:function(arm,size=0x4) addr:0x0207e908
 _ZN7MapBase18func_ov00_0207e96cEv kind:function(arm,size=0x4) addr:0x0207e90c
 _ZN7MapBase8vfunc_6cEP5Vec3pPiS1_ kind:function(arm,size=0x4a4) addr:0x0207e910
 _ZN7MapBase8vfunc_70EP5Vec3p kind:function(arm,size=0x1e0) addr:0x0207edb4
@@ -420,9 +420,9 @@ _ZN7MapBase18func_ov00_02080a78EP5Vec3p kind:function(arm,size=0x58) addr:0x0208
 _ZN12MapBase_Unk218func_ov00_02080ad0EPP11TriggerBaseS2_S2_ kind:function(arm,size=0x54) addr:0x02080a70
 _ZN7MapBase18func_ov00_02080b24EP7TilePos kind:function(arm,size=0x1e4) addr:0x02080ac4
 _ZN7MapBase18func_ov00_02080d08EP7TilePos kind:function(arm,size=0x6c) addr:0x02080ca8
-_ZN7MapBase8vfunc_bcEv kind:function(arm,size=0x4) addr:0x02080d14
+_ZN7MapBase8vfunc_bcEP7TilePosi kind:function(arm,size=0x4) addr:0x02080d14
 _ZN7MapBase8vfunc_98EP7TilePosii kind:function(arm,size=0x4) addr:0x02080d18
-_ZN7MapBase8vfunc_c0Ev kind:function(arm,size=0x4) addr:0x02080d1c
+_ZN7MapBase8vfunc_c0EP7TilePosi kind:function(arm,size=0x4) addr:0x02080d1c
 _ZN7MapBase22TriggerOfType_vfunc_10Ei kind:function(arm,size=0x5c) addr:0x02080d20
 _ZN11TriggerBase8vfunc_10Ev kind:function(arm,size=0x8) addr:0x02080d7c
 _ZN7MapBase18func_ov00_02080de4Ev kind:function(arm,size=0x4) addr:0x02080d84
@@ -682,7 +682,7 @@ _ZN10MapManager18func_ov00_02085594EP5Vec3p kind:function(arm,size=0x2a8) addr:0
 _ZN10MapManager18func_ov00_0208583cEPS_P5Vec3pi kind:function(arm,size=0x74) addr:0x020857dc
 _ZN10MapManager18func_ov00_020858b0EPS_P5Vec3pi kind:function(arm,size=0x184) addr:0x02085850
 _ZN10MapManager18func_ov00_02085a34EP5Vec3pi kind:function(arm,size=0x22c) addr:0x020859d4
-_ZN10MapManager18func_ov00_02085c60EP9UnkStructPiS2_j kind:function(arm,size=0x3e4) addr:0x02085c00
+_ZN10MapManager18func_ov00_02085c60EP5Vec3pPiS2_j kind:function(arm,size=0x3e4) addr:0x02085c00
 _ZN10MapManager18func_ov00_02086044EP5Vec3pS1_i kind:function(arm,size=0x240) addr:0x02085fe4
 _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_ kind:function(arm,size=0x800) addr:0x02086224
 _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_ kind:function(arm,size=0x24c) addr:0x02086a24

config/usa/arm9/overlays/ov014/symbols.txt

@@ -1132,7 +1132,7 @@ _ZN14ActorCharacter8vfunc_f0Ebi kind:function(arm,size=0x1c) addr:0x0214585c
 _ZN14ActorCharacter19func_ov014_0214591cEv kind:function(arm,size=0x58) addr:0x02145878
 _ZN14ActorCharacter15IsHitboxTouchedEb kind:function(arm,size=0x100) addr:0x021458d0
 _ZN18ActorCharacter_1d819func_ov014_02145a74Eii kind:function(arm,size=0x74) addr:0x021459d0
-func_ov014_02145ae8 kind:function(arm,size=0x30) addr:0x02145a44
+_ZN18ActorCharacter_1d819func_ov014_02145ae8EiPiS0_ kind:function(arm,size=0x30) addr:0x02145a44
 func_ov014_02145b18 kind:function(arm,size=0xb4) addr:0x02145a74
 func_ov014_02145bcc kind:function(arm,size=0xb0) addr:0x02145b28
 func_ov014_02145c7c kind:function(arm,size=0x30) addr:0x02145bd8
@@ -1141,7 +1141,7 @@ _ZN18ActorCharacter_1d819func_ov014_02145e48Ei kind:function(arm,size=0xc4) addr
 _ZN18ActorCharacter_1d819func_ov014_02145f0cEi kind:function(arm,size=0x1ac) addr:0x02145e68
 func_ov014_021460b8 kind:function(arm,size=0x54) addr:0x02146014
 func_ov014_0214610c kind:function(arm,size=0x14) addr:0x02146068
-func_ov014_02146120 kind:function(arm,size=0x74) addr:0x0214607c
+_ZN18ActorCharacter_1d819func_ov014_02146120Ei kind:function(arm,size=0x74) addr:0x0214607c
 func_ov014_02146194 kind:function(arm,size=0x4) addr:0x021460f0
 func_ov014_02146198 kind:function(arm,size=0x30) addr:0x021460f4
 func_ov014_021461c8 kind:function(arm,size=0x3c) addr:0x02146124
@@ -1193,8 +1193,8 @@ _ZN21ActorGenericCharacter19func_ov014_02147ba0Ev kind:function(arm,size=0x10) a
 _ZN21ActorGenericCharacter19func_ov014_02147bb0Ev kind:function(arm,size=0x28) addr:0x02147b0c
 _ZN21ActorGenericCharacter19func_ov014_02147bd8Ev kind:function(arm,size=0x28) addr:0x02147b34
 _ZN21ActorGenericCharacter19func_ov014_02147c00Ev kind:function(arm,size=0x64) addr:0x02147b5c
-_ZN21ActorGenericCharacterD1Ev kind:function(arm,size=0x1c) addr:0x02147bc0
-_ZN21ActorGenericCharacterD0Ev kind:function(arm,size=0x14) addr:0x02147bdc
+_ZN21ActorGenericCharacterD0Ev kind:function(arm,size=0x1c) addr:0x02147bc0
+_ZN21ActorGenericCharacterD1Ev kind:function(arm,size=0x14) addr:0x02147bdc
 _ZN21ActorGenericCharacter8vfunc_f8Ev kind:function(arm,size=0x4) addr:0x02147bf0
 _ZN21ActorGenericCharacter19func_ov014_02147c98Ev kind:function(arm,size=0x50) addr:0x02147bf4
 _ZN21ActorGenericCharacter19func_ov014_02147ce8Ei kind:function(arm,size=0x5c) addr:0x02147c44

config/usa/arm9/overlays/ov031/relocs.txt

@@ -822,7 +822,7 @@ from:0x0218139c kind:arm_call to:0x0217cf10 module:overlay(31)
 from:0x021813c0 kind:arm_call to:0x0202e9d8 module:main
 from:0x021813cc kind:arm_call to:0x0214762c module:overlay(14)
 from:0x0218140c kind:load to:0x027e0fe0 module:dtcm
-from:0x02181414 kind:load to:0x02183cdc module:overlay(31)
+from:0x02181414 kind:load to:0x02183cd4 module:overlay(31) add:0x8
 from:0x02181430 kind:arm_call to:0x02097700 module:overlay(0)
 from:0x02181450 kind:arm_call to:0x021459d0 module:overlay(14)
 from:0x02181464 kind:arm_call to:0x02145a44 module:overlay(14)

config/usa/arm9/overlays/ov031/symbols.txt

@@ -427,7 +427,7 @@ data_ov031_02183c1c kind:data(any) addr:0x02183b7c
 data_ov031_02183c48 kind:data(any) addr:0x02183ba8
 data_ov031_02183d68 kind:data(any) addr:0x02183cc8
 data_ov031_02183d6c kind:data(any) addr:0x02183ccc
-data_ov031_02183d7c kind:data(any) addr:0x02183cdc
+_ZTV10ActorTetra kind:data(any) addr:0x02183cd4
 data_ov031_02183e80 kind:bss addr:0x02183de0
 sCurrentSeller kind:bss addr:0x02183de4 local
 @792 kind:bss addr:0x02183de8

include/Actor/Character/ActorCharacter.hpp

@@ -193,9 +193,11 @@ class ActorCharacter_1d8 : public UnkStruct_ov000_020c5c2c {
         mUnk_244(0x11f) {}
 
     void func_ov014_02145a74(unk32 param1, unk32 param2);
+    void func_ov014_02145ae8(unk32 param1, unk32 *param2, unk32 *param3);
     void func_ov014_02145cac();
     void func_ov014_02145e48(unk32 param1);
     bool func_ov014_02145f0c(unk32 param1);
+    void func_ov014_02146120(unk32 pra);
 
     inline bool UnkFunc1(unk32 param1) {
         return param1 == mUnk_248.mUnk_00[mUnk_248.mUnk_08];
@@ -295,14 +297,14 @@ class ActorGenericCharacter : public ActorCharacter {
     /* 49a */ PAD(0x49a, 0x49c);
     /* 49c */
 
-    /* 00 */ virtual ~ActorGenericCharacter() override;
+    /* 00 */ // virtual ~ActorGenericCharacter() override;
     /* 08 */ virtual bool Init() override;
     /* 68 */ virtual void vfunc_68(unk32 param1, UnkStruct_020397f8 *param2) override;
     /* 80 */ virtual void vfunc_80() override;
     /* 84 */ virtual void vfunc_84() override;
     /* c0 */ virtual bool vfunc_c0() override;
     /* c4 */ virtual void vfunc_c4() override;
-    /* f4 */ virtual void vfunc_f4() = 0;
+    /* f4 */ virtual bool vfunc_f4() = 0;
     /* f8 */ virtual void vfunc_f8();
     /* fc */
 

include/Actor/Character/ActorTetra.hpp

@@ -19,7 +19,7 @@ struct ActorTetra_4b0 {
     /* 10 */ ActorTetra_4cc *mUnk_10;
     /* 14 */ unk32 mUnk_14; // always sizeof(ActorTetra_4cc)?
     /* 18 */ unk32 mUnk_18;
-    /* 1c */
+    /* 1c */ PAD(0x1c, 0x38);
 
     inline ActorTetra_4b0(ActorTetra_4cc *unk_0c, ActorTetra_4cc *unk_10, unk32 size) :
         mUnk_00(0),
@@ -43,11 +43,11 @@ class ActorTetra : public ActorGenericCharacter {
     /* 0e8c */ ActorTetra_4cc mUnk_e8c;
     /* 184c */
 
-    /* 00 */ virtual ~ActorTetra() override;
+    /* 00 */ // virtual ~ActorTetra() override;
     /* 20 */ virtual void vfunc_20(bool param1) override;
     /* c4 */ virtual void vfunc_c4() override;
-    /* f4 */ virtual void vfunc_f4() override;
-    /* f8 */ virtual void vfunc_f8() override;
+    /* f4 */ virtual bool vfunc_f4() override;
+    /* f8 */ virtual void vfunc_f8() override {}
     /* fc */
 
     static ActorTetra *Create();

include/DTCM/UnkStruct_027e0fec.hpp

@@ -0,0 +1,9 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+struct UnkStruct_027e0fec {
+    /* 000 */ PAD(0x0, 0xc10);
+    /* c10*/ unk32 mUnk_c10;
+};

include/Map/Course.hpp

@@ -18,6 +18,13 @@ enum CourseType_ {
     CourseType_Battle               = 4,
 };
 
+typedef unk32 CourseId;
+enum CourseId_ {
+    CourseId_BossWind   = 0x2a,
+    CourseId_BossWisdom = 0x2f,
+    CourseId_BossGhost  = 0x30,
+};
+
 struct CourseProgress {
     /* 0 */ unk32 flags;
     /* 4 */ s8 numKeys;