diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2019-09-17 00:10:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-17 00:10:23 -0400 |
commit | 945d3d3a27f6e5005e5481bb2ad36f1a2a220d3d (patch) | |
tree | 7dc8f5a21c6bb7640aad82de03a314b0e919f3b2 /src/scrcmd.c | |
parent | f4160ded9897f65e5ee7fa7050d195dfaa5bf5b2 (diff) | |
parent | 06af24bce58b9285166d27fc371ad3c3dbb63a29 (diff) |
Merge branch 'master' into document-eventscripts
Diffstat (limited to 'src/scrcmd.c')
-rw-r--r-- | src/scrcmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index 0326a56a4..560784c47 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1247,7 +1247,7 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx) HideFieldMessageBox(); playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - sub_80D338C(); + ScriptMovement_UnfreezeEventObjects(); UnfreezeEventObjects(); return FALSE; } @@ -1261,7 +1261,7 @@ bool8 ScrCmd_release(struct ScriptContext *ctx) EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - sub_80D338C(); + ScriptMovement_UnfreezeEventObjects(); UnfreezeEventObjects(); return FALSE; } |