diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-26 14:29:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-26 14:29:44 -0400 |
| commit | f9f91be60a6e21eb2c9bd87ac67865e05296eab8 (patch) | |
| tree | 230f93ac894e13bd9043d11cef2a4b6f7f35ef2f /src/trainer_see.c | |
| parent | d6571f2355d356431809668e8e905606a28ce7cf (diff) | |
| parent | bd9ea239256ecdb716e31c9063102cf52f972f93 (diff) | |
Merge pull request #1527 from cbt6/field-player
Document field player functions
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 ec3dc8123..ce06c5e9c 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -523,7 +523,7 @@ static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct O if (ObjectEventIsMovementOverridden(playerObj) && !ObjectEventClearHeldMovementIfFinished(playerObj)) return FALSE; - sub_808BCE8(); + CancelPlayerForcedMovement(); ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection))); task->tFuncId++; // TRSEE_PLAYER_FACE_WAIT return FALSE; |