thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 23:55:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making Brunswick Trail a route map

Browse source 
This fixes a bug where all of Brunswick Trail's tiles could have encounters.
This commit is contained in:
MementoMartha 2023-04-27 16:46:20 +01:00
parent 858e7bc92a
commit 234f3e120d
8 changed files with 145 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/hide_show_data.asm
View file

@ -41,6 +41,7 @@ MapHSPointers:
dw NoHS
dw Route24HS
dw Route25HS
dw BrunswickTrailHS
dw NoHS
dw NoHS
dw BluesHouseHS
@ -177,7 +178,6 @@ MapHSPointers:
dw NoHS
dw NoHS
dw NoHS
dw BrunswickTrailHS
dw NoHS
dw NoHS
dw NoHS

2
data/maps/map_header_banks.asm
View file

@ -39,6 +39,7 @@ MapHeaderBanks::
db BANK(Route23_h)
db BANK(Route24_h)
db BANK(Route25_h)
db BANK(BrunswickTrail_h) ; was cinnabar mart copy
db BANK(RedsHouse1F_h)
db BANK(RedsHouse2F_h)
db BANK(BluesHouse_h)
@ -175,7 +176,6 @@ MapHeaderBanks::
db BANK(CinnabarLabFossilRoom_h)
db BANK(CinnabarPokecenter_h)
db BANK(CinnabarMart_h)
db BANK(BrunswickTrail_h) ; was cinnabar mart copy
db BANK(IndigoPlateauLobby_h)
db BANK(CopycatsHouse1F_h)
db BANK(CopycatsHouse2F_h)

2
data/maps/map_header_pointers.asm
View file

@ -39,6 +39,7 @@ MapHeaderPointers::
dw Route23_h
dw Route24_h
dw Route25_h
dw BrunswickTrail_h ; CINNABAR_MART_COPY
dw RedsHouse1F_h
dw RedsHouse2F_h
dw BluesHouse_h
@ -175,7 +176,6 @@ MapHeaderPointers::
dw CinnabarLabFossilRoom_h
dw CinnabarPokecenter_h
dw CinnabarMart_h
dw BrunswickTrail_h ; CINNABAR_MART_COPY
dw IndigoPlateauLobby_h
dw CopycatsHouse1F_h
dw CopycatsHouse2F_h

2
data/maps/songs.asm
View file

@ -38,6 +38,7 @@ MapSongBanks::
db MUSIC_INDIGO_PLATEAU, 0 ; ROUTE_23
db MUSIC_ROUTES2, 0 ; ROUTE_24
db MUSIC_ROUTES2, 0 ; ROUTE_25
db MUSIC_FIELD06, 0 ; BRUNSWICK_TRAIL, was CINNABAR_MART_COPY
db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_1F
db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_2F
db MUSIC_PALLET_TOWN, 0 ; BLUES_HOUSE
@ -174,7 +175,6 @@ MapSongBanks::
db MUSIC_CINNABAR, 0 ; CINNABAR_LAB_FOSSIL_ROOM
db MUSIC_POKECENTER, 0 ; CINNABAR_POKECENTER
db MUSIC_POKECENTER, 0 ; CINNABAR_MART
db MUSIC_FIELD06, 0 ; BRUNSWICK_TRAIL, was CINNABAR_MART_COPY
db MUSIC_INDIGO_PLATEAU, 0 ; INDIGO_PLATEAU_LOBBY
db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_1F
db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_2F

3
data/maps/sprite_sets.asm
View file

@ -14,7 +14,7 @@ MapSpriteSets:
db SPRITESET_SAFFRON ; SAFFRON_CITY
db SPRITESET_PALLET_VIRIDIAN ; CINNABAR_ISLAND
db SPRITESET_INDIGO ; INDIGO_PLATEAU
db SPRITESET_CITRINE ; CITRINE_CITY
db SPRITESET_CITRINE ; CITRINE_CITY
db SPRITESET_PALLET_VIRIDIAN ; ROUTE_1
db SPLITSET_ROUTE_2 ; ROUTE_2
db SPRITESET_PEWTER_CERULEAN ; ROUTE_3
@ -40,6 +40,7 @@ MapSpriteSets:
db SPRITESET_INDIGO ; ROUTE_23
db SPRITESET_PEWTER_CERULEAN ; ROUTE_24
db SPRITESET_PEWTER_CERULEAN ; ROUTE_25
db SPRITESET_CITRINE ; CITRINE_CITY
assert_table_length FIRST_INDOOR_MAP
; Format:

2
data/maps/town_map_entries.asm
View file

@ -45,6 +45,7 @@ ExternalMapEntries:
external_map 0, 6, Route23Name
external_map 10, 1, Route24Name
external_map 11, 0, Route25Name
external_map 7, 10, BrunswickTrailName
assert_table_length FIRST_INDOOR_MAP
@ -98,7 +99,6 @@ InternalMapEntries:
internal_map FUCHSIA_GOOD_ROD_HOUSE, 8, 13, FuchsiaCityName
internal_map POKEMON_MANSION_1F, 2, 15, PokemonMansionName
internal_map CINNABAR_MART, 2, 15, CinnabarIslandName
internal_map BRUNSWICK_TRAIL, 7, 10, BrunswickTrailName
internal_map INDIGO_PLATEAU_LOBBY, 0, 2, IndigoPlateauName
internal_map MR_PSYCHICS_HOUSE, 10, 5, SaffronCityName
internal_map ROUTE_15_GATE_2F, 9, 13, Route15Name

2
data/wild/grass_water.asm
View file

@ -38,6 +38,7 @@ WildDataPointers:
dw Route23WildMons ; ROUTE_23
dw Route24WildMons ; ROUTE_24
dw Route25WildMons ; ROUTE_25
dw BrunswickTrailMons ; BRUNSWICK_TRAIL
dw NothingWildMons ; REDS_HOUSE_1F
dw NothingWildMons
dw NothingWildMons
@ -174,7 +175,6 @@ WildDataPointers:
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw BrunswickTrailMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons