From a9de8ab2ddd7024fa22c337fe5501e205f20a231 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Fri, 7 Feb 2025 23:39:39 +0100 Subject: match `EquipHammer::IsUsable` --- include/Player/EquipHammer.hpp | 2 ++ include/Player/EquipItem.hpp | 2 +- include/Player/LinkStateBase.hpp | 1 + include/Player/LinkStateItem.hpp | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) (limited to 'include/Player') 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; -- cgit v1.2.3