summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--constants.asm1
-rw-r--r--constants/map_constants.asm505
-rwxr-xr-xconstants/map_dimensions.asm896
-rwxr-xr-xdata/hide_show_data.asm2
-rwxr-xr-xdata/mapObjects/ceruleancity.asm12
-rwxr-xr-xdata/town_map_entries.asm2
6 files changed, 263 insertions, 1155 deletions
diff --git a/constants.asm b/constants.asm
index c5f4575e..ba2d76c6 100644
--- a/constants.asm
+++ b/constants.asm
@@ -21,7 +21,6 @@ INCLUDE "constants/palette_constants.asm"
INCLUDE "constants/evolution_constants.asm"
INCLUDE "constants/list_constants.asm"
INCLUDE "constants/map_constants.asm"
-INCLUDE "constants/map_dimensions.asm"
INCLUDE "constants/connection_constants.asm"
INCLUDE "constants/hide_show_constants.asm"
INCLUDE "constants/credits_constants.asm"
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 9ff23355..c2068dd9 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -1,251 +1,256 @@
-const_value = 0
+mapconst: MACRO
+ const \1
+\1_HEIGHT EQU \2
+\1_WIDTH EQU \3
+ENDM
- const PALLET_TOWN ; $00
- const VIRIDIAN_CITY ; $01
- const PEWTER_CITY ; $02
- const CERULEAN_CITY ; $03
- const LAVENDER_TOWN ; $04
- const VERMILION_CITY ; $05
- const CELADON_CITY ; $06
- const FUCHSIA_CITY ; $07
- const CINNABAR_ISLAND ; $08
- const INDIGO_PLATEAU ; $09
- const SAFFRON_CITY ; $0A
- const UNUSED_MAP_0B ; $0B
- const ROUTE_1 ; $0C
- const ROUTE_2 ; $0D
- const ROUTE_3 ; $0E
- const ROUTE_4 ; $0F
- const ROUTE_5 ; $10
- const ROUTE_6 ; $11
- const ROUTE_7 ; $12
- const ROUTE_8 ; $13
- const ROUTE_9 ; $14
- const ROUTE_10 ; $15
- const ROUTE_11 ; $16
- const ROUTE_12 ; $17
- const ROUTE_13 ; $18
- const ROUTE_14 ; $19
- const ROUTE_15 ; $1A
- const ROUTE_16 ; $1B
- const ROUTE_17 ; $1C
- const ROUTE_18 ; $1D
- const ROUTE_19 ; $1E
- const ROUTE_20 ; $1F
- const ROUTE_21 ; $20
- const ROUTE_22 ; $21
- const ROUTE_23 ; $22
- const ROUTE_24 ; $23
- const ROUTE_25 ; $24
- const REDS_HOUSE_1F ; $25
- const REDS_HOUSE_2F ; $26
- const BLUES_HOUSE ; $27
- const OAKS_LAB ; $28
- const VIRIDIAN_POKECENTER ; $29
- const VIRIDIAN_MART ; $2A
- const VIRIDIAN_SCHOOL ; $2B
- const VIRIDIAN_HOUSE ; $2C
- const VIRIDIAN_GYM ; $2D
- const DIGLETTS_CAVE_EXIT ; $2E
- const VIRIDIAN_FOREST_EXIT ; $2F
- const ROUTE_2_HOUSE ; $30
- const ROUTE_2_GATE ; $31
- const VIRIDIAN_FOREST_ENTRANCE ; $32
- const VIRIDIAN_FOREST ; $33
- const MUSEUM_1F ; $34
- const MUSEUM_2F ; $35
- const PEWTER_GYM ; $36
- const PEWTER_HOUSE_1 ; $37
- const PEWTER_MART ; $38
- const PEWTER_HOUSE_2 ; $39
- const PEWTER_POKECENTER ; $3A
- const MT_MOON_1 ; $3B
- const MT_MOON_2 ; $3C
- const MT_MOON_3 ; $3D
- const TRASHED_HOUSE ; $3E
- const CERULEAN_HOUSE ; $3F
- const CERULEAN_POKECENTER ; $40
- const CERULEAN_GYM ; $41
- const BIKE_SHOP ; $42
- const CERULEAN_MART ; $43
- const MT_MOON_POKECENTER ; $44
- const TRASHED_HOUSE_COPY ; $45
- const ROUTE_5_GATE ; $46
- const PATH_ENTRANCE_ROUTE_5 ; $47
- const DAYCAREM ; $48
- const ROUTE_6_GATE ; $49
- const PATH_ENTRANCE_ROUTE_6 ; $4A
- const PATH_ENTRANCE_ROUTE_6_COPY ; $4B
- const ROUTE_7_GATE ; $4C
- const PATH_ENTRANCE_ROUTE_7 ; $4D
- const PATH_ENTRANCE_ROUTE_7_COPY ; $4E
- const ROUTE_8_GATE ; $4F
- const PATH_ENTRANCE_ROUTE_8 ; $50
- const ROCK_TUNNEL_POKECENTER ; $51
- const ROCK_TUNNEL_1 ; $52
- const POWER_PLANT ; $53
- const ROUTE_11_GATE_1F ; $54
- const DIGLETTS_CAVE_ENTRANCE ; $55
- const ROUTE_11_GATE_2F ; $56
- const ROUTE_12_GATE_1F ; $57
- const BILLS_HOUSE ; $58
- const VERMILION_POKECENTER ; $59
- const POKEMON_FAN_CLUB ; $5A
- const VERMILION_MART ; $5B
- const VERMILION_GYM ; $5C
- const VERMILION_HOUSE_1 ; $5D
- const VERMILION_DOCK ; $5E
- const SS_ANNE_1 ; $5F
- const SS_ANNE_2 ; $60
- const SS_ANNE_3 ; $61
- const SS_ANNE_4 ; $62
- const SS_ANNE_5 ; $63
- const SS_ANNE_6 ; $64
- const SS_ANNE_7 ; $65
- const SS_ANNE_8 ; $66
- const SS_ANNE_9 ; $67
- const SS_ANNE_10 ; $68
- const UNUSED_MAP_69 ; $69
- const UNUSED_MAP_6A ; $6A
- const UNUSED_MAP_6B ; $6B
- const VICTORY_ROAD_1 ; $6C
- const UNUSED_MAP_6D ; $6D
- const UNUSED_MAP_6E ; $6E
- const UNUSED_MAP_6F ; $6F
- const UNUSED_MAP_70 ; $70
- const LANCES_ROOM ; $71
- const UNUSED_MAP_72 ; $72
- const UNUSED_MAP_73 ; $73
- const UNUSED_MAP_74 ; $74
- const UNUSED_MAP_75 ; $75
- const HALL_OF_FAME ; $76
- const UNDERGROUND_PATH_NS ; $77
- const CHAMPIONS_ROOM ; $78
- const UNDERGROUND_PATH_WE ; $79
- const CELADON_MART_1 ; $7A
- const CELADON_MART_2 ; $7B
- const CELADON_MART_3 ; $7C
- const CELADON_MART_4 ; $7D
- const CELADON_MART_ROOF ; $7E
- const CELADON_MART_ELEVATOR ; $7F
- const CELADON_MANSION_1 ; $80
- const CELADON_MANSION_2 ; $81
- const CELADON_MANSION_3 ; $82
- const CELADON_MANSION_4 ; $83
- const CELADON_MANSION_5 ; $84
- const CELADON_POKECENTER ; $85
- const CELADON_GYM ; $86
- const GAME_CORNER ; $87
- const CELADON_MART_5 ; $88
- const CELADON_PRIZE_ROOM ; $89
- const CELADON_DINER ; $8A
- const CELADON_HOUSE ; $8B
- const CELADON_HOTEL ; $8C
- const LAVENDER_POKECENTER ; $8D
- const POKEMONTOWER_1 ; $8E
- const POKEMONTOWER_2 ; $8F
- const POKEMONTOWER_3 ; $90
- const POKEMONTOWER_4 ; $91
- const POKEMONTOWER_5 ; $92
- const POKEMONTOWER_6 ; $93
- const POKEMONTOWER_7 ; $94
- const LAVENDER_HOUSE_1 ; $95
- const LAVENDER_MART ; $96
- const LAVENDER_HOUSE_2 ; $97
- const FUCHSIA_MART ; $98
- const FUCHSIA_HOUSE_1 ; $99
- const FUCHSIA_POKECENTER ; $9A
- const FUCHSIA_HOUSE_2 ; $9B
- const SAFARI_ZONE_ENTRANCE ; $9C
- const FUCHSIA_GYM ; $9D
- const FUCHSIA_MEETING_ROOM ; $9E
- const SEAFOAM_ISLANDS_2 ; $9F
- const SEAFOAM_ISLANDS_3 ; $A0
- const SEAFOAM_ISLANDS_4 ; $A1
- const SEAFOAM_ISLANDS_5 ; $A2
- const VERMILION_HOUSE_2 ; $A3
- const FUCHSIA_HOUSE_3 ; $A4
- const MANSION_1 ; $A5
- const CINNABAR_GYM ; $A6
- const CINNABAR_LAB_1 ; $A7
- const CINNABAR_LAB_2 ; $A8
- const CINNABAR_LAB_3 ; $A9
- const CINNABAR_LAB_4 ; $AA
- const CINNABAR_POKECENTER ; $AB
- const CINNABAR_MART ; $AC
- const CINNABAR_MART_COPY ; $AD
- const INDIGO_PLATEAU_LOBBY ; $AE
- const COPYCATS_HOUSE_1F ; $AF
- const COPYCATS_HOUSE_2F ; $B0
- const FIGHTING_DOJO ; $B1
- const SAFFRON_GYM ; $B2
- const SAFFRON_HOUSE_1 ; $B3
- const SAFFRON_MART ; $B4
- const SILPH_CO_1F ; $B5
- const SAFFRON_POKECENTER ; $B6
- const SAFFRON_HOUSE_2 ; $B7
- const ROUTE_15_GATE_1F ; $B8
- const ROUTE_15_GATE_2F ; $B9
- const ROUTE_16_GATE_1F ; $BA
- const ROUTE_16_GATE_2F ; $BB
- const ROUTE_16_HOUSE ; $BC
- const ROUTE_12_HOUSE ; $BD
- const ROUTE_18_GATE_1F ; $BE
- const ROUTE_18_GATE_2F ; $BF
- const SEAFOAM_ISLANDS_1 ; $C0
- const ROUTE_22_GATE ; $C1
- const VICTORY_ROAD_2 ; $C2
- const ROUTE_12_GATE_2F ; $C3
- const VERMILION_HOUSE_3 ; $C4
- const DIGLETTS_CAVE ; $C5
- const VICTORY_ROAD_3 ; $C6
- const ROCKET_HIDEOUT_1 ; $C7
- const ROCKET_HIDEOUT_2 ; $C8
- const ROCKET_HIDEOUT_3 ; $C9
- const ROCKET_HIDEOUT_4 ; $CA
- const ROCKET_HIDEOUT_ELEVATOR ; $CB
- const UNUSED_MAP_CC ; $CC
- const UNUSED_MAP_CD ; $CD
- const UNUSED_MAP_CE ; $CE
- const SILPH_CO_2F ; $CF
- const SILPH_CO_3F ; $D0
- const SILPH_CO_4F ; $D1
- const SILPH_CO_5F ; $D2
- const SILPH_CO_6F ; $D3
- const SILPH_CO_7F ; $D4
- const SILPH_CO_8F ; $D5
- const MANSION_2 ; $D6
- const MANSION_3 ; $D7
- const MANSION_4 ; $D8
- const SAFARI_ZONE_EAST ; $D9
- const SAFARI_ZONE_NORTH ; $DA
- const SAFARI_ZONE_WEST ; $DB
- const SAFARI_ZONE_CENTER ; $DC
- const SAFARI_ZONE_REST_HOUSE_1 ; $DD
- const SAFARI_ZONE_SECRET_HOUSE ; $DE
- const SAFARI_ZONE_REST_HOUSE_2 ; $DF
- const SAFARI_ZONE_REST_HOUSE_3 ; $E0
- const SAFARI_ZONE_REST_HOUSE_4 ; $E1
- const UNKNOWN_DUNGEON_2 ; $E2
- const UNKNOWN_DUNGEON_3 ; $E3
- const UNKNOWN_DUNGEON_1 ; $E4
- const NAME_RATERS_HOUSE ; $E5
- const CERULEAN_HOUSE_3 ; $E6
- const UNUSED_MAP_E7 ; $E7
- const ROCK_TUNNEL_2 ; $E8
- const SILPH_CO_9F ; $E9
- const SILPH_CO_10F ; $EA
- const SILPH_CO_11F ; $EB
- const SILPH_CO_ELEVATOR ; $EC
- const UNUSED_MAP_ED ; $ED
- const UNUSED_MAP_EE ; $EE
- const TRADE_CENTER ; $EF
- const COLOSSEUM ; $F0
- const UNUSED_MAP_F1 ; $F1
- const UNUSED_MAP_F2 ; $F2
- const UNUSED_MAP_F3 ; $F3
- const UNUSED_MAP_F4 ; $F4
- const LORELEIS_ROOM ; $F5
- const BRUNOS_ROOM ; $F6
- const AGATHAS_ROOM ; $F7
- const BEACH_HOUSE ; $F8
+ const_def
+ mapconst PALLET_TOWN, 9, 10 ; $00
+ mapconst VIRIDIAN_CITY, 18, 20 ; $01
+ mapconst PEWTER_CITY, 18, 20 ; $02
+ mapconst CERULEAN_CITY, 18, 20 ; $03
+ mapconst LAVENDER_TOWN, 9, 10 ; $04
+ mapconst VERMILION_CITY, 18, 20 ; $05
+ mapconst CELADON_CITY, 18, 25 ; $06
+ mapconst FUCHSIA_CITY, 18, 20 ; $07
+ mapconst CINNABAR_ISLAND, 9, 10 ; $08
+ mapconst INDIGO_PLATEAU, 9, 10 ; $09
+ mapconst SAFFRON_CITY, 18, 20 ; $0A
+ mapconst UNUSED_MAP_0B, 0, 0 ; $0B
+ mapconst ROUTE_1, 18, 10 ; $0C
+ mapconst ROUTE_2, 36, 10 ; $0D
+ mapconst ROUTE_3, 9, 35 ; $0E
+ mapconst ROUTE_4, 9, 45 ; $0F
+ mapconst ROUTE_5, 18, 10 ; $10
+ mapconst ROUTE_6, 18, 10 ; $11
+ mapconst ROUTE_7, 9, 10 ; $12
+ mapconst ROUTE_8, 9, 30 ; $13
+ mapconst ROUTE_9, 9, 30 ; $14
+ mapconst ROUTE_10, 36, 10 ; $15
+ mapconst ROUTE_11, 9, 30 ; $16
+ mapconst ROUTE_12, 54, 10 ; $17
+ mapconst ROUTE_13, 9, 30 ; $18
+ mapconst ROUTE_14, 27, 10 ; $19
+ mapconst ROUTE_15, 9, 30 ; $1A
+ mapconst ROUTE_16, 9, 20 ; $1B
+ mapconst ROUTE_17, 72, 10 ; $1C
+ mapconst ROUTE_18, 9, 25 ; $1D
+ mapconst ROUTE_19, 27, 10 ; $1E
+ mapconst ROUTE_20, 9, 50 ; $1F
+ mapconst ROUTE_21, 45, 10 ; $20
+ mapconst ROUTE_22, 9, 20 ; $21
+ mapconst ROUTE_23, 72, 10 ; $22
+ mapconst ROUTE_24, 18, 10 ; $23
+ mapconst ROUTE_25, 9, 30 ; $24
+ mapconst REDS_HOUSE_1F, 4, 4 ; $25
+ mapconst REDS_HOUSE_2F, 4, 4 ; $26
+ mapconst BLUES_HOUSE, 4, 4 ; $27
+ mapconst OAKS_LAB, 6, 5 ; $28
+ mapconst VIRIDIAN_POKECENTER, 4, 7 ; $29
+ mapconst VIRIDIAN_MART, 4, 4 ; $2A
+ mapconst VIRIDIAN_SCHOOL, 4, 4 ; $2B
+ mapconst VIRIDIAN_HOUSE, 4, 4 ; $2C
+ mapconst VIRIDIAN_GYM, 9, 10 ; $2D
+ mapconst DIGLETTS_CAVE_EXIT, 4, 4 ; $2E
+ mapconst VIRIDIAN_FOREST_EXIT, 4, 5 ; $2F
+ mapconst ROUTE_2_HOUSE, 4, 4 ; $30
+ mapconst ROUTE_2_GATE, 4, 5 ; $31
+ mapconst VIRIDIAN_FOREST_ENTRANCE, 4, 5 ; $32
+ mapconst VIRIDIAN_FOREST, 24, 17 ; $33
+ mapconst MUSEUM_1F, 4, 10 ; $34
+ mapconst MUSEUM_2F, 4, 7 ; $35
+ mapconst PEWTER_GYM, 7, 5 ; $36
+ mapconst PEWTER_HOUSE_1, 4, 4 ; $37
+ mapconst PEWTER_MART, 4, 4 ; $38
+ mapconst PEWTER_HOUSE_2, 4, 4 ; $39
+ mapconst PEWTER_POKECENTER, 4, 7 ; $3A
+ mapconst MT_MOON_1, 18, 20 ; $3B
+ mapconst MT_MOON_2, 14, 14 ; $3C
+ mapconst MT_MOON_3, 18, 20 ; $3D
+ mapconst TRASHED_HOUSE, 4, 4 ; $3E
+ mapconst CERULEAN_HOUSE_1, 4, 4 ; $3F
+ mapconst CERULEAN_POKECENTER, 4, 7 ; $40
+ mapconst CERULEAN_GYM, 7, 5 ; $41
+ mapconst BIKE_SHOP, 4, 4 ; $42
+ mapconst CERULEAN_MART, 4, 4 ; $43
+ mapconst MT_MOON_POKECENTER, 4, 7 ; $44
+ mapconst TRASHED_HOUSE_COPY, 4, 4 ; $45
+ mapconst ROUTE_5_GATE, 3, 4 ; $46
+ mapconst PATH_ENTRANCE_ROUTE_5, 4, 4 ; $47
+ mapconst DAYCAREM, 4, 4 ; $48
+ mapconst ROUTE_6_GATE, 3, 4 ; $49
+ mapconst PATH_ENTRANCE_ROUTE_6, 4, 4 ; $4A
+ mapconst PATH_ENTRANCE_ROUTE_6_COPY, 4, 4 ; $4B
+ mapconst ROUTE_7_GATE, 4, 3 ; $4C
+ mapconst PATH_ENTRANCE_ROUTE_7, 4, 4 ; $4D
+ mapconst PATH_ENTRANCE_ROUTE_7_COPY, 4, 4 ; $4E
+ mapconst ROUTE_8_GATE, 4, 3 ; $4F
+ mapconst PATH_ENTRANCE_ROUTE_8, 4, 4 ; $50
+ mapconst ROCK_TUNNEL_POKECENTER, 4, 7 ; $51
+ mapconst ROCK_TUNNEL_1, 18, 20 ; $52
+ mapconst POWER_PLANT, 18, 20 ; $53
+ mapconst ROUTE_11_GATE_1F, 5, 4 ; $54
+ mapconst DIGLETTS_CAVE_ENTRANCE, 4, 4 ; $55
+ mapconst ROUTE_11_GATE_2F, 4, 4 ; $56
+ mapconst ROUTE_12_GATE_1F, 4, 5 ; $57
+ mapconst BILLS_HOUSE, 4, 4 ; $58
+ mapconst VERMILION_POKECENTER, 4, 7 ; $59
+ mapconst POKEMON_FAN_CLUB, 4, 4 ; $5A
+ mapconst VERMILION_MART, 4, 4 ; $5B
+ mapconst VERMILION_GYM, 9, 5 ; $5C
+ mapconst VERMILION_HOUSE_1, 4, 4 ; $5D
+ mapconst VERMILION_DOCK, 6, 14 ; $5E
+ mapconst SS_ANNE_1, 9, 20 ; $5F
+ mapconst SS_ANNE_2, 9, 20 ; $60
+ mapconst SS_ANNE_3, 3, 10 ; $61
+ mapconst SS_ANNE_4, 4, 15 ; $62
+ mapconst SS_ANNE_5, 7, 10 ; $63
+ mapconst SS_ANNE_6, 8, 7 ; $64
+ mapconst SS_ANNE_7, 4, 3 ; $65
+ mapconst SS_ANNE_8, 8, 12 ; $66
+ mapconst SS_ANNE_9, 8, 12 ; $67
+ mapconst SS_ANNE_10, 8, 12 ; $68
+ mapconst UNUSED_MAP_69, 0, 0 ; $69
+ mapconst UNUSED_MAP_6A, 0, 0 ; $6A
+ mapconst UNUSED_MAP_6B, 0, 0 ; $6B
+ mapconst VICTORY_ROAD_1, 9, 10 ; $6C
+ mapconst UNUSED_MAP_6D, 0, 0 ; $6D
+ mapconst UNUSED_MAP_6E, 0, 0 ; $6E
+ mapconst UNUSED_MAP_6F, 0, 0 ; $6F
+ mapconst UNUSED_MAP_70, 0, 0 ; $70
+ mapconst LANCES_ROOM, 13, 13 ; $71
+ mapconst UNUSED_MAP_72, 0, 0 ; $72
+ mapconst UNUSED_MAP_73, 0, 0 ; $73
+ mapconst UNUSED_MAP_74, 0, 0 ; $74
+ mapconst UNUSED_MAP_75, 0, 0 ; $75
+ mapconst HALL_OF_FAME, 4, 5 ; $76
+ mapconst UNDERGROUND_PATH_NS, 24, 4 ; $77
+ mapconst CHAMPIONS_ROOM, 4, 4 ; $78
+ mapconst UNDERGROUND_PATH_WE, 4, 25 ; $79
+ mapconst CELADON_MART_1, 4, 10 ; $7A
+ mapconst CELADON_MART_2, 4, 10 ; $7B
+ mapconst CELADON_MART_3, 4, 10 ; $7C
+ mapconst CELADON_MART_4, 4, 10 ; $7D
+ mapconst CELADON_MART_ROOF, 4, 10 ; $7E
+ mapconst CELADON_MART_ELEVATOR, 2, 2 ; $7F
+ mapconst CELADON_MANSION_1, 6, 4 ; $80
+ mapconst CELADON_MANSION_2, 6, 4 ; $81
+ mapconst CELADON_MANSION_3, 6, 4 ; $82
+ mapconst CELADON_MANSION_4, 6, 4 ; $83
+ mapconst CELADON_MANSION_5, 4, 4 ; $84
+ mapconst CELADON_POKECENTER, 4, 7 ; $85
+ mapconst CELADON_GYM, 9, 5 ; $86
+ mapconst GAME_CORNER, 9, 10 ; $87
+ mapconst CELADON_MART_5, 4, 10 ; $88
+ mapconst CELADON_PRIZE_ROOM, 4, 5 ; $89
+ mapconst CELADON_DINER, 4, 5 ; $8A
+ mapconst CELADON_HOUSE, 4, 4 ; $8B
+ mapconst CELADON_HOTEL, 4, 7 ; $8C
+ mapconst LAVENDER_POKECENTER, 4, 7 ; $8D
+ mapconst POKEMONTOWER_1, 9, 10 ; $8E
+ mapconst POKEMONTOWER_2, 9, 10 ; $8F
+ mapconst POKEMONTOWER_3, 9, 10 ; $90
+ mapconst POKEMONTOWER_4, 9, 10 ; $91
+ mapconst POKEMONTOWER_5, 9, 10 ; $92
+ mapconst POKEMONTOWER_6, 9, 10 ; $93
+ mapconst POKEMONTOWER_7, 9, 10 ; $94
+ mapconst LAVENDER_HOUSE_1, 4, 4 ; $95
+ mapconst LAVENDER_MART, 4, 4 ; $96
+ mapconst LAVENDER_HOUSE_2, 4, 4 ; $97
+ mapconst FUCHSIA_MART, 4, 4 ; $98
+ mapconst FUCHSIA_HOUSE_1, 4, 4 ; $99
+ mapconst FUCHSIA_POKECENTER, 4, 7 ; $9A
+ mapconst FUCHSIA_HOUSE_2, 4, 5 ; $9B
+ mapconst SAFARI_ZONE_ENTRANCE, 3, 4 ; $9C
+ mapconst FUCHSIA_GYM, 9, 5 ; $9D
+ mapconst FUCHSIA_MEETING_ROOM, 4, 7 ; $9E
+ mapconst SEAFOAM_ISLANDS_2, 9, 15 ; $9F
+ mapconst SEAFOAM_ISLANDS_3, 9, 15 ; $A0
+ mapconst SEAFOAM_ISLANDS_4, 9, 15 ; $A1
+ mapconst SEAFOAM_ISLANDS_5, 9, 15 ; $A2
+ mapconst VERMILION_HOUSE_2, 4, 4 ; $A3
+ mapconst FUCHSIA_HOUSE_3, 4, 4 ; $A4
+ mapconst MANSION_1, 14, 15 ; $A5
+ mapconst CINNABAR_GYM, 9, 10 ; $A6
+ mapconst CINNABAR_LAB_1, 4, 9 ; $A7
+ mapconst CINNABAR_LAB_2, 4, 4 ; $A8
+ mapconst CINNABAR_LAB_3, 4, 4 ; $A9
+ mapconst CINNABAR_LAB_4, 4, 4 ; $AA
+ mapconst CINNABAR_POKECENTER, 4, 7 ; $AB
+ mapconst CINNABAR_MART, 4, 4 ; $AC
+ mapconst CINNABAR_MART_COPY, 4, 4 ; $AD
+ mapconst INDIGO_PLATEAU_LOBBY, 6, 8 ; $AE
+ mapconst COPYCATS_HOUSE_1F, 4, 4 ; $AF
+ mapconst COPYCATS_HOUSE_2F, 4, 4 ; $B0
+ mapconst FIGHTING_DOJO, 6, 5 ; $B1
+ mapconst SAFFRON_GYM, 9, 10 ; $B2
+ mapconst SAFFRON_HOUSE_1, 4, 4 ; $B3
+ mapconst SAFFRON_MART, 4, 4 ; $B4
+ mapconst SILPH_CO_1F, 9, 15 ; $B5
+ mapconst SAFFRON_POKECENTER, 4, 7 ; $B6
+ mapconst SAFFRON_HOUSE_2, 4, 4 ; $B7
+ mapconst ROUTE_15_GATE_1F, 5, 4 ; $B8
+ mapconst ROUTE_15_GATE_2F, 4, 4 ; $B9
+ mapconst ROUTE_16_GATE_1F, 7, 4 ; $BA
+ mapconst ROUTE_16_GATE_2F, 4, 4 ; $BB
+ mapconst ROUTE_16_HOUSE, 4, 4 ; $BC
+ mapconst ROUTE_12_HOUSE, 4, 4 ; $BD
+ mapconst ROUTE_18_GATE_1F, 5, 4 ; $BE
+ mapconst ROUTE_18_GATE_2F, 4, 4 ; $BF
+ mapconst SEAFOAM_ISLANDS_1, 9, 15 ; $C0
+ mapconst ROUTE_22_GATE, 4, 5 ; $C1
+ mapconst VICTORY_ROAD_2, 9, 15 ; $C2
+ mapconst ROUTE_12_GATE_2F, 4, 4 ; $C3
+ mapconst VERMILION_HOUSE_3, 4, 4 ; $C4
+ mapconst DIGLETTS_CAVE, 18, 20 ; $C5
+ mapconst VICTORY_ROAD_3, 9, 15 ; $C6
+ mapconst ROCKET_HIDEOUT_1, 14, 15 ; $C7
+ mapconst ROCKET_HIDEOUT_2, 14, 15 ; $C8
+ mapconst ROCKET_HIDEOUT_3, 14, 15 ; $C9
+ mapconst ROCKET_HIDEOUT_4, 12, 15 ; $CA
+ mapconst ROCKET_HIDEOUT_ELEVATOR, 4, 3 ; $CB
+ mapconst UNUSED_MAP_CC, 0, 0 ; $CC
+ mapconst UNUSED_MAP_CD, 0, 0 ; $CD
+ mapconst UNUSED_MAP_CE, 0, 0 ; $CE
+ mapconst SILPH_CO_2F, 9, 15 ; $CF
+ mapconst SILPH_CO_3F, 9, 15 ; $D0
+ mapconst SILPH_CO_4F, 9, 15 ; $D1
+ mapconst SILPH_CO_5F, 9, 15 ; $D2
+ mapconst SILPH_CO_6F, 9, 13 ; $D3
+ mapconst SILPH_CO_7F, 9, 13 ; $D4
+ mapconst SILPH_CO_8F, 9, 13 ; $D5
+ mapconst MANSION_2, 14, 15 ; $D6
+ mapconst MANSION_3, 9, 15 ; $D7
+ mapconst MANSION_4, 14, 15 ; $D8
+ mapconst SAFARI_ZONE_EAST, 13, 15 ; $D9
+ mapconst SAFARI_ZONE_NORTH, 18, 20 ; $DA
+ mapconst SAFARI_ZONE_WEST, 13, 15 ; $DB
+ mapconst SAFARI_ZONE_CENTER, 13, 15 ; $DC
+ mapconst SAFARI_ZONE_REST_HOUSE_1, 4, 4 ; $DD
+ mapconst SAFARI_ZONE_SECRET_HOUSE, 4, 4 ; $DE
+ mapconst SAFARI_ZONE_REST_HOUSE_2, 4, 4 ; $DF
+ mapconst SAFARI_ZONE_REST_HOUSE_3, 4, 4 ; $E0
+ mapconst SAFARI_ZONE_REST_HOUSE_4, 4, 4 ; $E1
+ mapconst UNKNOWN_DUNGEON_2, 9, 15 ; $E2
+ mapconst UNKNOWN_DUNGEON_3, 9, 15 ; $E3
+ mapconst UNKNOWN_DUNGEON_1, 9, 15 ; $E4
+ mapconst NAME_RATERS_HOUSE, 4, 4 ; $E5
+ mapconst CERULEAN_HOUSE_2, 4, 4 ; $E6
+ mapconst UNUSED_MAP_E7, 0, 0 ; $E7
+ mapconst ROCK_TUNNEL_2, 18, 20 ; $E8
+ mapconst SILPH_CO_9F, 9, 13 ; $E9
+ mapconst SILPH_CO_10F, 9, 8 ; $EA
+ mapconst SILPH_CO_11F, 9, 9 ; $EB
+ mapconst SILPH_CO_ELEVATOR, 2, 2 ; $EC
+ mapconst UNUSED_MAP_ED, 0, 0 ; $ED
+ mapconst UNUSED_MAP_EE, 0, 0 ; $EE
+ mapconst TRADE_CENTER, 4, 5 ; $EF
+ mapconst COLOSSEUM, 4, 5 ; $F0
+ mapconst UNUSED_MAP_F1, 0, 0 ; $F1
+ mapconst UNUSED_MAP_F2, 0, 0 ; $F2
+ mapconst UNUSED_MAP_F3, 0, 0 ; $F3
+ mapconst UNUSED_MAP_F4, 0, 0 ; $F4
+ mapconst LORELEIS_ROOM, 6, 5 ; $F5
+ mapconst BRUNOS_ROOM, 6, 5 ; $F6
+ mapconst AGATHAS_ROOM, 6, 5 ; $F7
+ mapconst BEACH_HOUSE, 4, 7 ; $F8
diff --git a/constants/map_dimensions.asm b/constants/map_dimensions.asm
deleted file mode 100755
index 22fa3c6e..00000000
--- a/constants/map_dimensions.asm
+++ /dev/null
@@ -1,896 +0,0 @@
-; Map sizes (y, x)
-
-; PalletTown_h map_id=0
-PALLET_TOWN_HEIGHT EQU $09
-PALLET_TOWN_WIDTH EQU $0a
-
-; ViridianCity_h map_id=1
-VIRIDIAN_CITY_HEIGHT EQU $12
-VIRIDIAN_CITY_WIDTH EQU $14
-
-; PewterCity_h map_id=2
-PEWTER_CITY_HEIGHT EQU $12
-PEWTER_CITY_WIDTH EQU $14
-
-; CeruleanCity_h map_id=3
-CERULEAN_CITY_HEIGHT EQU $12
-CERULEAN_CITY_WIDTH EQU $14
-
-; LavenderTown_h map_id=4
-LAVENDER_TOWN_HEIGHT EQU $09
-LAVENDER_TOWN_WIDTH EQU $0a
-
-; VermilionCity_h map_id=5
-VERMILION_CITY_HEIGHT EQU $12
-VERMILION_CITY_WIDTH EQU $14
-
-; CeladonCity_h map_id=6
-CELADON_CITY_HEIGHT EQU $12
-CELADON_CITY_WIDTH EQU $19
-
-; FuchsiaCity_h map_id=7
-FUCHSIA_CITY_HEIGHT EQU $12
-FUCHSIA_CITY_WIDTH EQU $14
-
-; CinnabarIsland_h map_id=8
-CINNABAR_ISLAND_HEIGHT EQU $09
-CINNABAR_ISLAND_WIDTH EQU $0a
-
-; IndigoPlateau_h map_id=9
-INDIGO_PLATEAU_HEIGHT EQU $09
-INDIGO_PLATEAU_WIDTH EQU $0a
-
-; SaffronCity_h map_id=10
-SAFFRON_CITY_HEIGHT EQU $12
-SAFFRON_CITY_WIDTH EQU $14
-
-; Route1_h map_id=12
-ROUTE_1_HEIGHT EQU $12
-ROUTE_1_WIDTH EQU $0a
-
-; Route2_h map_id=13
-ROUTE_2_HEIGHT EQU $24
-ROUTE_2_WIDTH EQU $0a
-
-; Route3_h map_id=14
-ROUTE_3_HEIGHT EQU $09
-ROUTE_3_WIDTH EQU $23
-
-; Route4_h map_id=15
-ROUTE_4_HEIGHT EQU $09
-ROUTE_4_WIDTH EQU $2d
-
-; Route5_h map_id=16
-ROUTE_5_HEIGHT EQU $12
-ROUTE_5_WIDTH EQU $0a
-
-; Route6_h map_id=17
-ROUTE_6_HEIGHT EQU $12
-ROUTE_6_WIDTH EQU $0a
-
-; Route7_h map_id=18
-ROUTE_7_HEIGHT EQU $09
-ROUTE_7_WIDTH EQU $0a
-
-; Route8_h map_id=19
-ROUTE_8_HEIGHT EQU $09
-ROUTE_8_WIDTH EQU $1e
-
-; Route9_h map_id=20
-ROUTE_9_HEIGHT EQU $09
-ROUTE_9_WIDTH EQU $1e
-
-; Route10_h map_id=21
-ROUTE_10_HEIGHT EQU $24
-ROUTE_10_WIDTH EQU $0a
-
-; Route11_h map_id=22
-ROUTE_11_HEIGHT EQU $09
-ROUTE_11_WIDTH EQU $1e
-
-; Route12_h map_id=23
-ROUTE_12_HEIGHT EQU $36
-ROUTE_12_WIDTH EQU $0a
-
-; Route13_h map_id=24
-ROUTE_13_HEIGHT EQU $09
-ROUTE_13_WIDTH EQU $1e
-
-; Route14_h map_id=25
-ROUTE_14_HEIGHT EQU $1b
-ROUTE_14_WIDTH EQU $0a
-
-; Route15_h map_id=26
-ROUTE_15_HEIGHT EQU $09
-ROUTE_15_WIDTH EQU $1e
-
-; Route16_h map_id=27
-ROUTE_16_HEIGHT EQU $09
-ROUTE_16_WIDTH EQU $14
-
-; Route17_h map_id=28
-ROUTE_17_HEIGHT EQU $48
-ROUTE_17_WIDTH EQU $0a
-
-; Route18_h map_id=29
-ROUTE_18_HEIGHT EQU $09
-ROUTE_18_WIDTH EQU $19
-
-; Route19_h map_id=30
-ROUTE_19_HEIGHT EQU $1b
-ROUTE_19_WIDTH EQU $0a
-
-; Route20_h map_id=31
-ROUTE_20_HEIGHT EQU $09
-ROUTE_20_WIDTH EQU $32
-
-; Route21_h map_id=32
-ROUTE_21_HEIGHT EQU $2d
-ROUTE_21_WIDTH EQU $0a
-
-; Route22_h map_id=33
-ROUTE_22_HEIGHT EQU $09
-ROUTE_22_WIDTH EQU $14
-
-; Route23_h map_id=34
-ROUTE_23_HEIGHT EQU $48
-ROUTE_23_WIDTH EQU $0a
-
-; Route24_h map_id=35
-ROUTE_24_HEIGHT EQU $12
-ROUTE_24_WIDTH EQU $0a
-
-; Route25_h map_id=36
-ROUTE_25_HEIGHT EQU $09
-ROUTE_25_WIDTH EQU $1e
-
-; RedsHouse1F_h map_id=37
-REDS_HOUSE_1F_HEIGHT EQU $04
-REDS_HOUSE_1F_WIDTH EQU $04
-
-; RedsHouse2F_h map_id=38
-REDS_HOUSE_2F_HEIGHT EQU $04
-REDS_HOUSE_2F_WIDTH EQU $04
-
-; BluesHouse_h map_id=39
-BLUES_HOUSE_HEIGHT EQU $04
-BLUES_HOUSE_WIDTH EQU $04
-
-; OaksLab_h map_id=40
-OAKS_LAB_HEIGHT EQU $06
-OAKS_LAB_WIDTH EQU $05
-
-; ViridianPokeCenter_h map_id=41
-VIRIDIAN_POKECENTER_HEIGHT EQU $04
-VIRIDIAN_POKECENTER_WIDTH EQU $07
-
-; ViridianMart_h map_id=42
-VIRIDIAN_MART_HEIGHT EQU $04
-VIRIDIAN_MART_WIDTH EQU $04
-
-; School_h map_id=43
-VIRIDIAN_SCHOOL_HEIGHT EQU $04
-VIRIDIAN_SCHOOL_WIDTH EQU $04
-
-; ViridianHouse_h map_id=44
-VIRIDIAN_HOUSE_HEIGHT EQU $04
-VIRIDIAN_HOUSE_WIDTH EQU $04
-
-; ViridianGym_h map_id=45
-VIRIDIAN_GYM_HEIGHT EQU $09
-VIRIDIAN_GYM_WIDTH EQU $0a
-
-; DiglettsCaveRoute2_h map_id=46
-DIGLETTS_CAVE_EXIT_HEIGHT EQU $04
-DIGLETTS_CAVE_EXIT_WIDTH EQU $04
-
-; ViridianForestExit_h map_id=47
-VIRIDIAN_FOREST_EXIT_HEIGHT EQU $04
-VIRIDIAN_FOREST_EXIT_WIDTH EQU $05
-
-; Route2House_h map_id=48
-ROUTE_2_HOUSE_HEIGHT EQU $04
-ROUTE_2_HOUSE_WIDTH EQU $04
-
-; Route2Gate_h map_id=49
-ROUTE_2_GATE_HEIGHT EQU $04
-ROUTE_2_GATE_WIDTH EQU $05
-
-; ViridianForestEntrance_h map_id=50
-VIRIDIAN_FOREST_ENTRANCE_HEIGHT EQU $04
-VIRIDIAN_FOREST_ENTRANCE_WIDTH EQU $05
-
-; ViridianForest_h map_id=51
-VIRIDIAN_FOREST_HEIGHT EQU $18
-VIRIDIAN_FOREST_WIDTH EQU $11
-
-; MuseumF1_h map_id=52
-MUSEUM_1F_HEIGHT EQU $04
-MUSEUM_1F_WIDTH EQU $0a
-
-; MuseumF2_h map_id=53
-MUSEUM_2F_HEIGHT EQU $04
-MUSEUM_2F_WIDTH EQU $07
-
-; PewterGym_h map_id=54
-PEWTER_GYM_HEIGHT EQU $07
-PEWTER_GYM_WIDTH EQU $05
-
-; PewterHouse1_h map_id=55
-PEWTER_HOUSE_1_HEIGHT EQU $04
-PEWTER_HOUSE_1_WIDTH EQU $04
-
-; PewterMart_h map_id=56
-PEWTER_MART_HEIGHT EQU $04
-PEWTER_MART_WIDTH EQU $04
-
-; PewterHouse2_h map_id=57
-PEWTER_HOUSE_2_HEIGHT EQU $04
-PEWTER_HOUSE_2_WIDTH EQU $04
-
-; PewterPokecenter_h map_id=58
-PEWTER_POKECENTER_HEIGHT EQU $04
-PEWTER_POKECENTER_WIDTH EQU $07
-
-; MtMoon1_h map_id=59
-MT_MOON_1_HEIGHT EQU $12
-MT_MOON_1_WIDTH EQU $14
-
-; MtMoon2_h map_id=60
-MT_MOON_2_HEIGHT EQU $0e
-MT_MOON_2_WIDTH EQU $0e
-
-; MtMoon3_h map_id=61
-MT_MOON_3_HEIGHT EQU $12
-MT_MOON_3_WIDTH EQU $14
-
-; CeruleanHouseTrashed_h map_id=62
-TRASHED_HOUSE_HEIGHT EQU $04
-TRASHED_HOUSE_WIDTH EQU $04
-
-; CeruleanHouse1_h map_id=63
-CERULEAN_HOUSE_1_HEIGHT EQU $04
-CERULEAN_HOUSE_1_WIDTH EQU $04
-
-; CeruleanPokecenter_h map_id=64
-CERULEAN_POKECENTER_HEIGHT EQU $04
-CERULEAN_POKECENTER_WIDTH EQU $07
-
-; CeruleanGym_h map_id=65
-CERULEAN_GYM_HEIGHT EQU $07
-CERULEAN_GYM_WIDTH EQU $05
-
-; BikeShop_h map_id=66
-BIKE_SHOP_HEIGHT EQU $04
-BIKE_SHOP_WIDTH EQU $04
-
-; CeruleanMart_h map_id=67
-CERULEAN_MART_HEIGHT EQU $04
-CERULEAN_MART_WIDTH EQU $04
-
-; MtMoonPokecenter_h map_id=68
-MT_MOON_POKECENTER_HEIGHT EQU $04
-MT_MOON_POKECENTER_WIDTH EQU $07
-
-; Route5Gate_h map_id=70
-ROUTE_5_GATE_HEIGHT EQU $03
-ROUTE_5_GATE_WIDTH EQU $04
-
-; UndergroundTunnelEntranceRoute5_h map_id=71
-PATH_ENTRANCE_ROUTE_5_HEIGHT EQU $04
-PATH_ENTRANCE_ROUTE_5_WIDTH EQU $04
-
-; DayCareM_h map_id=72
-DAYCAREM_HEIGHT EQU $04
-DAYCAREM_WIDTH EQU $04
-
-; Route6Gate_h map_id=73
-ROUTE_6_GATE_HEIGHT EQU $03
-ROUTE_6_GATE_WIDTH EQU $04
-
-; UndergroundTunnelEntranceRoute6_h map_id=74
-PATH_ENTRANCE_ROUTE_6_HEIGHT EQU $04
-PATH_ENTRANCE_ROUTE_6_WIDTH EQU $04
-
-; Route7Gate_h map_id=76
-ROUTE_7_GATE_HEIGHT EQU $04
-ROUTE_7_GATE_WIDTH EQU $03
-
-; UndergroundPathEntranceRoute7_h map_id=77
-PATH_ENTRANCE_ROUTE_7_HEIGHT EQU $04
-PATH_ENTRANCE_ROUTE_7_WIDTH EQU $04
-
-; UndergroundPathEntranceRoute7Copy_h map_id=78
-PATH_ENTRANCE_ROUTE_7_COPY_HEIGHT EQU $04
-PATH_ENTRANCE_ROUTE_7_COPY_WIDTH EQU $04
-
-; Route8Gate_h map_id=79
-ROUTE_8_GATE_HEIGHT EQU $04
-ROUTE_8_GATE_WIDTH EQU $03
-
-; UndergroundPathEntranceRoute8_h map_id=80
-PATH_ENTRANCE_ROUTE_8_HEIGHT EQU $04
-PATH_ENTRANCE_ROUTE_8_WIDTH EQU $04
-
-; RockTunnelPokecenter_h map_id=81
-ROCK_TUNNEL_POKECENTER_HEIGHT EQU $04
-ROCK_TUNNEL_POKECENTER_WIDTH EQU $07
-
-; RockTunnel1_h map_id=82
-ROCK_TUNNEL_1_HEIGHT EQU $12
-ROCK_TUNNEL_1_WIDTH EQU $14
-
-; PowerPlant_h map_id=83
-POWER_PLANT_HEIGHT EQU $12
-POWER_PLANT_WIDTH EQU $14
-
-; Route11Gate_h map_id=84
-ROUTE_11_GATE_1F_HEIGHT EQU $05
-ROUTE_11_GATE_1F_WIDTH EQU $04
-
-; DiglettsCaveEntranceRoute11_h map_id=85
-DIGLETTS_CAVE_ENTRANCE_HEIGHT EQU $04
-DIGLETTS_CAVE_ENTRANCE_WIDTH EQU $04
-
-; Route11GateUpstairs_h map_id=86
-ROUTE_11_GATE_2F_HEIGHT EQU $04
-ROUTE_11_GATE_2F_WIDTH EQU $04
-
-; Route12Gate_h map_id=87
-ROUTE_12_GATE_1F_HEIGHT EQU $04
-ROUTE_12_GATE_1F_WIDTH EQU $05
-
-; BillsHouse_h map_id=88
-BILLS_HOUSE_HEIGHT EQU $04
-BILLS_HOUSE_WIDTH EQU $04
-
-; VermilionPokecenter_h map_id=89
-VERMILION_POKECENTER_HEIGHT EQU $04
-VERMILION_POKECENTER_WIDTH EQU $07
-
-; FanClub_h map_id=90
-POKEMON_FAN_CLUB_HEIGHT EQU $04
-POKEMON_FAN_CLUB_WIDTH EQU $04
-
-; VermilionMart_h map_id=91
-VERMILION_MART_HEIGHT EQU $04
-VERMILION_MART_WIDTH EQU $04
-
-; VermilionGym_h map_id=92
-VERMILION_GYM_HEIGHT EQU $09
-VERMILION_GYM_WIDTH EQU $05
-
-; VermilionHouse1_h map_id=93
-VERMILION_HOUSE_1_HEIGHT EQU $04
-VERMILION_HOUSE_1_WIDTH EQU $04
-
-; VermilionDock_h map_id=94
-VERMILION_DOCK_HEIGHT EQU $06
-VERMILION_DOCK_WIDTH EQU $0e
-
-; SSAnne1_h map_id=95
-SS_ANNE_1_HEIGHT EQU $09
-SS_ANNE_1_WIDTH EQU $14
-
-; SSAnne2_h map_id=96
-SS_ANNE_2_HEIGHT EQU $09
-SS_ANNE_2_WIDTH EQU $14
-
-; SSAnne3_h map_id=97
-SS_ANNE_3_HEIGHT EQU $03
-SS_ANNE_3_WIDTH EQU $0a
-
-; SSAnne4_h map_id=98
-SS_ANNE_4_HEIGHT EQU $04
-SS_ANNE_4_WIDTH EQU $0f
-
-; SSAnne5_h map_id=99
-SS_ANNE_5_HEIGHT EQU $07
-SS_ANNE_5_WIDTH EQU $0a
-
-; SSAnne6_h map_id=100
-SS_ANNE_6_HEIGHT EQU $08
-SS_ANNE_6_WIDTH EQU $07
-
-; SSAnne7_h map_id=101
-SS_ANNE_7_HEIGHT EQU $04
-SS_ANNE_7_WIDTH EQU $03
-
-; SSAnne8_h map_id=102
-SS_ANNE_8_HEIGHT EQU $08
-SS_ANNE_8_WIDTH EQU $0c
-
-; SSAnne9_h map_id=103
-SS_ANNE_9_HEIGHT EQU $08
-SS_ANNE_9_WIDTH EQU $0c
-
-; SSAnne10_h map_id=104
-SS_ANNE_10_HEIGHT EQU $08
-SS_ANNE_10_WIDTH EQU $0c
-
-; VictoryRoad1_h map_id=108
-VICTORY_ROAD_1_HEIGHT EQU $09
-VICTORY_ROAD_1_WIDTH EQU $0a
-
-; Lance_h map_id=113
-LANCES_ROOM_HEIGHT EQU $0d
-LANCES_ROOM_WIDTH EQU $0d
-
-; HallofFameRoom_h map_id=118
-HALL_OF_FAME_HEIGHT EQU $04
-HALL_OF_FAME_WIDTH EQU $05
-
-; UndergroundPathNS_h map_id=119
-UNDERGROUND_PATH_NS_HEIGHT EQU $18
-UNDERGROUND_PATH_NS_WIDTH EQU $04
-
-; Gary_h map_id=120
-CHAMPIONS_ROOM_HEIGHT EQU $04
-CHAMPIONS_ROOM_WIDTH EQU $04
-
-; UndergroundPathWE_h map_id=121
-UNDERGROUND_PATH_WE_HEIGHT EQU $04
-UNDERGROUND_PATH_WE_WIDTH EQU $19
-
-; CeladonMart1_h map_id=122
-CELADON_MART_1_HEIGHT EQU $04
-CELADON_MART_1_WIDTH EQU $0a
-
-; CeladonMart2_h map_id=123
-CELADON_MART_2_HEIGHT EQU $04
-CELADON_MART_2_WIDTH EQU $0a
-
-; CeladonMart3_h map_id=124
-CELADON_MART_3_HEIGHT EQU $04
-CELADON_MART_3_WIDTH EQU $0a
-
-; CeladonMart4_h map_id=125
-CELADON_MART_4_HEIGHT EQU $04
-CELADON_MART_4_WIDTH EQU $0a
-
-; CeladonMartRoof_h map_id=126
-CELADON_MART_ROOF_HEIGHT EQU $04
-CELADON_MART_ROOF_WIDTH EQU $0a
-
-; CeladonMartElevator_h map_id=127
-CELADON_MART_ELEVATOR_HEIGHT EQU $02
-CELADON_MART_ELEVATOR_WIDTH EQU $02
-
-; CeladonMansion1_h map_id=128
-CELADON_MANSION_1_HEIGHT EQU $06
-CELADON_MANSION_1_WIDTH EQU $04
-
-; CeladonMansion2_h map_id=129
-CELADON_MANSION_2_HEIGHT EQU $06
-CELADON_MANSION_2_WIDTH EQU $04
-
-; CeladonMansion3_h map_id=130
-CELADON_MANSION_3_HEIGHT EQU $06
-CELADON_MANSION_3_WIDTH EQU $04
-
-; CeladonMansion4_h map_id=131
-CELADON_MANSION_4_HEIGHT EQU $06
-CELADON_MANSION_4_WIDTH EQU $04
-
-; CeladonMansion5_h map_id=132
-CELADON_MANSION_5_HEIGHT EQU $04
-CELADON_MANSION_5_WIDTH EQU $04
-
-; CeladonPokecenter_h map_id=133
-CELADON_POKECENTER_HEIGHT EQU $04
-CELADON_POKECENTER_WIDTH EQU $07
-
-; CeladonGym_h map_id=134
-CELADON_GYM_HEIGHT EQU $09
-CELADON_GYM_WIDTH EQU $05
-
-; CeladonGameCorner_h map_id=135
-GAME_CORNER_HEIGHT EQU $09
-GAME_CORNER_WIDTH EQU $0a
-
-; CeladonMart5_h map_id=136
-CELADON_MART_5_HEIGHT EQU $04
-CELADON_MART_5_WIDTH EQU $0a
-
-; CeladonPrizeRoom_h map_id=137
-CELADON_PRIZE_ROOM_HEIGHT EQU $04
-CELADON_PRIZE_ROOM_WIDTH EQU $05
-
-; CeladonDiner_h map_id=138
-CELADON_DINER_HEIGHT EQU $04
-CELADON_DINER_WIDTH EQU $05
-
-; CeladonHouse_h map_id=139
-CELADON_HOUSE_HEIGHT EQU $04
-CELADON_HOUSE_WIDTH EQU $04
-
-; CeladonHotel_h map_id=140
-CELADON_HOTEL_HEIGHT EQU $04
-CELADON_HOTEL_WIDTH EQU $07
-
-; LavenderPokecenter_h map_id=141
-LAVENDER_POKECENTER_HEIGHT EQU $04
-LAVENDER_POKECENTER_WIDTH EQU $07
-
-; PokemonTower1_h map_id=142
-POKEMONTOWER_1_HEIGHT EQU $09
-POKEMONTOWER_1_WIDTH EQU $0a
-
-; PokemonTower2_h map_id=143
-POKEMONTOWER_2_HEIGHT EQU $09
-POKEMONTOWER_2_WIDTH EQU $0a
-
-; PokemonTower3_h map_id=144
-POKEMONTOWER_3_HEIGHT EQU $09
-POKEMONTOWER_3_WIDTH EQU $0a
-
-; PokemonTower4_h map_id=145
-POKEMONTOWER_4_HEIGHT EQU $09
-POKEMONTOWER_4_WIDTH EQU $0a
-
-; PokemonTower5_h map_id=146
-POKEMONTOWER_5_HEIGHT EQU $09
-POKEMONTOWER_5_WIDTH EQU $0a
-
-; PokemonTower6_h map_id=147
-POKEMONTOWER_6_HEIGHT EQU $09
-POKEMONTOWER_6_WIDTH EQU $0a
-
-; PokemonTower7_h map_id=148
-POKEMONTOWER_7_HEIGHT EQU $09
-POKEMONTOWER_7_WIDTH EQU $0a
-
-; LavenderHouse1_h map_id=149
-LAVENDER_HOUSE_1_HEIGHT EQU $04
-LAVENDER_HOUSE_1_WIDTH EQU $04
-
-; LavenderMart_h map_id=150
-LAVENDER_MART_HEIGHT EQU $04
-LAVENDER_MART_WIDTH EQU $04
-
-; LavenderHouse2_h map_id=151
-LAVENDER_HOUSE_2_HEIGHT EQU $04
-LAVENDER_HOUSE_2_WIDTH EQU $04
-
-; FuchsiaMart_h map_id=152
-FUCHSIA_MART_HEIGHT EQU $04
-FUCHSIA_MART_WIDTH EQU $04
-
-; FuchsiaHouse1_h map_id=153
-FUCHSIA_HOUSE_1_HEIGHT EQU $04
-FUCHSIA_HOUSE_1_WIDTH EQU $04
-
-; FuchsiaPokecenter_h map_id=154
-FUCHSIA_POKECENTER_HEIGHT EQU $04
-FUCHSIA_POKECENTER_WIDTH EQU $07
-
-; FuchsiaHouse2_h map_id=155
-FUCHSIA_HOUSE_2_HEIGHT EQU $04
-FUCHSIA_HOUSE_2_WIDTH EQU $05
-
-; SafariZoneEntrance_h map_id=156
-SAFARI_ZONE_ENTRANCE_HEIGHT EQU $03
-SAFARI_ZONE_ENTRANCE_WIDTH EQU $04
-
-; FuchsiaGym_h map_id=157
-FUCHSIA_GYM_HEIGHT EQU $09
-FUCHSIA_GYM_WIDTH EQU $05
-
-; FuchsiaMeetingRoom_h map_id=158
-FUCHSIA_MEETING_ROOM_HEIGHT EQU $04
-FUCHSIA_MEETING_ROOM_WIDTH EQU $07
-
-; SeafoamIslands2_h map_id=159
-SEAFOAM_ISLANDS_2_HEIGHT EQU $09
-SEAFOAM_ISLANDS_2_WIDTH EQU $0f
-
-; SeafoamIslands3_h map_id=160
-SEAFOAM_ISLANDS_3_HEIGHT EQU $09
-SEAFOAM_ISLANDS_3_WIDTH EQU $0f
-
-; SeafoamIslands4_h map_id=161
-SEAFOAM_ISLANDS_4_HEIGHT EQU $09
-SEAFOAM_ISLANDS_4_WIDTH EQU $0f
-
-; SeafoamIslands5_h map_id=162
-SEAFOAM_ISLANDS_5_HEIGHT EQU $09
-SEAFOAM_ISLANDS_5_WIDTH EQU $0f
-
-; VermilionHouse2_h map_id=163
-VERMILION_HOUSE_2_HEIGHT EQU $04
-VERMILION_HOUSE_2_WIDTH EQU $04
-
-; FuchsiaHouse3_h map_id=164
-FUCHSIA_HOUSE_3_HEIGHT EQU $04
-FUCHSIA_HOUSE_3_WIDTH EQU $04
-
-; Mansion1_h map_id=165
-MANSION_1_HEIGHT EQU $0e
-MANSION_1_WIDTH EQU $0f
-
-; CinnabarGym_h map_id=166
-CINNABAR_GYM_HEIGHT EQU $09
-CINNABAR_GYM_WIDTH EQU $0a
-
-; Lab1_h map_id=167
-CINNABAR_LAB_1_HEIGHT EQU $04
-CINNABAR_LAB_1_WIDTH EQU $09
-
-; Lab2_h map_id=168
-CINNABAR_LAB_2_HEIGHT EQU $04
-CINNABAR_LAB_2_WIDTH EQU $04
-
-; Lab3_h map_id=169
-CINNABAR_LAB_3_HEIGHT EQU $04
-CINNABAR_LAB_3_WIDTH EQU $04
-
-; Lab4_h map_id=170
-CINNABAR_LAB_4_HEIGHT EQU $04
-CINNABAR_LAB_4_WIDTH EQU $04
-
-; CinnabarPokecenter_h map_id=171
-CINNABAR_POKECENTER_HEIGHT EQU $04
-CINNABAR_POKECENTER_WIDTH EQU $07
-
-; CinnabarMart_h map_id=172
-CINNABAR_MART_HEIGHT EQU $04
-CINNABAR_MART_WIDTH EQU $04
-
-; IndigoPlateauLobby_h map_id=174
-INDIGO_PLATEAU_LOBBY_HEIGHT EQU $06
-INDIGO_PLATEAU_LOBBY_WIDTH EQU $08
-
-; CopycatsHouse1F_h map_id=175
-COPYCATS_HOUSE_1F_HEIGHT EQU $04
-COPYCATS_HOUSE_1F_WIDTH EQU $04
-
-; CopycatsHouse2F_h map_id=176
-COPYCATS_HOUSE_2F_HEIGHT EQU $04
-COPYCATS_HOUSE_2F_WIDTH EQU $04
-
-; FightingDojo_h map_id=177
-FIGHTING_DOJO_HEIGHT EQU $06
-FIGHTING_DOJO_WIDTH EQU $05
-
-; SaffronGym_h map_id=178
-SAFFRON_GYM_HEIGHT EQU $09
-SAFFRON_GYM_WIDTH EQU $0a
-
-; SaffronHouse1_h map_id=179
-SAFFRON_HOUSE_1_HEIGHT EQU $04
-SAFFRON_HOUSE_1_WIDTH EQU $04
-
-; SaffronMart_h map_id=180
-SAFFRON_MART_HEIGHT EQU $04
-SAFFRON_MART_WIDTH EQU $04
-
-; SilphCo1_h map_id=181
-SILPH_CO_1F_HEIGHT EQU $09
-SILPH_CO_1F_WIDTH EQU $0f
-
-; SaffronPokecenter_h map_id=182
-SAFFRON_POKECENTER_HEIGHT EQU $04
-SAFFRON_POKECENTER_WIDTH EQU $07
-
-; SaffronHouse2_h map_id=183
-SAFFRON_HOUSE_2_HEIGHT EQU $04
-SAFFRON_HOUSE_2_WIDTH EQU $04
-
-; Route15Gate1F_h map_id=184
-ROUTE_15_GATE_1F_HEIGHT EQU $05
-ROUTE_15_GATE_1F_WIDTH EQU $04
-
-; Route15GateUpstairs_h map_id=185
-ROUTE_15_GATE_2F_HEIGHT EQU $04
-ROUTE_15_GATE_2F_WIDTH EQU $04
-
-; Route16GateMap_h map_id=186
-ROUTE_16_GATE_1F_HEIGHT EQU $07
-ROUTE_16_GATE_1F_WIDTH EQU $04
-
-; Route16GateUpstairs_h map_id=187
-ROUTE_16_GATE_2F_HEIGHT EQU $04
-ROUTE_16_GATE_2F_WIDTH EQU $04
-
-; Route16House_h map_id=188
-ROUTE_16_HOUSE_HEIGHT EQU $04
-ROUTE_16_HOUSE_WIDTH EQU $04
-
-; Route12House_h map_id=189
-ROUTE_12_HOUSE_HEIGHT EQU $04
-ROUTE_12_HOUSE_WIDTH EQU $04
-
-; Route18Gate_h map_id=190
-ROUTE_18_GATE_1F_HEIGHT EQU $05
-ROUTE_18_GATE_1F_WIDTH EQU $04
-
-; Route18GateHeader_h map_id=191
-ROUTE_18_GATE_2F_HEIGHT EQU $04
-ROUTE_18_GATE_2F_WIDTH EQU $04
-
-; SeafoamIslands1_h map_id=192
-SEAFOAM_ISLANDS_1_HEIGHT EQU $09
-SEAFOAM_ISLANDS_1_WIDTH EQU $0f
-
-; Route22Gate_h map_id=193
-ROUTE_22_GATE_HEIGHT EQU $04
-ROUTE_22_GATE_WIDTH EQU $05
-
-; VictoryRoad2_h map_id=194
-VICTORY_ROAD_2_HEIGHT EQU $09
-VICTORY_ROAD_2_WIDTH EQU $0f
-
-; Route12GateUpstairs_h map_id=195
-ROUTE_12_GATE_2F_HEIGHT EQU $04
-ROUTE_12_GATE_2F_WIDTH EQU $04
-
-; VermilionHouse3_h map_id=196
-VERMILION_HOUSE_3_HEIGHT EQU $04
-VERMILION_HOUSE_3_WIDTH EQU $04
-
-; DiglettsCave_h map_id=197
-DIGLETTS_CAVE_HEIGHT EQU $12
-DIGLETTS_CAVE_WIDTH EQU $14
-
-; VictoryRoad3_h map_id=198
-VICTORY_ROAD_3_HEIGHT EQU $09
-VICTORY_ROAD_3_WIDTH EQU $0f
-
-; RocketHideout1_h map_id=199
-ROCKET_HIDEOUT_1_HEIGHT EQU $0e
-ROCKET_HIDEOUT_1_WIDTH EQU $0f
-
-; RocketHideout2_h map_id=200
-ROCKET_HIDEOUT_2_HEIGHT EQU $0e
-ROCKET_HIDEOUT_2_WIDTH EQU $0f
-
-; RocketHideout3_h map_id=201
-ROCKET_HIDEOUT_3_HEIGHT EQU $0e
-ROCKET_HIDEOUT_3_WIDTH EQU $0f
-
-; RocketHideout4_h map_id=202
-ROCKET_HIDEOUT_4_HEIGHT EQU $0c
-ROCKET_HIDEOUT_4_WIDTH EQU $0f
-
-; RocketHideoutElevator_h map_id=203
-ROCKET_HIDEOUT_ELEVATOR_HEIGHT EQU $04
-ROCKET_HIDEOUT_ELEVATOR_WIDTH EQU $03
-
-; SilphCo2_h map_id=207
-SILPH_CO_2F_HEIGHT EQU $09
-SILPH_CO_2F_WIDTH EQU $0f
-
-; SilphCo3_h map_id=208
-SILPH_CO_3F_HEIGHT EQU $09
-SILPH_CO_3F_WIDTH EQU $0f
-
-; SilphCo4_h map_id=209
-SILPH_CO_4F_HEIGHT EQU $09
-SILPH_CO_4F_WIDTH EQU $0f
-
-; SilphCo5_h map_id=210
-SILPH_CO_5F_HEIGHT EQU $09
-SILPH_CO_5F_WIDTH EQU $0f
-
-; SilphCo6_h map_id=211
-SILPH_CO_6F_HEIGHT EQU $09
-SILPH_CO_6F_WIDTH EQU $0d
-
-; SilphCo7_h map_id=212
-SILPH_CO_7F_HEIGHT EQU $09
-SILPH_CO_7F_WIDTH EQU $0d
-
-; SilphCo8_h map_id=213
-SILPH_CO_8F_HEIGHT EQU $09
-SILPH_CO_8F_WIDTH EQU $0d
-
-; Mansion2_h map_id=214
-MANSION_2_HEIGHT EQU $0e
-MANSION_2_WIDTH EQU $0f
-
-; Mansion3_h map_id=215
-MANSION_3_HEIGHT EQU $09
-MANSION_3_WIDTH EQU $0f
-
-; Mansion4_h map_id=216
-MANSION_4_HEIGHT EQU $0e
-MANSION_4_WIDTH EQU $0f
-
-; SafariZoneEast_h map_id=217
-SAFARI_ZONE_EAST_HEIGHT EQU $0d
-SAFARI_ZONE_EAST_WIDTH EQU $0f
-
-; SafariZoneNorth_h map_id=218
-SAFARI_ZONE_NORTH_HEIGHT EQU $12
-SAFARI_ZONE_NORTH_WIDTH EQU $14
-
-; SafariZoneWest_h map_id=219
-SAFARI_ZONE_WEST_HEIGHT EQU $0d
-SAFARI_ZONE_WEST_WIDTH EQU $0f
-
-; SafariZoneCenter_h map_id=220
-SAFARI_ZONE_CENTER_HEIGHT EQU $0d
-SAFARI_ZONE_CENTER_WIDTH EQU $0f
-
-; SafariZoneRestHouse1_h map_id=221
-SAFARI_ZONE_REST_HOUSE_1_HEIGHT EQU $04
-SAFARI_ZONE_REST_HOUSE_1_WIDTH EQU $04
-
-; SafariZoneSecretHouse_h map_id=222
-SAFARI_ZONE_SECRET_HOUSE_HEIGHT EQU $04
-SAFARI_ZONE_SECRET_HOUSE_WIDTH EQU $04
-
-; SafariZoneRestHouse2_h map_id=223
-SAFARI_ZONE_REST_HOUSE_2_HEIGHT EQU $04
-SAFARI_ZONE_REST_HOUSE_2_WIDTH EQU $04
-
-; SafariZoneRestHouse3_h map_id=224
-SAFARI_ZONE_REST_HOUSE_3_HEIGHT EQU $04
-SAFARI_ZONE_REST_HOUSE_3_WIDTH EQU $04
-
-; SafariZoneRestHouse4_h map_id=225
-SAFARI_ZONE_REST_HOUSE_4_HEIGHT EQU $04
-SAFARI_ZONE_REST_HOUSE_4_WIDTH EQU $04
-
-; UnknownDungeon2_h map_id=226
-UNKNOWN_DUNGEON_2_HEIGHT EQU $09
-UNKNOWN_DUNGEON_2_WIDTH EQU $0f
-
-; UnknownDungeon3_h map_id=227
-UNKNOWN_DUNGEON_3_HEIGHT EQU $09
-UNKNOWN_DUNGEON_3_WIDTH EQU $0f
-
-; UnknownDungeon1_h map_id=228
-UNKNOWN_DUNGEON_1_HEIGHT EQU $09
-UNKNOWN_DUNGEON_1_WIDTH EQU $0f
-
-; NameRater_h map_id=229
-NAME_RATERS_HOUSE_HEIGHT EQU $04
-NAME_RATERS_HOUSE_WIDTH EQU $04
-
-; CeruleanHouse2_h map_id=230
-CERULEAN_HOUSE_2_HEIGHT EQU $04
-CERULEAN_HOUSE_2_WIDTH EQU $04
-
-; RockTunnel2_h map_id=232
-ROCK_TUNNEL_2_HEIGHT EQU $12
-ROCK_TUNNEL_2_WIDTH EQU $14
-
-; SilphCo9_h map_id=233
-SILPH_CO_9F_HEIGHT EQU $09
-SILPH_CO_9F_WIDTH EQU $0d
-
-; SilphCo10_h map_id=234
-SILPH_CO_10F_HEIGHT EQU $09
-SILPH_CO_10F_WIDTH EQU $08
-
-; SilphCo11_h map_id=235
-SILPH_CO_11F_HEIGHT EQU $09
-SILPH_CO_11F_WIDTH EQU $09
-
-; SilphCoElevator_h map_id=236
-SILPH_CO_ELEVATOR_HEIGHT EQU $02
-SILPH_CO_ELEVATOR_WIDTH EQU $02
-
-; TradeCenter_h map_id=239
-TRADE_CENTER_HEIGHT EQU $04
-TRADE_CENTER_WIDTH EQU $05
-
-; Colosseum_h map_id=240
-COLOSSEUM_HEIGHT EQU $04
-COLOSSEUM_WIDTH EQU $05
-
-; Lorelei_h map_id=245
-LORELEIS_ROOM_HEIGHT EQU $06
-LORELEIS_ROOM_WIDTH EQU $05
-
-; Bruno_h map_id=246
-BRUNOS_ROOM_HEIGHT EQU $06
-BRUNOS_ROOM_WIDTH EQU $05
-
-; Agatha_h map_id=247
-AGATHAS_ROOM_HEIGHT EQU $06
-AGATHAS_ROOM_WIDTH EQU $05
-
-BEACH_HOUSE_HEIGHT EQU 4
-BEACH_HOUSE_WIDTH EQU 7
diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm
index 4e3fe2c2..71a76e47 100755
--- a/data/hide_show_data.asm
+++ b/data/hide_show_data.asm
@@ -343,7 +343,7 @@ MapHS2D: ; c925 (3:4925)
MapHS34: ; c92b (3:492b)
db MUSEUM_1F,$05,Show
MapHS3F: ; c92e (3:492e) ; bulbasaur adoption house
- db CERULEAN_HOUSE,$02,Show
+ db CERULEAN_HOUSE_1,$02,Show
MapHSE4: ; c931 (3:4931)
db UNKNOWN_DUNGEON_1,$01,Show
db UNKNOWN_DUNGEON_1,$02,Show
diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm
index 8c429695..248a8e83 100755
--- a/data/mapObjects/ceruleancity.asm
+++ b/data/mapObjects/ceruleancity.asm
@@ -3,15 +3,15 @@ CeruleanCityObject: ; 0x18786 (size=170)
db $a ; warps
db $b, $1b, $0, TRASHED_HOUSE
- db $f, $d, $0, CERULEAN_HOUSE
+ db $f, $d, $0, CERULEAN_HOUSE_1
db $11, $13, $0, CERULEAN_POKECENTER
db $13, $1e, $0, CERULEAN_GYM
db $19, $d, $0, BIKE_SHOP
db $19, $19, $0, CERULEAN_MART
db $b, $4, $0, UNKNOWN_DUNGEON_1
db $9, $1b, $2, TRASHED_HOUSE
- db $b, $9, $1, CERULEAN_HOUSE_3
- db $9, $9, $0, CERULEAN_HOUSE_3
+ db $b, $9, $1, CERULEAN_HOUSE_2
+ db $9, $9, $0, CERULEAN_HOUSE_2
db $6 ; signs
db $13, $17, $c ; CeruleanCityText12
@@ -36,12 +36,12 @@ CeruleanCityObject: ; 0x18786 (size=170)
; warp-to
EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE
- EVENT_DISP CERULEAN_CITY_WIDTH, $f, $d ; CERULEAN_HOUSE
+ EVENT_DISP CERULEAN_CITY_WIDTH, $f, $d ; CERULEAN_HOUSE_1
EVENT_DISP CERULEAN_CITY_WIDTH, $11, $13 ; CERULEAN_POKECENTER
EVENT_DISP CERULEAN_CITY_WIDTH, $13, $1e ; CERULEAN_GYM
EVENT_DISP CERULEAN_CITY_WIDTH, $19, $d ; BIKE_SHOP
EVENT_DISP CERULEAN_CITY_WIDTH, $19, $19 ; CERULEAN_MART
EVENT_DISP CERULEAN_CITY_WIDTH, $b, $4 ; UNKNOWN_DUNGEON_1
EVENT_DISP CERULEAN_CITY_WIDTH, $9, $1b ; TRASHED_HOUSE
- EVENT_DISP CERULEAN_CITY_WIDTH, $b, $9 ; CERULEAN_HOUSE_3
- EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_3
+ EVENT_DISP CERULEAN_CITY_WIDTH, $b, $9 ; CERULEAN_HOUSE_2
+ EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_2
diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm
index bb0f31ff..865f14d8 100755
--- a/data/town_map_entries.asm
+++ b/data/town_map_entries.asm
@@ -94,7 +94,7 @@ InternalMapEntries: ; 7140b (1c:540b)
IMAP SAFARI_ZONE_REST_HOUSE_4, $8,$C,SafariZoneName
IMAP UNKNOWN_DUNGEON_1, $9,$1,CeruleanCaveName
IMAP NAME_RATERS_HOUSE, $E,$5,LavenderTownName
- IMAP CERULEAN_HOUSE_3, $A,$2,CeruleanCityName
+ IMAP CERULEAN_HOUSE_2, $A,$2,CeruleanCityName
IMAP ROCK_TUNNEL_2, $E,$3,RockTunnelName
IMAP SILPH_CO_ELEVATOR, $A,$5,SilphCoName
IMAP AGATHAS_ROOM, $0,$2,PokemonLeagueName
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 19:17:14 +0000