Merge branch 'master' into document-eventscripts

This commit is contained in:
GriffinR
2019-09-17 18:01:20 -04:00
committed by GitHub
49 changed files with 1225 additions and 982 deletions
+1 -1
View File
@@ -418,7 +418,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
setflag FLAG_DEFEATED_PETALBURG_GYM
setvar VAR_PETALBURG_GYM_STATE, 7
setflag FLAG_BADGE05_GET
special sub_813B9A0
special ResetHealLocationFromDewford
call PetalburgCity_Gym_EventScript_2721F8
setflag FLAG_HIDE_MAUVILLE_GYM_WATTSON
clearflag FLAG_HIDE_MAUVILLE_CITY_WATTSON