Merge branch 'master' into gflib

2019-09-27 09:11:22 -04:00
parent 27aae9da9a 208e1c9689
commit 7b8b5b5c8c
217 changed files with 5479 additions and 5086 deletions
@@ -55,7 +55,7 @@ void FinishMossdeepGymTiles(void)

    id = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
    EventObjectClearHeldMovementIfFinished(&gEventObjects[id]);
-    sub_80D338C();
+    ScriptMovement_UnfreezeEventObjects();
 }

 u16 MossdeepGym_MoveEvents(u8 arg0)