diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-16 07:51:21 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-16 07:51:21 -0400 |
| commit | 0367cc7d7884ff4100b90832ac000a3e415d2896 (patch) | |
| tree | a06d1aa77e267d20d0d925477fc27ffb303594a8 /src/script_movement.c | |
| parent | 9c2e157123903ba18ee51655c42c7304517b37cc (diff) | |
| parent | f44f89a463d7280a95094e8f37a56873a90da843 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into pokemon_storage_system
Diffstat (limited to 'src/script_movement.c')
| -rw-r--r-- | src/script_movement.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script_movement.c b/src/script_movement.c index 7503e8f44..55c26ded8 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -205,7 +205,7 @@ static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 objEventId, cons if (IsMovementScriptFinished(taskId, moveScrId) == TRUE) return; - if (ObjectEventIsSpecialAnimActive(&gObjectEvents[objEventId]) + if (ObjectEventIsHeldMovementActive(&gObjectEvents[objEventId]) && !ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId])) return; |