From f3134dbdc14805d88b3adbf32eb53e2a456db9fa Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Sat, 8 Feb 2025 00:49:06 +0100 Subject: match `LinkStateItem::func_ov059_021990a4` --- include/Actor/Navi/ActorNaviBase.hpp | 2 +- include/Player/EquipHammer.hpp | 9 +++++++++ include/Player/LinkStateBase.hpp | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/Actor/Navi/ActorNaviBase.hpp b/include/Actor/Navi/ActorNaviBase.hpp index d42a82b3..6fae5e7e 100644 --- a/include/Actor/Navi/ActorNaviBase.hpp +++ b/include/Actor/Navi/ActorNaviBase.hpp @@ -48,7 +48,7 @@ public: /* 3b4 */ EquipHammer *mHammer; /* 3b8 */ unk32 mUnk_3b8; /* 3bc */ unk32 mUnk_3bc; - /* 3c0 */ unk8 mUnk_3c0[0x8]; + /* 3c0 */ u8 mUnk_3c0[0x8]; /* 3c8 */ /* 00 */ virtual ~ActorNaviBase() override; diff --git a/include/Player/EquipHammer.hpp b/include/Player/EquipHammer.hpp index a367090d..b65bbcbf 100644 --- a/include/Player/EquipHammer.hpp +++ b/include/Player/EquipHammer.hpp @@ -42,6 +42,15 @@ public: void func_ov059_02198f10(Vec3p *vec, unk32 param2, s32 param3); void func_ov059_02198fa8(unk32 param1); bool func_ov059_02198fe0(); + + inline s32 GetUnk_18(void) { + return mUnk_18; + } + + inline unk32 GetUnk_20(void) { + return mUnk_20; + } }; extern LinkStateItem *GetLinkStateItem(); +extern EquipHammer *GetEquipHammer(); diff --git a/include/Player/LinkStateBase.hpp b/include/Player/LinkStateBase.hpp index 470f6096..3fa02e4e 100644 --- a/include/Player/LinkStateBase.hpp +++ b/include/Player/LinkStateBase.hpp @@ -95,7 +95,7 @@ public: void func_ov00_020a8ab0(unk32 param1); void func_ov00_020a8ad0(unk32 param1); void func_ov00_020a8b04(s32 param1, bool param2); - void func_ov00_020a8b3c(s32 param1); + unk32 func_ov00_020a8b3c(s32 param1); bool func_ov00_020a8b80(); bool HasFlags_PlayerLinkBase_Unk48(u16 flags); unk8 Get_PlayerLinkBase_Unk5e(); -- cgit v1.2.3