diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-24 23:19:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 23:19:48 -0400 |
| commit | 35b68c68ee565b9b232252e4f37ea082e9310560 (patch) | |
| tree | aeacb544f27db8f63b17b7e808b28f4a1e12acde /src/trainer_see.c | |
| parent | d8b76e6fb545efd69bfb18322a67243520e4d11d (diff) | |
| parent | 7f70b570dd2e18a34a2c0ee558f404c15c77371c (diff) | |
Merge pull request #404 from PikalaxALT/misc_doc
[PARTIALLY LEAK INFORMED] Miscellaneous cleanup and documentation
Diffstat (limited to 'src/trainer_see.c')
| -rw-r--r-- | src/trainer_see.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/trainer_see.c b/src/trainer_see.c index 644b87c37..cd7e23ac8 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -356,7 +356,7 @@ static bool8 TrainerSeeFunc_PrepareToEngage(u8 taskId, struct Task * task, struc if (ObjectEventIsMovementOverridden(playerObj) && !ObjectEventClearHeldMovementIfFinished(playerObj)) return FALSE; - sub_805C774(); + CancelPlayerForcedMovement(); // Uncomment to have player turn to face their opponent // ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection))); task->tFuncId++; |