diff options
| author | Aetias <144526980+AetiasHax@users.noreply.github.com> | 2025-05-26 21:35:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-26 21:35:20 +0200 |
| commit | 59a5cc5da29bd84680ceeaf2c2eeabe9effb6b6d (patch) | |
| tree | 3b4316c804d44cd46bf12d27f3c76d89abe2c97d /src/05/Player/LinkStateMove.cpp | |
| parent | 3f6a81d03dec2bd7c8394b508dbe4f017a5244b9 (diff) | |
| parent | 8f6142e4fdd1195541e3f1ecc08ddf961f3b046c (diff) | |
Merge pull request #71 from AetiasHax/decomp-PlayerControl
Decomp `src/00_Core/Player/PlayerControl.cpp` (99%)
Diffstat (limited to 'src/05/Player/LinkStateMove.cpp')
| -rw-r--r-- | src/05/Player/LinkStateMove.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/05/Player/LinkStateMove.cpp b/src/05/Player/LinkStateMove.cpp index 815d9060..0ca48089 100644 --- a/src/05/Player/LinkStateMove.cpp +++ b/src/05/Player/LinkStateMove.cpp @@ -200,6 +200,7 @@ ARM void LinkStateMove::vfunc_1c() { } } ActorRef sp4; + sp4.Reset(); this->PlayerLinkBase_vfunc_58(0, &sp4); return; } @@ -207,7 +208,7 @@ ARM void LinkStateMove::vfunc_1c() { } ARM bool LinkStateMove::vfunc_3c() { - if ((gPlayerControl->GetFollowActor() == NULL) && (gPlayerControl->mFollowActor == NULL) && + if ((gPlayerControl->GetFollowActor() == NULL) && (gPlayerControl->mFollowObject == NULL) && (this->Get_PlayerControlData_Unk120() != 2) && (this->Get_PlayerControlData_Unk120() != 3)) { return true; |