diff options
| author | SammygoodTunes <56520787+SammygoodTunes@users.noreply.github.com> | 2025-04-01 21:25:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-01 21:25:38 +0200 |
| commit | 3376d55c856262c43c731272a499bf41ba50feea (patch) | |
| tree | a113b273f81cac78a5a11bceaa87b4921d36f6cb /include/Player | |
| parent | 7608f9c8086f3978dde9bf285f4fff592f67f085 (diff) | |
| parent | abc53b54ecb15e06a54634ea67be9369b858e9ec (diff) | |
Merge branch 'main' into decomp/MapManager
Diffstat (limited to 'include/Player')
| -rw-r--r-- | include/Player/PlayerBase.hpp | 2 | ||||
| -rw-r--r-- | include/Player/PlayerLinkBase.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/Player/PlayerBase.hpp b/include/Player/PlayerBase.hpp index f813d770..f7caf604 100644 --- a/include/Player/PlayerBase.hpp +++ b/include/Player/PlayerBase.hpp @@ -29,7 +29,7 @@ public: /* 0c */ virtual bool CanMove(); /* 10 */ virtual void vfunc_10(Cylinder *param1) = 0; /* 14 */ virtual void vfunc_14(Cylinder *param1) = 0; - /* 18 */ virtual void vfunc_18() = 0; + /* 18 */ virtual bool vfunc_18(s32 param1) = 0; /* 1c */ virtual void Init() = 0; /* 20 */ virtual void vfunc_20() = 0; /* 24 */ virtual void UpdatePos() = 0; diff --git a/include/Player/PlayerLinkBase.hpp b/include/Player/PlayerLinkBase.hpp index 2a208365..b5bf77ed 100644 --- a/include/Player/PlayerLinkBase.hpp +++ b/include/Player/PlayerLinkBase.hpp @@ -50,7 +50,7 @@ public: /* 0c */ virtual bool CanMove() override; /* 10 */ virtual void vfunc_10(Cylinder *param1) override; /* 14 */ virtual void vfunc_14(Cylinder *param1) override; - /* 18 */ virtual void vfunc_18(s32 param1) override; + /* 18 */ virtual bool vfunc_18(s32 param1) override; /* 1c */ virtual void Init() override; /* 20 */ virtual void vfunc_20() override; /* 24 */ virtual void UpdatePos() override; |