From aecd9545577a9faf3fe8a578a64872aa4b93a4cd Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 25 Jan 2025 14:35:02 +0100 Subject: Move ov004 documentation from Ghidra --- include/Player/HealthManager.hpp | 27 --------------------------- include/Player/LinkStateBase.hpp | 2 ++ include/Player/LinkStateCutscene.hpp | 2 ++ include/Player/LinkStateDamage.hpp | 2 ++ include/Player/LinkStateFollow.hpp | 2 ++ include/Player/LinkStateInteract.hpp | 2 ++ include/Player/LinkStateItem.hpp | 2 ++ include/Player/LinkStateMove.hpp | 2 ++ include/Player/LinkStateRoll.hpp | 2 ++ include/Player/PlayerBase.hpp | 2 ++ include/Player/PlayerControl.hpp | 8 ++++++++ include/Player/PlayerControlData.hpp | 2 ++ include/Player/PlayerLinkBase.hpp | 2 ++ include/Player/PlayerManager.hpp | 34 ++++++++++++++++++++++++++++++++++ 14 files changed, 64 insertions(+), 27 deletions(-) delete mode 100644 include/Player/HealthManager.hpp create mode 100644 include/Player/PlayerManager.hpp (limited to 'include/Player') diff --git a/include/Player/HealthManager.hpp b/include/Player/HealthManager.hpp deleted file mode 100644 index 7e36decc..00000000 --- a/include/Player/HealthManager.hpp +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include "global.h" -#include "types.h" - -#include "Save/SaveItemManager.hpp" -#include "System/SysNew.hpp" - -class HealthManager : public SysObject { -public: - /* 00 */ u16 mMaxHealth; - /* 02 */ u16 mHealth; - /* 04 */ s16 mMaxShipHealth; - /* 06 */ s16 mShipHealth; - /* 08 */ u16 mSalvageArmHealth; - /* 0a */ s16 mFlags; - /* 0c */ unk16 mUnk_0c; - /* 0e */ unk8 mUnk_0e; - /* 0f */ unk8 mUnk_0f; - /* 10 */ - - void Save(SaveItemManager *save); - void IncreaseMaxHealth(s16 amount); - void UpdateShipMaxHealth(); -}; - -extern HealthManager *gHealthManager; diff --git a/include/Player/LinkStateBase.hpp b/include/Player/LinkStateBase.hpp index f3ac5087..b7f7800a 100644 --- a/include/Player/LinkStateBase.hpp +++ b/include/Player/LinkStateBase.hpp @@ -127,6 +127,8 @@ public: s32 Get_PlayerLinkBase_Unk38(); DebugHierarchy *GetDebugHierarchy0(); DebugHierarchy *GetDebugHierarchy1(); + + LinkStateBase(PlayerLinkBase *link); }; LinkStateBase *GetLinkState(s32 index); diff --git a/include/Player/LinkStateCutscene.hpp b/include/Player/LinkStateCutscene.hpp index 52b40e42..3c343b94 100644 --- a/include/Player/LinkStateCutscene.hpp +++ b/include/Player/LinkStateCutscene.hpp @@ -96,4 +96,6 @@ public: void func_ov000_020b3278(s32 param1, s32 *param2); void func_ov000_020b35d8(s32 param1, s32 param2); void func_ov000_020b38dc(u32 param1, u32 param2); + + LinkStateCutscene(PlayerLinkBase *link); }; diff --git a/include/Player/LinkStateDamage.hpp b/include/Player/LinkStateDamage.hpp index 1c59d90e..0e3a70a7 100644 --- a/include/Player/LinkStateDamage.hpp +++ b/include/Player/LinkStateDamage.hpp @@ -48,4 +48,6 @@ class LinkStateDamage : public LinkStateBase { void func_ov00_020ace90(Vec3p *param1, unk32 param2); void func_ov00_020acfe8(bool param1); + + LinkStateDamage(PlayerLinkBase *link); }; diff --git a/include/Player/LinkStateFollow.hpp b/include/Player/LinkStateFollow.hpp index 09de008e..1d9a5403 100644 --- a/include/Player/LinkStateFollow.hpp +++ b/include/Player/LinkStateFollow.hpp @@ -37,4 +37,6 @@ public: LinkStateCutscene *GetLinkStateCutscene(); bool func_ov00_020a9180(Vec3p *param1); bool func_ov00_020a9210(Vec3p *param1, Actor *param2); + + LinkStateFollow(PlayerLinkBase *link); }; diff --git a/include/Player/LinkStateInteract.hpp b/include/Player/LinkStateInteract.hpp index 55081c8a..d0bacf2d 100644 --- a/include/Player/LinkStateInteract.hpp +++ b/include/Player/LinkStateInteract.hpp @@ -53,4 +53,6 @@ public: void func_ov00_020abc18(ActorRef *ref); bool func_ov00_020abc40(); bool func_ov00_020abc78(ActorRef *ref); + + LinkStateInteract(PlayerLinkBase *link); }; diff --git a/include/Player/LinkStateItem.hpp b/include/Player/LinkStateItem.hpp index 0c5f4a4d..d9c6659b 100644 --- a/include/Player/LinkStateItem.hpp +++ b/include/Player/LinkStateItem.hpp @@ -50,4 +50,6 @@ public: static EquipBombchu *GetEquipBombchu(); static LinkStateMove *GetLinkStateMove(); bool func_ov00_020abf70(); + + LinkStateItem(PlayerLinkBase *link); }; diff --git a/include/Player/LinkStateMove.hpp b/include/Player/LinkStateMove.hpp index e56eee3c..a8f8d846 100644 --- a/include/Player/LinkStateMove.hpp +++ b/include/Player/LinkStateMove.hpp @@ -29,4 +29,6 @@ public: bool func_ov00_020a8f2c(); bool func_ov00_020a8f4c(); + + LinkStateMove(PlayerLinkBase *link); }; diff --git a/include/Player/LinkStateRoll.hpp b/include/Player/LinkStateRoll.hpp index 52b42b43..3185f511 100644 --- a/include/Player/LinkStateRoll.hpp +++ b/include/Player/LinkStateRoll.hpp @@ -43,4 +43,6 @@ public: void func_ov00_020aee58(s16 param1, u16 param2); void func_ov00_020aee84(); bool func_ov00_020aeeac(); + + LinkStateRoll(PlayerLinkBase *link); }; diff --git a/include/Player/PlayerBase.hpp b/include/Player/PlayerBase.hpp index 578f3e27..893335bb 100644 --- a/include/Player/PlayerBase.hpp +++ b/include/Player/PlayerBase.hpp @@ -57,6 +57,8 @@ public: bool EquipCollidesWith(Cylinder *cylinder, ItemFlag equipId); s32 EquipItem_vfunc_2c(); void SetHealth(s16 health); + + PlayerBase(); }; extern PlayerBase *gPlayer; diff --git a/include/Player/PlayerControl.hpp b/include/Player/PlayerControl.hpp index d8db3f65..f2cc23eb 100644 --- a/include/Player/PlayerControl.hpp +++ b/include/Player/PlayerControl.hpp @@ -130,6 +130,14 @@ public: void func_ov000_020b7924(s32 param1); void ApplyTouchWorld(Vec3p *result, unk32 scale); bool func_ov000_020b7d6c(); + + PlayerControl(); + ~PlayerControl(); + static void Create(); + static void Destroy(); + void Init(); + void func_ov004_0210b1d0(); + static void func_ov004_0210b1f0(); }; extern PlayerControl *gPlayerControl; diff --git a/include/Player/PlayerControlData.hpp b/include/Player/PlayerControlData.hpp index f309953c..99802698 100644 --- a/include/Player/PlayerControlData.hpp +++ b/include/Player/PlayerControlData.hpp @@ -102,4 +102,6 @@ public: void func_ov000_020b484c(s32 param1, s32 param2, s32 param3); void func_ov000_020b4944(unk32 param1, u32 param2, s32 param3); void func_ov000_020b4a00(s32 *param1, s32 *param2, s32 *param3, s32 param4); + + PlayerControlData(); }; diff --git a/include/Player/PlayerLinkBase.hpp b/include/Player/PlayerLinkBase.hpp index b617920b..e167d4d5 100644 --- a/include/Player/PlayerLinkBase.hpp +++ b/include/Player/PlayerLinkBase.hpp @@ -152,6 +152,8 @@ public: void SetPosition(Vec3p *position); void SetAngle(s16 *angle); bool func_ov000_020bd510(s32 param1, unk32 *param2); + + PlayerLinkBase(); }; extern PlayerLinkBase *gPlayerLink; diff --git a/include/Player/PlayerManager.hpp b/include/Player/PlayerManager.hpp new file mode 100644 index 00000000..63d4b303 --- /dev/null +++ b/include/Player/PlayerManager.hpp @@ -0,0 +1,34 @@ +#pragma once + +#include "global.h" +#include "types.h" + +#include "Save/SaveItemManager.hpp" +#include "System/SysNew.hpp" + +class PlayerManager : public SysObject { +public: + /* 00 */ u16 mMaxHealth; + /* 02 */ u16 mHealth; + /* 04 */ s16 mMaxShipHealth; + /* 06 */ s16 mShipHealth; + /* 08 */ u16 mSalvageArmHealth; + /* 0a */ s16 mFlags; + /* 0c */ unk16 mUnk_0c; + /* 0e */ unk8 mUnk_0e; + /* 0f */ unk8 mUnk_0f; + /* 10 */ + + void Save(SaveItemManager *save); + void IncreaseMaxHealth(s16 amount); + void UpdateShipMaxHealth(); + + static void Create(); + static void Destroy(); + PlayerManager(); + ~PlayerManager(); + void Init(bool param1); + void func_ov004_02108008(); +}; + +extern PlayerManager *gPlayerManager; -- cgit v1.2.3