cleanup actornavibase and match ActorNavi::func_ov059_0219b020

This commit is contained in:
Yanis002
2025-02-08 12:40:01 +01:00
parent cf757250b0
commit bd747975ff
5 changed files with 61 additions and 40 deletions
+24
View File
@@ -3,5 +3,29 @@
#include "Actor/Navi/ActorNaviBase.hpp"
class ActorNavi : public ActorNaviBase {
public:
/* 294 */ ModelRender mUnk_294;
/* 2f0 */ void *mUnk_2f0;
/* 2f4 */ unk8 mUnk_2f4[0x40];
/* 334 */ unk32 mUnk_334;
/* 338 */ unk32 mUnk_338;
/* 33c */ unk32 mUnk_33c;
/* 340 */ unk16 mUnk_340;
/* 342 */ unk8 mUnk_342[0x2];
/* 344 */ unk32 mUnk_344;
/* 348 */ unk32 mUnk_348;
/* 34c */ unk8 mUnk_34c[0x68];
/* 3b4 */ EquipHammer *mHammer;
/* 3b8 */ unk32 mUnk_3b8;
/* 3bc */ unk32 mUnk_3bc;
/* 3c0 */ u8 mUnk_3c0[0x8];
/* 3c8 */
bool func_ov059_0219933c(u32 param1);
void func_ov059_0219a0ac();
void func_ov059_0219aa08();
void func_ov059_0219aba8(u32 param1);
bool func_ov059_0219af14();
bool func_ov059_0219afc4();
void func_ov059_0219b020();
};
+2 -25
View File
@@ -34,22 +34,7 @@ public:
/* 288 */ unk8 mUnk_288[0x2];
/* 28a */ unk16 mUnk_28a;
/* 28c */ unk8 mUnk_28c[0x8];
/* 294 */ ModelRender mUnk_294;
/* 2f0 */ void *mUnk_2f0;
/* 2f4 */ unk8 mUnk_2f4[0x40];
/* 334 */ unk32 mUnk_334;
/* 338 */ unk32 mUnk_338;
/* 33c */ unk32 mUnk_33c;
/* 340 */ unk16 mUnk_340;
/* 342 */ unk8 mUnk_342[0x2];
/* 344 */ unk32 mUnk_344;
/* 348 */ unk32 mUnk_348;
/* 34c */ unk8 mUnk_34c[0x68];
/* 3b4 */ EquipHammer *mHammer;
/* 3b8 */ unk32 mUnk_3b8;
/* 3bc */ unk32 mUnk_3bc;
/* 3c0 */ u8 mUnk_3c0[0x8];
/* 3c8 */
/* 294 */
/* 00 */ virtual ~ActorNaviBase() override;
/* 08 */ virtual bool vfunc_08() override;
@@ -78,7 +63,7 @@ public:
/* d0 */ virtual void vfunc_d0();
/* d4 */ virtual void vfunc_d4();
/* d8 */ virtual void vfunc_d8();
/* dc */ virtual void SetActive(bool active);
/* dc */ virtual void SetActive(unk32 active);
/* e0 */ virtual void vfunc_e0();
/* e4 */ virtual void vfunc_e4();
/* e8 */ virtual void vfunc_e8();
@@ -103,12 +88,4 @@ public:
static void func_ov000_020bb0e0();
ActorNaviBase();
bool func_ov059_0219933c(u32 param1);
void func_ov059_0219a0ac();
void func_ov059_0219aa08();
void func_ov059_0219aba8(u32 param1);
bool func_ov059_0219af14();
bool func_ov059_0219afc4();
void func_ov059_0219b020();
};