From bd747975ff0197043a4e2c655cd3bd9d4874d2e8 Mon Sep 17 00:00:00 2001
From: Yanis002 <35189056+Yanis002@users.noreply.github.com>
Date: Sat, 8 Feb 2025 12:40:01 +0100
Subject: cleanup actornavibase and match `ActorNavi::func_ov059_0219b020`

---
 include/Actor/Navi/ActorNavi.hpp     | 24 ++++++++++++++++++++++++
 include/Actor/Navi/ActorNaviBase.hpp | 27 ++-------------------------
 2 files changed, 26 insertions(+), 25 deletions(-)

(limited to 'include/Actor/Navi')

diff --git a/include/Actor/Navi/ActorNavi.hpp b/include/Actor/Navi/ActorNavi.hpp
index dab24701..5604893c 100644
--- a/include/Actor/Navi/ActorNavi.hpp
+++ b/include/Actor/Navi/ActorNavi.hpp
@@ -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();
 };
diff --git a/include/Actor/Navi/ActorNaviBase.hpp b/include/Actor/Navi/ActorNaviBase.hpp
index 6fae5e7e..7df4559f 100644
--- a/include/Actor/Navi/ActorNaviBase.hpp
+++ b/include/Actor/Navi/ActorNaviBase.hpp
@@ -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();
 };
-- 
cgit v1.2.3