match `EquipHammer::IsUsable`

9 files changed, 27 insertions, 6 deletions

diff --git a/include/Actor/Navi/ActorNavi.hpp b/include/Actor/Navi/ActorNavi.hpp
index 98ebcf51..dab24701 100644
--- a/include/Actor/Navi/ActorNavi.hpp
+++ b/include/Actor/Navi/ActorNavi.hpp
@@ -1,3 +1,7 @@
 #pragma once
 
-class ActorNavi;
+#include "Actor/Navi/ActorNaviBase.hpp"
+
+class ActorNavi : public ActorNaviBase {
+
+};
diff --git a/include/Actor/Navi/ActorNaviBase.hpp b/include/Actor/Navi/ActorNaviBase.hpp
index f3a45e8a..d42a82b3 100644
--- a/include/Actor/Navi/ActorNaviBase.hpp
+++ b/include/Actor/Navi/ActorNaviBase.hpp
@@ -10,17 +10,18 @@
 class ActorNaviBase_Unk1 {};
 
 class ActorNaviBase : public Actor {
+public:
     /* 000 (base) */
     /* 158 */ Vec3p mUnk_158;
     /* 164 */ unk32 mUnk_164;
     /* 168 */ ModelRender mUnk_168;
     /* 1c4 */ unk8 mUnk_1c4[0xc];
     /* 1d0 */ void *mUnk_1d0;
-    /* 1d4 */ unk8 mUnk_1d4[0x30];
+    /* 1d4 */ unk8 mUnk_1d4[0x40];
     /* 214 */ unk16 mUnk_214;
     /* 216 */ unk8 mUnk_216[0xc];
     /* 222 */ unk16 mUnk_222;
-    /* 224 */ unk8 mUnk_224[0x18];
+    /* 224 */ unk8 mUnk_224[0x28];
     /* 24c */ unk32 mUnk_24c;
     /* 250 */ unk32 mUnk_250;
     /* 254 */ unk32 mUnk_254;
diff --git a/include/DTCM/UnkStruct_027e0d38.hpp b/include/DTCM/UnkStruct_027e0d38.hpp
index a36af0fe..a462a6e8 100644
--- a/include/DTCM/UnkStruct_027e0d38.hpp
+++ b/include/DTCM/UnkStruct_027e0d38.hpp
@@ -3,12 +3,18 @@
 #include "global.h"
 #include "types.h"
 
+struct UnkStruct_027e0d38_UnkC {
+    /* 00 */ unk32 mUnk_00;
+
+    unk32 func_ov000_020a5e9c(void);
+};
+
 struct UnkStruct_027e0d38 {
     /* 00 */ unk8 mUnk_00;
     /* 01 */ unk8 mUnk_01[3]; // padding?
     /* 04 */ unk32 mUnk_04;
     /* 08 */ unk32 mUnk_08;
-    /* 0c */ unk32 mUnk_0c;
+    /* 0c */ UnkStruct_027e0d38_UnkC mUnk_0c;
     /* 10 */ unk32 mUnk_10;
     /* 14 */ unk32 mUnk_14;
     /* 18 */ unk32 mUnk_18;
diff --git a/include/DTCM/UnkStruct_027e0fd4.hpp b/include/DTCM/UnkStruct_027e0fd4.hpp
index 4d931bd5..42e254ea 100644
--- a/include/DTCM/UnkStruct_027e0fd4.hpp
+++ b/include/DTCM/UnkStruct_027e0fd4.hpp
@@ -128,3 +128,5 @@ public:
     void func_ov000_020b6ba4(s32 param1, s32 param2);
     bool func_ov000_020b6e70();
 };
+
+extern UnkStruct_027e0fd4* data_027e0fd4;
diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp
index c0a84aa7..3d5340ce 100644
--- a/include/Item/ItemManager.hpp
+++ b/include/Item/ItemManager.hpp
@@ -108,6 +108,11 @@ public:
     ~ItemManager();

     void Init();

 

+    // Access to members

+    inline u8 GetUnk_14d(void) {

+        return mUnk_14d;

+    }

+

     // Save/load

     void Save(SaveItemManager *save);

     void Load(const SaveItemManager *save);

diff --git a/include/Player/EquipHammer.hpp b/include/Player/EquipHammer.hpp
index 0ac23473..a367090d 100644
--- a/include/Player/EquipHammer.hpp
+++ b/include/Player/EquipHammer.hpp
@@ -43,3 +43,5 @@ public:
     void func_ov059_02198fa8(unk32 param1);

     bool func_ov059_02198fe0();

 };

+

+extern LinkStateItem *GetLinkStateItem();

diff --git a/include/Player/EquipItem.hpp b/include/Player/EquipItem.hpp
index 6702bc48..79165634 100644
--- a/include/Player/EquipItem.hpp
+++ b/include/Player/EquipItem.hpp
@@ -41,5 +41,5 @@ public:
     Vec3p *GetPlayerPos();

     void func_ov000_020be99c(Vec3p *param1);

     void func_ov000_020be9e4(s32 param1, s32 param2, s32 param3, s16 param4);

-    u16 GetAmmo();

+    s16 GetAmmo() const;

 };

diff --git a/include/Player/LinkStateBase.hpp b/include/Player/LinkStateBase.hpp
index e099c021..470f6096 100644
--- a/include/Player/LinkStateBase.hpp
+++ b/include/Player/LinkStateBase.hpp
@@ -154,4 +154,5 @@ public:
 
 LinkStateBase *GetLinkState(s32 index);
 
+extern LinkStateBase *gLinkState;
 extern LinkStateBase **gLinkStates;
diff --git a/include/Player/LinkStateItem.hpp b/include/Player/LinkStateItem.hpp
index 9a5d4585..c96f75d1 100644
--- a/include/Player/LinkStateItem.hpp
+++ b/include/Player/LinkStateItem.hpp
@@ -19,7 +19,7 @@ public:
     /* 20 */ unk16 mUnk_20;
     /* 22 */ unk8 mUnk_22[2];
     /* 24 */ s8 mUnk_24;
-    /* 25 */ unk8 mUnk_25[7];
+    /* 25 */ u8 mUnk_25[7];
     /* 2c */ unk16 mUnk_2c;
     /* 2e */ unk8 mUnk_2e[2];
     /* 30 */ void *mUnk_30;