Merge branch 'master' into doc-partymenu

This commit is contained in:
GriffinR
2019-10-31 14:22:51 -04:00
committed by GitHub
219 changed files with 7959 additions and 7663 deletions

View File

@@ -102,7 +102,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
setflag FLAG_HIDE_ROUTE_109_MR_BRINEY
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
@@ -117,7 +117,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_PETALBURG_GYM_GREETER
setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
setflag FLAG_HIDE_PLAYERS_HOUSE_DAD