thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-14 09:06:41 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

274
constants/map_constants.asm
View file

@ -56,144 +56,144 @@ DEF FIRST_ROUTE_MAP EQU const_value
map_const ROUTE_23, 10, 72 ; $23 map_const ROUTE_23, 10, 72 ; $23
map_const ROUTE_24, 10, 18 ; $24 map_const ROUTE_24, 10, 18 ; $24
map_const ROUTE_25, 37, 9 ; $25 map_const ROUTE_25, 37, 9 ; $25
map_const BRUNSWICK_TRAIL, 32, 14 ; $26 - was unused Cinnabar Mart copy, moved to $26
DEF FIRST_INDOOR_MAP EQU const_value DEF FIRST_INDOOR_MAP EQU const_value
map_const REDS_HOUSE_1F, 4, 4 ; $26 map_const REDS_HOUSE_1F, 4, 4 ; $27
map_const REDS_HOUSE_2F, 4, 4 ; $27 map_const REDS_HOUSE_2F, 4, 4 ; $28
map_const BLUES_HOUSE, 4, 4 ; $28 map_const BLUES_HOUSE, 4, 4 ; $29
map_const OAKS_LAB, 7, 6 ; $29 map_const OAKS_LAB, 7, 6 ; $2A
map_const VIRIDIAN_POKECENTER, 7, 4 ; $2A map_const VIRIDIAN_POKECENTER, 7, 4 ; $2B
map_const VIRIDIAN_MART, 4, 4 ; $2B map_const VIRIDIAN_MART, 4, 4 ; $2C
map_const VIRIDIAN_SCHOOL_HOUSE, 4, 4 ; $2C map_const VIRIDIAN_SCHOOL_HOUSE, 4, 4 ; $2D
map_const VIRIDIAN_NICKNAME_HOUSE, 4, 4 ; $2D map_const VIRIDIAN_NICKNAME_HOUSE, 4, 4 ; $2E
map_const VIRIDIAN_GYM, 10, 9 ; $2E map_const VIRIDIAN_GYM, 10, 9 ; $2F
map_const DIGLETTS_CAVE_ROUTE_2, 4, 4 ; $2F map_const DIGLETTS_CAVE_ROUTE_2, 4, 4 ; $30
map_const VIRIDIAN_FOREST_NORTH_GATE, 5, 4 ; $30 map_const VIRIDIAN_FOREST_NORTH_GATE, 5, 4 ; $31
map_const ROUTE_2_TRADE_HOUSE, 4, 4 ; $31 map_const ROUTE_2_TRADE_HOUSE, 4, 4 ; $32
map_const ROUTE_2_GATE, 5, 4 ; $32 map_const ROUTE_2_GATE, 5, 4 ; $33
map_const VIRIDIAN_FOREST_SOUTH_GATE, 5, 4 ; $33 map_const VIRIDIAN_FOREST_SOUTH_GATE, 5, 4 ; $34
map_const VIRIDIAN_FOREST, 17, 24 ; $34 map_const VIRIDIAN_FOREST, 17, 24 ; $35
map_const MUSEUM_1F, 10, 4 ; $35 map_const MUSEUM_1F, 10, 4 ; $36
map_const MUSEUM_2F, 7, 4 ; $36 map_const MUSEUM_2F, 7, 4 ; $37
map_const PEWTER_GYM, 5, 7 ; $37 map_const PEWTER_GYM, 5, 7 ; $38
map_const PEWTER_NIDORAN_HOUSE, 4, 4 ; $38 map_const PEWTER_NIDORAN_HOUSE, 4, 4 ; $39
map_const PEWTER_MART, 4, 4 ; $39 map_const PEWTER_MART, 4, 4 ; $3A
map_const PEWTER_SPEECH_HOUSE, 4, 4 ; $3A map_const PEWTER_SPEECH_HOUSE, 4, 4 ; $3B
map_const PEWTER_POKECENTER, 7, 4 ; $3B map_const PEWTER_POKECENTER, 7, 4 ; $3C
map_const MT_MOON_1F, 20, 18 ; $3C map_const MT_MOON_1F, 20, 18 ; $3D
map_const MT_MOON_B1F, 14, 14 ; $3D map_const MT_MOON_B1F, 14, 14 ; $3E
map_const MT_MOON_B2F, 20, 18 ; $3E map_const MT_MOON_B2F, 20, 18 ; $3F
map_const CERULEAN_TRASHED_HOUSE, 4, 4 ; $3F map_const CERULEAN_TRASHED_HOUSE, 4, 4 ; $40
map_const CERULEAN_TRADE_HOUSE, 4, 4 ; $40 map_const CERULEAN_TRADE_HOUSE, 4, 4 ; $41
map_const CERULEAN_POKECENTER, 7, 4 ; $41 map_const CERULEAN_POKECENTER, 7, 4 ; $42
map_const CERULEAN_GYM, 5, 7 ; $42 map_const CERULEAN_GYM, 5, 7 ; $43
map_const BIKE_SHOP, 4, 4 ; $43 map_const BIKE_SHOP, 4, 4 ; $44
map_const CERULEAN_MART, 4, 4 ; $44 map_const CERULEAN_MART, 4, 4 ; $45
map_const MT_MOON_POKECENTER, 7, 4 ; $45 map_const MT_MOON_POKECENTER, 7, 4 ; $46
map_const VIRIDIAN_PRE_GYM, 5, 7 ; $46 - was CERULEAN_TRASHED_HOUSE_COPY map_const VIRIDIAN_PRE_GYM, 5, 7 ; $47 - was CERULEAN_TRASHED_HOUSE_COPY
map_const ROUTE_5_GATE, 4, 3 ; $47 map_const ROUTE_5_GATE, 4, 3 ; $48
map_const UNDERGROUND_PATH_ROUTE_5, 4, 4 ; $48 map_const UNDERGROUND_PATH_ROUTE_5, 4, 4 ; $49
map_const DAYCARE, 4, 4 ; $49 map_const DAYCARE, 4, 4 ; $4A
map_const ROUTE_6_GATE, 4, 3 ; $4A map_const ROUTE_6_GATE, 4, 3 ; $4B
map_const UNDERGROUND_PATH_ROUTE_6, 4, 4 ; $4B map_const UNDERGROUND_PATH_ROUTE_6, 4, 4 ; $4C
map_const CELESTE_HILL, 12, 12 ; $4C - Was copy of above & unused map_const CELESTE_HILL, 12, 12 ; $4D - Was copy of above & unused
map_const ROUTE_7_GATE, 3, 4 ; $4D map_const ROUTE_7_GATE, 3, 4 ; $4E
map_const UNDERGROUND_PATH_ROUTE_7, 4, 4 ; $4E map_const UNDERGROUND_PATH_ROUTE_7, 4, 4 ; $4F
map_const CITRINE_ROCKET_HOUSE, 5, 5 ; $4F - Unused, was UNDERGROUND_PATH_ROUTE_7_COPY map_const CITRINE_ROCKET_HOUSE, 5, 5 ; $50 - Unused, was UNDERGROUND_PATH_ROUTE_7_COPY
map_const ROUTE_8_GATE, 3, 4 ; $50 map_const ROUTE_8_GATE, 3, 4 ; $51
map_const UNDERGROUND_PATH_ROUTE_8, 4, 4 ; $51 map_const UNDERGROUND_PATH_ROUTE_8, 4, 4 ; $52
map_const ROCK_TUNNEL_POKECENTER, 7, 4 ; $52 map_const ROCK_TUNNEL_POKECENTER, 7, 4 ; $53
map_const ROCK_TUNNEL_1F, 20, 18 ; $53 map_const ROCK_TUNNEL_1F, 20, 18 ; $54
map_const POWER_PLANT, 20, 18 ; $54 map_const POWER_PLANT, 20, 18 ; $55
map_const ROUTE_11_GATE_1F, 4, 5 ; $55 map_const ROUTE_11_GATE_1F, 4, 5 ; $56
map_const DIGLETTS_CAVE_ROUTE_11, 4, 4 ; $56 map_const DIGLETTS_CAVE_ROUTE_11, 4, 4 ; $57
map_const ROUTE_11_GATE_2F, 4, 4 ; $57 map_const ROUTE_11_GATE_2F, 4, 4 ; $58
map_const ROUTE_12_GATE_1F, 5, 4 ; $58 map_const ROUTE_12_GATE_1F, 5, 4 ; $59
map_const BILLS_HOUSE, 7, 4 ; $59 map_const BILLS_HOUSE, 7, 4 ; $5A
map_const VERMILION_POKECENTER, 7, 4 ; $5A map_const VERMILION_POKECENTER, 7, 4 ; $5B
map_const POKEMON_FAN_CLUB, 4, 4 ; $5B map_const POKEMON_FAN_CLUB, 4, 4 ; $5C
map_const VERMILION_MART, 4, 4 ; $5C map_const VERMILION_MART, 4, 4 ; $5D
map_const VERMILION_GYM, 5, 9 ; $5D map_const VERMILION_GYM, 5, 9 ; $5E
map_const VERMILION_PIDGEY_HOUSE, 4, 4 ; $5E map_const VERMILION_PIDGEY_HOUSE, 4, 4 ; $5F
map_const VERMILION_DOCK, 14, 6 ; $5F map_const VERMILION_DOCK, 14, 6 ; $60
map_const SS_ANNE_1F, 20, 9 ; $60 map_const SS_ANNE_1F, 20, 9 ; $61
map_const SS_ANNE_2F, 20, 9 ; $61 map_const SS_ANNE_2F, 20, 9 ; $62
map_const SS_ANNE_3F, 10, 3 ; $62 map_const SS_ANNE_3F, 10, 3 ; $63
map_const SS_ANNE_B1F, 15, 4 ; $63 map_const SS_ANNE_B1F, 15, 4 ; $64
map_const SS_ANNE_BOW, 10, 7 ; $64 map_const SS_ANNE_BOW, 10, 7 ; $65
map_const SS_ANNE_KITCHEN, 7, 8 ; $65 map_const SS_ANNE_KITCHEN, 7, 8 ; $66
map_const SS_ANNE_CAPTAINS_ROOM, 3, 4 ; $66 map_const SS_ANNE_CAPTAINS_ROOM, 3, 4 ; $67
map_const SS_ANNE_1F_ROOMS, 12, 8 ; $67 map_const SS_ANNE_1F_ROOMS, 12, 8 ; $68
map_const SS_ANNE_2F_ROOMS, 12, 8 ; $68 map_const SS_ANNE_2F_ROOMS, 12, 8 ; $69
map_const SS_ANNE_B1F_ROOMS, 12, 8 ; $69 map_const SS_ANNE_B1F_ROOMS, 12, 8 ; $6A
map_const SILPH_GAUNTLET_1F, 10, 9 ; $6A - Was UNUSED_MAP_69 map_const SILPH_GAUNTLET_1F, 10, 9 ; $6B - Was UNUSED_MAP_69
map_const SILPH_GAUNTLET_2F, 13, 10 ; $6B - Was UNUSED_MAP_6A map_const SILPH_GAUNTLET_2F, 13, 10 ; $6C - Was UNUSED_MAP_6A
map_const SILPH_GAUNTLET_3F, 17, 13 ; $6C - Was UNUSED_MAP_6B map_const SILPH_GAUNTLET_3F, 17, 13 ; $6D - Was UNUSED_MAP_6B
map_const VICTORY_ROAD_1F, 10, 9 ; $6D map_const VICTORY_ROAD_1F, 10, 9 ; $6E
map_const SILPH_GAUNTLET_4F, 10, 9 ; $6E - Was UNUSED_MAP_6D map_const SILPH_GAUNTLET_4F, 10, 9 ; $6F - Was UNUSED_MAP_6D
map_const SILPH_GAUNTLET_5F, 10, 9 ; $6F - Was UNUSED_MAP_6E map_const SILPH_GAUNTLET_5F, 10, 9 ; $70 - Was UNUSED_MAP_6E
map_const SILPH_GAUNTLET_6F, 12, 12 ; $70 - Was UNUSED_MAP_6F map_const SILPH_GAUNTLET_6F, 12, 12 ; $71 - Was UNUSED_MAP_6F
map_const SILPH_GAUNTLET_7F, 6, 5 ; $71 - Was UNUSED_MAP_70 map_const SILPH_GAUNTLET_7F, 6, 5 ; $72 - Was UNUSED_MAP_70
map_const LANCES_ROOM, 13, 13 ; $72 map_const LANCES_ROOM, 13, 13 ; $73
map_const FARAWAY_ISLAND_OUTSIDE, 15, 18 ; $73 - Was UNUSED_MAP_72 map_const FARAWAY_ISLAND_OUTSIDE, 15, 18 ; $74 - Was UNUSED_MAP_72
map_const FARAWAY_ISLAND_INSIDE, 15, 11 ; $74 - Was UNUSED_MAP_73 map_const FARAWAY_ISLAND_INSIDE, 15, 11 ; $75 - Was UNUSED_MAP_73
map_const POKEMON_MANSION_B2F, 15, 12 ; $75 - Was UNUSED_MAP_74 map_const POKEMON_MANSION_B2F, 15, 12 ; $76 - Was UNUSED_MAP_74
map_const MT_MOON_CRATER, 25, 25 ; $76 - Was UNUSED_MAP_75 map_const MT_MOON_CRATER, 25, 25 ; $77 - Was UNUSED_MAP_75
map_const HALL_OF_FAME, 5, 4 ; $77 map_const HALL_OF_FAME, 5, 4 ; $78
map_const UNDERGROUND_PATH_NORTH_SOUTH, 4, 24 ; $78 ; UndergroundPathNorthSouth.blk is actually 4x23 map_const UNDERGROUND_PATH_NORTH_SOUTH, 4, 24 ; $79 ; UndergroundPathNorthSouth.blk is actually 4x23
map_const CHAMPIONS_ROOM, 4, 4 ; $79 map_const CHAMPIONS_ROOM, 4, 4 ; $7A
map_const UNDERGROUND_PATH_WEST_EAST, 25, 4 ; $7A map_const UNDERGROUND_PATH_WEST_EAST, 25, 4 ; $7B
map_const CELADON_MART_1F, 10, 4 ; $7B map_const CELADON_MART_1F, 10, 4 ; $7C
map_const CELADON_MART_2F, 10, 4 ; $7C map_const CELADON_MART_2F, 10, 4 ; $7D
map_const CELADON_MART_3F, 10, 4 ; $7D map_const CELADON_MART_3F, 10, 4 ; $7E
map_const CELADON_MART_4F, 10, 4 ; $7E map_const CELADON_MART_4F, 10, 4 ; $7F
map_const CELADON_MART_ROOF, 10, 4 ; $7F map_const CELADON_MART_ROOF, 10, 4 ; $80
map_const CELADON_MART_ELEVATOR, 2, 2 ; $80 map_const CELADON_MART_ELEVATOR, 2, 2 ; $81
map_const CELADON_MANSION_1F, 4, 6 ; $81 map_const CELADON_MANSION_1F, 4, 6 ; $82
map_const CELADON_MANSION_2F, 4, 6 ; $82 map_const CELADON_MANSION_2F, 4, 6 ; $83
map_const CELADON_MANSION_3F, 4, 6 ; $83 map_const CELADON_MANSION_3F, 4, 6 ; $84
map_const CELADON_MANSION_ROOF, 4, 6 ; $84 map_const CELADON_MANSION_ROOF, 4, 6 ; $85
map_const CELADON_MANSION_ROOF_HOUSE, 4, 4 ; $85 map_const CELADON_MANSION_ROOF_HOUSE, 4, 4 ; $86
map_const CELADON_POKECENTER, 7, 4 ; $86 map_const CELADON_POKECENTER, 7, 4 ; $87
map_const CELADON_GYM, 5, 9 ; $87 map_const CELADON_GYM, 5, 9 ; $88
map_const GAME_CORNER, 10, 9 ; $88 map_const GAME_CORNER, 10, 9 ; $89
map_const CELADON_MART_5F, 10, 4 ; $89 map_const CELADON_MART_5F, 10, 4 ; $8A
map_const GAME_CORNER_PRIZE_ROOM, 5, 4 ; $8A map_const GAME_CORNER_PRIZE_ROOM, 5, 4 ; $8B
map_const CELADON_DINER, 5, 4 ; $8B map_const CELADON_DINER, 5, 4 ; $8C
map_const CELADON_CHIEF_HOUSE, 4, 4 ; $8C map_const CELADON_CHIEF_HOUSE, 4, 4 ; $8D
map_const CELADON_HOTEL, 7, 4 ; $8D map_const CELADON_HOTEL, 7, 4 ; $8E
map_const LAVENDER_POKECENTER, 7, 4 ; $8E map_const LAVENDER_POKECENTER, 7, 4 ; $8F
map_const POKEMON_TOWER_1F, 10, 9 ; $8F map_const POKEMON_TOWER_1F, 10, 9 ; $90
map_const POKEMON_TOWER_2F, 10, 9 ; $90 map_const POKEMON_TOWER_2F, 10, 9 ; $91
map_const POKEMON_TOWER_3F, 10, 9 ; $91 - Currently unused map_const POKEMON_TOWER_3F, 10, 9 ; $92 - Currently unused
map_const POKEMON_TOWER_4F, 10, 9 ; $92 - Currently unused map_const POKEMON_TOWER_4F, 10, 9 ; $93 - Currently unused
map_const POKEMON_TOWER_5F, 10, 9 ; $93 - Currently unused map_const POKEMON_TOWER_5F, 10, 9 ; $94 - Currently unused
map_const POKEMON_TOWER_6F, 10, 9 ; $94 map_const POKEMON_TOWER_6F, 10, 9 ; $95
map_const POKEMON_TOWER_7F, 10, 9 ; $95 map_const POKEMON_TOWER_7F, 10, 9 ; $96
map_const MR_FUJIS_HOUSE, 4, 4 ; $96 map_const MR_FUJIS_HOUSE, 4, 4 ; $97
map_const LAVENDER_MART, 4, 4 ; $97 map_const LAVENDER_MART, 4, 4 ; $98
map_const LAVENDER_CUBONE_HOUSE, 4, 4 ; $98 map_const LAVENDER_CUBONE_HOUSE, 4, 4 ; $99
map_const FUCHSIA_MART, 4, 4 ; $99 map_const FUCHSIA_MART, 4, 4 ; $9A
map_const FUCHSIA_BILLS_GRANDPAS_HOUSE, 4, 4 ; $9A map_const FUCHSIA_BILLS_GRANDPAS_HOUSE, 4, 4 ; $9B
map_const FUCHSIA_POKECENTER, 7, 4 ; $9B map_const FUCHSIA_POKECENTER, 7, 4 ; $9C
map_const WARDENS_HOUSE, 5, 4 ; $9C map_const WARDENS_HOUSE, 5, 4 ; $9D
map_const SAFARI_ZONE_GATE, 4, 3 ; $9D map_const SAFARI_ZONE_GATE, 4, 3 ; $9E
map_const FUCHSIA_GYM, 5, 9 ; $9E map_const FUCHSIA_GYM, 5, 9 ; $9F
map_const FUCHSIA_MEETING_ROOM, 7, 4 ; $9F map_const FUCHSIA_MEETING_ROOM, 7, 4 ; $A0
map_const SEAFOAM_ISLANDS_B1F, 15, 9 ; $A0 map_const SEAFOAM_ISLANDS_B1F, 15, 9 ; $A1
map_const SEAFOAM_ISLANDS_B2F, 15, 9 ; $A1 map_const SEAFOAM_ISLANDS_B2F, 15, 9 ; $A2
map_const SEAFOAM_ISLANDS_B3F, 15, 9 ; $A2 map_const SEAFOAM_ISLANDS_B3F, 15, 9 ; $A3
map_const SEAFOAM_ISLANDS_B4F, 15, 9 ; $A3 map_const SEAFOAM_ISLANDS_B4F, 15, 9 ; $A4
map_const CITRINE_TRADEBACK_HOUSE, 4, 4 ; $A4 - Was Vermillion Old Rod house map_const CITRINE_TRADEBACK_HOUSE, 4, 4 ; $A5 - Was Vermillion Old Rod house
map_const FUCHSIA_GOOD_ROD_HOUSE, 4, 4 ; $A5 map_const FUCHSIA_GOOD_ROD_HOUSE, 4, 4 ; $A6
map_const POKEMON_MANSION_1F, 15, 14 ; $A6 map_const POKEMON_MANSION_1F, 15, 14 ; $A7
map_const CINNABAR_GYM, 10, 9 ; $A7 map_const CINNABAR_GYM, 10, 9 ; $A8
map_const CINNABAR_LAB, 9, 4 ; $A8 map_const CINNABAR_LAB, 9, 4 ; $A9
map_const CINNABAR_LAB_TRADE_ROOM, 4, 4 ; $A9 map_const CINNABAR_LAB_TRADE_ROOM, 4, 4 ; $AA
map_const CINNABAR_LAB_METRONOME_ROOM, 4, 4 ; $AA map_const CINNABAR_LAB_METRONOME_ROOM, 4, 4 ; $AB
map_const CINNABAR_LAB_FOSSIL_ROOM, 4, 4 ; $AB map_const CINNABAR_LAB_FOSSIL_ROOM, 4, 4 ; $AC
map_const CINNABAR_POKECENTER, 7, 4 ; $AC map_const CINNABAR_POKECENTER, 7, 4 ; $AD
map_const CINNABAR_MART, 4, 4 ; $AD map_const CINNABAR_MART, 4, 4 ; $AE
map_const BRUNSWICK_TRAIL, 32, 14 ; $AE - was unused Cinnabar Mart copy
map_const INDIGO_PLATEAU_LOBBY, 8, 6 ; $AF map_const INDIGO_PLATEAU_LOBBY, 8, 6 ; $AF
map_const COPYCATS_HOUSE_1F, 4, 4 ; $B0 map_const COPYCATS_HOUSE_1F, 4, 4 ; $B0
map_const COPYCATS_HOUSE_2F, 4, 4 ; $B1 map_const COPYCATS_HOUSE_2F, 4, 4 ; $B1

2
data/maps/hide_show_data.asm
View file

@ -41,6 +41,7 @@ MapHSPointers:
dw NoHS dw NoHS
dw Route24HS dw Route24HS
dw Route25HS dw Route25HS
dw BrunswickTrailHS
dw NoHS dw NoHS
dw NoHS dw NoHS
dw BluesHouseHS dw BluesHouseHS
@ -177,7 +178,6 @@ MapHSPointers:
dw NoHS dw NoHS
dw NoHS dw NoHS
dw NoHS dw NoHS
dw BrunswickTrailHS
dw NoHS dw NoHS
dw NoHS 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(Route23_h)
db BANK(Route24_h) db BANK(Route24_h)
db BANK(Route25_h) db BANK(Route25_h)
db BANK(BrunswickTrail_h) ; was cinnabar mart copy
db BANK(RedsHouse1F_h) db BANK(RedsHouse1F_h)
db BANK(RedsHouse2F_h) db BANK(RedsHouse2F_h)
db BANK(BluesHouse_h) db BANK(BluesHouse_h)
@ -175,7 +176,6 @@ MapHeaderBanks::
db BANK(CinnabarLabFossilRoom_h) db BANK(CinnabarLabFossilRoom_h)
db BANK(CinnabarPokecenter_h) db BANK(CinnabarPokecenter_h)
db BANK(CinnabarMart_h) db BANK(CinnabarMart_h)
db BANK(BrunswickTrail_h) ; was cinnabar mart copy
db BANK(IndigoPlateauLobby_h) db BANK(IndigoPlateauLobby_h)
db BANK(CopycatsHouse1F_h) db BANK(CopycatsHouse1F_h)
db BANK(CopycatsHouse2F_h) db BANK(CopycatsHouse2F_h)

2
data/maps/map_header_pointers.asm
View file

@ -39,6 +39,7 @@ MapHeaderPointers::
dw Route23_h dw Route23_h
dw Route24_h dw Route24_h
dw Route25_h dw Route25_h
dw BrunswickTrail_h ; CINNABAR_MART_COPY
dw RedsHouse1F_h dw RedsHouse1F_h
dw RedsHouse2F_h dw RedsHouse2F_h
dw BluesHouse_h dw BluesHouse_h
@ -175,7 +176,6 @@ MapHeaderPointers::
dw CinnabarLabFossilRoom_h dw CinnabarLabFossilRoom_h
dw CinnabarPokecenter_h dw CinnabarPokecenter_h
dw CinnabarMart_h dw CinnabarMart_h
dw BrunswickTrail_h ; CINNABAR_MART_COPY
dw IndigoPlateauLobby_h dw IndigoPlateauLobby_h
dw CopycatsHouse1F_h dw CopycatsHouse1F_h
dw CopycatsHouse2F_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_INDIGO_PLATEAU, 0 ; ROUTE_23
db MUSIC_ROUTES2, 0 ; ROUTE_24 db MUSIC_ROUTES2, 0 ; ROUTE_24
db MUSIC_ROUTES2, 0 ; ROUTE_25 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_1F
db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_2F db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_2F
db MUSIC_PALLET_TOWN, 0 ; BLUES_HOUSE db MUSIC_PALLET_TOWN, 0 ; BLUES_HOUSE
@ -174,7 +175,6 @@ MapSongBanks::
db MUSIC_CINNABAR, 0 ; CINNABAR_LAB_FOSSIL_ROOM db MUSIC_CINNABAR, 0 ; CINNABAR_LAB_FOSSIL_ROOM
db MUSIC_POKECENTER, 0 ; CINNABAR_POKECENTER db MUSIC_POKECENTER, 0 ; CINNABAR_POKECENTER
db MUSIC_POKECENTER, 0 ; CINNABAR_MART 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_INDIGO_PLATEAU, 0 ; INDIGO_PLATEAU_LOBBY
db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_1F db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_1F
db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_2F 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_SAFFRON ; SAFFRON_CITY
db SPRITESET_PALLET_VIRIDIAN ; CINNABAR_ISLAND db SPRITESET_PALLET_VIRIDIAN ; CINNABAR_ISLAND
db SPRITESET_INDIGO ; INDIGO_PLATEAU db SPRITESET_INDIGO ; INDIGO_PLATEAU
db SPRITESET_CITRINE ; CITRINE_CITY db SPRITESET_CITRINE ; CITRINE_CITY
db SPRITESET_PALLET_VIRIDIAN ; ROUTE_1 db SPRITESET_PALLET_VIRIDIAN ; ROUTE_1
db SPLITSET_ROUTE_2 ; ROUTE_2 db SPLITSET_ROUTE_2 ; ROUTE_2
db SPRITESET_PEWTER_CERULEAN ; ROUTE_3 db SPRITESET_PEWTER_CERULEAN ; ROUTE_3
@ -40,6 +40,7 @@ MapSpriteSets:
db SPRITESET_INDIGO ; ROUTE_23 db SPRITESET_INDIGO ; ROUTE_23
db SPRITESET_PEWTER_CERULEAN ; ROUTE_24 db SPRITESET_PEWTER_CERULEAN ; ROUTE_24
db SPRITESET_PEWTER_CERULEAN ; ROUTE_25 db SPRITESET_PEWTER_CERULEAN ; ROUTE_25
db SPRITESET_CITRINE ; CITRINE_CITY
assert_table_length FIRST_INDOOR_MAP assert_table_length FIRST_INDOOR_MAP
; Format: ; Format:

2
data/maps/town_map_entries.asm
View file

@ -45,6 +45,7 @@ ExternalMapEntries:
external_map 0, 6, Route23Name external_map 0, 6, Route23Name
external_map 10, 1, Route24Name external_map 10, 1, Route24Name
external_map 11, 0, Route25Name external_map 11, 0, Route25Name
external_map 7, 10, BrunswickTrailName
assert_table_length FIRST_INDOOR_MAP assert_table_length FIRST_INDOOR_MAP
@ -98,7 +99,6 @@ InternalMapEntries:
internal_map FUCHSIA_GOOD_ROD_HOUSE, 8, 13, FuchsiaCityName internal_map FUCHSIA_GOOD_ROD_HOUSE, 8, 13, FuchsiaCityName
internal_map POKEMON_MANSION_1F, 2, 15, PokemonMansionName internal_map POKEMON_MANSION_1F, 2, 15, PokemonMansionName
internal_map CINNABAR_MART, 2, 15, CinnabarIslandName internal_map CINNABAR_MART, 2, 15, CinnabarIslandName
internal_map BRUNSWICK_TRAIL, 7, 10, BrunswickTrailName
internal_map INDIGO_PLATEAU_LOBBY, 0, 2, IndigoPlateauName internal_map INDIGO_PLATEAU_LOBBY, 0, 2, IndigoPlateauName
internal_map MR_PSYCHICS_HOUSE, 10, 5, SaffronCityName internal_map MR_PSYCHICS_HOUSE, 10, 5, SaffronCityName
internal_map ROUTE_15_GATE_2F, 9, 13, Route15Name 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 Route23WildMons ; ROUTE_23
dw Route24WildMons ; ROUTE_24 dw Route24WildMons ; ROUTE_24
dw Route25WildMons ; ROUTE_25 dw Route25WildMons ; ROUTE_25
dw BrunswickTrailMons ; BRUNSWICK_TRAIL
dw NothingWildMons ; REDS_HOUSE_1F dw NothingWildMons ; REDS_HOUSE_1F
dw NothingWildMons dw NothingWildMons
dw NothingWildMons dw NothingWildMons
@ -174,7 +175,6 @@ WildDataPointers:
dw NothingWildMons dw NothingWildMons
dw NothingWildMons dw NothingWildMons
dw NothingWildMons dw NothingWildMons
dw BrunswickTrailMons
dw NothingWildMons dw NothingWildMons
dw NothingWildMons dw NothingWildMons
dw NothingWildMons dw NothingWildMons