Merge branch 'master' into document-eventscripts

2019-09-17 00:10:23 -04:00
parent f4160ded98 06af24bce5
commit 945d3d3a27
161 changed files with 12548 additions and 11791 deletions
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -1290,7 +1290,7 @@ static bool32 sub_81963F0(u8 taskId)
            sub_81973A4();
            playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
            EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]);
-            sub_80D338C();
+            ScriptMovement_UnfreezeEventObjects();
            UnfreezeEventObjects();
            ScriptContext2_Disable();
        }