fix rod house

i committed crimes no one ever should

this nukes silph co 8f from the game
This commit is contained in:
Llinos Evans 2023-07-13 05:45:43 +01:00
parent 07582e02cb
commit 9015062b0a
14 changed files with 28 additions and 33 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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)

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -216,7 +216,7 @@ WildDataPointers:
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
;dw NothingWildMons
dw PokemonMansion2FWildMons
dw PokemonMansion3FWildMons
dw PokemonMansionB1FWildMons