ActorCharacterBase OK (#161)

* ActorCharacterBase OK

* Fix broken matches
This commit is contained in:
Aetias
2026-05-09 16:31:17 +02:00
committed by GitHub
parent e9ffe114a9
commit d02c870d1d
19 changed files with 265 additions and 87 deletions
+2 -2
View File
@@ -152,7 +152,7 @@ public:
/* 119 */ u8 mUnk_119;
/* 11a */ bool mVisible;
/* 11b */ bool mGrabbed;
/* 11c */ unk8 mUnk_11c;
/* 11c */ bool mUnk_11c;
/* 11d */ bool mUnk_11d;
/* 11e */ q4 mYOffset;
/* 120 */ s16 mUnk_120;
@@ -227,7 +227,7 @@ public:
unk8 func_ov00_020c1788();
void SetUnk_129(bool value);
void SetUnk_11c(unk8 value);
void SetUnk_11c(bool value);
bool func_ov00_020c195c();
bool func_ov00_020c198c();
void KillPickupItemActors();
+17 -9
View File
@@ -10,17 +10,25 @@
#include "Unknown/UnkStruct_ov000_020c5c2c.hpp"
#include "Unknown/UnkStruct_ov000_020d18f4.hpp"
struct UnkStruct_ov014_021448f4 {
/* 00 */ unk32 mUnk_00;
/* 04 */
UnkStruct_ov014_021448f4() :
mUnk_00(0) {}
};
class ActorCharacterBase : public Actor {
public:
/* 000 (base) */
/* 158 */ UnkStruct_ov000_020d18f4 mUnk_158;
/* 1b4 */ unk32 mUnk_1b4;
/* 1b8 */ unk32 mUnk_1b8;
/* 1b8 */ unk32 (*mUnk_1b8)(unk32);
/* 1bc */ unk32 mUnk_1bc;
/* 1c0 */ unk8 mUnk_1c0;
/* 1c1 */ unk8 mUnk_1c1;
/* 1c0 */ bool mUnk_1c0;
/* 1c1 */ bool mUnk_1c1;
/* 1c2 */ unk8 mUnk_1c2;
/* 1c3 */ unk8 mUnk_1c3;
/* 1c3 */ bool mUnk_1c3;
/* 1c4 */
/* 00 */ virtual ~ActorCharacterBase() override;
@@ -39,11 +47,11 @@ public:
/* cc */ virtual void vfunc_cc();
/* d0 */ virtual void vfunc_d0();
/* d4 */ virtual unk32 vfunc_d4();
/* d8 */ virtual unk32 vfunc_d8();
/* dc */ virtual unk32 vfunc_dc();
/* e0 */ virtual unk32 vfunc_e0();
/* e4 */ virtual unk32 vfunc_e4();
/* e8 */ virtual void vfunc_e8();
/* d8 */ virtual unk32 vfunc_d8(unk32 param1);
/* dc */ virtual unk32 vfunc_dc(unk32 param1);
/* e0 */ virtual unk32 vfunc_e0(unk32 param1);
/* e4 */ virtual unk32 vfunc_e4(unk32 param1);
/* e8 */ virtual UnkStruct_ov014_021448f4 vfunc_e8(u16 param2, u16 param3);
/* ec */
ActorCharacterBase();
+1 -1
View File
@@ -60,7 +60,7 @@ public:
void func_02036bbc(void);
void func_02036c50(u16 *param_2);
void func_02036ca4(unk32 param_2);
bool func_02036ce4(UnkStruct_020386d8 *param_2, unk32 param_3);
bool func_02036ce4(UnkStruct_02037750 *param_2, unk32 param_3);
bool func_02036d30(UnkStruct_02037750 *param_2);
bool func_02036d4c(UnkStruct_02037750 *param_2);
void func_02036d6c(void);
+3 -3
View File
@@ -9,14 +9,14 @@
class LinkStateInteract;
class UnkStruct_020397f8;
typedef unk32 (*UnkStruct_02037750_Callback1)(unk32);
typedef unk32 (*UnkStruct_02037750_Callback1)(void *, unk32);
// astruct_14
class UnkStruct_02037750 : public SysObject {
public:
/* 00 (vtable) */
/* 04 */ UnkStruct_02037750_Callback1 mUnk_04[0x4];
/* 14 */ unk32 mUnk_14;
/* 14 */ void *mUnk_14;
/* 18 */ u32 mUnk_18;
/* 1c */ u8 mUnk_1c;
/* 1d */ u8 mUnk_1d;
@@ -37,7 +37,7 @@ public:
/* 30 */ virtual bool vfunc_30();
/* 34 */
UnkStruct_02037750(unk32 param1, unk32 param2);
UnkStruct_02037750(unk32 param1, void *param2);
static LinkStateInteract *GetLinkStateInteract();
unk32 func_020385d0(s32 param1, u8 *param2);
};
+1 -1
View File
@@ -13,7 +13,7 @@ public:
/* 28 */ unk8 mUnk_28[0x18];
/* 40 */ void *mUnk_40;
/* 44 */ unk32 mUnk_44;
/* 48 */ unk32 mUnk_48;
/* 48 */ void *mUnk_48;
/* 4c */ unk32 mUnk_4c;
/* 50 */ unk32 mUnk_50;
/* 54 */ unk32 mUnk_54;