mirror of
https://github.com/zeldaret/st
synced 2026-05-31 09:21:46 -04:00
Decompile overlay 0 map objects (#49)
* add missing scratch link * ActorUnk_ov000_020a8bb0_a4_00 -> UnkSystem4 * match mapobj switch step * SWST -> SwitchStep * dsd format * fix playerget regression * fix fake match * BLCM -> MiniBlocks * match mapobj miniblocks * minor improvement * fix regressions
This commit is contained in:
@@ -40,6 +40,7 @@ public:
|
||||
/* 0C */
|
||||
|
||||
MapObjectProfile_D4() {}
|
||||
~MapObjectProfile_D4() {}
|
||||
|
||||
/* 00 */ virtual void vfunc_00(void);
|
||||
/* 04 */ virtual void vfunc_04(void);
|
||||
@@ -55,7 +56,7 @@ class MapObjectProfile : public SysObject {
|
||||
public:
|
||||
/* 00 (vtable) */
|
||||
/* 04 */ unk8 mUnk_04[2];
|
||||
/* 06 */ u8 mUnk_06;
|
||||
/* 06 */ s8 mUnk_06;
|
||||
/* 07 */ unk8 mUnk_07;
|
||||
/* 08 */ unk32 mUnk_08;
|
||||
/* 0C */ unk16 mUnk_0C;
|
||||
@@ -66,10 +67,11 @@ public:
|
||||
/* 18 */ unk32 mUnk_18;
|
||||
/* 1C */ unk8 mUnk_1C;
|
||||
/* 1D */ unk8 mUnk_1D;
|
||||
/* 1E */ unk16 mUnk_1E;
|
||||
/* 1E */ u16 mUnk_1E;
|
||||
/* 20 */
|
||||
|
||||
MapObjectProfile(MapObjectId mapObjId); // func_ov000_0209c828
|
||||
~MapObjectProfile();
|
||||
|
||||
// data_ov000_020b3524
|
||||
/* 00 */ virtual MapObject *Create() = 0;
|
||||
@@ -80,12 +82,14 @@ public:
|
||||
/* 14 */
|
||||
};
|
||||
|
||||
class MapObjectProfile_Derived2_20;
|
||||
|
||||
class MapObjectProfile_Derived1_20 {
|
||||
public:
|
||||
/* 00 */ unk32 mUnk_00;
|
||||
/* 00 */ MapObjectProfile_Derived2_20 *mUnk_00;
|
||||
|
||||
MapObjectProfile_Derived1_20() {
|
||||
this->mUnk_00 = 0;
|
||||
this->mUnk_00 = NULL;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -96,15 +100,19 @@ public:
|
||||
/* 60 */ unk32 mUnk_60;
|
||||
/* 64 */ unk16 mUnk_64;
|
||||
/* 66 */ unk16 mUnk_66;
|
||||
/* 68 */ MapObjectProfile_D4 mUnk_68;
|
||||
/* 74 */ unk32 mUnk_74;
|
||||
/* 78 */ unk32 mUnk_78;
|
||||
/* 7C */ unk32 mUnk_7C;
|
||||
/* 80 */ unk32 mUnk_80;
|
||||
/* 84 */ unk32 mUnk_84;
|
||||
/* 88 */
|
||||
/* 68 */
|
||||
|
||||
MapObjectProfile_Derived1(MapObjectId mapObjId); // func_ov000_0209cb4c
|
||||
MapObjectProfile_Derived1(MapObjectId mapObjId, unk32 param2, unk32 param3); // func_ov000_0209cb4c
|
||||
|
||||
// data_ov000_020b3540
|
||||
/* 04 */ virtual void vfunc_04();
|
||||
/* 08 */ virtual void vfunc_08();
|
||||
/* 0C */ virtual void vfunc_0C();
|
||||
/* 10 */ virtual void vfunc_10();
|
||||
/* 14 */ virtual ~MapObjectProfile_Derived1();
|
||||
/* 1C */ virtual MapObjectProfile_Derived2_20 *vfunc_1C(unk32 param1);
|
||||
|
||||
void func_ov000_0209ccd8(unk32 param1, u32 param2);
|
||||
};
|
||||
|
||||
class MapObjectProfile_Derived2_20_Base_18 {
|
||||
@@ -118,8 +126,8 @@ public:
|
||||
|
||||
class MapObjectProfile_Derived2_20_Base_20 {
|
||||
public:
|
||||
/* 00 */ unk32 mUnk_00;
|
||||
/* 04 */ unk32 mUnk_04;
|
||||
/* 00 */ void *mUnk_00;
|
||||
/* 04 */ void *mUnk_04;
|
||||
/* 08 */ unk32 mUnk_08;
|
||||
/* 0C */
|
||||
|
||||
@@ -127,6 +135,23 @@ public:
|
||||
unk32 param5); // func_020153fc
|
||||
};
|
||||
|
||||
class MapObjectProfile_Derived2_20_Base_50 {
|
||||
public:
|
||||
/* 00 */ unk32 mUnk_00;
|
||||
/* 04 */ unk32 mUnk_04;
|
||||
/* 08 */ u8 mUnk_08;
|
||||
/* 08 */ u8 mUnk_09;
|
||||
/* 08 */ u8 mUnk_0A;
|
||||
/* 08 */ u8 mUnk_0B;
|
||||
/* 0C */ unk8 mUnk_0C;
|
||||
/* 0C */ unk8 mUnk_0D;
|
||||
/* 0C */ u16 mUnk_0E;
|
||||
/* 10 */
|
||||
|
||||
MapObjectProfile_Derived2_20_Base_50();
|
||||
~MapObjectProfile_Derived2_20_Base_50();
|
||||
};
|
||||
|
||||
class MapObjectProfile_Derived2_20_Base_54 {
|
||||
public:
|
||||
/* 00 */ unk32 mUnk_00;
|
||||
@@ -142,10 +167,10 @@ public:
|
||||
class MapObjectProfile_Derived2_20_Base {
|
||||
public:
|
||||
/* 00 (vtable) */
|
||||
/* 04 */ unk32 mUnk_04;
|
||||
/* 08 */ unk32 mUnk_08;
|
||||
/* 0C */ unk32 mUnk_0C;
|
||||
/* 10 */ unk32 mUnk_10;
|
||||
/* 04 */ const char *mUnk_04;
|
||||
/* 08 */ void *mUnk_08;
|
||||
/* 0C */ void *mUnk_0C;
|
||||
/* 10 */ void *mUnk_10;
|
||||
/* 14 */ unk8 mUnk_14; // bool?
|
||||
/* 15 */ unk8 mUnk_15; // bool?
|
||||
/* 16 */ unk8 mUnk_16; // bool?
|
||||
@@ -154,7 +179,7 @@ public:
|
||||
/* 20 */ MapObjectProfile_Derived2_20_Base_20 mUnk_20;
|
||||
/* 2C */ UnkFileSystem3 mUnk_2C;
|
||||
/* 3C */ UnkFileSystem5 mUnk_3C;
|
||||
/* 50 */ unk32 mUnk_50;
|
||||
/* 50 */ MapObjectProfile_Derived2_20_Base_50 *mUnk_50;
|
||||
/* 54 */ MapObjectProfile_Derived2_20_Base_54 mUnk_54[4];
|
||||
/* 94 */
|
||||
|
||||
@@ -184,23 +209,25 @@ public:
|
||||
|
||||
// data_ov000_020b3568
|
||||
/* 00 */ virtual ~MapObjectProfile_Derived2_20() override;
|
||||
|
||||
unk32 func_ov000_02058a24();
|
||||
unk32 func_ov000_02058a84(unk32 param1, const char *param2);
|
||||
};
|
||||
|
||||
class MapObjectProfile_Derived2 : public MapObjectProfile {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 20 */ MapObjectProfile_Derived2_20 mUnk_20;
|
||||
/* D4 */ MapObjectProfile_D4 mUnk_D4;
|
||||
/* E0 */ Vec3p mUnk_E0;
|
||||
/* EC */ Vec3p mUnk_EC;
|
||||
/* F8 */
|
||||
/* D4 */
|
||||
|
||||
MapObjectProfile_Derived2(MapObjectId mapObjId1, MapObjectId mapObjId2); // func_ov000_0209c9a8
|
||||
~MapObjectProfile_Derived2();
|
||||
|
||||
// data_ov000_020b3508
|
||||
/* 04 */ virtual void vfunc_04() override;
|
||||
/* 08 */ virtual void vfunc_08() override;
|
||||
/* 0C */ virtual void vfunc_0C() override;
|
||||
/* 10 */ virtual void vfunc_10() override;
|
||||
};
|
||||
|
||||
typedef MapObjectProfile *(*GetMapObjectProfile)();
|
||||
|
||||
Reference in New Issue
Block a user