Merge branch 'master' into document-eventscripts

This commit is contained in:
GriffinR authored and GitHub committed 2019-09-17 00:10:23 -04:00
commit 945d3d3a27
161 files changed
+12548 -11791

No files matched your search

@@ -35,7 +35,7 @@ BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9
BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3
setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, 2
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD