mirror of
https://github.com/zeldaret/st
synced 2026-10-08 13:36:27 -04:00
Sync nitro headers with nitro decomp (#156)
* sync headers with nitro decomp * fix most build issues * fix symbols * fix regressions
This commit is contained in:
@@ -24,7 +24,7 @@ class MapObjectBombFlower : public MapObjectPot_Base {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 48 */ ModelRender_ov031_0211578c mUnk_48;
|
||||
/* A8 */ STRUCT_PAD(0xA8, 0xB0);
|
||||
/* A8 */ PAD(0xA8, 0xB0);
|
||||
/* BC */ fx32 mUnk_B0;
|
||||
/* BC */ fx32 mUnk_B4;
|
||||
/* B8 */ Timer mUnk_B8;
|
||||
|
||||
@@ -32,7 +32,7 @@ public:
|
||||
/* 1E */ unk16 mUnk_1E;
|
||||
/* 20 */ unk16 mUnk_20;
|
||||
/* 22 */ unk16 mUnk_22;
|
||||
/* 24 */ STRUCT_PAD(0x24, 0x6C);
|
||||
/* 24 */ PAD(0x24, 0x6C);
|
||||
/* 6C */ void *mUnk_6C;
|
||||
/* 70 */
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ public:
|
||||
/* 40 */ MapObjectSwitchStep_40 mUnk_40;
|
||||
/* A4 */ UnkSystem5 mUnk_A4;
|
||||
/* C4 */ unk32 mUnk_C4;
|
||||
/* C8 */ STRUCT_PAD(0xC8, 0xE4);
|
||||
/* C8 */ PAD(0xC8, 0xE4);
|
||||
/* E4 */ Timer mUnk_E4;
|
||||
/* E8 */ unk16 mUnk_E8;
|
||||
/* EA */ u8 mUnk_EA; // bool?
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
class MapObjectUnkDRTY : public MapObjectUnkWPHL { //! TODO: fake?
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 8C */ STRUCT_PAD(0x8C, 0xCC);
|
||||
/* 8C */ PAD(0x8C, 0xCC);
|
||||
/* CC */ unk32 mUnk_CC;
|
||||
/* D0 */ STRUCT_PAD(0xD0, 0xF4);
|
||||
/* D0 */ PAD(0xD0, 0xF4);
|
||||
/* F4 */
|
||||
|
||||
MapObjectUnkDRTY();
|
||||
|
||||
@@ -28,11 +28,11 @@ public:
|
||||
/* 087 */ u8 mUnk_087;
|
||||
/* 088 */ u8 mUnk_088;
|
||||
/* 089 */ unk8 mUnk_089;
|
||||
/* 080 */ STRUCT_PAD(0x08A, 0x08C);
|
||||
/* 080 */ PAD(0x08A, 0x08C);
|
||||
/* 08C */ UnkStruct_ov031_Items_02 mUnk_08C;
|
||||
/* 0A8 */ STRUCT_PAD(0x098, 0x0BC);
|
||||
/* 0A8 */ PAD(0x098, 0x0BC);
|
||||
/* 0BC */ unk32 mUnk_0BC;
|
||||
/* 0C0 */ STRUCT_PAD(0x0C0, 0x0D4);
|
||||
/* 0C0 */ PAD(0x0C0, 0x0D4);
|
||||
/* 0D4 */ MapObject_10 mUnk_0D4;
|
||||
/* 0F8 */ Timer mUnk_0F8;
|
||||
/* 0FC */ unk32 mUnk_0FC;
|
||||
|
||||
@@ -16,7 +16,7 @@ public:
|
||||
/* 54 */ unk32 mUnk_54;
|
||||
/* 58 */ unk16 mUnk_58;
|
||||
/* 5A */ Timer mUnk_5A;
|
||||
/* 5E */ STRUCT_PAD(0x5E, 0x60);
|
||||
/* 5E */ PAD(0x5E, 0x60);
|
||||
/* 60 */ unk32 mUnk_60;
|
||||
/* 64 */ unk32 mUnk_64;
|
||||
/* 68 */ unk32 mUnk_68;
|
||||
|
||||
@@ -23,7 +23,7 @@ public:
|
||||
/* 054 */ ModelRender mUnk_054;
|
||||
/* 0B4 */ UnkSystem5 mUnk_0B4;
|
||||
/* 0D4 */ unk32 mUnk_0D4;
|
||||
/* 0D8 */ STRUCT_PAD(0x0D8, 0x0F4);
|
||||
/* 0D8 */ PAD(0x0D8, 0x0F4);
|
||||
/* 0F4 */ UnkSystem7 mUnk_0F4;
|
||||
/* 0F8 */ unk32 mUnk_0F8;
|
||||
/* 0FC */ unk32 mUnk_0FC;
|
||||
|
||||
@@ -31,14 +31,14 @@ public:
|
||||
/* 040 */ MapObjectUnkSWSW_40 mUnk_040;
|
||||
/* 0AC */ UnkSystem5 mUnk_0AC;
|
||||
/* 0CC */ unk32 mUnk_0CC;
|
||||
/* 0E0 */ STRUCT_PAD(0xD0, 0xEC);
|
||||
/* 0EC */ VecFx32 mUnk_0EC;
|
||||
/* 0E0 */ PAD(0xD0, 0xEC);
|
||||
/* 0EC */ VecFx32Cpp mUnk_0EC;
|
||||
/* 0F8 */ ActorUnkNSSW *mUnk_0F8;
|
||||
/* 0FC */ unk32 mUnk_0FC;
|
||||
/* 100 */ Timer mUnk_100;
|
||||
/* 104 */ u8 mUnk_104;
|
||||
/* 105 */ u8 mUnk_105;
|
||||
/* 106 */ STRUCT_PAD(0x106, 0x108);
|
||||
/* 106 */ PAD(0x106, 0x108);
|
||||
/* 108 */ fx32 mUnk_108;
|
||||
/* 10C */ unk16 mUnk_10C;
|
||||
/* 10E */ Timer mUnk_10E;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
class MapObjectUnkWDST : public MapObject {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 40 */ STRUCT_PAD(0x40, 0xB8);
|
||||
/* 40 */ PAD(0x40, 0xB8);
|
||||
/* B8 */ unk32 mUnk_B8;
|
||||
|
||||
MapObjectUnkWDST();
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
class MapObjectUnkWPHL : public MapObject {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 40 */ STRUCT_PAD(0x40, 0x8C);
|
||||
/* 40 */ PAD(0x40, 0x8C);
|
||||
/* 8C */
|
||||
|
||||
MapObjectUnkWPHL();
|
||||
|
||||
Reference in New Issue
Block a user