summaryrefslogtreecommitdiff
path: root/data/maps/hide_show_data.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/hide_show_data.asm')
-rw-r--r--data/maps/hide_show_data.asm38
1 files changed, 26 insertions, 12 deletions
diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm
index f54e484a..6d5d4aa6 100644
--- a/data/maps/hide_show_data.asm
+++ b/data/maps/hide_show_data.asm
@@ -66,7 +66,7 @@ MapHSPointers:
dw NoHS
dw MtMoonB2FHS
dw NoHS
- dw NoHS
+ dw CeruleanMelaniesHouseHS
dw NoHS
dw NoHS
dw NoHS
@@ -251,6 +251,7 @@ MapHSPointers:
dw NoHS
dw NoHS
dw NoHS
+ dw NoHS
assert_table_length NUM_MAPS
dw -1 ; end
@@ -267,6 +268,7 @@ PalletTownHS:
ViridianCityHS:
db VIRIDIAN_CITY, $05, SHOW
db VIRIDIAN_CITY, $07, HIDE
+ db VIRIDIAN_CITY, $08, HIDE
PewterCityHS:
db PEWTER_CITY, $03, SHOW
db PEWTER_CITY, $05, SHOW
@@ -322,21 +324,22 @@ BluesHouseHS:
OaksLabHS:
db OAKS_LAB, $01, SHOW
db OAKS_LAB, $02, SHOW
- db OAKS_LAB, $03, SHOW
+ db OAKS_LAB, $03, HIDE
db OAKS_LAB, $04, SHOW
- db OAKS_LAB, $05, HIDE
- db OAKS_LAB, $06, SHOW
- db OAKS_LAB, $07, SHOW
- db OAKS_LAB, $08, HIDE
+ db OAKS_LAB, $05, SHOW
+ db OAKS_LAB, $06, HIDE
ViridianGymHS:
db VIRIDIAN_GYM, $01, SHOW
db VIRIDIAN_GYM, $0B, SHOW
Museum1FHS:
db MUSEUM_1F, $05, SHOW
+CeruleanMelaniesHouseHS:
+ db CERULEAN_MELANIES_HOUSE, $02, SHOW
CeruleanCaveHS:
db CERULEAN_CAVE_1F, $01, SHOW
db CERULEAN_CAVE_1F, $02, SHOW
db CERULEAN_CAVE_1F, $03, SHOW
+ db CERULEAN_CAVE_1F, $04, SHOW
PokemonTower2FHS:
db POKEMON_TOWER_2F, $01, SHOW
PokemonTower3FHS:
@@ -351,10 +354,9 @@ PokemonTower6FHS:
db POKEMON_TOWER_6F, $04, SHOW
db POKEMON_TOWER_6F, $05, SHOW
PokemonTower7FHS:
- db POKEMON_TOWER_7F, $01, SHOW
- db POKEMON_TOWER_7F, $02, SHOW
+ db POKEMON_TOWER_7F, $01, HIDE ; jessie & james?
+ db POKEMON_TOWER_7F, $02, HIDE
db POKEMON_TOWER_7F, $03, SHOW
- db POKEMON_TOWER_7F, $04, SHOW
MrFujisHouseHS:
db MR_FUJIS_HOUSE, $05, HIDE
CeladonMansionRoofHouseHS:
@@ -398,9 +400,9 @@ BillsHouseHS:
db BILLS_HOUSE, $02, HIDE
db BILLS_HOUSE, $03, HIDE
ViridianForestHS:
- db VIRIDIAN_FOREST, $05, SHOW
- db VIRIDIAN_FOREST, $06, SHOW
db VIRIDIAN_FOREST, $07, SHOW
+ db VIRIDIAN_FOREST, $08, SHOW
+ db VIRIDIAN_FOREST, $09, SHOW
MtMoon1FHS:
db MT_MOON_1F, $08, SHOW
db MT_MOON_1F, $09, SHOW
@@ -409,10 +411,12 @@ MtMoon1FHS:
db MT_MOON_1F, $0C, SHOW
db MT_MOON_1F, $0D, SHOW
MtMoonB2FHS:
- db MT_MOON_B2F, $06, SHOW
+ db MT_MOON_B2F, $02, HIDE
+ db MT_MOON_B2F, $06, HIDE
db MT_MOON_B2F, $07, SHOW
db MT_MOON_B2F, $08, SHOW
db MT_MOON_B2F, $09, SHOW
+ db MT_MOON_B2F, $0A, SHOW
SSAnne2FHS:
db SS_ANNE_2F, $02, HIDE
SSAnne1FRoomsHS:
@@ -441,6 +445,8 @@ RocketHideoutB3FHS:
db ROCKET_HIDEOUT_B3F, $04, SHOW
RocketHideoutB4FHS:
db ROCKET_HIDEOUT_B4F, $01, SHOW
+ db ROCKET_HIDEOUT_B4F, $02, HIDE
+ db ROCKET_HIDEOUT_B4F, $03, HIDE
db ROCKET_HIDEOUT_B4F, $05, SHOW
db ROCKET_HIDEOUT_B4F, $06, SHOW
db ROCKET_HIDEOUT_B4F, $07, SHOW
@@ -505,6 +511,7 @@ SilphCo11FHS:
db SILPH_CO_11F, $03, SHOW
db SILPH_CO_11F, $04, SHOW
db SILPH_CO_11F, $05, SHOW
+ db SILPH_CO_11F, $06, SHOW
UnusedMapF4HS:
db UNUSED_MAP_F4, $02, SHOW
PokemonMansion2FHS:
@@ -537,10 +544,13 @@ CeruleanCave2FHS:
db CERULEAN_CAVE_2F, $01, SHOW
db CERULEAN_CAVE_2F, $02, SHOW
db CERULEAN_CAVE_2F, $03, SHOW
+ db CERULEAN_CAVE_2F, $04, SHOW
CeruleanCaveB1FHS:
db CERULEAN_CAVE_B1F, $01, SHOW
db CERULEAN_CAVE_B1F, $02, SHOW
db CERULEAN_CAVE_B1F, $03, SHOW
+ db CERULEAN_CAVE_B1F, $04, SHOW
+ db CERULEAN_CAVE_B1F, $05, SHOW
VictoryRoad1FHS:
db VICTORY_ROAD_1F, $03, SHOW
db VICTORY_ROAD_1F, $04, SHOW
@@ -564,5 +574,9 @@ SeafoamIslandsB4FHS:
db SEAFOAM_ISLANDS_B4F, $01, HIDE
db SEAFOAM_ISLANDS_B4F, $02, HIDE
db SEAFOAM_ISLANDS_B4F, $03, SHOW
+BluesHouseHSCopy: ; unreferenced
+ db BLUES_HOUSE, $01, SHOW
+ db BLUES_HOUSE, $02, HIDE
+ db BLUES_HOUSE, $03, SHOW
db $FF, $01, SHOW ; end
assert_table_length NUM_HS_OBJECTS + 1