diff options
| author | SammygoodTunes <56520787+SammygoodTunes@users.noreply.github.com> | 2025-05-11 11:49:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-11 11:49:54 +0200 |
| commit | fd8700c1914b6723ff739997796e21025d6fc56f (patch) | |
| tree | c8e8d1d848dbf567e8db8a4b1266e71b26aedb4b /include/Player | |
| parent | 1eeb1b1b5421c645188ae45fd3b144de563eff00 (diff) | |
| parent | a6df0608a8fb9065c0239114daa81599821c119e (diff) | |
Merge branch 'main' into decomp/MapManager
Diffstat (limited to 'include/Player')
| -rw-r--r-- | include/Player/LinkStateMove.hpp | 5 | ||||
| -rw-r--r-- | include/Player/PlayerBase.hpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/Player/LinkStateMove.hpp b/include/Player/LinkStateMove.hpp index 9b369e9c..0b197a27 100644 --- a/include/Player/LinkStateMove.hpp +++ b/include/Player/LinkStateMove.hpp @@ -12,8 +12,9 @@ public: /* 10 */ unk16 mUnk_10; /* 12 */ unk16 mUnk_12; /* 14 */ bool mUnk_14; - /* 14 */ bool mUnk_15; - /* 16 */ unk8 mUnk_16[2]; + /* 15 */ bool mUnk_15; + /* 16 */ bool mUnk_16; + /* 17 */ bool mUnk_17; /* 18 */ /* 00 */ virtual void vfunc_00() override; diff --git a/include/Player/PlayerBase.hpp b/include/Player/PlayerBase.hpp index ba4b3deb..d2ffea38 100644 --- a/include/Player/PlayerBase.hpp +++ b/include/Player/PlayerBase.hpp @@ -48,8 +48,8 @@ public: void SetUpdatePos(bool updatePos); void SetVisible(bool visible); - EquipSword *GetEquipSword(); - EquipShield *GetEquipShield(); + static EquipSword *GetEquipSword(); + static EquipShield *GetEquipShield(); void LookAt(Vec3p *target); bool func_ov00_020a7c00(s32 param1); bool CollidesWith(Cylinder *cylinder); |