From c81b52be8649fa4569ff404b3f33beba9686c1f6 Mon Sep 17 00:00:00 2001
From: Yanis002 <35189056+Yanis002@users.noreply.github.com>
Date: Sat, 8 Feb 2025 19:30:22 +0100
Subject: progress on ActorNaviBase.cpp

---
 include/Actor/Navi/ActorNavi.hpp     | 12 +++++++-----
 include/Actor/Navi/ActorNaviBase.hpp |  2 +-
 include/Item/ItemManager.hpp         |  2 ++
 include/Map/MapManager.hpp           |  2 +-
 include/Player/EquipHammer.hpp       |  4 ++++
 5 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/Actor/Navi/ActorNavi.hpp b/include/Actor/Navi/ActorNavi.hpp
index 5604893c..c2504f50 100644
--- a/include/Actor/Navi/ActorNavi.hpp
+++ b/include/Actor/Navi/ActorNavi.hpp
@@ -7,20 +7,22 @@ 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;
+    /* 334 */ Vec3p mUnk_334;
     /* 340 */ unk16 mUnk_340;
     /* 342 */ unk8 mUnk_342[0x2];
-    /* 344 */ unk32 mUnk_344;
+    /* 344 */ u32 mUnk_344;
     /* 348 */ unk32 mUnk_348;
-    /* 34c */ unk8 mUnk_34c[0x68];
+    /* 34c */ unk8 mUnk_34c[0x38];
+    /* 384 */ Mat3p mUnk_384;
+    /* 3a8 */ unk8 mUnk_3a8[0xC];
     /* 3b4 */ EquipHammer *mHammer;
     /* 3b8 */ unk32 mUnk_3b8;
     /* 3bc */ unk32 mUnk_3bc;
     /* 3c0 */ u8 mUnk_3c0[0x8];
     /* 3c8 */
 
+    void func_ov000_020b853c(void);
+
     bool func_ov059_0219933c(u32 param1);
     void func_ov059_0219a0ac();
     void func_ov059_0219aa08();
diff --git a/include/Actor/Navi/ActorNaviBase.hpp b/include/Actor/Navi/ActorNaviBase.hpp
index 7df4559f..27e12ef2 100644
--- a/include/Actor/Navi/ActorNaviBase.hpp
+++ b/include/Actor/Navi/ActorNaviBase.hpp
@@ -70,7 +70,7 @@ public:
     /* ec */ virtual void vfunc_ec();
     /* f0 */
 
-    void func_ov000_020b8c50();
+    void func_ov000_020b8c50(unk32);
     void func_ov000_020b8c98(unk32 param1, unk32 param2, unk32 param3);
     void TeleportAboveLink();
     void func_ov000_020b9770(s32 param1);
diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp
index 3d5340ce..7f9f48f8 100644
--- a/include/Item/ItemManager.hpp
+++ b/include/Item/ItemManager.hpp
@@ -215,6 +215,8 @@ public:
 
     // Unknown
     void func_ov00_020ae4dc(s32 param1);
+    void func_ov000_020c0c44(void*);
+    void func_ov000_020c0e5c(void*, unk32);
 };
 
 extern ItemManager *gItemManager;
diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp
index 346d43d8..59506f33 100644
--- a/include/Map/MapManager.hpp
+++ b/include/Map/MapManager.hpp
@@ -41,7 +41,7 @@ public:
     /* 10 */
 
     bool func_01ffbe78(Vec3p *param1, Vec3p *param2, Vec3p *param3, Vec4p *param4);
-    bool func_01ffbf5c(s32 param1, Vec3p *param2, Vec3p *param3, s32 length);
+    bool func_01ffbf5c(struct UnkStruct* param1, Vec3p *param2, Vec3p *param3, s32 length);
     bool func_01ffc118(s32 *param1, Vec3p *param2, Vec3p *param3, s32 param4, s32 *param5, u32 param6, s32 *param7);
     bool func_01ffd1e0(s32 *param1, Vec3p *param2, Vec3p *param3, s32 param4, s32 *param5, u32 param6, s32 *param7);
 
diff --git a/include/Player/EquipHammer.hpp b/include/Player/EquipHammer.hpp
index 187100be..65fa2024 100644
--- a/include/Player/EquipHammer.hpp
+++ b/include/Player/EquipHammer.hpp
@@ -55,6 +55,10 @@ public:
         return mState;
     }
 
+    inline bool IsReleased(void) {
+        return mIsReleased;
+    }
+
     inline unk32 GetChargeTimer(void) {
         return mChargeTimer;
     }
-- 
cgit v1.2.3