diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-26 15:02:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-26 15:02:38 -0400 |
| commit | 1016b239186097361ea20f2f91adf3932026f40c (patch) | |
| tree | 840a0f28046d3c66fcaf1c2bb8ab3228386a3a8a /src/event_obj_lock.c | |
| parent | bb236b490d99fef02ed172e7ca86f6c70ef09527 (diff) | |
| parent | 208e1c968959c781562f0b94c03368385ce7012c (diff) | |
Merge branch 'master' into rename-tablecmds
Diffstat (limited to 'src/event_obj_lock.c')
| -rw-r--r-- | src/event_obj_lock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/event_obj_lock.c b/src/event_obj_lock.c index 566b4931d..22a29fd5d 100644 --- a/src/event_obj_lock.c +++ b/src/event_obj_lock.c @@ -92,7 +92,7 @@ void ScriptUnfreezeEventObjects(void) { u8 playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - sub_80D338C(); + ScriptMovement_UnfreezeEventObjects(); UnfreezeEventObjects(); } @@ -104,7 +104,7 @@ void sub_8098524(void) EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - sub_80D338C(); + ScriptMovement_UnfreezeEventObjects(); UnfreezeEventObjects(); } |