diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-24 16:02:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-24 16:02:31 -0500 |
| commit | 3b558edc7906b2a75b7d65aa396c611ce1802e62 (patch) | |
| tree | 5858e6933a00ccb2ec24385fc080e6115c9a4eb6 /src/event_object_lock.c | |
| parent | a0fa06a066dd2261dfdfb87ea5fd8a4ecb3fa634 (diff) | |
| parent | 3666a47d1cf9ee654f198bf79f632187b608afa1 (diff) | |
Merge pull request #267 from PikalaxALT/script_movement
Port script_movement
Diffstat (limited to 'src/event_object_lock.c')
| -rw-r--r-- | src/event_object_lock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/event_object_lock.c b/src/event_object_lock.c index 2bb9736aa..02f0557f2 100644 --- a/src/event_object_lock.c +++ b/src/event_object_lock.c @@ -87,7 +87,7 @@ void sub_80696C0(void) { u8 objectEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]); - sub_80974D8(); + ScriptMovement_UnfreezeObjectEvents(); UnfreezeObjectEvents(); } @@ -98,7 +98,7 @@ void UnionRoom_UnlockPlayerAndChatPartner(void) ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); objectEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]); - sub_80974D8(); + ScriptMovement_UnfreezeObjectEvents(); UnfreezeObjectEvents(); } |