Decompiling MapObjectUnkLTRW

config/eur/arm9/overlays/ov063/delinks.txt

@@ -85,6 +85,7 @@ src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp:
     .text       start:0x02160ad0 end:0x02160e98
     .init       start:0x02162d20 end:0x02162da0
     .ctor       start:0x02162e6c end:0x02162e70
+    .data       start:0x021639c4 end:0x02163a94
     .bss        start:0x021646f8 end:0x02164800
 
 src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp:

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

@@ -1180,17 +1180,17 @@ from:0x02160aec kind:arm_call to:0x02011f3c module:main
 from:0x02160af8 kind:arm_call to:0x02160bd0 module:overlay(63)
 from:0x02160b10 kind:arm_call to:0x0209c9a8 module:overlay(0)
 from:0x02160b20 kind:arm_call to:0x0207c018 module:overlay(0)
-from:0x02160bb4 kind:load to:0x021639fc module:overlay(63)
-from:0x02160bb8 kind:load to:0x02163a34 module:overlay(63)
-from:0x02160bbc kind:load to:0x02163a18 module:overlay(63)
+from:0x02160bb4 kind:load to:0x021639f4 module:overlay(63) add:0x8
+from:0x02160bb8 kind:load to:0x02163a2c module:overlay(63) add:0x8
+from:0x02160bbc kind:load to:0x02163a10 module:overlay(63) add:0x8
 from:0x02160bc8 kind:load to:0x021639c4 module:overlay(63)
 from:0x02160bd8 kind:arm_call to:0x0209cfe0 module:overlay(0)
 from:0x02160c30 kind:arm_call_thumb to:0x02057b70 module:overlay(0)
-from:0x02160c60 kind:load to:0x02163a5c module:overlay(63)
+from:0x02160c60 kind:load to:0x02163a54 module:overlay(63) add:0x8
 from:0x02160c64 kind:load to:0x02164708 module:overlay(63)
-from:0x02160c68 kind:load to:0x021639e4 module:overlay(63)
+from:0x02160c68 kind:load to:0x021639dc module:overlay(63) add:0x8
 from:0x02160cb8 kind:arm_call to:0x02160d18 module:overlay(63)
-from:0x02160cc4 kind:load to:0x021647dc module:overlay(63)
+from:0x02160cc4 kind:load to:0x02164708 add:0xd4 module:overlay(63)
 from:0x02160d04 kind:arm_call to:0x020e0f30 module:overlay(31)
 from:0x02160d50 kind:arm_call to:0x0209d22c module:overlay(0)
 from:0x02160d5c kind:arm_call to:0x020730ac module:overlay(0)
@@ -1212,7 +1212,7 @@ from:0x02160ed8 kind:arm_call to:0x0209c9a8 module:overlay(0)
 from:0x02160ee8 kind:arm_call to:0x0207c018 module:overlay(0)
 from:0x02160f48 kind:load to:0x02163820 module:overlay(63) add:0x8
 from:0x02160f4c kind:load to:0x02163858 module:overlay(63) add:0x8
-from:0x02160f50 kind:load to:0x02163a9c module:overlay(63)
+from:0x02160f50 kind:load to:0x02163a94 module:overlay(63) add:0x8
 from:0x02160f6c kind:arm_call to:0x0209cfe0 module:overlay(0)
 from:0x02160fc4 kind:arm_call_thumb to:0x02057b70 module:overlay(0)
 from:0x02160ff4 kind:load to:0x02163ab8 module:overlay(63)

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

@@ -308,13 +308,13 @@ _ZN23MapObjectProfileUnkLTRW10GetProfileEv kind:function(arm,size=0xc) addr:0x02
 _ZN23MapObjectProfileUnkLTRW6CreateEv kind:function(arm,size=0x24) addr:0x02160adc
 _ZN23MapObjectProfileUnkLTRWC1Ev kind:function(arm,size=0xd0) addr:0x02160b00
 _ZN16MapObjectUnkLTRWC1Ev kind:function(arm,size=0x9c) addr:0x02160bd0
-_ZN16MapObjectUnkLTRW19func_ov063_02160c6cEv kind:function(arm,size=0x5c) addr:0x02160c6c
-_ZN16MapObjectUnkLTRW19func_ov063_02160cc8Ev kind:function(arm,size=0x1c) addr:0x02160cc8
-_ZN16MapObjectUnkLTRW19func_ov063_02160ce4Ev kind:function(arm,size=0x34) addr:0x02160ce4
-_ZN16MapObjectUnkLTRW19func_ov063_02160d18Ev kind:function(arm,size=0x1c) addr:0x02160d18
-_ZN16MapObjectUnkLTRW19func_ov063_02160d34Ev kind:function(arm,size=0xc4) addr:0x02160d34
-_ZN16MapObjectUnkLTRW19func_ov063_02160df8Ev kind:function(arm,size=0x20) addr:0x02160df8
-_ZN16MapObjectUnkLTRW19func_ov063_02160e18Ev kind:function(arm,size=0x24) addr:0x02160e18
+_ZN16MapObjectUnkLTRW8vfunc_00Ev kind:function(arm,size=0x5c) addr:0x02160c6c
+_ZN16MapObjectUnkLTRW8vfunc_08Ev kind:function(arm,size=0x1c) addr:0x02160cc8
+_ZN16MapObjectUnkLTRW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x34) addr:0x02160ce4
+_ZN16MapObjectUnkLTRW19func_ov063_02160d18Ei kind:function(arm,size=0x1c) addr:0x02160d18
+_ZN16MapObjectUnkLTRW8vfunc_28Eiii kind:function(arm,size=0xc4) addr:0x02160d34
+_ZN16MapObjectUnkLTRW8vfunc_14Ev kind:function(arm,size=0x20) addr:0x02160df8
+_ZN24UnkStruct_ov063_021639e49vfunc2_04Ev kind:function(arm,size=0x24) addr:0x02160e18
 _ZN16MapObjectUnkLTRWD1Ev kind:function(arm,size=0x20) addr:0x02160e3c
 _ZN16MapObjectUnkLTRWD0Ev kind:function(arm,size=0x28) addr:0x02160e5c
 _ZN23MapObjectProfileUnkLTRWD1Ev kind:function(arm,size=0x14) addr:0x02160e84
@@ -395,7 +395,7 @@ __sinit_ov063_021629c4 kind:function(arm,size=0x168) addr:0x021629c4
 __sinit_ActorUnkRBLS.cpp kind:function(arm,size=0x50) addr:0x02162b2c
 __sinit_MapObjectUnkSTAT.cpp kind:function(arm,size=0x50) addr:0x02162b7c
 __sinit_MapObjectUnkWLMS.cpp kind:function(arm,size=0x154) addr:0x02162bcc
-__sinit_MapObjectUnkLTRW.cpp kind:function(arm,size=0x80) addr:0x02162d20
+__sinit_MapObjectUnkLTRW.cpp kind:function(arm,size=0x80) addr:0x02162d20 local
 __sinit_MapObjectUnkMTJR.cpp kind:function(arm,size=0x50) addr:0x02162da0
 __sinit_MapObjectUnkSWCR.cpp kind:function(arm,size=0x50) addr:0x02162df0
 .p__sinit_ActorUnkCANS.cpp kind:data(word) addr:0x02162e40
@@ -409,7 +409,7 @@ __sinit_MapObjectUnkSWCR.cpp kind:function(arm,size=0x50) addr:0x02162df0
 .p__sinit_ActorUnkRBLS.cpp kind:data(word) addr:0x02162e60
 .p__sinit_MapObjectUnkSTAT.cpp kind:data(word) addr:0x02162e64
 .p__sinit_MapObjectUnkWLMS.cpp kind:data(word) addr:0x02162e68
-.p__sinit_MapObjectUnkLTRW.cpp kind:data(word) addr:0x02162e6c
+.p__sinit_MapObjectUnkLTRW.cpp kind:data(word) addr:0x02162e6c local
 .p__sinit_MapObjectUnkMTJR.cpp kind:data(word) addr:0x02162e70
 .p__sinit_MapObjectUnkSWCR.cpp kind:data(word) addr:0x02162e74
 _ZTV24UnkStruct_ov063_02162e88 kind:data(any) addr:0x02162e80
@@ -484,13 +484,13 @@ data_ov063_02163910 kind:data(any) addr:0x02163910
 data_ov063_02163928 kind:data(any) addr:0x02163928
 data_ov063_02163944 kind:data(any) addr:0x02163944
 _ZTV19data_ov063_02163980 kind:data(any) addr:0x02163980
-data_ov063_021639c4 kind:data(any) addr:0x021639c4
-data_ov063_021639e4 kind:data(any) addr:0x021639e4
-data_ov063_021639fc kind:data(any) addr:0x021639fc
-data_ov063_02163a18 kind:data(any) addr:0x02163a18
-data_ov063_02163a34 kind:data(any) addr:0x02163a34
-data_ov063_02163a5c kind:data(any) addr:0x02163a5c
-data_ov063_02163a9c kind:data(any) addr:0x02163a9c
+data_ov063_021639c4 kind:data(any) addr:0x021639c4 local
+_ZTV24UnkStruct_ov063_021639e4 kind:data(any) addr:0x021639dc
+_ZTV28MapObjectProfileUnkLTRW_Base kind:data(any) addr:0x021639f4
+_ZTV23MapObjectProfileUnkLTRW kind:data(any) addr:0x02163a10
+_ZTV31MapObjectProfileUnkLTRW_Base_D4 kind:data(any) addr:0x02163a2c
+_ZTV16MapObjectUnkLTRW kind:data(any) addr:0x02163a54
+data_ov063_02163a9c kind:data(any) addr:0x02163a94
 data_ov063_02163ab8 kind:data(any) addr:0x02163ab8
 data_ov063_02163af8 kind:data(any) addr:0x02163af8
 data_ov063_02163b0c kind:data(any) addr:0x02163b0c
@@ -536,7 +536,6 @@ data_ov063_021646d8 kind:bss addr:0x021646d8
 _ZGVN15ProfileInstanceI23MapObjectProfileUnkLTRWE8sProfileE kind:bss addr:0x021646f8
 @12257 kind:bss addr:0x021646fc
 _ZN15ProfileInstanceI23MapObjectProfileUnkLTRWE8sProfileE kind:bss addr:0x02164708
-data_ov063_021647dc kind:bss addr:0x021647dc
 _ZGVN15ProfileInstanceI23MapObjectProfileUnkMTJRE8sProfileE kind:bss addr:0x02164800
 @12263 kind:bss addr:0x02164804
 _ZN15ProfileInstanceI23MapObjectProfileUnkMTJRE8sProfileE kind:bss addr:0x02164810

config/jp/arm9/overlays/ov063/delinks.txt

@@ -85,6 +85,7 @@ src/063_Shrine/MapObject/MapObjectUnkLTRW.cpp:
     .text       start:0x021628e8 end:0x02162cb0
     .init       start:0x02164b38 end:0x02164bb8
     .ctor       start:0x02164c84 end:0x02164c88
+    .data       start:0x021657e4 end:0x021658b4
     .bss        start:0x02166518 end:0x02166620
 
 src/063_Shrine/MapObject/MapObjectUnkMTJR.cpp:

config/jp/arm9/overlays/ov063/relocs.txt

@@ -1188,17 +1188,17 @@ from:0x02162904 kind:arm_call to:0x02011f3c module:main
 from:0x02162910 kind:arm_call to:0x021629e8 module:overlay(63)
 from:0x02162928 kind:arm_call to:0x0209e16c module:overlay(0)
 from:0x02162938 kind:arm_call to:0x0207d6d0 module:overlay(0)
-from:0x021629cc kind:load to:0x0216581c module:overlay(63)
-from:0x021629d0 kind:load to:0x02165854 module:overlay(63)
-from:0x021629d4 kind:load to:0x02165838 module:overlay(63)
+from:0x021629cc kind:load to:0x02165814 module:overlay(63) add:0x8
+from:0x021629d0 kind:load to:0x0216584c module:overlay(63) add:0x8
+from:0x021629d4 kind:load to:0x02165830 module:overlay(63) add:0x8
 from:0x021629e0 kind:load to:0x021657e4 module:overlay(63)
 from:0x021629f0 kind:arm_call to:0x0209e7a4 module:overlay(0)
 from:0x02162a48 kind:arm_call_thumb to:0x020590f0 module:overlay(0)
-from:0x02162a78 kind:load to:0x0216587c module:overlay(63)
+from:0x02162a78 kind:load to:0x02165874 module:overlay(63) add:0x8
 from:0x02162a7c kind:load to:0x02166528 module:overlay(63)
-from:0x02162a80 kind:load to:0x02165804 module:overlay(63)
+from:0x02162a80 kind:load to:0x021657fc module:overlay(63) add:0x8
 from:0x02162ad0 kind:arm_call to:0x02162b30 module:overlay(63)
-from:0x02162adc kind:load to:0x021665fc module:overlay(63)
+from:0x02162adc kind:load to:0x02166528 add:0xd4 module:overlay(63)
 from:0x02162b1c kind:arm_call to:0x020e2900 module:overlay(31)
 from:0x02162b68 kind:arm_call to:0x0209e9f0 module:overlay(0)
 from:0x02162b74 kind:arm_call to:0x02074764 module:overlay(0)
@@ -1220,7 +1220,7 @@ from:0x02162cf0 kind:arm_call to:0x0209e16c module:overlay(0)
 from:0x02162d00 kind:arm_call to:0x0207d6d0 module:overlay(0)
 from:0x02162d60 kind:load to:0x02165640 module:overlay(63) add:0x8
 from:0x02162d64 kind:load to:0x02165678 module:overlay(63) add:0x8
-from:0x02162d68 kind:load to:0x021658bc module:overlay(63)
+from:0x02162d68 kind:load to:0x021658b4 module:overlay(63) add:0x8
 from:0x02162d84 kind:arm_call to:0x0209e7a4 module:overlay(0)
 from:0x02162ddc kind:arm_call_thumb to:0x020590f0 module:overlay(0)
 from:0x02162e0c kind:load to:0x021658d8 module:overlay(63)

config/jp/arm9/overlays/ov063/symbols.txt

@@ -310,13 +310,13 @@ _ZN23MapObjectProfileUnkLTRW10GetProfileEv kind:function(arm,size=0xc) addr:0x02
 _ZN23MapObjectProfileUnkLTRW6CreateEv kind:function(arm,size=0x24) addr:0x021628f4
 _ZN23MapObjectProfileUnkLTRWC1Ev kind:function(arm,size=0xd0) addr:0x02162918
 _ZN16MapObjectUnkLTRWC1Ev kind:function(arm,size=0x9c) addr:0x021629e8
-_ZN16MapObjectUnkLTRW19func_ov063_02160c6cEv kind:function(arm,size=0x5c) addr:0x02162a84
-_ZN16MapObjectUnkLTRW19func_ov063_02160cc8Ev kind:function(arm,size=0x1c) addr:0x02162ae0
-_ZN16MapObjectUnkLTRW19func_ov063_02160ce4Ev kind:function(arm,size=0x34) addr:0x02162afc
-_ZN16MapObjectUnkLTRW19func_ov063_02160d18Ev kind:function(arm,size=0x1c) addr:0x02162b30
-_ZN16MapObjectUnkLTRW19func_ov063_02160d34Ev kind:function(arm,size=0xc4) addr:0x02162b4c
-_ZN16MapObjectUnkLTRW19func_ov063_02160df8Ev kind:function(arm,size=0x20) addr:0x02162c10
-_ZN16MapObjectUnkLTRW19func_ov063_02160e18Ev kind:function(arm,size=0x24) addr:0x02162c30
+_ZN16MapObjectUnkLTRW8vfunc_00Ev kind:function(arm,size=0x5c) addr:0x02162a84
+_ZN16MapObjectUnkLTRW8vfunc_08Ev kind:function(arm,size=0x1c) addr:0x02162ae0
+_ZN16MapObjectUnkLTRW8vfunc_1CE8ActorRefiP7VecFx32 kind:function(arm,size=0x34) addr:0x02162afc
+_ZN16MapObjectUnkLTRW19func_ov063_02160d18Ei kind:function(arm,size=0x1c) addr:0x02162b30
+_ZN16MapObjectUnkLTRW8vfunc_28Eiii kind:function(arm,size=0xc4) addr:0x02162b4c
+_ZN16MapObjectUnkLTRW8vfunc_14Ev kind:function(arm,size=0x20) addr:0x02162c10
+_ZN24UnkStruct_ov063_021639e49vfunc2_04Ev kind:function(arm,size=0x24) addr:0x02162c30
 _ZN16MapObjectUnkLTRWD1Ev kind:function(arm,size=0x20) addr:0x02162c54
 _ZN16MapObjectUnkLTRWD0Ev kind:function(arm,size=0x28) addr:0x02162c74
 _ZN23MapObjectProfileUnkLTRWD1Ev kind:function(arm,size=0x14) addr:0x02162c9c
@@ -397,7 +397,7 @@ __sinit_ov063_021647dc kind:function(arm,size=0x168) addr:0x021647dc
 __sinit_ActorUnkRBLS.cpp kind:function(arm,size=0x50) addr:0x02164944
 __sinit_MapObjectUnkSTAT.cpp kind:function(arm,size=0x50) addr:0x02164994
 __sinit_MapObjectUnkWLMS.cpp kind:function(arm,size=0x154) addr:0x021649e4
-__sinit_MapObjectUnkLTRW.cpp kind:function(arm,size=0x80) addr:0x02164b38
+__sinit_MapObjectUnkLTRW.cpp kind:function(arm,size=0x80) addr:0x02164b38 local
 __sinit_MapObjectUnkMTJR.cpp kind:function(arm,size=0x50) addr:0x02164bb8
 __sinit_MapObjectUnkSWCR.cpp kind:function(arm,size=0x50) addr:0x02164c08
 .p__sinit_ActorUnkCANS.cpp kind:data(word) addr:0x02164c58
@@ -411,7 +411,7 @@ __sinit_MapObjectUnkSWCR.cpp kind:function(arm,size=0x50) addr:0x02164c08
 .p__sinit_ActorUnkRBLS.cpp kind:data(word) addr:0x02164c78
 .p__sinit_MapObjectUnkSTAT.cpp kind:data(word) addr:0x02164c7c
 .p__sinit_MapObjectUnkWLMS.cpp kind:data(word) addr:0x02164c80
-.p__sinit_MapObjectUnkLTRW.cpp kind:data(word) addr:0x02164c84
+.p__sinit_MapObjectUnkLTRW.cpp kind:data(word) addr:0x02164c84 local
 .p__sinit_MapObjectUnkMTJR.cpp kind:data(word) addr:0x02164c88
 .p__sinit_MapObjectUnkSWCR.cpp kind:data(word) addr:0x02164c8c
 _ZTV24UnkStruct_ov063_02162e88 kind:data(any) addr:0x02164ca0
@@ -487,13 +487,13 @@ data_ov063_02165730 kind:data(any) addr:0x02165730
 data_ov063_02165748 kind:data(any) addr:0x02165748
 data_ov063_02165764 kind:data(any) addr:0x02165764
 _ZTV19data_ov063_021657a0 kind:data(any) addr:0x021657a0
-data_ov063_021657e4 kind:data(any) addr:0x021657e4
-data_ov063_02165804 kind:data(any) addr:0x02165804
-data_ov063_0216581c kind:data(any) addr:0x0216581c
-data_ov063_02165838 kind:data(any) addr:0x02165838
-data_ov063_02165854 kind:data(any) addr:0x02165854
-data_ov063_0216587c kind:data(any) addr:0x0216587c
-data_ov063_021658bc kind:data(any) addr:0x021658bc
+data_ov063_021639c4 kind:data(any) addr:0x021657e4 local
+_ZTV24UnkStruct_ov063_021639e4 kind:data(any) addr:0x021657fc
+_ZTV28MapObjectProfileUnkLTRW_Base kind:data(any) addr:0x02165814
+_ZTV23MapObjectProfileUnkLTRW kind:data(any) addr:0x02165830
+_ZTV31MapObjectProfileUnkLTRW_Base_D4 kind:data(any) addr:0x0216584c
+_ZTV16MapObjectUnkLTRW kind:data(any) addr:0x02165874
+data_ov063_021658bc kind:data(any) addr:0x021658b4
 data_ov063_021658d8 kind:data(any) addr:0x021658d8
 data_ov063_02165918 kind:data(any) addr:0x02165918
 data_ov063_0216592c kind:data(any) addr:0x0216592c
@@ -541,7 +541,6 @@ data_ov063_021664f8 kind:bss addr:0x021664f8
 _ZGVN15ProfileInstanceI23MapObjectProfileUnkLTRWE8sProfileE kind:bss addr:0x02166518
 @32263 kind:bss addr:0x0216651c
 _ZN15ProfileInstanceI23MapObjectProfileUnkLTRWE8sProfileE kind:bss addr:0x02166528
-data_ov063_021665fc kind:bss addr:0x021665fc
 _ZGVN15ProfileInstanceI23MapObjectProfileUnkMTJRE8sProfileE kind:bss addr:0x02166620
 @32269 kind:bss addr:0x02166624
 _ZN15ProfileInstanceI23MapObjectProfileUnkMTJRE8sProfileE kind:bss addr:0x02166630

include/MapObject/MapObject.hpp

@@ -94,6 +94,11 @@ class MapObject_10 : public MapObject_10_Base {
     /* 20 */
 };
 
+class MapObject_10_Derived1 : public MapObject_10 {
+public:
+    MapObject_10_Derived1() {}
+};
+
 class MapObject_20 {
 public:
     /* 00 */ u16 mParams[4]; // parameters

include/MapObject/MapObjectUnkLTRW.hpp

@@ -1,36 +1,64 @@
-//! TODO: This file was generated automatically and might contain errors
-
 #pragma once
 
+#include "Actor/ActorUnkTLKT.hpp"
 #include "MapObject/MapObject.hpp"
 #include "MapObject/MapObjectProfile.hpp"
+#include "Render/ModelRender.hpp"
 #include "global.h"
-#include "types.h"
+
+class UnkStruct_ov063_021639e4 : public ActorUnkTLKT_9C_Base {
+public:
+    /* 00 (vtable) */
+    /* 08 */
+
+    UnkStruct_ov063_021639e4() {
+        mUnk_04h = 0;
+        mUnk_06  = 0;
+    };
+
+    /* 04 */ virtual void vfunc2_04() override;
+};
 
 class MapObjectUnkLTRW : public MapObject {
 public:
     /* 00 (base) */
-    /* 40 */
+    /* 40 */ ModelRender mUnk_40;
+    /* A0 */ unk32 mUnk_A0;
+    /* A4 */ volatile u16 mUnk_A4;
+    /* A6 */ u16 mUnk_A6;
+    /* A8 */ UnkStruct_ov063_021639e4 mUnk_A8;
 
     MapObjectUnkLTRW();
 
-    /* 30 */ virtual ~MapObjectUnkLTRW() override;
+    /* 00 */ virtual bool vfunc_00() override;
+    /* 08 */ virtual void vfunc_08() override;
+    /* 14 */ virtual void vfunc_14() override;
+    /* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override;
+    /* 28 */ virtual unk32 vfunc_28(unk32 param1, unk32 param2, unk32 param3) override;
+
+    void func_ov063_02160d18(unk32 param1);
+};
+
+class MapObjectProfileUnkLTRW_Base_D4 : public MapObject_10 {
+public:
+};
+
+class MapObjectProfileUnkLTRW_Base : public MapObjectProfile_Derived2 {
+public:
+    /* 00 (base) */
+    /* D4 */ MapObjectProfileUnkLTRW_Base_D4 mUnk_D4;
+    /* F8 */
 
-    void func_ov063_02160c6c(void);
-    void func_ov063_02160cc8(void);
-    void func_ov063_02160ce4(void);
-    void func_ov063_02160d18(void);
-    void func_ov063_02160d34(void);
-    void func_ov063_02160df8(void);
-    void func_ov063_02160e18(void);
+    MapObjectProfileUnkLTRW_Base(MapObjectId mapObjId1, MapObjectId mapObjId2) :
+        MapObjectProfile_Derived2(mapObjId1, mapObjId2),
+        mUnk_D4() {};
 };
 
-class MapObjectProfileUnkLTRW : public MapObjectProfile {
+class MapObjectProfileUnkLTRW : public MapObjectProfileUnkLTRW_Base {
 public:
     /* 00 (base) */
 
     MapObjectProfileUnkLTRW();
-    ~MapObjectProfileUnkLTRW();
 
     /* 0C */ virtual MapObject *Create();
 

include/MapObject/MapObjectUnkSTAT.hpp

@@ -1,5 +1,3 @@
-//! TODO: This file was generated automatically and might contain errors
-
 #pragma once
 
 #include "MapObject/MapObject.hpp"

include/MapObject/MapObject_ov031.hpp

@@ -0,0 +1,45 @@
+#pragma once
+
+class MapObjectPot_Base : public MapObject {
+public:
+    /* 00 (base) */
+    /* 40 */
+
+    MapObjectPot_Base();
+
+    // data_ov000_020b35d0
+
+    /* 00 */ virtual bool vfunc_00();                                           // func_ov000_0209d780
+    /* 24 */ virtual void vfunc_24(MapObject *param1, VecFx32 param2) override; // func_ov000_0209d8e8
+    /* 28 */ virtual unk32 vfunc_28(unk32 param1) override;                     // func_ov000_0209d9f8
+    /* 30 */ virtual ~MapObjectPot_Base() = 0 override;
+    /* 38 */ virtual void vfunc_38() override;             // func_ov000_0209d9ac
+    /* 3C */ virtual bool vfunc_3C() override;             // func_ov000_0209db74
+    /* 40 */ virtual bool vfunc_40() override;             // func_ov000_0209db7c
+    /* 44 */ virtual void vfunc_44(unk32, unk32) override; // func_ov000_0209d7a4
+    /* 48 */ virtual void vfunc_48() override;             // func_ov000_0209da60
+    /* 4C */ virtual void vfunc_4C() override;             // func_ov000_0209da70
+    /* 50 */ virtual void vfunc_50() override;             // func_ov000_0209dac0
+    /* 54 */ virtual unk32 vfunc_54() override;            // func_ov000_0209da64
+
+    // overlay 0
+    void func_ov000_0209d8e8(MapObjectPot_Base *param1, fx32 param2);
+    unk32 func_ov000_0209da64();
+};
+
+class MapObject_10_Pot : public MapObject_10 {
+public:
+    /* 00 (base) */
+    /* 24 */
+
+    MapObject_10_Pot() {}
+};
+
+class MapObjectProfilePot_Base : public MapObjectProfile_Derived2 {
+public:
+    /* 00 (base) */
+    /* D4 */ MapObject_10_Pot mUnk_D4;
+
+    MapObjectProfilePot_Base(MapObjectId param1, MapObjectId param2) :
+        MapObjectProfile_Derived2(param1, param2) {}
+};

include/Unknown/Common.hpp

@@ -894,6 +894,10 @@ class MapObject_UnkStruct1 {
             bool mUnk_04b;
             bool mUnk_05;
         };
+        struct {
+            unk16 mUnk_04h;
+            unk16 mUnk_06;
+        };
         unk32 mUnk_04;
     };
     /* 08 */

src/063_Shrine/Actor/ActorUnkRMSD.cpp

@@ -10,8 +10,6 @@ extern char data_ov063_021625e8[0x10]; // = "RMSD";
 
 ActorUnkZLSL_AnimationTag data_ov063_021634b0 = {0, "RMSD"};
 
-extern "C" void func_ov000_02099ff8(unk32 *param1, ActorUnkZLSL_AnimationTag param2, unk32 param8);
-
 DECL_PROFILE(ActorProfileUnkRMSD);
 
 Actor *ActorProfileUnkRMSD::Create() {

src/063_Shrine/Actor/ActorUnkRMSV.cpp

@@ -10,7 +10,6 @@ extern char data_ov063_02162578[0x10]; // = "RMSV";
 extern char data_ov063_02162588[0x10]; // = "RMSV_wall";
 
 // Overlay 0
-extern "C" void func_ov000_02099ff8(unk32 *param1, ActorUnkZLSL_AnimationTag param2, unk32 param8);
 extern "C" void func_ov000_02099e58(UnkStruct_ov063_021632e4 *param1, ActorUnkZLSL_AnimationTag param2, unk32 param8);
 
 // Overlay 31