diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-16 07:51:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-16 07:51:08 -0400 |
| commit | f44f89a463d7280a95094e8f37a56873a90da843 (patch) | |
| tree | 194662b15b39fb223bd20b17ea696ff525ebab0d /src/script_movement.c | |
| parent | 4a7c1d888a9f90b9102f469aab12beeab89ffff6 (diff) | |
| parent | e1f7efb8e67fb5587a8baf20f421c20e134e8b24 (diff) | |
Merge pull request #300 from ultima-soul/event_object_movement
Decompile/port event_object_movement
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; |