Merge branch 'master' into document-eventscripts

This commit is contained in:
GriffinR
2019-09-17 00:10:23 -04:00
committed by GitHub
161 changed files with 12548 additions and 11791 deletions

View File

@@ -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