Merge branch 'master' into apprentice

This commit is contained in:
DizzyEggg committed 2018-10-14 15:07:16 +02:00
commit 84936b4260
29 files changed
+1378 -2896

No files matched your search

@@ -929,7 +929,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7
BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
setvar VAR_0x8004, 9
message OldaleTown_PokemonCenter_2F_Text_278091
message gText_PleaseWaitForLink
waitmessage
setvar VAR_0x8005, 0
special sub_80B2DA4