diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index 5ac5e4c0f..4489a935d 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -21,8 +21,8 @@ class Actor_5c_Base { public: /* 00 */ Vec3p mUnk_00; - /* 0c */ s16 mUnk_0c; - /* 0e */ unk16 mUnk_0e; // padding? + /* 0C */ s16 mUnk_0C; + /* 0E */ unk16 mUnk_0E; // padding? /* 10 */ Actor_5c_Base() {}; @@ -103,37 +103,37 @@ class Actor : public SysObject { /* 00 (vtable) */ /* 04 */ Vec3p mPos; /* 10 */ Vec3p mPrevPos; - /* 1c */ Vec3p mVel; + /* 1C */ Vec3p mVel; /* 28 */ s16 mAngle; - /* 2a */ unk16 mUnk_2a; - /* 2c */ unk32 mUnk_2c; // gravity? + /* 2A */ unk16 mUnk_2A; + /* 2C */ unk32 mUnk_2C; // gravity? /* 30 */ Cylinder *mUnk_30; /* 34 */ Cylinder *mUnk_34; /* 38 */ unk32 *mUnk_38; - /* 3c */ unk32 mUnk_3c; + /* 3C */ unk32 mUnk_3C; /* 40 */ Actor_c4 *mUnk_40; /* 44 */ u16 mUnk_44; /* 46 */ unk16 mUnk_46; /* 48 */ unk16 mUnk_48; - /* 4a */ unk8 mUnk_4a; - /* 4a */ unk8 mUnk_4b; - /* 4c */ s16 mUnk_4c; - /* 4e */ s16 mUnk_4e; + /* 4A */ unk8 mUnk_4A; + /* 4A */ unk8 mUnk_4B; + /* 4C */ s16 mUnk_4C; + /* 4E */ s16 mUnk_4E; /* 50 */ volatile u16 mUnk_50; /* 52 */ u16 mUnk_52; /* 54 */ unk32 mUnk_54; /* 58 */ ActorFlags mFlags[1]; - /* 5c */ Actor_5c mUnk_5c; - /* 6c */ u16 mUnk_6c; // actor user id? - /* 6e */ u16 mUnk_6e; + /* 5C */ Actor_5c mUnk_5C; + /* 6C */ u16 mUnk_6C; // actor user id? + /* 6E */ u16 mUnk_6E; /* 70 */ u16 mUnk_70; /* 70 */ u16 mUnk_72; /* 74 */ u8 mUnk_74; /* 74 */ u8 mUnk_75; /* 76 */ u16 mUnk_76; /* 78 */ u16 mUnk_78; - /* 7A */ unk16 mUnk_7a; - /* 7C */ unk32 mUnk_7c; + /* 7A */ unk16 mUnk_7A; + /* 7C */ unk32 mUnk_7C; /* 80 */ s16 mUnk_80; /* 80 */ unk16 mUnk_82; /* 84 */ unk32 mUnk_84; @@ -145,23 +145,23 @@ class Actor : public SysObject { /* 00 */ virtual void vfunc_00(Vec3p *param1); /* 04 */ virtual bool vfunc_04(); /* 08 */ virtual unk16 vfunc_08(); - /* 0c */ virtual unk8 vfunc_0c(); + /* 0C */ virtual unk8 vfunc_0c(); /* 10 */ virtual void vfunc_10(); /* 14 */ virtual void vfunc_14(); /* 18 */ virtual bool vfunc_18(unk32 param1); - /* 1c */ virtual void vfunc_1c(); + /* 1C */ virtual void vfunc_1c(); /* 20 */ virtual void vfunc_20(); /* 24 */ virtual void vfunc_24(); /* 28 */ virtual void vfunc_28(); - /* 2c */ virtual void vfunc_2c(unk32 param1); + /* 2C */ virtual void vfunc_2c(unk32 param1); /* 30 */ virtual void vfunc_30(); /* 34 */ virtual unk32 vfunc_34(); /* 38 */ virtual unk32 vfunc_38(unk32 param1); - /* 3c */ virtual bool vfunc_3c(unk32 param2, Vec3p *param3); + /* 3C */ virtual bool vfunc_3c(unk32 param2, Vec3p *param3); /* 40 */ virtual void vfunc_40(); /* 44 */ virtual void vfunc_44(); /* 48 */ virtual void vfunc_48(); - /* 4c */ virtual ~Actor(); + /* 4C */ virtual ~Actor(); /* 54 */ unk32 func_01fff5d0(unk32 param1, unk32 param2); @@ -221,21 +221,21 @@ class Actor_c4 : public Actor_c4_Base { /* 00 (vtable) */ /* 04 */ unk32 mUnk_04; /* 08 */ unk16 mUnk_08; - /* 08 */ unk16 mUnk_0a; - /* 0c */ unk16 mUnk_0c; - /* 0c */ unk16 mUnk_0e; + /* 08 */ unk16 mUnk_0A; + /* 0C */ unk16 mUnk_0C; + /* 0C */ unk16 mUnk_0E; /* 10 */ unk16 mUnk_10; /* 10 */ unk16 mUnk_12; /* 14 */ unk32 mUnk_14; /* 18 */ unk32 mUnk_18; - /* 1c */ unk32 mUnk_1c; + /* 1C */ unk32 mUnk_1C; /* 20 */ Actor *mUnk_20; /* 24 */ /* 00 */ virtual unk32 vfunc_00(Actor_c4_stack param1, unk32 param2); /* 04 */ virtual void vfunc_04(); /* 08 */ virtual void vfunc_08(); - /* 0c */ virtual void vfunc_0c(unk32 param1); + /* 0C */ virtual void vfunc_0c(unk32 param1); /* 10 */ Actor_c4(Actor *param1) : diff --git a/include/Actor/ActorManager.hpp b/include/Actor/ActorManager.hpp index 2141bfa2b..338875053 100644 --- a/include/Actor/ActorManager.hpp +++ b/include/Actor/ActorManager.hpp @@ -17,21 +17,21 @@ class ActorManager : public SysObject { /* 00 */ Actor **mActorTable; /* 04 */ Actor **mActorTableEnd; /* 08 */ Actor **mUnk_08; // pointer to first available slot? - /* 0c */ unk16 mActorCount; - /* 0e */ unk16 mNextActorId; + /* 0C */ unk16 mActorCount; + /* 0E */ unk16 mNextActorId; /* 10 */ unk8 mUnk_10; /* 10 */ unk8 mUnk_11; /* 10 */ unk8 mUnk_12; /* 10 */ unk8 mUnk_13; /* 14 */ UnkStruct_ov019_020d24c8_28_258_00 mUnk_14; - /* 1c */ unk32 mUnk_1c; + /* 1C */ unk32 mUnk_1C; /* 20 */ unk8 mUnk_20; /* 21 */ unk8 mUnk_21; /* 22 */ unk8 mUnk_22; /* 23 */ unk8 mUnk_23; /* 24 */ unk32 mUnk_24; /* 28 */ unk32 mUnk_28; - /* 2c */ unk32 mUnk_2c; + /* 2C */ unk32 mUnk_2C; /* 30 */ unk16 mUnk_30; /* 32 */ unk8 mUnk_32; /* 33 */ unk8 mUnk_33; diff --git a/include/Actor/ActorProfile.hpp b/include/Actor/ActorProfile.hpp index ac8375d66..b5a5515ff 100644 --- a/include/Actor/ActorProfile.hpp +++ b/include/Actor/ActorProfile.hpp @@ -15,18 +15,18 @@ class ActorProfile : public SysObject { /* 14 */ unk8 mUnk_14[0x18 - 0x14]; /* 18 */ unk8 mUnk_18; /* 19 */ unk8 mUnk_19; - /* 1a */ unk16 mUnk_1a; - /* 1c */ unk16 mUnk_1c; - /* 1e */ u16 mUnk_1e; + /* 1A */ unk16 mUnk_1A; + /* 1C */ unk16 mUnk_1C; + /* 1E */ u16 mUnk_1E; /* 20 */ ActorId mActorId; /* 24 */ unk32 mUnk_24; /* 28 */ unk32 mUnk_28; - /* 2c */ unk32 mUnk_2c; + /* 2C */ unk32 mUnk_2C; /* 30 */ unk32 mUnk_30; /* 34 */ unk32 mUnk_34; /* 38 */ u8 mUnk_38; /* 39 */ unk8 mUnk_39; - /* 3a */ + /* 3A */ ActorProfile(ActorId actorId); ~ActorProfile(); @@ -34,11 +34,11 @@ class ActorProfile : public SysObject { /* 00 */ virtual Actor *Create() = 0; /* 04 */ virtual void vfunc_04(); /* 08 */ virtual void vfunc_08(); - /* 0c */ virtual void vfunc_0c(); + /* 0C */ virtual void vfunc_0c(); /* 10 */ virtual void vfunc_10(); /* 14 */ virtual void vfunc_14(); /* 18 */ virtual void vfunc_18(); - /* 1c */ + /* 1C */ void func_ov000_020977e4(); void func_ov000_020975dc(); diff --git a/include/Actor/ActorRupee.hpp b/include/Actor/ActorRupee.hpp index 586cb5e56..7153d4833 100644 --- a/include/Actor/ActorRupee.hpp +++ b/include/Actor/ActorRupee.hpp @@ -48,33 +48,33 @@ class ActorRupee : public Actor { /* 94 */ u16 mUnk_94; /* 96 */ u16 mUnk_96; /* 98 */ u16 mUnk_98; - /* 9a */ u16 mUnk_9a; - /* 9c */ Actor_9c mUnk_9c; - /* a0 */ unk32 mUnk_a0; - /* a4 */ unk32 mUnk_a4; - /* a8 */ unk32 mUnk_a8; - /* ac */ unk32 mUnk_ac; - /* b0 */ unk32 mUnk_b0; - /* b4 */ unk32 mUnk_b4; - /* b8 */ unk32 mUnk_b8; - /* bc */ unk32 mUnk_bc; - /* c0 */ unk32 mUnk_c0; - /* c4 */ ActorRupee_c4 mUnk_c4; - /* e8 */ unk32 mUnk_e8; - /* ec */ s16 mUnk_ec; - /* f0 */ UnkStruct_PlayerGet_ec mUnk_f0; - /* f4 */ bool mUnk_f4; - /* f5 */ unk8 mUnk_f5; - /* f6 */ unk8 mUnk_f6; - /* f7 */ unk8 mUnk_f7; - /* f8 */ + /* 9A */ u16 mUnk_9A; + /* 9C */ Actor_9c mUnk_9C; + /* A0 */ unk32 mUnk_A0; + /* A4 */ unk32 mUnk_A4; + /* A8 */ unk32 mUnk_A8; + /* AC */ unk32 mUnk_AC; + /* B0 */ unk32 mUnk_B0; + /* B4 */ unk32 mUnk_B4; + /* B8 */ unk32 mUnk_B8; + /* BC */ unk32 mUnk_BC; + /* C0 */ unk32 mUnk_C0; + /* C4 */ ActorRupee_c4 mUnk_C4; + /* E8 */ unk32 mUnk_E8; + /* EC */ s16 mUnk_EC; + /* F0 */ UnkStruct_PlayerGet_ec mUnk_F0; + /* F4 */ bool mUnk_F4; + /* F5 */ unk8 mUnk_F5; + /* F6 */ unk8 mUnk_F6; + /* F7 */ unk8 mUnk_F7; + /* F8 */ ActorRupee(); /* 18 */ virtual bool vfunc_18(unk32 param1) override; /* 20 */ virtual void vfunc_20() override; - /* 2c */ virtual void vfunc_2c(unk32 param1) override; - /* 4c */ virtual ~ActorRupee() override; + /* 2C */ virtual void vfunc_2c(unk32 param1) override; + /* 4C */ virtual ~ActorRupee() override; void func_ov017_020bf9c8(Actor *param1); @@ -121,7 +121,7 @@ class ActorProfileRupee : public ActorProfile { ActorProfileRupee(); - /* 0c */ virtual Actor *Create(); + /* 0C */ virtual Actor *Create(); static ActorProfileRupee *GetProfile(); }; diff --git a/include/Actor/ActorUnk_ov000_020a8bb0.hpp b/include/Actor/ActorUnk_ov000_020a8bb0.hpp index d1e02e3ce..18d60d2ac 100644 --- a/include/Actor/ActorUnk_ov000_020a8bb0.hpp +++ b/include/Actor/ActorUnk_ov000_020a8bb0.hpp @@ -9,24 +9,24 @@ class ActorUnk_vfunc_b0 { /* 00 */ unk32 mUnk_00; /* 04 */ unk32 mUnk_04; /* 08 */ unk32 mUnk_08; - /* 0c */ unk32 mUnk_0c; + /* 0C */ unk32 mUnk_0C; /* 10 */ unk32 mUnk_10; /* 14 */ unk16 mUnk_14; /* 16 */ unk16 mUnk_16; /* 18 */ unk32 mUnk_18; - /* 1c */ unk32 mUnk_1c; + /* 1C */ unk32 mUnk_1C; /* 20 */ unk8 mUnk_20; /* 21 */ unk8 mUnk_21; /* 22 */ unk8 mUnk_22; /* 23 */ unk8 mUnk_23; /* 24 */ void *mUnk_24; /* 28 */ unk32 mUnk_28; - /* 2c */ unk32 mUnk_2c; + /* 2C */ unk32 mUnk_2C; /* 30 */ unk16 mUnk_30; /* 32 */ unk16 mUnk_32; /* 34 */ Vec3p mUnk_34; /* 40 */ Vec3p mUnk_40; - /* 4c */ + /* 4C */ ActorUnk_vfunc_b0(); }; @@ -36,8 +36,8 @@ class ActorUnk_ov000_020a8bb0_94 { /* 00 */ unk32 mUnk_00; /* 04 */ unk32 mUnk_04; /* 08 */ unk16 mUnk_08; - /* 0a */ unk16 mUnk_0a; - /* 0c */ unk32 mUnk_0c; + /* 0A */ unk16 mUnk_0A; + /* 0C */ unk32 mUnk_0C; ActorUnk_ov000_020a8bb0_94(); ~ActorUnk_ov000_020a8bb0_94(); @@ -48,8 +48,8 @@ class ActorUnk_ov000_020a8bb0_a4 { /* 00 */ UnkSystem4 *mUnk_00; /* 08 */ unk16 mUnk_04; /* 08 */ unk16 mUnk_06; - /* 0a */ unk32 mUnk_08; - /* 0c */ + /* 0A */ unk32 mUnk_08; + /* 0C */ void func_01ffc6d4(u16 param1, Vec3p *pos); @@ -66,73 +66,73 @@ class ActorUnk_ov000_020a8bb0 : public Actor { public: /* 000 (base) */ /* 094 */ ActorUnk_ov000_020a8bb0_94 mUnk_094; - /* 0a4 */ ActorUnk_ov000_020a8bb0_a4 mUnk_0a4; - /* 0b0 */ u16 mUnk_0b0; - /* 0b4 */ unk32 mUnk_0b4; - /* 0b8 */ unk32 mUnk_0b8; - /* 0bc */ ActorRef mUnk_0bc; - /* 0c0 */ Vec3p mUnk_0c0; - /* 0cc */ unk16 mUnk_0cc; - /* 0cc */ unk16 mUnk_0ce; - /* 0d0 */ unk32 mUnk_0d0; - /* 0d4 */ unk32 mUnk_0d4; - /* 0d8 */ unk16 mUnk_0d8; - /* 0d8 */ unk16 mUnk_0da; - /* 0dc */ unk16 mUnk_0dc; - /* 0dc */ unk16 mUnk_0de; - /* 0e0 */ unk16 mUnk_0e0; - /* 0e0 */ unk16 mUnk_0e2; - /* 0e4 */ unk32 mUnk_0e4; - /* 0e8 */ unk16 mUnk_0e8; - /* 0e8 */ unk16 mUnk_0ea; - /* 0ec */ ActorUnk_ov000_020a8bb0_ec mUnk_0ec; - /* 0f0 */ unk32 mUnk_0f0; - /* 0f4 */ unk32 mUnk_0f4; - /* 0f8 */ unk32 mUnk_0f8; - /* 0fc */ unk32 mUnk_0fc; + /* 0A4 */ ActorUnk_ov000_020a8bb0_a4 mUnk_0A4; + /* 0B0 */ u16 mUnk_0B0; + /* 0B4 */ unk32 mUnk_0B4; + /* 0B8 */ unk32 mUnk_0B8; + /* 0BC */ ActorRef mUnk_0BC; + /* 0C0 */ Vec3p mUnk_0C0; + /* 0CC */ unk16 mUnk_0CC; + /* 0CC */ unk16 mUnk_0CE; + /* 0D0 */ unk32 mUnk_0D0; + /* 0D4 */ unk32 mUnk_0D4; + /* 0D8 */ unk16 mUnk_0D8; + /* 0D8 */ unk16 mUnk_0DA; + /* 0DC */ unk16 mUnk_0DC; + /* 0DC */ unk16 mUnk_0DE; + /* 0E0 */ unk16 mUnk_0E0; + /* 0E0 */ unk16 mUnk_0E2; + /* 0E4 */ unk32 mUnk_0E4; + /* 0E8 */ unk16 mUnk_0E8; + /* 0E8 */ unk16 mUnk_0EA; + /* 0EC */ ActorUnk_ov000_020a8bb0_ec mUnk_0EC; + /* 0F0 */ unk32 mUnk_0F0; + /* 0F4 */ unk32 mUnk_0F4; + /* 0F8 */ unk32 mUnk_0F8; + /* 0FC */ unk32 mUnk_0FC; /* 100 */ unk32 mUnk_100; /* 104 */ unk32 mUnk_104; /* 108 */ unk32 mUnk_108; - /* 10c */ unk32 mUnk_10c; + /* 10C */ unk32 mUnk_10C; /* 110 */ unk32 mUnk_110; /* 114 */ unk32 mUnk_114; /* 118 */ unk32 mUnk_118; - /* 11c */ unk32 mUnk_11c; + /* 11C */ unk32 mUnk_11C; /* 14 */ virtual void vfunc_14() override; /* 18 */ virtual bool vfunc_18(unk32 param1) override; - /* 1c */ virtual void vfunc_1c() override; + /* 1C */ virtual void vfunc_1c() override; /* 20 */ virtual void vfunc_20() override; /* 24 */ virtual void vfunc_24() override; - /* 2c */ virtual void vfunc_2c(unk32 param1) override; - /* 4c */ virtual ~ActorUnk_ov000_020a8bb0(); + /* 2C */ virtual void vfunc_2c(unk32 param1) override; + /* 4C */ virtual ~ActorUnk_ov000_020a8bb0(); /* 54 */ virtual void vfunc_54(unk32 param1); /* 54 */ virtual void vfunc_58(unk32 param1) = 0; - /* 5c */ virtual void vfunc_5c(); + /* 5C */ virtual void vfunc_5c(); /* 60 */ virtual void vfunc_60(); /* 64 */ virtual bool vfunc_64(); /* 68 */ virtual void vfunc_68(); - /* 6c */ virtual void vfunc_6c(); + /* 6C */ virtual void vfunc_6c(); /* 70 */ virtual void vfunc_70(); /* 74 */ virtual void vfunc_74(); /* 78 */ virtual void vfunc_78(); - /* 7c */ virtual unk32 vfunc_7c(); + /* 7C */ virtual unk32 vfunc_7c(); /* 80 */ virtual unk32 vfunc_80(); /* 84 */ virtual unk32 vfunc_84(); /* 88 */ virtual unk32 vfunc_88(); - /* 8c */ virtual unk32 vfunc_8c(); + /* 8C */ virtual unk32 vfunc_8c(); /* 90 */ virtual unk32 vfunc_90(); /* 94 */ virtual void vfunc_94(); /* 98 */ virtual void vfunc_98(); - /* 9c */ virtual void vfunc_9c(); - /* a0 */ virtual unk32 vfunc_a0(); - /* a4 */ virtual void vfunc_a4(); - /* a8 */ virtual unk32 vfunc_a8(); - /* ac */ virtual void vfunc_ac(); - /* b0 */ virtual void vfunc_b0(); - /* b4 */ virtual void vfunc_b4(); - /* b8 */ virtual void vfunc_b8(); - /* bc */ + /* 9C */ virtual void vfunc_9c(); + /* A0 */ virtual unk32 vfunc_a0(); + /* A4 */ virtual void vfunc_a4(); + /* A8 */ virtual unk32 vfunc_a8(); + /* AC */ virtual void vfunc_ac(); + /* B0 */ virtual void vfunc_b0(); + /* B4 */ virtual void vfunc_b4(); + /* B8 */ virtual void vfunc_b8(); + /* BC */ void func_ov000_020a8ae0(q20 param1); ActorUnk_ov000_020a8bb0(UnkSystem4 *param1, unk32 param2); diff --git a/include/Actor/Course/ActorSCCN.hpp b/include/Actor/Course/ActorSCCN.hpp index 60a24ef85..47d417d32 100644 --- a/include/Actor/Course/ActorSCCN.hpp +++ b/include/Actor/Course/ActorSCCN.hpp @@ -46,18 +46,18 @@ class ActorSCCN : public Actor { /* 94 */ unk32 mUnk_94; /* 98 */ unk8 mUnk_98; /* 99 */ unk8 mUnk_99; // gives knockback if not -1 - /* 9a */ unk8 mUnk_9a; - /* 9b */ SCCNType mUnk_9b : 8; - /* 9c */ unk32 mUnk_9c; - /* a0 */ q20 mUnk_a0; - /* a4 */ q20 mUnk_a4; - /* a8 */ q20 mUnk_a8; - /* ac */ q20 mUnk_ac; - /* b0 */ q20 mUnk_b0; - /* b4 */ q20 mUnk_b4; - /* b8 */ unk32 mUnk_b8; - /* bc */ unk32 mUnk_bc; - /* c0 */ unk32 mUnk_c0; - /* c4 */ unk32 mUnk_c4; - /* c8 */ + /* 9A */ unk8 mUnk_9A; + /* 9B */ SCCNType mUnk_9B : 8; + /* 9C */ unk32 mUnk_9C; + /* A0 */ q20 mUnk_A0; + /* A4 */ q20 mUnk_A4; + /* A8 */ q20 mUnk_A8; + /* AC */ q20 mUnk_AC; + /* B0 */ q20 mUnk_B0; + /* B4 */ q20 mUnk_B4; + /* B8 */ unk32 mUnk_B8; + /* BC */ unk32 mUnk_BC; + /* C0 */ unk32 mUnk_C0; + /* C4 */ unk32 mUnk_C4; + /* C8 */ }; diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index f40a08125..b19bd66e9 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -12,7 +12,7 @@ struct UnkStruct_ov000_020afc48 { /* 02 */ unk16 mUnk_02; /* 04 */ unk32 mUnk_04; /* 08 */ unk32 mUnk_08; - /* 0c */ unk32 mUnk_0c; + /* 0C */ unk32 mUnk_0C; /* 10 */ char mUnk_10[16]; /* 20 */ }; @@ -26,11 +26,11 @@ class UnkStruct_ItemManager_20_14 { /* 00 */ virtual void vfunc_00(); //! TODO: name symbol func_ov000_020667d8 /* 04 */ virtual void vfunc_04(); //! TODO: name symbol func_ov000_020667f4 /* 08 */ virtual void vfunc_08(); //! TODO: name symbol func_ov000_020673c8 - /* 0c */ virtual void vfunc_0c(); //! TODO: name symbol func_ov000_02067434 + /* 0C */ virtual void vfunc_0c(); //! TODO: name symbol func_ov000_02067434 /* 10 */ virtual void vfunc_10(); //! TODO: name symbol func_ov000_02067474 /* 14 */ virtual void vfunc_14(); //! TODO: name symbol func_ov000_02066dfc /* 18 */ virtual void vfunc_18(); //! TODO: name symbol func_ov000_020669d8 - /* 1c */ virtual void vfunc_1c(); //! TODO: name symbol func_ov000_02067234 + /* 1C */ virtual void vfunc_1c(); //! TODO: name symbol func_ov000_02067234 /* 20 */ virtual void vfunc_20(); //! TODO: name symbol func_ov000_0206723c /* 24 */ virtual ~UnkStruct_ItemManager_20_14(); //! TODO: name symbols func_ov000_020672ac, func_ov000_020672f4 @@ -44,7 +44,7 @@ class UnkStruct_ItemManager_20 { /* 00 */ unk32 mUnk_00; /* 04 */ unk32 mUnk_04; /* 08 */ unk32 mUnk_08; - /* 0c */ unk32 mUnk_0c; + /* 0C */ unk32 mUnk_0C; /* 10 */ unk32 mUnk_10; /* 14 */ UnkStruct_ItemManager_20_14 mUnk_14; @@ -65,10 +65,10 @@ class ItemManager : public SysObject { /* 17 */ u8 mKeyAmount; // number of small keys /* 18 */ UpgradeCapacity mQuiverCapacity; /* 19 */ UpgradeCapacity mBombBagCapacity; - /* 1a */ u8 mArrowAmount; - /* 1b */ u8 mBombAmount; - /* 1c */ u8 mPotions[MAX_POTIONS]; - /* 1e */ unk16 mUnk_1e; + /* 1A */ u8 mArrowAmount; + /* 1B */ u8 mBombAmount; + /* 1C */ u8 mPotions[MAX_POTIONS]; + /* 1E */ unk16 mUnk_1E; /* 20 */ UnkStruct_ItemManager_20 *mUnk_20; /* 24 */ unk8 mUnk_24; /* 24 */ unk8 mUnk_25; @@ -116,7 +116,7 @@ class ItemManager : public SysObject { class TreasureManager : public ItemManager { public: /* 28 */ unk8 mUnk_28[0x3C - 0x28]; - /* 3C */ s16 mUnk_3c[TreasureType_Max]; // treasures + /* 3C */ s16 mUnk_3C[TreasureType_Max]; // treasures /* 5C */ unk16 mUnk_5C; /* 5E */ unk16 mUnk_5E; /* 60 */ STRUCT_PAD(0x60, 0x7E); diff --git a/include/Player/PlayerGet.hpp b/include/Player/PlayerGet.hpp index cf11155db..c02f791af 100644 --- a/include/Player/PlayerGet.hpp +++ b/include/Player/PlayerGet.hpp @@ -17,7 +17,7 @@ struct UnkStruct_ov110_02185dc8 { class UnkStruct_ov110_021861ec { public: /* 00 */ Vec3p mUnk_00; - /* 0c */ + /* 0C */ ARM UnkStruct_ov110_021861ec(q20 x, q20 y, q20 z) { this->mUnk_00.x = x; @@ -40,7 +40,7 @@ class UnkStruct_PlayerGet_74 : public UnkStruct_PlayerGet_74_base { /* 00 (base) */ /* 04 */ unk32 mUnk_04; /* 08 */ unk32 mUnk_08; - /* 0c */ unk32 mUnk_0c; + /* 0C */ unk32 mUnk_0C; /* 10 */ unk32 mUnk_10; /* 14 */ UnkStruct_ov000_0208f820 *mUnk_14; @@ -86,7 +86,7 @@ class UnkStruct_PlayerGet_48 { /* 46 */ unk8 mUnk_46; /* 47 */ unk8 mUnk_47; /* 48 */ unk8 mUnk_48[0x5E - 0x48]; - /* 5e */ unk16 mUnk_5e; + /* 5E */ unk16 mUnk_5E; /* 60 */ unk8 mUnk_60; /* 61 */ unk8 mUnk_61; /* 62 */ unk8 mUnk_62; @@ -97,23 +97,23 @@ class PlayerGet : public UnkStruct_ov000_0208f820 { public: /* 000 (base) */ /* 048 */ UnkStruct_PlayerGet_48 *mUnk_48; - /* 04c */ unk32 *mUnk_4c; + /* 04C */ unk32 *mUnk_4C; /* 050 */ UnkStruct_PlayerGet_50 *mUnk_50; /* 054 */ UnkStruct_ov000_0208f820_04 mUnk_54; /* 064 */ UnkStruct_PlayerGet_64 mUnk_64; /* 068 */ unk32 mUnk_68; - /* 06c */ unk32 mUnk_6c; // scale + /* 06C */ unk32 mUnk_6C; // scale /* 070 */ unk16 mUnk_70; // angle/rotation /* 070 */ u8 mUnk_72; // probably bools /* 070 */ u8 mUnk_73; // probably bools /* 074 */ UnkStruct_PlayerGet_74 mUnk_74; - /* 08c */ UnkSystem4 mUnk_8c; - /* 0ec */ UnkStruct_PlayerGet_ec mUnk_ec[4]; - /* 0fc */ void *mUnk_fc; + /* 08C */ UnkSystem4 mUnk_8C; + /* 0EC */ UnkStruct_PlayerGet_ec mUnk_EC[4]; + /* 0FC */ void *mUnk_FC; /* 100 */ /* 04 */ virtual ~PlayerGet() override; - /* 0c */ virtual void vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) override; + /* 0C */ virtual void vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) override; /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; /* 18 */ virtual void vfunc_18(unk32 param1, unk32 param2, unk32 param3) override; diff --git a/include/Unknown/UnkStruct_027e09bc.hpp b/include/Unknown/UnkStruct_027e09bc.hpp index 8e405be0e..216c0054f 100644 --- a/include/Unknown/UnkStruct_027e09bc.hpp +++ b/include/Unknown/UnkStruct_027e09bc.hpp @@ -13,7 +13,7 @@ class UnkStruct_027e09bc { /* 00 */ unk32 mUnk_00; /* 04 */ unk32 mUnk_04; /* 08 */ unk32 mUnk_08; - /* 0c */ UnkStruct_027e09bc_0c *mUnk_0c; + /* 0C */ UnkStruct_027e09bc_0c *mUnk_0C; }; extern UnkStruct_027e09bc *data_027e09bc; diff --git a/include/Unknown/UnkStruct_027e0cd8.hpp b/include/Unknown/UnkStruct_027e0cd8.hpp index a595f9ac9..aa879663c 100644 --- a/include/Unknown/UnkStruct_027e0cd8.hpp +++ b/include/Unknown/UnkStruct_027e0cd8.hpp @@ -11,74 +11,74 @@ class UnkStruct_027e0cd8_0c { /* 000 (vtable) */ /* 004 */ unk32 *mUnk_04; /* 008 */ unk32 *mUnk_08; - /* 00c */ unk32 mUnk_0c; + /* 00C */ unk32 mUnk_0C; /* 010 */ unk32 *mUnk_10; /* 014 */ unk32 *mUnk_14; /* 018 */ unk32 mUnk_18; - /* 01c */ unk32 *mUnk_1c; + /* 01C */ unk32 *mUnk_1C; /* 020 */ unk32 mUnk_20; /* 024 */ unk32 *mUnk_24; /* 028 */ unk32 mUnk_28; - /* 02c */ unk32 *mUnk_2c; + /* 02C */ unk32 *mUnk_2C; /* 030 */ unk32 mUnk_30; /* 034 */ unk32 *mUnk_34; /* 038 */ unk32 mUnk_38; - /* 03c */ unk32 mUnk_3c; + /* 03C */ unk32 mUnk_3C; /* 040 */ unk32 mUnk_40; /* 044 */ unk32 mUnk_44; /* 048 */ unk32 mUnk_48; - /* 04c */ unk32 mUnk_4c; + /* 04C */ unk32 mUnk_4C; /* 050 */ unk32 mUnk_50; /* 054 */ unk32 mUnk_54; /* 058 */ unk32 mUnk_58; - /* 05c */ unk32 mUnk_5c; + /* 05C */ unk32 mUnk_5C; /* 060 */ unk32 mUnk_60; /* 064 */ unk32 mUnk_64; /* 068 */ unk32 mUnk_68; - /* 06c */ unk32 mUnk_6c; + /* 06C */ unk32 mUnk_6C; /* 070 */ unk32 *mUnk_70; /* 074 */ unk32 *mUnk_74; /* 078 */ unk32 *mUnk_78; - /* 07c */ unk32 mUnk_7c; + /* 07C */ unk32 mUnk_7C; /* 080 */ unk32 mUnk_80; /* 084 */ unk32 mUnk_84; /* 088 */ unk32 *mUnk_88; - /* 08c */ unk32 *mUnk_8c; + /* 08C */ unk32 *mUnk_8C; /* 090 */ unk32 mUnk_90; /* 094 */ unk32 mUnk_94; /* 098 */ unk32 mUnk_98; - /* 09c */ unk32 mUnk_9c; - /* 0a0 */ unk32 mUnk_a0; - /* 0a4 */ unk32 mUnk_a4; - /* 0a8 */ unk32 mUnk_a8; - /* 0ac */ unk32 mUnk_ac; - /* 0b0 */ unk32 mUnk_b0; - /* 0b4 */ ZeldaObjectList *mUnk_b4; - /* 0b8 */ ZeldaObjectList *mUnk_b8; - /* 0bc */ ZeldaObjectList *mUnk_bc; - /* 0c0 */ ZeldaObjectList *mUnk_c0; - /* 0c4 */ ZeldaObjectList *mUnk_c4; - /* 0c8 */ ZeldaObjectList *mUnk_c8; - /* 0cc */ ZeldaObjectList *mUnk_cc; - /* 0d0 */ ZeldaObjectList *mUnk_d0; - /* 0d4 */ ZeldaObjectList *mUnk_d4; - /* 0d8 */ ZeldaObjectList *mUnk_d8; - /* 0dc */ ZeldaObjectList *mUnk_dc[8]; - /* 0fc */ STRUCT_PAD(0xFC, 0x128); + /* 09C */ unk32 mUnk_9C; + /* 0A0 */ unk32 mUnk_A0; + /* 0A4 */ unk32 mUnk_A4; + /* 0A8 */ unk32 mUnk_A8; + /* 0AC */ unk32 mUnk_AC; + /* 0B0 */ unk32 mUnk_B0; + /* 0B4 */ ZeldaObjectList *mUnk_B4; + /* 0B8 */ ZeldaObjectList *mUnk_B8; + /* 0BC */ ZeldaObjectList *mUnk_BC; + /* 0C0 */ ZeldaObjectList *mUnk_C0; + /* 0C4 */ ZeldaObjectList *mUnk_C4; + /* 0C8 */ ZeldaObjectList *mUnk_C8; + /* 0CC */ ZeldaObjectList *mUnk_CC; + /* 0D0 */ ZeldaObjectList *mUnk_D0; + /* 0D4 */ ZeldaObjectList *mUnk_D4; + /* 0D8 */ ZeldaObjectList *mUnk_D8; + /* 0DC */ ZeldaObjectList *mUnk_DC[8]; + /* 0FC */ STRUCT_PAD(0xFC, 0x128); /* 128 */ u16 mUnk_128; /* 00 */ virtual void vfunc_00(); /* 04 */ virtual void vfunc_04(); /* 08 */ virtual void vfunc_08(); - /* 0c */ virtual void vfunc_0c(); + /* 0C */ virtual void vfunc_0c(); /* 10 */ virtual void vfunc_10(); /* 14 */ virtual void vfunc_14(); /* 18 */ virtual void vfunc_18(); - /* 1c */ virtual void vfunc_1c(); + /* 1C */ virtual void vfunc_1c(); /* 20 */ virtual void vfunc_20(); /* 24 */ virtual void vfunc_24(); /* 28 */ virtual q20 vfunc_28(Vec3p *param1, unk32 param2, unk32 param3); - /* 2c */ virtual void vfunc_2c(); + /* 2C */ virtual void vfunc_2c(); q20 func_01ffedf4(Vec2b *pPos); unk32 func_ov000_02080180(void *param1); @@ -100,7 +100,7 @@ class UnkStruct_027e0cd8 { /* 00 */ unk32 mUnk_00; /* 04 */ unk32 *mUnk_04; /* 08 */ unk32 mUnk_08; - /* 0C */ UnkStruct_027e0cd8_0c *mUnk_0c; + /* 0C */ UnkStruct_027e0cd8_0c *mUnk_0C; /* 10 */ UnkStruct_027e0cd8_10 *mUnk_10; /* 14 */ STRUCT_PAD(0x14, 0x4C); /* 4C */ diff --git a/include/Unknown/UnkStruct_027e0ce0.hpp b/include/Unknown/UnkStruct_027e0ce0.hpp index 690713679..062046232 100644 --- a/include/Unknown/UnkStruct_027e0ce0.hpp +++ b/include/Unknown/UnkStruct_027e0ce0.hpp @@ -11,15 +11,15 @@ class UnkStruct_027e0ce0_34 { /* 00 */ unk32 mUnk_00; /* 04 */ unk32 mUnk_04; /* 08 */ unk32 mUnk_08; - /* 0c */ unk32 mUnk_0c; + /* 0C */ unk32 mUnk_0C; /* 10 */ unk32 mUnk_10; /* 14 */ unk32 mUnk_14; /* 18 */ unk32 mUnk_18; - /* 1c */ unk32 mUnk_1c; + /* 1C */ unk32 mUnk_1C; /* 20 */ unk32 mUnk_20; /* 24 */ unk32 mUnk_24; /* 28 */ unk32 mUnk_28; - /* 2c */ unk32 mUnk_2c; + /* 2C */ unk32 mUnk_2C; /* 30 */ void func_ov024_020d3d98(unk32 param1, unk32 param2); @@ -37,19 +37,19 @@ class UnkStruct_027e0ce0 { /* 03 */ unk8 mUnk_03; /* 04 */ unk32 *mUnk_04; /* 08 */ unk32 *mUnk_08; - /* 0c */ unk32 *mUnk_0c; // vtable + /* 0C */ unk32 *mUnk_0C; // vtable /* 10 */ unk32 *mUnk_10; /* 14 */ unk32 *mUnk_14; /* 18 */ unk32 *mUnk_18; - /* 1c */ unk32 *mUnk_1c; + /* 1C */ unk32 *mUnk_1C; /* 20 */ unk32 *mUnk_20; /* 24 */ unk32 mUnk_24; /* 28 */ ItemManager *mUnk_28; - /* 2c */ ItemManager *mUnk_2c; // same as above + /* 2C */ ItemManager *mUnk_2C; // same as above /* 30 */ unk32 *mUnk_30; // ? /* 34 */ UnkStruct_027e0ce0_34 *mUnk_34; /* 38 */ unk32 *mUnk_38; // pointer to data_027e0478 when on the train - /* 3c */ unk32 mUnk_3c; + /* 3C */ unk32 mUnk_3C; /* 40 */ unk32 *mUnk_40; // pointer to data_027e0478 when not on the train /* 44 */ diff --git a/include/Unknown/UnkStruct_ov000_0208f820.hpp b/include/Unknown/UnkStruct_ov000_0208f820.hpp index 508b0e3de..ae79265a9 100644 --- a/include/Unknown/UnkStruct_ov000_0208f820.hpp +++ b/include/Unknown/UnkStruct_ov000_0208f820.hpp @@ -10,16 +10,16 @@ class UnkStruct_ov000_0208f820_14 { public: /* 00 */ unk8 mUnk_00[0x6C]; - /* 6c */ unk32 mUnk_6c; + /* 6C */ unk32 mUnk_6C; /* 70 */ u16 mUnk_70; /* 72 */ unk16 mUnk_72; /* 74 */ unk32 mUnk_74; /* 78 */ unk32 mUnk_78; - /* 7c */ unk32 mUnk_7c; + /* 7C */ unk32 mUnk_7C; /* 80 */ unk32 mUnk_80; /* 84 */ unk32 mUnk_84; /* 88 */ unk32 mUnk_88; - /* 8c */ unk32 mUnk_8c; + /* 8C */ unk32 mUnk_8C; /* 90 */ }; @@ -37,7 +37,7 @@ class UnkStruct_ov000_0208f820_28_98 { public: /* 00 */ unk8 mUnk_00[0x38]; /* 38 */ UnkStruct_PlayerGet_64 mUnk_38; - /* 3c */ unk32 mUnk_3c; + /* 3C */ unk32 mUnk_3C; /* 40 */ u16 mUnk_40; void func_ov093_0216f76c(Vec3p *param1, unk32 param2); @@ -68,7 +68,7 @@ class UnkStruct_ov000_0208f820_2c { /* 00 */ unk32 mUnk_00; /* 04 */ unk32 mUnk_04; /* 08 */ unk32 mUnk_08; - /* 0c */ unk32 mUnk_0c; + /* 0C */ unk32 mUnk_0C; /* 10 */ unk32 mUnk_10; /* 14 */ unk16 mUnk_14; /* 16 */ unk16 mUnk_16; @@ -94,11 +94,11 @@ class UnkStruct_ov000_0208f820_30 { /* 00 */ unk32 mUnk_00; /* 04 */ unk32 mUnk_04; /* 08 */ unk32 mUnk_08; - /* 0c */ unk32 mUnk_0c; + /* 0C */ unk32 mUnk_0C; /* 10 */ UnkStruct_ov000_0208f820_30_10 *mUnk_10; /* 14 */ unk32 mUnk_14; /* 18 */ unk32 mUnk_18; - /* 1c */ unk32 mUnk_1c; + /* 1C */ unk32 mUnk_1C; /* 20 */ unk32 mUnk_20; /* 24 */ unk32 mUnk_24; /* 28 */ STRUCT_PAD(0x28, 0x68); @@ -122,9 +122,9 @@ class UnkStruct_PlayerGet_vfunc_0c_param1 { /* 00 */ unk32 mUnk_00; /* 04 */ unk32 mUnk_04; /* 08 */ unk32 mUnk_08; - /* 0c */ unk32 mUnk_0c; + /* 0C */ unk32 mUnk_0C; /* 10 */ Vec3p mUnk_10; - /* 1c */ ItemId mUnk_1c; + /* 1C */ ItemId mUnk_1C; }; class UnkStruct_ov000_0208f820_24 { @@ -150,7 +150,7 @@ class UnkStruct_ov000_0208f820_04 { /* 00 */ u8 mUnk_00[4]; /* 04 */ u8 mUnk_04[4]; /* 08 */ unk32 mUnk_08; - /* 0c */ ItemId mItemId; + /* 0C */ ItemId mItemId; /* 14 */ UnkStruct_ov000_0208f820_04(unk32 param1, unk32 param2, unk32 param3, ItemId itemId) { @@ -170,28 +170,28 @@ class UnkStruct_ov000_0208f820 { /* 14 */ UnkStruct_ov000_0208f820_14 *mUnk_14; /* 18 */ unk8 mUnk_18; /* 19 */ unk8 mUnk_19; - /* 1a */ unk8 mUnk_1a; - /* 1b */ unk8 mUnk_1b; - /* 1c */ unk32 mUnk_1c; + /* 1A */ unk8 mUnk_1A; + /* 1B */ unk8 mUnk_1B; + /* 1C */ unk32 mUnk_1C; /* 20 */ unk32 mUnk_20; /* 24 */ UnkStruct_ov000_0208f820_24 *mUnk_24; /* 28 */ UnkStruct_ov000_0208f820_28 *mUnk_28; - /* 2c */ UnkStruct_ov000_0208f820_2c *mUnk_2c; + /* 2C */ UnkStruct_ov000_0208f820_2c *mUnk_2C; /* 30 */ UnkStruct_ov000_0208f820_30 *mUnk_30; /* 34 */ Vec3p *mUnk_34; /* 38 */ Vec3p *mUnk_38; - /* 3c */ Vec3p *mUnk_3C; + /* 3C */ Vec3p *mUnk_3C; /* 40 */ UnkStruct_ov000_0208f820_40 *mUnk_40; /* 44 */ unk32 *mUnk_44; /* 48 */ /* 00 */ virtual void vfunc_00(); /* 04 */ virtual ~UnkStruct_ov000_0208f820(); - /* 0c */ virtual void vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) = 0; + /* 0C */ virtual void vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) = 0; /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) = 0; /* 14 */ virtual void vfunc_14(); /* 18 */ virtual void vfunc_18(unk32 param1, unk32 param2, unk32 param3); - /* 1c */ virtual bool vfunc_1c(Vec3p *param1); + /* 1C */ virtual bool vfunc_1c(Vec3p *param1); /* 20 */ UnkStruct_ov000_0208f820(); diff --git a/include/files.h b/include/files.h index cfc6d3688..da58e964b 100644 --- a/include/files.h +++ b/include/files.h @@ -12,8 +12,8 @@ typedef struct ZeldaObjectList { /* 00 */ FileType type; // always "ZOLB" /* 04 */ unk32 nSize; // file size? /* 08 */ unk16 unk_08; - /* 0a */ unk16 unk_0a; - /* 0c */ u16 nEntries; // number of entries - /* 0e */ unk16 unk_0e; + /* 0A */ unk16 unk_0a; + /* 0C */ u16 nEntries; // number of entries + /* 0E */ unk16 unk_0e; /* 10 */ u32 aIdList[]; // actor id or map object id } ZeldaObjectList; diff --git a/libs/nitro/include/nitro/Overlay.h b/libs/nitro/include/nitro/Overlay.h index f910d7489..362ea09f2 100644 --- a/libs/nitro/include/nitro/Overlay.h +++ b/libs/nitro/include/nitro/Overlay.h @@ -14,11 +14,11 @@ typedef struct Overlay { /* 00 */ unk32 mId; /* 04 */ void *mBaseAddress; /* 08 */ u32 mTextSize; - /* 0c */ s32 mBssSize; + /* 0C */ s32 mBssSize; /* 10 */ unk32 mCtorStart; /* 14 */ unk32 mCtorEnd; /* 18 */ unk32 mFileId; - /* 1c */ u32 mFileSize; + /* 1C */ u32 mFileSize; /* 20 */ } Overlay; diff --git a/libs/nitro/include/nitro/math.h b/libs/nitro/include/nitro/math.h index 4d1233efb..a1902e574 100644 --- a/libs/nitro/include/nitro/math.h +++ b/libs/nitro/include/nitro/math.h @@ -138,7 +138,7 @@ union Vec4p { /* 00 */ q20 x; /* 04 */ q20 y; /* 08 */ q20 z; - /* 0c */ q20 w; + /* 0C */ q20 w; /* 10 */ }; q20 coords[4]; @@ -173,7 +173,7 @@ struct Mat2p { struct Mat3p { /* 00 */ Vec3p xColumn; - /* 0c */ Vec3p yColumn; + /* 0C */ Vec3p yColumn; /* 18 */ Vec3p zColumn; /* 24 */ @@ -187,7 +187,7 @@ struct Mat3p { struct Mat4x3p { /* 00 */ Vec3p xColumn; - /* 0c */ Vec3p yColumn; + /* 0C */ Vec3p yColumn; /* 18 */ Vec3p zColumn; /* 24 */ Vec3p wColumn; /* 30 */ @@ -240,14 +240,14 @@ typedef struct Vec3p { /* 0 */ q20 x; /* 4 */ q20 y; /* 8 */ q20 z; - /* c */ + /* C */ } Vec3p; typedef struct Vec4p { /* 00 */ q20 x; /* 04 */ q20 y; /* 08 */ q20 z; - /* 0c */ q20 w; + /* 0C */ q20 w; /* 10 */ } Vec4p; @@ -259,14 +259,14 @@ typedef struct Mat2p { typedef struct Mat3p { /* 00 */ Vec3p xColumn; - /* 0c */ Vec3p yColumn; + /* 0C */ Vec3p yColumn; /* 18 */ Vec3p zColumn; /* 24 */ } Mat3p; typedef struct Mat4x3p { /* 00 */ Vec3p xColumn; - /* 0c */ Vec3p yColumn; + /* 0C */ Vec3p yColumn; /* 18 */ Vec3p zColumn; /* 24 */ Vec3p wColumn; /* 30 */ diff --git a/libs/nns/include/nns/g3d/g3d.h b/libs/nns/include/nns/g3d/g3d.h index f933c2290..2a9b8d853 100644 --- a/libs/nns/include/nns/g3d/g3d.h +++ b/libs/nns/include/nns/g3d/g3d.h @@ -10,7 +10,7 @@ typedef struct G3d_NameList_ { /* 04 */ u16 dummy2; /* 06 */ u16 ofsHeader; // offset to the G3d_NameList_Header /* 08 */ void *entry[1]; // variable size - /* 0c */ + /* 0C */ } G3d_NameList; typedef struct G3d_NameList_Header_ { @@ -45,8 +45,8 @@ typedef struct G3d_Animation_ { /* 10 */ struct G3d_Animation_ *next; // next animation in the list /* 14 */ u8 mUnk_14[0x5]; /* 19 */ u8 numElmnts; // number of elements in the elementBinds array - /* 1a */ u16 elementBinds[1]; // each bit corresponds to a bone/material and determines whether an animation exists for it - /* 1c */ + /* 1A */ u16 elementBinds[1]; // each bit corresponds to a bone/material and determines whether an animation exists for it + /* 1C */ } G3d_Animation; // Structure representing the NSBMD model file @@ -54,7 +54,7 @@ typedef struct G3d_Model_ { /* 00 */ u32 size; // size of the model in bytes /* 04 */ u32 offSbc; // offset of the SBC commands list /* 08 */ u32 offMat; // offset of the material list - /* 0c */ u32 offMesh; // offset of the mesh list + /* 0C */ u32 offMesh; // offset of the mesh list /* 10 */ u32 offInvBMtx; // offset of the InvBindMatrix list /* 14 */ u8 dummy1; /* 15 */ u8 scalingHandler; // Determines which of the G3d_gScaleHandlers to use for this model @@ -62,18 +62,18 @@ typedef struct G3d_Model_ { /* 17 */ u8 numBones; // number of nodes /* 18 */ u8 numMat; // number of materials /* 19 */ u8 numMesh; // number of meshes - /* 1a */ u8 dummy2[2]; - /* 1c */ q20 upScale; + /* 1A */ u8 dummy2[2]; + /* 1C */ q20 upScale; /* 20 */ q20 downScale; /* 24 */ u16 numVertex; // number of vertices /* 26 */ u16 numPolygon; // number of polygons /* 28 */ u16 numTriangle; // number of triangles - /* 2a */ u16 numQuad; // number of quads - /* 2c */ q4 boundingBoxMin[3]; // bounding box lower vertex + /* 2A */ u16 numQuad; // number of quads + /* 2C */ q4 boundingBoxMin[3]; // bounding box lower vertex /* 32 */ q4 boundingBoxMax[3]; // bounding box upper vertex /* 38 */ u8 dummy3[8]; /* 40 */ G3d_NameList boneList; // bone list - /* 4c */ + /* 4C */ } G3d_Model; static inline G3d_NameList *G3d_GetBoneList(const G3d_Model *mdl) { @@ -101,23 +101,23 @@ typedef struct G3d_RenderObject_ { /* 00 */ u32 flag; // G3d_RenderObjFlag /* 04 */ G3d_Model *model; /* 08 */ G3d_Animation *matAnim; // material animation - /* 0c */ void *mUnk_0c; + /* 0C */ void *mUnk_0C; /* 10 */ G3d_Animation *jntAnim; // joint animation /* 14 */ void *mUnk_14; /* 18 */ G3d_Animation *mUnk_18; - /* 1c */ void *mUnk_1c; + /* 1C */ void *mUnk_1C; /* 20 */ G3d_CallbackFunction callbackFunction; /* 24 */ u8 callbackIdx; // index of the callbackFunction in the callback array of G3d_RenderState /* 25 */ u8 mUnk_25; // related to callback /* 26 */ u16 dummy_; /* 28 */ G3d_CallbackFunction callbackInitFunc; // initializes the G3d_RenderState callback array - /* 2c */ void *modelRender; // pointer to the ModelRender that is rendering this model + /* 2C */ void *modelRender; // pointer to the ModelRender that is rendering this model /* 30 */ u8 *unkCommandsList; // if not null, this command list is used instead of the one in the model /* 34 */ G3d_BoneMtxStruct *cacheJntAnm; /* 38 */ void *cacheMatAnm; - /* 3c */ u32 matAnimBindMap[2]; + /* 3C */ u32 matAnimBindMap[2]; /* 44 */ u32 jntAnimBindMap[2]; - /* 4c */ u32 unkAnimBindMap[2]; + /* 4C */ u32 unkAnimBindMap[2]; /* 54 */ } G3d_RenderObject; @@ -132,28 +132,28 @@ typedef struct G3d_Material_ { /* 00 */ u32 mUnk_00; /* 04 */ u32 dif_amb; /* 08 */ u32 spe_emi; - /* 0c */ u32 polygon_attr; + /* 0C */ u32 polygon_attr; /* 10 */ u32 mUnk_10; /* 14 */ u32 teximage_params; /* 18 */ u32 mUnk_18; - /* 1c */ u16 pltt_base; - /* 1e */ u16 flag; + /* 1C */ u16 pltt_base; + /* 1E */ u16 flag; /* 20 */ u16 width; /* 22 */ u16 height; /* 24 */ u8 mUnk_24[0x8]; - /* 2c */ + /* 2C */ } G3d_Material; typedef struct G3d_MaterialAnimation_ { /* 00 */ u32 flag; /* 04 */ u32 dif_amb; /* 08 */ u32 spe_emi; - /* 0c */ u32 polygon_attr; + /* 0C */ u32 polygon_attr; /* 10 */ u32 teximage_params; /* 14 */ u32 pltt_base; /* 18 */ u8 mUnk_18[0x14]; - /* 2c */ u16 width; - /* 2e */ u16 height; + /* 2C */ u16 width; + /* 2E */ u16 height; /* 30 */ u8 mUnk_30[0x8]; /* 38 */ } G3d_MaterialAnimation; diff --git a/libs/nns/include/nns/g3d/sbc.h b/libs/nns/include/nns/g3d/sbc.h index d1259a92f..413914098 100644 --- a/libs/nns/include/nns/g3d/sbc.h +++ b/libs/nns/include/nns/g3d/sbc.h @@ -35,27 +35,27 @@ typedef struct G3d_RenderState_ { /* 00 */ u8 *currentCmd; // current command being processed /* 04 */ G3d_RenderObject *renderObj; // current render object being processed /* 08 */ u32 flag; // G3d_RenderStateFlag - /* 0c */ G3d_CallbackFunction callbackFuncs[32]; // callback function for each SBC command - /* 8c */ u8 callbackSegment[32]; // determines at which segment of the SBC command to invoke the callback - /* ac */ u8 currentBoneId; - /* ad */ u8 currentMaterialId; - /* ae */ u8 currentBoneMtxId; - /* af */ u8 dummy; - /* b0 */ G3d_MaterialAnimation *matAnim; - /* b4 */ void *mUnk_19; - /* b8 */ u8 *visibilityPtr; // points to isVisible (0x187) - /* bc */ u32 mUnk_bc[2]; - /* c4 */ u32 mUnk_c4[2]; - /* cc */ u32 mUnk_cc[2]; - /* d4 */ G3d_NameList *boneList; - /* d8 */ const G3d_Material_List *materialList; - /* dc */ G3d_NameList *meshList; - /* e0 */ q20 upScale; - /* e4 */ q20 downScale; - /* e8 */ void *jntScalingHandler; // scaling handler - /* ec */ void *jntSRTHandler; // SRT transform handler - /* f0 */ void *textureHandler; // texture matrix handler - /* f4 */ u8 mUnk_f4[0x93]; + /* 0C */ G3d_CallbackFunction callbackFuncs[32]; // callback function for each SBC command + /* 8C */ u8 callbackSegment[32]; // determines at which segment of the SBC command to invoke the callback + /* AC */ u8 currentBoneId; + /* AD */ u8 currentMaterialId; + /* AE */ u8 currentBoneMtxId; + /* AF */ u8 dummy; + /* B0 */ G3d_MaterialAnimation *matAnim; + /* B4 */ void *mUnk_19; + /* B8 */ u8 *visibilityPtr; // points to isVisible (0x187) + /* BC */ u32 mUnk_BC[2]; + /* C4 */ u32 mUnk_C4[2]; + /* CC */ u32 mUnk_CC[2]; + /* D4 */ G3d_NameList *boneList; + /* D8 */ const G3d_Material_List *materialList; + /* DC */ G3d_NameList *meshList; + /* E0 */ q20 upScale; + /* E4 */ q20 downScale; + /* E8 */ void *jntScalingHandler; // scaling handler + /* EC */ void *jntSRTHandler; // SRT transform handler + /* F0 */ void *textureHandler; // texture matrix handler + /* F4 */ u8 mUnk_F4[0x93]; /* 187 */ u8 isVisible; /* 188 */ } G3d_RenderState; diff --git a/libs/nns/src/g3d/sbc.c b/libs/nns/src/g3d/sbc.c index f52b4bcb2..5a6c7fbe6 100644 --- a/libs/nns/src/g3d/sbc.c +++ b/libs/nns/src/g3d/sbc.c @@ -4,33 +4,33 @@ typedef struct UnkStruct_027e037c_ { /* 004 */ unk32 mUnk_004; /* 008 */ Mat4p mUnk_008; /* 048 */ unk32 mUnk_048; - /* 04c */ Mat4x3p mUnk_04c; - /* 07c */ unk32 mUnk_07c; + /* 04C */ Mat4x3p mUnk_04C; + /* 07C */ unk32 mUnk_07C; /* 080 */ unk32 mUnk_080; /* 084 */ unk32 mUnk_084; /* 088 */ unk32 mUnk_088; - /* 08c */ unk32 mUnk_08c; + /* 08C */ unk32 mUnk_08C; /* 090 */ unk32 mUnk_090; /* 094 */ unk32 mUnk_094; /* 098 */ unk32 mUnk_098; - /* 09c */ unk32 mUnk_09c; - /* 0a0 */ unk32 mUnk_0a0; - /* 0a4 */ unk32 mUnk_0a4; - /* 0a8 */ unk32 mUnk_0a8; - /* 0ac */ unk32 mUnk_0ac; - /* 0b0 */ unk32 mUnk_0b0; - /* 0b4 */ unk32 mUnk_0b4; - /* 0b8 */ unk32 mUnk_0b8; - /* 0bc */ Mat3p rotation; - /* 0e0 */ Vec3p translation; - /* 0ec */ Vec3p scale; - /* 0f8 */ unk32 mUnk_0f8; - /* 0fc */ u32 flags; + /* 09C */ unk32 mUnk_09C; + /* 0A0 */ unk32 mUnk_0A0; + /* 0A4 */ unk32 mUnk_0A4; + /* 0A8 */ unk32 mUnk_0A8; + /* 0AC */ unk32 mUnk_0AC; + /* 0B0 */ unk32 mUnk_0B0; + /* 0B4 */ unk32 mUnk_0B4; + /* 0B8 */ unk32 mUnk_0B8; + /* 0BC */ Mat3p rotation; + /* 0E0 */ Vec3p translation; + /* 0EC */ Vec3p scale; + /* 0F8 */ unk32 mUnk_0F8; + /* 0FC */ u32 flags; /* 100 */ Mat4x3p mUnk_100; /* 130 */ Mat4x3p mUnk_130; /* 160 */ Mat4x3p mUnk_160; /* 190 */ Mat4x3p mUnk_190; - /* 1c0 */ + /* 1C0 */ } UnkStruct_027e037c; extern UnkStruct_027e037c data_027e0208; @@ -71,7 +71,7 @@ void G3d_RenderSBCCommands(G3d_RenderState *renderState) { void G3d_InitRenderState(G3d_RenderState *renderState, G3d_RenderObject *renderObj) { _MI_CpuFill(0, (short *) renderState, sizeof(*renderState)); - renderState->mUnk_c4[0] = 1; + renderState->mUnk_C4[0] = 1; renderState->flag = G3D_RENDERST_FLAG_BONE_VISIBLE; if (renderObj->unkCommandsList) { @@ -262,7 +262,7 @@ void G3d_SBCRender_007(G3d_RenderState *renderState, u32 opCode) { Mat4x3p_CopyToMat4p(mtx1, &mtx2); Mat4p_Multiply(¤tMtx, &mtx2, ¤tMtx); } else if (data_027e0208.flags & 2) { - const Mat4x3p *mtx1 = &data_027e0208.mUnk_04c; + const Mat4x3p *mtx1 = &data_027e0208.mUnk_04C; Mat4p mtx2; Mat4x3p_CopyToMat4p(mtx1, &mtx2); @@ -400,7 +400,7 @@ void G3d_SBCRender_008(G3d_RenderState *renderState, u32 opCode) { Mat4x3p_CopyToMat4p(mtx1, &mtx2); Mat4p_Multiply(¤tMtx, &mtx2, ¤tMtx); } else if (data_027e0208.flags & 2) { - const Mat4x3p *mtx1 = &data_027e0208.mUnk_04c; + const Mat4x3p *mtx1 = &data_027e0208.mUnk_04C; Mat4p mtx2; Mat4x3p_CopyToMat4p(mtx1, &mtx2); @@ -493,11 +493,11 @@ void G3d_SBCRender_SKN(G3d_RenderState *renderState, u32) { for (i = 0; i < numTerms; i++) { u32 jntIndex = *(termPtr + 1); - u32 unk = G3d_FindInBitArray(&renderState->mUnk_cc[0], jntIndex); + u32 unk = G3d_FindInBitArray(&renderState->mUnk_CC[0], jntIndex); mat4x = &data_02046c80.mUnk_1400[jntIndex].mtx1; if (!unk) { - G3d_SetBitArray(&renderState->mUnk_cc[0], jntIndex); + G3d_SetBitArray(&renderState->mUnk_CC[0], jntIndex); GFX_FIFO_MTX_RESTORE = (*termPtr); GFX_FIFO_MTX_MODE = 1; // Position @@ -749,11 +749,11 @@ void G3d_SBCRender_00C(G3d_RenderState *renderState, u32) { G3d_SetMtxMode_inline(3); // MTX_MODE = Texture if (data_027e0208.flags & 1) { - G3d_MtxMult33_inline((const Mat3p *) &data_027e0208.mUnk_04c); // MTX_MULT_3x3 + G3d_MtxMult33_inline((const Mat3p *) &data_027e0208.mUnk_04C); // MTX_MULT_3x3 G3d_MtxMult33_inline(&gGeomMatrix); // MTX_MULT_3x3 G3d_MtxMult33_inline(&m); // MTX_MULT_3x3 } else if (data_027e0208.flags & 2) { - G3d_MtxMult33_inline((const Mat3p *) &data_027e0208.mUnk_04c); // MTX_MULT_3x3 + G3d_MtxMult33_inline((const Mat3p *) &data_027e0208.mUnk_04C); // MTX_MULT_3x3 G3d_MtxMult33_inline(&m); // MTX_MULT_3x3 } else { G3d_MtxMult33_inline(&m); // MTX_MULT_3x3 diff --git a/src/000_Second/Actor/Actor.cpp b/src/000_Second/Actor/Actor.cpp index 1ddc0ae14..55b7327df 100644 --- a/src/000_Second/Actor/Actor.cpp +++ b/src/000_Second/Actor/Actor.cpp @@ -7,24 +7,24 @@ ARM Actor::Actor() { this->mVel.x = 0; this->mVel.y = 0; this->mVel.z = 0; - this->mUnk_2c = 0xCD; + this->mUnk_2C = 0xCD; this->mUnk_38 = 0; - this->mUnk_3c = 0; + this->mUnk_3C = 0; this->mUnk_40 = 0; this->mUnk_48 = 4; - this->mUnk_4c = -1; + this->mUnk_4C = -1; this->mUnk_50 = 0; this->mUnk_52 = 0; this->mUnk_54 = 0; this->ResetFlags(); this->mUnk_84 = 0; - this->mUnk_5c.func_ov000_020975f8(); + this->mUnk_5C.func_ov000_020975f8(); this->mRef.Reset(); this->mType = NULL; - _MI_CpuCopy(&data_ov000_020b539c_eur.mUnk_00, &this->mUnk_5c, sizeof(data_ov000_020b539c_eur.mUnk_00)); - this->mPos = this->mUnk_5c.mUnk_00; - this->mPrevPos = this->mUnk_5c.mUnk_00; - this->mAngle = this->mUnk_5c.mUnk_0c; + _MI_CpuCopy(&data_ov000_020b539c_eur.mUnk_00, &this->mUnk_5C, sizeof(data_ov000_020b539c_eur.mUnk_00)); + this->mPos = this->mUnk_5C.mUnk_00; + this->mPrevPos = this->mUnk_5C.mUnk_00; + this->mAngle = this->mUnk_5C.mUnk_0C; SET_FLAGS(this->mFlags, ActorFlag_Alive, ActorFlag_Visible, ActorFlag_Active, ActorFlag_14); this->mUnk_44 = 0xFF; this->mUnk_46 = 0; @@ -39,12 +39,12 @@ ARM void Actor::func_ov000_0209848c(ActorProfile *param1) { s16 unk_1c; Cylinder *temp_r3; - unk_1c = param1->mUnk_1c; + unk_1c = param1->mUnk_1C; temp_r3 = ¶m1->mUnk_04; this->mType = param1; this->mUnk_30 = this->mUnk_34 = temp_r3; - this->mUnk_4e = unk_1c; + this->mUnk_4E = unk_1c; } ARM bool Actor::vfunc_18(unk32 param1) { @@ -84,13 +84,13 @@ ARM void Actor::func_ov000_020984f0() { // non-matching ARM void Actor::vfunc_00(Vec3p *param1) { *param1 = mPos; - param1->y += mUnk_4e; + param1->y += mUnk_4E; // short sVar1; // int iVar2; // int iVar3; // param1->x = this->mPos.x; - // param1->y = this->mPos.y + this->mUnk_4e; + // param1->y = this->mPos.y + this->mUnk_4E; // param1->z = this->mPos.z; } @@ -99,11 +99,11 @@ ARM Vec3p *Actor::func_ov000_0209853c(unk32 param1) { } ARM bool Actor::vfunc_04() { - return this->mType->mUnk_1e & 1; + return this->mType->mUnk_1E & 1; } ARM unk16 Actor::vfunc_08() { - return this->mType->mUnk_1a; + return this->mType->mUnk_1A; } ARM unk8 Actor::vfunc_0c() { @@ -132,7 +132,7 @@ ARM unk32 Actor::vfunc_38(unk32 param1) { } // ??? - *(&this->mUnk_4a + var_r3) = 0; + *(&this->mUnk_4A + var_r3) = 0; break; default: break; @@ -163,6 +163,6 @@ ARM void Actor::func_ov000_0209862c(unk32 param1) { var_ip = 0; do { var_ip += 1; - (&this->mUnk_4a)[var_ip] = param1; + (&this->mUnk_4A)[var_ip] = param1; } while (var_ip < 2); } diff --git a/src/000_Second/Actor/ActorEventIcon.cpp b/src/000_Second/Actor/ActorEventIcon.cpp index f699715d9..48f087669 100644 --- a/src/000_Second/Actor/ActorEventIcon.cpp +++ b/src/000_Second/Actor/ActorEventIcon.cpp @@ -15,7 +15,7 @@ ARM ActorEventIcon::ActorEventIcon() { } ARM bool ActorEventIcon::vfunc_18(unk32 param1) { - this->mUnk_094.func_ov000_0206082c(0x5D, this->mUnk_6c); + this->mUnk_094.func_ov000_0206082c(0x5D, this->mUnk_6C); return true; } diff --git a/src/000_Second/Actor/ActorUnkEFIK.cpp b/src/000_Second/Actor/ActorUnkEFIK.cpp index 1b33e30e1..34d8beac2 100644 --- a/src/000_Second/Actor/ActorUnkEFIK.cpp +++ b/src/000_Second/Actor/ActorUnkEFIK.cpp @@ -47,7 +47,7 @@ ARM void ActorUnkEFIK::vfunc_20() { for (int i = 0; i < length; i++) { u8 j; u8 k; - UnkStruct_027e0cd8_0c *pUVar5 = data_027e0cd8->mUnk_0c; + UnkStruct_027e0cd8_0c *pUVar5 = data_027e0cd8->mUnk_0C; u8 bStack_3c[2]; bStack_3c[0] = 0; diff --git a/src/000_Second/Actor/ActorUnkSWOB.cpp b/src/000_Second/Actor/ActorUnkSWOB.cpp index 40a70ff80..fd7517130 100644 --- a/src/000_Second/Actor/ActorUnkSWOB.cpp +++ b/src/000_Second/Actor/ActorUnkSWOB.cpp @@ -22,9 +22,9 @@ ARM ActorUnkSWOB::ActorUnkSWOB() {} ARM bool ActorUnkSWOB::vfunc_18(unk32 param1) { this->mUnk_9E = this->mUnk_78; - this->mUnk_94 = this->mUnk_6e; + this->mUnk_94 = this->mUnk_6E; this->mUnk_98 = this->mUnk_70; - this->mUnk_A0 = this->mUnk_9E + this->mUnk_6c; + this->mUnk_A0 = this->mUnk_9E + this->mUnk_6C; this->mUnk_A2 = this->mUnk_75; this->mUnk_9C = this->mUnk_9E; @@ -38,9 +38,9 @@ ARM bool ActorUnkSWOB::vfunc_18(unk32 param1) { } ARM void ActorUnkSWOB::func_ov000_0209a9b4(unk32 param1) { - this->mUnk_4c = param1; + this->mUnk_4C = param1; - switch (this->mUnk_4c) { + switch (this->mUnk_4C) { case 0: this->func_ov000_02098a88(0, 0); break; @@ -63,7 +63,7 @@ ARM void ActorUnkSWOB::func_ov000_0209a9b4(unk32 param1) { // https://decomp.me/scratch/cUf0c ARM void ActorUnkSWOB::func_ov000_0209aa30(void) { - if (this->mUnk_4c == 1) { + if (this->mUnk_4C == 1) { return; } diff --git a/src/000_Second/Actor/ActorUnkSWTM.cpp b/src/000_Second/Actor/ActorUnkSWTM.cpp index 8cafda046..16ebb8fc9 100644 --- a/src/000_Second/Actor/ActorUnkSWTM.cpp +++ b/src/000_Second/Actor/ActorUnkSWTM.cpp @@ -23,7 +23,7 @@ ARM ActorUnkSWTM::ActorUnkSWTM() : mUnk_A8(0) {} ARM ActorUnkSWTM::~ActorUnkSWTM() { - if (this->mUnk_4c != 2 && this->func_ov000_02098a60(0) == 0) { + if (this->mUnk_4C != 2 && this->func_ov000_02098a60(0) == 0) { this->func_ov000_0209b184(); } } @@ -32,8 +32,8 @@ ARM ActorUnkSWTM::~ActorUnkSWTM() { ARM bool ActorUnkSWTM::vfunc_18(unk32 param1) { this->mUnk_9E = this->mUnk_78; this->mUnk_98 = this->mUnk_70; - this->mUnk_A4 = this->mUnk_6e * 30; - this->mUnk_A0 = this->mUnk_9E + this->mUnk_6c; + this->mUnk_A4 = this->mUnk_6E * 30; + this->mUnk_A0 = this->mUnk_9E + this->mUnk_6C; this->mUnk_A2 = this->mUnk_75; this->mUnk_9C = this->mUnk_9E; @@ -47,7 +47,7 @@ ARM bool ActorUnkSWTM::vfunc_18(unk32 param1) { } ARM void ActorUnkSWTM::vfunc_20(void) { - switch (this->mUnk_4c) { + switch (this->mUnk_4C) { case 0: if (!this->func_ov000_0209afe4()) { return; @@ -94,10 +94,10 @@ ARM void ActorUnkSWTM::vfunc_20(void) { ARM void ActorUnkSWTM::vfunc_24(void) {} ARM void ActorUnkSWTM::func_ov000_0209af54(unk32 param1) { - this->mUnk_4c = param1; + this->mUnk_4C = param1; this->mUnk_A8 = 0; - switch (this->mUnk_4c) { + switch (this->mUnk_4C) { case 0: this->func_ov000_02098a88(0, 0); break; @@ -167,7 +167,7 @@ ARM unk32 ActorUnkSWTM::func_ov000_0209b038(void) { break; } - for (int i = 0; i < this->mUnk_6c; i++) { + for (int i = 0; i < this->mUnk_6C; i++) { if (data_027e0cd8->func_ov000_02081e30(this->mUnk_9E + i, this->mUnk_A2) == 0) { return 0; } @@ -177,7 +177,7 @@ ARM unk32 ActorUnkSWTM::func_ov000_0209b038(void) { } ARM void ActorUnkSWTM::func_ov000_0209b160(void) { - if (this->mUnk_4c != 2) { + if (this->mUnk_4C != 2) { data_ov000_020b5214.func_ov000_0206db44(0xA3); } } diff --git a/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp b/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp index 410d5e41c..2c3144249 100644 --- a/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp +++ b/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp @@ -17,44 +17,44 @@ ARM void ActorUnk_ov000_020a8bb0::func_ov000_020a8ae0(q20 param1) { ARM ActorUnk_ov000_020a8bb0::ActorUnk_ov000_020a8bb0(UnkSystem4 *param1, unk32 param2) { unk32 uVar2; - this->mUnk_0b0 = 0; - this->mUnk_094.mUnk_0c = param2; - this->mUnk_0a4.mUnk_00 = param1; - this->mUnk_0a4.mUnk_04 = 0; - this->mUnk_0a4.mUnk_08 = 0; - this->mUnk_0b4 = -1; - this->mUnk_0b8 = 0; - this->mUnk_0bc.Reset(); - this->mUnk_0c0.x = 0; - this->mUnk_0c0.y = 0; - this->mUnk_0c0.z = 0; - this->mUnk_0cc = 0; - this->mUnk_0ce = 0; - this->mUnk_0d0 = 0; - this->mUnk_0d4 = 0; - this->mUnk_0d8 = 0; - this->mUnk_0da = 0; - this->mUnk_0dc = 0x2AAB; - this->mUnk_0de = 0xEAAB; - this->mUnk_0e0 = 0x1555; - this->mUnk_0e4 = 0; - this->mUnk_0e8 = 0; - this->mUnk_0ea = 0; - this->mUnk_0ec.func_ov024_020d6668(); + this->mUnk_0B0 = 0; + this->mUnk_094.mUnk_0C = param2; + this->mUnk_0A4.mUnk_00 = param1; + this->mUnk_0A4.mUnk_04 = 0; + this->mUnk_0A4.mUnk_08 = 0; + this->mUnk_0B4 = -1; + this->mUnk_0B8 = 0; + this->mUnk_0BC.Reset(); + this->mUnk_0C0.x = 0; + this->mUnk_0C0.y = 0; + this->mUnk_0C0.z = 0; + this->mUnk_0CC = 0; + this->mUnk_0CE = 0; + this->mUnk_0D0 = 0; + this->mUnk_0D4 = 0; + this->mUnk_0D8 = 0; + this->mUnk_0DA = 0; + this->mUnk_0DC = 0x2AAB; + this->mUnk_0DE = 0xEAAB; + this->mUnk_0E0 = 0x1555; + this->mUnk_0E4 = 0; + this->mUnk_0E8 = 0; + this->mUnk_0EA = 0; + this->mUnk_0EC.func_ov024_020d6668(); uVar2 = this->mUnk_34->size; this->mUnk_114 = -1; this->mUnk_118 = 0x1000; - this->mUnk_11c = 0x019A; + this->mUnk_11C = 0x019A; this->mUnk_104 = 0; this->mUnk_108 = uVar2; - this->mUnk_10c = 0; + this->mUnk_10C = 0; this->mUnk_110 = uVar2; this->mUnk_30 = (Cylinder *) &this->mUnk_104; - this->mUnk_4a = 5; + this->mUnk_4A = 5; this->mUnk_44 = 0x1F; this->mUnk_094.mUnk_08 = 3; this->mUnk_38 = &this->mUnk_094.mUnk_00; - this->mUnk_0b0 |= 8; + this->mUnk_0B0 |= 8; } ARM ActorUnk_ov000_020a8bb0::~ActorUnk_ov000_020a8bb0() {} @@ -64,9 +64,9 @@ ARM bool ActorUnk_ov000_020a8bb0::vfunc_18(unk32 param1) { UNSET_FLAG(this->mFlags, ActorFlag_Alive); } - if (this->mUnk_0b0 & 8) { - this->mUnk_0a4.mUnk_00->func_ov000_02057c38(6, 2); - this->mUnk_0a4.mUnk_00->func_ov000_0209a7b8(this, ActorUnk_ov000_020a8bb0::func_ov000_020a9804); + if (this->mUnk_0B0 & 8) { + this->mUnk_0A4.mUnk_00->func_ov000_02057c38(6, 2); + this->mUnk_0A4.mUnk_00->func_ov000_0209a7b8(this, ActorUnk_ov000_020a8bb0::func_ov000_020a9804); } this->vfunc_54(param1); @@ -90,18 +90,18 @@ ARM unk32 ActorUnk_ov000_020a8bb0::func_ov000_020a8dd0() { // non-matching ARM void ActorUnk_ov000_020a8bb0::func_ov000_020a8df0(ActorRef param1, unk32 param2) { if (!((u32) (((param2 + 8) - param2) / 2) < 2)) { - this->mUnk_0b0 |= 2; + this->mUnk_0B0 |= 2; } else { - this->mUnk_0b0 &= ~2; + this->mUnk_0B0 &= ~2; } if (this->mRef != param1) { this->vfunc_b4(); - *(u32 *) &this->mUnk_0bc = param1.Get32(); - this->mUnk_0c0.x = 0; - this->mUnk_0c0.y = 0; - this->mUnk_0c0.z = 0; - this->mUnk_0b0 |= 1; + *(u32 *) &this->mUnk_0BC = param1.Get32(); + this->mUnk_0C0.x = 0; + this->mUnk_0C0.y = 0; + this->mUnk_0C0.z = 0; + this->mUnk_0B0 |= 1; } } @@ -115,26 +115,26 @@ ARM void ActorUnk_ov000_020a8bb0::func_ov000_020a8e9c(Vec3p *param1) { q20 y = param1->y; q20 x = param1->z; - this->mUnk_0c0.x = x; - this->mUnk_0c0.y = y; - this->mUnk_0c0.z = x; - this->mUnk_0bc.Reset(); + this->mUnk_0C0.x = x; + this->mUnk_0C0.y = y; + this->mUnk_0C0.z = x; + this->mUnk_0BC.Reset(); } ARM void ActorUnk_ov000_020a8bb0::vfunc_b0() { if (data_027e09b8->func_01ffd420() == 0) { ActorUnk_vfunc_b0 auStack_60; auStack_60.mUnk_24 = this; - auStack_60.mUnk_0c = this->mUnk_7c; + auStack_60.mUnk_0C = this->mUnk_7C; auStack_60.mUnk_14 = 0; auStack_60.mUnk_18 = -1; - auStack_60.mUnk_1c = -1; + auStack_60.mUnk_1C = -1; auStack_60.mUnk_20 = 0; auStack_60.mUnk_21 = 0; auStack_60.mUnk_32 = 1; this->vfunc_00(&auStack_60.mUnk_34); - this->mUnk_0b4 = data_027e09b8->func_ov000_02073470(&auStack_60, 0); + this->mUnk_0B4 = data_027e09b8->func_ov000_02073470(&auStack_60, 0); } } @@ -151,7 +151,7 @@ ARM unk32 ActorUnk_ov000_020a8bb0::vfunc_90() { } ARM void ActorUnk_ov000_020a8bb0::vfunc_94() { - this->mUnk_0a4.mUnk_08 = 0xF6; + this->mUnk_0A4.mUnk_08 = 0xF6; } ARM void ActorUnk_ov000_020a8bb0::vfunc_60() { @@ -176,8 +176,8 @@ ARM void ActorUnk_ov000_020a8bb0::vfunc_68() { UNSET_FLAG(this->mFlags, ActorFlag_Interacting); this->func_ov000_020a9200(); this->vfunc_ac(); - this->mUnk_0b0 &= ~0x01; - this->mUnk_0b0 &= ~0x10; + this->mUnk_0B0 &= ~0x01; + this->mUnk_0B0 &= ~0x10; } ARM unk32 ActorUnk_ov000_020a8bb0::vfunc_7c() { @@ -196,9 +196,9 @@ ARM void ActorUnk_ov000_020a8bb0::func_ov000_020a91b8(Vec3p *param1, unk32 param this->func_ov000_020a8e9c(param1); if (param2 != 0) { - this->mUnk_0b0 |= 0x20; + this->mUnk_0B0 |= 0x20; } else { - this->mUnk_0b0 &= ~0x20; + this->mUnk_0B0 &= ~0x20; } this->vfunc_58(7); @@ -207,7 +207,7 @@ ARM void ActorUnk_ov000_020a8bb0::func_ov000_020a91b8(Vec3p *param1, unk32 param ARM void ActorUnk_ov000_020a8bb0::func_ov000_020a9200() {} ARM void ActorUnk_ov000_020a8bb0::vfunc_70() { - if (this->mUnk_4c != 5) { + if (this->mUnk_4C != 5) { this->vfunc_58(4); } } @@ -238,14 +238,14 @@ ARM void ActorUnk_ov000_020a8bb0::vfunc_20() {} // non-matching ARM void ActorUnk_ov000_020a8bb0::vfunc_24() { - if (data_027e09b8->func_ov000_020732dc(3) == 0 || !(this->mUnk_0b0 & 4)) { + if (data_027e09b8->func_ov000_020732dc(3) == 0 || !(this->mUnk_0B0 & 4)) { this->vfunc_20(); } - if (!(this->mUnk_0b0 & 0x200)) { - this->mUnk_0b0 &= ~0x100; + if (!(this->mUnk_0B0 & 0x200)) { + this->mUnk_0B0 &= ~0x100; } else { - this->mUnk_0b0 &= ~0x200; + this->mUnk_0B0 &= ~0x200; } } @@ -256,7 +256,7 @@ ARM void ActorUnk_ov000_020a8bb0::vfunc_2c(unk32 param1) { } this->vfunc_b8(); - this->mUnk_0a4.func_01ffc6d4(this->mAngle, &this->mPos); + this->mUnk_0A4.func_01ffc6d4(this->mAngle, &this->mPos); } ARM void ActorUnk_ov000_020a8bb0::vfunc_b8() { diff --git a/src/000_Second/Item/ItemManager.cpp b/src/000_Second/Item/ItemManager.cpp index c6b74b095..92c195047 100644 --- a/src/000_Second/Item/ItemManager.cpp +++ b/src/000_Second/Item/ItemManager.cpp @@ -271,7 +271,7 @@ ARM unk32 ItemManager::func_ov000_020a8aa4() { } ARM unk32 ItemManager::func_ov000_020a8ab8() { - return this->mUnk_20 != NULL ? this->mUnk_20->mUnk_0c : 0; + return this->mUnk_20 != NULL ? this->mUnk_20->mUnk_0C : 0; } ARM unk32 ItemManager::func_ov000_020a8acc() { diff --git a/src/000_Second/Item/TreasureManager.cpp b/src/000_Second/Item/TreasureManager.cpp index fdcb6c8ba..e7054f70f 100644 --- a/src/000_Second/Item/TreasureManager.cpp +++ b/src/000_Second/Item/TreasureManager.cpp @@ -9,13 +9,13 @@ ARM void TreasureManager::func_ov000_020a9b3c() {} ARM void TreasureManager::func_ov000_020a9b4c() {} ARM bool TreasureManager::func_ov000_020a9c4c(TreasureType type) { - return this->mUnk_3c[type] >= 0; + return this->mUnk_3C[type] >= 0; } // hasAnyTreasure ARM bool TreasureManager::func_ov000_020a9c64() { - for (s32 i = 0; i < ARRAY_LEN(this->mUnk_3c); i++) { - if (this->mUnk_3c[i] >= 0) { + for (s32 i = 0; i < ARRAY_LEN(this->mUnk_3C); i++) { + if (this->mUnk_3C[i] >= 0) { return true; } } @@ -25,8 +25,8 @@ ARM bool TreasureManager::func_ov000_020a9c64() { // getTreasureAmount ARM unk32 TreasureManager::func_ov000_020a9c90(TreasureType type) { - if (this->mUnk_3c[type] >= 0) { - return this->mUnk_3c[type]; + if (this->mUnk_3C[type] >= 0) { + return this->mUnk_3C[type]; } return 0; @@ -41,11 +41,11 @@ ARM bool TreasureManager::func_ov000_020a9ca4(TreasureType type) { ARM void TreasureManager::func_ov000_020a9cbc(TreasureType type, s32 amount) { s32 newAmount; - if (this->mUnk_3c[type] < 0) { - this->mUnk_3c[type] = 0; + if (this->mUnk_3C[type] < 0) { + this->mUnk_3C[type] = 0; } - newAmount = this->mUnk_3c[type] + amount; + newAmount = this->mUnk_3C[type] + amount; if (newAmount > MAX_TREASURE) { newAmount = MAX_TREASURE; @@ -53,7 +53,7 @@ ARM void TreasureManager::func_ov000_020a9cbc(TreasureType type, s32 amount) { newAmount = 0; } - this->mUnk_3c[type] = newAmount; + this->mUnk_3C[type] = newAmount; } ARM unk32 TreasureManager::func_ov000_020a9d78(unk32 param1) {} diff --git a/src/000_Second/MapObject/MapObject.cpp b/src/000_Second/MapObject/MapObject.cpp index ec28b6487..e0ed15acb 100644 --- a/src/000_Second/MapObject/MapObject.cpp +++ b/src/000_Second/MapObject/MapObject.cpp @@ -147,7 +147,7 @@ ARM void MapObject::func_ov000_0209d2c4(unk32 param1, unk32 param2) { } ARM void MapObject::func_ov000_0209d2f0(unk32 param1, unk32 param2, Vec2b *param3) { - UnkStruct_027e0cd8_0c *temp_r5 = data_027e0cd8->mUnk_0c; + UnkStruct_027e0cd8_0c *temp_r5 = data_027e0cd8->mUnk_0C; Vec2b sp0(0, 0); sp0.x = this->mUnk_3A.x; diff --git a/src/000_Second/MapObject/MapObjectMiniBlocks.cpp b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp index a2c1a5ee5..e974483ba 100644 --- a/src/000_Second/MapObject/MapObjectMiniBlocks.cpp +++ b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp @@ -39,7 +39,7 @@ ARM MapObjectMiniBlocks::MapObjectMiniBlocks() : ARM bool MapObjectMiniBlocks::vfunc_00(void) { GET_PROFILE(MapObjectProfileMiniBlocks) ->func_ov000_0209ccd8(this->mUnk_20.mUnk_00[1], data_ov000_020af574[this->mUnk_20.mUnk_00[1]]); - UnkStruct_027e0cd8_0c *pUnkStruct_027e0cd8_0c = data_027e0cd8->mUnk_0c; + UnkStruct_027e0cd8_0c *pUnkStruct_027e0cd8_0c = data_027e0cd8->mUnk_0C; u8 uVar6; if (this->mUnk_20.mUnk_00[1] != MiniBlocksVariant_BLKF) { diff --git a/src/001_SceneInit/Actor/ActorManager_001.cpp b/src/001_SceneInit/Actor/ActorManager_001.cpp index f0b63c4ee..b0a7e75b4 100644 --- a/src/001_SceneInit/Actor/ActorManager_001.cpp +++ b/src/001_SceneInit/Actor/ActorManager_001.cpp @@ -54,7 +54,7 @@ THUMB ActorManager::ActorManager() { this->mUnk_14.mUnk_04 = 0; this->mUnk_24 = 0; this->mUnk_28 = 0; - this->mUnk_2c = 0; + this->mUnk_2C = 0; this->mUnk_30 = 0; this->mUnk_34 = 0; } @@ -231,7 +231,7 @@ THUMB void ActorManager::func_ov001_020bb488() { case 0x01: case 0x03: case 0x06: - if (data_027e0cd8->mUnk_0c->mUnk_128 & 0x800) { + if (data_027e0cd8->mUnk_0C->mUnk_128 & 0x800) { func_ov031_020ea100(); } break; diff --git a/src/031_Land/Actor/ActorRupee.cpp b/src/031_Land/Actor/ActorRupee.cpp index 9d32e0d3e..dcf259a35 100644 --- a/src/031_Land/Actor/ActorRupee.cpp +++ b/src/031_Land/Actor/ActorRupee.cpp @@ -62,15 +62,15 @@ ARM ActorRupee::ActorRupee() : mUnk_94(0), mUnk_96(0), mUnk_98(0), - mUnk_9a(6), - mUnk_bc(0), - mUnk_c0(0), - mUnk_c4(this), - mUnk_e8(0), - mUnk_f0(0), - mUnk_f4(false) { - this->mUnk_a0 = 0x13100; - this->mUnk_40 = &this->mUnk_c4; + mUnk_9A(6), + mUnk_BC(0), + mUnk_C0(0), + mUnk_C4(this), + mUnk_E8(0), + mUnk_F0(0), + mUnk_F4(false) { + this->mUnk_A0 = 0x13100; + this->mUnk_40 = &this->mUnk_C4; } // https://decomp.me/scratch/wunA4 @@ -86,7 +86,7 @@ ARM bool ActorRupee::vfunc_18(unk32 param1) { return false; } - if (this->mUnk_6e == 0) { + if (this->mUnk_6E == 0) { this->func_ov031_020e9904(3); } else { this->func_ov031_020e9904(10); @@ -157,7 +157,7 @@ ARM bool ActorRupee::vfunc_18(unk32 param1) { } ARM void ActorRupee::func_ov031_020e8fec() { - switch (this->mUnk_6c) { + switch (this->mUnk_6C) { case RupeeId_Green: data_027e09a8->func_ov000_02071b30(0x73, &this->mPos, 0); break; @@ -176,14 +176,14 @@ ARM void ActorRupee::func_ov031_020e8fec() { ARM void ActorRupee::func_ov031_020e9068() { bool var_r4 = false; - switch (this->mUnk_6c) { + switch (this->mUnk_6C) { case RupeeId_BigGreen: case RupeeId_BigRed: case RupeeId_Gold: this->func_ov031_020e9904(5); break; default: { - ItemManager *pItemManager = data_027e0ce0->mUnk_2c; + ItemManager *pItemManager = data_027e0ce0->mUnk_2C; pItemManager->GiveRupees(func_02017158(), false, true); var_r4 = true; break; @@ -228,7 +228,7 @@ ARM void ActorRupee::func_ov031_020e91a8() { return; } - func_01fff05c(&sp0, data_027e0cd8->mUnk_0c, &this->mPos); + func_01fff05c(&sp0, data_027e0cd8->mUnk_0C, &this->mPos); if (((sp0 >> 5) & 0x03) == 2) { this->func_ov000_020984d0(); @@ -258,7 +258,7 @@ ARM void ActorRupee::func_ov031_020e9254() { return; } - func_01fff05c(&sp0, data_027e0cd8->mUnk_0c, &this->mPos); + func_01fff05c(&sp0, data_027e0cd8->mUnk_0C, &this->mPos); if (((sp0 >> 5) & 0x03) == 2) { this->func_ov000_020984d0(); @@ -287,10 +287,10 @@ ARM void ActorRupee::func_ov031_020e9310() { this->mUnk_50++; } - switch (this->mUnk_ec) { + switch (this->mUnk_EC) { case 0: - if (data_027e0cd8->mUnk_0c->vfunc_28(&this->mPos, 1, 0) < this->mPos.y) { - this->mUnk_ec++; + if (data_027e0cd8->mUnk_0C->vfunc_28(&this->mPos, 1, 0) < this->mPos.y) { + this->mUnk_EC++; } break; case 1: @@ -300,10 +300,10 @@ ARM void ActorRupee::func_ov031_020e9310() { this->mVel.y = 0; this->mVel.z = 0; - func_01fff05c(&sp0, data_027e0cd8->mUnk_0c, &this->mPos); + func_01fff05c(&sp0, data_027e0cd8->mUnk_0C, &this->mPos); if (((sp0 >> 5) & 3) != 2) { - this->mUnk_ec = 0; + this->mUnk_EC = 0; } else { this->func_ov000_020984d0(); } @@ -333,11 +333,11 @@ ARM void ActorRupee::func_ov031_020e9434() {} ARM void ActorRupee::func_ov031_020e9438() { func_ov017_020bf99c(); - this->mUnk_9c.func_ov000_02097bec(); + this->mUnk_9C.func_ov000_02097bec(); } ARM void ActorRupee::func_ov031_020e9450() { - this->func_ov017_020bf9c8(gpActorManager->func_01fff3b4(this->mUnk_bc)); + this->func_ov017_020bf9c8(gpActorManager->func_01fff3b4(this->mUnk_BC)); this->mPrevPos = this->mPos; Vec3p_Add(&this->mPos, &this->mVel, &this->mPos); @@ -348,7 +348,7 @@ ARM void ActorRupee::func_ov031_020e9450() { this->mVel.x = 0; this->mVel.y = 0; this->mVel.z = 0; - this->mUnk_a0 |= 0x1000; + this->mUnk_A0 |= 0x1000; this->func_ov031_020e9904(0); } @@ -358,9 +358,9 @@ ARM void ActorRupee::func_ov031_020e94d4() { this->mVel.x = 0; this->mVel.y = 0; this->mVel.z = 0; - this->mUnk_4a = 0; + this->mUnk_4A = 0; this->mUnk_44 = 0; - this->mUnk_9c.func_ov000_02097bec(); + this->mUnk_9C.func_ov000_02097bec(); UNSET_FLAG(this->mFlags, ActorFlag_Visible); } @@ -373,7 +373,7 @@ ARM void ActorRupee::func_ov031_020e951c() { itemId = ItemId_None; - switch (this->mUnk_6c) { + switch (this->mUnk_6C) { case RupeeId_Gold: itemId = ItemId_BigGoldRupee; break; @@ -411,7 +411,7 @@ ARM void ActorRupee::func_ov031_020e95b0() { ARM void ActorRupee::func_ov031_020e95c0() { Actor *pActor; - pActor = gpActorManager->func_01fff3b4(this->mUnk_c0); + pActor = gpActorManager->func_01fff3b4(this->mUnk_C0); if (pActor == NULL) { this->func_ov031_020e9904(0); return; @@ -429,7 +429,7 @@ ARM void ActorRupee::func_ov031_020e9610() { } ARM void ActorRupee::func_ov031_020e9624() { - this->mUnk_9a = 0x14; + this->mUnk_9A = 0x14; this->mUnk_98 = 0x00; } @@ -438,13 +438,13 @@ ARM void ActorRupee::func_ov031_020e9638() { this->mVel.y = 0; this->mVel.z = 0; UNSET_FLAG(this->mFlags, ActorFlag_Visible); - this->mUnk_c4.mUnk_04 = 0; + this->mUnk_C4.mUnk_04 = 0; - if (this->mUnk_6e == 2) { - this->mUnk_4a = 1; - data_027e0cec->func_ov000_0209ff8c(&this->mUnk_f0, 0xD00C, &this->mPos, 2); + if (this->mUnk_6E == 2) { + this->mUnk_4A = 1; + data_027e0cec->func_ov000_0209ff8c(&this->mUnk_F0, 0xD00C, &this->mPos, 2); } else { - this->mUnk_4a = 0; + this->mUnk_4A = 0; } this->mPos.y -= FLOAT_TO_Q20(1.2); @@ -468,7 +468,7 @@ ARM void ActorRupee::func_ov031_020e970c() { this->mVel.y = 0; this->mVel.z = 0; SET_FLAG(this->mFlags, ActorFlag_Visible); - this->mUnk_4a = 1; + this->mUnk_4A = 1; this->mUnk_52 = -1; this->mUnk_50 = 0; } @@ -485,7 +485,7 @@ ARM void ActorRupee::func_ov031_020e9740() { sp4 = 0; if (func_ov031_0210af50(sp0, &sp4) != 0) { - temp_r0 = data_027e0cd8->mUnk_0c; + temp_r0 = data_027e0cd8->mUnk_0C; temp_r2 = (sp4 - 0x800) + temp_r0->vfunc_28(&this->mPos, 0, 0); if (this->mPos.y != temp_r2) { @@ -496,8 +496,8 @@ ARM void ActorRupee::func_ov031_020e9740() { this->func_ov031_020e9904(0xC); } } else { - temp_r0 = data_027e0cd8->mUnk_0c; - this->mPos.y = temp_r0->vfunc_28(&this->mUnk_5c.mUnk_00, 0, 0); + temp_r0 = data_027e0cd8->mUnk_0C; + this->mPos.y = temp_r0->vfunc_28(&this->mUnk_5C.mUnk_00, 0, 0); this->func_ov031_020e9904(0xC); } @@ -511,11 +511,11 @@ ARM void ActorRupee::func_ov031_020e9838() { u16 sp2; func_01ffedac(&sp2, &this->mPos); - this->mUnk_c4.mUnk_04 = 1; + this->mUnk_C4.mUnk_04 = 1; func_ov031_0210b0e4(sp2, 0); func_ov031_0210acd4(sp2); func_ov031_0210acd4(sp2); - data_027e0cec->func_ov000_020a0110(&this->mUnk_f0); + data_027e0cec->func_ov000_020a0110(&this->mUnk_F0); } // non-matching @@ -537,17 +537,17 @@ extern UnkStruct_ov031_02113520 data_ov031_02113520[13]; // non-matching ARM void ActorRupee::func_ov031_020e9904(unk32 param1) { - this->mUnk_4c = param1; + this->mUnk_4C = param1; this->mUnk_52 = -1; this->mUnk_50 = 0; - this->mUnk_ec = 0; - u32 uVar1 = data_ov031_02113520[this->mUnk_4c].mUnk_04; + this->mUnk_EC = 0; + u32 uVar1 = data_ov031_02113520[this->mUnk_4C].mUnk_04; UnkCallback_ov031_02113520 pcVar2; if (!(uVar1 & 1)) { - pcVar2 = data_ov031_02113520[this->mUnk_4c].mUnk_00; + pcVar2 = data_ov031_02113520[this->mUnk_4C].mUnk_00; } else { - pcVar2 = (UnkCallback_ov031_02113520) (((u32) this + uVar1 >> 1) + &data_ov031_02113520[this->mUnk_4c]); + pcVar2 = (UnkCallback_ov031_02113520) (((u32) this + uVar1 >> 1) + &data_ov031_02113520[this->mUnk_4C]); } pcVar2(this); @@ -589,56 +589,56 @@ ARM void ActorRupee::vfunc_20() { func_01fff17c(&sStack_1c, data_027e0ce0, 0); func_02018114(&uStack_1a, sStack_1c); - this->mUnk_c4.mUnk_08 = uStack_1a; - this->mUnk_c4.mUnk_0a = uStack_18; - this->mUnk_c4.mUnk_0c = uStack_16; + this->mUnk_C4.mUnk_08 = uStack_1a; + this->mUnk_C4.mUnk_0A = uStack_18; + this->mUnk_C4.mUnk_0C = uStack_16; uStack_1a = 0; uStack_18 = 0x666; uStack_16 = 0; - this->mUnk_c4.mUnk_0e = 0; - this->mUnk_c4.mUnk_10 = 0x666; - sVar1 = this->mUnk_4c; + this->mUnk_C4.mUnk_0E = 0; + this->mUnk_C4.mUnk_10 = 0x666; + sVar1 = this->mUnk_4C; test = this->mPos; if (sVar1 != 5) { - iVar4 = (int) (short) this->mUnk_4c; + iVar4 = (int) (short) this->mUnk_4C; } - this->mUnk_c4.mUnk_12 = 0; + this->mUnk_C4.mUnk_12 = 0; this->mPrevPos = test; uVar3 = uVar2; if ((sVar1 != 5 && iVar4 != 10) && iVar4 != 0xb) { - if ((sVar1 != 6) && ((u16) this->mUnk_98 < (u16) this->mUnk_9a)) { + if ((sVar1 != 6) && ((u16) this->mUnk_98 < (u16) this->mUnk_9A)) { this->mUnk_98++; } uVar3 = uStack_18; - if ((u16) this->mUnk_9a <= (u16) this->mUnk_98) { - this->mUnk_3c = (unk32) & this->mUnk_9c; + if ((u16) this->mUnk_9A <= (u16) this->mUnk_98) { + this->mUnk_3C = (unk32) & this->mUnk_9C; uStack_18 = uVar2; this->func_ov000_020989e0(); uVar3 = uStack_18; - if ((this->mUnk_a4 & 0x3ffff) != 0) { - sVar1 = *(short *) &this->mUnk_b8; + if ((this->mUnk_A4 & 0x3ffff) != 0) { + sVar1 = *(short *) &this->mUnk_B8; - switch (mUnk_b8) { + switch (mUnk_B8) { case 0x08: case 0x10: - if ((this->mUnk_a8 & 0x100) != 0) { + if ((this->mUnk_A8 & 0x100) != 0) { this->func_ov031_020e9068(); uVar3 = uStack_18; } break; case 0x0C: - this->mUnk_bc = this->mUnk_a8; - this->mUnk_a0 &= 0xffffefff; + this->mUnk_BC = this->mUnk_A8; + this->mUnk_A0 &= 0xffffefff; this->func_ov031_020e9904(6); uVar3 = uStack_18; break; @@ -650,7 +650,7 @@ ARM void ActorRupee::vfunc_20() { } uStack_18 = uVar3; - iVar4 = (int) (short) this->mUnk_4c; + iVar4 = (int) (short) this->mUnk_4C; // uVar5 = *(u32 *) (data_ov031_0211358c[iVar4 * 8]); if (!(uVar5 & 1)) { @@ -662,12 +662,12 @@ ARM void ActorRupee::vfunc_20() { // (*pcVar6)(); - if ((this->mUnk_80 < 0) && (this->mUnk_4c != 5)) { + if ((this->mUnk_80 < 0) && (this->mUnk_4C != 5)) { this->func_ov031_020e9d94(); } - if (this->mUnk_6e != 0) { - sVar1 = this->mUnk_4c; + if (this->mUnk_6E != 0) { + sVar1 = this->mUnk_4C; if (!(sVar1 != 10 && sVar1 != 0xb && sVar1 != 0xc)) { func_01ffedac(&uStack_1e, &this->mPos); @@ -683,7 +683,7 @@ ARM void ActorRupee::func_ov031_020e9b88() { func_ov000_02098838(); Vec3p_Add(&this->mPos, &this->mVel, &this->mPos); - if (this->mUnk_5c.mUnk_00.y < this->mPos.y + this->mVel.y) { + if (this->mUnk_5C.mUnk_00.y < this->mPos.y + this->mVel.y) { this->mUnk_44 = 0x9C; } else { this->mUnk_44 = 0x9F; @@ -721,7 +721,7 @@ ARM void ActorRupee::vfunc_2c(unk32 param1) { return; } - func_ov000_0205c1f0(auStack_30, data_ov031_02110aa0[this->mUnk_6c]); + func_ov000_0205c1f0(auStack_30, data_ov031_02110aa0[this->mUnk_6C]); iStack_18 = this->mPos; if (!this->func_ov031_020e9d54()) { @@ -734,7 +734,7 @@ ARM void ActorRupee::vfunc_2c(unk32 param1) { uVar2 = 0x4CD; } - if (this->mUnk_4c != 9) { + if (this->mUnk_4C != 9) { iStack_28.x = this->mPos.x; iStack_28.y = this->mPos.y + 0x80; iStack_28.z = this->mPos.z; @@ -743,7 +743,7 @@ ARM void ActorRupee::vfunc_2c(unk32 param1) { } ARM bool ActorRupee::func_ov031_020e9d54() { - switch (this->mUnk_6c) { + switch (this->mUnk_6C) { case RupeeId_BigGreen: case RupeeId_BigRed: case RupeeId_Gold: @@ -771,7 +771,7 @@ ARM void ActorRupee::func_ov031_020e9d94() { return; } - if (!this->mUnk_f4) { + if (!this->mUnk_F4) { if (this->mUnk_94 < this->mUnk_96) { this->mUnk_94++; var_r1 = 0; @@ -782,7 +782,7 @@ ARM void ActorRupee::func_ov031_020e9d94() { if (var_r1 == 0) { return; } - this->mUnk_f4 = 1; + this->mUnk_F4 = 1; this->mUnk_96 = 0x3C; this->mUnk_94 = 0; return; @@ -822,7 +822,7 @@ ARM bool ActorRupee::func_ov031_020e9e5c() { bool bVar6; bool bVar7; - sVar1 = this->mUnk_4c; + sVar1 = this->mUnk_4C; bVar6 = true; bVar5 = true; bVar4 = true; @@ -867,7 +867,7 @@ ARM ActorRupee_c4::ActorRupee_c4(Actor *param1) : ARM unk32 ActorRupee_c4::vfunc_00(Actor_c4_stack param1, unk32 param2) { if (param2 != 0) { ActorRupee *pRupee = GET_ACTOR_RUPEE(this->mUnk_20); - pRupee->mUnk_c0 = param1.param1; + pRupee->mUnk_C0 = param1.param1; pRupee->func_ov031_020e9904(7); } diff --git a/src/110_PlayerGet/PlayerGet.cpp b/src/110_PlayerGet/PlayerGet.cpp index b1c8904e1..abb2e1cd8 100644 --- a/src/110_PlayerGet/PlayerGet.cpp +++ b/src/110_PlayerGet/PlayerGet.cpp @@ -21,7 +21,7 @@ struct UnkStruct_02186240 { /* 0000 */ unk8 mUnk_0000[0x3F68]; - /* 3f68 */ + /* 3F68 */ }; UnkStruct_02186240 data_ov110_02186240; @@ -47,11 +47,11 @@ struct func_ov000_0205abcc_ret { unk32 mUnk_04; unk8 mUnk_08; unk8 mUnk_09; - unk8 mUnk_0a; - unk8 mUnk_0b; - unk8 mUnk_0c; - unk8 mUnk_0d; - unk8 mUnk_0e; + unk8 mUnk_0A; + unk8 mUnk_0B; + unk8 mUnk_0C; + unk8 mUnk_0D; + unk8 mUnk_0E; }; extern "C" func_ov000_0205abcc_ret *func_ov000_0205abcc(char *, char *, unk32, unk32, unk32); extern "C" unk32 func_ov000_02077590(unk32); @@ -224,27 +224,27 @@ static const unk32 data_ov110_021860c4[] = { ARM void UnkStruct_PlayerGet_74::vfunc_00(unk32 param1, unk32 param2, unk32 param3) { PlayerGet *unk_14 = (PlayerGet *) this->mUnk_14; - func_01ffc5a0(&unk_14->mUnk_8c, unk_14->mUnk_6c, unk_14->mUnk_70, &this->mUnk_04, param3); + func_01ffc5a0(&unk_14->mUnk_8C, unk_14->mUnk_6C, unk_14->mUnk_70, &this->mUnk_04, param3); } ARM PlayerGet::PlayerGet() : mUnk_54(0, 0, -1, ItemId_None), mUnk_64(mUnk_44, -1), - mUnk_6c(0x1000), + mUnk_6C(0x1000), mUnk_70(0), mUnk_72(0), mUnk_73(0), mUnk_74(this), - mUnk_8c(0) {} + mUnk_8C(0) {} ARM PlayerGet::~PlayerGet() { func_ov000_0205ca74(this->mUnk_54.mUnk_08); UnkStruct_027e0cec *pData_027e0cec = data_027e0cec; if (pData_027e0cec != NULL) { - UnkStruct_PlayerGet_ec *pUnk_ec = &this->mUnk_ec[0]; + UnkStruct_PlayerGet_ec *pUnk_ec = &this->mUnk_EC[0]; - while (pUnk_ec != (UnkStruct_PlayerGet_ec *) &this->mUnk_fc) { + while (pUnk_ec != (UnkStruct_PlayerGet_ec *) &this->mUnk_FC) { pData_027e0cec->func_ov000_020a0110(pUnk_ec); pUnk_ec++; } @@ -299,7 +299,7 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) { *(u32 *) this->mUnk_54.mUnk_04 = param1->mUnk_10.y; this->mUnk_54.mUnk_08 = param1->mUnk_10.z; pItemManager = this->mUnk_28->pItemManager; - itemId = param1->mUnk_1c; + itemId = param1->mUnk_1C; switch (itemId) { case ItemId_BombBag: @@ -331,7 +331,7 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) { this->mUnk_54.mItemId = itemId; this->mUnk_70 = 0; - this->mUnk_2c->mUnk_58 = 0; + this->mUnk_2C->mUnk_58 = 0; func_ov000_0208ba10(auStack_108, &this->mUnk_24->mUnk_25, 0); this->mUnk_40->mUnk_00 = 0x8000; @@ -356,13 +356,13 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) { if (iVar10->GetActorId() == ActorId_NormalShield) { UNSET_FLAG(iVar10->mFlags, ActorFlag_Visible); - iVar10->mUnk_4a = 0; + iVar10->mUnk_4A = 0; } break; case 0x3A: if (this->mUnk_54.mItemId != ItemId_Nothing) { if (func_ov000_020a4c00(this->mUnk_54.mItemId) == 0) { - this->mUnk_8c.vfunc_08(0); + this->mUnk_8C.vfunc_08(0); } else { unk32 niVar10; @@ -402,7 +402,7 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) { func_ov000_0205abcc((char *) auStack_64, (char *) auStack_48, 0, 1, this->mUnk_30->mUnk_24); if (ret != NULL) { if (ret->mUnk_08 != 0 && ret->mUnk_09 > 0) { - var_r1_2 = ret->mUnk_08 + ret->mUnk_0e + 4; + var_r1_2 = ret->mUnk_08 + ret->mUnk_0E + 4; } else { var_r1_2 = 0; } @@ -416,7 +416,7 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) { var_r1_3 = NULL; } - this->mUnk_8c.vfunc_08((unk32) var_r1_3); + this->mUnk_8C.vfunc_08((unk32) var_r1_3); func_020156f4((char *) auStack_48); func_02015644((char *) auStack_64); } @@ -425,22 +425,22 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) { case ItemId_BigGreenRupee: case ItemId_BigRedRupee: case ItemId_BigGoldRupee: - this->mUnk_6c = 0x1666; + this->mUnk_6C = 0x1666; break; default: - this->mUnk_6c = 0x1000; + this->mUnk_6C = 0x1000; break; } } - UnkStruct_027e09bc_0c *uVar11 = data_027e09bc->mUnk_0c; + UnkStruct_027e09bc_0c *uVar11 = data_027e09bc->mUnk_0C; unk32 uVar6 = func_ov000_02077590(4); uVar11->func_ov000_0207834c(this->mUnk_34, uVar6, 0); UnkStruct_PlayerGet_48 *pUnk_48 = this->mUnk_48; pUnk_48->mUnk_42 = 0x1000; pUnk_48->mUnk_47 = 0; - pUnk_48->mUnk_5e = 0x1000; + pUnk_48->mUnk_5E = 0x1000; pUnk_48->mUnk_63 = 0; if (this->mUnk_44 != NULL) { @@ -471,7 +471,7 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) { return; } - data_ov000_020b51b8.func_ov000_0206c96c(data_027e0cd8->mUnk_0c->func_ov000_02080a44()); + data_ov000_020b51b8.func_ov000_0206c96c(data_027e0cd8->mUnk_0C->func_ov000_02080a44()); this->mUnk_73 = 1; break; case 0x3B: @@ -483,7 +483,7 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) { uStack_f0[2] = 0x872; uStack_f0[0] = 0x870; uStack_f0[3] = 0x873; - data_027e0cec->func_ov000_020a0000(this->mUnk_ec, this->mUnk_fc, uStack_f0, &VStack_fc, 1); + data_027e0cec->func_ov000_020a0000(this->mUnk_EC, this->mUnk_FC, uStack_f0, &VStack_fc, 1); } UnkStruct_ov000_02067bc4::UnkStruct1 auStack_30; @@ -707,7 +707,7 @@ ARM void PlayerGet::vfunc_10(unk32 param1, unk32 param2) { } if (!temp_r6) { - data_027e09bc->mUnk_0c->func_ov000_02078230(0); + data_027e09bc->mUnk_0C->func_ov000_02078230(0); } if (data_027e09b8->func_ov000_020732fc(this->mUnk_54.mUnk_08) != 0) { @@ -738,7 +738,7 @@ ARM void PlayerGet::vfunc_10(unk32 param1, unk32 param2) { break; } - temp_r5 = data_027e0cd8->mUnk_0c->func_ov000_02080a44(); + temp_r5 = data_027e0cd8->mUnk_0C->func_ov000_02080a44(); if (data_ov000_020b51b8.mUnk_08[2] != NULL) { var_r0 = 1; @@ -776,7 +776,7 @@ ARM void PlayerGet::vfunc_18(unk32 param1, unk32 param2, unk32 param3) { case 0x3A: break; case 0x3B: - if (param3 != 0 && this->mUnk_54.mItemId != ItemId_Nothing && this->mUnk_8c.mUnk_04 != 0) { + if (param3 != 0 && this->mUnk_54.mItemId != ItemId_Nothing && this->mUnk_8C.mUnk_04 != 0) { Vec3p_Add(this->mUnk_34, (Vec3p *) &data_ov110_021861ec.mUnk_00, &auStack_18); func_ov000_02058fc4(data_027e0958, &this->mUnk_74, &auStack_18); } @@ -798,13 +798,13 @@ THUMB void UnkStruct_027e0ce0_34::func_ov110_02185d3c(ItemId itemId) { switch (itemId) { case ItemId_31: this->func_ov024_020d3d98(0, 0); - this->mUnk_2c = 1; + this->mUnk_2C = 1; this->mUnk_00 = 0; this->mUnk_10 = 0; break; case ItemId_33: this->func_ov024_020d3d98(2, 0); - this->mUnk_2c = 2; + this->mUnk_2C = 2; this->mUnk_04 = 2; this->mUnk_14 = 0; break; diff --git a/src/112_PlayerSceneChange/PlayerSceneChange.cpp b/src/112_PlayerSceneChange/PlayerSceneChange.cpp index ba8aba63a..d2651097f 100644 --- a/src/112_PlayerSceneChange/PlayerSceneChange.cpp +++ b/src/112_PlayerSceneChange/PlayerSceneChange.cpp @@ -13,7 +13,7 @@ extern "C" void func_ov000_0205ca74(unk32); extern "C" void func_ov000_0205d65c(void *, Vec3p *, Vec3p *, u32); ARM PlayerSceneChange::PlayerSceneChange() { - this->mUnk_68 = this->mUnk_2c->mUnk_14C; + this->mUnk_68 = this->mUnk_2C->mUnk_14C; this->mUnk_6C = -1; this->mUnk_70.coords = this->mUnk_34->coords; @@ -82,7 +82,7 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1 switch (param1->mUnk_04) { case 0x3C: { - int iVar19 = data_027e0cd8->mUnk_0c->func_ov000_02080658((this->mUnk_2c->mUnk_148 >> 16) & 0x3F, &this->mUnk_54); + int iVar19 = data_027e0cd8->mUnk_0C->func_ov000_02080658((this->mUnk_2C->mUnk_148 >> 16) & 0x3F, &this->mUnk_54); if (iVar19 != 0 && this->mUnk_28->mUnk_94 != 0 && func_ov096_02179c14()) { this->mUnk_54.mUnk_10 = 1; } @@ -143,9 +143,9 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1 this->mUnk_70.z = temp_r8->z + MUL_Q20(data_0203f964[1], FLOAT_TO_Q20(2.0f)); break; default: - if (this->mUnk_2c->mUnk_150 == 0x1000) { + if (this->mUnk_2C->mUnk_150 == 0x1000) { MapObjectUnkDRTY *pDRTY = - (MapObjectUnkDRTY *) gpMapObjManager->func_01fff498(this->mUnk_2c->mUnk_150 >> 0x10, 0); + (MapObjectUnkDRTY *) gpMapObjManager->func_01fff498(this->mUnk_2C->mUnk_150 >> 0x10, 0); if (pDRTY != NULL) { pDRTY->func_ov000_0209d6ac((Vec3p *) &this->mUnk_70); @@ -170,9 +170,9 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1 } } } else { - if (((u32) ((u16) this->mUnk_2c->mUnk_150 << 0x10) >> 0x1E) == 1) { + if (((u32) ((u16) this->mUnk_2C->mUnk_150 << 0x10) >> 0x1E) == 1) { ActorUnk_ov000_020a8bb0 *temp_r0_6 = - (ActorUnk_ov000_020a8bb0 *) gpActorManager->func_01fff3b4(this->mUnk_2c->mUnk_150); + (ActorUnk_ov000_020a8bb0 *) gpActorManager->func_01fff3b4(this->mUnk_2C->mUnk_150); if (temp_r0_6 != NULL) { this->mUnk_70.x = temp_r0_6->mPos.x; @@ -418,7 +418,7 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1 case 0x1E: case 0x1F: default: - UnkStruct_027e0cd8_0c *ptr = data_027e0cd8->mUnk_0c; + UnkStruct_027e0cd8_0c *ptr = data_027e0cd8->mUnk_0C; switch (this->mUnk_68) { case 0x0F: @@ -622,10 +622,10 @@ ARM void PlayerSceneChange::vfunc_10(unk32 param1, unk32 param2) { case 0x14: case 0x21: case 0x25: - this->mUnk_2c->mUnk_9C = this->mUnk_34->y + 0xFFFFFCCD; + this->mUnk_2C->mUnk_9C = this->mUnk_34->y + 0xFFFFFCCD; break; default: - this->mUnk_2c->mUnk_9C = this->mUnk_34->y; + this->mUnk_2C->mUnk_9C = this->mUnk_34->y; break; } break; @@ -673,7 +673,7 @@ ARM void PlayerSceneChange::vfunc_10(unk32 param1, unk32 param2) { case 0x25: break; default: - this->mUnk_2c->mUnk_9C = this->mUnk_34->y; + this->mUnk_2C->mUnk_9C = this->mUnk_34->y; break; } @@ -684,7 +684,7 @@ ARM void PlayerSceneChange::vfunc_10(unk32 param1, unk32 param2) { case 0x11: case 0x13: case 0x24: { - UnkStruct_027e0cd8_0c *temp_r0_13 = data_027e0cd8->mUnk_0c; + UnkStruct_027e0cd8_0c *temp_r0_13 = data_027e0cd8->mUnk_0C; q20 temp_r0_14 = temp_r0_13->vfunc_28(this->mUnk_34, 0, 0); Vec3p *temp_r2_9 = this->mUnk_34; diff --git a/src/112_PlayerSceneChange/PlayerSceneChange2.cpp b/src/112_PlayerSceneChange/PlayerSceneChange2.cpp index 34270b3b8..60933f097 100644 --- a/src/112_PlayerSceneChange/PlayerSceneChange2.cpp +++ b/src/112_PlayerSceneChange/PlayerSceneChange2.cpp @@ -27,7 +27,7 @@ ARM void PlayerSceneChange2::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param pVVar1->y = 0; pVVar1->z = 0; - this->mUnk_2c->mUnk_58 = 0; + this->mUnk_2C->mUnk_58 = 0; func_ov000_0208ba10(auStack_18, &this->mUnk_24->mUnk_94, 0); @@ -76,10 +76,10 @@ ARM void PlayerSceneChange2::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param func_ov000_0205d65c(&auStack_2c, this->mUnk_34, (Vec3p *) &this->mUnk_54, this->mUnk_40->mUnk_00); this->mUnk_40->mUnk_00 = auStack_2c; - this->mUnk_2c->mUnk_26 = 0; + this->mUnk_2C->mUnk_26 = 0; break; case 0x45: - this->mUnk_2c->mUnk_26 = 0; + this->mUnk_2C->mUnk_26 = 0; break; default: break; diff --git a/src/Main/System/OverlayManager.cpp b/src/Main/System/OverlayManager.cpp index 758f180db..8559a1783 100644 --- a/src/Main/System/OverlayManager.cpp +++ b/src/Main/System/OverlayManager.cpp @@ -4,7 +4,7 @@ struct UnkStruct_020ee698 { /* 00 */ unk8 mUnk_00[0x2C]; - /* 2c */ unk32 mUnk_2c; + /* 2C */ unk32 mUnk_2C; /* 30 */ }; extern UnkStruct_020ee698 data_ov000_020ee698; @@ -16,11 +16,11 @@ struct OverlaySetup { /* 03 */ unk8 mUnk_03; /* 04 */ OverlayId slot1Overlay; /* 08 */ OverlayId slot2Overlay; - /* 0c */ OverlayId slot3Overlay; + /* 0C */ OverlayId slot3Overlay; /* 10 */ OverlayId slot12Overlay; /* 14 */ void *mUnk_14; /* 18 */ void *mUnk_18; - /* 1c */ + /* 1C */ }; extern OverlaySetup gOverlaySetups[]; @@ -68,7 +68,7 @@ THUMB void OverlayManager::LoadOverlaySetup(s32 index) { } else { overlayId = pSetup->slot12Overlay; - if (index == 6 && data_ov000_020ee698.mUnk_2c == 2) { + if (index == 6 && data_ov000_020ee698.mUnk_2C == 2) { overlayId = OverlayId_CastleTown; }