Skip to content

Make hex digits consistent #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yanis002 merged 1 commit into from
Apr 16, 2026
Merged

Make hex digits consistent #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions include/Actor/Actor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {};
Expand Down Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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) :
Expand Down
8 changes: 4 additions & 4 deletions include/Actor/ActorManager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions include/Actor/ActorProfile.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,30 @@ 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();

/* 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();
Expand Down
46 changes: 23 additions & 23 deletions include/Actor/ActorRupee.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -121,7 +121,7 @@ class ActorProfileRupee : public ActorProfile {

ActorProfileRupee();

/* 0c */ virtual Actor *Create();
/* 0C */ virtual Actor *Create();

static ActorProfileRupee *GetProfile();
};
Loading
Loading