diff options
| author | Aetias <aetias@outlook.com> | 2024-10-21 20:36:15 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-10-21 20:36:15 +0200 |
| commit | a62cc074e93cdd77605bddcd145a96d3cfa7618d (patch) | |
| tree | 31f0d5bf0872b316643d543957ea2a6d22e632e2 /include/Player/PlayerLinkBase.hpp | |
| parent | 5c3e3aee99af35884462f518a9bc1fbf65ae92d4 (diff) | |
| parent | f4c5e4862419a14487575bf477118458c0e4a289 (diff) | |
Merge branch 'main' into actor-manager
Diffstat (limited to 'include/Player/PlayerLinkBase.hpp')
| -rw-r--r-- | include/Player/PlayerLinkBase.hpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/include/Player/PlayerLinkBase.hpp b/include/Player/PlayerLinkBase.hpp index 09eefeb1..02cf3219 100644 --- a/include/Player/PlayerLinkBase.hpp +++ b/include/Player/PlayerLinkBase.hpp @@ -1,24 +1,22 @@ #pragma once #include "global.h" -#include "types.h" #include "lib/math.h" - -#include "Player/PlayerBase.hpp" -#include "Player/MotionParams.hpp" +#include "types.h" #include "Actor/ActorManager.hpp" - #include "Debug/DebugHierarchy.hpp" +#include "Player/MotionParams.hpp" +#include "Player/PlayerBase.hpp" typedef s32 PlayerCharacter; enum PlayerCharacter_ { - PlayerCharacter_Link = 0, + PlayerCharacter_Link = 0, PlayerCharacter_Gongoron = 1, - PlayerCharacter_COUNT = 2, + PlayerCharacter_COUNT = 2, }; -class PlayerLinkBase: public PlayerBase { +class PlayerLinkBase : public PlayerBase { public: /* 00 (base) */ /* 14 */ Vec3p mPos; @@ -44,7 +42,7 @@ public: /* 68 */ DebugHierarchy *mDebugHierarchy_1; /* 6c */ DebugHierarchy *mDebugHierarchy_2; /* 70 */ - + /* 00 */ s32 GetMaxHealth() override; /* 08 */ ItemFlag GetEquipId() override; /* 0c */ bool CanMove() override; @@ -77,6 +75,7 @@ public: bool func_ov00_020bbd80(s32 param1); void func_ov00_020bc854(Vec3p *param1); + bool func_ov00_020bce48(ItemId cutsceneItemId); // PlayItemCutscene bool func_ov00_020bd304(); bool GongoronCollidesWith(Cylinder *hitbox); s32 GetGrabActorId(); |