diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index a36dd943..30e38c68 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -190,9 +190,9 @@ DEF SHOW EQU $15 const HS_SILPH_CO_7F_RIVAL ; B1 const HS_SILPH_CO_7F_ITEM_1 ; B2 X const HS_SILPH_CO_7F_ITEM_2 ; B3 X - const HS_SILPH_CO_8F_1 ; B4 - const HS_SILPH_CO_8F_2 ; B5 - const HS_SILPH_CO_8F_3 ; B6 + ;const HS_SILPH_CO_8F_1 ; B4 + ;const HS_SILPH_CO_8F_2 ; B5 + ;const HS_SILPH_CO_8F_3 ; B6 const HS_SILPH_CO_10F_1 ; B7 const HS_SILPH_CO_10F_2 ; B8 const HS_SILPH_CO_10F_ITEM_1 ; B9 X diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 2e23c08a..8911a2ab 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -235,7 +235,7 @@ DEF FIRST_INDOOR_MAP EQU const_value map_const SILPH_CO_5F, 15, 9 ; $D3 map_const SILPH_CO_6F, 13, 9 ; $D4 map_const SILPH_CO_7F, 13, 9 ; $D5 - map_const SILPH_CO_8F, 13, 9 ; $D6 + ;map_const SILPH_CO_8F, 13, 9 ; $D6 map_const POKEMON_MANSION_2F, 15, 14 ; $D7 map_const POKEMON_MANSION_3F, 15, 9 ; $D8 map_const POKEMON_MANSION_B1F, 15, 14 ; $D9 diff --git a/data/events/card_key_coords.asm b/data/events/card_key_coords.asm index afdcfbd4..efe393fb 100644 --- a/data/events/card_key_coords.asm +++ b/data/events/card_key_coords.asm @@ -24,8 +24,8 @@ CardKeyTable2: db SILPH_CO_5F, $05, $07, 13 db SILPH_CO_6F, $0C, $05, 14 db SILPH_CO_6F, $0D, $05, 15 - db SILPH_CO_8F, $08, $07, 16 - db SILPH_CO_8F, $09, $07, 17 + ;db SILPH_CO_8F, $08, $07, 16 + ;db SILPH_CO_8F, $09, $07, 17 db SILPH_CO_9F, $08, $03, 18 db SILPH_CO_9F, $09, $03, 19 db -1 ; end diff --git a/data/events/card_key_maps.asm b/data/events/card_key_maps.asm index c66f31d9..4c826fd8 100644 --- a/data/events/card_key_maps.asm +++ b/data/events/card_key_maps.asm @@ -5,7 +5,7 @@ SilphCoMapList: db SILPH_CO_5F db SILPH_CO_6F db SILPH_CO_7F - db SILPH_CO_8F + ;db SILPH_CO_8F db SILPH_CO_9F db SILPH_CO_10F db SILPH_CO_11F diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 2bfe5e2d..df5178ed 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -219,7 +219,7 @@ MapHSPointers: dw SilphCo5FHS dw SilphCo6FHS dw SilphCo7FHS - dw SilphCo8FHS + ;dw SilphCo8FHS dw PokemonMansion2FHS dw PokemonMansion3FHS dw PokemonMansionB1FHS @@ -511,10 +511,10 @@ SilphCo7FHS: db SILPH_CO_7F, $09, SHOW ; HS_SILPH_CO_7F_RIVAL db SILPH_CO_7F, $0A, SHOW ; HS_SILPH_CO_7F_ITEM_1 db SILPH_CO_7F, $0B, SHOW ; HS_SILPH_CO_7F_ITEM_2 -SilphCo8FHS: - db SILPH_CO_8F, $02, SHOW ; HS_SILPH_CO_8F_1 - db SILPH_CO_8F, $03, SHOW ; HS_SILPH_CO_8F_2 - db SILPH_CO_8F, $04, SHOW ; HS_SILPH_CO_8F_3 +;SilphCo8FHS: +; db SILPH_CO_8F, $02, SHOW ; HS_SILPH_CO_8F_1 +; db SILPH_CO_8F, $03, SHOW ; HS_SILPH_CO_8F_2 +; db SILPH_CO_8F, $04, SHOW ; HS_SILPH_CO_8F_3 SilphCo10FHS: db SILPH_CO_10F, $01, SHOW ; HS_SILPH_CO_10F_1 db SILPH_CO_10F, $02, SHOW ; HS_SILPH_CO_10F_2 diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index dfb43627..0d1c3708 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -217,7 +217,7 @@ MapHeaderBanks:: db BANK(SilphCo5F_h) db BANK(SilphCo6F_h) db BANK(SilphCo7F_h) - db BANK(SilphCo8F_h) + ;db BANK(SilphCo8F_h) db BANK(PokemonMansion2F_h) db BANK(PokemonMansion3F_h) db BANK(PokemonMansionB1F_h) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 5318c2aa..7b537a95 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -217,7 +217,7 @@ MapHeaderPointers:: dw SilphCo5F_h dw SilphCo6F_h dw SilphCo7F_h - dw SilphCo8F_h + ;dw SilphCo8F_h dw PokemonMansion2F_h dw PokemonMansion3F_h dw PokemonMansionB1F_h diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm index 25d6777c..95eb2c05 100644 --- a/data/maps/objects/SilphCo9F.asm +++ b/data/maps/objects/SilphCo9F.asm @@ -4,7 +4,7 @@ SilphCo9F_Object: def_warp_events warp_event 14, 0, SILPH_CO_10F, 1 - warp_event 16, 0, SILPH_CO_8F, 1 +; warp_event 16, 0, SILPH_CO_8F, 1 ; warp_event 18, 0, SILPH_CO_ELEVATOR, 1 ; warp_event 9, 3, SILPH_CO_3F, 8 ; warp_event 17, 15, SILPH_CO_5F, 5 diff --git a/data/maps/songs.asm b/data/maps/songs.asm index d637557f..269bc62e 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -216,7 +216,7 @@ MapSongBanks:: db MUSIC_SILPH_CO, 0 ; SILPH_CO_5F db MUSIC_SILPH_CO, 0 ; SILPH_CO_6F db MUSIC_SILPH_CO, 0 ; SILPH_CO_7F - db MUSIC_SILPH_CO, 0 ; SILPH_CO_8F + ;db MUSIC_SILPH_CO, 0 ; SILPH_CO_8F db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_2F db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_3F db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_B1F diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm index 74fcecc6..1aa29015 100644 --- a/data/maps/town_map_entries.asm +++ b/data/maps/town_map_entries.asm @@ -121,7 +121,7 @@ InternalMapEntries: internal_map ROCKET_HIDEOUT_ELEVATOR, 7, 5, RocketHQName internal_map CITRINE_MART, 7, 10, CitrineCityName internal_map GARNET_CAVERN_B1F, 6, 10, GarnetCavernName - internal_map SILPH_CO_8F, 10, 5, SilphCoName +; internal_map SILPH_CO_8F, 10, 5, SilphCoName internal_map POKEMON_MANSION_B1F, 2, 15, PokemonMansionName internal_map SAFARI_ZONE_NORTH_REST_HOUSE, 8, 12, SafariZoneName internal_map CERULEAN_CAVE_1F, 9, 1, CeruleanCaveName diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index 233256c6..768627ea 100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -216,7 +216,7 @@ WildDataPointers: dw NothingWildMons dw NothingWildMons dw NothingWildMons - dw NothingWildMons + ;dw NothingWildMons dw PokemonMansion2FWildMons dw PokemonMansion3FWildMons dw PokemonMansionB1FWildMons diff --git a/maps.asm b/maps.asm index 27077bf1..560cb527 100644 --- a/maps.asm +++ b/maps.asm @@ -726,18 +726,13 @@ INCLUDE "data/maps/headers/Daycare.asm" INCLUDE "scripts/Daycare.asm" INCLUDE "data/maps/objects/Daycare.asm" -INCLUDE "data/maps/headers/SilphCo8F.asm" -INCLUDE "scripts/SilphCo8F.asm" -INCLUDE "data/maps/objects/SilphCo8F.asm" -SilphCo8F_Blocks: INCBIN "maps/SilphCo8F.blk" - - -SECTION "Maps 13", ROMX - INCLUDE "data/maps/headers/Route12SuperRodHouse.asm" INCLUDE "scripts/Route12SuperRodHouse.asm" INCLUDE "data/maps/objects/Route12SuperRodHouse.asm" + +SECTION "Maps 13", ROMX + INCLUDE "data/maps/headers/Route6.asm" INCLUDE "data/maps/objects/Route6.asm" Route6_Blocks: INCBIN "maps/Route6.blk" diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index 5b9a82f5..cac6e2e1 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -180,9 +180,9 @@ MissableObjectIDs_6219b: db HS_SILPH_CO_7F_2 db HS_SILPH_CO_7F_3 db HS_SILPH_CO_7F_4 - db HS_SILPH_CO_8F_1 - db HS_SILPH_CO_8F_2 - db HS_SILPH_CO_8F_3 + ;db HS_SILPH_CO_8F_1 + ;db HS_SILPH_CO_8F_2 + ;db HS_SILPH_CO_8F_3 db HS_SILPH_CO_10F_1 db HS_SILPH_CO_10F_2 db HS_SILPH_CO_11F_1 @@ -651,9 +651,9 @@ SaffronCityRockets: db HS_SILPH_CO_7F_2 db HS_SILPH_CO_7F_3 db HS_SILPH_CO_7F_4 - db HS_SILPH_CO_8F_1 - db HS_SILPH_CO_8F_2 - db HS_SILPH_CO_8F_3 + ;db HS_SILPH_CO_8F_1 + ;db HS_SILPH_CO_8F_2 + ;db HS_SILPH_CO_8F_3 db HS_SILPH_CO_10F_1 db HS_SILPH_CO_10F_2 db HS_SILPH_CO_11F_1 diff --git a/scripts/SilphCoElevator.asm b/scripts/SilphCoElevator.asm index c898cbd1..30323295 100644 --- a/scripts/SilphCoElevator.asm +++ b/scripts/SilphCoElevator.asm @@ -65,7 +65,7 @@ SilphCoElevatorWarpMaps: db 2, SILPH_CO_5F db 2, SILPH_CO_6F db 2, SILPH_CO_7F - db 2, SILPH_CO_8F + ;db 2, SILPH_CO_8F db 2, SILPH_CO_9F db 2, SILPH_CO_10F db 1, SILPH_CO_11F