shithub: pokered

Download patch

ref: e9e769fba15c2373d43f37721a45427a9218c154
parent: 74cee737f6990fd770838eb8fe4d090028a76bd9
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Sun Sep 11 11:00:06 EDT 2022

Copy pokecrystal's `map_const` macro

Fixes #386

--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -1,7 +1,7 @@
-MACRO mapconst
+MACRO map_const
 	const \1
-	DEF \1_HEIGHT EQU \2
-	DEF \1_WIDTH EQU \3
+	DEF \1_WIDTH EQU \2
+	DEF \1_HEIGHT EQU \3
 ENDM
 
 ; map ids
@@ -16,257 +16,257 @@
 ; Each map also has associated data in maps.asm.
 ; Order: towns/cities, then routes, then indoor/dungeon maps
 	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
+	map_const PALLET_TOWN,                   10,  9 ; $00
+	map_const VIRIDIAN_CITY,                 20, 18 ; $01
+	map_const PEWTER_CITY,                   20, 18 ; $02
+	map_const CERULEAN_CITY,                 20, 18 ; $03
+	map_const LAVENDER_TOWN,                 10,  9 ; $04
+	map_const VERMILION_CITY,                20, 18 ; $05
+	map_const CELADON_CITY,                  25, 18 ; $06
+	map_const FUCHSIA_CITY,                  20, 18 ; $07
+	map_const CINNABAR_ISLAND,               10,  9 ; $08
+	map_const INDIGO_PLATEAU,                10,  9 ; $09
+	map_const SAFFRON_CITY,                  20, 18 ; $0A
 DEF NUM_CITY_MAPS EQU const_value
-	mapconst UNUSED_MAP_0B,                  0,  0 ; $0B
+	map_const UNUSED_MAP_0B,                  0,  0 ; $0B
 DEF FIRST_ROUTE_MAP EQU const_value
-	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
+	map_const ROUTE_1,                       10, 18 ; $0C
+	map_const ROUTE_2,                       10, 36 ; $0D
+	map_const ROUTE_3,                       35,  9 ; $0E
+	map_const ROUTE_4,                       45,  9 ; $0F
+	map_const ROUTE_5,                       10, 18 ; $10
+	map_const ROUTE_6,                       10, 18 ; $11
+	map_const ROUTE_7,                       10,  9 ; $12
+	map_const ROUTE_8,                       30,  9 ; $13
+	map_const ROUTE_9,                       30,  9 ; $14
+	map_const ROUTE_10,                      10, 36 ; $15
+	map_const ROUTE_11,                      30,  9 ; $16
+	map_const ROUTE_12,                      10, 54 ; $17
+	map_const ROUTE_13,                      30,  9 ; $18
+	map_const ROUTE_14,                      10, 27 ; $19
+	map_const ROUTE_15,                      30,  9 ; $1A
+	map_const ROUTE_16,                      20,  9 ; $1B
+	map_const ROUTE_17,                      10, 72 ; $1C
+	map_const ROUTE_18,                      25,  9 ; $1D
+	map_const ROUTE_19,                      10, 27 ; $1E
+	map_const ROUTE_20,                      50,  9 ; $1F
+	map_const ROUTE_21,                      10, 45 ; $20
+	map_const ROUTE_22,                      20,  9 ; $21
+	map_const ROUTE_23,                      10, 72 ; $22
+	map_const ROUTE_24,                      10, 18 ; $23
+	map_const ROUTE_25,                      30,  9 ; $24
 DEF FIRST_INDOOR_MAP EQU const_value
-	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_HOUSE,          4,  4 ; $2B
-	mapconst VIRIDIAN_NICKNAME_HOUSE,        4,  4 ; $2C
-	mapconst VIRIDIAN_GYM,                   9, 10 ; $2D
-	mapconst DIGLETTS_CAVE_ROUTE_2,          4,  4 ; $2E
-	mapconst VIRIDIAN_FOREST_NORTH_GATE,     4,  5 ; $2F
-	mapconst ROUTE_2_TRADE_HOUSE,            4,  4 ; $30
-	mapconst ROUTE_2_GATE,                   4,  5 ; $31
-	mapconst VIRIDIAN_FOREST_SOUTH_GATE,     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_NIDORAN_HOUSE,           4,  4 ; $37
-	mapconst PEWTER_MART,                    4,  4 ; $38
-	mapconst PEWTER_SPEECH_HOUSE,            4,  4 ; $39
-	mapconst PEWTER_POKECENTER,              4,  7 ; $3A
-	mapconst MT_MOON_1F,                    18, 20 ; $3B
-	mapconst MT_MOON_B1F,                   14, 14 ; $3C
-	mapconst MT_MOON_B2F,                   18, 20 ; $3D
-	mapconst CERULEAN_TRASHED_HOUSE,         4,  4 ; $3E
-	mapconst CERULEAN_TRADE_HOUSE,           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 CERULEAN_TRASHED_HOUSE_COPY,    4,  4 ; $45
-	mapconst ROUTE_5_GATE,                   3,  4 ; $46
-	mapconst UNDERGROUND_PATH_ROUTE_5,       4,  4 ; $47
-	mapconst DAYCARE,                        4,  4 ; $48
-	mapconst ROUTE_6_GATE,                   3,  4 ; $49
-	mapconst UNDERGROUND_PATH_ROUTE_6,       4,  4 ; $4A
-	mapconst UNDERGROUND_PATH_ROUTE_6_COPY,  4,  4 ; $4B
-	mapconst ROUTE_7_GATE,                   4,  3 ; $4C
-	mapconst UNDERGROUND_PATH_ROUTE_7,       4,  4 ; $4D
-	mapconst UNDERGROUND_PATH_ROUTE_7_COPY,  4,  4 ; $4E
-	mapconst ROUTE_8_GATE,                   4,  3 ; $4F
-	mapconst UNDERGROUND_PATH_ROUTE_8,       4,  4 ; $50
-	mapconst ROCK_TUNNEL_POKECENTER,         4,  7 ; $51
-	mapconst ROCK_TUNNEL_1F,                18, 20 ; $52
-	mapconst POWER_PLANT,                   18, 20 ; $53
-	mapconst ROUTE_11_GATE_1F,               5,  4 ; $54
-	mapconst DIGLETTS_CAVE_ROUTE_11,         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_PIDGEY_HOUSE,         4,  4 ; $5D
-	mapconst VERMILION_DOCK,                 6, 14 ; $5E
-	mapconst SS_ANNE_1F,                     9, 20 ; $5F
-	mapconst SS_ANNE_2F,                     9, 20 ; $60
-	mapconst SS_ANNE_3F,                     3, 10 ; $61
-	mapconst SS_ANNE_B1F,                    4, 15 ; $62
-	mapconst SS_ANNE_BOW,                    7, 10 ; $63
-	mapconst SS_ANNE_KITCHEN,                8,  7 ; $64
-	mapconst SS_ANNE_CAPTAINS_ROOM,          4,  3 ; $65
-	mapconst SS_ANNE_1F_ROOMS,               8, 12 ; $66
-	mapconst SS_ANNE_2F_ROOMS,               8, 12 ; $67
-	mapconst SS_ANNE_B1F_ROOMS,              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_1F,                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_NORTH_SOUTH,  24,  4 ; $77
-	mapconst CHAMPIONS_ROOM,                 4,  4 ; $78
-	mapconst UNDERGROUND_PATH_WEST_EAST,     4, 25 ; $79
-	mapconst CELADON_MART_1F,                4, 10 ; $7A
-	mapconst CELADON_MART_2F,                4, 10 ; $7B
-	mapconst CELADON_MART_3F,                4, 10 ; $7C
-	mapconst CELADON_MART_4F,                4, 10 ; $7D
-	mapconst CELADON_MART_ROOF,              4, 10 ; $7E
-	mapconst CELADON_MART_ELEVATOR,          2,  2 ; $7F
-	mapconst CELADON_MANSION_1F,             6,  4 ; $80
-	mapconst CELADON_MANSION_2F,             6,  4 ; $81
-	mapconst CELADON_MANSION_3F,             6,  4 ; $82
-	mapconst CELADON_MANSION_ROOF,           6,  4 ; $83
-	mapconst CELADON_MANSION_ROOF_HOUSE,     4,  4 ; $84
-	mapconst CELADON_POKECENTER,             4,  7 ; $85
-	mapconst CELADON_GYM,                    9,  5 ; $86
-	mapconst GAME_CORNER,                    9, 10 ; $87
-	mapconst CELADON_MART_5F,                4, 10 ; $88
-	mapconst GAME_CORNER_PRIZE_ROOM,         4,  5 ; $89
-	mapconst CELADON_DINER,                  4,  5 ; $8A
-	mapconst CELADON_CHIEF_HOUSE,            4,  4 ; $8B
-	mapconst CELADON_HOTEL,                  4,  7 ; $8C
-	mapconst LAVENDER_POKECENTER,            4,  7 ; $8D
-	mapconst POKEMON_TOWER_1F,               9, 10 ; $8E
-	mapconst POKEMON_TOWER_2F,               9, 10 ; $8F
-	mapconst POKEMON_TOWER_3F,               9, 10 ; $90
-	mapconst POKEMON_TOWER_4F,               9, 10 ; $91
-	mapconst POKEMON_TOWER_5F,               9, 10 ; $92
-	mapconst POKEMON_TOWER_6F,               9, 10 ; $93
-	mapconst POKEMON_TOWER_7F,               9, 10 ; $94
-	mapconst MR_FUJIS_HOUSE,                 4,  4 ; $95
-	mapconst LAVENDER_MART,                  4,  4 ; $96
-	mapconst LAVENDER_CUBONE_HOUSE,          4,  4 ; $97
-	mapconst FUCHSIA_MART,                   4,  4 ; $98
-	mapconst FUCHSIA_BILLS_GRANDPAS_HOUSE,   4,  4 ; $99
-	mapconst FUCHSIA_POKECENTER,             4,  7 ; $9A
-	mapconst WARDENS_HOUSE,                  4,  5 ; $9B
-	mapconst SAFARI_ZONE_GATE,               3,  4 ; $9C
-	mapconst FUCHSIA_GYM,                    9,  5 ; $9D
-	mapconst FUCHSIA_MEETING_ROOM,           4,  7 ; $9E
-	mapconst SEAFOAM_ISLANDS_B1F,            9, 15 ; $9F
-	mapconst SEAFOAM_ISLANDS_B2F,            9, 15 ; $A0
-	mapconst SEAFOAM_ISLANDS_B3F,            9, 15 ; $A1
-	mapconst SEAFOAM_ISLANDS_B4F,            9, 15 ; $A2
-	mapconst VERMILION_OLD_ROD_HOUSE,        4,  4 ; $A3
-	mapconst FUCHSIA_GOOD_ROD_HOUSE,         4,  4 ; $A4
-	mapconst POKEMON_MANSION_1F,            14, 15 ; $A5
-	mapconst CINNABAR_GYM,                   9, 10 ; $A6
-	mapconst CINNABAR_LAB,                   4,  9 ; $A7
-	mapconst CINNABAR_LAB_TRADE_ROOM,        4,  4 ; $A8
-	mapconst CINNABAR_LAB_METRONOME_ROOM,    4,  4 ; $A9
-	mapconst CINNABAR_LAB_FOSSIL_ROOM,       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_PIDGEY_HOUSE,           4,  4 ; $B3
-	mapconst SAFFRON_MART,                   4,  4 ; $B4
-	mapconst SILPH_CO_1F,                    9, 15 ; $B5
-	mapconst SAFFRON_POKECENTER,             4,  7 ; $B6
-	mapconst MR_PSYCHICS_HOUSE,              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_FLY_HOUSE,             4,  4 ; $BC
-	mapconst ROUTE_12_SUPER_ROD_HOUSE,       4,  4 ; $BD
-	mapconst ROUTE_18_GATE_1F,               5,  4 ; $BE
-	mapconst ROUTE_18_GATE_2F,               4,  4 ; $BF
-	mapconst SEAFOAM_ISLANDS_1F,             9, 15 ; $C0
-	mapconst ROUTE_22_GATE,                  4,  5 ; $C1
-	mapconst VICTORY_ROAD_2F,                9, 15 ; $C2
-	mapconst ROUTE_12_GATE_2F,               4,  4 ; $C3
-	mapconst VERMILION_TRADE_HOUSE,          4,  4 ; $C4
-	mapconst DIGLETTS_CAVE,                 18, 20 ; $C5
-	mapconst VICTORY_ROAD_3F,                9, 15 ; $C6
-	mapconst ROCKET_HIDEOUT_B1F,            14, 15 ; $C7
-	mapconst ROCKET_HIDEOUT_B2F,            14, 15 ; $C8
-	mapconst ROCKET_HIDEOUT_B3F,            14, 15 ; $C9
-	mapconst ROCKET_HIDEOUT_B4F,            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 POKEMON_MANSION_2F,            14, 15 ; $D6
-	mapconst POKEMON_MANSION_3F,             9, 15 ; $D7
-	mapconst POKEMON_MANSION_B1F,           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_CENTER_REST_HOUSE,  4,  4 ; $DD
-	mapconst SAFARI_ZONE_SECRET_HOUSE,       4,  4 ; $DE
-	mapconst SAFARI_ZONE_WEST_REST_HOUSE,    4,  4 ; $DF
-	mapconst SAFARI_ZONE_EAST_REST_HOUSE,    4,  4 ; $E0
-	mapconst SAFARI_ZONE_NORTH_REST_HOUSE,   4,  4 ; $E1
-	mapconst CERULEAN_CAVE_2F,               9, 15 ; $E2
-	mapconst CERULEAN_CAVE_B1F,              9, 15 ; $E3
-	mapconst CERULEAN_CAVE_1F,               9, 15 ; $E4
-	mapconst NAME_RATERS_HOUSE,              4,  4 ; $E5
-	mapconst CERULEAN_BADGE_HOUSE,           4,  4 ; $E6
-	mapconst UNUSED_MAP_E7,                  0,  0 ; $E7
-	mapconst ROCK_TUNNEL_B1F,               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
+	map_const REDS_HOUSE_1F,                  4,  4 ; $25
+	map_const REDS_HOUSE_2F,                  4,  4 ; $26
+	map_const BLUES_HOUSE,                    4,  4 ; $27
+	map_const OAKS_LAB,                       5,  6 ; $28
+	map_const VIRIDIAN_POKECENTER,            7,  4 ; $29
+	map_const VIRIDIAN_MART,                  4,  4 ; $2A
+	map_const VIRIDIAN_SCHOOL_HOUSE,          4,  4 ; $2B
+	map_const VIRIDIAN_NICKNAME_HOUSE,        4,  4 ; $2C
+	map_const VIRIDIAN_GYM,                  10,  9 ; $2D
+	map_const DIGLETTS_CAVE_ROUTE_2,          4,  4 ; $2E
+	map_const VIRIDIAN_FOREST_NORTH_GATE,     5,  4 ; $2F
+	map_const ROUTE_2_TRADE_HOUSE,            4,  4 ; $30
+	map_const ROUTE_2_GATE,                   5,  4 ; $31
+	map_const VIRIDIAN_FOREST_SOUTH_GATE,     5,  4 ; $32
+	map_const VIRIDIAN_FOREST,               17, 24 ; $33
+	map_const MUSEUM_1F,                     10,  4 ; $34
+	map_const MUSEUM_2F,                      7,  4 ; $35
+	map_const PEWTER_GYM,                     5,  7 ; $36
+	map_const PEWTER_NIDORAN_HOUSE,           4,  4 ; $37
+	map_const PEWTER_MART,                    4,  4 ; $38
+	map_const PEWTER_SPEECH_HOUSE,            4,  4 ; $39
+	map_const PEWTER_POKECENTER,              7,  4 ; $3A
+	map_const MT_MOON_1F,                    20, 18 ; $3B
+	map_const MT_MOON_B1F,                   14, 14 ; $3C
+	map_const MT_MOON_B2F,                   20, 18 ; $3D
+	map_const CERULEAN_TRASHED_HOUSE,         4,  4 ; $3E
+	map_const CERULEAN_TRADE_HOUSE,           4,  4 ; $3F
+	map_const CERULEAN_POKECENTER,            7,  4 ; $40
+	map_const CERULEAN_GYM,                   5,  7 ; $41
+	map_const BIKE_SHOP,                      4,  4 ; $42
+	map_const CERULEAN_MART,                  4,  4 ; $43
+	map_const MT_MOON_POKECENTER,             7,  4 ; $44
+	map_const CERULEAN_TRASHED_HOUSE_COPY,    4,  4 ; $45
+	map_const ROUTE_5_GATE,                   4,  3 ; $46
+	map_const UNDERGROUND_PATH_ROUTE_5,       4,  4 ; $47
+	map_const DAYCARE,                        4,  4 ; $48
+	map_const ROUTE_6_GATE,                   4,  3 ; $49
+	map_const UNDERGROUND_PATH_ROUTE_6,       4,  4 ; $4A
+	map_const UNDERGROUND_PATH_ROUTE_6_COPY,  4,  4 ; $4B
+	map_const ROUTE_7_GATE,                   3,  4 ; $4C
+	map_const UNDERGROUND_PATH_ROUTE_7,       4,  4 ; $4D
+	map_const UNDERGROUND_PATH_ROUTE_7_COPY,  4,  4 ; $4E
+	map_const ROUTE_8_GATE,                   3,  4 ; $4F
+	map_const UNDERGROUND_PATH_ROUTE_8,       4,  4 ; $50
+	map_const ROCK_TUNNEL_POKECENTER,         7,  4 ; $51
+	map_const ROCK_TUNNEL_1F,                20, 18 ; $52
+	map_const POWER_PLANT,                   20, 18 ; $53
+	map_const ROUTE_11_GATE_1F,               4,  5 ; $54
+	map_const DIGLETTS_CAVE_ROUTE_11,         4,  4 ; $55
+	map_const ROUTE_11_GATE_2F,               4,  4 ; $56
+	map_const ROUTE_12_GATE_1F,               5,  4 ; $57
+	map_const BILLS_HOUSE,                    4,  4 ; $58
+	map_const VERMILION_POKECENTER,           7,  4 ; $59
+	map_const POKEMON_FAN_CLUB,               4,  4 ; $5A
+	map_const VERMILION_MART,                 4,  4 ; $5B
+	map_const VERMILION_GYM,                  5,  9 ; $5C
+	map_const VERMILION_PIDGEY_HOUSE,         4,  4 ; $5D
+	map_const VERMILION_DOCK,                14,  6 ; $5E
+	map_const SS_ANNE_1F,                    20,  9 ; $5F
+	map_const SS_ANNE_2F,                    20,  9 ; $60
+	map_const SS_ANNE_3F,                    10,  3 ; $61
+	map_const SS_ANNE_B1F,                   15,  4 ; $62
+	map_const SS_ANNE_BOW,                   10,  7 ; $63
+	map_const SS_ANNE_KITCHEN,                7,  8 ; $64
+	map_const SS_ANNE_CAPTAINS_ROOM,          3,  4 ; $65
+	map_const SS_ANNE_1F_ROOMS,              12,  8 ; $66
+	map_const SS_ANNE_2F_ROOMS,              12,  8 ; $67
+	map_const SS_ANNE_B1F_ROOMS,             12,  8 ; $68
+	map_const UNUSED_MAP_69,                  0,  0 ; $69
+	map_const UNUSED_MAP_6A,                  0,  0 ; $6A
+	map_const UNUSED_MAP_6B,                  0,  0 ; $6B
+	map_const VICTORY_ROAD_1F,               10,  9 ; $6C
+	map_const UNUSED_MAP_6D,                  0,  0 ; $6D
+	map_const UNUSED_MAP_6E,                  0,  0 ; $6E
+	map_const UNUSED_MAP_6F,                  0,  0 ; $6F
+	map_const UNUSED_MAP_70,                  0,  0 ; $70
+	map_const LANCES_ROOM,                   13, 13 ; $71
+	map_const UNUSED_MAP_72,                  0,  0 ; $72
+	map_const UNUSED_MAP_73,                  0,  0 ; $73
+	map_const UNUSED_MAP_74,                  0,  0 ; $74
+	map_const UNUSED_MAP_75,                  0,  0 ; $75
+	map_const HALL_OF_FAME,                   5,  4 ; $76
+	map_const UNDERGROUND_PATH_NORTH_SOUTH,   4, 24 ; $77
+	map_const CHAMPIONS_ROOM,                 4,  4 ; $78
+	map_const UNDERGROUND_PATH_WEST_EAST,    25,  4 ; $79
+	map_const CELADON_MART_1F,               10,  4 ; $7A
+	map_const CELADON_MART_2F,               10,  4 ; $7B
+	map_const CELADON_MART_3F,               10,  4 ; $7C
+	map_const CELADON_MART_4F,               10,  4 ; $7D
+	map_const CELADON_MART_ROOF,             10,  4 ; $7E
+	map_const CELADON_MART_ELEVATOR,          2,  2 ; $7F
+	map_const CELADON_MANSION_1F,             4,  6 ; $80
+	map_const CELADON_MANSION_2F,             4,  6 ; $81
+	map_const CELADON_MANSION_3F,             4,  6 ; $82
+	map_const CELADON_MANSION_ROOF,           4,  6 ; $83
+	map_const CELADON_MANSION_ROOF_HOUSE,     4,  4 ; $84
+	map_const CELADON_POKECENTER,             7,  4 ; $85
+	map_const CELADON_GYM,                    5,  9 ; $86
+	map_const GAME_CORNER,                   10,  9 ; $87
+	map_const CELADON_MART_5F,               10,  4 ; $88
+	map_const GAME_CORNER_PRIZE_ROOM,         5,  4 ; $89
+	map_const CELADON_DINER,                  5,  4 ; $8A
+	map_const CELADON_CHIEF_HOUSE,            4,  4 ; $8B
+	map_const CELADON_HOTEL,                  7,  4 ; $8C
+	map_const LAVENDER_POKECENTER,            7,  4 ; $8D
+	map_const POKEMON_TOWER_1F,              10,  9 ; $8E
+	map_const POKEMON_TOWER_2F,              10,  9 ; $8F
+	map_const POKEMON_TOWER_3F,              10,  9 ; $90
+	map_const POKEMON_TOWER_4F,              10,  9 ; $91
+	map_const POKEMON_TOWER_5F,              10,  9 ; $92
+	map_const POKEMON_TOWER_6F,              10,  9 ; $93
+	map_const POKEMON_TOWER_7F,              10,  9 ; $94
+	map_const MR_FUJIS_HOUSE,                 4,  4 ; $95
+	map_const LAVENDER_MART,                  4,  4 ; $96
+	map_const LAVENDER_CUBONE_HOUSE,          4,  4 ; $97
+	map_const FUCHSIA_MART,                   4,  4 ; $98
+	map_const FUCHSIA_BILLS_GRANDPAS_HOUSE,   4,  4 ; $99
+	map_const FUCHSIA_POKECENTER,             7,  4 ; $9A
+	map_const WARDENS_HOUSE,                  5,  4 ; $9B
+	map_const SAFARI_ZONE_GATE,               4,  3 ; $9C
+	map_const FUCHSIA_GYM,                    5,  9 ; $9D
+	map_const FUCHSIA_MEETING_ROOM,           7,  4 ; $9E
+	map_const SEAFOAM_ISLANDS_B1F,           15,  9 ; $9F
+	map_const SEAFOAM_ISLANDS_B2F,           15,  9 ; $A0
+	map_const SEAFOAM_ISLANDS_B3F,           15,  9 ; $A1
+	map_const SEAFOAM_ISLANDS_B4F,           15,  9 ; $A2
+	map_const VERMILION_OLD_ROD_HOUSE,        4,  4 ; $A3
+	map_const FUCHSIA_GOOD_ROD_HOUSE,         4,  4 ; $A4
+	map_const POKEMON_MANSION_1F,            15, 14 ; $A5
+	map_const CINNABAR_GYM,                  10,  9 ; $A6
+	map_const CINNABAR_LAB,                   9,  4 ; $A7
+	map_const CINNABAR_LAB_TRADE_ROOM,        4,  4 ; $A8
+	map_const CINNABAR_LAB_METRONOME_ROOM,    4,  4 ; $A9
+	map_const CINNABAR_LAB_FOSSIL_ROOM,       4,  4 ; $AA
+	map_const CINNABAR_POKECENTER,            7,  4 ; $AB
+	map_const CINNABAR_MART,                  4,  4 ; $AC
+	map_const CINNABAR_MART_COPY,             4,  4 ; $AD
+	map_const INDIGO_PLATEAU_LOBBY,           8,  6 ; $AE
+	map_const COPYCATS_HOUSE_1F,              4,  4 ; $AF
+	map_const COPYCATS_HOUSE_2F,              4,  4 ; $B0
+	map_const FIGHTING_DOJO,                  5,  6 ; $B1
+	map_const SAFFRON_GYM,                   10,  9 ; $B2
+	map_const SAFFRON_PIDGEY_HOUSE,           4,  4 ; $B3
+	map_const SAFFRON_MART,                   4,  4 ; $B4
+	map_const SILPH_CO_1F,                   15,  9 ; $B5
+	map_const SAFFRON_POKECENTER,             7,  4 ; $B6
+	map_const MR_PSYCHICS_HOUSE,              4,  4 ; $B7
+	map_const ROUTE_15_GATE_1F,               4,  5 ; $B8
+	map_const ROUTE_15_GATE_2F,               4,  4 ; $B9
+	map_const ROUTE_16_GATE_1F,               4,  7 ; $BA
+	map_const ROUTE_16_GATE_2F,               4,  4 ; $BB
+	map_const ROUTE_16_FLY_HOUSE,             4,  4 ; $BC
+	map_const ROUTE_12_SUPER_ROD_HOUSE,       4,  4 ; $BD
+	map_const ROUTE_18_GATE_1F,               4,  5 ; $BE
+	map_const ROUTE_18_GATE_2F,               4,  4 ; $BF
+	map_const SEAFOAM_ISLANDS_1F,            15,  9 ; $C0
+	map_const ROUTE_22_GATE,                  5,  4 ; $C1
+	map_const VICTORY_ROAD_2F,               15,  9 ; $C2
+	map_const ROUTE_12_GATE_2F,               4,  4 ; $C3
+	map_const VERMILION_TRADE_HOUSE,          4,  4 ; $C4
+	map_const DIGLETTS_CAVE,                 20, 18 ; $C5
+	map_const VICTORY_ROAD_3F,               15,  9 ; $C6
+	map_const ROCKET_HIDEOUT_B1F,            15, 14 ; $C7
+	map_const ROCKET_HIDEOUT_B2F,            15, 14 ; $C8
+	map_const ROCKET_HIDEOUT_B3F,            15, 14 ; $C9
+	map_const ROCKET_HIDEOUT_B4F,            15, 12 ; $CA
+	map_const ROCKET_HIDEOUT_ELEVATOR,        3,  4 ; $CB
+	map_const UNUSED_MAP_CC,                  0,  0 ; $CC
+	map_const UNUSED_MAP_CD,                  0,  0 ; $CD
+	map_const UNUSED_MAP_CE,                  0,  0 ; $CE
+	map_const SILPH_CO_2F,                   15,  9 ; $CF
+	map_const SILPH_CO_3F,                   15,  9 ; $D0
+	map_const SILPH_CO_4F,                   15,  9 ; $D1
+	map_const SILPH_CO_5F,                   15,  9 ; $D2
+	map_const SILPH_CO_6F,                   13,  9 ; $D3
+	map_const SILPH_CO_7F,                   13,  9 ; $D4
+	map_const SILPH_CO_8F,                   13,  9 ; $D5
+	map_const POKEMON_MANSION_2F,            15, 14 ; $D6
+	map_const POKEMON_MANSION_3F,            15,  9 ; $D7
+	map_const POKEMON_MANSION_B1F,           15, 14 ; $D8
+	map_const SAFARI_ZONE_EAST,              15, 13 ; $D9
+	map_const SAFARI_ZONE_NORTH,             20, 18 ; $DA
+	map_const SAFARI_ZONE_WEST,              15, 13 ; $DB
+	map_const SAFARI_ZONE_CENTER,            15, 13 ; $DC
+	map_const SAFARI_ZONE_CENTER_REST_HOUSE,  4,  4 ; $DD
+	map_const SAFARI_ZONE_SECRET_HOUSE,       4,  4 ; $DE
+	map_const SAFARI_ZONE_WEST_REST_HOUSE,    4,  4 ; $DF
+	map_const SAFARI_ZONE_EAST_REST_HOUSE,    4,  4 ; $E0
+	map_const SAFARI_ZONE_NORTH_REST_HOUSE,   4,  4 ; $E1
+	map_const CERULEAN_CAVE_2F,              15,  9 ; $E2
+	map_const CERULEAN_CAVE_B1F,             15,  9 ; $E3
+	map_const CERULEAN_CAVE_1F,              15,  9 ; $E4
+	map_const NAME_RATERS_HOUSE,              4,  4 ; $E5
+	map_const CERULEAN_BADGE_HOUSE,           4,  4 ; $E6
+	map_const UNUSED_MAP_E7,                  0,  0 ; $E7
+	map_const ROCK_TUNNEL_B1F,               20, 18 ; $E8
+	map_const SILPH_CO_9F,                   13,  9 ; $E9
+	map_const SILPH_CO_10F,                   8,  9 ; $EA
+	map_const SILPH_CO_11F,                   9,  9 ; $EB
+	map_const SILPH_CO_ELEVATOR,              2,  2 ; $EC
+	map_const UNUSED_MAP_ED,                  0,  0 ; $ED
+	map_const UNUSED_MAP_EE,                  0,  0 ; $EE
+	map_const TRADE_CENTER,                   5,  4 ; $EF
+	map_const COLOSSEUM,                      5,  4 ; $F0
+	map_const UNUSED_MAP_F1,                  0,  0 ; $F1
+	map_const UNUSED_MAP_F2,                  0,  0 ; $F2
+	map_const UNUSED_MAP_F3,                  0,  0 ; $F3
+	map_const UNUSED_MAP_F4,                  0,  0 ; $F4
+	map_const LORELEIS_ROOM,                  5,  6 ; $F5
+	map_const BRUNOS_ROOM,                    5,  6 ; $F6
+	map_const AGATHAS_ROOM,                   5,  6 ; $F7
 DEF NUM_MAPS EQU const_value
 
 ; Indoor maps, such as houses, use this as the Map ID in their exit warps