map_header → map_def; map_header_2 → map_data

constants/map_constants.asm

@@ -15,11 +15,11 @@ ENDM
 
 ; map group ids
 ; `newgroup` indexes are for:
-; - MapGroupPointers (see data/maps/map_headers.asm)
+; - MapGroupPointers (see data/maps/map_defs.asm)
 ; - MapGroupRoofs (see data/maps/roofs.asm)
 ; - OutdoorSprites (see data/maps/outdoor_sprites.asm)
 ; - RoofPals (see gfx/tilesets/roofs.pal)
-; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see data/maps/map_headers.asm)
+; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see data/maps/map_defs.asm)
 	const_def
 
 	newgroup                                                     ;  1
@@ -172,7 +172,7 @@ ENDM
 
 	mapgroup CINNABAR_POKECENTER_1F,                       4,  5 ;  1
 	mapgroup CINNABAR_POKECENTER_2F_BETA,                  4,  8 ;  2
-	mapgroup ROUTE_19___FUCHSIA_GATE,                      4,  5 ;  3
+	mapgroup ROUTE_19_FUCHSIA_GATE,                        4,  5 ;  3
 	mapgroup SEAFOAM_GYM,                                  4,  5 ;  4
 	mapgroup ROUTE_19,                                    18, 10 ;  5
 	mapgroup ROUTE_20,                                     9, 30 ;  6

constants/map_data_constants.asm

@@ -3,18 +3,18 @@ MAP_N_A    EQU -1
 GROUP_NONE EQU 0
 MAP_NONE   EQU 0
 
-; map header struct members (see data/maps/map_headers.asm)
+; map header struct members (see data/maps/map_defs.asm)
 	const_def
-	const MAPHEADER_MAPHEADER2_BANK ; 0
+	const MAPDEF_MAPDATA_BANK ; 0
-	const MAPHEADER_TILESET         ; 1
+	const MAPDEF_TILESET      ; 1
-	const MAPHEADER_ENVIRONMENT     ; 2
+	const MAPDEF_ENVIRONMENT  ; 2
-	const MAPHEADER_MAPHEADER2      ; 3
+	const MAPDEF_MAPDATA      ; 3
-	const MAPHEADER_MAPHEADER2_HI   ; 4
+	const MAPDEF_MAPDATA_HI   ; 4
-	const MAPHEADER_LOCATION        ; 5
+	const MAPDEF_LOCATION     ; 5
-	const MAPHEADER_MUSIC           ; 6
+	const MAPDEF_MUSIC        ; 6
-	const MAPHEADER_PALETTE         ; 7
+	const MAPDEF_PALETTE      ; 7
-	const MAPHEADER_FISHGROUP       ; 8
+	const MAPDEF_FISHGROUP    ; 8
-NUM_MAPHEADER_ATTRIBUTES EQU const_value
+NUM_MAPDEF_ATTRIBUTES EQU const_value
 
 ; map environments (wEnvironment)
 const_value set 1
@@ -52,7 +52,7 @@ const_value set 1
 	const FISHGROUP_QWILFISH_NO_SWARM
 
 
-; connection directions (see data/maps/map_headers_2.asm)
+; connection directions (see data/maps/map_data.asm)
 	const_def
 	const EAST_F
 	const WEST_F

constants/music_constants.asm

@@ -108,13 +108,13 @@
 	const MUSIC_BATTLE_TOWER_LOBBY           ; 65
 	const MUSIC_MOBILE_CENTER                ; 66
 
-; GetMapHeaderMusic picks music for this value (see home/map.asm)
+; GetMapMusic picks music for this value (see home/map.asm)
 MUSIC_MAHOGANY_MART EQU $64
 
 ; ExitPokegearRadio_HandleMusic uses these values
 RESTART_MAP_MUSIC EQU $fe
 ENTER_MAP_MUSIC   EQU $ff
 
-; GetMapHeaderMusic picks music for this bit flag
+; GetMapMusic picks music for this bit flag
 RADIO_TOWER_MUSIC_F EQU 7
 RADIO_TOWER_MUSIC EQU 1 << RADIO_TOWER_MUSIC_F

data/maps/map_data.asm

@@ -0,0 +1,685 @@
+map_data: MACRO
+;\1: map label
+;\2: map id
+;\3: border block
+;\4: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none
+\1_MapData::
+	db \3
+	db \2_HEIGHT, \2_WIDTH
+	db BANK(\1_Blocks)
+	dw \1_Blocks
+	db BANK(\1_MapScripts)
+	dw \1_MapScripts
+	dw \1_MapEvents
+	db \4
+ENDM
+
+connection: MACRO
+if "\1" == "north"
+;\2: map id
+;\3: map label (eventually will be rolled into map id)
+;\4: x
+;\5: offset?
+;\6: strip length
+;\7: this map id
+	map \2
+	dw \3_Blocks + \2_WIDTH * (\2_HEIGHT - 3) + \5
+	dw OverworldMap + \4 + 3
+	db \6
+	db \2_WIDTH
+	db \2_HEIGHT * 2 - 1
+	db (\4 - \5) * -2
+	dw OverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1
+endc
+
+if "\1" == "south"
+;\2: map id
+;\3: map label (eventually will be rolled into map id)
+;\4: x
+;\5: offset?
+;\6: strip length
+;\7: this map id
+	map \2
+	dw \3_Blocks + \5
+	dw OverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3
+	db \6
+	db \2_WIDTH
+	db 0
+	db (\4 - \5) * -2
+	dw OverworldMap + \2_WIDTH + 7
+endc
+
+if "\1" == "west"
+;\2: map id
+;\3: map label (eventually will be rolled into map id)
+;\4: y
+;\5: offset?
+;\6: strip length
+;\7: this map id
+	map \2
+	dw \3_Blocks + (\2_WIDTH * \5) + \2_WIDTH - 3
+	dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3)
+	db \6
+	db \2_WIDTH
+	db (\4 - \5) * -2
+	db \2_WIDTH * 2 - 1
+	dw OverworldMap + \2_WIDTH * 2 + 6
+endc
+
+if "\1" == "east"
+;\2: map id
+;\3: map label (eventually will be rolled into map id)
+;\4: y
+;\5: offset?
+;\6: strip length
+;\7: this map id
+	map \2
+	dw \3_Blocks + (\2_WIDTH * \5)
+	dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3
+	db \6
+	db \2_WIDTH
+	db (\4 - \5) * -2
+	db 0
+	dw OverworldMap + \2_WIDTH + 7
+endc
+ENDM
+
+
+	map_data NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST
+	connection west, ROUTE_29, Route29, 0, 0, 9, NEW_BARK_TOWN
+	connection east, ROUTE_27, Route27, 0, 0, 9, NEW_BARK_TOWN
+
+	map_data CherrygroveCity, CHERRYGROVE_CITY, $35, NORTH | EAST
+	connection north, ROUTE_30, Route30, 5, 0, 10, CHERRYGROVE_CITY
+	connection east, ROUTE_29, Route29, 0, 0, 9, CHERRYGROVE_CITY
+
+	map_data VioletCity, VIOLET_CITY, $05, SOUTH | WEST | EAST
+	connection south, ROUTE_32, Route32, 0, 0, 10, VIOLET_CITY
+	connection west, ROUTE_36, Route36, 0, 0, 9, VIOLET_CITY
+	connection east, ROUTE_31, Route31, 9, 0, 9, VIOLET_CITY
+
+	map_data AzaleaTown, AZALEA_TOWN, $05, WEST | EAST
+	connection west, ROUTE_34, Route34, -3, 15, 12, AZALEA_TOWN
+	connection east, ROUTE_33, Route33, 0, 0, 9, AZALEA_TOWN
+
+	map_data CianwoodCity, CIANWOOD_CITY, $35, EAST
+	connection east, ROUTE_41, Route41, 0, 0, 27, CIANWOOD_CITY
+
+	map_data GoldenrodCity, GOLDENROD_CITY, $35, NORTH | SOUTH
+	connection north, ROUTE_35, Route35, 5, 0, 10, GOLDENROD_CITY
+	connection south, ROUTE_34, Route34, 5, 0, 10, GOLDENROD_CITY
+
+	map_data OlivineCity, OLIVINE_CITY, $35, NORTH | WEST
+	connection north, ROUTE_39, Route39, 5, 0, 10, OLIVINE_CITY
+	connection west, ROUTE_40, Route40, 9, 0, 12, OLIVINE_CITY
+
+	map_data EcruteakCity, ECRUTEAK_CITY, $05, SOUTH | WEST | EAST
+	connection south, ROUTE_37, Route37, 5, 0, 10, ECRUTEAK_CITY
+	connection west, ROUTE_38, Route38, 5, 0, 9, ECRUTEAK_CITY
+	connection east, ROUTE_42, Route42, 9, 0, 9, ECRUTEAK_CITY
+
+	map_data MahoganyTown, MAHOGANY_TOWN, $71, NORTH | WEST | EAST
+	connection north, ROUTE_43, Route43, 0, 0, 10, MAHOGANY_TOWN
+	connection west, ROUTE_42, Route42, 0, 0, 9, MAHOGANY_TOWN
+	connection east, ROUTE_44, Route44, 0, 0, 9, MAHOGANY_TOWN
+
+	map_data LakeOfRage, LAKE_OF_RAGE, $05, SOUTH
+	connection south, ROUTE_43, Route43, 5, 0, 10, LAKE_OF_RAGE
+
+	map_data BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST
+	connection south, ROUTE_45, Route45, 0, 0, 10, BLACKTHORN_CITY
+	connection west, ROUTE_44, Route44, 9, 0, 9, BLACKTHORN_CITY
+
+	map_data SilverCaveOutside, SILVER_CAVE_OUTSIDE, $2c, EAST
+	connection east, ROUTE_28, Route28, 9, 0, 9, SILVER_CAVE_OUTSIDE
+
+	map_data Route26, ROUTE_26, $05, WEST
+	connection west, ROUTE_27, Route27, 45, 0, 9, ROUTE_26
+
+	map_data Route27, ROUTE_27, $35, WEST | EAST
+	connection west, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_27
+	connection east, ROUTE_26, Route26, -3, 42, 12, ROUTE_27
+
+	map_data Route28, ROUTE_28, $2c, WEST
+	connection west, SILVER_CAVE_OUTSIDE, SilverCaveOutside, -3, 6, 12, ROUTE_28
+
+	map_data Route29, ROUTE_29, $05, NORTH | WEST | EAST
+	connection north, ROUTE_46, Route46, 10, 0, 10, ROUTE_29
+	connection west, CHERRYGROVE_CITY, CherrygroveCity, 0, 0, 9, ROUTE_29
+	connection east, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_29
+
+	map_data Route30, ROUTE_30, $05, NORTH | SOUTH
+	connection north, ROUTE_31, Route31, -3, 7, 13, ROUTE_30
+	connection south, CHERRYGROVE_CITY, CherrygroveCity, -3, 2, 16, ROUTE_30
+
+	map_data Route31, ROUTE_31, $05, SOUTH | WEST
+	connection south, ROUTE_30, Route30, 10, 0, 10, ROUTE_31
+	connection west, VIOLET_CITY, VioletCity, -3, 6, 12, ROUTE_31
+
+	map_data Route32, ROUTE_32, $05, NORTH | SOUTH
+	connection north, VIOLET_CITY, VioletCity, 0, 0, 13, ROUTE_32
+	connection south, ROUTE_33, Route33, 0, 0, 10, ROUTE_32
+
+	map_data Route33, ROUTE_33, $05, NORTH | WEST
+	connection north, ROUTE_32, Route32, 0, 0, 10, ROUTE_33
+	connection west, AZALEA_TOWN, AzaleaTown, 0, 0, 9, ROUTE_33
+
+	map_data Route34, ROUTE_34, $05, NORTH | EAST
+	connection north, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_34
+	connection east, AZALEA_TOWN, AzaleaTown, 18, 0, 9, ROUTE_34
+
+	map_data Route35, ROUTE_35, $05, NORTH | SOUTH
+	connection north, ROUTE_36, Route36, 0, 0, 13, ROUTE_35
+	connection south, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_35
+
+	map_data Route36, ROUTE_36, $05, NORTH | SOUTH | EAST
+	connection north, ROUTE_37, Route37, 10, 0, 10, ROUTE_36
+	connection south, ROUTE_35, Route35, 0, 0, 10, ROUTE_36
+	connection east, VIOLET_CITY, VioletCity, 0, 0, 12, ROUTE_36
+
+	map_data Route37, ROUTE_37, $05, NORTH | SOUTH
+	connection north, ECRUTEAK_CITY, EcruteakCity, -3, 2, 16, ROUTE_37
+	connection south, ROUTE_36, Route36, -3, 7, 16, ROUTE_37
+
+	map_data Route38, ROUTE_38, $05, WEST | EAST
+	connection west, ROUTE_39, Route39, 0, 0, 12, ROUTE_38
+	connection east, ECRUTEAK_CITY, EcruteakCity, -3, 2, 15, ROUTE_38
+
+	map_data Route39, ROUTE_39, $05, SOUTH | EAST
+	connection south, OLIVINE_CITY, OlivineCity, -3, 2, 16, ROUTE_39
+	connection east, ROUTE_38, Route38, 0, 0, 9, ROUTE_39
+
+	map_data Route40, ROUTE_40, $35, SOUTH | EAST
+	connection south, ROUTE_41, Route41, -3, 12, 13, ROUTE_40
+	connection east, OLIVINE_CITY, OlivineCity, -3, 6, 12, ROUTE_40
+
+	map_data Route41, ROUTE_41, $35, NORTH | WEST
+	connection north, ROUTE_40, Route40, 15, 0, 10, ROUTE_41
+	connection west, CIANWOOD_CITY, CianwoodCity, 0, 0, 27, ROUTE_41
+
+	map_data Route42, ROUTE_42, $05, WEST | EAST
+	connection west, ECRUTEAK_CITY, EcruteakCity, -3, 6, 12, ROUTE_42
+	connection east, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_42
+
+	map_data Route43, ROUTE_43, $05, NORTH | SOUTH
+	connection north, LAKE_OF_RAGE, LakeOfRage, -3, 2, 16, ROUTE_43
+	connection south, MAHOGANY_TOWN, MahoganyTown, 0, 0, 10, ROUTE_43
+
+	map_data Route44, ROUTE_44, $71, WEST | EAST
+	connection west, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_44
+	connection east, BLACKTHORN_CITY, BlackthornCity, -3, 6, 12, ROUTE_44
+
+	map_data Route45, ROUTE_45, $71, NORTH | WEST
+	connection north, BLACKTHORN_CITY, BlackthornCity, 0, 0, 13, ROUTE_45
+	connection west, ROUTE_46, Route46, 36, 0, 12, ROUTE_45
+
+	map_data Route46, ROUTE_46, $05, SOUTH | EAST
+	connection south, ROUTE_29, Route29, -3, 7, 16, ROUTE_46
+	connection east, ROUTE_45, Route45, -3, 33, 12, ROUTE_46
+
+	map_data PewterCity, PEWTER_CITY, $0f, SOUTH | EAST
+	connection south, ROUTE_2, Route2, 5, 0, 10, PEWTER_CITY
+	connection east, ROUTE_3, Route3, 5, 0, 9, PEWTER_CITY
+
+	map_data Route2, ROUTE_2, $0f, NORTH | SOUTH
+	connection north, PEWTER_CITY, PewterCity, -3, 2, 16, ROUTE_2
+	connection south, VIRIDIAN_CITY, ViridianCity, -3, 2, 16, ROUTE_2
+
+	map_data ViridianCity, VIRIDIAN_CITY, $0f, NORTH | SOUTH | WEST
+	connection north, ROUTE_2, Route2, 5, 0, 10, VIRIDIAN_CITY
+	connection south, ROUTE_1, Route1, 10, 0, 10, VIRIDIAN_CITY
+	connection west, ROUTE_22, Route22, 4, 0, 9, VIRIDIAN_CITY
+
+	map_data Route22, ROUTE_22, $2c, EAST
+	connection east, VIRIDIAN_CITY, ViridianCity, -3, 1, 15, ROUTE_22
+
+	map_data Route1, ROUTE_1, $0f, NORTH | SOUTH
+	connection north, VIRIDIAN_CITY, ViridianCity, -3, 7, 13, ROUTE_1
+	connection south, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_1
+
+	map_data PalletTown, PALLET_TOWN, $0f, NORTH | SOUTH
+	connection north, ROUTE_1, Route1, 0, 0, 10, PALLET_TOWN
+	connection south, ROUTE_21, Route21, 0, 0, 10, PALLET_TOWN
+
+	map_data Route21, ROUTE_21, $43, NORTH | SOUTH
+	connection north, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_21
+	connection south, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 10, ROUTE_21
+
+	map_data CinnabarIsland, CINNABAR_ISLAND, $43, NORTH | EAST
+	connection north, ROUTE_21, Route21, 0, 0, 10, CINNABAR_ISLAND
+	connection east, ROUTE_20, Route20, 0, 0, 9, CINNABAR_ISLAND
+
+	map_data Route20, ROUTE_20, $43, WEST | EAST
+	connection west, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 9, ROUTE_20
+	connection east, ROUTE_19, Route19, -3, 6, 12, ROUTE_20
+
+	map_data Route19, ROUTE_19, $43, NORTH | WEST
+	connection north, FUCHSIA_CITY, FuchsiaCity, 0, 0, 13, ROUTE_19
+	connection west, ROUTE_20, Route20, 9, 0, 9, ROUTE_19
+
+	map_data FuchsiaCity, FUCHSIA_CITY, $0f, SOUTH | WEST | EAST
+	connection south, ROUTE_19, Route19, 0, 0, 10, FUCHSIA_CITY
+	connection west, ROUTE_18, Route18, 7, 0, 9, FUCHSIA_CITY
+	connection east, ROUTE_15, Route15, 9, 0, 9, FUCHSIA_CITY
+
+	map_data Route18, ROUTE_18, $43, WEST | EAST
+	connection west, ROUTE_17, Route17, -3, 35, 10, ROUTE_18
+	connection east, FUCHSIA_CITY, FuchsiaCity, -3, 4, 14, ROUTE_18
+
+	map_data Route17, ROUTE_17, $43, NORTH | EAST
+	connection north, ROUTE_16, Route16, 0, 0, 10, ROUTE_17
+	connection east, ROUTE_18, Route18, 38, 0, 9, ROUTE_17
+
+	map_data Route16, ROUTE_16, $0f, SOUTH | EAST
+	connection south, ROUTE_17, Route17, 0, 0, 10, ROUTE_16
+	connection east, CELADON_CITY, CeladonCity, -3, 6, 12, ROUTE_16
+
+	map_data CeladonCity, CELADON_CITY, $0f, WEST | EAST
+	connection west, ROUTE_16, Route16, 9, 0, 9, CELADON_CITY
+	connection east, ROUTE_7, Route7, 5, 0, 9, CELADON_CITY
+
+	map_data Route7, ROUTE_7, $0f, WEST | EAST
+	connection west, CELADON_CITY, CeladonCity, -3, 2, 15, ROUTE_7
+	connection east, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_7
+
+	map_data Route15, ROUTE_15, $0f, WEST | EAST
+	connection west, FUCHSIA_CITY, FuchsiaCity, -3, 6, 12, ROUTE_15
+	connection east, ROUTE_14, Route14, -3, 6, 12, ROUTE_15
+
+	map_data Route14, ROUTE_14, $43, NORTH | WEST
+	connection north, ROUTE_13, Route13, 0, 0, 13, ROUTE_14
+	connection west, ROUTE_15, Route15, 9, 0, 9, ROUTE_14
+
+	map_data Route13, ROUTE_13, $43, NORTH | SOUTH
+	connection north, ROUTE_12, Route12, 20, 0, 10, ROUTE_13
+	connection south, ROUTE_14, Route14, 0, 0, 10, ROUTE_13
+
+	map_data Route12, ROUTE_12, $43, NORTH | SOUTH | WEST
+	connection north, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_12
+	connection south, ROUTE_13, Route13, -3, 17, 13, ROUTE_12
+	connection west, ROUTE_11, Route11, 9, 0, 9, ROUTE_12
+
+	map_data Route11, ROUTE_11, $0f, WEST | EAST
+	connection west, VERMILION_CITY, VermilionCity, 0, 0, 12, ROUTE_11
+	connection east, ROUTE_12, Route12, -3, 6, 15, ROUTE_11
+
+	map_data LavenderTown, LAVENDER_TOWN, $2c, NORTH | SOUTH | WEST
+	connection north, ROUTE_10_SOUTH, Route10South, 0, 0, 10, LAVENDER_TOWN
+	connection south, ROUTE_12, Route12, 0, 0, 10, LAVENDER_TOWN
+	connection west, ROUTE_8, Route8, 0, 0, 9, LAVENDER_TOWN
+
+	map_data VermilionCity, VERMILION_CITY, $43, NORTH | EAST
+	connection north, ROUTE_6, Route6, 5, 0, 10, VERMILION_CITY
+	connection east, ROUTE_11, Route11, 0, 0, 9, VERMILION_CITY
+
+	map_data Route6, ROUTE_6, $0f, NORTH | SOUTH
+	connection north, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_6
+	connection south, VERMILION_CITY, VermilionCity, -3, 2, 16, ROUTE_6
+
+	map_data SaffronCity, SAFFRON_CITY, $0f, NORTH | SOUTH | WEST | EAST
+	connection north, ROUTE_5, Route5, 5, 0, 10, SAFFRON_CITY
+	connection south, ROUTE_6, Route6, 5, 0, 10, SAFFRON_CITY
+	connection west, ROUTE_7, Route7, 9, 0, 9, SAFFRON_CITY
+	connection east, ROUTE_8, Route8, 9, 0, 9, SAFFRON_CITY
+
+	map_data Route5, ROUTE_5, $0f, NORTH | SOUTH
+	connection north, CERULEAN_CITY, CeruleanCity, -3, 2, 16, ROUTE_5
+	connection south, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_5
+
+	map_data CeruleanCity, CERULEAN_CITY, $0f, NORTH | SOUTH | WEST | EAST
+	connection north, ROUTE_24, Route24, 6, 0, 10, CERULEAN_CITY
+	connection south, ROUTE_5, Route5, 5, 0, 10, CERULEAN_CITY
+	connection west, ROUTE_4, Route4, 5, 0, 9, CERULEAN_CITY
+	connection east, ROUTE_9, Route9, 9, 0, 9, CERULEAN_CITY
+
+	map_data Route9, ROUTE_9, $2c, SOUTH | WEST
+	connection south, ROUTE_10_NORTH, Route10North, 20, 0, 10, ROUTE_9
+	connection west, CERULEAN_CITY, CeruleanCity, -3, 6, 12, ROUTE_9
+
+	map_data Route24, ROUTE_24, $2c, NORTH | SOUTH
+	connection north, ROUTE_25, Route25, 0, 0, 13, ROUTE_24
+	connection south, CERULEAN_CITY, CeruleanCity, -3, 3, 16, ROUTE_24
+
+	map_data Route25, ROUTE_25, $2c, SOUTH
+	connection south, ROUTE_24, Route24, 0, 0, 10, ROUTE_25
+
+	map_data Route3, ROUTE_3, $2c, WEST | EAST
+	connection west, PEWTER_CITY, PewterCity, -3, 2, 15, ROUTE_3
+	connection east, ROUTE_4, Route4, 0, 0, 9, ROUTE_3
+
+	map_data Route4, ROUTE_4, $2c, WEST | EAST
+	connection west, ROUTE_3, Route3, 0, 0, 9, ROUTE_4
+	connection east, CERULEAN_CITY, CeruleanCity, -3, 2, 15, ROUTE_4
+
+	map_data Route8, ROUTE_8, $2c, WEST | EAST
+	connection west, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_8
+	connection east, LAVENDER_TOWN, LavenderTown, 0, 0, 9, ROUTE_8
+
+	map_data Route10North, ROUTE_10_NORTH, $2c, NORTH | SOUTH
+	connection north, ROUTE_9, Route9, -3, 17, 13, ROUTE_10_NORTH
+	connection south, ROUTE_10_SOUTH, Route10South, 0, 0, 10, ROUTE_10_NORTH
+
+	map_data Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH
+	connection north, ROUTE_10_NORTH, Route10North, 0, 0, 10, ROUTE_10_SOUTH
+	connection south, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_10_SOUTH
+
+	map_data Route23, ROUTE_23, $0f, 0
+	map_data SproutTower1F, SPROUT_TOWER_1F, $00, 0
+	map_data SproutTower2F, SPROUT_TOWER_2F, $00, 0
+	map_data SproutTower3F, SPROUT_TOWER_3F, $00, 0
+	map_data TinTower1F, TIN_TOWER_1F, $00, 0
+	map_data TinTower2F, TIN_TOWER_2F, $00, 0
+	map_data TinTower3F, TIN_TOWER_3F, $00, 0
+	map_data TinTower4F, TIN_TOWER_4F, $00, 0
+	map_data TinTower5F, TIN_TOWER_5F, $00, 0
+	map_data TinTower6F, TIN_TOWER_6F, $00, 0
+	map_data TinTower7F, TIN_TOWER_7F, $00, 0
+	map_data TinTower8F, TIN_TOWER_8F, $00, 0
+	map_data TinTower9F, TIN_TOWER_9F, $00, 0
+	map_data BurnedTower1F, BURNED_TOWER_1F, $00, 0
+	map_data BurnedTowerB1F, BURNED_TOWER_B1F, $09, 0
+	map_data NationalPark, NATIONAL_PARK, $00, 0
+	map_data NationalParkBugContest, NATIONAL_PARK_BUG_CONTEST, $00, 0
+	map_data RadioTower1F, RADIO_TOWER_1F, $00, 0
+	map_data RadioTower2F, RADIO_TOWER_2F, $00, 0
+	map_data RadioTower3F, RADIO_TOWER_3F, $00, 0
+	map_data RadioTower4F, RADIO_TOWER_4F, $00, 0
+	map_data RadioTower5F, RADIO_TOWER_5F, $00, 0
+	map_data RuinsOfAlphOutside, RUINS_OF_ALPH_OUTSIDE, $05, 0
+	map_data RuinsOfAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $00, 0
+	map_data RuinsOfAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $00, 0
+	map_data RuinsOfAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $00, 0
+	map_data RuinsOfAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $00, 0
+	map_data RuinsOfAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $00, 0
+	map_data RuinsOfAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $00, 0
+	map_data RuinsOfAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $00, 0
+	map_data RuinsOfAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $00, 0
+	map_data RuinsOfAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $00, 0
+	map_data RuinsOfAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $00, 0
+	map_data RuinsOfAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $00, 0
+	map_data RuinsOfAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $00, 0
+	map_data RuinsOfAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $00, 0
+	map_data RuinsOfAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $00, 0
+	map_data UnionCave1F, UNION_CAVE_1F, $09, 0
+	map_data UnionCaveB1F, UNION_CAVE_B1F, $09, 0
+	map_data UnionCaveB2F, UNION_CAVE_B2F, $09, 0
+	map_data SlowpokeWellB1F, SLOWPOKE_WELL_B1F, $09, 0
+	map_data SlowpokeWellB2F, SLOWPOKE_WELL_B2F, $09, 0
+	map_data OlivineLighthouse1F, OLIVINE_LIGHTHOUSE_1F, $00, 0
+	map_data OlivineLighthouse2F, OLIVINE_LIGHTHOUSE_2F, $00, 0
+	map_data OlivineLighthouse3F, OLIVINE_LIGHTHOUSE_3F, $00, 0
+	map_data OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $00, 0
+	map_data OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $00, 0
+	map_data OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $00, 0
+	map_data MahoganyMart1F, MAHOGANY_MART_1F, $00, 0
+	map_data TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $00, 0
+	map_data TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $00, 0
+	map_data TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $00, 0
+	map_data IlexForest, ILEX_FOREST, $05, 0
+	map_data GoldenrodUnderground, GOLDENROD_UNDERGROUND, $00, 0
+	map_data GoldenrodUndergroundSwitchRoomEntrances, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, $00, 0
+	map_data GoldenrodDeptStoreB1F, GOLDENROD_DEPT_STORE_B1F, $00, 0
+	map_data GoldenrodUndergroundWarehouse, GOLDENROD_UNDERGROUND_WAREHOUSE, $00, 0
+	map_data MountMortar1FOutside, MOUNT_MORTAR_1F_OUTSIDE, $09, 0
+	map_data MountMortar1FInside, MOUNT_MORTAR_1F_INSIDE, $09, 0
+	map_data MountMortar2FInside, MOUNT_MORTAR_2F_INSIDE, $09, 0
+	map_data MountMortarB1F, MOUNT_MORTAR_B1F, $09, 0
+	map_data IcePath1F, ICE_PATH_1F, $09, 0
+	map_data IcePathB1F, ICE_PATH_B1F, $19, 0
+	map_data IcePathB2FMahoganySide, ICE_PATH_B2F_MAHOGANY_SIDE, $19, 0
+	map_data IcePathB2FBlackthornSide, ICE_PATH_B2F_BLACKTHORN_SIDE, $19, 0
+	map_data IcePathB3F, ICE_PATH_B3F, $19, 0
+	map_data WhirlIslandNW, WHIRL_ISLAND_NW, $09, 0
+	map_data WhirlIslandNE, WHIRL_ISLAND_NE, $09, 0
+	map_data WhirlIslandSW, WHIRL_ISLAND_SW, $09, 0
+	map_data WhirlIslandCave, WHIRL_ISLAND_CAVE, $09, 0
+	map_data WhirlIslandSE, WHIRL_ISLAND_SE, $0f, 0
+	map_data WhirlIslandB1F, WHIRL_ISLAND_B1F, $09, 0
+	map_data WhirlIslandB2F, WHIRL_ISLAND_B2F, $2e, 0
+	map_data WhirlIslandLugiaChamber, WHIRL_ISLAND_LUGIA_CHAMBER, $0f, 0
+	map_data SilverCaveRoom1, SILVER_CAVE_ROOM_1, $09, 0
+	map_data SilverCaveRoom2, SILVER_CAVE_ROOM_2, $09, 0
+	map_data SilverCaveRoom3, SILVER_CAVE_ROOM_3, $09, 0
+	map_data SilverCaveItemRooms, SILVER_CAVE_ITEM_ROOMS, $09, 0
+	map_data DarkCaveVioletEntrance, DARK_CAVE_VIOLET_ENTRANCE, $09, 0
+	map_data DarkCaveBlackthornEntrance, DARK_CAVE_BLACKTHORN_ENTRANCE, $09, 0
+	map_data DragonsDen1F, DRAGONS_DEN_1F, $09, 0
+	map_data DragonsDenB1F, DRAGONS_DEN_B1F, $71, 0
+	map_data DragonShrine, DRAGON_SHRINE, $00, 0
+	map_data TohjoFalls, TOHJO_FALLS, $09, 0
+	map_data OlivinePokecenter1F, OLIVINE_POKECENTER_1F, $00, 0
+	map_data OlivineGym, OLIVINE_GYM, $00, 0
+	map_data OlivineTimsHouse, OLIVINE_TIMS_HOUSE, $00, 0
+	map_data OlivineHouseBeta, OLIVINE_HOUSE_BETA, $00, 0
+	map_data OlivinePunishmentSpeechHouse, OLIVINE_PUNISHMENT_SPEECH_HOUSE, $00, 0
+	map_data OlivineGoodRodHouse, OLIVINE_GOOD_ROD_HOUSE, $00, 0
+	map_data OlivineCafe, OLIVINE_CAFE, $00, 0
+	map_data OlivineMart, OLIVINE_MART, $00, 0
+	map_data Route38EcruteakGate, ROUTE_38_ECRUTEAK_GATE, $00, 0
+	map_data Route39Barn, ROUTE_39_BARN, $00, 0
+	map_data Route39Farmhouse, ROUTE_39_FARMHOUSE, $00, 0
+	map_data MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $00, 0
+	map_data MahoganyGym, MAHOGANY_GYM, $00, 0
+	map_data MahoganyPokecenter1F, MAHOGANY_POKECENTER_1F, $00, 0
+	map_data Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $00, 0
+	map_data DiglettsCave, DIGLETTS_CAVE, $09, 0
+	map_data MountMoon, MOUNT_MOON, $09, 0
+	map_data UndergroundPath, UNDERGROUND_PATH, $00, 0
+	map_data RockTunnel1F, ROCK_TUNNEL_1F, $09, 0
+	map_data RockTunnelB1F, ROCK_TUNNEL_B1F, $09, 0
+	map_data SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $00, 0
+	map_data SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0
+	map_data VictoryRoad, VICTORY_ROAD, $1d, 0
+	map_data EcruteakHouse, ECRUTEAK_HOUSE, $00, 0
+	map_data WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0
+	map_data EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0
+	map_data EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0
+	map_data DanceTheatre, DANCE_THEATRE, $00, 0
+	map_data EcruteakMart, ECRUTEAK_MART, $00, 0
+	map_data EcruteakGym, ECRUTEAK_GYM, $00, 0
+	map_data EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $00, 0
+	map_data BlackthornGym1F, BLACKTHORN_GYM_1F, $00, 0
+	map_data BlackthornGym2F, BLACKTHORN_GYM_2F, $00, 0
+	map_data BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $00, 0
+	map_data BlackthornEmysHouse, BLACKTHORN_EMYS_HOUSE, $00, 0
+	map_data BlackthornMart, BLACKTHORN_MART, $00, 0
+	map_data BlackthornPokecenter1F, BLACKTHORN_POKECENTER_1F, $00, 0
+	map_data MoveDeletersHouse, MOVE_DELETERS_HOUSE, $00, 0
+	map_data CinnabarPokecenter1F, CINNABAR_POKECENTER_1F, $00, 0
+	map_data CinnabarPokecenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $00, 0
+	map_data Route19FuchsiaGate, ROUTE_19_FUCHSIA_GATE, $00, 0
+	map_data SeafoamGym, SEAFOAM_GYM, $09, 0
+	map_data CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $00, 0
+	map_data CeruleanPoliceStation, CERULEAN_POLICE_STATION, $00, 0
+	map_data CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $00, 0
+	map_data CeruleanPokecenter1F, CERULEAN_POKECENTER_1F, $00, 0
+	map_data CeruleanPokecenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $00, 0
+	map_data CeruleanGym, CERULEAN_GYM, $00, 0
+	map_data CeruleanMart, CERULEAN_MART, $00, 0
+	map_data Route10Pokecenter1F, ROUTE_10_POKECENTER_1F, $00, 0
+	map_data Route10Pokecenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $00, 0
+	map_data PowerPlant, POWER_PLANT, $00, 0
+	map_data BillsHouse, BILLS_HOUSE, $00, 0
+	map_data AzaleaPokecenter1F, AZALEA_POKECENTER_1F, $00, 0
+	map_data CharcoalKiln, CHARCOAL_KILN, $00, 0
+	map_data AzaleaMart, AZALEA_MART, $00, 0
+	map_data KurtsHouse, KURTS_HOUSE, $00, 0
+	map_data AzaleaGym, AZALEA_GYM, $00, 0
+	map_data LakeOfRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $00, 0
+	map_data LakeOfRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $00, 0
+	map_data Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $00, 0
+	map_data Route43Gate, ROUTE_43_GATE, $00, 0
+	map_data VioletMart, VIOLET_MART, $00, 0
+	map_data VioletGym, VIOLET_GYM, $00, 0
+	map_data EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $00, 0
+	map_data VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $00, 0
+	map_data VioletPokecenter1F, VIOLET_POKECENTER_1F, $00, 0
+	map_data VioletKylesHouse, VIOLET_KYLES_HOUSE, $00, 0
+	map_data Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $00, 0
+	map_data Route32Pokecenter1F, ROUTE_32_POKECENTER_1F, $00, 0
+	map_data Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $00, 0
+	map_data Route35NationalParkGate, ROUTE_35_NATIONAL_PARK_GATE, $00, 0
+	map_data Route36RuinsOfAlphGate, ROUTE_36_RUINS_OF_ALPH_GATE, $00, 0
+	map_data Route36NationalParkGate, ROUTE_36_NATIONAL_PARK_GATE, $00, 0
+	map_data GoldenrodGym, GOLDENROD_GYM, $00, 0
+	map_data GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $00, 0
+	map_data GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $00, 0
+	map_data GoldenrodBillsHouse, GOLDENROD_BILLS_HOUSE, $00, 0
+	map_data GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $00, 0
+	map_data GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $00, 0
+	map_data GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $00, 0
+	map_data GoldenrodNameRater, GOLDENROD_NAME_RATER, $00, 0
+	map_data GoldenrodDeptStore1F, GOLDENROD_DEPT_STORE_1F, $00, 0
+	map_data GoldenrodDeptStore2F, GOLDENROD_DEPT_STORE_2F, $00, 0
+	map_data GoldenrodDeptStore3F, GOLDENROD_DEPT_STORE_3F, $00, 0
+	map_data GoldenrodDeptStore4F, GOLDENROD_DEPT_STORE_4F, $00, 0
+	map_data GoldenrodDeptStore5F, GOLDENROD_DEPT_STORE_5F, $00, 0
+	map_data GoldenrodDeptStore6F, GOLDENROD_DEPT_STORE_6F, $00, 0
+	map_data GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $00, 0
+	map_data GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0
+	map_data GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0
+	map_data GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0
+	map_data GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $00, 0
+	map_data IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0
+	map_data Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0
+	map_data DayCare, DAY_CARE, $00, 0
+	map_data VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $00, 0
+	map_data VermilionPokecenter1F, VERMILION_POKECENTER_1F, $00, 0
+	map_data VermilionPokecenter2FBeta, VERMILION_POKECENTER_2F_BETA, $00, 0
+	map_data PokemonFanClub, POKEMON_FAN_CLUB, $00, 0
+	map_data VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $00, 0
+	map_data VermilionMart, VERMILION_MART, $00, 0
+	map_data VermilionHouseDiglettsCaveSpeechHouse, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, $00, 0
+	map_data VermilionGym, VERMILION_GYM, $00, 0
+	map_data Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $00, 0
+	map_data Route6UndergroundPathEntrance, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, $00, 0
+	map_data RedsHouse1F, REDS_HOUSE_1F, $00, 0
+	map_data RedsHouse2F, REDS_HOUSE_2F, $00, 0
+	map_data BluesHouse, BLUES_HOUSE, $00, 0
+	map_data OaksLab, OAKS_LAB, $00, 0
+	map_data PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $00, 0
+	map_data PewterGym, PEWTER_GYM, $00, 0
+	map_data PewterMart, PEWTER_MART, $00, 0
+	map_data PewterPokecenter1F, PEWTER_POKECENTER_1F, $00, 0
+	map_data PewterPokecenter2FBeta, PEWTER_POKECENTER_2F_BETA, $00, 0
+	map_data PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $00, 0
+	map_data OlivinePort, OLIVINE_PORT, $0a, 0
+	map_data VermilionPort, VERMILION_PORT, $0a, 0
+	map_data FastShip1F, FAST_SHIP_1F, $00, 0
+	map_data FastShipCabins_NNW_NNE_NE, FAST_SHIP_CABINS_NNW_NNE_NE, $00, 0
+	map_data FastShipCabins_SW_SSW_NW, FAST_SHIP_CABINS_SW_SSW_NW, $00, 0
+	map_data FastShipCabins_SE_SSE_CaptainsCabin, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, $00, 0
+	map_data FastShipB1F, FAST_SHIP_B1F, $00, 0
+	map_data OlivinePortPassage, OLIVINE_PORT_PASSAGE, $00, 0
+	map_data VermilionPortPassage, VERMILION_PORT_PASSAGE, $00, 0
+	map_data MountMoonSquare, MOUNT_MOON_SQUARE, $2d, 0
+	map_data MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $00, 0
+	map_data TinTowerRoof, TIN_TOWER_ROOF, $00, 0
+	map_data IndigoPlateauPokecenter1F, INDIGO_PLATEAU_POKECENTER_1F, $00, 0
+	map_data WillsRoom, WILLS_ROOM, $00, 0
+	map_data KogasRoom, KOGAS_ROOM, $00, 0
+	map_data BrunosRoom, BRUNOS_ROOM, $00, 0
+	map_data KarensRoom, KARENS_ROOM, $00, 0
+	map_data LancesRoom, LANCES_ROOM, $00, 0
+	map_data HallOfFame, HALL_OF_FAME, $00, 0
+	map_data FuchsiaMart, FUCHSIA_MART, $00, 0
+	map_data SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $00, 0
+	map_data FuchsiaGym, FUCHSIA_GYM, $00, 0
+	map_data FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $00, 0
+	map_data FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $00, 0
+	map_data FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $00, 0
+	map_data SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $00, 0
+	map_data Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $00, 0
+	map_data LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $00, 0
+	map_data LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $00, 0
+	map_data MrFujisHouse, MR_FUJIS_HOUSE, $00, 0
+	map_data LavenderSpeechHouse, LAVENDER_SPEECH_HOUSE, $00, 0
+	map_data LavenderNameRater, LAVENDER_NAME_RATER, $00, 0
+	map_data LavenderMart, LAVENDER_MART, $00, 0
+	map_data SoulHouse, SOUL_HOUSE, $00, 0
+	map_data LavRadioTower1F, LAV_RADIO_TOWER_1F, $00, 0
+	map_data Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $00, 0
+	map_data Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $00, 0
+	map_data SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $00, 0
+	map_data Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $00, 0
+	map_data Pokecenter2F, POKECENTER_2F, $00, 0
+	map_data TradeCenter, TRADE_CENTER, $00, 0
+	map_data Colosseum, COLOSSEUM, $00, 0
+	map_data TimeCapsule, TIME_CAPSULE, $00, 0
+	map_data MobileTradeRoomMobile, MOBILE_TRADE_ROOM_MOBILE, $00, 0
+	map_data MobileBattleRoom, MOBILE_BATTLE_ROOM, $00, 0
+	map_data CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $00, 0
+	map_data CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $00, 0
+	map_data CeladonDeptStore3F, CELADON_DEPT_STORE_3F, $00, 0
+	map_data CeladonDeptStore4F, CELADON_DEPT_STORE_4F, $00, 0
+	map_data CeladonDeptStore5F, CELADON_DEPT_STORE_5F, $00, 0
+	map_data CeladonDeptStore6F, CELADON_DEPT_STORE_6F, $00, 0
+	map_data CeladonDeptStoreElevator, CELADON_DEPT_STORE_ELEVATOR, $00, 0
+	map_data CeladonMansion1F, CELADON_MANSION_1F, $00, 0
+	map_data CeladonMansion2F, CELADON_MANSION_2F, $00, 0
+	map_data CeladonMansion3F, CELADON_MANSION_3F, $00, 0
+	map_data CeladonMansionRoof, CELADON_MANSION_ROOF, $01, 0
+	map_data CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $00, 0
+	map_data CeladonPokecenter1F, CELADON_POKECENTER_1F, $00, 0
+	map_data CeladonPokecenter2FBeta, CELADON_POKECENTER_2F_BETA, $00, 0
+	map_data CeladonGameCorner, CELADON_GAME_CORNER, $00, 0
+	map_data CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $00, 0
+	map_data CeladonGym, CELADON_GYM, $00, 0
+	map_data CeladonCafe, CELADON_CAFE, $00, 0
+	map_data Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $00, 0
+	map_data Route16Gate, ROUTE_16_GATE, $00, 0
+	map_data Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $00, 0
+	map_data Route17Route18Gate, ROUTE_17_ROUTE_18_GATE, $00, 0
+	map_data ManiasHouse, MANIAS_HOUSE, $00, 0
+	map_data CianwoodGym, CIANWOOD_GYM, $00, 0
+	map_data CianwoodPokecenter1F, CIANWOOD_POKECENTER_1F, $00, 0
+	map_data CianwoodPharmacy, CIANWOOD_PHARMACY, $00, 0
+	map_data CianwoodPhotoStudio, CIANWOOD_PHOTO_STUDIO, $00, 0
+	map_data CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $00, 0
+	map_data PokeSeersHouse, POKE_SEERS_HOUSE, $00, 0
+	map_data BattleTower1F, BATTLE_TOWER_1F, $00, 0
+	map_data BattleTowerBattleRoom, BATTLE_TOWER_BATTLE_ROOM, $00, 0
+	map_data BattleTowerElevator, BATTLE_TOWER_ELEVATOR, $00, 0
+	map_data BattleTowerHallway, BATTLE_TOWER_HALLWAY, $00, 0
+	map_data Route40BattleTowerGate, ROUTE_40_BATTLE_TOWER_GATE, $00, 0
+	map_data BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $05, 0
+	map_data ViridianGym, VIRIDIAN_GYM, $00, 0
+	map_data ViridianNicknameSpeechHouse, VIRIDIAN_NICKNAME_SPEECH_HOUSE, $00, 0
+	map_data TrainerHouse1F, TRAINER_HOUSE_1F, $00, 0
+	map_data TrainerHouseB1F, TRAINER_HOUSE_B1F, $00, 0
+	map_data ViridianMart, VIRIDIAN_MART, $00, 0
+	map_data ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $00, 0
+	map_data ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $00, 0
+	map_data Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $00, 0
+	map_data Route2Gate, ROUTE_2_GATE, $00, 0
+	map_data VictoryRoadGate, VICTORY_ROAD_GATE, $00, 0
+	map_data ElmsLab, ELMS_LAB, $00, 0
+	map_data KrissHouse1F, KRISS_HOUSE_1F, $00, 0
+	map_data KrissHouse2F, KRISS_HOUSE_2F, $00, 0
+	map_data KrissNeighborsHouse, KRISS_NEIGHBORS_HOUSE, $00, 0
+	map_data ElmsHouse, ELMS_HOUSE, $00, 0
+	map_data Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $00, 0
+	map_data Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0
+	map_data Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $00, 0
+	map_data Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $00, 0
+	map_data FightingDojo, FIGHTING_DOJO, $00, 0
+	map_data SaffronGym, SAFFRON_GYM, $00, 0
+	map_data SaffronMart, SAFFRON_MART, $00, 0
+	map_data SaffronPokecenter1F, SAFFRON_POKECENTER_1F, $00, 0
+	map_data SaffronPokecenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $00, 0
+	map_data MrPsychicsHouse, MR_PSYCHICS_HOUSE, $00, 0
+	map_data SaffronMagnetTrainStation, SAFFRON_MAGNET_TRAIN_STATION, $00, 0
+	map_data SilphCo1F, SILPH_CO_1F, $00, 0
+	map_data CopycatsHouse1F, COPYCATS_HOUSE_1F, $00, 0
+	map_data CopycatsHouse2F, COPYCATS_HOUSE_2F, $00, 0
+	map_data Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $00, 0
+	map_data Route5SaffronGate, ROUTE_5_SAFFRON_GATE, $00, 0
+	map_data Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $00, 0
+	map_data CherrygroveMart, CHERRYGROVE_MART, $00, 0
+	map_data CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $00, 0
+	map_data CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $00, 0
+	map_data GuideGentsHouse, GUIDE_GENTS_HOUSE, $00, 0
+	map_data CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $00, 0
+	map_data Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $00, 0
+	map_data MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0
+	map_data Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0

data/maps/map_defs.asm

@@ -0,0 +1,485 @@
+map_def: MACRO
+;\1: map label
+;\2: tileset: a TILESET_* constant
+;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON
+;\4: location: from constants/landmark_constants.asm
+;\5: music: a MUSIC_* constant
+;\6: phone service flag: TRUE to prevent phone calls
+;\7: time of day: a PALETTE_* constant
+;\8: fishing group: a FISHGROUP_* constant
+	db BANK(\1_MapData), \2, \3
+	dw \1_MapData
+	db \4, \5
+	dn \6, \7
+	db \8
+ENDM
+
+MapGroupPointers::
+; pointers to the first map header of each map group
+	dw MapGroup_Olivine     ;  1
+	dw MapGroup_Mahogany    ;  2
+	dw MapGroup_Dungeons    ;  3
+	dw MapGroup_Ecruteak    ;  4
+	dw MapGroup_Blackthorn  ;  5
+	dw MapGroup_Cinnabar    ;  6
+	dw MapGroup_Cerulean    ;  7
+	dw MapGroup_Azalea      ;  8
+	dw MapGroup_LakeOfRage  ;  9
+	dw MapGroup_Violet      ; 10
+	dw MapGroup_Goldenrod   ; 11
+	dw MapGroup_Vermilion   ; 12
+	dw MapGroup_Pallet      ; 13
+	dw MapGroup_Pewter      ; 14
+	dw MapGroup_FastShip    ; 15
+	dw MapGroup_Indigo      ; 16
+	dw MapGroup_Fuchsia     ; 17
+	dw MapGroup_Lavender    ; 18
+	dw MapGroup_Silver      ; 19
+	dw MapGroup_CableClub   ; 20
+	dw MapGroup_Celadon     ; 21
+	dw MapGroup_Cianwood    ; 22
+	dw MapGroup_Viridian    ; 23
+	dw MapGroup_NewBark     ; 24
+	dw MapGroup_Saffron     ; 25
+	dw MapGroup_Cherrygrove ; 26
+
+
+MapGroup_Olivine:
+	map_def OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def OlivineGym, TILESET_OLIVINE_GYM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def OlivineTimsHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def OlivineHouseBeta, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def OlivinePunishmentSpeechHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def OlivineGoodRodHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def OlivineCafe, TILESET_GAME_CORNER, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def OlivineMart, TILESET_MART, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route39Barn, TILESET_KURTS_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route39Farmhouse, TILESET_HOUSE_1, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route38, TILESET_JOHTO_1, ROUTE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def Route39, TILESET_JOHTO_1, ROUTE, ROUTE_39, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def OlivineCity, TILESET_JOHTO_1, TOWN, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+
+MapGroup_Mahogany:
+	map_def MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE_1, INDOOR, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def MahoganyGym, TILESET_GYM_1, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route42EcruteakGate, TILESET_GATE, GATE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route42, TILESET_JOHTO_1, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map_def Route44, TILESET_JOHTO_1, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map_def MahoganyTown, TILESET_JOHTO_1, TOWN, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+
+MapGroup_Dungeons:
+	map_def SproutTower1F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def SproutTower2F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def SproutTower3F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TinTower1F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TinTower2F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TinTower3F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TinTower4F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TinTower5F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TinTower6F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TinTower7F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TinTower8F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TinTower9F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def BurnedTower1F, TILESET_SPROUT_TOWER, DUNGEON, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map_def BurnedTowerB1F, TILESET_CAVE, CAVE, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map_def NationalPark, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_NATIONAL_PARK, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def NationalParkBugContest, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def RadioTower1F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RadioTower2F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RuinsOfAlphOutside, TILESET_JOHTO_1, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map_def RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RuinsOfAlphOmanyteChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RuinsOfAlphAerodactylChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RuinsOfAlphInnerChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_RUINS_OF_ALPH_INTERIOR, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RuinsOfAlphResearchCenter, TILESET_POWER_PLANT, INDOOR, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RuinsOfAlphHoOhItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RuinsOfAlphKabutoItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RuinsOfAlphOmanyteItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RuinsOfAlphAerodactylItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RuinsOfAlphHoOhWordRoom, TILESET_HO_OH_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RuinsOfAlphKabutoWordRoom, TILESET_KABUTO_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RuinsOfAlphOmanyteWordRoom, TILESET_OMANYTE_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RuinsOfAlphAerodactylWordRoom, TILESET_AERODACTYL_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def UnionCave1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map_def UnionCaveB1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map_def UnionCaveB2F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map_def SlowpokeWellB1F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map_def SlowpokeWellB2F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map_def OlivineLighthouse1F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def OlivineLighthouse2F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def OlivineLighthouse3F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def MahoganyMart1F, TILESET_KURTS_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TeamRocketBaseB2F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TeamRocketBaseB3F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def IlexForest, TILESET_ILEX_FOREST, CAVE, ILEX_FOREST, MUSIC_UNION_CAVE, FALSE, PALETTE_NITE, FISHGROUP_POND
+	map_def GoldenrodUnderground, TILESET_GATE, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodUndergroundSwitchRoomEntrances, TILESET_GYM_1, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodDeptStoreB1F, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodUndergroundWarehouse, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def MountMortar1FOutside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map_def MountMortar1FInside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map_def MountMortar2FInside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map_def MountMortarB1F, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map_def IcePath1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map_def IcePathB1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map_def IcePathB2FMahoganySide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map_def IcePathB2FBlackthornSide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map_def IcePathB3F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map_def WhirlIslandNW, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map_def WhirlIslandNE, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map_def WhirlIslandSW, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map_def WhirlIslandCave, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map_def WhirlIslandSE, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map_def WhirlIslandB1F, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map_def WhirlIslandB2F, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map_def WhirlIslandLugiaChamber, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map_def SilverCaveRoom1, TILESET_WHIRL_ISLANDS, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
+	map_def SilverCaveRoom2, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map_def SilverCaveRoom3, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DAY, FISHGROUP_LAKE
+	map_def SilverCaveItemRooms, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map_def DarkCaveVioletEntrance, TILESET_WHIRL_ISLANDS, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
+	map_def DarkCaveBlackthornEntrance, TILESET_WHIRL_ISLANDS, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
+	map_def DragonsDen1F, TILESET_CAVE, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map_def DragonsDenB1F, TILESET_JOHTO_1, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map_def DragonShrine, TILESET_LAB, INDOOR, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map_def TohjoFalls, TILESET_CAVE, CAVE, TOHJO_FALLS, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map_def DiglettsCave, TILESET_CAVE, CAVE, DIGLETTS_CAVE, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map_def MountMoon, TILESET_CAVE, CAVE, MT_MOON, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map_def UndergroundPath, TILESET_UNDERGROUND, GATE, UNDERGROUND_PATH, MUSIC_MT_MOON, FALSE, PALETTE_NITE, FISHGROUP_SHORE
+	map_def RockTunnel1F, TILESET_WHIRL_ISLANDS, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE
+	map_def RockTunnelB1F, TILESET_WHIRL_ISLANDS, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE
+	map_def SafariZoneFuchsiaGateBeta, TILESET_GATE, INDOOR, FUCHSIA_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def SafariZoneBeta, TILESET_PARK, CAVE, FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+
+MapGroup_Ecruteak:
+	map_def EcruteakHouse, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def WiseTriosRoom, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def EcruteakLugiaSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def DanceTheatre, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def EcruteakGym, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def EcruteakItemfinderHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def EcruteakCity, TILESET_JOHTO_1, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
+
+MapGroup_Blackthorn:
+	map_def BlackthornGym1F, TILESET_GYM_1, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def BlackthornGym2F, TILESET_GYM_1, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def BlackthornDragonSpeechHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def BlackthornEmysHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def BlackthornMart, TILESET_MART, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def BlackthornPokecenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def MoveDeletersHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route45, TILESET_JOHTO_1, ROUTE, ROUTE_45, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI_2
+	map_def Route46, TILESET_JOHTO_1, ROUTE, ROUTE_46, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def BlackthornCity, TILESET_JOHTO_1, TOWN, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_POND
+
+MapGroup_Cinnabar:
+	map_def CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CinnabarPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route19FuchsiaGate, TILESET_GATE, GATE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def SeafoamGym, TILESET_CAVE, INDOOR, SEAFOAM_ISLANDS, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route19, TILESET_KANTO, ROUTE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def Route20, TILESET_KANTO, ROUTE, ROUTE_20, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map_def Route21, TILESET_KANTO, ROUTE, ROUTE_21, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map_def CinnabarIsland, TILESET_KANTO, TOWN, CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+
+MapGroup_Cerulean:
+	map_def CeruleanGymBadgeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeruleanPoliceStation, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeruleanTradeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeruleanPokecenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeruleanPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeruleanGym, TILESET_PORT, INDOOR, CERULEAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_NONE
+	map_def CeruleanMart, TILESET_MART, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route10Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route10Pokecenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def PowerPlant, TILESET_POWER_PLANT, INDOOR, POWER_PLANT, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def BillsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_25, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route4, TILESET_KANTO, ROUTE, ROUTE_4, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE
+	map_def Route9, TILESET_KANTO, ROUTE, ROUTE_9, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map_def Route10North, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map_def Route24, TILESET_KANTO, ROUTE, ROUTE_24, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map_def Route25, TILESET_KANTO, ROUTE, ROUTE_25, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map_def CeruleanCity, TILESET_KANTO, TOWN, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE
+
+MapGroup_Azalea:
+	map_def AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CharcoalKiln, TILESET_HOUSE_1, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def KurtsHouse, TILESET_KURTS_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def AzaleaGym, TILESET_GYM_1, INDOOR, AZALEA_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route33, TILESET_JOHTO_2, ROUTE, ROUTE_33, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def AzaleaTown, TILESET_JOHTO_2, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+
+MapGroup_LakeOfRage:
+	map_def LakeOfRageHiddenPowerHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def LakeOfRageMagikarpHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route43MahoganyGate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route43Gate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route43, TILESET_JOHTO_1, ROUTE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map_def LakeOfRage, TILESET_JOHTO_1, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS
+
+MapGroup_Violet:
+	map_def Route32, TILESET_JOHTO_1, ROUTE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH
+	map_def Route35, TILESET_JOHTO_1, ROUTE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map_def Route36, TILESET_JOHTO_1, ROUTE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def Route37, TILESET_JOHTO_1, ROUTE, ROUTE_37, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def VioletCity, TILESET_JOHTO_1, TOWN, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map_def VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def VioletGym, TILESET_GYM_1, INDOOR, VIOLET_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def VioletNicknameSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def VioletKylesHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route35NationalParkGate, TILESET_GATE, INDOOR, ROUTE_35, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route36RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route36NationalParkGate, TILESET_GATE, INDOOR, ROUTE_36, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Goldenrod:
+	map_def Route34, TILESET_JOHTO_2, ROUTE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def GoldenrodCity, TILESET_JOHTO_2, TOWN, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def GoldenrodGym, TILESET_GYM_1, INDOOR, GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodBikeShop, TILESET_OLIVINE_GYM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodHappinessRater, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodBillsHouse, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodFlowerShop, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodPPSpeechHouse, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodNameRater, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodDeptStore1F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodDeptStore2F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodDeptStore3F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodDeptStore4F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodDeptStore5F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodDeptStore6F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodDeptStoreElevator, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GoldenrodPokeComCenter2FMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def DayCare, TILESET_HOUSE_1, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Vermilion:
+	map_def Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map_def Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map_def VermilionHouseFishingSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def PokemonFanClub, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def VermilionMagnetTrainSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def VermilionHouseDiglettsCaveSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def VermilionGym, TILESET_GAME_CORNER, INDOOR, VERMILION_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route6SaffronGate, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Pallet:
+	map_def Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map_def RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def RedsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def BluesHouse, TILESET_HOUSE_1, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Pewter:
+	map_def Route3, TILESET_KANTO, ROUTE, ROUTE_3, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def PewterCity, TILESET_KANTO, TOWN, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def PewterNidoranSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def PewterGym, TILESET_SPROUT_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def PewterPokecenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def PewterSnoozeSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_FastShip:
+	map_def OlivinePort, TILESET_PORT, ROUTE, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map_def VermilionPort, TILESET_PORT, ROUTE, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map_def FastShip1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def FastShipCabins_NNW_NNE_NE, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def FastShipCabins_SW_SSW_NW, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def FastShipCabins_SE_SSE_CaptainsCabin, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def FastShipB1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def MountMoonGiftShop, TILESET_KURTS_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TinTowerRoof, TILESET_SPROUT_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+
+MapGroup_Indigo:
+	map_def Route23, TILESET_KANTO, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def WillsRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def KogasRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def BrunosRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def KarensRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def LancesRoom, TILESET_OLIVINE_GYM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def HallOfFame, TILESET_ICE_PATH, INDOOR, INDIGO_PLATEAU, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Fuchsia:
+	map_def Route13, TILESET_KANTO, ROUTE, ROUTE_13, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM
+	map_def Route14, TILESET_KANTO, ROUTE, ROUTE_14, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def Route15, TILESET_KANTO, ROUTE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def Route18, TILESET_KANTO, ROUTE, ROUTE_18, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def FuchsiaCity, TILESET_KANTO, TOWN, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS
+	map_def FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def FuchsiaBillSpeechHouse, TILESET_HOUSE_1, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def SafariZoneWardensHome, TILESET_HOUSE_1, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route15FuchsiaGate, TILESET_GATE, GATE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Lavender:
+	map_def Route8, TILESET_KANTO, ROUTE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def Route12, TILESET_KANTO, ROUTE, ROUTE_12, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM
+	map_def Route10South, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map_def LavenderTown, TILESET_KANTO, TOWN, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def LavenderPokecenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def LavenderPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def MrFujisHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def LavenderSpeechHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def LavenderNameRater, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def LavenderMart, TILESET_MART, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def SoulHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def LavRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LAV_RADIO_TOWER, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route8SaffronGate, TILESET_GATE, GATE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route12SuperRodHouse, TILESET_HOUSE_1, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Silver:
+	map_def Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map_def SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map_def SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route28FamousSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_CableClub:
+	map_def Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TimeCapsule, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def MobileTradeRoomMobile, TILESET_CELADON_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def MobileBattleRoom, TILESET_CELADON_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Celadon:
+	map_def Route7, TILESET_KANTO, ROUTE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def Route16, TILESET_KANTO, ROUTE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def Route17, TILESET_KANTO, ROUTE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE
+	map_def CeladonCity, TILESET_KANTO, TOWN, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE
+	map_def CeladonDeptStore1F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonDeptStore2F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonDeptStore3F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonDeptStore4F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonDeptStore5F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonDeptStore6F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonDeptStoreElevator, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonMansion1F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonMansion2F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonMansion3F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonMansionRoof, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonMansionRoofHouse, TILESET_HOUSE_1, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonPokecenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonGameCorner, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonGameCornerPrizeRoom, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonGym, TILESET_TRAIN_STATION, INDOOR, CELADON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CeladonCafe, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route16FuchsiaSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_16, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route16Gate, TILESET_GATE, GATE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route7SaffronGate, TILESET_GATE, GATE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route17Route18Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Cianwood:
+	map_def Route40, TILESET_JOHTO_1, ROUTE, ROUTE_40, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def Route41, TILESET_JOHTO_1, ROUTE, ROUTE_41, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map_def CianwoodCity, TILESET_JOHTO_1, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def ManiasHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CianwoodGym, TILESET_SPROUT_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CianwoodPokecenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CianwoodPharmacy, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CianwoodPhotoStudio, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CianwoodLugiaSpeechHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def PokeSeersHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+
+MapGroup_Viridian:
+	map_def Route2, TILESET_KANTO, ROUTE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def Route22, TILESET_KANTO, ROUTE, ROUTE_22, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map_def ViridianCity, TILESET_KANTO, TOWN, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map_def ViridianGym, TILESET_TRAIN_STATION, INDOOR, VIRIDIAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def ViridianNicknameSpeechHouse, TILESET_HOUSE_1, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TrainerHouse1F, TILESET_HOUSE_1, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def TrainerHouseB1F, TILESET_POWER_PLANT, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route2NuggetSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_NewBark:
+	map_def Route26, TILESET_JOHTO_1, ROUTE, ROUTE_26, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map_def Route27, TILESET_JOHTO_1, ROUTE, ROUTE_27, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map_def Route29, TILESET_JOHTO_1, ROUTE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def NewBarkTown, TILESET_JOHTO_1, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map_def ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def KrissHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def KrissHouse2F, TILESET_PLAYERS_HOUSE_2F, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def KrissNeighborsHouse, TILESET_HOUSE_1, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route26HealSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route26DayofWeekSiblingsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route27SandstormHouse, TILESET_HOUSE_1, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Saffron:
+	map_def Route5, TILESET_KANTO, ROUTE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def SaffronCity, TILESET_KANTO, TOWN, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def FightingDojo, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def SaffronGym, TILESET_UNDERGROUND, INDOOR, SAFFRON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def SaffronMart, TILESET_MART, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def SaffronPokecenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def MrPsychicsHouse, TILESET_HOUSE_1, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def SaffronMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def SilphCo1F, TILESET_POWER_PLANT, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route5CleanseTagSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Cherrygrove:
+	map_def Route30, TILESET_JOHTO_1, ROUTE, ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map_def Route31, TILESET_JOHTO_1, ROUTE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map_def CherrygroveCity, TILESET_JOHTO_1, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map_def CherrygroveMart, TILESET_MART, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CherrygrovePokecenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CherrygroveGymSpeechHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def GuideGentsHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def CherrygroveEvolutionSpeechHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route30BerrySpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def MrPokemonsHouse, TILESET_POWER_PLANT, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route31VioletGate, TILESET_GATE, GATE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE

data/maps/map_headers.asm

@@ -1,510 +0,0 @@
-map_header: MACRO
-;\1: map label
-;\2: tileset: a TILESET_* constant
-;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON
-;\4: location: from constants/landmark_constants.asm
-;\5: music: a MUSIC_* constant
-;\6: phone service flag: TRUE to prevent phone calls
-;\7: time of day: a PALETTE_* constant
-;\8: fishing group: a FISHGROUP_* constant
-\1_MapHeader:
-	db BANK(\1_SecondMapHeader), \2, \3
-	dw \1_SecondMapHeader
-	db \4, \5
-	dn \6, \7
-	db \8
-ENDM
-
-MapGroupPointers::
-; pointers to the first map header of each map group
-	dw MapGroup_Olivine     ;  1
-	dw MapGroup_Mahogany    ;  2
-	dw MapGroup_Dungeons    ;  3
-	dw MapGroup_Ecruteak    ;  4
-	dw MapGroup_Blackthorn  ;  5
-	dw MapGroup_Cinnabar    ;  6
-	dw MapGroup_Cerulean    ;  7
-	dw MapGroup_Azalea      ;  8
-	dw MapGroup_LakeOfRage  ;  9
-	dw MapGroup_Violet      ; 10
-	dw MapGroup_Goldenrod   ; 11
-	dw MapGroup_Vermilion   ; 12
-	dw MapGroup_Pallet      ; 13
-	dw MapGroup_Pewter      ; 14
-	dw MapGroup_FastShip    ; 15
-	dw MapGroup_Indigo      ; 16
-	dw MapGroup_Fuchsia     ; 17
-	dw MapGroup_Lavender    ; 18
-	dw MapGroup_Silver      ; 19
-	dw MapGroup_CableClub   ; 20
-	dw MapGroup_Celadon     ; 21
-	dw MapGroup_Cianwood    ; 22
-	dw MapGroup_Viridian    ; 23
-	dw MapGroup_NewBark     ; 24
-	dw MapGroup_Saffron     ; 25
-	dw MapGroup_Cherrygrove ; 26
-
-MapGroup_Olivine:
-	map_header OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header OlivineGym, TILESET_OLIVINE_GYM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header OlivineTimsHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header OlivineHouseBeta, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header OlivinePunishmentSpeechHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header OlivineGoodRodHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header OlivineCafe, TILESET_GAME_CORNER, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header OlivineMart, TILESET_MART, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route39Barn, TILESET_KURTS_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route39Farmhouse, TILESET_HOUSE_1, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route38, TILESET_JOHTO_1, ROUTE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header Route39, TILESET_JOHTO_1, ROUTE, ROUTE_39, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header OlivineCity, TILESET_JOHTO_1, TOWN, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-
-
-MapGroup_Mahogany:
-	map_header MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE_1, INDOOR, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header MahoganyGym, TILESET_GYM_1, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route42EcruteakGate, TILESET_GATE, GATE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route42, TILESET_JOHTO_1, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_header Route44, TILESET_JOHTO_1, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_header MahoganyTown, TILESET_JOHTO_1, TOWN, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-
-
-MapGroup_Dungeons:
-	map_header SproutTower1F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header SproutTower2F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header SproutTower3F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TinTower1F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TinTower2F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TinTower3F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TinTower4F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TinTower5F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TinTower6F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TinTower7F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TinTower8F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TinTower9F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header BurnedTower1F, TILESET_SPROUT_TOWER, DUNGEON, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_header BurnedTowerB1F, TILESET_CAVE, CAVE, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_header NationalPark, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_NATIONAL_PARK, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header NationalParkBugContest, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header RadioTower1F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RadioTower2F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RuinsOfAlphOutside, TILESET_JOHTO_1, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_header RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RuinsOfAlphOmanyteChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RuinsOfAlphAerodactylChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RuinsOfAlphInnerChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_RUINS_OF_ALPH_INTERIOR, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RuinsOfAlphResearchCenter, TILESET_POWER_PLANT, INDOOR, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RuinsOfAlphHoOhItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RuinsOfAlphKabutoItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RuinsOfAlphOmanyteItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RuinsOfAlphAerodactylItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RuinsOfAlphHoOhWordRoom, TILESET_HO_OH_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RuinsOfAlphKabutoWordRoom, TILESET_KABUTO_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RuinsOfAlphOmanyteWordRoom, TILESET_OMANYTE_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RuinsOfAlphAerodactylWordRoom, TILESET_AERODACTYL_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header UnionCave1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_header UnionCaveB1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_header UnionCaveB2F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_header SlowpokeWellB1F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_header SlowpokeWellB2F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_header OlivineLighthouse1F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header OlivineLighthouse2F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header OlivineLighthouse3F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header MahoganyMart1F, TILESET_KURTS_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TeamRocketBaseB2F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TeamRocketBaseB3F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header IlexForest, TILESET_ILEX_FOREST, CAVE, ILEX_FOREST, MUSIC_UNION_CAVE, FALSE, PALETTE_NITE, FISHGROUP_POND
-	map_header GoldenrodUnderground, TILESET_GATE, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodUndergroundSwitchRoomEntrances, TILESET_GYM_1, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodDeptStoreB1F, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodUndergroundWarehouse, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header MountMortar1FOutside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_header MountMortar1FInside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_header MountMortar2FInside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_header MountMortarB1F, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_header IcePath1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_header IcePathB1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_header IcePathB2FMahoganySide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_header IcePathB2FBlackthornSide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_header IcePathB3F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_header WhirlIslandNW, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_header WhirlIslandNE, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_header WhirlIslandSW, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_header WhirlIslandCave, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_header WhirlIslandSE, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_header WhirlIslandB1F, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_header WhirlIslandB2F, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_header WhirlIslandLugiaChamber, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_header SilverCaveRoom1, TILESET_WHIRL_ISLANDS, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
-	map_header SilverCaveRoom2, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_header SilverCaveRoom3, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DAY, FISHGROUP_LAKE
-	map_header SilverCaveItemRooms, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_header DarkCaveVioletEntrance, TILESET_WHIRL_ISLANDS, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
-	map_header DarkCaveBlackthornEntrance, TILESET_WHIRL_ISLANDS, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
-	map_header DragonsDen1F, TILESET_CAVE, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_header DragonsDenB1F, TILESET_JOHTO_1, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_header DragonShrine, TILESET_LAB, INDOOR, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_header TohjoFalls, TILESET_CAVE, CAVE, TOHJO_FALLS, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_header DiglettsCave, TILESET_CAVE, CAVE, DIGLETTS_CAVE, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_header MountMoon, TILESET_CAVE, CAVE, MT_MOON, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_header UndergroundPath, TILESET_UNDERGROUND, GATE, UNDERGROUND_PATH, MUSIC_MT_MOON, FALSE, PALETTE_NITE, FISHGROUP_SHORE
-	map_header RockTunnel1F, TILESET_WHIRL_ISLANDS, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE
-	map_header RockTunnelB1F, TILESET_WHIRL_ISLANDS, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE
-	map_header SafariZoneFuchsiaGateBeta, TILESET_GATE, INDOOR, FUCHSIA_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header SafariZoneBeta, TILESET_PARK, CAVE, FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-
-
-MapGroup_Ecruteak:
-	map_header EcruteakHouse, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header WiseTriosRoom, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header EcruteakLugiaSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header DanceTheatre, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header EcruteakGym, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header EcruteakItemfinderHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header EcruteakCity, TILESET_JOHTO_1, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
-
-
-MapGroup_Blackthorn:
-	map_header BlackthornGym1F, TILESET_GYM_1, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header BlackthornGym2F, TILESET_GYM_1, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header BlackthornDragonSpeechHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header BlackthornEmysHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header BlackthornMart, TILESET_MART, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header BlackthornPokecenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header MoveDeletersHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route45, TILESET_JOHTO_1, ROUTE, ROUTE_45, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI_2
-	map_header Route46, TILESET_JOHTO_1, ROUTE, ROUTE_46, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header BlackthornCity, TILESET_JOHTO_1, TOWN, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_POND
-
-
-MapGroup_Cinnabar:
-	map_header CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CinnabarPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route19FuchsiaGate, TILESET_GATE, GATE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header SeafoamGym, TILESET_CAVE, INDOOR, SEAFOAM_ISLANDS, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route19, TILESET_KANTO, ROUTE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header Route20, TILESET_KANTO, ROUTE, ROUTE_20, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_header Route21, TILESET_KANTO, ROUTE, ROUTE_21, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_header CinnabarIsland, TILESET_KANTO, TOWN, CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-
-
-MapGroup_Cerulean:
-	map_header CeruleanGymBadgeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeruleanPoliceStation, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeruleanTradeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeruleanPokecenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeruleanPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeruleanGym, TILESET_PORT, INDOOR, CERULEAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_NONE
-	map_header CeruleanMart, TILESET_MART, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route10Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route10Pokecenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header PowerPlant, TILESET_POWER_PLANT, INDOOR, POWER_PLANT, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header BillsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_25, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route4, TILESET_KANTO, ROUTE, ROUTE_4, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE
-	map_header Route9, TILESET_KANTO, ROUTE, ROUTE_9, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_header Route10North, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_header Route24, TILESET_KANTO, ROUTE, ROUTE_24, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_header Route25, TILESET_KANTO, ROUTE, ROUTE_25, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_header CeruleanCity, TILESET_KANTO, TOWN, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE
-
-
-MapGroup_Azalea:
-	map_header AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CharcoalKiln, TILESET_HOUSE_1, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header KurtsHouse, TILESET_KURTS_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header AzaleaGym, TILESET_GYM_1, INDOOR, AZALEA_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route33, TILESET_JOHTO_2, ROUTE, ROUTE_33, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header AzaleaTown, TILESET_JOHTO_2, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-
-
-MapGroup_LakeOfRage:
-	map_header LakeOfRageHiddenPowerHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header LakeOfRageMagikarpHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route43MahoganyGate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route43Gate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route43, TILESET_JOHTO_1, ROUTE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_header LakeOfRage, TILESET_JOHTO_1, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS
-
-
-MapGroup_Violet:
-	map_header Route32, TILESET_JOHTO_1, ROUTE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH
-	map_header Route35, TILESET_JOHTO_1, ROUTE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_header Route36, TILESET_JOHTO_1, ROUTE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header Route37, TILESET_JOHTO_1, ROUTE, ROUTE_37, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header VioletCity, TILESET_JOHTO_1, TOWN, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_header VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header VioletGym, TILESET_GYM_1, INDOOR, VIOLET_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header VioletNicknameSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header VioletKylesHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route35NationalParkGate, TILESET_GATE, INDOOR, ROUTE_35, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route36RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route36NationalParkGate, TILESET_GATE, INDOOR, ROUTE_36, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-
-MapGroup_Goldenrod:
-	map_header Route34, TILESET_JOHTO_2, ROUTE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header GoldenrodCity, TILESET_JOHTO_2, TOWN, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header GoldenrodGym, TILESET_GYM_1, INDOOR, GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodBikeShop, TILESET_OLIVINE_GYM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodHappinessRater, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodBillsHouse, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodFlowerShop, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodPPSpeechHouse, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodNameRater, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodDeptStore1F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodDeptStore2F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodDeptStore3F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodDeptStore4F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodDeptStore5F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodDeptStore6F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodDeptStoreElevator, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GoldenrodPokeComCenter2FMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header DayCare, TILESET_HOUSE_1, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-
-MapGroup_Vermilion:
-	map_header Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_header Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_header VermilionHouseFishingSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header PokemonFanClub, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header VermilionMagnetTrainSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header VermilionHouseDiglettsCaveSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header VermilionGym, TILESET_GAME_CORNER, INDOOR, VERMILION_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route6SaffronGate, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-
-MapGroup_Pallet:
-	map_header Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_header RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header RedsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header BluesHouse, TILESET_HOUSE_1, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-
-MapGroup_Pewter:
-	map_header Route3, TILESET_KANTO, ROUTE, ROUTE_3, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header PewterCity, TILESET_KANTO, TOWN, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header PewterNidoranSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header PewterGym, TILESET_SPROUT_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header PewterPokecenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header PewterSnoozeSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-
-MapGroup_FastShip:
-	map_header OlivinePort, TILESET_PORT, ROUTE, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_header VermilionPort, TILESET_PORT, ROUTE, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_header FastShip1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header FastShipCabins_NNW_NNE_NE, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header FastShipCabins_SW_SSW_NW, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header FastShipCabins_SE_SSE_CaptainsCabin, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header FastShipB1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header MountMoonGiftShop, TILESET_KURTS_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TinTowerRoof, TILESET_SPROUT_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-
-
-MapGroup_Indigo:
-	map_header Route23, TILESET_KANTO, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header WillsRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header KogasRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header BrunosRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header KarensRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header LancesRoom, TILESET_OLIVINE_GYM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header HallOfFame, TILESET_ICE_PATH, INDOOR, INDIGO_PLATEAU, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-
-
-MapGroup_Fuchsia:
-	map_header Route13, TILESET_KANTO, ROUTE, ROUTE_13, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM
-	map_header Route14, TILESET_KANTO, ROUTE, ROUTE_14, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header Route15, TILESET_KANTO, ROUTE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header Route18, TILESET_KANTO, ROUTE, ROUTE_18, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header FuchsiaCity, TILESET_KANTO, TOWN, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS
-	map_header FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header FuchsiaBillSpeechHouse, TILESET_HOUSE_1, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header SafariZoneWardensHome, TILESET_HOUSE_1, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route15FuchsiaGate, TILESET_GATE, GATE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-
-MapGroup_Lavender:
-	map_header Route8, TILESET_KANTO, ROUTE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header Route12, TILESET_KANTO, ROUTE, ROUTE_12, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM
-	map_header Route10South, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_header LavenderTown, TILESET_KANTO, TOWN, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header LavenderPokecenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header LavenderPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header MrFujisHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header LavenderSpeechHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header LavenderNameRater, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header LavenderMart, TILESET_MART, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header SoulHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header LavRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LAV_RADIO_TOWER, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route8SaffronGate, TILESET_GATE, GATE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route12SuperRodHouse, TILESET_HOUSE_1, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-
-MapGroup_Silver:
-	map_header Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_header SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_header SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route28FamousSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-
-MapGroup_CableClub:
-	map_header Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TimeCapsule, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header MobileTradeRoomMobile, TILESET_CELADON_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header MobileBattleRoom, TILESET_CELADON_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-
-
-MapGroup_Celadon:
-	map_header Route7, TILESET_KANTO, ROUTE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header Route16, TILESET_KANTO, ROUTE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header Route17, TILESET_KANTO, ROUTE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE
-	map_header CeladonCity, TILESET_KANTO, TOWN, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE
-	map_header CeladonDeptStore1F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonDeptStore2F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonDeptStore3F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonDeptStore4F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonDeptStore5F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonDeptStore6F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonDeptStoreElevator, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonMansion1F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonMansion2F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonMansion3F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonMansionRoof, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonMansionRoofHouse, TILESET_HOUSE_1, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonPokecenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonGameCorner, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonGameCornerPrizeRoom, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonGym, TILESET_TRAIN_STATION, INDOOR, CELADON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CeladonCafe, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route16FuchsiaSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_16, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route16Gate, TILESET_GATE, GATE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route7SaffronGate, TILESET_GATE, GATE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route17Route18Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-
-MapGroup_Cianwood:
-	map_header Route40, TILESET_JOHTO_1, ROUTE, ROUTE_40, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header Route41, TILESET_JOHTO_1, ROUTE, ROUTE_41, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_header CianwoodCity, TILESET_JOHTO_1, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header ManiasHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CianwoodGym, TILESET_SPROUT_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CianwoodPokecenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CianwoodPharmacy, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CianwoodPhotoStudio, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CianwoodLugiaSpeechHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header PokeSeersHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-
-
-MapGroup_Viridian:
-	map_header Route2, TILESET_KANTO, ROUTE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header Route22, TILESET_KANTO, ROUTE, ROUTE_22, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_header ViridianCity, TILESET_KANTO, TOWN, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_header ViridianGym, TILESET_TRAIN_STATION, INDOOR, VIRIDIAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header ViridianNicknameSpeechHouse, TILESET_HOUSE_1, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TrainerHouse1F, TILESET_HOUSE_1, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header TrainerHouseB1F, TILESET_POWER_PLANT, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route2NuggetSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-
-MapGroup_NewBark:
-	map_header Route26, TILESET_JOHTO_1, ROUTE, ROUTE_26, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_header Route27, TILESET_JOHTO_1, ROUTE, ROUTE_27, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_header Route29, TILESET_JOHTO_1, ROUTE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header NewBarkTown, TILESET_JOHTO_1, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_header ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header KrissHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header KrissHouse2F, TILESET_PLAYERS_HOUSE_2F, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header KrissNeighborsHouse, TILESET_HOUSE_1, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route26HealSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route26DayofWeekSiblingsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route27SandstormHouse, TILESET_HOUSE_1, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-
-MapGroup_Saffron:
-	map_header Route5, TILESET_KANTO, ROUTE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header SaffronCity, TILESET_KANTO, TOWN, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header FightingDojo, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header SaffronGym, TILESET_UNDERGROUND, INDOOR, SAFFRON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header SaffronMart, TILESET_MART, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header SaffronPokecenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header MrPsychicsHouse, TILESET_HOUSE_1, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header SaffronMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header SilphCo1F, TILESET_POWER_PLANT, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route5CleanseTagSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-
-MapGroup_Cherrygrove:
-	map_header Route30, TILESET_JOHTO_1, ROUTE, ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_header Route31, TILESET_JOHTO_1, ROUTE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_header CherrygroveCity, TILESET_JOHTO_1, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_header CherrygroveMart, TILESET_MART, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CherrygrovePokecenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CherrygroveGymSpeechHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header GuideGentsHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header CherrygroveEvolutionSpeechHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route30BerrySpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header MrPokemonsHouse, TILESET_POWER_PLANT, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route31VioletGate, TILESET_GATE, GATE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE

data/maps/map_headers_2.asm

@@ -1,685 +0,0 @@
-map_header_2: MACRO
-;\1: map label
-;\2: map id
-;\3: border block
-;\4: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none
-\1_SecondMapHeader::
-	db \3
-	db \2_HEIGHT, \2_WIDTH
-	db BANK(\1_BlockData)
-	dw \1_BlockData
-	db BANK(\1_MapScriptHeader)
-	dw \1_MapScriptHeader
-	dw \1_MapEventHeader
-	db \4
-ENDM
-
-connection: MACRO
-if "\1" == "north"
-;\2: map id
-;\3: map label (eventually will be rolled into map id)
-;\4: x
-;\5: offset?
-;\6: strip length
-;\7: this map id
-	map \2
-	dw \3_BlockData + \2_WIDTH * (\2_HEIGHT - 3) + \5
-	dw OverworldMap + \4 + 3
-	db \6
-	db \2_WIDTH
-	db \2_HEIGHT * 2 - 1
-	db (\4 - \5) * -2
-	dw OverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1
-endc
-
-if "\1" == "south"
-;\2: map id
-;\3: map label (eventually will be rolled into map id)
-;\4: x
-;\5: offset?
-;\6: strip length
-;\7: this map id
-	map \2
-	dw \3_BlockData + \5
-	dw OverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3
-	db \6
-	db \2_WIDTH
-	db 0
-	db (\4 - \5) * -2
-	dw OverworldMap + \2_WIDTH + 7
-endc
-
-if "\1" == "west"
-;\2: map id
-;\3: map label (eventually will be rolled into map id)
-;\4: y
-;\5: offset?
-;\6: strip length
-;\7: this map id
-	map \2
-	dw \3_BlockData + (\2_WIDTH * \5) + \2_WIDTH - 3
-	dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3)
-	db \6
-	db \2_WIDTH
-	db (\4 - \5) * -2
-	db \2_WIDTH * 2 - 1
-	dw OverworldMap + \2_WIDTH * 2 + 6
-endc
-
-if "\1" == "east"
-;\2: map id
-;\3: map label (eventually will be rolled into map id)
-;\4: y
-;\5: offset?
-;\6: strip length
-;\7: this map id
-	map \2
-	dw \3_BlockData + (\2_WIDTH * \5)
-	dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3
-	db \6
-	db \2_WIDTH
-	db (\4 - \5) * -2
-	db 0
-	dw OverworldMap + \2_WIDTH + 7
-endc
-ENDM
-
-
-	map_header_2 NewBarkTown, NEW_BARK_TOWN, $5, WEST | EAST
-	connection west, ROUTE_29, Route29, 0, 0, 9, NEW_BARK_TOWN
-	connection east, ROUTE_27, Route27, 0, 0, 9, NEW_BARK_TOWN
-
-	map_header_2 CherrygroveCity, CHERRYGROVE_CITY, $35, NORTH | EAST
-	connection north, ROUTE_30, Route30, 5, 0, 10, CHERRYGROVE_CITY
-	connection east, ROUTE_29, Route29, 0, 0, 9, CHERRYGROVE_CITY
-
-	map_header_2 VioletCity, VIOLET_CITY, $5, SOUTH | WEST | EAST
-	connection south, ROUTE_32, Route32, 0, 0, 10, VIOLET_CITY
-	connection west, ROUTE_36, Route36, 0, 0, 9, VIOLET_CITY
-	connection east, ROUTE_31, Route31, 9, 0, 9, VIOLET_CITY
-
-	map_header_2 AzaleaTown, AZALEA_TOWN, $5, WEST | EAST
-	connection west, ROUTE_34, Route34, -3, 15, 12, AZALEA_TOWN
-	connection east, ROUTE_33, Route33, 0, 0, 9, AZALEA_TOWN
-
-	map_header_2 CianwoodCity, CIANWOOD_CITY, $35, EAST
-	connection east, ROUTE_41, Route41, 0, 0, 27, CIANWOOD_CITY
-
-	map_header_2 GoldenrodCity, GOLDENROD_CITY, $35, NORTH | SOUTH
-	connection north, ROUTE_35, Route35, 5, 0, 10, GOLDENROD_CITY
-	connection south, ROUTE_34, Route34, 5, 0, 10, GOLDENROD_CITY
-
-	map_header_2 OlivineCity, OLIVINE_CITY, $35, NORTH | WEST
-	connection north, ROUTE_39, Route39, 5, 0, 10, OLIVINE_CITY
-	connection west, ROUTE_40, Route40, 9, 0, 12, OLIVINE_CITY
-
-	map_header_2 EcruteakCity, ECRUTEAK_CITY, $5, SOUTH | WEST | EAST
-	connection south, ROUTE_37, Route37, 5, 0, 10, ECRUTEAK_CITY
-	connection west, ROUTE_38, Route38, 5, 0, 9, ECRUTEAK_CITY
-	connection east, ROUTE_42, Route42, 9, 0, 9, ECRUTEAK_CITY
-
-	map_header_2 MahoganyTown, MAHOGANY_TOWN, $71, NORTH | WEST | EAST
-	connection north, ROUTE_43, Route43, 0, 0, 10, MAHOGANY_TOWN
-	connection west, ROUTE_42, Route42, 0, 0, 9, MAHOGANY_TOWN
-	connection east, ROUTE_44, Route44, 0, 0, 9, MAHOGANY_TOWN
-
-	map_header_2 LakeOfRage, LAKE_OF_RAGE, $5, SOUTH
-	connection south, ROUTE_43, Route43, 5, 0, 10, LAKE_OF_RAGE
-
-	map_header_2 BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST
-	connection south, ROUTE_45, Route45, 0, 0, 10, BLACKTHORN_CITY
-	connection west, ROUTE_44, Route44, 9, 0, 9, BLACKTHORN_CITY
-
-	map_header_2 SilverCaveOutside, SILVER_CAVE_OUTSIDE, $2c, EAST
-	connection east, ROUTE_28, Route28, 9, 0, 9, SILVER_CAVE_OUTSIDE
-
-	map_header_2 Route26, ROUTE_26, $5, WEST
-	connection west, ROUTE_27, Route27, 45, 0, 9, ROUTE_26
-
-	map_header_2 Route27, ROUTE_27, $35, WEST | EAST
-	connection west, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_27
-	connection east, ROUTE_26, Route26, -3, 42, 12, ROUTE_27
-
-	map_header_2 Route28, ROUTE_28, $2c, WEST
-	connection west, SILVER_CAVE_OUTSIDE, SilverCaveOutside, -3, 6, 12, ROUTE_28
-
-	map_header_2 Route29, ROUTE_29, $5, NORTH | WEST | EAST
-	connection north, ROUTE_46, Route46, 10, 0, 10, ROUTE_29
-	connection west, CHERRYGROVE_CITY, CherrygroveCity, 0, 0, 9, ROUTE_29
-	connection east, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_29
-
-	map_header_2 Route30, ROUTE_30, $5, NORTH | SOUTH
-	connection north, ROUTE_31, Route31, -3, 7, 13, ROUTE_30
-	connection south, CHERRYGROVE_CITY, CherrygroveCity, -3, 2, 16, ROUTE_30
-
-	map_header_2 Route31, ROUTE_31, $5, SOUTH | WEST
-	connection south, ROUTE_30, Route30, 10, 0, 10, ROUTE_31
-	connection west, VIOLET_CITY, VioletCity, -3, 6, 12, ROUTE_31
-
-	map_header_2 Route32, ROUTE_32, $5, NORTH | SOUTH
-	connection north, VIOLET_CITY, VioletCity, 0, 0, 13, ROUTE_32
-	connection south, ROUTE_33, Route33, 0, 0, 10, ROUTE_32
-
-	map_header_2 Route33, ROUTE_33, $5, NORTH | WEST
-	connection north, ROUTE_32, Route32, 0, 0, 10, ROUTE_33
-	connection west, AZALEA_TOWN, AzaleaTown, 0, 0, 9, ROUTE_33
-
-	map_header_2 Route34, ROUTE_34, $5, NORTH | EAST
-	connection north, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_34
-	connection east, AZALEA_TOWN, AzaleaTown, 18, 0, 9, ROUTE_34
-
-	map_header_2 Route35, ROUTE_35, $5, NORTH | SOUTH
-	connection north, ROUTE_36, Route36, 0, 0, 13, ROUTE_35
-	connection south, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_35
-
-	map_header_2 Route36, ROUTE_36, $5, NORTH | SOUTH | EAST
-	connection north, ROUTE_37, Route37, 10, 0, 10, ROUTE_36
-	connection south, ROUTE_35, Route35, 0, 0, 10, ROUTE_36
-	connection east, VIOLET_CITY, VioletCity, 0, 0, 12, ROUTE_36
-
-	map_header_2 Route37, ROUTE_37, $5, NORTH | SOUTH
-	connection north, ECRUTEAK_CITY, EcruteakCity, -3, 2, 16, ROUTE_37
-	connection south, ROUTE_36, Route36, -3, 7, 16, ROUTE_37
-
-	map_header_2 Route38, ROUTE_38, $5, WEST | EAST
-	connection west, ROUTE_39, Route39, 0, 0, 12, ROUTE_38
-	connection east, ECRUTEAK_CITY, EcruteakCity, -3, 2, 15, ROUTE_38
-
-	map_header_2 Route39, ROUTE_39, $5, SOUTH | EAST
-	connection south, OLIVINE_CITY, OlivineCity, -3, 2, 16, ROUTE_39
-	connection east, ROUTE_38, Route38, 0, 0, 9, ROUTE_39
-
-	map_header_2 Route40, ROUTE_40, $35, SOUTH | EAST
-	connection south, ROUTE_41, Route41, -3, 12, 13, ROUTE_40
-	connection east, OLIVINE_CITY, OlivineCity, -3, 6, 12, ROUTE_40
-
-	map_header_2 Route41, ROUTE_41, $35, NORTH | WEST
-	connection north, ROUTE_40, Route40, 15, 0, 10, ROUTE_41
-	connection west, CIANWOOD_CITY, CianwoodCity, 0, 0, 27, ROUTE_41
-
-	map_header_2 Route42, ROUTE_42, $5, WEST | EAST
-	connection west, ECRUTEAK_CITY, EcruteakCity, -3, 6, 12, ROUTE_42
-	connection east, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_42
-
-	map_header_2 Route43, ROUTE_43, $5, NORTH | SOUTH
-	connection north, LAKE_OF_RAGE, LakeOfRage, -3, 2, 16, ROUTE_43
-	connection south, MAHOGANY_TOWN, MahoganyTown, 0, 0, 10, ROUTE_43
-
-	map_header_2 Route44, ROUTE_44, $71, WEST | EAST
-	connection west, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_44
-	connection east, BLACKTHORN_CITY, BlackthornCity, -3, 6, 12, ROUTE_44
-
-	map_header_2 Route45, ROUTE_45, $71, NORTH | WEST
-	connection north, BLACKTHORN_CITY, BlackthornCity, 0, 0, 13, ROUTE_45
-	connection west, ROUTE_46, Route46, 36, 0, 12, ROUTE_45
-
-	map_header_2 Route46, ROUTE_46, $5, SOUTH | EAST
-	connection south, ROUTE_29, Route29, -3, 7, 16, ROUTE_46
-	connection east, ROUTE_45, Route45, -3, 33, 12, ROUTE_46
-
-	map_header_2 PewterCity, PEWTER_CITY, $f, SOUTH | EAST
-	connection south, ROUTE_2, Route2, 5, 0, 10, PEWTER_CITY
-	connection east, ROUTE_3, Route3, 5, 0, 9, PEWTER_CITY
-
-	map_header_2 Route2, ROUTE_2, $f, NORTH | SOUTH
-	connection north, PEWTER_CITY, PewterCity, -3, 2, 16, ROUTE_2
-	connection south, VIRIDIAN_CITY, ViridianCity, -3, 2, 16, ROUTE_2
-
-	map_header_2 ViridianCity, VIRIDIAN_CITY, $f, NORTH | SOUTH | WEST
-	connection north, ROUTE_2, Route2, 5, 0, 10, VIRIDIAN_CITY
-	connection south, ROUTE_1, Route1, 10, 0, 10, VIRIDIAN_CITY
-	connection west, ROUTE_22, Route22, 4, 0, 9, VIRIDIAN_CITY
-
-	map_header_2 Route22, ROUTE_22, $2c, EAST
-	connection east, VIRIDIAN_CITY, ViridianCity, -3, 1, 15, ROUTE_22
-
-	map_header_2 Route1, ROUTE_1, $f, NORTH | SOUTH
-	connection north, VIRIDIAN_CITY, ViridianCity, -3, 7, 13, ROUTE_1
-	connection south, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_1
-
-	map_header_2 PalletTown, PALLET_TOWN, $f, NORTH | SOUTH
-	connection north, ROUTE_1, Route1, 0, 0, 10, PALLET_TOWN
-	connection south, ROUTE_21, Route21, 0, 0, 10, PALLET_TOWN
-
-	map_header_2 Route21, ROUTE_21, $43, NORTH | SOUTH
-	connection north, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_21
-	connection south, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 10, ROUTE_21
-
-	map_header_2 CinnabarIsland, CINNABAR_ISLAND, $43, NORTH | EAST
-	connection north, ROUTE_21, Route21, 0, 0, 10, CINNABAR_ISLAND
-	connection east, ROUTE_20, Route20, 0, 0, 9, CINNABAR_ISLAND
-
-	map_header_2 Route20, ROUTE_20, $43, WEST | EAST
-	connection west, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 9, ROUTE_20
-	connection east, ROUTE_19, Route19, -3, 6, 12, ROUTE_20
-
-	map_header_2 Route19, ROUTE_19, $43, NORTH | WEST
-	connection north, FUCHSIA_CITY, FuchsiaCity, 0, 0, 13, ROUTE_19
-	connection west, ROUTE_20, Route20, 9, 0, 9, ROUTE_19
-
-	map_header_2 FuchsiaCity, FUCHSIA_CITY, $f, SOUTH | WEST | EAST
-	connection south, ROUTE_19, Route19, 0, 0, 10, FUCHSIA_CITY
-	connection west, ROUTE_18, Route18, 7, 0, 9, FUCHSIA_CITY
-	connection east, ROUTE_15, Route15, 9, 0, 9, FUCHSIA_CITY
-
-	map_header_2 Route18, ROUTE_18, $43, WEST | EAST
-	connection west, ROUTE_17, Route17, -3, 35, 10, ROUTE_18
-	connection east, FUCHSIA_CITY, FuchsiaCity, -3, 4, 14, ROUTE_18
-
-	map_header_2 Route17, ROUTE_17, $43, NORTH | EAST
-	connection north, ROUTE_16, Route16, 0, 0, 10, ROUTE_17
-	connection east, ROUTE_18, Route18, 38, 0, 9, ROUTE_17
-
-	map_header_2 Route16, ROUTE_16, $f, SOUTH | EAST
-	connection south, ROUTE_17, Route17, 0, 0, 10, ROUTE_16
-	connection east, CELADON_CITY, CeladonCity, -3, 6, 12, ROUTE_16
-
-	map_header_2 CeladonCity, CELADON_CITY, $f, WEST | EAST
-	connection west, ROUTE_16, Route16, 9, 0, 9, CELADON_CITY
-	connection east, ROUTE_7, Route7, 5, 0, 9, CELADON_CITY
-
-	map_header_2 Route7, ROUTE_7, $f, WEST | EAST
-	connection west, CELADON_CITY, CeladonCity, -3, 2, 15, ROUTE_7
-	connection east, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_7
-
-	map_header_2 Route15, ROUTE_15, $f, WEST | EAST
-	connection west, FUCHSIA_CITY, FuchsiaCity, -3, 6, 12, ROUTE_15
-	connection east, ROUTE_14, Route14, -3, 6, 12, ROUTE_15
-
-	map_header_2 Route14, ROUTE_14, $43, NORTH | WEST
-	connection north, ROUTE_13, Route13, 0, 0, 13, ROUTE_14
-	connection west, ROUTE_15, Route15, 9, 0, 9, ROUTE_14
-
-	map_header_2 Route13, ROUTE_13, $43, NORTH | SOUTH
-	connection north, ROUTE_12, Route12, 20, 0, 10, ROUTE_13
-	connection south, ROUTE_14, Route14, 0, 0, 10, ROUTE_13
-
-	map_header_2 Route12, ROUTE_12, $43, NORTH | SOUTH | WEST
-	connection north, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_12
-	connection south, ROUTE_13, Route13, -3, 17, 13, ROUTE_12
-	connection west, ROUTE_11, Route11, 9, 0, 9, ROUTE_12
-
-	map_header_2 Route11, ROUTE_11, $f, WEST | EAST
-	connection west, VERMILION_CITY, VermilionCity, 0, 0, 12, ROUTE_11
-	connection east, ROUTE_12, Route12, -3, 6, 15, ROUTE_11
-
-	map_header_2 LavenderTown, LAVENDER_TOWN, $2c, NORTH | SOUTH | WEST
-	connection north, ROUTE_10_SOUTH, Route10South, 0, 0, 10, LAVENDER_TOWN
-	connection south, ROUTE_12, Route12, 0, 0, 10, LAVENDER_TOWN
-	connection west, ROUTE_8, Route8, 0, 0, 9, LAVENDER_TOWN
-
-	map_header_2 VermilionCity, VERMILION_CITY, $43, NORTH | EAST
-	connection north, ROUTE_6, Route6, 5, 0, 10, VERMILION_CITY
-	connection east, ROUTE_11, Route11, 0, 0, 9, VERMILION_CITY
-
-	map_header_2 Route6, ROUTE_6, $f, NORTH | SOUTH
-	connection north, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_6
-	connection south, VERMILION_CITY, VermilionCity, -3, 2, 16, ROUTE_6
-
-	map_header_2 SaffronCity, SAFFRON_CITY, $f, NORTH | SOUTH | WEST | EAST
-	connection north, ROUTE_5, Route5, 5, 0, 10, SAFFRON_CITY
-	connection south, ROUTE_6, Route6, 5, 0, 10, SAFFRON_CITY
-	connection west, ROUTE_7, Route7, 9, 0, 9, SAFFRON_CITY
-	connection east, ROUTE_8, Route8, 9, 0, 9, SAFFRON_CITY
-
-	map_header_2 Route5, ROUTE_5, $f, NORTH | SOUTH
-	connection north, CERULEAN_CITY, CeruleanCity, -3, 2, 16, ROUTE_5
-	connection south, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_5
-
-	map_header_2 CeruleanCity, CERULEAN_CITY, $f, NORTH | SOUTH | WEST | EAST
-	connection north, ROUTE_24, Route24, 6, 0, 10, CERULEAN_CITY
-	connection south, ROUTE_5, Route5, 5, 0, 10, CERULEAN_CITY
-	connection west, ROUTE_4, Route4, 5, 0, 9, CERULEAN_CITY
-	connection east, ROUTE_9, Route9, 9, 0, 9, CERULEAN_CITY
-
-	map_header_2 Route9, ROUTE_9, $2c, SOUTH | WEST
-	connection south, ROUTE_10_NORTH, Route10North, 20, 0, 10, ROUTE_9
-	connection west, CERULEAN_CITY, CeruleanCity, -3, 6, 12, ROUTE_9
-
-	map_header_2 Route24, ROUTE_24, $2c, NORTH | SOUTH
-	connection north, ROUTE_25, Route25, 0, 0, 13, ROUTE_24
-	connection south, CERULEAN_CITY, CeruleanCity, -3, 3, 16, ROUTE_24
-
-	map_header_2 Route25, ROUTE_25, $2c, SOUTH
-	connection south, ROUTE_24, Route24, 0, 0, 10, ROUTE_25
-
-	map_header_2 Route3, ROUTE_3, $2c, WEST | EAST
-	connection west, PEWTER_CITY, PewterCity, -3, 2, 15, ROUTE_3
-	connection east, ROUTE_4, Route4, 0, 0, 9, ROUTE_3
-
-	map_header_2 Route4, ROUTE_4, $2c, WEST | EAST
-	connection west, ROUTE_3, Route3, 0, 0, 9, ROUTE_4
-	connection east, CERULEAN_CITY, CeruleanCity, -3, 2, 15, ROUTE_4
-
-	map_header_2 Route8, ROUTE_8, $2c, WEST | EAST
-	connection west, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_8
-	connection east, LAVENDER_TOWN, LavenderTown, 0, 0, 9, ROUTE_8
-
-	map_header_2 Route10North, ROUTE_10_NORTH, $2c, NORTH | SOUTH
-	connection north, ROUTE_9, Route9, -3, 17, 13, ROUTE_10_NORTH
-	connection south, ROUTE_10_SOUTH, Route10South, 0, 0, 10, ROUTE_10_NORTH
-
-	map_header_2 Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH
-	connection north, ROUTE_10_NORTH, Route10North, 0, 0, 10, ROUTE_10_SOUTH
-	connection south, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_10_SOUTH
-
-	map_header_2 Route23, ROUTE_23, $f, 0
-	map_header_2 SproutTower1F, SPROUT_TOWER_1F, $0, 0
-	map_header_2 SproutTower2F, SPROUT_TOWER_2F, $0, 0
-	map_header_2 SproutTower3F, SPROUT_TOWER_3F, $0, 0
-	map_header_2 TinTower1F, TIN_TOWER_1F, $0, 0
-	map_header_2 TinTower2F, TIN_TOWER_2F, $0, 0
-	map_header_2 TinTower3F, TIN_TOWER_3F, $0, 0
-	map_header_2 TinTower4F, TIN_TOWER_4F, $0, 0
-	map_header_2 TinTower5F, TIN_TOWER_5F, $0, 0
-	map_header_2 TinTower6F, TIN_TOWER_6F, $0, 0
-	map_header_2 TinTower7F, TIN_TOWER_7F, $0, 0
-	map_header_2 TinTower8F, TIN_TOWER_8F, $0, 0
-	map_header_2 TinTower9F, TIN_TOWER_9F, $0, 0
-	map_header_2 BurnedTower1F, BURNED_TOWER_1F, $0, 0
-	map_header_2 BurnedTowerB1F, BURNED_TOWER_B1F, $9, 0
-	map_header_2 NationalPark, NATIONAL_PARK, $0, 0
-	map_header_2 NationalParkBugContest, NATIONAL_PARK_BUG_CONTEST, $0, 0
-	map_header_2 RadioTower1F, RADIO_TOWER_1F, $0, 0
-	map_header_2 RadioTower2F, RADIO_TOWER_2F, $0, 0
-	map_header_2 RadioTower3F, RADIO_TOWER_3F, $0, 0
-	map_header_2 RadioTower4F, RADIO_TOWER_4F, $0, 0
-	map_header_2 RadioTower5F, RADIO_TOWER_5F, $0, 0
-	map_header_2 RuinsOfAlphOutside, RUINS_OF_ALPH_OUTSIDE, $5, 0
-	map_header_2 RuinsOfAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $0, 0
-	map_header_2 RuinsOfAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $0, 0
-	map_header_2 RuinsOfAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $0, 0
-	map_header_2 RuinsOfAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $0, 0
-	map_header_2 RuinsOfAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $0, 0
-	map_header_2 RuinsOfAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $0, 0
-	map_header_2 RuinsOfAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $0, 0
-	map_header_2 RuinsOfAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $0, 0
-	map_header_2 RuinsOfAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $0, 0
-	map_header_2 RuinsOfAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $0, 0
-	map_header_2 RuinsOfAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $0, 0
-	map_header_2 RuinsOfAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $0, 0
-	map_header_2 RuinsOfAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $0, 0
-	map_header_2 RuinsOfAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $0, 0
-	map_header_2 UnionCave1F, UNION_CAVE_1F, $9, 0
-	map_header_2 UnionCaveB1F, UNION_CAVE_B1F, $9, 0
-	map_header_2 UnionCaveB2F, UNION_CAVE_B2F, $9, 0
-	map_header_2 SlowpokeWellB1F, SLOWPOKE_WELL_B1F, $9, 0
-	map_header_2 SlowpokeWellB2F, SLOWPOKE_WELL_B2F, $9, 0
-	map_header_2 OlivineLighthouse1F, OLIVINE_LIGHTHOUSE_1F, $0, 0
-	map_header_2 OlivineLighthouse2F, OLIVINE_LIGHTHOUSE_2F, $0, 0
-	map_header_2 OlivineLighthouse3F, OLIVINE_LIGHTHOUSE_3F, $0, 0
-	map_header_2 OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $0, 0
-	map_header_2 OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $0, 0
-	map_header_2 OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $0, 0
-	map_header_2 MahoganyMart1F, MAHOGANY_MART_1F, $0, 0
-	map_header_2 TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $0, 0
-	map_header_2 TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $0, 0
-	map_header_2 TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $0, 0
-	map_header_2 IlexForest, ILEX_FOREST, $5, 0
-	map_header_2 GoldenrodUnderground, GOLDENROD_UNDERGROUND, $0, 0
-	map_header_2 GoldenrodUndergroundSwitchRoomEntrances, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, $0, 0
-	map_header_2 GoldenrodDeptStoreB1F, GOLDENROD_DEPT_STORE_B1F, $0, 0
-	map_header_2 GoldenrodUndergroundWarehouse, GOLDENROD_UNDERGROUND_WAREHOUSE, $0, 0
-	map_header_2 MountMortar1FOutside, MOUNT_MORTAR_1F_OUTSIDE, $9, 0
-	map_header_2 MountMortar1FInside, MOUNT_MORTAR_1F_INSIDE, $9, 0
-	map_header_2 MountMortar2FInside, MOUNT_MORTAR_2F_INSIDE, $9, 0
-	map_header_2 MountMortarB1F, MOUNT_MORTAR_B1F, $9, 0
-	map_header_2 IcePath1F, ICE_PATH_1F, $9, 0
-	map_header_2 IcePathB1F, ICE_PATH_B1F, $19, 0
-	map_header_2 IcePathB2FMahoganySide, ICE_PATH_B2F_MAHOGANY_SIDE, $19, 0
-	map_header_2 IcePathB2FBlackthornSide, ICE_PATH_B2F_BLACKTHORN_SIDE, $19, 0
-	map_header_2 IcePathB3F, ICE_PATH_B3F, $19, 0
-	map_header_2 WhirlIslandNW, WHIRL_ISLAND_NW, $9, 0
-	map_header_2 WhirlIslandNE, WHIRL_ISLAND_NE, $9, 0
-	map_header_2 WhirlIslandSW, WHIRL_ISLAND_SW, $9, 0
-	map_header_2 WhirlIslandCave, WHIRL_ISLAND_CAVE, $9, 0
-	map_header_2 WhirlIslandSE, WHIRL_ISLAND_SE, $f, 0
-	map_header_2 WhirlIslandB1F, WHIRL_ISLAND_B1F, $9, 0
-	map_header_2 WhirlIslandB2F, WHIRL_ISLAND_B2F, $2e, 0
-	map_header_2 WhirlIslandLugiaChamber, WHIRL_ISLAND_LUGIA_CHAMBER, $f, 0
-	map_header_2 SilverCaveRoom1, SILVER_CAVE_ROOM_1, $9, 0
-	map_header_2 SilverCaveRoom2, SILVER_CAVE_ROOM_2, $9, 0
-	map_header_2 SilverCaveRoom3, SILVER_CAVE_ROOM_3, $9, 0
-	map_header_2 SilverCaveItemRooms, SILVER_CAVE_ITEM_ROOMS, $9, 0
-	map_header_2 DarkCaveVioletEntrance, DARK_CAVE_VIOLET_ENTRANCE, $9, 0
-	map_header_2 DarkCaveBlackthornEntrance, DARK_CAVE_BLACKTHORN_ENTRANCE, $9, 0
-	map_header_2 DragonsDen1F, DRAGONS_DEN_1F, $9, 0
-	map_header_2 DragonsDenB1F, DRAGONS_DEN_B1F, $71, 0
-	map_header_2 DragonShrine, DRAGON_SHRINE, $0, 0
-	map_header_2 TohjoFalls, TOHJO_FALLS, $9, 0
-	map_header_2 OlivinePokecenter1F, OLIVINE_POKECENTER_1F, $0, 0
-	map_header_2 OlivineGym, OLIVINE_GYM, $0, 0
-	map_header_2 OlivineTimsHouse, OLIVINE_TIMS_HOUSE, $0, 0
-	map_header_2 OlivineHouseBeta, OLIVINE_HOUSE_BETA, $0, 0
-	map_header_2 OlivinePunishmentSpeechHouse, OLIVINE_PUNISHMENT_SPEECH_HOUSE, $0, 0
-	map_header_2 OlivineGoodRodHouse, OLIVINE_GOOD_ROD_HOUSE, $0, 0
-	map_header_2 OlivineCafe, OLIVINE_CAFE, $0, 0
-	map_header_2 OlivineMart, OLIVINE_MART, $0, 0
-	map_header_2 Route38EcruteakGate, ROUTE_38_ECRUTEAK_GATE, $0, 0
-	map_header_2 Route39Barn, ROUTE_39_BARN, $0, 0
-	map_header_2 Route39Farmhouse, ROUTE_39_FARMHOUSE, $0, 0
-	map_header_2 MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $0, 0
-	map_header_2 MahoganyGym, MAHOGANY_GYM, $0, 0
-	map_header_2 MahoganyPokecenter1F, MAHOGANY_POKECENTER_1F, $0, 0
-	map_header_2 Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $0, 0
-	map_header_2 DiglettsCave, DIGLETTS_CAVE, $9, 0
-	map_header_2 MountMoon, MOUNT_MOON, $9, 0
-	map_header_2 UndergroundPath, UNDERGROUND_PATH, $0, 0
-	map_header_2 RockTunnel1F, ROCK_TUNNEL_1F, $9, 0
-	map_header_2 RockTunnelB1F, ROCK_TUNNEL_B1F, $9, 0
-	map_header_2 SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $0, 0
-	map_header_2 SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0
-	map_header_2 VictoryRoad, VICTORY_ROAD, $1d, 0
-	map_header_2 EcruteakHouse, ECRUTEAK_HOUSE, $0, 0
-	map_header_2 WiseTriosRoom, WISE_TRIOS_ROOM, $0, 0
-	map_header_2 EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $0, 0
-	map_header_2 EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $0, 0
-	map_header_2 DanceTheatre, DANCE_THEATRE, $0, 0
-	map_header_2 EcruteakMart, ECRUTEAK_MART, $0, 0
-	map_header_2 EcruteakGym, ECRUTEAK_GYM, $0, 0
-	map_header_2 EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $0, 0
-	map_header_2 BlackthornGym1F, BLACKTHORN_GYM_1F, $0, 0
-	map_header_2 BlackthornGym2F, BLACKTHORN_GYM_2F, $0, 0
-	map_header_2 BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $0, 0
-	map_header_2 BlackthornEmysHouse, BLACKTHORN_EMYS_HOUSE, $0, 0
-	map_header_2 BlackthornMart, BLACKTHORN_MART, $0, 0
-	map_header_2 BlackthornPokecenter1F, BLACKTHORN_POKECENTER_1F, $0, 0
-	map_header_2 MoveDeletersHouse, MOVE_DELETERS_HOUSE, $0, 0
-	map_header_2 CinnabarPokecenter1F, CINNABAR_POKECENTER_1F, $0, 0
-	map_header_2 CinnabarPokecenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $0, 0
-	map_header_2 Route19FuchsiaGate, ROUTE_19___FUCHSIA_GATE, $0, 0
-	map_header_2 SeafoamGym, SEAFOAM_GYM, $9, 0
-	map_header_2 CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $0, 0
-	map_header_2 CeruleanPoliceStation, CERULEAN_POLICE_STATION, $0, 0
-	map_header_2 CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $0, 0
-	map_header_2 CeruleanPokecenter1F, CERULEAN_POKECENTER_1F, $0, 0
-	map_header_2 CeruleanPokecenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $0, 0
-	map_header_2 CeruleanGym, CERULEAN_GYM, $0, 0
-	map_header_2 CeruleanMart, CERULEAN_MART, $0, 0
-	map_header_2 Route10Pokecenter1F, ROUTE_10_POKECENTER_1F, $0, 0
-	map_header_2 Route10Pokecenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $0, 0
-	map_header_2 PowerPlant, POWER_PLANT, $0, 0
-	map_header_2 BillsHouse, BILLS_HOUSE, $0, 0
-	map_header_2 AzaleaPokecenter1F, AZALEA_POKECENTER_1F, $0, 0
-	map_header_2 CharcoalKiln, CHARCOAL_KILN, $0, 0
-	map_header_2 AzaleaMart, AZALEA_MART, $0, 0
-	map_header_2 KurtsHouse, KURTS_HOUSE, $0, 0
-	map_header_2 AzaleaGym, AZALEA_GYM, $0, 0
-	map_header_2 LakeOfRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $0, 0
-	map_header_2 LakeOfRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $0, 0
-	map_header_2 Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $0, 0
-	map_header_2 Route43Gate, ROUTE_43_GATE, $0, 0
-	map_header_2 VioletMart, VIOLET_MART, $0, 0
-	map_header_2 VioletGym, VIOLET_GYM, $0, 0
-	map_header_2 EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $0, 0
-	map_header_2 VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $0, 0
-	map_header_2 VioletPokecenter1F, VIOLET_POKECENTER_1F, $0, 0
-	map_header_2 VioletKylesHouse, VIOLET_KYLES_HOUSE, $0, 0
-	map_header_2 Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $0, 0
-	map_header_2 Route32Pokecenter1F, ROUTE_32_POKECENTER_1F, $0, 0
-	map_header_2 Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $0, 0
-	map_header_2 Route35NationalParkGate, ROUTE_35_NATIONAL_PARK_GATE, $0, 0
-	map_header_2 Route36RuinsOfAlphGate, ROUTE_36_RUINS_OF_ALPH_GATE, $0, 0
-	map_header_2 Route36NationalParkGate, ROUTE_36_NATIONAL_PARK_GATE, $0, 0
-	map_header_2 GoldenrodGym, GOLDENROD_GYM, $0, 0
-	map_header_2 GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $0, 0
-	map_header_2 GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $0, 0
-	map_header_2 GoldenrodBillsHouse, GOLDENROD_BILLS_HOUSE, $0, 0
-	map_header_2 GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $0, 0
-	map_header_2 GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $0, 0
-	map_header_2 GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $0, 0
-	map_header_2 GoldenrodNameRater, GOLDENROD_NAME_RATER, $0, 0
-	map_header_2 GoldenrodDeptStore1F, GOLDENROD_DEPT_STORE_1F, $0, 0
-	map_header_2 GoldenrodDeptStore2F, GOLDENROD_DEPT_STORE_2F, $0, 0
-	map_header_2 GoldenrodDeptStore3F, GOLDENROD_DEPT_STORE_3F, $0, 0
-	map_header_2 GoldenrodDeptStore4F, GOLDENROD_DEPT_STORE_4F, $0, 0
-	map_header_2 GoldenrodDeptStore5F, GOLDENROD_DEPT_STORE_5F, $0, 0
-	map_header_2 GoldenrodDeptStore6F, GOLDENROD_DEPT_STORE_6F, $0, 0
-	map_header_2 GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $0, 0
-	map_header_2 GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0
-	map_header_2 GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $0, 0
-	map_header_2 GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $0, 0
-	map_header_2 GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $0, 0
-	map_header_2 IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $0, 0
-	map_header_2 Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $0, 0
-	map_header_2 DayCare, DAY_CARE, $0, 0
-	map_header_2 VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $0, 0
-	map_header_2 VermilionPokecenter1F, VERMILION_POKECENTER_1F, $0, 0
-	map_header_2 VermilionPokecenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, 0
-	map_header_2 PokemonFanClub, POKEMON_FAN_CLUB, $0, 0
-	map_header_2 VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $0, 0
-	map_header_2 VermilionMart, VERMILION_MART, $0, 0
-	map_header_2 VermilionHouseDiglettsCaveSpeechHouse, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, $0, 0
-	map_header_2 VermilionGym, VERMILION_GYM, $0, 0
-	map_header_2 Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $0, 0
-	map_header_2 Route6UndergroundPathEntrance, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, $0, 0
-	map_header_2 RedsHouse1F, REDS_HOUSE_1F, $0, 0
-	map_header_2 RedsHouse2F, REDS_HOUSE_2F, $0, 0
-	map_header_2 BluesHouse, BLUES_HOUSE, $0, 0
-	map_header_2 OaksLab, OAKS_LAB, $0, 0
-	map_header_2 PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $0, 0
-	map_header_2 PewterGym, PEWTER_GYM, $0, 0
-	map_header_2 PewterMart, PEWTER_MART, $0, 0
-	map_header_2 PewterPokecenter1F, PEWTER_POKECENTER_1F, $0, 0
-	map_header_2 PewterPokecenter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, 0
-	map_header_2 PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $0, 0
-	map_header_2 OlivinePort, OLIVINE_PORT, $a, 0
-	map_header_2 VermilionPort, VERMILION_PORT, $a, 0
-	map_header_2 FastShip1F, FAST_SHIP_1F, $0, 0
-	map_header_2 FastShipCabins_NNW_NNE_NE, FAST_SHIP_CABINS_NNW_NNE_NE, $0, 0
-	map_header_2 FastShipCabins_SW_SSW_NW, FAST_SHIP_CABINS_SW_SSW_NW, $0, 0
-	map_header_2 FastShipCabins_SE_SSE_CaptainsCabin, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, $0, 0
-	map_header_2 FastShipB1F, FAST_SHIP_B1F, $0, 0
-	map_header_2 OlivinePortPassage, OLIVINE_PORT_PASSAGE, $0, 0
-	map_header_2 VermilionPortPassage, VERMILION_PORT_PASSAGE, $0, 0
-	map_header_2 MountMoonSquare, MOUNT_MOON_SQUARE, $2d, 0
-	map_header_2 MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $0, 0
-	map_header_2 TinTowerRoof, TIN_TOWER_ROOF, $0, 0
-	map_header_2 IndigoPlateauPokecenter1F, INDIGO_PLATEAU_POKECENTER_1F, $0, 0
-	map_header_2 WillsRoom, WILLS_ROOM, $0, 0
-	map_header_2 KogasRoom, KOGAS_ROOM, $0, 0
-	map_header_2 BrunosRoom, BRUNOS_ROOM, $0, 0
-	map_header_2 KarensRoom, KARENS_ROOM, $0, 0
-	map_header_2 LancesRoom, LANCES_ROOM, $0, 0
-	map_header_2 HallOfFame, HALL_OF_FAME, $0, 0
-	map_header_2 FuchsiaMart, FUCHSIA_MART, $0, 0
-	map_header_2 SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $0, 0
-	map_header_2 FuchsiaGym, FUCHSIA_GYM, $0, 0
-	map_header_2 FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $0, 0
-	map_header_2 FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $0, 0
-	map_header_2 FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $0, 0
-	map_header_2 SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $0, 0
-	map_header_2 Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $0, 0
-	map_header_2 LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $0, 0
-	map_header_2 LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $0, 0
-	map_header_2 MrFujisHouse, MR_FUJIS_HOUSE, $0, 0
-	map_header_2 LavenderSpeechHouse, LAVENDER_SPEECH_HOUSE, $0, 0
-	map_header_2 LavenderNameRater, LAVENDER_NAME_RATER, $0, 0
-	map_header_2 LavenderMart, LAVENDER_MART, $0, 0
-	map_header_2 SoulHouse, SOUL_HOUSE, $0, 0
-	map_header_2 LavRadioTower1F, LAV_RADIO_TOWER_1F, $0, 0
-	map_header_2 Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $0, 0
-	map_header_2 Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $0, 0
-	map_header_2 SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $0, 0
-	map_header_2 Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $0, 0
-	map_header_2 Pokecenter2F, POKECENTER_2F, $0, 0
-	map_header_2 TradeCenter, TRADE_CENTER, $0, 0
-	map_header_2 Colosseum, COLOSSEUM, $0, 0
-	map_header_2 TimeCapsule, TIME_CAPSULE, $0, 0
-	map_header_2 MobileTradeRoomMobile, MOBILE_TRADE_ROOM_MOBILE, $0, 0
-	map_header_2 MobileBattleRoom, MOBILE_BATTLE_ROOM, $0, 0
-	map_header_2 CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $0, 0
-	map_header_2 CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $0, 0
-	map_header_2 CeladonDeptStore3F, CELADON_DEPT_STORE_3F, $0, 0
-	map_header_2 CeladonDeptStore4F, CELADON_DEPT_STORE_4F, $0, 0
-	map_header_2 CeladonDeptStore5F, CELADON_DEPT_STORE_5F, $0, 0
-	map_header_2 CeladonDeptStore6F, CELADON_DEPT_STORE_6F, $0, 0
-	map_header_2 CeladonDeptStoreElevator, CELADON_DEPT_STORE_ELEVATOR, $0, 0
-	map_header_2 CeladonMansion1F, CELADON_MANSION_1F, $0, 0
-	map_header_2 CeladonMansion2F, CELADON_MANSION_2F, $0, 0
-	map_header_2 CeladonMansion3F, CELADON_MANSION_3F, $0, 0
-	map_header_2 CeladonMansionRoof, CELADON_MANSION_ROOF, $1, 0
-	map_header_2 CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $0, 0
-	map_header_2 CeladonPokecenter1F, CELADON_POKECENTER_1F, $0, 0
-	map_header_2 CeladonPokecenter2FBeta, CELADON_POKECENTER_2F_BETA, $0, 0
-	map_header_2 CeladonGameCorner, CELADON_GAME_CORNER, $0, 0
-	map_header_2 CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $0, 0
-	map_header_2 CeladonGym, CELADON_GYM, $0, 0
-	map_header_2 CeladonCafe, CELADON_CAFE, $0, 0
-	map_header_2 Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $0, 0
-	map_header_2 Route16Gate, ROUTE_16_GATE, $0, 0
-	map_header_2 Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $0, 0
-	map_header_2 Route17Route18Gate, ROUTE_17_ROUTE_18_GATE, $0, 0
-	map_header_2 ManiasHouse, MANIAS_HOUSE, $0, 0
-	map_header_2 CianwoodGym, CIANWOOD_GYM, $0, 0
-	map_header_2 CianwoodPokecenter1F, CIANWOOD_POKECENTER_1F, $0, 0
-	map_header_2 CianwoodPharmacy, CIANWOOD_PHARMACY, $0, 0
-	map_header_2 CianwoodPhotoStudio, CIANWOOD_PHOTO_STUDIO, $0, 0
-	map_header_2 CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $0, 0
-	map_header_2 PokeSeersHouse, POKE_SEERS_HOUSE, $0, 0
-	map_header_2 BattleTower1F, BATTLE_TOWER_1F, $0, 0
-	map_header_2 BattleTowerBattleRoom, BATTLE_TOWER_BATTLE_ROOM, $0, 0
-	map_header_2 BattleTowerElevator, BATTLE_TOWER_ELEVATOR, $0, 0
-	map_header_2 BattleTowerHallway, BATTLE_TOWER_HALLWAY, $0, 0
-	map_header_2 Route40BattleTowerGate, ROUTE_40_BATTLE_TOWER_GATE, $0, 0
-	map_header_2 BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $5, 0
-	map_header_2 ViridianGym, VIRIDIAN_GYM, $0, 0
-	map_header_2 ViridianNicknameSpeechHouse, VIRIDIAN_NICKNAME_SPEECH_HOUSE, $0, 0
-	map_header_2 TrainerHouse1F, TRAINER_HOUSE_1F, $0, 0
-	map_header_2 TrainerHouseB1F, TRAINER_HOUSE_B1F, $0, 0
-	map_header_2 ViridianMart, VIRIDIAN_MART, $0, 0
-	map_header_2 ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $0, 0
-	map_header_2 ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $0, 0
-	map_header_2 Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $0, 0
-	map_header_2 Route2Gate, ROUTE_2_GATE, $0, 0
-	map_header_2 VictoryRoadGate, VICTORY_ROAD_GATE, $0, 0
-	map_header_2 ElmsLab, ELMS_LAB, $0, 0
-	map_header_2 KrissHouse1F, KRISS_HOUSE_1F, $0, 0
-	map_header_2 KrissHouse2F, KRISS_HOUSE_2F, $0, 0
-	map_header_2 KrissNeighborsHouse, KRISS_NEIGHBORS_HOUSE, $0, 0
-	map_header_2 ElmsHouse, ELMS_HOUSE, $0, 0
-	map_header_2 Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $0, 0
-	map_header_2 Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $0, 0
-	map_header_2 Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $0, 0
-	map_header_2 Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $0, 0
-	map_header_2 FightingDojo, FIGHTING_DOJO, $0, 0
-	map_header_2 SaffronGym, SAFFRON_GYM, $0, 0
-	map_header_2 SaffronMart, SAFFRON_MART, $0, 0
-	map_header_2 SaffronPokecenter1F, SAFFRON_POKECENTER_1F, $0, 0
-	map_header_2 SaffronPokecenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $0, 0
-	map_header_2 MrPsychicsHouse, MR_PSYCHICS_HOUSE, $0, 0
-	map_header_2 SaffronMagnetTrainStation, SAFFRON_MAGNET_TRAIN_STATION, $0, 0
-	map_header_2 SilphCo1F, SILPH_CO_1F, $0, 0
-	map_header_2 CopycatsHouse1F, COPYCATS_HOUSE_1F, $0, 0
-	map_header_2 CopycatsHouse2F, COPYCATS_HOUSE_2F, $0, 0
-	map_header_2 Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $0, 0
-	map_header_2 Route5SaffronGate, ROUTE_5_SAFFRON_GATE, $0, 0
-	map_header_2 Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $0, 0
-	map_header_2 CherrygroveMart, CHERRYGROVE_MART, $0, 0
-	map_header_2 CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $0, 0
-	map_header_2 CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $0, 0
-	map_header_2 GuideGentsHouse, GUIDE_GENTS_HOUSE, $0, 0
-	map_header_2 CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $0, 0
-	map_header_2 Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $0, 0
-	map_header_2 MrPokemonsHouse, MR_POKEMONS_HOUSE, $0, 0
-	map_header_2 Route31VioletGate, ROUTE_31_VIOLET_GATE, $0, 0

data/maps/maps.asm

@@ -1,10 +1,10 @@
 INCLUDE "constants.asm"
 
 
-SECTION "Map Headers", ROMX
+SECTION "Maps", ROMX
 
-INCLUDE "data/maps/map_headers.asm"
+INCLUDE "data/maps/map_defs.asm"
-INCLUDE "data/maps/map_headers_2.asm"
+INCLUDE "data/maps/map_data.asm"
 
 
 INCLUDE "data/maps/blocks.asm"

data/player_names.asm

@@ -1,4 +1,4 @@
-ChrisNameMenuHeader: ; 882b5
+ChrisNameMenuDataHeader: ; 882b5
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, TEXTBOX_Y - 1
 	dw .MaleNames
@@ -17,7 +17,7 @@ MalePlayerNameArray: ; 882c9
 	db 2 ; displacement
 	db " NAME @" ; title
 
-KrisNameMenuHeader: ; 882e5
+KrisNameMenuDataHeader: ; 882e5
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, TEXTBOX_Y - 1
 	dw .FemaleNames

docs/map_scripts.md

@@ -3,34 +3,39 @@
 
 ## `const_value set 2`
 
-- **`const` *`MAPNAME_OBJECTNAME`***
+<pre>
+	const <i>MAPNAME</i>_<i>OBJECTNAME</i>
+</pre>
 
 
-## `MapName_MapScriptHeader:`
+## `MapName_MapScripts:`
 
 
-## `.SceneScripts: db` *N*
+### `.SceneScripts: db` *N*
 
-- **`scene_script` *script***
+<pre>
+	scene_script <i>script</i>
+</pre>
 
 
-## `.MapCallbacks: db` *N*
+### `.MapCallbacks: db` *N*
 
-- **`callback` *type*, *script***
+<pre>
+	callback <i>type</i>, <i>script</i>
+</pre>
 
 Callback types:
 
-- **`MAPCALLBACK_NEWMAP`**
+- `MAPCALLBACK_NEWMAP`
 
-- **`MAPCALLBACK_TILES`**
+- `MAPCALLBACK_TILES`
 
-- **`MAPCALLBACK_OBJECTS`**
+- `MAPCALLBACK_OBJECTS`
 
-- **`MAPCALLBACK_SPRITES`**
+- `MAPCALLBACK_SPRITES`
 
-- **`MAPCALLBACK_CMDQUEUE`**
+- `MAPCALLBACK_CMDQUEUE`
 
-<!-- need pre tags here; can't use inline bold/italic formatting in Markdown code blocks -->
 <pre>
 	callback MAPCALLBACK_CMDQUEUE, .Boulders
 
@@ -62,7 +67,7 @@ Callback types:
 [Movement commands](movement_commands.md)
 
 
-## `MapName_MapEventHeader:`
+## `MapName_MapEvents:`
 
 ```asm
 	; filler
@@ -70,82 +75,98 @@ Callback types:
 ```
 
 
-## `.Warps: db` *N*
+### `.Warps: db` *N*
 
-- **`warp_def` *x*, *y*, *warp_id*, *map***
+<pre>
+	warp_def <i>x</i>, <i>y</i>, <i>warp_id</i>, <i>map</i>
+</pre>
 
 
-## `.CoordEvents: db` *N*
+### `.CoordEvents: db` *N*
 
-- **`coord_event` *x*, *y*, *scene_id*, *script***
+<pre>
+	coord_event <i>x</i>, <i>y</i>, <i>scene_id</i>, <i>script</i>
+</pre>
 
 
-## `.BGEvents: db` *N*
+### `.BGEvents: db` *N*
 
-- **`bg_event` *x*, *y*, *type*, *script***
+<pre>
+	bg_event <i>x</i>, <i>y</i>, <i>type</i>, <i>script</i>
+</pre>
 
 BG event types:
 
-- **`BGEVENT_READ`**
+- `BGEVENT_READ`
 
-- **`BGEVENT_UP/DOWN/LEFT/RIGHT`**
+- `BGEVENT_UP/DOWN/LEFT/RIGHT`
 
-- **`BGEVENT_IFSET/IFNOTSET`**
+- `BGEVENT_IFSET/IFNOTSET`
 
-  **`conditional_event` *event_flag*, *script***
+<pre>
+	conditional_event <i>event_flag</i>, <i>script</i>
+</pre>
 
-- **`BGEVENT_ITEM`**
+- `BGEVENT_ITEM`
 
-  **`hiddenitem` *event_flag*, *item_id***
+<pre>
+	hiddenitem <i>event_flag</i>, <i>item_id</i>
+</pre>
 
-- **`BGEVENT_COPY`**
+- `BGEVENT_COPY`
 
-## `.ObjectEvents: db` *N*
+### `.ObjectEvents: db` *N*
 
-- **`object_event` *x*, *y*, *sprite*, *movement*, *rx*, *ry*, *h1*, *h2*, *palette*, *type*, *range*, *script*, *event_flag***
+<pre>
+	object_event <i>x</i>, <i>y</i>, <i>sprite</i>, <i>movement</i>, <i>rx</i>, <i>ry</i>, <i>h1</i>, <i>h2</i>, <i>palette</i>, <i>type</i>, <i>range</i>, <i>script</i>, <i>event_flag<i>
+</pre>
 
 Movement types:
 
-- **`SPRITEMOVEDATA_ITEM_TREE`**
+- `SPRITEMOVEDATA_ITEM_TREE`
 
-- **`SPRITEMOVEDATA_WANDER`**
+- `SPRITEMOVEDATA_WANDER`
 
-- **`SPRITEMOVEDATA_SPINRANDOM_SLOW`**
+- `SPRITEMOVEDATA_SPINRANDOM_SLOW`
 
-- **`SPRITEMOVEDATA_WALK_UP_DOWN`**
+- `SPRITEMOVEDATA_WALK_UP_DOWN`
 
-- **`SPRITEMOVEDATA_WALK_LEFT_RIGHT`**
+- `SPRITEMOVEDATA_WALK_LEFT_RIGHT`
 
-- **`SPRITEMOVEDATA_STANDING_UP/DOWN/LEFT/RIGHT`**
+- `SPRITEMOVEDATA_STANDING_UP/DOWN/LEFT/RIGHT`
 
-- **`SPRITEMOVEDATA_SPINRANDOM_FAST`**
+- `SPRITEMOVEDATA_SPINRANDOM_FAST`
 
-- **`SPRITEMOVEDATA_SNORLAX`**
+- `SPRITEMOVEDATA_SNORLAX`
 
-- **`SPRITEMOVEDATA_POKEMON`**
+- `SPRITEMOVEDATA_POKEMON`
 
-- **`SPRITEMOVEDATA_SUDOWOODO`**
+- `SPRITEMOVEDATA_SUDOWOODO`
 
-- **`SPRITEMOVEDATA_SMASHABLE_ROCK`**
+- `SPRITEMOVEDATA_SMASHABLE_ROCK`
 
-- **`SPRITEMOVEDATA_STRENGTH_BOULDER`**
+- `SPRITEMOVEDATA_STRENGTH_BOULDER`
 
-- **`SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE`**
+- `SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE`
 
-- **`SPRITEMOVEDATA_SPINCLOCKWISE`**
+- `SPRITEMOVEDATA_SPINCLOCKWISE`
 
-- **`SPRITEMOVEDATA_BIGDOLL`**
+- `SPRITEMOVEDATA_BIGDOLL`
 
-- **`SPRITEMOVEDATA_LAPRAS`**
+- `SPRITEMOVEDATA_LAPRAS`
 
 Object types:
 
-- **`OBJECTTYPE_SCRIPT`**
+- `OBJECTTYPE_SCRIPT`
 
-- **`OBJECTTYPE_ITEMBALL`**
+- `OBJECTTYPE_ITEMBALL`
 
-  **`itemball` *item_id***
+<pre>
+	itemball <i>item_id</i>
+</pre>
 
-- **`OBJECTTYPE_TRAINER`**
+- `OBJECTTYPE_TRAINER`
 
-  **`trainer` *event_flag*, *group_id*, *trainer_id*, *seen_text*, *beaten_text*, *loss_text*, *script***
+<pre>
+	trainer <i>event_flag</i>, <i>group_id</i>, <i>trainer_id</i>, <i>seen_text</i>, <i>beaten_text</i>, <i>loss_text</i>, <i>script</i>
+</pre>

engine/events.asm

@@ -396,7 +396,7 @@ CheckTileEvent: ; 96874
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call CallScript
 	ret
 ; 968c7
@@ -450,7 +450,7 @@ RunSceneScript: ; 968ec
 
 	ld e, a
 	ld d, 0
-	ld hl, wCurrMapSceneScriptHeaderPointer
+	ld hl, wCurrMapSceneScriptsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -458,9 +458,9 @@ rept 4
 	add hl, de
 endr
 
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call GetFarHalfword
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call CallScript
 
 	ld hl, ScriptFlags
@@ -635,7 +635,7 @@ TryObjectEvent: ; 969b5
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call CallScript
 	ret
 ; 96a12
@@ -646,7 +646,7 @@ TryObjectEvent: ; 969b5
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	ld de, EngineBuffer1
 	ld bc, 2
 	call FarCopyBytes
@@ -731,7 +731,7 @@ TryBGEvent: ; 96a38
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call CallScript
 	scf
 	ret
@@ -740,7 +740,7 @@ TryBGEvent: ; 96a38
 	call CheckBGEventFlag
 	jp nz, .dontread
 	call PlayTalkObject
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	ld de, EngineBuffer1
 	ld bc, 3
 	call FarCopyBytes
@@ -753,7 +753,7 @@ TryBGEvent: ; 96a38
 .copy
 	call CheckBGEventFlag
 	jr nz, .dontread
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	ld de, EngineBuffer1
 	ld bc, 3
 	call FarCopyBytes
@@ -774,9 +774,9 @@ TryBGEvent: ; 96a38
 	pop hl
 	inc hl
 	inc hl
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call GetFarHalfword
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call CallScript
 	scf
 	ret
@@ -792,7 +792,7 @@ CheckBGEventFlag: ; 96ad8
 	ld h, [hl]
 	ld l, a
 	push hl
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call GetFarHalfword
 	ld e, l
 	ld d, h

engine/events/checkforhiddenitems.asm

@@ -1,6 +1,6 @@
 CheckForHiddenItems: ; b8172
 ; Checks to see if there are hidden items on the screen that have not yet been found.  If it finds one, returns carry.
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	ld [Buffer1], a
 ; Get the coordinate of the bottom right corner of the screen, and load it in Buffer3/Buffer4.
 	ld a, [XCoord]
@@ -9,8 +9,8 @@ CheckForHiddenItems: ; b8172
 	ld a, [YCoord]
 	add SCREEN_HEIGHT / 4
 	ld [Buffer3], a
-; Get the pointer for the first BG event header in the map...
+; Get the pointer for the first bg_event in the map...
-	ld hl, wCurrMapBGEventHeaderPointer
+	ld hl, wCurrMapBGEventsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -20,7 +20,7 @@ CheckForHiddenItems: ; b8172
 	jr z, .nobgeventitems
 ; For i = 1:wCurrMapBGEventCount...
 .loop
-; Store the counter in Buffer2, and store the BG event header pointer in the stack.
+; Store the counter in Buffer2, and store the bg_event pointer in the stack.
 	ld [Buffer2], a
 	push hl
 ; Get the Y coordinate of the BG event.
@@ -58,7 +58,7 @@ CheckForHiddenItems: ; b8172
 	jr z, .itemnearby
 
 .next
-; Restore the BG event header pointer and increment it by the length of a BG event header.
+; Restore the bg_event pointer and increment it by the length of a bg_event.
 	pop hl
 	ld bc, 5
 	add hl, bc

engine/events/mom_phone.asm

@@ -9,7 +9,7 @@ MomTriesToBuySomething:: ; fcfec
 	ld a, [wMapReentryScriptQueueFlag]
 	and a
 	ret nz
-	call GetMapHeaderPhoneServiceNybble
+	call GetMapPhoneService
 	and a
 	ret nz
 	xor a

engine/events/unown_walls.asm

@@ -3,7 +3,7 @@ Special_HoOhChamber: ; 0x8addb
 	ld a, [hl]
 	cp HO_OH ; is Ho-oh the first Pokémon in the party?
 	jr nz, .done ; if not, we're done
-	call GetSecondaryMapHeaderPointer
+	call GetMapDataPointer ; pointless?
 	ld de, EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
 	ld b, SET_FLAG
 	call EventFlagAction
@@ -12,7 +12,7 @@ Special_HoOhChamber: ; 0x8addb
 ; 0x8adef
 
 Special_OmanyteChamber: ; 8adef
-	call GetSecondaryMapHeaderPointer
+	call GetMapDataPointer ; pointless?
 	ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
 	ld b, CHECK_FLAG
 	call EventFlagAction
@@ -44,7 +44,7 @@ Special_OmanyteChamber: ; 8adef
 	jr nz, .loop
 
 .open
-	call GetSecondaryMapHeaderPointer
+	call GetMapDataPointer ; pointless?
 	ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
 	ld b, SET_FLAG
 	call EventFlagAction
@@ -57,12 +57,12 @@ SpecialAerodactylChamber: ; 8ae30
 	push de
 	push bc
 
-	call GetSecondaryMapHeaderPointer
+	call GetMapDataPointer
 	ld a, h
-	cp HIGH(RuinsOfAlphAerodactylChamber_SecondMapHeader)
+	cp HIGH(RuinsOfAlphAerodactylChamber_MapData)
 	jr nz, .nope
 	ld a, l
-	cp LOW(RuinsOfAlphAerodactylChamber_SecondMapHeader)
+	cp LOW(RuinsOfAlphAerodactylChamber_MapData)
 	jr nz, .nope
 
 	ld de, EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
@@ -85,12 +85,12 @@ SpecialKabutoChamber: ; 8ae4e
 	push hl
 	push de
 
-	call GetSecondaryMapHeaderPointer
+	call GetMapDataPointer
 	ld a, h
-	cp HIGH(RuinsOfAlphKabutoChamber_SecondMapHeader)
+	cp HIGH(RuinsOfAlphKabutoChamber_MapData)
 	jr nz, .done
 	ld a, l
-	cp LOW(RuinsOfAlphKabutoChamber_SecondMapHeader)
+	cp LOW(RuinsOfAlphKabutoChamber_MapData)
 	jr nz, .done
 
 	ld de, EVENT_WALL_OPENED_IN_KABUTO_CHAMBER

engine/events_2.asm

@@ -274,7 +274,7 @@ DoBikeStep:: ; 97db3
 
 	; If we're not in an area of phone service, we don't
 	; have to be here.
-	call GetMapHeaderPhoneServiceNybble
+	call GetMapPhoneService
 	and a
 	jr nz, .NoCall
 

engine/intro_menu.asm

@@ -542,10 +542,10 @@ Continue_LoadMenuHeader: ; 5ebf
 	ld hl, .MenuDataHeader_Dex
 	ld a, [wStatusFlags]
 	bit 0, a ; pokedex
-	jr nz, .pokedex_header
+	jr nz, .show_menu
 	ld hl, .MenuDataHeader_NoDex
 
-.pokedex_header
+.show_menu
 	call _OffsetMenuDataHeader
 	call MenuBox
 	call PlaceVerticalMenuItems

engine/phone/phone.asm

@@ -131,7 +131,7 @@ CheckPhoneCall:: ; 90074 (24:4074)
 	cp b
 	jr nz, .no_call
 
-	call GetMapHeaderPhoneServiceNybble
+	call GetMapPhoneService
 	and a
 	jr nz, .no_call
 
@@ -328,7 +328,7 @@ Function90199: ; 90199 (24:4199)
 	and a
 	jr nz, .OutOfArea
 	; If you're in an area without phone service, don't do the call
-	call GetMapHeaderPhoneServiceNybble
+	call GetMapPhoneService
 	and a
 	jr nz, .OutOfArea
 	; If the person can't take a call at that time, don't do the call

engine/player_gfx.asm

@@ -56,11 +56,11 @@ MovePlayerPic: ; 88266
 	jr .loop
 
 ShowPlayerNamingChoices: ; 88297
-	ld hl, ChrisNameMenuHeader
+	ld hl, ChrisNameMenuDataHeader
 	ld a, [wPlayerGender]
 	bit 0, a
 	jr z, .GotGender
-	ld hl, KrisNameMenuHeader
+	ld hl, KrisNameMenuDataHeader
 .GotGender:
 	call LoadMenuDataHeader
 	call VerticalMenu

engine/pokegear.asm

@@ -393,7 +393,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
 	hlcoord 17, 2
 	inc a
 	ld [hli], a
-	call GetMapHeaderPhoneServiceNybble
+	call GetMapPhoneService
 	and a
 	ret nz
 	hlcoord 18, 2
@@ -926,7 +926,7 @@ PokegearPhone_Joypad: ; 91171 (24:5171)
 	ret
 
 PokegearPhone_MakePhoneCall: ; 911eb (24:51eb)
-	call GetMapHeaderPhoneServiceNybble
+	call GetMapPhoneService
 	and a
 	jr nz, .no_service
 	ld hl, Options

engine/save.asm

@@ -525,9 +525,9 @@ SavePlayerData: ; 14dd7
 	ld de, sPlayerData
 	ld bc, wPlayerDataEnd - wPlayerData
 	call CopyBytes
-	ld hl, wMapData
+	ld hl, wCurrMapData
-	ld de, sMapData
+	ld de, sCurrMapData
-	ld bc, wMapDataEnd - wMapData
+	ld bc, wCurrMapDataEnd - wCurrMapData
 	call CopyBytes
 	jp CloseSRAM
 ; 14df7
@@ -592,9 +592,9 @@ SaveBackupPlayerData: ; 14e55
 	ld de, sBackupPlayerData
 	ld bc, wPlayerDataEnd - wPlayerData
 	call CopyBytes
-	ld hl, wMapData
+	ld hl, wCurrMapData
-	ld de, sBackupMapData
+	ld de, sBackupCurrMapData
-	ld bc, wMapDataEnd - wMapData
+	ld bc, wCurrMapDataEnd - wCurrMapData
 	call CopyBytes
 	call CloseSRAM
 	ret
@@ -777,9 +777,9 @@ LoadPlayerData: ; 14fd7 (5:4fd7)
 	ld de, wPlayerData
 	ld bc, wPlayerDataEnd - wPlayerData
 	call CopyBytes
-	ld hl, sMapData
+	ld hl, sCurrMapData
-	ld de, wMapData
+	ld de, wCurrMapData
-	ld bc, wMapDataEnd - wMapData
+	ld bc, wCurrMapDataEnd - wCurrMapData
 	call CopyBytes
 	call CloseSRAM
 	ld a, BANK(sBattleTowerChallengeState)
@@ -833,9 +833,9 @@ LoadBackupPlayerData: ; 15046 (5:5046)
 	ld de, wPlayerData
 	ld bc, wPlayerDataEnd - wPlayerData
 	call CopyBytes
-	ld hl, sBackupMapData
+	ld hl, sBackupCurrMapData
-	ld de, wMapData
+	ld de, wCurrMapData
-	ld bc, wMapDataEnd - wMapData
+	ld bc, wCurrMapDataEnd - wCurrMapData
 	call CopyBytes
 	call CloseSRAM
 	ret

engine/scripting.asm

@@ -2580,11 +2580,11 @@ Script_changemap:
 ; parameters: map_data_pointer
 
 	call GetScriptByte
-	ld [MapBlockDataBank], a
+	ld [MapBlocksBank], a
 	call GetScriptByte
-	ld [MapBlockDataPointer], a
+	ld [MapBlocksPointer], a
 	call GetScriptByte
-	ld [MapBlockDataPointer + 1], a
+	ld [MapBlocksPointer + 1], a
 	call ChangeMap
 	call BufferScreen
 	ret

engine/unown_puzzle.asm

@@ -763,7 +763,7 @@ endr
 ; e16c7
 
 UnownPuzzle_AddPuzzlePieceBorders: ; e16c7
-	ld hl, GFXHeaders
+	ld hl, PuzzlePieceBorderData
 	ld a, 8
 .loop
 	push af
@@ -819,7 +819,7 @@ endr
 	ret
 ; e1703
 
-GFXHeaders: ; e1703
+PuzzlePieceBorderData: ; e1703
 	dw .TileBordersGFX + 0 tiles, vTiles0 tile $00
 	dw .TileBordersGFX + 1 tiles, vTiles0 tile $01
 	dw .TileBordersGFX + 2 tiles, vTiles0 tile $02

engine/warp_connection.asm

@@ -11,7 +11,7 @@ InitCommandQueue: ; 1045c4
 	farcall ClearCmdQueue
 	ld a, MAPCALLBACK_CMDQUEUE
 	call RunMapCallback
-	call GetMapHeaderTimeOfDayNybble
+	call GetMapTimeOfDay
 	ld [wMapTimeOfDay], a
 	ret
 

home.asm

@@ -842,7 +842,7 @@ HandleStoneQueue:: ; 3567
 	ld a, [hROMBank]
 	push af
 
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call .WarpAction
 
 	pop bc
@@ -899,7 +899,7 @@ HandleStoneQueue:: ; 3567
 ; 35b0
 
 .check_on_warp ; 35b0
-	ld hl, wCurrMapWarpHeaderPointer
+	ld hl, wCurrMapWarpsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a

home/audio.asm

@@ -340,7 +340,7 @@ FadeToMapMusic:: ; 3cbc
 	push bc
 	push af
 
-	call GetMapMusic
+	call GetMapMusic_MaybeSpecial
 	ld a, [wMapMusic]
 	cp e
 	jr z, .done
@@ -368,7 +368,7 @@ PlayMapMusic:: ; 3cdf
 	push bc
 	push af
 
-	call GetMapMusic
+	call GetMapMusic_MaybeSpecial
 	ld a, [wMapMusic]
 	cp e
 	jr z, .done
@@ -402,7 +402,7 @@ EnterMapMusic:: ; 3d03
 	ld a, [PlayerState]
 	cp PLAYER_BIKE
 	jr z, .play
-	call GetMapMusic
+	call GetMapMusic_MaybeSpecial
 .play
 	push de
 	ld de, MUSIC_NONE
@@ -495,10 +495,10 @@ SpecialMapMusic:: ; 3d62
 	ret
 ; 3d97
 
-GetMapMusic:: ; 3d97
+GetMapMusic_MaybeSpecial:: ; 3d97
 	call SpecialMapMusic
 	ret c
-	call GetMapHeaderMusic
+	call GetMapMusic
 	ret
 ; 3d9f
 

home/map.asm

@@ -72,7 +72,7 @@ GetMapSceneID:: ; 2147
 
 .next
 	pop hl
-	ld de, 4 ; size of an entry in the scene script table
+	ld de, 4 ; scene_script size
 	add hl, de
 	jr .loop
 
@@ -249,7 +249,7 @@ GetDestinationWarpNumber:: ; 2252
 	ld a, [hROMBank]
 	push af
 
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call .GetDestinationWarpNumber
 
 	pop de
@@ -270,7 +270,7 @@ GetDestinationWarpNumber:: ; 2252
 	ret z
 
 	ld c, a
-	ld hl, wCurrMapWarpHeaderPointer
+	ld hl, wCurrMapWarpsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -321,7 +321,7 @@ CopyWarpData:: ; 22a7
 	ld a, [hROMBank]
 	push af
 
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call .CopyWarpData
 
 	pop af
@@ -332,7 +332,7 @@ CopyWarpData:: ; 22a7
 
 .CopyWarpData: ; 22b4
 	push bc
-	ld hl, wCurrMapWarpHeaderPointer
+	ld hl, wCurrMapWarpsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -394,35 +394,35 @@ CheckIndoorMap:: ; 22f4
 ; 2309
 
 LoadMapAttributes:: ; 2309
-	call CopyMapHeaders
+	call CopyMapDefAndData
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call ReadMapScripts
-	xor a
+	xor a ; do not skip object_events
-	call ReadMapEventHeader
+	call ReadMapEvents
 	ret
 ; 2317
 
 LoadMapAttributes_SkipPeople:: ; 2317
-	call CopyMapHeaders
+	call CopyMapDefAndData
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call ReadMapScripts
-	ld a, $1
+	ld a, TRUE ; skip object events
-	call ReadMapEventHeader
+	call ReadMapEvents
 	ret
 ; 2326
 
-CopyMapHeaders:: ; 2326
+CopyMapDefAndData:: ; 2326
-	call PartiallyCopyMapHeader
+	call PartialCopyMapDef
-	call SwitchToMapBank
+	call SwitchToMapDataBank
-	call GetSecondaryMapHeaderPointer
+	call GetMapDataPointer
-	call CopySecondMapHeader
+	call CopyMapData
 	call GetMapConnections
 	ret
 ; 2336
 
-ReadMapEventHeader:: ; 2336
+ReadMapEvents:: ; 2336
 	push af
-	ld hl, MapEventHeaderPointer
+	ld hl, MapEventsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -433,7 +433,7 @@ ReadMapEventHeader:: ; 2336
 	call ReadBGEvents
 
 	pop af
-	and a
+	and a ; skip object events?
 	ret nz
 
 	call ReadObjectEvents
@@ -441,7 +441,7 @@ ReadMapEventHeader:: ; 2336
 ; 234f
 
 ReadMapScripts:: ; 234f
-	ld hl, MapScriptHeaderPointer
+	ld hl, MapScriptsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -450,9 +450,9 @@ ReadMapScripts:: ; 234f
 	ret
 ; 235c
 
-CopySecondMapHeader:: ; 235c
+CopyMapData:: ; 235c
-	ld de, MapHeader
+	ld de, wMapData
-	ld c, 12 ; size of the second map header
+	ld c, wMapDataEnd - wMapData
 .loop
 	ld a, [hli]
 	ld [de], a
@@ -516,14 +516,14 @@ ReadMapSceneScripts:: ; 23ac
 	ld c, a
 	ld [wCurrMapSceneScriptCount], a ; current map scene script count
 	ld a, l
-	ld [wCurrMapSceneScriptHeaderPointer], a ; map scene script pointer
+	ld [wCurrMapSceneScriptsPointer], a ; map scene script pointer
 	ld a, h
-	ld [wCurrMapSceneScriptHeaderPointer + 1], a
+	ld [wCurrMapSceneScriptsPointer + 1], a
 	ld a, c
 	and a
 	ret z
 
-	ld bc, 4 ; size of a map scene script header entry
+	ld bc, 4 ; scene_script size
 	call AddNTimes
 	ret
 ; 23c3
@@ -533,9 +533,9 @@ ReadMapCallbacks:: ; 23c3
 	ld c, a
 	ld [wCurrMapCallbackCount], a
 	ld a, l
-	ld [wCurrMapCallbackHeaderPointer], a
+	ld [wCurrMapCallbacksPointer], a
 	ld a, h
-	ld [wCurrMapCallbackHeaderPointer + 1], a
+	ld [wCurrMapCallbacksPointer + 1], a
 	ld a, c
 	and a
 	ret z
@@ -550,9 +550,9 @@ ReadWarps:: ; 23da
 	ld c, a
 	ld [wCurrMapWarpCount], a
 	ld a, l
-	ld [wCurrMapWarpHeaderPointer], a
+	ld [wCurrMapWarpsPointer], a
 	ld a, h
-	ld [wCurrMapWarpHeaderPointer + 1], a
+	ld [wCurrMapWarpsPointer + 1], a
 	ld a, c
 	and a
 	ret z
@@ -566,9 +566,9 @@ ReadCoordEvents:: ; 23f1
 	ld c, a
 	ld [wCurrMapCoordEventCount], a
 	ld a, l
-	ld [wCurrMapCoordEventHeaderPointer], a
+	ld [wCurrMapCoordEventsPointer], a
 	ld a, h
-	ld [wCurrMapCoordEventHeaderPointer + 1], a
+	ld [wCurrMapCoordEventsPointer + 1], a
 
 	ld a, c
 	and a
@@ -584,9 +584,9 @@ ReadBGEvents:: ; 2408
 	ld c, a
 	ld [wCurrMapBGEventCount], a
 	ld a, l
-	ld [wCurrMapBGEventHeaderPointer], a
+	ld [wCurrMapBGEventsPointer], a
 	ld a, h
-	ld [wCurrMapBGEventHeaderPointer + 1], a
+	ld [wCurrMapBGEventsPointer + 1], a
 
 	ld a, c
 	and a
@@ -606,12 +606,12 @@ ReadObjectEvents:: ; 241f
 	inc de
 	ld [wCurrMapObjectEventCount], a
 	ld a, e
-	ld [wCurrMapObjectEventHeaderPointer], a
+	ld [wCurrMapObjectEventsPointer], a
 	ld a, d
-	ld [wCurrMapObjectEventHeaderPointer + 1], a
+	ld [wCurrMapObjectEventsPointer + 1], a
 
 	ld a, [wCurrMapObjectEventCount]
-	call CopyMapObjectHeaders
+	call CopyMapObjectEvents
 
 ; get NUM_OBJECTS - [wCurrMapObjectEventCount]
 	ld a, [wCurrMapObjectEventCount]
@@ -643,7 +643,7 @@ ReadObjectEvents:: ; 241f
 	ret
 ; 2457
 
-CopyMapObjectHeaders:: ; 2457
+CopyMapObjectEvents:: ; 2457
 	and a
 	ret z
 
@@ -690,10 +690,10 @@ ClearObjectStructs:: ; 2471
 ; 248a
 
 RestoreFacingAfterWarp:: ; 248a
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	rst Bankswitch
 
-	ld hl, MapEventHeaderPointer
+	ld hl, MapEventsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -759,12 +759,12 @@ ChangeMap:: ; 24e4
 	add hl, bc
 	ld c, 3
 	add hl, bc
-	ld a, [MapBlockDataBank]
+	ld a, [MapBlocksBank]
 	rst Bankswitch
 
-	ld a, [MapBlockDataPointer]
+	ld a, [MapBlocksPointer]
 	ld e, a
-	ld a, [MapBlockDataPointer+1]
+	ld a, [MapBlocksPointer + 1]
 	ld d, a
 	ld a, [MapHeight]
 	ld b, a
@@ -802,7 +802,7 @@ FillMapConnections:: ; 2524
 	ld b, a
 	ld a, [NorthConnectedMapNumber]
 	ld c, a
-	call GetAnyMapBlockdataBank
+	call GetAnyMapBlocksBank
 
 	ld a, [NorthConnectionStripPointer]
 	ld l, a
@@ -825,7 +825,7 @@ FillMapConnections:: ; 2524
 	ld b, a
 	ld a, [SouthConnectedMapNumber]
 	ld c, a
-	call GetAnyMapBlockdataBank
+	call GetAnyMapBlocksBank
 
 	ld a, [SouthConnectionStripPointer]
 	ld l, a
@@ -848,7 +848,7 @@ FillMapConnections:: ; 2524
 	ld b, a
 	ld a, [WestConnectedMapNumber]
 	ld c, a
-	call GetAnyMapBlockdataBank
+	call GetAnyMapBlocksBank
 
 	ld a, [WestConnectionStripPointer]
 	ld l, a
@@ -871,7 +871,7 @@ FillMapConnections:: ; 2524
 	ld b, a
 	ld a, [EastConnectedMapNumber]
 	ld c, a
-	call GetAnyMapBlockdataBank
+	call GetAnyMapBlocksBank
 
 	ld a, [EastConnectionStripPointer]
 	ld l, a
@@ -992,20 +992,20 @@ CallMapScript:: ; 2631
 	ld a, [ScriptRunning]
 	and a
 	ret nz
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	jr CallScript
 ; 263b
 
 RunMapCallback:: ; 263b
-; Will run the first callback found in the map header with execution index equal to a.
+; Will run the first callback found with execution index equal to a.
 	ld b, a
 	ld a, [hROMBank]
 	push af
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call .FindCallback
 	jr nc, .done
 
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	ld b, a
 	ld d, h
 	ld e, l
@@ -1022,7 +1022,7 @@ RunMapCallback:: ; 263b
 	ld c, a
 	and a
 	ret z
-	ld hl, wCurrMapCallbackHeaderPointer
+	ld hl, wCurrMapCallbacksPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -1860,7 +1860,7 @@ CheckFacingBGEvent:: ; 2a8b
 	ld c, a
 	ld a, [hROMBank]
 	push af
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call CheckIfFacingTileCoordIsBGEvent
 	pop hl
 	ld a, h
@@ -1870,7 +1870,7 @@ CheckFacingBGEvent:: ; 2a8b
 
 CheckIfFacingTileCoordIsBGEvent:: ; 2aaa
 ; Checks to see if you are facing a BG event.  If so, copies it into EngineBuffer1 and sets carry.
-	ld hl, wCurrMapBGEventHeaderPointer
+	ld hl, wCurrMapBGEventsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -1916,7 +1916,7 @@ CheckCurrentMapCoordEvents:: ; 2ad4
 	ld c, a
 	ld a, [hROMBank]
 	push af
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call .CoordEventCheck
 	pop hl
 	ld a, h
@@ -1925,7 +1925,7 @@ CheckCurrentMapCoordEvents:: ; 2ad4
 
 .CoordEventCheck:
 ; Checks to see if you are standing on a coord event.  If yes, copies the event to EngineBuffer1 and sets carry.
-	ld hl, wCurrMapCoordEventHeaderPointer
+	ld hl, wCurrMapCoordEventsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -2052,7 +2052,7 @@ ReloadTilesetAndPalettes:: ; 2bae
 	ld b, a
 	ld a, [MapNumber]
 	ld c, a
-	call SwitchToAnyMapBank
+	call SwitchToAnyMapDataBank
 	farcall UpdateTimeOfDayPal
 	call OverworldTextModeSwitch
 	call LoadTilesetGFX
@@ -2065,12 +2065,12 @@ ReloadTilesetAndPalettes:: ; 2bae
 	ret
 ; 2be5
 
-GetMapHeaderPointer:: ; 2be5
+GetMapDefPointer:: ; 2be5
 	ld a, [MapGroup]
 	ld b, a
 	ld a, [MapNumber]
 	ld c, a
-GetAnyMapHeaderPointer:: ; 0x2bed
+GetAnyMapDefPointer:: ; 0x2bed
 ; Prior to calling this function, you must have switched banks so that
 ; MapGroupPointers is visible.
 
@@ -2078,7 +2078,7 @@ GetAnyMapHeaderPointer:: ; 0x2bed
 ; b = map group, c = map number
 
 ; outputs:
-; hl points to the map header
+; hl points to the map_def
 	push bc ; save map number for later
 
 	; get pointer to map group
@@ -2094,7 +2094,7 @@ GetAnyMapHeaderPointer:: ; 0x2bed
 	ld l, a
 	pop bc ; restore map number
 
-	; find the cth map header
+	; find the cth map_def
 	dec c
 	ld b, 0
 	ld a, 9
@@ -2102,28 +2102,28 @@ GetAnyMapHeaderPointer:: ; 0x2bed
 	ret
 ; 0x2c04
 
-GetMapHeaderMember:: ; 0x2c04
+GetMapDefField:: ; 0x2c04
-; Extract data from the current map's header.
+; Extract data from the current map's map_def.
 
 ; inputs:
-; de = offset of desired data within the mapheader (a MAPHEADER_* constant)
+; de = offset of desired data within the map_def (a MAPDEF_* constant)
 
 ; outputs:
-; bc = data from the current map's header
+; bc = data from the current map's map_def
-; (e.g., de = MAPHEADER_MAPHEADER2 would return a pointer to the secondary map header)
+; (e.g., de = MAPDEF_TILESET would return a pointer to the tileset id)
 
 	ld a, [MapGroup]
 	ld b, a
 	ld a, [MapNumber]
 	ld c, a
-GetAnyMapHeaderMember:: ; 0x2c0c
+GetAnyMapDefField:: ; 0x2c0c
 	; bankswitch
 	ld a, [hROMBank]
 	push af
 	ld a, BANK(MapGroupPointers)
 	rst Bankswitch
 
-	call GetAnyMapHeaderPointer
+	call GetAnyMapDefPointer
 	add hl, de
 	ld c, [hl]
 	inc hl
@@ -2135,44 +2135,44 @@ GetAnyMapHeaderMember:: ; 0x2c0c
 	ret
 ; 0x2c1c
 
-SwitchToMapBank:: ; 2c1c
+SwitchToMapDataBank:: ; 2c1c
 	ld a, [MapGroup]
 	ld b, a
 	ld a, [MapNumber]
 	ld c, a
-SwitchToAnyMapBank:: ; 2c24
+SwitchToAnyMapDataBank:: ; 2c24
-	call GetAnyMapBank
+	call GetAnyMapDataBank
 	rst Bankswitch
 	ret
 ; 2c29
 
-GetMapBank:: ; 2c29
+GetMapDataBank:: ; 2c29
 	ld a, [MapGroup]
 	ld b, a
 	ld a, [MapNumber]
 	ld c, a
-GetAnyMapBank:: ; 2c31
+GetAnyMapDataBank:: ; 2c31
 	push hl
 	push de
-	ld de, MAPHEADER_MAPHEADER2_BANK
+	ld de, MAPDEF_MAPDATA_BANK
-	call GetAnyMapHeaderMember
+	call GetAnyMapDefField
 	ld a, c
 	pop de
 	pop hl
 	ret
 ; 2c3d
 
-PartiallyCopyMapHeader:: ; 2c3d
+PartialCopyMapDef:: ; 2c3d
-; Copy second map header bank, tileset, environment, and second map header address
+; Copy map data bank, tileset, environment, and map data address
-; from the current map's map header.
+; from the current map's map_def.
 	ld a, [hROMBank]
 	push af
 	ld a, BANK(MapGroupPointers)
 	rst Bankswitch
 
-	call GetMapHeaderPointer
+	call GetMapDefPointer
-	ld de, wSecondMapHeaderBank
+	ld de, wPartialMapDef
-	ld bc, MapHeader - wSecondMapHeaderBank
+	ld bc, wPartialMapDefEnd - wPartialMapDef
 	call CopyBytes
 
 	pop af
@@ -2180,36 +2180,36 @@ PartiallyCopyMapHeader:: ; 2c3d
 	ret
 ; 2c52
 
-SwitchToMapScriptHeaderBank:: ; 2c52
+SwitchToMapScriptsBank:: ; 2c52
-	ld a, [MapScriptHeaderBank]
+	ld a, [MapScriptsBank]
 	rst Bankswitch
 	ret
 ; 2c57
 
-GetMapScriptHeaderBank:: ; 2c57
+GetMapScriptsBank:: ; 2c57
-	ld a, [MapScriptHeaderBank]
+	ld a, [MapScriptsBank]
 	ret
 ; 2c5b
 
-GetAnyMapBlockdataBank:: ; 2c5b
+GetAnyMapBlocksBank:: ; 2c5b
 ; Return the blockdata bank for group b map c.
 	push hl
 	push de
 	push bc
 
 	push bc
-	ld de, MAPHEADER_MAPHEADER2
+	ld de, MAPDEF_MAPDATA
-	call GetAnyMapHeaderMember
+	call GetAnyMapDefField
 	ld l, c
 	ld h, b
 	pop bc
 
 	push hl
-	ld de, MAPHEADER_MAPHEADER2_BANK
+	ld de, MAPDEF_MAPDATA_BANK
-	call GetAnyMapHeaderMember
+	call GetAnyMapDefField
 	pop hl
 
-	ld de, MAPHEADER_MAPHEADER2 ; blockdata bank
+	ld de, MAPDEF_MAPDATA ; blockdata bank
 	add hl, de
 	ld a, c
 	call GetFarByte
@@ -2221,12 +2221,12 @@ GetAnyMapBlockdataBank:: ; 2c5b
 	ret
 ; 2c7d
 
-GetSecondaryMapHeaderPointer:: ; 0x2c7d
+GetMapDataPointer:: ; 0x2c7d
-; returns the current map's secondary map header pointer in hl.
+; returns the current map's data pointer in hl.
 	push bc
 	push de
-	ld de, MAPHEADER_MAPHEADER2
+	ld de, MAPDEF_MAPDATA
-	call GetMapHeaderMember
+	call GetMapDefField
 	ld l, c
 	ld h, b
 	pop de
@@ -2238,8 +2238,8 @@ GetMapEnvironment:: ; 2c8a
 	push hl
 	push de
 	push bc
-	ld de, MAPHEADER_ENVIRONMENT
+	ld de, MAPDEF_ENVIRONMENT
-	call GetMapHeaderMember
+	call GetMapDefField
 	ld a, c
 	pop bc
 	pop de
@@ -2254,8 +2254,8 @@ GetAnyMapEnvironment:: ; 2c99
 	push hl
 	push de
 	push bc
-	ld de, MAPHEADER_ENVIRONMENT
+	ld de, MAPDEF_ENVIRONMENT
-	call GetAnyMapHeaderMember
+	call GetAnyMapDefField
 	ld a, c
 	pop bc
 	pop de
@@ -2264,8 +2264,8 @@ GetAnyMapEnvironment:: ; 2c99
 ; 2ca7
 
 GetAnyMapTileset:: ; 2ca7
-	ld de, MAPHEADER_TILESET
+	ld de, MAPDEF_TILESET
-	call GetAnyMapHeaderMember
+	call GetAnyMapDefField
 	ld a, c
 	ret
 ; 2caf
@@ -2276,8 +2276,8 @@ GetWorldMapLocation:: ; 0x2caf
 	push de
 	push bc
 
-	ld de, MAPHEADER_LOCATION
+	ld de, MAPDEF_LOCATION
-	call GetAnyMapHeaderMember
+	call GetAnyMapDefField
 	ld a, c
 
 	pop bc
@@ -2286,11 +2286,11 @@ GetWorldMapLocation:: ; 0x2caf
 	ret
 ; 0x2cbd
 
-GetMapHeaderMusic:: ; 2cbd
+GetMapMusic:: ; 2cbd
 	push hl
 	push bc
-	ld de, MAPHEADER_MUSIC
+	ld de, MAPDEF_MUSIC
-	call GetMapHeaderMember
+	call GetMapDefField
 	ld a, c
 	cp MUSIC_MAHOGANY_MART
 	jr z, .mahoganymart
@@ -2331,13 +2331,13 @@ GetMapHeaderMusic:: ; 2cbd
 	jr .done
 ; 2cff
 
-GetMapHeaderTimeOfDayNybble:: ; 2cff
+GetMapTimeOfDay:: ; 2cff
 	call GetPhoneServiceTimeOfDayByte
 	and $f
 	ret
 ; 2d05
 
-GetMapHeaderPhoneServiceNybble:: ; 2d05
+GetMapPhoneService:: ; 2d05
 	call GetPhoneServiceTimeOfDayByte
 	and $f0
 	swap a
@@ -2348,8 +2348,8 @@ GetPhoneServiceTimeOfDayByte:: ; 2d0d
 	push hl
 	push bc
 
-	ld de, MAPHEADER_PALETTE
+	ld de, MAPDEF_PALETTE
-	call GetMapHeaderMember
+	call GetMapDefField
 	ld a, c
 
 	pop bc
@@ -2362,8 +2362,8 @@ GetFishingGroup:: ; 2d19
 	push hl
 	push bc
 
-	ld de, MAPHEADER_FISHGROUP
+	ld de, MAPDEF_FISHGROUP
-	call GetMapHeaderMember
+	call GetMapDefField
 	ld a, c
 
 	pop bc

home/trainers.asm

@@ -2,7 +2,7 @@ CheckTrainerBattle2:: ; 3600
 	ld a, [hROMBank]
 	push af
 
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call CheckTrainerBattle
 
 	pop bc
@@ -110,7 +110,7 @@ TalkToTrainer:: ; 3674
 	ld [EngineBuffer3], a
 
 LoadTrainer_continue:: ; 367e
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	ld [EngineBuffer1], a
 
 	ld a, [hLastTalked]
@@ -120,8 +120,8 @@ LoadTrainer_continue:: ; 367e
 	add hl, bc
 	ld a, [EngineBuffer1]
 	call GetFarHalfword
-	ld de, wTempTrainerHeader
+	ld de, wTempTrainer
-	ld bc, wTempTrainerHeaderEnd - wTempTrainerHeader
+	ld bc, wTempTrainerEnd - wTempTrainer
 	ld a, [EngineBuffer1]
 	call FarCopyBytes
 	xor a
@@ -221,7 +221,7 @@ CheckTrainerFlag:: ; 36f5
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call GetFarHalfword
 	ld d, h
 	ld e, l
@@ -255,7 +255,7 @@ PrintWinLossText:: ; 3718
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call FarPrintText
 	call WaitBGMap
 	call WaitPressAorB_BlinkCursor

maps/AzaleaGym.asm

@@ -7,7 +7,7 @@ const_value set 2
 	const AZALEAGYM_TWIN2
 	const AZALEAGYM_GYM_GUY
 
-AzaleaGym_MapScriptHeader:
+AzaleaGym_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -361,7 +361,7 @@ AzaleaGymGuyWinText:
 	cont "#MON is bright!"
 	done
 
-AzaleaGym_MapEventHeader:
+AzaleaGym_MapEvents:
 	; filler
 	db 0, 0
 

maps/AzaleaMart.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const AZALEAMART_COOLTRAINER_M
 	const AZALEAMART_BUG_CATCHER
 
-AzaleaMart_MapScriptHeader:
+AzaleaMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -45,7 +45,7 @@ AzaleaMartBugCatcherText:
 	cont "times."
 	done
 
-AzaleaMart_MapEventHeader:
+AzaleaMart_MapEvents:
 	; filler
 	db 0, 0
 

maps/AzaleaPokecenter1F.asm

@@ -4,7 +4,7 @@ const_value set 2
 	const AZALEAPOKECENTER1F_FISHING_GURU
 	const AZALEAPOKECENTER1F_POKEFAN_F
 
-AzaleaPokecenter1F_MapScriptHeader:
+AzaleaPokecenter1F_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -76,7 +76,7 @@ AzaleaPokecenter1FPokefanFText:
 	line "APRICORNS."
 	done
 
-AzaleaPokecenter1F_MapEventHeader:
+AzaleaPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 

maps/AzaleaTown.asm

@@ -12,7 +12,7 @@ const_value set 2
 	const AZALEATOWN_AZALEA_ROCKET3
 	const AZALEATOWN_KURT_OUTSIDE
 
-AzaleaTown_MapScriptHeader:
+AzaleaTown_MapScripts:
 .SceneScripts:
 	db 3
 	scene_script .DummyScene0
@@ -455,7 +455,7 @@ AzaleaTownIlexForestSignText:
 	line "gate."
 	done
 
-AzaleaTown_MapEventHeader:
+AzaleaTown_MapEvents:
 	; filler
 	db 0, 0
 

maps/BattleTower1F.asm

@@ -5,7 +5,7 @@ const_value set 2
 	const BATTLETOWER1F_BUG_CATCHER
 	const BATTLETOWER1F_GRANNY
 
-BattleTower1F_MapScriptHeader:
+BattleTower1F_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .Scene0
@@ -793,7 +793,7 @@ Text_BattleTowerBugCatcher: ; 0x9f35b
 	line "any fire #MON…"
 	done
 
-BattleTower1F_MapEventHeader:
+BattleTower1F_MapEvents:
 	; filler
 	db 0, 0
 

maps/BattleTowerBattleRoom.asm

@@ -2,7 +2,7 @@ const_value set 2
 	const BATTLETOWERBATTLEROOM_YOUNGSTER
 	const BATTLETOWERBATTLEROOM_RECEPTIONIST
 
-BattleTowerBattleRoom_MapScriptHeader:
+BattleTowerBattleRoom_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .EnterBattleRoom
@@ -138,7 +138,7 @@ Text_ReturnedAfterSave_Mobile:
 	line "after you SAVE."
 	done
 
-BattleTowerBattleRoom_MapEventHeader:
+BattleTowerBattleRoom_MapEvents:
 	; filler
 	db 0, 0
 

maps/BattleTowerElevator.asm

@@ -1,7 +1,7 @@
 const_value set 2
 	const BATTLETOWERELEVATOR_RECEPTIONIST
 
-BattleTowerElevator_MapScriptHeader:
+BattleTowerElevator_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .Scene0
@@ -44,7 +44,7 @@ MovementData_BattleTowerElevatorPlayerWalksIn:
 	turn_head DOWN
 	step_end
 
-BattleTowerElevator_MapEventHeader:
+BattleTowerElevator_MapEvents:
 	; filler
 	db 0, 0
 

maps/BattleTowerHallway.asm

@@ -1,7 +1,7 @@
 const_value set 2
 	const BATTLETOWERHALLWAY_RECEPTIONIST
 
-BattleTowerHallway_MapScriptHeader:
+BattleTowerHallway_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .Scene0
@@ -76,7 +76,7 @@ BattleTowerHallway_MapScriptHeader:
 	warpcheck
 	end
 
-BattleTowerHallway_MapEventHeader:
+BattleTowerHallway_MapEvents:
 	; filler
 	db 0, 0
 
@@ -97,4 +97,4 @@ BattleTowerHallway_MapEventHeader:
 
 .ObjectEvents:
 	db 1
-	object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1
+	object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1

maps/BattleTowerOutside.asm

@@ -4,7 +4,7 @@ const_value set 2
 	const BATTLETOWEROUTSIDE_SAILOR
 	const BATTLETOWEROUTSIDE_LASS
 
-BattleTowerOutside_MapScriptHeader:
+BattleTowerOutside_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -126,7 +126,7 @@ BattleTowerOutsideText_DoorsOpen:
 	text "It's open!"
 	done
 
-BattleTowerOutside_MapEventHeader:
+BattleTowerOutside_MapEvents:
 	; filler
 	db 0, 0
 

maps/BillsHouse.asm

@@ -1,7 +1,7 @@
 const_value set 2
 	const BILLSHOUSE_GRAMPS
 
-BillsHouse_MapScriptHeader:
+BillsHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -353,7 +353,7 @@ BillsGrandpaPichuText:
 	line "evolves."
 	done
 
-BillsHouse_MapEventHeader:
+BillsHouse_MapEvents:
 	; filler
 	db 0, 0
 

maps/BlackthornCity.asm

@@ -9,7 +9,7 @@ const_value set 2
 	const BLACKTHORNCITY_SANTOS
 	const BLACKTHORNCITY_COOLTRAINER_F2
 
-BlackthornCity_MapScriptHeader:
+BlackthornCity_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -312,7 +312,7 @@ BlackthornCityTrainerTipsText:
 	cont "problem."
 	done
 
-BlackthornCity_MapEventHeader:
+BlackthornCity_MapEvents:
 	; filler
 	db 0, 0
 

maps/BlackthornDragonSpeechHouse.asm

@@ -2,7 +2,7 @@ const_value set 2
 	const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY
 	const BLACKTHORNDRAGONSPEECHHOUSE_EKANS
 
-BlackthornDragonSpeechHouse_MapScriptHeader:
+BlackthornDragonSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -47,7 +47,7 @@ BlackthornDragonSpeechHouseDratiniText:
 	text "DRATINI: Draa!"
 	done
 
-BlackthornDragonSpeechHouse_MapEventHeader:
+BlackthornDragonSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 

maps/BlackthornEmysHouse.asm

@@ -1,7 +1,7 @@
 const_value set 2
 	const BLACKTHORNEMYSHOUSE_EMY
 
-BlackthornEmysHouse_MapScriptHeader:
+BlackthornEmysHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -19,7 +19,7 @@ Emy:
 EmysHouseBookshelf:
 	jumpstd magazinebookshelf
 
-BlackthornEmysHouse_MapEventHeader:
+BlackthornEmysHouse_MapEvents:
 	; filler
 	db 0, 0
 

maps/BlackthornGym1F.asm

@@ -5,7 +5,7 @@ const_value set 2
 	const BLACKTHORNGYM1F_COOLTRAINER_F
 	const BLACKTHORNGYM1F_GYM_GUY
 
-BlackthornGym1F_MapScriptHeader:
+BlackthornGym1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -386,7 +386,7 @@ BlackthornGymGuyWinText:
 	cont "#MON CHAMPION!"
 	done
 
-BlackthornGym1F_MapEventHeader:
+BlackthornGym1F_MapEvents:
 	; filler
 	db 0, 0
 

maps/BlackthornGym2F.asm

@@ -8,7 +8,7 @@ const_value set 2
 	const BLACKTHORNGYM2F_BOULDER5
 	const BLACKTHORNGYM2F_BOULDER6
 
-BlackthornGym2F_MapScriptHeader:
+BlackthornGym2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -125,7 +125,7 @@ BlackthornGym2FBoulderFellText:
 	line "through!"
 	done
 
-BlackthornGym2F_MapEventHeader:
+BlackthornGym2F_MapEvents:
 	; filler
 	db 0, 0
 

maps/BlackthornMart.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const BLACKTHORNMART_COOLTRAINER_M
 	const BLACKTHORNMART_BLACK_BELT
 
-BlackthornMart_MapScriptHeader:
+BlackthornMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -46,7 +46,7 @@ BlackthornMartBlackBeltText:
 	cont "REPEL sprays."
 	done
 
-BlackthornMart_MapEventHeader:
+BlackthornMart_MapEvents:
 	; filler
 	db 0, 0
 

maps/BlackthornPokecenter1F.asm

@@ -4,7 +4,7 @@ const_value set 2
 	const BLACKTHORNPOKECENTER1F_TWIN
 	const BLACKTHORNPOKECENTER1F_COOLTRAINER_M
 
-BlackthornPokecenter1F_MapScriptHeader:
+BlackthornPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -49,7 +49,7 @@ BlackthornPokecenter1FTwinText:
 	cont "forget an HM move."
 	done
 
-BlackthornPokecenter1F_MapEventHeader:
+BlackthornPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 

maps/BluesHouse.asm

@@ -1,7 +1,7 @@
 const_value set 2
 	const BLUESHOUSE_DAISY
 
-BluesHouse_MapScriptHeader:
+BluesHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -144,7 +144,7 @@ DaisyCantGroomEggText:
 	cont "groom an EGG."
 	done
 
-BluesHouse_MapEventHeader:
+BluesHouse_MapEvents:
 	; filler
 	db 0, 0
 

maps/BrunosRoom.asm

@@ -1,7 +1,7 @@
 const_value set 2
 	const BRUNOSROOM_BRUNO
 
-BrunosRoom_MapScriptHeader:
+BrunosRoom_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .LockDoor
@@ -124,7 +124,7 @@ BrunoScript_BrunoDefeatText:
 	line "challenge!"
 	done
 
-BrunosRoom_MapEventHeader:
+BrunosRoom_MapEvents:
 	; filler
 	db 0, 0
 

maps/BurnedTower1F.asm

@@ -5,7 +5,7 @@ const_value set 2
 	const BURNEDTOWER1F_MORTY
 	const BURNEDTOWER1F_POKE_BALL
 
-BurnedTower1F_MapScriptHeader:
+BurnedTower1F_MapScripts:
 .SceneScripts:
 	db 3
 	scene_script .EusineScene
@@ -277,7 +277,7 @@ BurnedTower1FMortyText:
 	line "TOWER with him."
 	done
 
-BurnedTower1F_MapEventHeader:
+BurnedTower1F_MapEvents:
 	; filler
 	db 0, 0
 

maps/BurnedTowerB1F.asm

@@ -9,7 +9,7 @@ const_value set 2
 	const BURNEDTOWERB1F_POKE_BALL
 	const BURNEDTOWERB1F_EUSINE
 
-BurnedTowerB1F_MapScriptHeader:
+BurnedTowerB1F_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -235,7 +235,7 @@ BurnedTowerB1FEusineText:
 	para "Farewell!"
 	done
 
-BurnedTowerB1F_MapEventHeader:
+BurnedTowerB1F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonCafe.asm

@@ -5,7 +5,7 @@ const_value set 2
 	const CELADONCAFE_FISHER3
 	const CELADONCAFE_TEACHER
 
-CeladonCafe_MapScriptHeader:
+CeladonCafe_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -207,7 +207,7 @@ NoRoomForLeftoversText:
 	line "hold another item…"
 	done
 
-CeladonCafe_MapEventHeader:
+CeladonCafe_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonCity.asm

@@ -9,7 +9,7 @@ const_value set 2
 	const CELADONCITY_TEACHER2
 	const CELADONCITY_LASS
 
-CeladonCity_MapScriptHeader:
+CeladonCity_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -234,7 +234,7 @@ CeladonCityTrainerTipsText:
 	cont "STORE!"
 	done
 
-CeladonCity_MapEventHeader:
+CeladonCity_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonDeptStore1F.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const CELADONDEPTSTORE1F_GENTLEMAN
 	const CELADONDEPTSTORE1F_TEACHER
 
-CeladonDeptStore1F_MapScriptHeader:
+CeladonDeptStore1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -73,7 +73,7 @@ CeladonDeptStore1FDirectoryText:
 	line "    SQUARE"
 	done
 
-CeladonDeptStore1F_MapEventHeader:
+CeladonDeptStore1F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonDeptStore2F.asm

@@ -4,7 +4,7 @@ const_value set 2
 	const CELADONDEPTSTORE2F_POKEFAN_M
 	const CELADONDEPTSTORE2F_YOUNGSTER
 
-CeladonDeptStore2F_MapScriptHeader:
+CeladonDeptStore2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -68,7 +68,7 @@ CeladonDeptStore2FDirectoryText:
 	line "    MARKET"
 	done
 
-CeladonDeptStore2F_MapEventHeader:
+CeladonDeptStore2F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonDeptStore3F.asm

@@ -5,7 +5,7 @@ const_value set 2
 	const CELADONDEPTSTORE3F_GAMEBOY_KID2
 	const CELADONDEPTSTORE3F_SUPER_NERD
 
-CeladonDeptStore3F_MapScriptHeader:
+CeladonDeptStore3F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -94,7 +94,7 @@ CeladonDeptStore3FDirectoryText:
 	line "Stronger!"
 	done
 
-CeladonDeptStore3F_MapEventHeader:
+CeladonDeptStore3F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonDeptStore4F.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const CELADONDEPTSTORE4F_SUPER_NERD
 	const CELADONDEPTSTORE4F_YOUNGSTER
 
-CeladonDeptStore4F_MapScriptHeader:
+CeladonDeptStore4F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -50,7 +50,7 @@ CeladonDeptStore4FDirectoryText:
 	para "4F: WISEMAN GIFTS"
 	done
 
-CeladonDeptStore4F_MapEventHeader:
+CeladonDeptStore4F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonDeptStore5F.asm

@@ -5,7 +5,7 @@ const_value set 2
 	const CELADONDEPTSTORE5F_SAILOR
 	const CELADONDEPTSTORE5F_TEACHER
 
-CeladonDeptStore5F_MapScriptHeader:
+CeladonDeptStore5F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -71,7 +71,7 @@ CeladonDeptStore5FDirectoryText:
 	text "5F: DRUG STORE"
 	done
 
-CeladonDeptStore5F_MapEventHeader:
+CeladonDeptStore5F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonDeptStore6F.asm

@@ -2,7 +2,7 @@ const_value set 2
 	const CELADONDEPTSTORE6F_SUPER_NERD
 	const CELADONDEPTSTORE6F_YOUNGSTER
 
-CeladonDeptStore6F_MapScriptHeader:
+CeladonDeptStore6F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -145,7 +145,7 @@ CeladonDeptStore6FDirectoryText:
 	line "VENDING MACHINES"
 	done
 
-CeladonDeptStore6F_MapEventHeader:
+CeladonDeptStore6F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonDeptStoreElevator.asm

@@ -1,4 +1,4 @@
-CeladonDeptStoreElevator_MapScriptHeader:
+CeladonDeptStoreElevator_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -27,7 +27,7 @@ CeladonDeptStoreElevatorData:
 	elevfloor FLOOR_6F, 2, CELADON_DEPT_STORE_6F
 	db -1 ; end
 
-CeladonDeptStoreElevator_MapEventHeader:
+CeladonDeptStoreElevator_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonGameCorner.asm

@@ -9,7 +9,7 @@ const_value set 2
 	const CELADONGAMECORNER_GYM_GUY
 	const CELADONGAMECORNER_GRAMPS
 
-CeladonGameCorner_MapScriptHeader:
+CeladonGameCorner_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -281,7 +281,7 @@ UnknownText_0x72567:
 	para "Huh? It's empty!"
 	done
 
-CeladonGameCorner_MapEventHeader:
+CeladonGameCorner_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonGameCornerPrizeRoom.asm

@@ -2,7 +2,7 @@ const_value set 2
 	const CELADONGAMECORNERPRIZEROOM_GENTLEMAN
 	const CELADONGAMECORNERPRIZEROOM_PHARMACIST
 
-CeladonGameCornerPrizeRoom_MapScriptHeader:
+CeladonGameCornerPrizeRoom_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -263,7 +263,7 @@ CeladonPrizeRoom_NoCoinCaseText:
 	line "a COIN CASE."
 	done
 
-CeladonGameCornerPrizeRoom_MapEventHeader:
+CeladonGameCornerPrizeRoom_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonGym.asm

@@ -6,7 +6,7 @@ const_value set 2
 	const CELADONGYM_TWIN1
 	const CELADONGYM_TWIN2
 
-CeladonGym_MapScriptHeader:
+CeladonGym_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -267,7 +267,7 @@ TwinsJoandzoe2AfterBattleText:
 	line "much stronger!"
 	done
 
-CeladonGym_MapEventHeader:
+CeladonGym_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonMansion1F.asm

@@ -4,7 +4,7 @@ const_value set 2
 	const CELADONMANSION1F_CLEFAIRY
 	const CELADONMANSION1F_GROWLITHE2
 
-CeladonMansion1F_MapScriptHeader:
+CeladonMansion1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -74,7 +74,7 @@ CeladonMansionManagersSuiteSignText:
 	line "MANAGER'S SUITE"
 	done
 
-CeladonMansion1F_MapEventHeader:
+CeladonMansion1F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonMansion2F.asm

@@ -1,4 +1,4 @@
-CeladonMansion2F_MapScriptHeader:
+CeladonMansion2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -49,7 +49,7 @@ CeladonMansion2FSignText:
 	line "MEETING ROOM"
 	done
 
-CeladonMansion2F_MapEventHeader:
+CeladonMansion2F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonMansion3F.asm

@@ -4,7 +4,7 @@ const_value set 2
 	const CELADONMANSION3F_SUPER_NERD
 	const CELADONMANSION3F_FISHER
 
-CeladonMansion3F_MapScriptHeader:
+CeladonMansion3F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -189,7 +189,7 @@ UnknownText_0x71996:
 	cont "a # DOLL."
 	done
 
-CeladonMansion3F_MapEventHeader:
+CeladonMansion3F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonMansionRoof.asm

@@ -1,7 +1,7 @@
 const_value set 2
 	const CELADONMANSIONROOF_FISHER
 
-CeladonMansionRoof_MapScriptHeader:
+CeladonMansionRoof_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -33,7 +33,7 @@ UnknownText_0x71aa1:
 	line "moustache!"
 	done
 
-CeladonMansionRoof_MapEventHeader:
+CeladonMansionRoof_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonMansionRoofHouse.asm

@@ -1,7 +1,7 @@
 const_value set 2
 	const CELADONMANSIONROOFHOUSE_PHARMACIST
 
-CeladonMansionRoofHouse_MapScriptHeader:
+CeladonMansionRoofHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -116,7 +116,7 @@ UnknownText_0x71db3:
 	line "victim's HP."
 	done
 
-CeladonMansionRoofHouse_MapEventHeader:
+CeladonMansionRoofHouse_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonPokecenter1F.asm

@@ -5,7 +5,7 @@ const_value set 2
 	const CELADONPOKECENTER1F_COOLTRAINER_F
 	const CELADONPOKECENTER1F_EUSINE
 
-CeladonPokecenter1F_MapScriptHeader:
+CeladonPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -145,7 +145,7 @@ NoBeastsText:
 	line "you, <PLAYER>!"
 	done
 
-CeladonPokecenter1F_MapEventHeader:
+CeladonPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeladonPokecenter2FBeta.asm

@@ -1,11 +1,11 @@
-CeladonPokecenter2FBeta_MapScriptHeader:
+CeladonPokecenter2FBeta_MapScripts:
 .SceneScripts:
 	db 0
 
 .MapCallbacks:
 	db 0
 
-CeladonPokecenter2FBeta_MapEventHeader:
+CeladonPokecenter2FBeta_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeruleanCity.asm

@@ -6,7 +6,7 @@ const_value set 2
 	const CERULEANCITY_FISHER
 	const CERULEANCITY_YOUNGSTER
 
-CeruleanCity_MapScriptHeader:
+CeruleanCity_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -275,7 +275,7 @@ CeruleanLockedDoorText:
 	text "It's locked…"
 	done
 
-CeruleanCity_MapEventHeader:
+CeruleanCity_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeruleanGym.asm

@@ -6,7 +6,7 @@ const_value set 2
 	const CERULEANGYM_SWIMMER_GUY
 	const CERULEANGYM_GYM_GUY
 
-CeruleanGym_MapScriptHeader:
+CeruleanGym_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -362,7 +362,7 @@ CeruleanGymGuyWinText:
 	cont "great battle!"
 	done
 
-CeruleanGym_MapEventHeader:
+CeruleanGym_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeruleanGymBadgeSpeechHouse.asm

@@ -1,7 +1,7 @@
 const_value set 2
 	const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M
 
-CeruleanGymBadgeSpeechHouse_MapScriptHeader:
+CeruleanGymBadgeSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -16,7 +16,7 @@ CeruleanGymBadgeSpeechHousePokefanMText:
 	line "KANTO GYM BADGES?"
 	done
 
-CeruleanGymBadgeSpeechHouse_MapEventHeader:
+CeruleanGymBadgeSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeruleanMart.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const CERULEANMART_COOLTRAINER_M
 	const CERULEANMART_COOLTRAINER_F
 
-CeruleanMart_MapScriptHeader:
+CeruleanMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -45,7 +45,7 @@ CeruleanMart_CooltrainerFText:
 	cont "CERULEAN's CAPE."
 	done
 
-CeruleanMart_MapEventHeader:
+CeruleanMart_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeruleanPokecenter1F.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const CERULEANPOKECENTER1F_SUPER_NERD
 	const CERULEANPOKECENTER1F_GYM_GUY
 
-CeruleanPokecenter1F_MapScriptHeader:
+CeruleanPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -62,7 +62,7 @@ CeruleanPokecenter1FGymGuyText:
 	line "JOHTO accessible."
 	done
 
-CeruleanPokecenter1F_MapEventHeader:
+CeruleanPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeruleanPokecenter2FBeta.asm

@@ -1,11 +1,11 @@
-CeruleanPokecenter2FBeta_MapScriptHeader:
+CeruleanPokecenter2FBeta_MapScripts:
 .SceneScripts:
 	db 0
 
 .MapCallbacks:
 	db 0
 
-CeruleanPokecenter2FBeta_MapEventHeader:
+CeruleanPokecenter2FBeta_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeruleanPoliceStation.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const CERULEANPOLICESTATION_POKEFAN_F
 	const CERULEANPOLICESTATION_DIGLETT
 
-CeruleanPoliceStation_MapScriptHeader:
+CeruleanPoliceStation_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -43,7 +43,7 @@ CeruleanDiglettText:
 	text "DIGLETT: Dug dug."
 	done
 
-CeruleanPoliceStation_MapEventHeader:
+CeruleanPoliceStation_MapEvents:
 	; filler
 	db 0, 0
 

maps/CeruleanTradeSpeechHouse.asm

@@ -4,7 +4,7 @@ const_value set 2
 	const CERULEANTRADESPEECHHOUSE_RHYDON
 	const CERULEANTRADESPEECHHOUSE_ZUBAT
 
-CeruleanTradeSpeechHouse_MapScriptHeader:
+CeruleanTradeSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -53,7 +53,7 @@ UnknownText_0x1881b5:
 	text "ZUBAT: Zuba zubaa."
 	done
 
-CeruleanTradeSpeechHouse_MapEventHeader:
+CeruleanTradeSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 

maps/CharcoalKiln.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const CHARCOALKILN_YOUNGSTER
 	const CHARCOALKILN_MOLTRES
 
-CharcoalKiln_MapScriptHeader:
+CharcoalKiln_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -148,7 +148,7 @@ FarfetchdText:
 	text "FARFETCH'D: Kwaa!"
 	done
 
-CharcoalKiln_MapEventHeader:
+CharcoalKiln_MapEvents:
 	; filler
 	db 0, 0
 

maps/CherrygroveCity.asm

@@ -5,7 +5,7 @@ const_value set 2
 	const CHERRYGROVECITY_YOUNGSTER
 	const CHERRYGROVECITY_FISHER
 
-CherrygroveCity_MapScriptHeader:
+CherrygroveCity_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -546,7 +546,7 @@ GuideGentsHouseSignText:
 	text "GUIDE GENT'S HOUSE"
 	done
 
-CherrygroveCity_MapEventHeader:
+CherrygroveCity_MapEvents:
 	; filler
 	db 0, 0
 

maps/CherrygroveEvolutionSpeechHouse.asm

@@ -2,7 +2,7 @@ const_value set 2
 	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS
 	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER
 
-CherrygroveEvolutionSpeechHouse_MapScriptHeader:
+CherrygroveEvolutionSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -41,7 +41,7 @@ UnknownText_0x196cfc:
 	line "if one did that!"
 	done
 
-CherrygroveEvolutionSpeechHouse_MapEventHeader:
+CherrygroveEvolutionSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 

maps/CherrygroveGymSpeechHouse.asm

@@ -2,7 +2,7 @@ const_value set 2
 	const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M
 	const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER
 
-CherrygroveGymSpeechHouse_MapScriptHeader:
+CherrygroveGymSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -44,7 +44,7 @@ CherrygroveGymSpeechHouseBugCatcherText:
 	line "them tougher!"
 	done
 
-CherrygroveGymSpeechHouse_MapEventHeader:
+CherrygroveGymSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 

maps/CherrygroveMart.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const CHERRYGROVEMART_COOLTRAINER_M
 	const CHERRYGROVEMART_YOUNGSTER
 
-CherrygroveMart_MapScriptHeader:
+CherrygroveMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -71,7 +71,7 @@ CherrygroveMartYoungsterText:
 	line "ANTIDOTE with you."
 	done
 
-CherrygroveMart_MapEventHeader:
+CherrygroveMart_MapEvents:
 	; filler
 	db 0, 0
 

maps/CherrygrovePokecenter1F.asm

@@ -4,7 +4,7 @@ const_value set 2
 	const CHERRYGROVEPOKECENTER1F_GENTLEMAN
 	const CHERRYGROVEPOKECENTER1F_TEACHER
 
-CherrygrovePokecenter1F_MapScriptHeader:
+CherrygrovePokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -68,7 +68,7 @@ UnknownText_0x196a46:
 	line "there already!"
 	done
 
-CherrygrovePokecenter1F_MapEventHeader:
+CherrygrovePokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CianwoodCity.asm

@@ -12,7 +12,7 @@ const_value set 2
 	const CIANWOODCITY_EUSINE
 	const CIANWOODCITY_SUICUNE
 
-CianwoodCity_MapScriptHeader:
+CianwoodCity_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -380,7 +380,7 @@ CianwoodPokeSeerSignText:
 	line "AHEAD"
 	done
 
-CianwoodCity_MapEventHeader:
+CianwoodCity_MapEvents:
 	; filler
 	db 0, 0
 

maps/CianwoodGym.asm

@@ -9,7 +9,7 @@ const_value set 2
 	const CIANWOODGYM_BOULDER3
 	const CIANWOODGYM_BOULDER4
 
-CianwoodGym_MapScriptHeader:
+CianwoodGym_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -305,7 +305,7 @@ BlackbeltLungAfterText:
 	cont "shattered…"
 	done
 
-CianwoodGym_MapEventHeader:
+CianwoodGym_MapEvents:
 	; filler
 	db 0, 0
 

maps/CianwoodLugiaSpeechHouse.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const CIANWOODLUGIASPEECHHOUSE_LASS
 	const CIANWOODLUGIASPEECHHOUSE_TWIN
 
-CianwoodLugiaSpeechHouse_MapScriptHeader:
+CianwoodLugiaSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -61,7 +61,7 @@ CianwoodLugiaSpeechHouseTwinText:
 	cont "get past them."
 	done
 
-CianwoodLugiaSpeechHouse_MapEventHeader:
+CianwoodLugiaSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 

maps/CianwoodPharmacy.asm

@@ -1,7 +1,7 @@
 const_value set 2
 	const CIANWOODPHARMACY_PHARMACIST
 
-CianwoodPharmacy_MapScriptHeader:
+CianwoodPharmacy_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -72,7 +72,7 @@ PharmacistDescribeSecretpotionText:
 	line "an emergency."
 	done
 
-CianwoodPharmacy_MapEventHeader:
+CianwoodPharmacy_MapEvents:
 	; filler
 	db 0, 0
 

maps/CianwoodPhotoStudio.asm

@@ -1,7 +1,7 @@
 const_value set 2
 	const CIANWOODPHOTOSTUDIO_FISHING_GURU
 
-CianwoodPhotoStudio_MapScriptHeader:
+CianwoodPhotoStudio_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -48,7 +48,7 @@ UnknownText_0x9e156:
 	line "memento…"
 	done
 
-CianwoodPhotoStudio_MapEventHeader:
+CianwoodPhotoStudio_MapEvents:
 	; filler
 	db 0, 0
 

maps/CianwoodPokecenter1F.asm

@@ -4,7 +4,7 @@ const_value set 2
 	const CIANWOODPOKECENTER1F_GYM_GUY
 	const CIANWOODPOKECENTER1F_SUPER_NERD
 
-CianwoodPokecenter1F_MapScriptHeader:
+CianwoodPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -131,7 +131,7 @@ CianwoodPokecenter1FSuperNerdText:
 	line "off my #MON!"
 	done
 
-CianwoodPokecenter1F_MapEventHeader:
+CianwoodPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CinnabarIsland.asm

@@ -1,7 +1,7 @@
 const_value set 2
 	const CINNABARISLAND_BLUE
 
-CinnabarIsland_MapScriptHeader:
+CinnabarIsland_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -127,7 +127,7 @@ CinnabarIslandSignText:
 	line "Burning Desire"
 	done
 
-CinnabarIsland_MapEventHeader:
+CinnabarIsland_MapEvents:
 	; filler
 	db 0, 0
 

maps/CinnabarPokecenter1F.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const CINNABARPOKECENTER1F_COOLTRAINER_F
 	const CINNABARPOKECENTER1F_FISHER
 
-CinnabarPokecenter1F_MapScriptHeader:
+CinnabarPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -34,7 +34,7 @@ CinnabarPokecenter1FFisherText:
 	cont "erupted."
 	done
 
-CinnabarPokecenter1F_MapEventHeader:
+CinnabarPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CinnabarPokecenter2FBeta.asm

@@ -1,11 +1,11 @@
-CinnabarPokecenter2FBeta_MapScriptHeader:
+CinnabarPokecenter2FBeta_MapScripts:
 .SceneScripts:
 	db 0
 
 .MapCallbacks:
 	db 0
 
-CinnabarPokecenter2FBeta_MapEventHeader:
+CinnabarPokecenter2FBeta_MapEvents:
 	; filler
 	db 0, 0
 

maps/Colosseum.asm

@@ -2,7 +2,7 @@ const_value set 2
 	const COLOSSEUM_CHRIS1
 	const COLOSSEUM_CHRIS2
 
-Colosseum_MapScriptHeader:
+Colosseum_MapScripts:
 .SceneScripts:
 	db 3
 	scene_script .InitializeColosseum
@@ -62,7 +62,7 @@ ChrisScript_0x193499:
 	line "ready."
 	done
 
-Colosseum_MapEventHeader:
+Colosseum_MapEvents:
 	; filler
 	db 0, 0
 

maps/CopycatsHouse1F.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const COPYCATSHOUSE1F_POKEFAN_F
 	const COPYCATSHOUSE1F_CLEFAIRY
 
-CopycatsHouse1F_MapScriptHeader:
+CopycatsHouse1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -72,7 +72,7 @@ UnknownText_0x18ae4b:
 	text "BLISSEY: Bliisii!"
 	done
 
-CopycatsHouse1F_MapEventHeader:
+CopycatsHouse1F_MapEvents:
 	; filler
 	db 0, 0
 

maps/CopycatsHouse2F.asm

@@ -6,7 +6,7 @@ const_value set 2
 	const COPYCATSHOUSE2F_BIRDDOLL
 	const COPYCATSHOUSE2F_COPYCAT2 ; if player is female
 
-CopycatsHouse2F_MapScriptHeader:
+CopycatsHouse2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -360,7 +360,7 @@ CopycatsHouse2FDollText:
 	para "It's only a doll…"
 	done
 
-CopycatsHouse2F_MapEventHeader:
+CopycatsHouse2F_MapEvents:
 	; filler
 	db 0, 0
 

maps/DanceTheatre.asm

@@ -9,7 +9,7 @@ const_value set 2
 	const DANCETHEATRE_COOLTRAINER_M
 	const DANCETHEATRE_GRANNY
 
-DanceTheatre_MapScriptHeader:
+DanceTheatre_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -337,7 +337,7 @@ FancyPanelText:
 	cont "with flowers."
 	done
 
-DanceTheatre_MapEventHeader:
+DanceTheatre_MapEvents:
 	; filler
 	db 0, 0
 

maps/DarkCaveBlackthornEntrance.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1
 	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2
 
-DarkCaveBlackthornEntrance_MapScriptHeader:
+DarkCaveBlackthornEntrance_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -61,7 +61,7 @@ DarkCaveBlackthornEntrancePharmacistText2:
 	cont "type moves."
 	done
 
-DarkCaveBlackthornEntrance_MapEventHeader:
+DarkCaveBlackthornEntrance_MapEvents:
 	; filler
 	db 0, 0
 

maps/DarkCaveVioletEntrance.asm

@@ -8,7 +8,7 @@ const_value set 2
 	const DARKCAVEVIOLETENTRANCE_POKE_BALL3
 	const DARKCAVEVIOLETENTRANCE_POKE_BALL4
 
-DarkCaveVioletEntrance_MapScriptHeader:
+DarkCaveVioletEntrance_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -33,7 +33,7 @@ DarkCaveVioletEntranceRock:
 DarkCaveVioletEntranceHiddenElixer:
 	hiddenitem EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER
 
-DarkCaveVioletEntrance_MapEventHeader:
+DarkCaveVioletEntrance_MapEvents:
 	; filler
 	db 0, 0
 

maps/DayCare.asm

@@ -2,7 +2,7 @@ const_value set 2
 	const DAYCARE_GRAMPS
 	const DAYCARE_GRANNY
 
-DayCare_MapScriptHeader:
+DayCare_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -155,7 +155,7 @@ DayCareText_PartyFull:
 	line "this."
 	done
 
-DayCare_MapEventHeader:
+DayCare_MapEvents:
 	; filler
 	db 0, 0
 

maps/DiglettsCave.asm

@@ -1,7 +1,7 @@
 const_value set 2
 	const DIGLETTSCAVE_POKEFAN_M
 
-DiglettsCave_MapScriptHeader:
+DiglettsCave_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -22,7 +22,7 @@ DiglettsCavePokefanMText:
 	line "shocking."
 	done
 
-DiglettsCave_MapEventHeader:
+DiglettsCave_MapEvents:
 	; filler
 	db 0, 0
 

maps/DragonShrine.asm

@@ -4,7 +4,7 @@ const_value set 2
 	const DRAGONSHRINE_ELDER3
 	const DRAGONSHRINE_CLAIR
 
-DragonShrine_MapScriptHeader:
+DragonShrine_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DragonShrineTest
@@ -657,7 +657,7 @@ DragonShrineSpeechlessText:
 	text "<......><......><......><......><......><......>"
 	done
 
-DragonShrine_MapEventHeader:
+DragonShrine_MapEvents:
 	; filler
 	db 0, 0