Merge branch 'master' into doc-scriptclean

This commit is contained in:
GriffinR authored and GitHub committed 2019-11-13 19:25:41 -05:00
commit ff7e11c0b0
113 files changed
+3816 -3895

No files matched your search

@@ -1015,7 +1015,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3DA:: @ 823F3DA
end
BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8
setvar VAR_0x8004, 20
setvar VAR_0x8004, LINK_GROUP_BATTLE_TOWER
goto BattleFrontier_BattleTowerLobby_EventScript_23F3F3
end