shithub: pokecrystal

Download patch

ref: bf074f359886707d2ffb2e0b525b03dc7af0fe29
parent: 3d0e1819e919676b90e2a8621149a0c12689dd37
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Tue Jan 16 17:57:19 EST 2018

map_header → map_def; map_header_2 → map_data

--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -15,11 +15,11 @@
 
 ; 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 @@
 
 	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
--- a/constants/map_data_constants.asm
+++ b/constants/map_data_constants.asm
@@ -3,18 +3,18 @@
 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 MAPHEADER_TILESET         ; 1
-	const MAPHEADER_ENVIRONMENT     ; 2
-	const MAPHEADER_MAPHEADER2      ; 3
-	const MAPHEADER_MAPHEADER2_HI   ; 4
-	const MAPHEADER_LOCATION        ; 5
-	const MAPHEADER_MUSIC           ; 6
-	const MAPHEADER_PALETTE         ; 7
-	const MAPHEADER_FISHGROUP       ; 8
-NUM_MAPHEADER_ATTRIBUTES EQU const_value
+	const MAPDEF_MAPDATA_BANK ; 0
+	const MAPDEF_TILESET      ; 1
+	const MAPDEF_ENVIRONMENT  ; 2
+	const MAPDEF_MAPDATA      ; 3
+	const MAPDEF_MAPDATA_HI   ; 4
+	const MAPDEF_LOCATION     ; 5
+	const MAPDEF_MUSIC        ; 6
+	const MAPDEF_PALETTE      ; 7
+	const MAPDEF_FISHGROUP    ; 8
+NUM_MAPDEF_ATTRIBUTES EQU const_value
 
 ; map environments (wEnvironment)
 const_value set 1
@@ -52,7 +52,7 @@
 	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
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -108,7 +108,7 @@
 	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
@@ -115,6 +115,6 @@
 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
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@@ -1,1047 +1,1047 @@
-SECTION "Map Blockdata 1", ROMX
+SECTION "Map Blocks 1", ROMX
 
-Route32_BlockData:
+Route32_Blocks:
 	INCBIN "maps/Route32.blk"
 
-Route40_BlockData:
+Route40_Blocks:
 	INCBIN "maps/Route40.blk"
 
-Route36_BlockData:
+Route36_Blocks:
 	INCBIN "maps/Route36.blk"
 
-Route44_BlockData:
+Route44_Blocks:
 	INCBIN "maps/Route44.blk"
 
-Route28_BlockData:
+Route28_Blocks:
 	INCBIN "maps/Route28.blk"
 
-BetaHerosHouse_BlockData:
+BetaHerosHouse_Blocks:
 	INCBIN "maps/unused/BetaHerosHouse.blk"
 
-CeladonCity_BlockData:
+CeladonCity_Blocks:
 	INCBIN "maps/CeladonCity.blk"
 
-SaffronCity_BlockData:
+SaffronCity_Blocks:
 	INCBIN "maps/SaffronCity.blk"
 
-Route2_BlockData:
+Route2_Blocks:
 	INCBIN "maps/Route2.blk"
 
-ElmsHouse_BlockData:
+ElmsHouse_Blocks:
 	INCBIN "maps/ElmsHouse.blk"
 
-BetaSproutTower1_BlockData:
+BetaSproutTower1_Blocks:
 	INCBIN "maps/unused/BetaSproutTower1.blk"
 
-Route11_BlockData:
+Route11_Blocks:
 	INCBIN "maps/Route11.blk"
 
-BetaSproutTower5_BlockData:
+BetaSproutTower5_Blocks:
 	INCBIN "maps/unused/BetaSproutTower5.blk"
 
-Route15_BlockData:
+Route15_Blocks:
 	INCBIN "maps/Route15.blk"
 
-BetaSproutTower9_BlockData:
+BetaSproutTower9_Blocks:
 	INCBIN "maps/unused/BetaSproutTower9.blk"
 
-Route19_BlockData:
+Route19_Blocks:
 	INCBIN "maps/Route19.blk"
 
-BetaBlackthornCity_BlockData:
+BetaBlackthornCity_Blocks:
 	INCBIN "maps/unused/BetaBlackthornCity.blk"
 
-Route10South_BlockData:
+Route10South_Blocks:
 	INCBIN "maps/Route10South.blk"
 
-Pokecenter2F_BlockData:
-CinnabarPokecenter2FBeta_BlockData:
-CeruleanPokecenter2FBeta_BlockData:
-Route10Pokecenter2FBeta_BlockData:
-VermilionPokecenter2FBeta_BlockData:
-PewterPokecenter2FBeta_BlockData:
-FuchsiaPokecenter2FBeta_BlockData:
-LavenderPokecenter2FBeta_BlockData:
-CeladonPokecenter2FBeta_BlockData:
-ViridianPokecenter2FBeta_BlockData:
-SaffronPokecenter2FBeta_BlockData:
+Pokecenter2F_Blocks:
+CinnabarPokecenter2FBeta_Blocks:
+CeruleanPokecenter2FBeta_Blocks:
+Route10Pokecenter2FBeta_Blocks:
+VermilionPokecenter2FBeta_Blocks:
+PewterPokecenter2FBeta_Blocks:
+FuchsiaPokecenter2FBeta_Blocks:
+LavenderPokecenter2FBeta_Blocks:
+CeladonPokecenter2FBeta_Blocks:
+ViridianPokecenter2FBeta_Blocks:
+SaffronPokecenter2FBeta_Blocks:
 	INCBIN "maps/Pokecenter2F.blk"
 
-Route41_BlockData:
+Route41_Blocks:
 	INCBIN "maps/Route41.blk"
 
-Route33_BlockData:
+Route33_Blocks:
 	INCBIN "maps/Route33.blk"
 
-Route45_BlockData:
+Route45_Blocks:
 	INCBIN "maps/Route45.blk"
 
-Route29_BlockData:
+Route29_Blocks:
 	INCBIN "maps/Route29.blk"
 
-Route37_BlockData:
+Route37_Blocks:
 	INCBIN "maps/Route37.blk"
 
-LavenderTown_BlockData:
+LavenderTown_Blocks:
 	INCBIN "maps/LavenderTown.blk"
 
-PalletTown_BlockData:
+PalletTown_Blocks:
 	INCBIN "maps/PalletTown.blk"
 
-Route25_BlockData:
+Route25_Blocks:
 	INCBIN "maps/Route25.blk"
 
-Route24_BlockData:
+Route24_Blocks:
 	INCBIN "maps/Route24.blk"
 
-BetaVioletCity_BlockData:
+BetaVioletCity_Blocks:
 	INCBIN "maps/unused/BetaVioletCity.blk"
 
-Route3_BlockData:
+Route3_Blocks:
 	INCBIN "maps/Route3.blk"
 
-PewterCity_BlockData:
+PewterCity_Blocks:
 	INCBIN "maps/PewterCity.blk"
 
-BetaIlexForest_BlockData:
+BetaIlexForest_Blocks:
 	INCBIN "maps/unused/BetaIlexForest.blk"
 
-BetaSproutTower2_BlockData:
+BetaSproutTower2_Blocks:
 	INCBIN "maps/unused/BetaSproutTower2.blk"
 
-Route12_BlockData:
+Route12_Blocks:
 	INCBIN "maps/Route12.blk"
 
-BetaGoldenrodCity_BlockData:
+BetaGoldenrodCity_Blocks:
 	INCBIN "maps/unused/BetaGoldenrodCity.blk"
 
-Route20_BlockData:
+Route20_Blocks:
 	INCBIN "maps/Route20.blk"
 
-BetaSproutTower6_BlockData:
+BetaSproutTower6_Blocks:
 	INCBIN "maps/unused/BetaSproutTower6.blk"
 
-BetaPokecenterMainHouse_BlockData:
+BetaPokecenterMainHouse_Blocks:
 	INCBIN "maps/unused/BetaPokecenterMainHouse.blk"
 
-Route30_BlockData:
+Route30_Blocks:
 	INCBIN "maps/Route30.blk"
 
-Route26_BlockData:
+Route26_Blocks:
 	INCBIN "maps/Route26.blk"
 
-Route42_BlockData:
+Route42_Blocks:
 	INCBIN "maps/Route42.blk"
 
-Route34_BlockData:
+Route34_Blocks:
 	INCBIN "maps/Route34.blk"
 
-Route46_BlockData:
+Route46_Blocks:
 	INCBIN "maps/Route46.blk"
 
-FuchsiaCity_BlockData:
+FuchsiaCity_Blocks:
 	INCBIN "maps/FuchsiaCity.blk"
 
-Route38_BlockData:
+Route38_Blocks:
 	INCBIN "maps/Route38.blk"
 
-BetaCianwoodCity_BlockData:
+BetaCianwoodCity_Blocks:
 	INCBIN "maps/unused/BetaCianwoodCity.blk"
 
-OlivineTimsHouse_BlockData:
-OlivineHouseBeta_BlockData:
-OlivinePunishmentSpeechHouse_BlockData:
-OlivineGoodRodHouse_BlockData:
-Route39Farmhouse_BlockData:
-MahoganyRedGyaradosSpeechHouse_BlockData:
-BlackthornDragonSpeechHouse_BlockData:
-BlackthornEmysHouse_BlockData:
-MoveDeletersHouse_BlockData:
-CeruleanGymBadgeSpeechHouse_BlockData:
-CeruleanPoliceStation_BlockData:
-CeruleanTradeSpeechHouse_BlockData:
-BillsHouse_BlockData:
-CharcoalKiln_BlockData:
-LakeOfRageHiddenPowerHouse_BlockData:
-LakeOfRageMagikarpHouse_BlockData:
-GoldenrodHappinessRater_BlockData:
-GoldenrodBillsHouse_BlockData:
-GoldenrodPPSpeechHouse_BlockData:
-GoldenrodNameRater_BlockData:
-VermilionHouseFishingSpeechHouse_BlockData:
-VermilionMagnetTrainSpeechHouse_BlockData:
-VermilionHouseDiglettsCaveSpeechHouse_BlockData:
-BluesHouse_BlockData:
-PewterNidoranSpeechHouse_BlockData:
-PewterSnoozeSpeechHouse_BlockData:
-FuchsiaBillSpeechHouse_BlockData:
-LavenderSpeechHouse_BlockData:
-LavenderNameRater_BlockData:
-Route12SuperRodHouse_BlockData:
-Route28FamousSpeechHouse_BlockData:
-CeladonMansionRoofHouse_BlockData:
-Route16FuchsiaSpeechHouse_BlockData:
-ManiasHouse_BlockData:
-CianwoodPharmacy_BlockData:
-CianwoodPhotoStudio_BlockData:
-CianwoodLugiaSpeechHouse_BlockData:
-PokeSeersHouse_BlockData:
-ViridianNicknameSpeechHouse_BlockData:
-Route2NuggetSpeechHouse_BlockData:
-KrissNeighborsHouse_BlockData:
-Route26HealSpeechHouse_BlockData:
-Route26DayofWeekSiblingsHouse_BlockData:
-Route27SandstormHouse_BlockData:
-MrPsychicsHouse_BlockData:
-Route5CleanseTagSpeechHouse_BlockData:
-CherrygroveGymSpeechHouse_BlockData:
-GuideGentsHouse_BlockData:
-CherrygroveEvolutionSpeechHouse_BlockData:
-Route30BerrySpeechHouse_BlockData:
+OlivineTimsHouse_Blocks:
+OlivineHouseBeta_Blocks:
+OlivinePunishmentSpeechHouse_Blocks:
+OlivineGoodRodHouse_Blocks:
+Route39Farmhouse_Blocks:
+MahoganyRedGyaradosSpeechHouse_Blocks:
+BlackthornDragonSpeechHouse_Blocks:
+BlackthornEmysHouse_Blocks:
+MoveDeletersHouse_Blocks:
+CeruleanGymBadgeSpeechHouse_Blocks:
+CeruleanPoliceStation_Blocks:
+CeruleanTradeSpeechHouse_Blocks:
+BillsHouse_Blocks:
+CharcoalKiln_Blocks:
+LakeOfRageHiddenPowerHouse_Blocks:
+LakeOfRageMagikarpHouse_Blocks:
+GoldenrodHappinessRater_Blocks:
+GoldenrodBillsHouse_Blocks:
+GoldenrodPPSpeechHouse_Blocks:
+GoldenrodNameRater_Blocks:
+VermilionHouseFishingSpeechHouse_Blocks:
+VermilionMagnetTrainSpeechHouse_Blocks:
+VermilionHouseDiglettsCaveSpeechHouse_Blocks:
+BluesHouse_Blocks:
+PewterNidoranSpeechHouse_Blocks:
+PewterSnoozeSpeechHouse_Blocks:
+FuchsiaBillSpeechHouse_Blocks:
+LavenderSpeechHouse_Blocks:
+LavenderNameRater_Blocks:
+Route12SuperRodHouse_Blocks:
+Route28FamousSpeechHouse_Blocks:
+CeladonMansionRoofHouse_Blocks:
+Route16FuchsiaSpeechHouse_Blocks:
+ManiasHouse_Blocks:
+CianwoodPharmacy_Blocks:
+CianwoodPhotoStudio_Blocks:
+CianwoodLugiaSpeechHouse_Blocks:
+PokeSeersHouse_Blocks:
+ViridianNicknameSpeechHouse_Blocks:
+Route2NuggetSpeechHouse_Blocks:
+KrissNeighborsHouse_Blocks:
+Route26HealSpeechHouse_Blocks:
+Route26DayofWeekSiblingsHouse_Blocks:
+Route27SandstormHouse_Blocks:
+MrPsychicsHouse_Blocks:
+Route5CleanseTagSpeechHouse_Blocks:
+CherrygroveGymSpeechHouse_Blocks:
+GuideGentsHouse_Blocks:
+CherrygroveEvolutionSpeechHouse_Blocks:
+Route30BerrySpeechHouse_Blocks:
 	INCBIN "maps/House1.blk"
 
-SafariZoneFuchsiaGateBeta_BlockData:
-Route19FuchsiaGate_BlockData:
-Route43MahoganyGate_BlockData:
-Route43Gate_BlockData:
-Route35GoldenrodGate_BlockData:
-Route36RuinsOfAlphGate_BlockData:
-Route34IlexForestGate_BlockData:
-Route6SaffronGate_BlockData:
-Route40BattleTowerGate_BlockData:
-Route2Gate_BlockData:
-Route29Route46Gate_BlockData:
-Route5SaffronGate_BlockData:
+SafariZoneFuchsiaGateBeta_Blocks:
+Route19FuchsiaGate_Blocks:
+Route43MahoganyGate_Blocks:
+Route43Gate_Blocks:
+Route35GoldenrodGate_Blocks:
+Route36RuinsOfAlphGate_Blocks:
+Route34IlexForestGate_Blocks:
+Route6SaffronGate_Blocks:
+Route40BattleTowerGate_Blocks:
+Route2Gate_Blocks:
+Route29Route46Gate_Blocks:
+Route5SaffronGate_Blocks:
 	INCBIN "maps/NorthSouthGate.blk"
 
-BetaEcruteakCity_BlockData:
+BetaEcruteakCity_Blocks:
 	INCBIN "maps/unused/BetaEcruteakCity.blk"
 
-BetaCherrygroveCity_BlockData:
+BetaCherrygroveCity_Blocks:
 	INCBIN "maps/unused/BetaCherrygroveCity.blk"
 
-CinnabarIsland_BlockData:
+CinnabarIsland_Blocks:
 	INCBIN "maps/CinnabarIsland.blk"
 
-Route4_BlockData:
+Route4_Blocks:
 	INCBIN "maps/Route4.blk"
 
-Route8_BlockData:
+Route8_Blocks:
 	INCBIN "maps/Route8.blk"
 
-BetaSproutTower3_BlockData:
+BetaSproutTower3_Blocks:
 	INCBIN "maps/unused/BetaSproutTower3.blk"
 
-ViridianCity_BlockData:
+ViridianCity_Blocks:
 	INCBIN "maps/ViridianCity.blk"
 
-Route13_BlockData:
+Route13_Blocks:
 	INCBIN "maps/Route13.blk"
 
-Route21_BlockData:
+Route21_Blocks:
 	INCBIN "maps/Route21.blk"
 
-BetaSproutTower7_BlockData:
+BetaSproutTower7_Blocks:
 	INCBIN "maps/unused/BetaSproutTower7.blk"
 
-Route17_BlockData:
+Route17_Blocks:
 	INCBIN "maps/Route17.blk"
 
-BetaMahoganyTown_BlockData:
+BetaMahoganyTown_Blocks:
 	INCBIN "maps/unused/BetaMahoganyTown.blk"
 
-Route31_BlockData:
+Route31_Blocks:
 	INCBIN "maps/Route31.blk"
 
-Route27_BlockData:
+Route27_Blocks:
 	INCBIN "maps/Route27.blk"
 
-Route35_BlockData:
+Route35_Blocks:
 	INCBIN "maps/Route35.blk"
 
-Route43_BlockData:
+Route43_Blocks:
 	INCBIN "maps/Route43.blk"
 
-Route39_BlockData:
+Route39_Blocks:
 	INCBIN "maps/Route39.blk"
 
-KrissHouse1F_BlockData:
+KrissHouse1F_Blocks:
 	INCBIN "maps/KrissHouse1F.blk"
 
-Route38EcruteakGate_BlockData:
-Route42EcruteakGate_BlockData:
-Route32RuinsOfAlphGate_BlockData:
-IlexForestAzaleaGate_BlockData:
-Route15FuchsiaGate_BlockData:
-Route8SaffronGate_BlockData:
-Route16Gate_BlockData:
-Route7SaffronGate_BlockData:
-Route17Route18Gate_BlockData:
-Route31VioletGate_BlockData:
+Route38EcruteakGate_Blocks:
+Route42EcruteakGate_Blocks:
+Route32RuinsOfAlphGate_Blocks:
+IlexForestAzaleaGate_Blocks:
+Route15FuchsiaGate_Blocks:
+Route8SaffronGate_Blocks:
+Route16Gate_Blocks:
+Route7SaffronGate_Blocks:
+Route17Route18Gate_Blocks:
+Route31VioletGate_Blocks:
 	INCBIN "maps/EastWestGate.blk"
 
-BetaAzaleaTown_BlockData:
+BetaAzaleaTown_Blocks:
 	INCBIN "maps/unused/BetaAzaleaTown.blk"
 
-VermilionCity_BlockData:
+VermilionCity_Blocks:
 	INCBIN "maps/VermilionCity.blk"
 
-BetaOlivineCity_BlockData:
+BetaOlivineCity_Blocks:
 	INCBIN "maps/unused/BetaOlivineCity.blk"
 
-BetaNewBarkTown_BlockData:
+BetaNewBarkTown_Blocks:
 	INCBIN "maps/unused/BetaNewBarkTown.blk"
 
-ElmsLab_BlockData:
+ElmsLab_Blocks:
 	INCBIN "maps/ElmsLab.blk"
 
-CeruleanCity_BlockData:
+CeruleanCity_Blocks:
 	INCBIN "maps/CeruleanCity.blk"
 
-Route1_BlockData:
+Route1_Blocks:
 	INCBIN "maps/Route1.blk"
 
-Route5_BlockData:
+Route5_Blocks:
 	INCBIN "maps/Route5.blk"
 
-Route9_BlockData:
+Route9_Blocks:
 	INCBIN "maps/Route9.blk"
 
-Route22_BlockData:
+Route22_Blocks:
 	INCBIN "maps/Route22.blk"
 
 
-SECTION "Map Blockdata 2", ROMX
+SECTION "Map Blocks 2", ROMX
 
-Route14_BlockData:
+Route14_Blocks:
 	INCBIN "maps/Route14.blk"
 
-BetaSproutTower8_BlockData:
+BetaSproutTower8_Blocks:
 	INCBIN "maps/unused/BetaSproutTower8.blk"
 
-OlivineMart_BlockData:
-EcruteakMart_BlockData:
-BlackthornMart_BlockData:
-CeruleanMart_BlockData:
-AzaleaMart_BlockData:
-VioletMart_BlockData:
-VermilionMart_BlockData:
-PewterMart_BlockData:
-FuchsiaMart_BlockData:
-LavenderMart_BlockData:
-ViridianMart_BlockData:
-SaffronMart_BlockData:
-CherrygroveMart_BlockData:
+OlivineMart_Blocks:
+EcruteakMart_Blocks:
+BlackthornMart_Blocks:
+CeruleanMart_Blocks:
+AzaleaMart_Blocks:
+VioletMart_Blocks:
+VermilionMart_Blocks:
+PewterMart_Blocks:
+FuchsiaMart_Blocks:
+LavenderMart_Blocks:
+ViridianMart_Blocks:
+SaffronMart_Blocks:
+CherrygroveMart_Blocks:
 	INCBIN "maps/Mart.blk"
 
-Route10North_BlockData:
+Route10North_Blocks:
 	INCBIN "maps/Route10North.blk"
 
-BetaLakeOfRage_BlockData:
+BetaLakeOfRage_Blocks:
 	INCBIN "maps/unused/BetaLakeOfRage.blk"
 
-OlivinePokecenter1F_BlockData:
-MahoganyPokecenter1F_BlockData:
-EcruteakPokecenter1F_BlockData:
-BlackthornPokecenter1F_BlockData:
-CinnabarPokecenter1F_BlockData:
-CeruleanPokecenter1F_BlockData:
-Route10Pokecenter1F_BlockData:
-AzaleaPokecenter1F_BlockData:
-VioletPokecenter1F_BlockData:
-Route32Pokecenter1F_BlockData:
-GoldenrodPokecenter1F_BlockData:
-VermilionPokecenter1F_BlockData:
-PewterPokecenter1F_BlockData:
-FuchsiaPokecenter1F_BlockData:
-LavenderPokecenter1F_BlockData:
-SilverCavePokecenter1F_BlockData:
-CeladonPokecenter1F_BlockData:
-CianwoodPokecenter1F_BlockData:
-ViridianPokecenter1F_BlockData:
-SaffronPokecenter1F_BlockData:
-CherrygrovePokecenter1F_BlockData:
+OlivinePokecenter1F_Blocks:
+MahoganyPokecenter1F_Blocks:
+EcruteakPokecenter1F_Blocks:
+BlackthornPokecenter1F_Blocks:
+CinnabarPokecenter1F_Blocks:
+CeruleanPokecenter1F_Blocks:
+Route10Pokecenter1F_Blocks:
+AzaleaPokecenter1F_Blocks:
+VioletPokecenter1F_Blocks:
+Route32Pokecenter1F_Blocks:
+GoldenrodPokecenter1F_Blocks:
+VermilionPokecenter1F_Blocks:
+PewterPokecenter1F_Blocks:
+FuchsiaPokecenter1F_Blocks:
+LavenderPokecenter1F_Blocks:
+SilverCavePokecenter1F_Blocks:
+CeladonPokecenter1F_Blocks:
+CianwoodPokecenter1F_Blocks:
+ViridianPokecenter1F_Blocks:
+SaffronPokecenter1F_Blocks:
+CherrygrovePokecenter1F_Blocks:
 	INCBIN "maps/Pokecenter1F.blk"
 
-BetaPewterMuseumOfScience1F_BlockData:
+BetaPewterMuseumOfScience1F_Blocks:
 	INCBIN "maps/unused/BetaPewterMuseumOfScience1F.blk"
 
-BetaPewterMuseumOfScience2F_BlockData:
+BetaPewterMuseumOfScience2F_Blocks:
 	INCBIN "maps/unused/BetaPewterMuseumOfScience2F.blk"
 
-EarlsPokemonAcademy_BlockData:
+EarlsPokemonAcademy_Blocks:
 	INCBIN "maps/EarlsPokemonAcademy.blk"
 
-BetaCinnabarPokemonLabHallway_BlockData:
+BetaCinnabarPokemonLabHallway_Blocks:
 	INCBIN "maps/unused/BetaCinnabarPokemonLabHallway.blk"
 
-BetaCinnabarPokemonLabRoom1_BlockData:
+BetaCinnabarPokemonLabRoom1_Blocks:
 	INCBIN "maps/unused/BetaCinnabarPokemonLabRoom1.blk"
 
-BetaCinnabarPokemonLabRoom2_BlockData:
+BetaCinnabarPokemonLabRoom2_Blocks:
 	INCBIN "maps/unused/BetaCinnabarPokemonLabRoom2.blk"
 
-BetaCinnabarPokemonLabRoom3_BlockData:
+BetaCinnabarPokemonLabRoom3_Blocks:
 	INCBIN "maps/unused/BetaCinnabarPokemonLabRoom3.blk"
 
-GoldenrodDeptStore1F_BlockData:
-CeladonDeptStore1F_BlockData:
+GoldenrodDeptStore1F_Blocks:
+CeladonDeptStore1F_Blocks:
 	INCBIN "maps/DeptStore1F.blk"
 
-GoldenrodDeptStore2F_BlockData:
-CeladonDeptStore2F_BlockData:
+GoldenrodDeptStore2F_Blocks:
+CeladonDeptStore2F_Blocks:
 	INCBIN "maps/DeptStore2F.blk"
 
-GoldenrodDeptStore3F_BlockData:
-CeladonDeptStore3F_BlockData:
+GoldenrodDeptStore3F_Blocks:
+CeladonDeptStore3F_Blocks:
 	INCBIN "maps/DeptStore3F.blk"
 
-GoldenrodDeptStore4F_BlockData:
-CeladonDeptStore4F_BlockData:
+GoldenrodDeptStore4F_Blocks:
+CeladonDeptStore4F_Blocks:
 	INCBIN "maps/DeptStore4F.blk"
 
-GoldenrodDeptStore5F_BlockData:
-CeladonDeptStore5F_BlockData:
+GoldenrodDeptStore5F_Blocks:
+CeladonDeptStore5F_Blocks:
 	INCBIN "maps/DeptStore5F.blk"
 
-GoldenrodDeptStore6F_BlockData:
-CeladonDeptStore6F_BlockData:
+GoldenrodDeptStore6F_Blocks:
+CeladonDeptStore6F_Blocks:
 	INCBIN "maps/DeptStore6F.blk"
 
-GoldenrodDeptStoreElevator_BlockData:
-CeladonDeptStoreElevator_BlockData:
+GoldenrodDeptStoreElevator_Blocks:
+CeladonDeptStoreElevator_Blocks:
 	INCBIN "maps/DeptStoreElevator.blk"
 
-CeladonMansion1F_BlockData:
+CeladonMansion1F_Blocks:
 	INCBIN "maps/CeladonMansion1F.blk"
 
-CeladonMansion2F_BlockData:
+CeladonMansion2F_Blocks:
 	INCBIN "maps/CeladonMansion2F.blk"
 
-CeladonMansion3F_BlockData:
+CeladonMansion3F_Blocks:
 	INCBIN "maps/CeladonMansion3F.blk"
 
-CeladonMansionRoof_BlockData:
+CeladonMansionRoof_Blocks:
 	INCBIN "maps/CeladonMansionRoof.blk"
 
-BetaHouse_BlockData:
+BetaHouse_Blocks:
 	INCBIN "maps/unused/BetaHouse.blk"
 
-CeladonGameCorner_BlockData:
+CeladonGameCorner_Blocks:
 	INCBIN "maps/CeladonGameCorner.blk"
 
-CeladonGameCornerPrizeRoom_BlockData:
+CeladonGameCornerPrizeRoom_Blocks:
 	INCBIN "maps/CeladonGameCornerPrizeRoom.blk"
 
-Colosseum_BlockData:
+Colosseum_Blocks:
 	INCBIN "maps/Colosseum.blk"
 
-TradeCenter_BlockData:
-TimeCapsule_BlockData:
+TradeCenter_Blocks:
+TimeCapsule_Blocks:
 	INCBIN "maps/TradeCenter.blk"
 
-EcruteakLugiaSpeechHouse_BlockData:
-EcruteakItemfinderHouse_BlockData:
-VioletNicknameSpeechHouse_BlockData:
-VioletKylesHouse_BlockData:
+EcruteakLugiaSpeechHouse_Blocks:
+EcruteakItemfinderHouse_Blocks:
+VioletNicknameSpeechHouse_Blocks:
+VioletKylesHouse_Blocks:
 	INCBIN "maps/House2.blk"
 
-BetaCave_BlockData:
+BetaCave_Blocks:
 	INCBIN "maps/unused/BetaCave.blk"
 
-UnionCaveB1F_BlockData:
+UnionCaveB1F_Blocks:
 	INCBIN "maps/UnionCaveB1F.blk"
 
-UnionCaveB2F_BlockData:
+UnionCaveB2F_Blocks:
 	INCBIN "maps/UnionCaveB2F.blk"
 
-UnionCave1F_BlockData:
+UnionCave1F_Blocks:
 	INCBIN "maps/UnionCave1F.blk"
 
-NationalPark_BlockData:
-NationalParkBugContest_BlockData:
+NationalPark_Blocks:
+NationalParkBugContest_Blocks:
 	INCBIN "maps/NationalPark.blk"
 
-Route5UndergroundPathEntrance_BlockData:
-Route6UndergroundPathEntrance_BlockData:
+Route5UndergroundPathEntrance_Blocks:
+Route6UndergroundPathEntrance_Blocks:
 	INCBIN "maps/UndergroundPathEntrance.blk"
 
-BetaPokecenterTradeStation_BlockData:
+BetaPokecenterTradeStation_Blocks:
 	INCBIN "maps/unused/BetaPokecenterTradeStation.blk"
 
-KurtsHouse_BlockData:
+KurtsHouse_Blocks:
 	INCBIN "maps/KurtsHouse.blk"
 
-GoldenrodMagnetTrainStation_BlockData:
+GoldenrodMagnetTrainStation_Blocks:
 	INCBIN "maps/GoldenrodMagnetTrainStation.blk"
 
-RuinsOfAlphOutside_BlockData:
+RuinsOfAlphOutside_Blocks:
 	INCBIN "maps/RuinsOfAlphOutside.blk"
 
-BetaRuinsOfAlphUnsolvedPuzzleRoom_BlockData:
+BetaRuinsOfAlphUnsolvedPuzzleRoom_Blocks:
 	INCBIN "maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk"
 
-RuinsOfAlphInnerChamber_BlockData:
+RuinsOfAlphInnerChamber_Blocks:
 	INCBIN "maps/RuinsOfAlphInnerChamber.blk"
 
-RuinsOfAlphHoOhChamber_BlockData:
-RuinsOfAlphKabutoChamber_BlockData:
-RuinsOfAlphOmanyteChamber_BlockData:
-RuinsOfAlphAerodactylChamber_BlockData:
+RuinsOfAlphHoOhChamber_Blocks:
+RuinsOfAlphKabutoChamber_Blocks:
+RuinsOfAlphOmanyteChamber_Blocks:
+RuinsOfAlphAerodactylChamber_Blocks:
 	INCBIN "maps/RuinsOfAlphPuzzleChamber.blk"
 
-SproutTower1F_BlockData:
+SproutTower1F_Blocks:
 	INCBIN "maps/SproutTower1F.blk"
 
-BetaSproutTowerCutOut1_BlockData:
+BetaSproutTowerCutOut1_Blocks:
 	INCBIN "maps/unused/BetaSproutTowerCutOut1.blk"
 
-SproutTower2F_BlockData:
+SproutTower2F_Blocks:
 	INCBIN "maps/SproutTower2F.blk"
 
-BetaSproutTowerCutOut2_BlockData:
+BetaSproutTowerCutOut2_Blocks:
 	INCBIN "maps/unused/BetaSproutTowerCutOut2.blk"
 
-SproutTower3F_BlockData:
+SproutTower3F_Blocks:
 	INCBIN "maps/SproutTower3F.blk"
 
-BetaSproutTowerCutOut3_BlockData:
+BetaSproutTowerCutOut3_Blocks:
 	INCBIN "maps/unused/BetaSproutTowerCutOut3.blk"
 
-RadioTower1F_BlockData:
+RadioTower1F_Blocks:
 	INCBIN "maps/RadioTower1F.blk"
 
-RadioTower2F_BlockData:
+RadioTower2F_Blocks:
 	INCBIN "maps/RadioTower2F.blk"
 
-RadioTower3F_BlockData:
+RadioTower3F_Blocks:
 	INCBIN "maps/RadioTower3F.blk"
 
-RadioTower4F_BlockData:
+RadioTower4F_Blocks:
 	INCBIN "maps/RadioTower4F.blk"
 
-RadioTower5F_BlockData:
+RadioTower5F_Blocks:
 	INCBIN "maps/RadioTower5F.blk"
 
-NewBarkTown_BlockData:
+NewBarkTown_Blocks:
 	INCBIN "maps/NewBarkTown.blk"
 
-CherrygroveCity_BlockData:
+CherrygroveCity_Blocks:
 	INCBIN "maps/CherrygroveCity.blk"
 
-VioletCity_BlockData:
+VioletCity_Blocks:
 	INCBIN "maps/VioletCity.blk"
 
-AzaleaTown_BlockData:
+AzaleaTown_Blocks:
 	INCBIN "maps/AzaleaTown.blk"
 
-CianwoodCity_BlockData:
+CianwoodCity_Blocks:
 	INCBIN "maps/CianwoodCity.blk"
 
-GoldenrodCity_BlockData:
+GoldenrodCity_Blocks:
 	INCBIN "maps/GoldenrodCity.blk"
 
-OlivineCity_BlockData:
+OlivineCity_Blocks:
 	INCBIN "maps/OlivineCity.blk"
 
-EcruteakCity_BlockData:
+EcruteakCity_Blocks:
 	INCBIN "maps/EcruteakCity.blk"
 
-MahoganyTown_BlockData:
+MahoganyTown_Blocks:
 	INCBIN "maps/MahoganyTown.blk"
 
-LakeOfRage_BlockData:
+LakeOfRage_Blocks:
 	INCBIN "maps/LakeOfRage.blk"
 
-BlackthornCity_BlockData:
+BlackthornCity_Blocks:
 	INCBIN "maps/BlackthornCity.blk"
 
-SilverCaveOutside_BlockData:
+SilverCaveOutside_Blocks:
 	INCBIN "maps/SilverCaveOutside.blk"
 
-Route6_BlockData:
+Route6_Blocks:
 	INCBIN "maps/Route6.blk"
 
-Route7_BlockData:
+Route7_Blocks:
 	INCBIN "maps/Route7.blk"
 
-Route16_BlockData:
+Route16_Blocks:
 	INCBIN "maps/Route16.blk"
 
-Route18_BlockData:
+Route18_Blocks:
 	INCBIN "maps/Route18.blk"
 
-GoldenrodUnderground_BlockData:
+GoldenrodUnderground_Blocks:
 	INCBIN "maps/GoldenrodUnderground.blk"
 
-GoldenrodUndergroundSwitchRoomEntrances_BlockData:
+GoldenrodUndergroundSwitchRoomEntrances_Blocks:
 	INCBIN "maps/GoldenrodUndergroundSwitchRoomEntrances.blk"
 
-GoldenrodDeptStoreB1F_BlockData:
+GoldenrodDeptStoreB1F_Blocks:
 	INCBIN "maps/GoldenrodDeptStoreB1F.blk"
 
-GoldenrodUndergroundWarehouse_BlockData:
+GoldenrodUndergroundWarehouse_Blocks:
 	INCBIN "maps/GoldenrodUndergroundWarehouse.blk"
 
-BetaElevator_BlockData:
+BetaElevator_Blocks:
 	INCBIN "maps/unused/BetaElevator.blk"
 
-TinTower1F_BlockData:
+TinTower1F_Blocks:
 	INCBIN "maps/TinTower1F.blk"
 
-TinTower2F_BlockData:
+TinTower2F_Blocks:
 	INCBIN "maps/TinTower2F.blk"
 
-TinTower3F_BlockData:
+TinTower3F_Blocks:
 	INCBIN "maps/TinTower3F.blk"
 
-TinTower4F_BlockData:
+TinTower4F_Blocks:
 	INCBIN "maps/TinTower4F.blk"
 
-TinTower5F_BlockData:
+TinTower5F_Blocks:
 	INCBIN "maps/TinTower5F.blk"
 
-TinTower6F_BlockData:
+TinTower6F_Blocks:
 	INCBIN "maps/TinTower6F.blk"
 
-TinTower7F_BlockData:
+TinTower7F_Blocks:
 	INCBIN "maps/TinTower7F.blk"
 
-TinTower8F_BlockData:
+TinTower8F_Blocks:
 	INCBIN "maps/TinTower8F.blk"
 
-TinTower9F_BlockData:
+TinTower9F_Blocks:
 	INCBIN "maps/TinTower9F.blk"
 
-TinTowerRoof_BlockData:
+TinTowerRoof_Blocks:
 	INCBIN "maps/TinTowerRoof.blk"
 
-BurnedTower1F_BlockData:
+BurnedTower1F_Blocks:
 	INCBIN "maps/BurnedTower1F.blk"
 
-BurnedTowerB1F_BlockData:
+BurnedTowerB1F_Blocks:
 	INCBIN "maps/BurnedTowerB1F.blk"
 
-BetaCaveTestMap_BlockData:
+BetaCaveTestMap_Blocks:
 	INCBIN "maps/unused/BetaCaveTestMap.blk"
 
-MountMortar1FOutside_BlockData:
+MountMortar1FOutside_Blocks:
 	INCBIN "maps/MountMortar1FOutside.blk"
 
-MountMortar1FInside_BlockData:
+MountMortar1FInside_Blocks:
 	INCBIN "maps/MountMortar1FInside.blk"
 
-MountMortar2FInside_BlockData:
+MountMortar2FInside_Blocks:
 	INCBIN "maps/MountMortar2FInside.blk"
 
-MountMortarB1F_BlockData:
+MountMortarB1F_Blocks:
 	INCBIN "maps/MountMortarB1F.blk"
 
-IcePath1F_BlockData:
+IcePath1F_Blocks:
 	INCBIN "maps/IcePath1F.blk"
 
-IcePathB1F_BlockData:
+IcePathB1F_Blocks:
 	INCBIN "maps/IcePathB1F.blk"
 
-IcePathB2FMahoganySide_BlockData:
+IcePathB2FMahoganySide_Blocks:
 	INCBIN "maps/IcePathB2FMahoganySide.blk"
 
-IcePathB2FBlackthornSide_BlockData:
+IcePathB2FBlackthornSide_Blocks:
 	INCBIN "maps/IcePathB2FBlackthornSide.blk"
 
-IcePathB3F_BlockData:
+IcePathB3F_Blocks:
 	INCBIN "maps/IcePathB3F.blk"
 
-WhirlIslandNW_BlockData:
+WhirlIslandNW_Blocks:
 	INCBIN "maps/WhirlIslandNW.blk"
 
-WhirlIslandNE_BlockData:
+WhirlIslandNE_Blocks:
 	INCBIN "maps/WhirlIslandNE.blk"
 
-WhirlIslandSW_BlockData:
+WhirlIslandSW_Blocks:
 	INCBIN "maps/WhirlIslandSW.blk"
 
-WhirlIslandCave_BlockData:
+WhirlIslandCave_Blocks:
 	INCBIN "maps/WhirlIslandCave.blk"
 
-WhirlIslandSE_BlockData:
+WhirlIslandSE_Blocks:
 	INCBIN "maps/WhirlIslandSE.blk"
 
-WhirlIslandB1F_BlockData:
+WhirlIslandB1F_Blocks:
 	INCBIN "maps/WhirlIslandB1F.blk"
 
-WhirlIslandB2F_BlockData:
+WhirlIslandB2F_Blocks:
 	INCBIN "maps/WhirlIslandB2F.blk"
 
-WhirlIslandLugiaChamber_BlockData:
+WhirlIslandLugiaChamber_Blocks:
 	INCBIN "maps/WhirlIslandLugiaChamber.blk"
 
-SilverCaveRoom1_BlockData:
+SilverCaveRoom1_Blocks:
 	INCBIN "maps/SilverCaveRoom1.blk"
 
-SilverCaveRoom2_BlockData:
+SilverCaveRoom2_Blocks:
 	INCBIN "maps/SilverCaveRoom2.blk"
 
-SilverCaveRoom3_BlockData:
+SilverCaveRoom3_Blocks:
 	INCBIN "maps/SilverCaveRoom3.blk"
 
-BetaRocketHideout1_BlockData:
+BetaRocketHideout1_Blocks:
 	INCBIN "maps/unused/BetaRocketHideout1.blk"
 
-BetaRocketHideout2_BlockData:
+BetaRocketHideout2_Blocks:
 	INCBIN "maps/unused/BetaRocketHideout2.blk"
 
-BetaEmptyHouse_BlockData:
+BetaEmptyHouse_Blocks:
 	INCBIN "maps/unused/BetaEmptyHouse.blk"
 
-BetaRocketHideout3_BlockData:
-	INCBIN "maps/unused/BetaRocketHideout3.blk"
+BetaRocketHideout3_Blocks:
+	INCBIN "maps/unused/BetaRocketHideout3.blk"
 
-MahoganyMart1F_BlockData:
-MountMoonGiftShop_BlockData:
+MahoganyMart1F_Blocks:
+MountMoonGiftShop_Blocks:
 	INCBIN "maps/GiftShop.blk"
 
-TeamRocketBaseB1F_BlockData:
+TeamRocketBaseB1F_Blocks:
 	INCBIN "maps/TeamRocketBaseB1F.blk"
 
-TeamRocketBaseB2F_BlockData:
+TeamRocketBaseB2F_Blocks:
 	INCBIN "maps/TeamRocketBaseB2F.blk"
 
-TeamRocketBaseB3F_BlockData:
+TeamRocketBaseB3F_Blocks:
 	INCBIN "maps/TeamRocketBaseB3F.blk"
 
-BetaRoute23EarlyVersion_BlockData:
+BetaRoute23EarlyVersion_Blocks:
 	INCBIN "maps/unused/BetaRoute23EarlyVersion.blk"
 
-IndigoPlateauPokecenter1F_BlockData:
+IndigoPlateauPokecenter1F_Blocks:
 	INCBIN "maps/IndigoPlateauPokecenter1F.blk"
 
-WillsRoom_BlockData:
+WillsRoom_Blocks:
 	INCBIN "maps/WillsRoom.blk"
 
-KogasRoom_BlockData:
+KogasRoom_Blocks:
 	INCBIN "maps/KogasRoom.blk"
 
-BrunosRoom_BlockData:
+BrunosRoom_Blocks:
 	INCBIN "maps/BrunosRoom.blk"
 
-KarensRoom_BlockData:
+KarensRoom_Blocks:
 	INCBIN "maps/KarensRoom.blk"
 
-AzaleaGym_BlockData:
+AzaleaGym_Blocks:
 	INCBIN "maps/AzaleaGym.blk"
 
-VioletGym_BlockData:
+VioletGym_Blocks:
 	INCBIN "maps/VioletGym.blk"
 
-GoldenrodGym_BlockData:
+GoldenrodGym_Blocks:
 	INCBIN "maps/GoldenrodGym.blk"
 
-EcruteakGym_BlockData:
+EcruteakGym_Blocks:
 	INCBIN "maps/EcruteakGym.blk"
 
-MahoganyGym_BlockData:
+MahoganyGym_Blocks:
 	INCBIN "maps/MahoganyGym.blk"
 
-OlivineGym_BlockData:
+OlivineGym_Blocks:
 	INCBIN "maps/OlivineGym.blk"
 
-BetaUnknown_BlockData:
+BetaUnknown_Blocks:
 	INCBIN "maps/unused/BetaUnknown.blk"
 
-CianwoodGym_BlockData:
+CianwoodGym_Blocks:
 	INCBIN "maps/CianwoodGym.blk"
 
-BlackthornGym1F_BlockData:
+BlackthornGym1F_Blocks:
 	INCBIN "maps/BlackthornGym1F.blk"
 
-BlackthornGym2F_BlockData:
+BlackthornGym2F_Blocks:
 	INCBIN "maps/BlackthornGym2F.blk"
 
-OlivineLighthouse1F_BlockData:
+OlivineLighthouse1F_Blocks:
 	INCBIN "maps/OlivineLighthouse1F.blk"
 
-OlivineLighthouse2F_BlockData:
+OlivineLighthouse2F_Blocks:
 	INCBIN "maps/OlivineLighthouse2F.blk"
 
-OlivineLighthouse3F_BlockData:
+OlivineLighthouse3F_Blocks:
 	INCBIN "maps/OlivineLighthouse3F.blk"
 
-OlivineLighthouse4F_BlockData:
+OlivineLighthouse4F_Blocks:
 	INCBIN "maps/OlivineLighthouse4F.blk"
 
-OlivineLighthouse5F_BlockData:
+OlivineLighthouse5F_Blocks:
 	INCBIN "maps/OlivineLighthouse5F.blk"
 
-OlivineLighthouse6F_BlockData:
+OlivineLighthouse6F_Blocks:
 	INCBIN "maps/OlivineLighthouse6F.blk"
 
 
-SECTION "Map Blockdata 3", ROMX
+SECTION "Map Blocks 3", ROMX
 
-BetaCave2_BlockData:
+BetaCave2_Blocks:
 	INCBIN "maps/unused/BetaCave2.blk"
 
-SlowpokeWellB1F_BlockData:
+SlowpokeWellB1F_Blocks:
 	INCBIN "maps/SlowpokeWellB1F.blk"
 
-SlowpokeWellB2F_BlockData:
+SlowpokeWellB2F_Blocks:
 	INCBIN "maps/SlowpokeWellB2F.blk"
 
-IlexForest_BlockData:
+IlexForest_Blocks:
 	INCBIN "maps/IlexForest.blk"
 
-DarkCaveVioletEntrance_BlockData:
+DarkCaveVioletEntrance_Blocks:
 	INCBIN "maps/DarkCaveVioletEntrance.blk"
 
-DarkCaveBlackthornEntrance_BlockData:
+DarkCaveBlackthornEntrance_Blocks:
 	INCBIN "maps/DarkCaveBlackthornEntrance.blk"
 
-RuinsOfAlphResearchCenter_BlockData:
+RuinsOfAlphResearchCenter_Blocks:
 	INCBIN "maps/RuinsOfAlphResearchCenter.blk"
 
-GoldenrodBikeShop_BlockData:
+GoldenrodBikeShop_Blocks:
 	INCBIN "maps/GoldenrodBikeShop.blk"
 
-DanceTheatre_BlockData:
+DanceTheatre_Blocks:
 	INCBIN "maps/DanceTheatre.blk"
 
-EcruteakHouse_BlockData:
+EcruteakHouse_Blocks:
 	INCBIN "maps/EcruteakHouse.blk"
 
-GoldenrodGameCorner_BlockData:
+GoldenrodGameCorner_Blocks:
 	INCBIN "maps/GoldenrodGameCorner.blk"
 
-Route35NationalParkGate_BlockData:
+Route35NationalParkGate_Blocks:
 	INCBIN "maps/Route35NationalParkGate.blk"
 
-Route36NationalParkGate_BlockData:
+Route36NationalParkGate_Blocks:
 	INCBIN "maps/Route36NationalParkGate.blk"
 
-FastShip1F_BlockData:
+FastShip1F_Blocks:
 	INCBIN "maps/FastShip1F.blk"
 
-FastShipB1F_BlockData:
+FastShipB1F_Blocks:
 	INCBIN "maps/FastShipB1F.blk"
 
-BetaFastShipInsideCutOut_BlockData:
+BetaFastShipInsideCutOut_Blocks:
 	INCBIN "maps/unused/BetaFastShipInsideCutOut.blk"
 
-FastShipCabins_NNW_NNE_NE_BlockData:
+FastShipCabins_NNW_NNE_NE_Blocks:
 	INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk"
 
-FastShipCabins_SW_SSW_NW_BlockData:
+FastShipCabins_SW_SSW_NW_Blocks:
 	INCBIN "maps/FastShipCabins_SW_SSW_NW.blk"
 
-FastShipCabins_SE_SSE_CaptainsCabin_BlockData:
+FastShipCabins_SE_SSE_CaptainsCabin_Blocks:
 	INCBIN "maps/FastShipCabins_SE_SSE_CaptainsCabin.blk"
 
-OlivinePort_BlockData:
+OlivinePort_Blocks:
 	INCBIN "maps/OlivinePort.blk"
 
-VermilionPort_BlockData:
+VermilionPort_Blocks:
 	INCBIN "maps/VermilionPort.blk"
 
-OlivineCafe_BlockData:
-SafariZoneMainOffice_BlockData:
+OlivineCafe_Blocks:
+SafariZoneMainOffice_Blocks:
 	INCBIN "maps/OlivineCafe.blk"
 
-KrissHouse2F_BlockData:
+KrissHouse2F_Blocks:
 	INCBIN "maps/KrissHouse2F.blk"
 
-SaffronMagnetTrainStation_BlockData:
+SaffronMagnetTrainStation_Blocks:
 	INCBIN "maps/SaffronMagnetTrainStation.blk"
 
-CeruleanGym_BlockData:
+CeruleanGym_Blocks:
 	INCBIN "maps/CeruleanGym.blk"
 
-VermilionGym_BlockData:
+VermilionGym_Blocks:
 	INCBIN "maps/VermilionGym.blk"
 
-SaffronGym_BlockData:
+SaffronGym_Blocks:
 	INCBIN "maps/SaffronGym.blk"
 
-PowerPlant_BlockData:
+PowerPlant_Blocks:
 	INCBIN "maps/PowerPlant.blk"
 
-PokemonFanClub_BlockData:
-SafariZoneWardensHome_BlockData:
+PokemonFanClub_Blocks:
+SafariZoneWardensHome_Blocks:
 	INCBIN "maps/PokemonFanClub.blk"
 
-FightingDojo_BlockData:
+FightingDojo_Blocks:
 	INCBIN "maps/FightingDojo.blk"
 
-SilphCo1F_BlockData:
+SilphCo1F_Blocks:
 	INCBIN "maps/SilphCo1F.blk"
 
-ViridianGym_BlockData:
+ViridianGym_Blocks:
 	INCBIN "maps/ViridianGym.blk"
 
-TrainerHouse1F_BlockData:
+TrainerHouse1F_Blocks:
 	INCBIN "maps/TrainerHouse1F.blk"
 
-TrainerHouseB1F_BlockData:
+TrainerHouseB1F_Blocks:
 	INCBIN "maps/TrainerHouseB1F.blk"
 
-RedsHouse1F_BlockData:
+RedsHouse1F_Blocks:
 	INCBIN "maps/RedsHouse1F.blk"
 
-RedsHouse2F_BlockData:
+RedsHouse2F_Blocks:
 	INCBIN "maps/RedsHouse2F.blk"
 
-OaksLab_BlockData:
+OaksLab_Blocks:
 	INCBIN "maps/OaksLab.blk"
 
-MrFujisHouse_BlockData:
+MrFujisHouse_Blocks:
 	INCBIN "maps/MrFujisHouse.blk"
 
-LavRadioTower1F_BlockData:
+LavRadioTower1F_Blocks:
 	INCBIN "maps/LavRadioTower1F.blk"
 
-SilverCaveItemRooms_BlockData:
+SilverCaveItemRooms_Blocks:
 	INCBIN "maps/SilverCaveItemRooms.blk"
 
-DayCare_BlockData:
+DayCare_Blocks:
 	INCBIN "maps/DayCare.blk"
 
-SoulHouse_BlockData:
+SoulHouse_Blocks:
 	INCBIN "maps/SoulHouse.blk"
 
-PewterGym_BlockData:
+PewterGym_Blocks:
 	INCBIN "maps/PewterGym.blk"
 
-CeladonGym_BlockData:
+CeladonGym_Blocks:
 	INCBIN "maps/CeladonGym.blk"
 
-BetaHouse2_BlockData:
+BetaHouse2_Blocks:
 	INCBIN "maps/unused/BetaHouse2.blk"
 
-CeladonCafe_BlockData:
+CeladonCafe_Blocks:
 	INCBIN "maps/CeladonCafe.blk"
 
-BetaCeladonMansion_BlockData:
+BetaCeladonMansion_Blocks:
 	INCBIN "maps/unused/BetaCeladonMansion.blk"
 
-RockTunnel1F_BlockData:
+RockTunnel1F_Blocks:
 	INCBIN "maps/RockTunnel1F.blk"
 
-RockTunnelB1F_BlockData:
+RockTunnelB1F_Blocks:
 	INCBIN "maps/RockTunnelB1F.blk"
 
-DiglettsCave_BlockData:
+DiglettsCave_Blocks:
 	INCBIN "maps/DiglettsCave.blk"
 
-MountMoon_BlockData:
+MountMoon_Blocks:
 	INCBIN "maps/MountMoon.blk"
 
-SeafoamGym_BlockData:
+SeafoamGym_Blocks:
 	INCBIN "maps/SeafoamGym.blk"
 
-MrPokemonsHouse_BlockData:
+MrPokemonsHouse_Blocks:
 	INCBIN "maps/MrPokemonsHouse.blk"
 
-VictoryRoadGate_BlockData:
+VictoryRoadGate_Blocks:
 	INCBIN "maps/VictoryRoadGate.blk"
 
-OlivinePortPassage_BlockData:
-VermilionPortPassage_BlockData:
+OlivinePortPassage_Blocks:
+VermilionPortPassage_Blocks:
 	INCBIN "maps/PortPassage.blk"
 
-FuchsiaGym_BlockData:
+FuchsiaGym_Blocks:
 	INCBIN "maps/FuchsiaGym.blk"
 
-SafariZoneBeta_BlockData:
+SafariZoneBeta_Blocks:
 	INCBIN "maps/SafariZoneBeta.blk"
 
-UndergroundPath_BlockData:
+UndergroundPath_Blocks:
 	INCBIN "maps/UndergroundPath.blk"
 
-Route39Barn_BlockData:
+Route39Barn_Blocks:
 	INCBIN "maps/Route39Barn.blk"
 
-VictoryRoad_BlockData:
+VictoryRoad_Blocks:
 	INCBIN "maps/VictoryRoad.blk"
 
-Route23_BlockData:
+Route23_Blocks:
 	INCBIN "maps/Route23.blk"
 
-LancesRoom_BlockData:
+LancesRoom_Blocks:
 	INCBIN "maps/LancesRoom.blk"
 
-HallOfFame_BlockData:
+HallOfFame_Blocks:
 	INCBIN "maps/HallOfFame.blk"
 
-CopycatsHouse1F_BlockData:
+CopycatsHouse1F_Blocks:
 	INCBIN "maps/CopycatsHouse1F.blk"
 
-CopycatsHouse2F_BlockData:
+CopycatsHouse2F_Blocks:
 	INCBIN "maps/CopycatsHouse2F.blk"
 
-GoldenrodFlowerShop_BlockData:
+GoldenrodFlowerShop_Blocks:
 	INCBIN "maps/GoldenrodFlowerShop.blk"
 
-MountMoonSquare_BlockData:
+MountMoonSquare_Blocks:
 	INCBIN "maps/MountMoonSquare.blk"
 
-WiseTriosRoom_BlockData:
+WiseTriosRoom_Blocks:
 	INCBIN "maps/WiseTriosRoom.blk"
 
-DragonsDen1F_BlockData:
+DragonsDen1F_Blocks:
 	INCBIN "maps/DragonsDen1F.blk"
 
-DragonsDenB1F_BlockData:
+DragonsDenB1F_Blocks:
 	INCBIN "maps/DragonsDenB1F.blk"
 
-TohjoFalls_BlockData:
+TohjoFalls_Blocks:
 	INCBIN "maps/TohjoFalls.blk"
 
-RuinsOfAlphHoOhItemRoom_BlockData:
-RuinsOfAlphKabutoItemRoom_BlockData:
-RuinsOfAlphOmanyteItemRoom_BlockData:
-RuinsOfAlphAerodactylItemRoom_BlockData:
+RuinsOfAlphHoOhItemRoom_Blocks:
+RuinsOfAlphKabutoItemRoom_Blocks:
+RuinsOfAlphOmanyteItemRoom_Blocks:
+RuinsOfAlphAerodactylItemRoom_Blocks:
 	INCBIN "maps/RuinsOfAlphItemRoom.blk"
 
-RuinsOfAlphHoOhWordRoom_BlockData:
+RuinsOfAlphHoOhWordRoom_Blocks:
 	INCBIN "maps/RuinsOfAlphHoOhWordRoom.blk"
 
-RuinsOfAlphKabutoWordRoom_BlockData:
+RuinsOfAlphKabutoWordRoom_Blocks:
 	INCBIN "maps/RuinsOfAlphKabutoWordRoom.blk"
 
-RuinsOfAlphOmanyteWordRoom_BlockData:
+RuinsOfAlphOmanyteWordRoom_Blocks:
 	INCBIN "maps/RuinsOfAlphOmanyteWordRoom.blk"
 
-RuinsOfAlphAerodactylWordRoom_BlockData:
+RuinsOfAlphAerodactylWordRoom_Blocks:
 	INCBIN "maps/RuinsOfAlphAerodactylWordRoom.blk"
 
-DragonShrine_BlockData:
+DragonShrine_Blocks:
 	INCBIN "maps/DragonShrine.blk"
 
-BattleTower1F_BlockData:
+BattleTower1F_Blocks:
 	INCBIN "maps/BattleTower1F.blk"
 
-BattleTowerBattleRoom_BlockData:
+BattleTowerBattleRoom_Blocks:
 	INCBIN "maps/BattleTowerBattleRoom.blk"
 
-GoldenrodPokeComCenter2FMobile_BlockData:
+GoldenrodPokeComCenter2FMobile_Blocks:
 	INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk"
 
-MobileTradeRoomMobile_BlockData:
+MobileTradeRoomMobile_Blocks:
 	INCBIN "maps/MobileTradeRoomMobile.blk"
 
-MobileBattleRoom_BlockData:
+MobileBattleRoom_Blocks:
 	INCBIN "maps/MobileBattleRoom.blk"
 
-BattleTowerHallway_BlockData:
+BattleTowerHallway_Blocks:
 	INCBIN "maps/BattleTowerHallway.blk"
 
-BattleTowerElevator_BlockData:
+BattleTowerElevator_Blocks:
 	INCBIN "maps/BattleTowerElevator.blk"
 
-BattleTowerOutside_BlockData:
+BattleTowerOutside_Blocks:
 	INCBIN "maps/BattleTowerOutside.blk"
 
-BetaBlank_BlockData:
+BetaBlank_Blocks:
 	INCBIN "maps/unused/BetaBlank.blk"
 
-GoldenrodDeptStoreRoof_BlockData:
+GoldenrodDeptStoreRoof_Blocks:
 	INCBIN "maps/GoldenrodDeptStoreRoof.blk"
--- /dev/null
+++ b/data/maps/map_data.asm
@@ -1,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
--- /dev/null
+++ b/data/maps/map_defs.asm
@@ -1,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
--- a/data/maps/map_headers.asm
+++ /dev/null
@@ -1,510 +1,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
--- a/data/maps/map_headers_2.asm
+++ /dev/null
@@ -1,685 +1,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
--- a/data/maps/maps.asm
+++ b/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_headers_2.asm"
+INCLUDE "data/maps/map_defs.asm"
+INCLUDE "data/maps/map_data.asm"
 
 
 INCLUDE "data/maps/blocks.asm"
--- a/data/player_names.asm
+++ b/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 @@
 	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
--- a/docs/map_scripts.md
+++ b/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 @@
 [Movement commands](movement_commands.md)
 
 
-## `MapName_MapEventHeader:`
+## `MapName_MapEvents:`
 
 ```asm
 	; filler
@@ -70,82 +75,98 @@
 ```
 
 
-## `.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>
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -396,7 +396,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call CallScript
 	ret
 ; 968c7
@@ -450,7 +450,7 @@
 
 	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 @@
 	add hl, de
 endr
 
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call GetFarHalfword
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call CallScript
 
 	ld hl, ScriptFlags
@@ -635,7 +635,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call CallScript
 	ret
 ; 96a12
@@ -646,7 +646,7 @@
 	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 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call CallScript
 	scf
 	ret
@@ -740,7 +740,7 @@
 	call CheckBGEventFlag
 	jp nz, .dontread
 	call PlayTalkObject
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	ld de, EngineBuffer1
 	ld bc, 3
 	call FarCopyBytes
@@ -753,7 +753,7 @@
 .copy
 	call CheckBGEventFlag
 	jr nz, .dontread
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	ld de, EngineBuffer1
 	ld bc, 3
 	call FarCopyBytes
@@ -774,9 +774,9 @@
 	pop hl
 	inc hl
 	inc hl
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call GetFarHalfword
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call CallScript
 	scf
 	ret
@@ -792,7 +792,7 @@
 	ld h, [hl]
 	ld l, a
 	push hl
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call GetFarHalfword
 	ld e, l
 	ld d, h
--- a/engine/events/checkforhiddenitems.asm
+++ b/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 @@
 	ld a, [YCoord]
 	add SCREEN_HEIGHT / 4
 	ld [Buffer3], a
-; Get the pointer for the first BG event header in the map...
-	ld hl, wCurrMapBGEventHeaderPointer
+; Get the pointer for the first bg_event in the map...
+	ld hl, wCurrMapBGEventsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -20,7 +20,7 @@
 	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 @@
 	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
--- a/engine/events/mom_phone.asm
+++ b/engine/events/mom_phone.asm
@@ -9,7 +9,7 @@
 	ld a, [wMapReentryScriptQueueFlag]
 	and a
 	ret nz
-	call GetMapHeaderPhoneServiceNybble
+	call GetMapPhoneService
 	and a
 	ret nz
 	xor a
--- a/engine/events/unown_walls.asm
+++ b/engine/events/unown_walls.asm
@@ -3,7 +3,7 @@
 	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 @@
 ; 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 @@
 	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 @@
 	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 @@
 	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
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -274,7 +274,7 @@
 
 	; 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
 
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -542,10 +542,10 @@
 	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
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -131,7 +131,7 @@
 	cp b
 	jr nz, .no_call
 
-	call GetMapHeaderPhoneServiceNybble
+	call GetMapPhoneService
 	and a
 	jr nz, .no_call
 
@@ -328,7 +328,7 @@
 	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
--- a/engine/player_gfx.asm
+++ b/engine/player_gfx.asm
@@ -56,11 +56,11 @@
 	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
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -393,7 +393,7 @@
 	hlcoord 17, 2
 	inc a
 	ld [hli], a
-	call GetMapHeaderPhoneServiceNybble
+	call GetMapPhoneService
 	and a
 	ret nz
 	hlcoord 18, 2
@@ -926,7 +926,7 @@
 	ret
 
 PokegearPhone_MakePhoneCall: ; 911eb (24:51eb)
-	call GetMapHeaderPhoneServiceNybble
+	call GetMapPhoneService
 	and a
 	jr nz, .no_service
 	ld hl, Options
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -525,9 +525,9 @@
 	ld de, sPlayerData
 	ld bc, wPlayerDataEnd - wPlayerData
 	call CopyBytes
-	ld hl, wMapData
-	ld de, sMapData
-	ld bc, wMapDataEnd - wMapData
+	ld hl, wCurrMapData
+	ld de, sCurrMapData
+	ld bc, wCurrMapDataEnd - wCurrMapData
 	call CopyBytes
 	jp CloseSRAM
 ; 14df7
@@ -592,9 +592,9 @@
 	ld de, sBackupPlayerData
 	ld bc, wPlayerDataEnd - wPlayerData
 	call CopyBytes
-	ld hl, wMapData
-	ld de, sBackupMapData
-	ld bc, wMapDataEnd - wMapData
+	ld hl, wCurrMapData
+	ld de, sBackupCurrMapData
+	ld bc, wCurrMapDataEnd - wCurrMapData
 	call CopyBytes
 	call CloseSRAM
 	ret
@@ -777,9 +777,9 @@
 	ld de, wPlayerData
 	ld bc, wPlayerDataEnd - wPlayerData
 	call CopyBytes
-	ld hl, sMapData
-	ld de, wMapData
-	ld bc, wMapDataEnd - wMapData
+	ld hl, sCurrMapData
+	ld de, wCurrMapData
+	ld bc, wCurrMapDataEnd - wCurrMapData
 	call CopyBytes
 	call CloseSRAM
 	ld a, BANK(sBattleTowerChallengeState)
@@ -833,9 +833,9 @@
 	ld de, wPlayerData
 	ld bc, wPlayerDataEnd - wPlayerData
 	call CopyBytes
-	ld hl, sBackupMapData
-	ld de, wMapData
-	ld bc, wMapDataEnd - wMapData
+	ld hl, sBackupCurrMapData
+	ld de, wCurrMapData
+	ld bc, wCurrMapDataEnd - wCurrMapData
 	call CopyBytes
 	call CloseSRAM
 	ret
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -2580,11 +2580,11 @@
 ; 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
--- a/engine/unown_puzzle.asm
+++ b/engine/unown_puzzle.asm
@@ -763,7 +763,7 @@
 ; e16c7
 
 UnownPuzzle_AddPuzzlePieceBorders: ; e16c7
-	ld hl, GFXHeaders
+	ld hl, PuzzlePieceBorderData
 	ld a, 8
 .loop
 	push af
@@ -819,7 +819,7 @@
 	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
--- a/engine/warp_connection.asm
+++ b/engine/warp_connection.asm
@@ -11,7 +11,7 @@
 	farcall ClearCmdQueue
 	ld a, MAPCALLBACK_CMDQUEUE
 	call RunMapCallback
-	call GetMapHeaderTimeOfDayNybble
+	call GetMapTimeOfDay
 	ld [wMapTimeOfDay], a
 	ret
 
--- a/home.asm
+++ b/home.asm
@@ -842,7 +842,7 @@
 	ld a, [hROMBank]
 	push af
 
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call .WarpAction
 
 	pop bc
@@ -899,7 +899,7 @@
 ; 35b0
 
 .check_on_warp ; 35b0
-	ld hl, wCurrMapWarpHeaderPointer
+	ld hl, wCurrMapWarpsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -340,7 +340,7 @@
 	push bc
 	push af
 
-	call GetMapMusic
+	call GetMapMusic_MaybeSpecial
 	ld a, [wMapMusic]
 	cp e
 	jr z, .done
@@ -368,7 +368,7 @@
 	push bc
 	push af
 
-	call GetMapMusic
+	call GetMapMusic_MaybeSpecial
 	ld a, [wMapMusic]
 	cp e
 	jr z, .done
@@ -402,7 +402,7 @@
 	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 @@
 	ret
 ; 3d97
 
-GetMapMusic:: ; 3d97
+GetMapMusic_MaybeSpecial:: ; 3d97
 	call SpecialMapMusic
 	ret c
-	call GetMapHeaderMusic
+	call GetMapMusic
 	ret
 ; 3d9f
 
--- a/home/map.asm
+++ b/home/map.asm
@@ -72,7 +72,7 @@
 
 .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 @@
 	ld a, [hROMBank]
 	push af
 
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call .GetDestinationWarpNumber
 
 	pop de
@@ -270,7 +270,7 @@
 	ret z
 
 	ld c, a
-	ld hl, wCurrMapWarpHeaderPointer
+	ld hl, wCurrMapWarpsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -321,7 +321,7 @@
 	ld a, [hROMBank]
 	push af
 
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call .CopyWarpData
 
 	pop af
@@ -332,7 +332,7 @@
 
 .CopyWarpData: ; 22b4
 	push bc
-	ld hl, wCurrMapWarpHeaderPointer
+	ld hl, wCurrMapWarpsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -394,35 +394,35 @@
 ; 2309
 
 LoadMapAttributes:: ; 2309
-	call CopyMapHeaders
-	call SwitchToMapScriptHeaderBank
+	call CopyMapDefAndData
+	call SwitchToMapScriptsBank
 	call ReadMapScripts
-	xor a
-	call ReadMapEventHeader
+	xor a ; do not skip object_events
+	call ReadMapEvents
 	ret
 ; 2317
 
 LoadMapAttributes_SkipPeople:: ; 2317
-	call CopyMapHeaders
-	call SwitchToMapScriptHeaderBank
+	call CopyMapDefAndData
+	call SwitchToMapScriptsBank
 	call ReadMapScripts
-	ld a, $1
-	call ReadMapEventHeader
+	ld a, TRUE ; skip object events
+	call ReadMapEvents
 	ret
 ; 2326
 
-CopyMapHeaders:: ; 2326
-	call PartiallyCopyMapHeader
-	call SwitchToMapBank
-	call GetSecondaryMapHeaderPointer
-	call CopySecondMapHeader
+CopyMapDefAndData:: ; 2326
+	call PartialCopyMapDef
+	call SwitchToMapDataBank
+	call GetMapDataPointer
+	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 @@
 	call ReadBGEvents
 
 	pop af
-	and a
+	and a ; skip object events?
 	ret nz
 
 	call ReadObjectEvents
@@ -441,7 +441,7 @@
 ; 234f
 
 ReadMapScripts:: ; 234f
-	ld hl, MapScriptHeaderPointer
+	ld hl, MapScriptsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -450,9 +450,9 @@
 	ret
 ; 235c
 
-CopySecondMapHeader:: ; 235c
-	ld de, MapHeader
-	ld c, 12 ; size of the second map header
+CopyMapData:: ; 235c
+	ld de, wMapData
+	ld c, wMapDataEnd - wMapData
 .loop
 	ld a, [hli]
 	ld [de], a
@@ -516,14 +516,14 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ret
 ; 2457
 
-CopyMapObjectHeaders:: ; 2457
+CopyMapObjectEvents:: ; 2457
 	and a
 	ret z
 
@@ -690,10 +690,10 @@
 ; 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 @@
 	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 @@
 	ld b, a
 	ld a, [NorthConnectedMapNumber]
 	ld c, a
-	call GetAnyMapBlockdataBank
+	call GetAnyMapBlocksBank
 
 	ld a, [NorthConnectionStripPointer]
 	ld l, a
@@ -825,7 +825,7 @@
 	ld b, a
 	ld a, [SouthConnectedMapNumber]
 	ld c, a
-	call GetAnyMapBlockdataBank
+	call GetAnyMapBlocksBank
 
 	ld a, [SouthConnectionStripPointer]
 	ld l, a
@@ -848,7 +848,7 @@
 	ld b, a
 	ld a, [WestConnectedMapNumber]
 	ld c, a
-	call GetAnyMapBlockdataBank
+	call GetAnyMapBlocksBank
 
 	ld a, [WestConnectionStripPointer]
 	ld l, a
@@ -871,7 +871,7 @@
 	ld b, a
 	ld a, [EastConnectedMapNumber]
 	ld c, a
-	call GetAnyMapBlockdataBank
+	call GetAnyMapBlocksBank
 
 	ld a, [EastConnectionStripPointer]
 	ld l, a
@@ -992,20 +992,20 @@
 	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 @@
 	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 @@
 	ld c, a
 	ld a, [hROMBank]
 	push af
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call CheckIfFacingTileCoordIsBGEvent
 	pop hl
 	ld a, h
@@ -1870,7 +1870,7 @@
 
 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 @@
 	ld c, a
 	ld a, [hROMBank]
 	push af
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call .CoordEventCheck
 	pop hl
 	ld a, h
@@ -1925,7 +1925,7 @@
 
 .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 @@
 	ld b, a
 	ld a, [MapNumber]
 	ld c, a
-	call SwitchToAnyMapBank
+	call SwitchToAnyMapDataBank
 	farcall UpdateTimeOfDayPal
 	call OverworldTextModeSwitch
 	call LoadTilesetGFX
@@ -2065,12 +2065,12 @@
 	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 @@
 ; 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 @@
 	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,21 +2102,21 @@
 	ret
 ; 0x2c04
 
-GetMapHeaderMember:: ; 0x2c04
-; Extract data from the current map's header.
+GetMapDefField:: ; 0x2c04
+; 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
-; (e.g., de = MAPHEADER_MAPHEADER2 would return a pointer to the secondary map header)
+; bc = data from the current map's map_def
+; (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
@@ -2123,7 +2123,7 @@
 	ld a, BANK(MapGroupPointers)
 	rst Bankswitch
 
-	call GetAnyMapHeaderPointer
+	call GetAnyMapDefPointer
 	add hl, de
 	ld c, [hl]
 	inc hl
@@ -2135,27 +2135,27 @@
 	ret
 ; 0x2c1c
 
-SwitchToMapBank:: ; 2c1c
+SwitchToMapDataBank:: ; 2c1c
 	ld a, [MapGroup]
 	ld b, a
 	ld a, [MapNumber]
 	ld c, a
-SwitchToAnyMapBank:: ; 2c24
-	call GetAnyMapBank
+SwitchToAnyMapDataBank:: ; 2c24
+	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
-	call GetAnyMapHeaderMember
+	ld de, MAPDEF_MAPDATA_BANK
+	call GetAnyMapDefField
 	ld a, c
 	pop de
 	pop hl
@@ -2162,17 +2162,17 @@
 	ret
 ; 2c3d
 
-PartiallyCopyMapHeader:: ; 2c3d
-; Copy second map header bank, tileset, environment, and second map header address
-; from the current map's map header.
+PartialCopyMapDef:: ; 2c3d
+; Copy map data bank, tileset, environment, and map data address
+; from the current map's map_def.
 	ld a, [hROMBank]
 	push af
 	ld a, BANK(MapGroupPointers)
 	rst Bankswitch
 
-	call GetMapHeaderPointer
-	ld de, wSecondMapHeaderBank
-	ld bc, MapHeader - wSecondMapHeaderBank
+	call GetMapDefPointer
+	ld de, wPartialMapDef
+	ld bc, wPartialMapDefEnd - wPartialMapDef
 	call CopyBytes
 
 	pop af
@@ -2180,18 +2180,18 @@
 	ret
 ; 2c52
 
-SwitchToMapScriptHeaderBank:: ; 2c52
-	ld a, [MapScriptHeaderBank]
+SwitchToMapScriptsBank:: ; 2c52
+	ld a, [MapScriptsBank]
 	rst Bankswitch
 	ret
 ; 2c57
 
-GetMapScriptHeaderBank:: ; 2c57
-	ld a, [MapScriptHeaderBank]
+GetMapScriptsBank:: ; 2c57
+	ld a, [MapScriptsBank]
 	ret
 ; 2c5b
 
-GetAnyMapBlockdataBank:: ; 2c5b
+GetAnyMapBlocksBank:: ; 2c5b
 ; Return the blockdata bank for group b map c.
 	push hl
 	push de
@@ -2198,18 +2198,18 @@
 	push bc
 
 	push bc
-	ld de, MAPHEADER_MAPHEADER2
-	call GetAnyMapHeaderMember
+	ld de, MAPDEF_MAPDATA
+	call GetAnyMapDefField
 	ld l, c
 	ld h, b
 	pop bc
 
 	push hl
-	ld de, MAPHEADER_MAPHEADER2_BANK
-	call GetAnyMapHeaderMember
+	ld de, MAPDEF_MAPDATA_BANK
+	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 @@
 	ret
 ; 2c7d
 
-GetSecondaryMapHeaderPointer:: ; 0x2c7d
-; returns the current map's secondary map header pointer in hl.
+GetMapDataPointer:: ; 0x2c7d
+; returns the current map's data pointer in hl.
 	push bc
 	push de
-	ld de, MAPHEADER_MAPHEADER2
-	call GetMapHeaderMember
+	ld de, MAPDEF_MAPDATA
+	call GetMapDefField
 	ld l, c
 	ld h, b
 	pop de
@@ -2238,8 +2238,8 @@
 	push hl
 	push de
 	push bc
-	ld de, MAPHEADER_ENVIRONMENT
-	call GetMapHeaderMember
+	ld de, MAPDEF_ENVIRONMENT
+	call GetMapDefField
 	ld a, c
 	pop bc
 	pop de
@@ -2254,8 +2254,8 @@
 	push hl
 	push de
 	push bc
-	ld de, MAPHEADER_ENVIRONMENT
-	call GetAnyMapHeaderMember
+	ld de, MAPDEF_ENVIRONMENT
+	call GetAnyMapDefField
 	ld a, c
 	pop bc
 	pop de
@@ -2264,8 +2264,8 @@
 ; 2ca7
 
 GetAnyMapTileset:: ; 2ca7
-	ld de, MAPHEADER_TILESET
-	call GetAnyMapHeaderMember
+	ld de, MAPDEF_TILESET
+	call GetAnyMapDefField
 	ld a, c
 	ret
 ; 2caf
@@ -2276,8 +2276,8 @@
 	push de
 	push bc
 
-	ld de, MAPHEADER_LOCATION
-	call GetAnyMapHeaderMember
+	ld de, MAPDEF_LOCATION
+	call GetAnyMapDefField
 	ld a, c
 
 	pop bc
@@ -2286,11 +2286,11 @@
 	ret
 ; 0x2cbd
 
-GetMapHeaderMusic:: ; 2cbd
+GetMapMusic:: ; 2cbd
 	push hl
 	push bc
-	ld de, MAPHEADER_MUSIC
-	call GetMapHeaderMember
+	ld de, MAPDEF_MUSIC
+	call GetMapDefField
 	ld a, c
 	cp MUSIC_MAHOGANY_MART
 	jr z, .mahoganymart
@@ -2331,13 +2331,13 @@
 	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 @@
 	push hl
 	push bc
 
-	ld de, MAPHEADER_PALETTE
-	call GetMapHeaderMember
+	ld de, MAPDEF_PALETTE
+	call GetMapDefField
 	ld a, c
 
 	pop bc
@@ -2362,8 +2362,8 @@
 	push hl
 	push bc
 
-	ld de, MAPHEADER_FISHGROUP
-	call GetMapHeaderMember
+	ld de, MAPDEF_FISHGROUP
+	call GetMapDefField
 	ld a, c
 
 	pop bc
--- a/home/trainers.asm
+++ b/home/trainers.asm
@@ -2,7 +2,7 @@
 	ld a, [hROMBank]
 	push af
 
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call CheckTrainerBattle
 
 	pop bc
@@ -110,7 +110,7 @@
 	ld [EngineBuffer3], a
 
 LoadTrainer_continue:: ; 367e
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	ld [EngineBuffer1], a
 
 	ld a, [hLastTalked]
@@ -120,8 +120,8 @@
 	add hl, bc
 	ld a, [EngineBuffer1]
 	call GetFarHalfword
-	ld de, wTempTrainerHeader
-	ld bc, wTempTrainerHeaderEnd - wTempTrainerHeader
+	ld de, wTempTrainer
+	ld bc, wTempTrainerEnd - wTempTrainer
 	ld a, [EngineBuffer1]
 	call FarCopyBytes
 	xor a
@@ -221,7 +221,7 @@
 	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 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call FarPrintText
 	call WaitBGMap
 	call WaitPressAorB_BlinkCursor
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -7,7 +7,7 @@
 	const AZALEAGYM_TWIN2
 	const AZALEAGYM_GYM_GUY
 
-AzaleaGym_MapScriptHeader:
+AzaleaGym_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -361,7 +361,7 @@
 	cont "#MON is bright!"
 	done
 
-AzaleaGym_MapEventHeader:
+AzaleaGym_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -3,7 +3,7 @@
 	const AZALEAMART_COOLTRAINER_M
 	const AZALEAMART_BUG_CATCHER
 
-AzaleaMart_MapScriptHeader:
+AzaleaMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -45,7 +45,7 @@
 	cont "times."
 	done
 
-AzaleaMart_MapEventHeader:
+AzaleaMart_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/AzaleaPokecenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@@ -4,7 +4,7 @@
 	const AZALEAPOKECENTER1F_FISHING_GURU
 	const AZALEAPOKECENTER1F_POKEFAN_F
 
-AzaleaPokecenter1F_MapScriptHeader:
+AzaleaPokecenter1F_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -76,7 +76,7 @@
 	line "APRICORNS."
 	done
 
-AzaleaPokecenter1F_MapEventHeader:
+AzaleaPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -12,7 +12,7 @@
 	const AZALEATOWN_AZALEA_ROCKET3
 	const AZALEATOWN_KURT_OUTSIDE
 
-AzaleaTown_MapScriptHeader:
+AzaleaTown_MapScripts:
 .SceneScripts:
 	db 3
 	scene_script .DummyScene0
@@ -455,7 +455,7 @@
 	line "gate."
 	done
 
-AzaleaTown_MapEventHeader:
+AzaleaTown_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -5,7 +5,7 @@
 	const BATTLETOWER1F_BUG_CATCHER
 	const BATTLETOWER1F_GRANNY
 
-BattleTower1F_MapScriptHeader:
+BattleTower1F_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .Scene0
@@ -793,7 +793,7 @@
 	line "any fire #MON…"
 	done
 
-BattleTower1F_MapEventHeader:
+BattleTower1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -2,7 +2,7 @@
 	const BATTLETOWERBATTLEROOM_YOUNGSTER
 	const BATTLETOWERBATTLEROOM_RECEPTIONIST
 
-BattleTowerBattleRoom_MapScriptHeader:
+BattleTowerBattleRoom_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .EnterBattleRoom
@@ -138,7 +138,7 @@
 	line "after you SAVE."
 	done
 
-BattleTowerBattleRoom_MapEventHeader:
+BattleTowerBattleRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BattleTowerElevator.asm
+++ b/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 @@
 	turn_head DOWN
 	step_end
 
-BattleTowerElevator_MapEventHeader:
+BattleTowerElevator_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BattleTowerHallway.asm
+++ b/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 @@
 	warpcheck
 	end
 
-BattleTowerHallway_MapEventHeader:
+BattleTowerHallway_MapEvents:
 	; filler
 	db 0, 0
 
@@ -97,4 +97,4 @@
 
 .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
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -4,7 +4,7 @@
 	const BATTLETOWEROUTSIDE_SAILOR
 	const BATTLETOWEROUTSIDE_LASS
 
-BattleTowerOutside_MapScriptHeader:
+BattleTowerOutside_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -126,7 +126,7 @@
 	text "It's open!"
 	done
 
-BattleTowerOutside_MapEventHeader:
+BattleTowerOutside_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BillsHouse.asm
+++ b/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 @@
 	line "evolves."
 	done
 
-BillsHouse_MapEventHeader:
+BillsHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -9,7 +9,7 @@
 	const BLACKTHORNCITY_SANTOS
 	const BLACKTHORNCITY_COOLTRAINER_F2
 
-BlackthornCity_MapScriptHeader:
+BlackthornCity_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -312,7 +312,7 @@
 	cont "problem."
 	done
 
-BlackthornCity_MapEventHeader:
+BlackthornCity_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BlackthornDragonSpeechHouse.asm
+++ b/maps/BlackthornDragonSpeechHouse.asm
@@ -2,7 +2,7 @@
 	const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY
 	const BLACKTHORNDRAGONSPEECHHOUSE_EKANS
 
-BlackthornDragonSpeechHouse_MapScriptHeader:
+BlackthornDragonSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -47,7 +47,7 @@
 	text "DRATINI: Draa!"
 	done
 
-BlackthornDragonSpeechHouse_MapEventHeader:
+BlackthornDragonSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BlackthornEmysHouse.asm
+++ b/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 @@
 EmysHouseBookshelf:
 	jumpstd magazinebookshelf
 
-BlackthornEmysHouse_MapEventHeader:
+BlackthornEmysHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -5,7 +5,7 @@
 	const BLACKTHORNGYM1F_COOLTRAINER_F
 	const BLACKTHORNGYM1F_GYM_GUY
 
-BlackthornGym1F_MapScriptHeader:
+BlackthornGym1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -386,7 +386,7 @@
 	cont "#MON CHAMPION!"
 	done
 
-BlackthornGym1F_MapEventHeader:
+BlackthornGym1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -8,7 +8,7 @@
 	const BLACKTHORNGYM2F_BOULDER5
 	const BLACKTHORNGYM2F_BOULDER6
 
-BlackthornGym2F_MapScriptHeader:
+BlackthornGym2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -125,7 +125,7 @@
 	line "through!"
 	done
 
-BlackthornGym2F_MapEventHeader:
+BlackthornGym2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -3,7 +3,7 @@
 	const BLACKTHORNMART_COOLTRAINER_M
 	const BLACKTHORNMART_BLACK_BELT
 
-BlackthornMart_MapScriptHeader:
+BlackthornMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -46,7 +46,7 @@
 	cont "REPEL sprays."
 	done
 
-BlackthornMart_MapEventHeader:
+BlackthornMart_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BlackthornPokecenter1F.asm
+++ b/maps/BlackthornPokecenter1F.asm
@@ -4,7 +4,7 @@
 	const BLACKTHORNPOKECENTER1F_TWIN
 	const BLACKTHORNPOKECENTER1F_COOLTRAINER_M
 
-BlackthornPokecenter1F_MapScriptHeader:
+BlackthornPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -49,7 +49,7 @@
 	cont "forget an HM move."
 	done
 
-BlackthornPokecenter1F_MapEventHeader:
+BlackthornPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BluesHouse.asm
+++ b/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 @@
 	cont "groom an EGG."
 	done
 
-BluesHouse_MapEventHeader:
+BluesHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BrunosRoom.asm
+++ b/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 @@
 	line "challenge!"
 	done
 
-BrunosRoom_MapEventHeader:
+BrunosRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -5,7 +5,7 @@
 	const BURNEDTOWER1F_MORTY
 	const BURNEDTOWER1F_POKE_BALL
 
-BurnedTower1F_MapScriptHeader:
+BurnedTower1F_MapScripts:
 .SceneScripts:
 	db 3
 	scene_script .EusineScene
@@ -277,7 +277,7 @@
 	line "TOWER with him."
 	done
 
-BurnedTower1F_MapEventHeader:
+BurnedTower1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -9,7 +9,7 @@
 	const BURNEDTOWERB1F_POKE_BALL
 	const BURNEDTOWERB1F_EUSINE
 
-BurnedTowerB1F_MapScriptHeader:
+BurnedTowerB1F_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -235,7 +235,7 @@
 	para "Farewell!"
 	done
 
-BurnedTowerB1F_MapEventHeader:
+BurnedTowerB1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -5,7 +5,7 @@
 	const CELADONCAFE_FISHER3
 	const CELADONCAFE_TEACHER
 
-CeladonCafe_MapScriptHeader:
+CeladonCafe_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -207,7 +207,7 @@
 	line "hold another item…"
 	done
 
-CeladonCafe_MapEventHeader:
+CeladonCafe_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -9,7 +9,7 @@
 	const CELADONCITY_TEACHER2
 	const CELADONCITY_LASS
 
-CeladonCity_MapScriptHeader:
+CeladonCity_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -234,7 +234,7 @@
 	cont "STORE!"
 	done
 
-CeladonCity_MapEventHeader:
+CeladonCity_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonDeptStore1F.asm
+++ b/maps/CeladonDeptStore1F.asm
@@ -3,7 +3,7 @@
 	const CELADONDEPTSTORE1F_GENTLEMAN
 	const CELADONDEPTSTORE1F_TEACHER
 
-CeladonDeptStore1F_MapScriptHeader:
+CeladonDeptStore1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -73,7 +73,7 @@
 	line "    SQUARE"
 	done
 
-CeladonDeptStore1F_MapEventHeader:
+CeladonDeptStore1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -4,7 +4,7 @@
 	const CELADONDEPTSTORE2F_POKEFAN_M
 	const CELADONDEPTSTORE2F_YOUNGSTER
 
-CeladonDeptStore2F_MapScriptHeader:
+CeladonDeptStore2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -68,7 +68,7 @@
 	line "    MARKET"
 	done
 
-CeladonDeptStore2F_MapEventHeader:
+CeladonDeptStore2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -5,7 +5,7 @@
 	const CELADONDEPTSTORE3F_GAMEBOY_KID2
 	const CELADONDEPTSTORE3F_SUPER_NERD
 
-CeladonDeptStore3F_MapScriptHeader:
+CeladonDeptStore3F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -94,7 +94,7 @@
 	line "Stronger!"
 	done
 
-CeladonDeptStore3F_MapEventHeader:
+CeladonDeptStore3F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -3,7 +3,7 @@
 	const CELADONDEPTSTORE4F_SUPER_NERD
 	const CELADONDEPTSTORE4F_YOUNGSTER
 
-CeladonDeptStore4F_MapScriptHeader:
+CeladonDeptStore4F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -50,7 +50,7 @@
 	para "4F: WISEMAN GIFTS"
 	done
 
-CeladonDeptStore4F_MapEventHeader:
+CeladonDeptStore4F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -5,7 +5,7 @@
 	const CELADONDEPTSTORE5F_SAILOR
 	const CELADONDEPTSTORE5F_TEACHER
 
-CeladonDeptStore5F_MapScriptHeader:
+CeladonDeptStore5F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -71,7 +71,7 @@
 	text "5F: DRUG STORE"
 	done
 
-CeladonDeptStore5F_MapEventHeader:
+CeladonDeptStore5F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -2,7 +2,7 @@
 	const CELADONDEPTSTORE6F_SUPER_NERD
 	const CELADONDEPTSTORE6F_YOUNGSTER
 
-CeladonDeptStore6F_MapScriptHeader:
+CeladonDeptStore6F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -145,7 +145,7 @@
 	line "VENDING MACHINES"
 	done
 
-CeladonDeptStore6F_MapEventHeader:
+CeladonDeptStore6F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonDeptStoreElevator.asm
+++ b/maps/CeladonDeptStoreElevator.asm
@@ -1,4 +1,4 @@
-CeladonDeptStoreElevator_MapScriptHeader:
+CeladonDeptStoreElevator_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -27,7 +27,7 @@
 	elevfloor FLOOR_6F, 2, CELADON_DEPT_STORE_6F
 	db -1 ; end
 
-CeladonDeptStoreElevator_MapEventHeader:
+CeladonDeptStoreElevator_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -9,7 +9,7 @@
 	const CELADONGAMECORNER_GYM_GUY
 	const CELADONGAMECORNER_GRAMPS
 
-CeladonGameCorner_MapScriptHeader:
+CeladonGameCorner_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -281,7 +281,7 @@
 	para "Huh? It's empty!"
 	done
 
-CeladonGameCorner_MapEventHeader:
+CeladonGameCorner_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -2,7 +2,7 @@
 	const CELADONGAMECORNERPRIZEROOM_GENTLEMAN
 	const CELADONGAMECORNERPRIZEROOM_PHARMACIST
 
-CeladonGameCornerPrizeRoom_MapScriptHeader:
+CeladonGameCornerPrizeRoom_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -263,7 +263,7 @@
 	line "a COIN CASE."
 	done
 
-CeladonGameCornerPrizeRoom_MapEventHeader:
+CeladonGameCornerPrizeRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -6,7 +6,7 @@
 	const CELADONGYM_TWIN1
 	const CELADONGYM_TWIN2
 
-CeladonGym_MapScriptHeader:
+CeladonGym_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -267,7 +267,7 @@
 	line "much stronger!"
 	done
 
-CeladonGym_MapEventHeader:
+CeladonGym_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -4,7 +4,7 @@
 	const CELADONMANSION1F_CLEFAIRY
 	const CELADONMANSION1F_GROWLITHE2
 
-CeladonMansion1F_MapScriptHeader:
+CeladonMansion1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -74,7 +74,7 @@
 	line "MANAGER'S SUITE"
 	done
 
-CeladonMansion1F_MapEventHeader:
+CeladonMansion1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonMansion2F.asm
+++ b/maps/CeladonMansion2F.asm
@@ -1,4 +1,4 @@
-CeladonMansion2F_MapScriptHeader:
+CeladonMansion2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -49,7 +49,7 @@
 	line "MEETING ROOM"
 	done
 
-CeladonMansion2F_MapEventHeader:
+CeladonMansion2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -4,7 +4,7 @@
 	const CELADONMANSION3F_SUPER_NERD
 	const CELADONMANSION3F_FISHER
 
-CeladonMansion3F_MapScriptHeader:
+CeladonMansion3F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -189,7 +189,7 @@
 	cont "a # DOLL."
 	done
 
-CeladonMansion3F_MapEventHeader:
+CeladonMansion3F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonMansionRoof.asm
+++ b/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 @@
 	line "moustache!"
 	done
 
-CeladonMansionRoof_MapEventHeader:
+CeladonMansionRoof_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/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 @@
 	line "victim's HP."
 	done
 
-CeladonMansionRoofHouse_MapEventHeader:
+CeladonMansionRoofHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -5,7 +5,7 @@
 	const CELADONPOKECENTER1F_COOLTRAINER_F
 	const CELADONPOKECENTER1F_EUSINE
 
-CeladonPokecenter1F_MapScriptHeader:
+CeladonPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -145,7 +145,7 @@
 	line "you, <PLAYER>!"
 	done
 
-CeladonPokecenter1F_MapEventHeader:
+CeladonPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeladonPokecenter2FBeta.asm
+++ b/maps/CeladonPokecenter2FBeta.asm
@@ -1,4 +1,4 @@
-CeladonPokecenter2FBeta_MapScriptHeader:
+CeladonPokecenter2FBeta_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-CeladonPokecenter2FBeta_MapEventHeader:
+CeladonPokecenter2FBeta_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -6,7 +6,7 @@
 	const CERULEANCITY_FISHER
 	const CERULEANCITY_YOUNGSTER
 
-CeruleanCity_MapScriptHeader:
+CeruleanCity_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -275,7 +275,7 @@
 	text "It's locked…"
 	done
 
-CeruleanCity_MapEventHeader:
+CeruleanCity_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -6,7 +6,7 @@
 	const CERULEANGYM_SWIMMER_GUY
 	const CERULEANGYM_GYM_GUY
 
-CeruleanGym_MapScriptHeader:
+CeruleanGym_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -362,7 +362,7 @@
 	cont "great battle!"
 	done
 
-CeruleanGym_MapEventHeader:
+CeruleanGym_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeruleanGymBadgeSpeechHouse.asm
+++ b/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 @@
 	line "KANTO GYM BADGES?"
 	done
 
-CeruleanGymBadgeSpeechHouse_MapEventHeader:
+CeruleanGymBadgeSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -3,7 +3,7 @@
 	const CERULEANMART_COOLTRAINER_M
 	const CERULEANMART_COOLTRAINER_F
 
-CeruleanMart_MapScriptHeader:
+CeruleanMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -45,7 +45,7 @@
 	cont "CERULEAN's CAPE."
 	done
 
-CeruleanMart_MapEventHeader:
+CeruleanMart_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeruleanPokecenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -3,7 +3,7 @@
 	const CERULEANPOKECENTER1F_SUPER_NERD
 	const CERULEANPOKECENTER1F_GYM_GUY
 
-CeruleanPokecenter1F_MapScriptHeader:
+CeruleanPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -62,7 +62,7 @@
 	line "JOHTO accessible."
 	done
 
-CeruleanPokecenter1F_MapEventHeader:
+CeruleanPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeruleanPokecenter2FBeta.asm
+++ b/maps/CeruleanPokecenter2FBeta.asm
@@ -1,4 +1,4 @@
-CeruleanPokecenter2FBeta_MapScriptHeader:
+CeruleanPokecenter2FBeta_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-CeruleanPokecenter2FBeta_MapEventHeader:
+CeruleanPokecenter2FBeta_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeruleanPoliceStation.asm
+++ b/maps/CeruleanPoliceStation.asm
@@ -3,7 +3,7 @@
 	const CERULEANPOLICESTATION_POKEFAN_F
 	const CERULEANPOLICESTATION_DIGLETT
 
-CeruleanPoliceStation_MapScriptHeader:
+CeruleanPoliceStation_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -43,7 +43,7 @@
 	text "DIGLETT: Dug dug."
 	done
 
-CeruleanPoliceStation_MapEventHeader:
+CeruleanPoliceStation_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -4,7 +4,7 @@
 	const CERULEANTRADESPEECHHOUSE_RHYDON
 	const CERULEANTRADESPEECHHOUSE_ZUBAT
 
-CeruleanTradeSpeechHouse_MapScriptHeader:
+CeruleanTradeSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -53,7 +53,7 @@
 	text "ZUBAT: Zuba zubaa."
 	done
 
-CeruleanTradeSpeechHouse_MapEventHeader:
+CeruleanTradeSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -3,7 +3,7 @@
 	const CHARCOALKILN_YOUNGSTER
 	const CHARCOALKILN_MOLTRES
 
-CharcoalKiln_MapScriptHeader:
+CharcoalKiln_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -148,7 +148,7 @@
 	text "FARFETCH'D: Kwaa!"
 	done
 
-CharcoalKiln_MapEventHeader:
+CharcoalKiln_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -5,7 +5,7 @@
 	const CHERRYGROVECITY_YOUNGSTER
 	const CHERRYGROVECITY_FISHER
 
-CherrygroveCity_MapScriptHeader:
+CherrygroveCity_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -546,7 +546,7 @@
 	text "GUIDE GENT'S HOUSE"
 	done
 
-CherrygroveCity_MapEventHeader:
+CherrygroveCity_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -2,7 +2,7 @@
 	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS
 	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER
 
-CherrygroveEvolutionSpeechHouse_MapScriptHeader:
+CherrygroveEvolutionSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -41,7 +41,7 @@
 	line "if one did that!"
 	done
 
-CherrygroveEvolutionSpeechHouse_MapEventHeader:
+CherrygroveEvolutionSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CherrygroveGymSpeechHouse.asm
+++ b/maps/CherrygroveGymSpeechHouse.asm
@@ -2,7 +2,7 @@
 	const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M
 	const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER
 
-CherrygroveGymSpeechHouse_MapScriptHeader:
+CherrygroveGymSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -44,7 +44,7 @@
 	line "them tougher!"
 	done
 
-CherrygroveGymSpeechHouse_MapEventHeader:
+CherrygroveGymSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -3,7 +3,7 @@
 	const CHERRYGROVEMART_COOLTRAINER_M
 	const CHERRYGROVEMART_YOUNGSTER
 
-CherrygroveMart_MapScriptHeader:
+CherrygroveMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -71,7 +71,7 @@
 	line "ANTIDOTE with you."
 	done
 
-CherrygroveMart_MapEventHeader:
+CherrygroveMart_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CherrygrovePokecenter1F.asm
+++ b/maps/CherrygrovePokecenter1F.asm
@@ -4,7 +4,7 @@
 	const CHERRYGROVEPOKECENTER1F_GENTLEMAN
 	const CHERRYGROVEPOKECENTER1F_TEACHER
 
-CherrygrovePokecenter1F_MapScriptHeader:
+CherrygrovePokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -68,7 +68,7 @@
 	line "there already!"
 	done
 
-CherrygrovePokecenter1F_MapEventHeader:
+CherrygrovePokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -12,7 +12,7 @@
 	const CIANWOODCITY_EUSINE
 	const CIANWOODCITY_SUICUNE
 
-CianwoodCity_MapScriptHeader:
+CianwoodCity_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -380,7 +380,7 @@
 	line "AHEAD"
 	done
 
-CianwoodCity_MapEventHeader:
+CianwoodCity_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -9,7 +9,7 @@
 	const CIANWOODGYM_BOULDER3
 	const CIANWOODGYM_BOULDER4
 
-CianwoodGym_MapScriptHeader:
+CianwoodGym_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -305,7 +305,7 @@
 	cont "shattered…"
 	done
 
-CianwoodGym_MapEventHeader:
+CianwoodGym_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -3,7 +3,7 @@
 	const CIANWOODLUGIASPEECHHOUSE_LASS
 	const CIANWOODLUGIASPEECHHOUSE_TWIN
 
-CianwoodLugiaSpeechHouse_MapScriptHeader:
+CianwoodLugiaSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -61,7 +61,7 @@
 	cont "get past them."
 	done
 
-CianwoodLugiaSpeechHouse_MapEventHeader:
+CianwoodLugiaSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CianwoodPharmacy.asm
+++ b/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 @@
 	line "an emergency."
 	done
 
-CianwoodPharmacy_MapEventHeader:
+CianwoodPharmacy_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CianwoodPhotoStudio.asm
+++ b/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 @@
 	line "memento…"
 	done
 
-CianwoodPhotoStudio_MapEventHeader:
+CianwoodPhotoStudio_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CianwoodPokecenter1F.asm
+++ b/maps/CianwoodPokecenter1F.asm
@@ -4,7 +4,7 @@
 	const CIANWOODPOKECENTER1F_GYM_GUY
 	const CIANWOODPOKECENTER1F_SUPER_NERD
 
-CianwoodPokecenter1F_MapScriptHeader:
+CianwoodPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -131,7 +131,7 @@
 	line "off my #MON!"
 	done
 
-CianwoodPokecenter1F_MapEventHeader:
+CianwoodPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CinnabarIsland.asm
+++ b/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 @@
 	line "Burning Desire"
 	done
 
-CinnabarIsland_MapEventHeader:
+CinnabarIsland_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CinnabarPokecenter1F.asm
+++ b/maps/CinnabarPokecenter1F.asm
@@ -3,7 +3,7 @@
 	const CINNABARPOKECENTER1F_COOLTRAINER_F
 	const CINNABARPOKECENTER1F_FISHER
 
-CinnabarPokecenter1F_MapScriptHeader:
+CinnabarPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -34,7 +34,7 @@
 	cont "erupted."
 	done
 
-CinnabarPokecenter1F_MapEventHeader:
+CinnabarPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CinnabarPokecenter2FBeta.asm
+++ b/maps/CinnabarPokecenter2FBeta.asm
@@ -1,4 +1,4 @@
-CinnabarPokecenter2FBeta_MapScriptHeader:
+CinnabarPokecenter2FBeta_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-CinnabarPokecenter2FBeta_MapEventHeader:
+CinnabarPokecenter2FBeta_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -2,7 +2,7 @@
 	const COLOSSEUM_CHRIS1
 	const COLOSSEUM_CHRIS2
 
-Colosseum_MapScriptHeader:
+Colosseum_MapScripts:
 .SceneScripts:
 	db 3
 	scene_script .InitializeColosseum
@@ -62,7 +62,7 @@
 	line "ready."
 	done
 
-Colosseum_MapEventHeader:
+Colosseum_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -3,7 +3,7 @@
 	const COPYCATSHOUSE1F_POKEFAN_F
 	const COPYCATSHOUSE1F_CLEFAIRY
 
-CopycatsHouse1F_MapScriptHeader:
+CopycatsHouse1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -72,7 +72,7 @@
 	text "BLISSEY: Bliisii!"
 	done
 
-CopycatsHouse1F_MapEventHeader:
+CopycatsHouse1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -6,7 +6,7 @@
 	const COPYCATSHOUSE2F_BIRDDOLL
 	const COPYCATSHOUSE2F_COPYCAT2 ; if player is female
 
-CopycatsHouse2F_MapScriptHeader:
+CopycatsHouse2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -360,7 +360,7 @@
 	para "It's only a doll…"
 	done
 
-CopycatsHouse2F_MapEventHeader:
+CopycatsHouse2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -9,7 +9,7 @@
 	const DANCETHEATRE_COOLTRAINER_M
 	const DANCETHEATRE_GRANNY
 
-DanceTheatre_MapScriptHeader:
+DanceTheatre_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -337,7 +337,7 @@
 	cont "with flowers."
 	done
 
-DanceTheatre_MapEventHeader:
+DanceTheatre_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -3,7 +3,7 @@
 	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1
 	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2
 
-DarkCaveBlackthornEntrance_MapScriptHeader:
+DarkCaveBlackthornEntrance_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -61,7 +61,7 @@
 	cont "type moves."
 	done
 
-DarkCaveBlackthornEntrance_MapEventHeader:
+DarkCaveBlackthornEntrance_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -8,7 +8,7 @@
 	const DARKCAVEVIOLETENTRANCE_POKE_BALL3
 	const DARKCAVEVIOLETENTRANCE_POKE_BALL4
 
-DarkCaveVioletEntrance_MapScriptHeader:
+DarkCaveVioletEntrance_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -33,7 +33,7 @@
 DarkCaveVioletEntranceHiddenElixer:
 	hiddenitem EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER
 
-DarkCaveVioletEntrance_MapEventHeader:
+DarkCaveVioletEntrance_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -2,7 +2,7 @@
 	const DAYCARE_GRAMPS
 	const DAYCARE_GRANNY
 
-DayCare_MapScriptHeader:
+DayCare_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -155,7 +155,7 @@
 	line "this."
 	done
 
-DayCare_MapEventHeader:
+DayCare_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/DiglettsCave.asm
+++ b/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 @@
 	line "shocking."
 	done
 
-DiglettsCave_MapEventHeader:
+DiglettsCave_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -4,7 +4,7 @@
 	const DRAGONSHRINE_ELDER3
 	const DRAGONSHRINE_CLAIR
 
-DragonShrine_MapScriptHeader:
+DragonShrine_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DragonShrineTest
@@ -657,7 +657,7 @@
 	text "<......><......><......><......><......><......>"
 	done
 
-DragonShrine_MapEventHeader:
+DragonShrine_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/DragonsDen1F.asm
+++ b/maps/DragonsDen1F.asm
@@ -1,4 +1,4 @@
-DragonsDen1F_MapScriptHeader:
+DragonsDen1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-DragonsDen1F_MapEventHeader:
+DragonsDen1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -9,7 +9,7 @@
 	const DRAGONSDENB1F_POKE_BALL2
 	const DRAGONSDENB1F_POKE_BALL3
 
-DragonsDenB1F_MapScriptHeader:
+DragonsDenB1F_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -406,7 +406,7 @@
 	cont "items."
 	done
 
-DragonsDenB1F_MapEventHeader:
+DragonsDenB1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -6,7 +6,7 @@
 	const EARLSPOKEMONACADEMY_YOUNGSTER2
 	const EARLSPOKEMONACADEMY_POKEDEX
 
-EarlsPokemonAcademy_MapScriptHeader:
+EarlsPokemonAcademy_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -411,7 +411,7 @@
 	para "stickers!"
 	done
 
-EarlsPokemonAcademy_MapEventHeader:
+EarlsPokemonAcademy_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -7,7 +7,7 @@
 	const ECRUTEAKCITY_YOUNGSTER
 	const ECRUTEAKCITY_GRAMPS3
 
-EcruteakCity_MapScriptHeader:
+EcruteakCity_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -259,7 +259,7 @@
 	line "as it is unsafe."
 	done
 
-EcruteakCity_MapEventHeader:
+EcruteakCity_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -7,7 +7,7 @@
 	const ECRUTEAKGYM_GYM_GUY
 	const ECRUTEAKGYM_GRAMPS
 
-EcruteakGym_MapScriptHeader:
+EcruteakGym_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .ForcedToLeave
@@ -386,7 +386,7 @@
 	para "Hohohoho."
 	done
 
-EcruteakGym_MapEventHeader:
+EcruteakGym_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/EcruteakHouse.asm
+++ b/maps/EcruteakHouse.asm
@@ -4,7 +4,7 @@
 	const ECRUTEAKHOUSE_SAGE3
 	const ECRUTEAKHOUSE_GRAMPS
 
-EcruteakHouse_MapScriptHeader:
+EcruteakHouse_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -277,7 +277,7 @@
 	line "never to return."
 	done
 
-EcruteakHouse_MapEventHeader:
+EcruteakHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -2,7 +2,7 @@
 	const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M
 	const ECRUTEAKITEMFINDERHOUSE_POKEDEX
 
-EcruteakItemfinderHouse_MapScriptHeader:
+EcruteakItemfinderHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -162,7 +162,7 @@
 	line "grassland."
 	done
 
-EcruteakItemfinderHouse_MapEventHeader:
+EcruteakItemfinderHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -2,7 +2,7 @@
 	const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS
 	const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER
 
-EcruteakLugiaSpeechHouse_MapScriptHeader:
+EcruteakLugiaSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -44,7 +44,7 @@
 	line "must be powerful."
 	done
 
-EcruteakLugiaSpeechHouse_MapEventHeader:
+EcruteakLugiaSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -3,7 +3,7 @@
 	const ECRUTEAKMART_SUPER_NERD
 	const ECRUTEAKMART_GRANNY
 
-EcruteakMart_MapScriptHeader:
+EcruteakMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -45,7 +45,7 @@
 	line "right up."
 	done
 
-EcruteakMart_MapEventHeader:
+EcruteakMart_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -5,7 +5,7 @@
 	const ECRUTEAKPOKECENTER1F_GYM_GUY
 	const ECRUTEAKPOKECENTER1F_BILL
 
-EcruteakPokecenter1F_MapScriptHeader:
+EcruteakPokecenter1F_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .MeetBill
@@ -206,7 +206,7 @@
 	line "acy. I know it!"
 	done
 
-EcruteakPokecenter1F_MapEventHeader:
+EcruteakPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -2,7 +2,7 @@
 	const ELMSHOUSE_ELMS_WIFE
 	const ELMSHOUSE_ELMS_SON
 
-ElmsHouse_MapScriptHeader:
+ElmsHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -83,7 +83,7 @@
 	cont "search papers."
 	done
 
-ElmsHouse_MapEventHeader:
+ElmsHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -6,7 +6,7 @@
 	const ELMSLAB_POKE_BALL3
 	const ELMSLAB_OFFICER
 
-ElmsLab_MapScriptHeader:
+ElmsLab_MapScripts:
 .SceneScripts:
 	db 6
 	scene_script .MeetElm
@@ -1370,7 +1370,7 @@
 	line "screen…"
 	done
 
-ElmsLab_MapEventHeader:
+ElmsLab_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -4,7 +4,7 @@
 	const FASTSHIP1F_SAILOR3
 	const FASTSHIP1F_GENTLEMAN
 
-FastShip1F_MapScriptHeader:
+FastShip1F_MapScripts:
 .SceneScripts:
 	db 3
 	scene_script .DummyScene0
@@ -285,7 +285,7 @@
 	cont "VERMILION CITY."
 	done
 
-FastShip1F_MapEventHeader:
+FastShip1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -12,7 +12,7 @@
 	const FASTSHIPB1F_YOUNGSTER1
 	const FASTSHIPB1F_YOUNGSTER2
 
-FastShipB1F_MapScriptHeader:
+FastShipB1F_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -448,7 +448,7 @@
 	cont "stone panels."
 	done
 
-FastShipB1F_MapEventHeader:
+FastShipB1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -7,7 +7,7 @@
 	const FASTSHIPCABINS_NNW_NNE_NE_GENTLEMAN
 	const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST
 
-FastShipCabins_NNW_NNE_NE_MapScriptHeader:
+FastShipCabins_NNW_NNE_NE_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -266,7 +266,7 @@
 	line "lost it…"
 	done
 
-FastShipCabins_NNW_NNE_NE_MapEventHeader:
+FastShipCabins_NNW_NNE_NE_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -11,7 +11,7 @@
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_POKEFAN_F
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2
 
-FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader:
+FastShipCabins_SE_SSE_CaptainsCabin_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -462,7 +462,7 @@
 	cont "VERMILION CITY."
 	done
 
-FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader:
+FastShipCabins_SE_SSE_CaptainsCabin_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -4,7 +4,7 @@
 	const FASTSHIPCABINS_SW_SSW_NW_BUENA
 	const FASTSHIPCABINS_SW_SSW_NW_ROCKER
 
-FastShipCabins_SW_SSW_NW_MapScriptHeader:
+FastShipCabins_SW_SSW_NW_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -222,7 +222,7 @@
 	cont "VERMILION CITY."
 	done
 
-FastShipCabins_SW_SSW_NW_MapEventHeader:
+FastShipCabins_SW_SSW_NW_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -2,7 +2,7 @@
 	const FIGHTINGDOJO_BLACK_BELT
 	const FIGHTINGDOJO_POKE_BALL
 
-FightingDojo_MapScriptHeader:
+FightingDojo_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -42,7 +42,7 @@
 	line "side!"
 	done
 
-FightingDojo_MapEventHeader:
+FightingDojo_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/FuchsiaBillSpeechHouse.asm
+++ b/maps/FuchsiaBillSpeechHouse.asm
@@ -2,7 +2,7 @@
 	const FUCHSIABILLSPEECHHOUSE_POKEFAN_F
 	const FUCHSIABILLSPEECHHOUSE_YOUNGSTER
 
-FuchsiaBillSpeechHouse_MapScriptHeader:
+FuchsiaBillSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -27,7 +27,7 @@
 	cont "CYCLING ROAD."
 	done
 
-FuchsiaBillSpeechHouse_MapEventHeader:
+FuchsiaBillSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -4,7 +4,7 @@
 	const FUCHSIACITY_TEACHER
 	const FUCHSIACITY_FRUIT_TREE
 
-FuchsiaCity_MapScriptHeader:
+FuchsiaCity_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -124,7 +124,7 @@
 	line "waste with you."
 	done
 
-FuchsiaCity_MapEventHeader:
+FuchsiaCity_MapEvents:
 	; filler
 	db 0, 0
 
@@ -139,8 +139,8 @@
 	warp_def 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA
 	warp_def 37, 22, 1, ROUTE_15_FUCHSIA_GATE
 	warp_def 37, 23, 2, ROUTE_15_FUCHSIA_GATE
-	warp_def 7, 35, 1, ROUTE_19___FUCHSIA_GATE
-	warp_def 8, 35, 2, ROUTE_19___FUCHSIA_GATE
+	warp_def 7, 35, 1, ROUTE_19_FUCHSIA_GATE
+	warp_def 8, 35, 2, ROUTE_19_FUCHSIA_GATE
 
 .CoordEvents:
 	db 0
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -6,7 +6,7 @@
 	const FUCHSIAGYM_FUCHSIA_GYM_4
 	const FUCHSIAGYM_GYM_GUY
 
-FuchsiaGym_MapScriptHeader:
+FuchsiaGym_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -380,7 +380,7 @@
 	cont "from JOHTO!"
 	done
 
-FuchsiaGym_MapEventHeader:
+FuchsiaGym_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -3,7 +3,7 @@
 	const FUCHSIAMART_FISHER
 	const FUCHSIAMART_COOLTRAINER_F
 
-FuchsiaMart_MapScriptHeader:
+FuchsiaMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -37,7 +37,7 @@
 	cont "town."
 	done
 
-FuchsiaMart_MapEventHeader:
+FuchsiaMart_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/FuchsiaPokecenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -4,7 +4,7 @@
 	const FUCHSIAPOKECENTER1F_COOLTRAINER_F
 	const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR
 
-FuchsiaPokecenter1F_MapScriptHeader:
+FuchsiaPokecenter1F_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -88,7 +88,7 @@
 	line "like her now!"
 	done
 
-FuchsiaPokecenter1F_MapEventHeader:
+FuchsiaPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/FuchsiaPokecenter2FBeta.asm
+++ b/maps/FuchsiaPokecenter2FBeta.asm
@@ -1,4 +1,4 @@
-FuchsiaPokecenter2FBeta_MapScriptHeader:
+FuchsiaPokecenter2FBeta_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-FuchsiaPokecenter2FBeta_MapEventHeader:
+FuchsiaPokecenter2FBeta_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const GOLDENRODBIKESHOP_CLERK
 
-GoldenrodBikeShop_MapScriptHeader:
+GoldenrodBikeShop_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -102,7 +102,7 @@
 	line "BICYCLE!"
 	done
 
-GoldenrodBikeShop_MapEventHeader:
+GoldenrodBikeShop_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodBillsHouse.asm
+++ b/maps/GoldenrodBillsHouse.asm
@@ -3,7 +3,7 @@
 	const GOLDENRODBILLSHOUSE_POKEFAN_F
 	const GOLDENRODBILLSHOUSE_TWIN
 
-GoldenrodBillsHouse_MapScriptHeader:
+GoldenrodBillsHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -242,7 +242,7 @@
 	line "system."
 	done
 
-GoldenrodBillsHouse_MapEventHeader:
+GoldenrodBillsHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -15,7 +15,7 @@
 	const GOLDENRODCITY_ROCKET6
 	const GOLDENRODCITY_POKEFAN_M2
 
-GoldenrodCity_MapScriptHeader:
+GoldenrodCity_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -551,7 +551,7 @@
 	text ""
 	done
 
-GoldenrodCity_MapEventHeader:
+GoldenrodCity_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -4,7 +4,7 @@
 	const GOLDENRODDEPTSTORE1F_BUG_CATCHER
 	const GOLDENRODDEPTSTORE1F_GENTLEMAN
 
-GoldenrodDeptStore1F_MapScriptHeader:
+GoldenrodDeptStore1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -78,7 +78,7 @@
 	para "ROOFTOP LOOKOUT"
 	done
 
-GoldenrodDeptStore1F_MapEventHeader:
+GoldenrodDeptStore1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -5,7 +5,7 @@
 	const GOLDENRODDEPTSTORE2F_COOLTRAINER_F
 	const GOLDENRODDEPTSTORE2F_GENTLEMAN
 
-GoldenrodDeptStore2F_MapScriptHeader:
+GoldenrodDeptStore2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -100,7 +100,7 @@
 	line "   MARKET"
 	done
 
-GoldenrodDeptStore2F_MapEventHeader:
+GoldenrodDeptStore2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -3,7 +3,7 @@
 	const GOLDENRODDEPTSTORE3F_SUPER_NERD
 	const GOLDENRODDEPTSTORE3F_ROCKER
 
-GoldenrodDeptStore3F_MapScriptHeader:
+GoldenrodDeptStore3F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -56,7 +56,7 @@
 	line "   COLLECTION"
 	done
 
-GoldenrodDeptStore3F_MapEventHeader:
+GoldenrodDeptStore3F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -4,7 +4,7 @@
 	const GOLDENRODDEPTSTORE4F_BUG_CATCHER
 	const GOLDENRODDEPTSTORE4F_GAMEBOY_KID
 
-GoldenrodDeptStore4F_MapScriptHeader:
+GoldenrodDeptStore4F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -77,7 +77,7 @@
 	para "4F MEDICINE BOX"
 	done
 
-GoldenrodDeptStore4F_MapEventHeader:
+GoldenrodDeptStore4F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -6,7 +6,7 @@
 	const GOLDENRODDEPTSTORE5F_CARRIE
 	const GOLDENRODDEPTSTORE5F_RECEPTIONIST
 
-GoldenrodDeptStore5F_MapScriptHeader:
+GoldenrodDeptStore5F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -217,7 +217,7 @@
 	para "5F TM CORNER"
 	done
 
-GoldenrodDeptStore5F_MapEventHeader:
+GoldenrodDeptStore5F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -2,7 +2,7 @@
 	const GOLDENRODDEPTSTORE6F_LASS
 	const GOLDENRODDEPTSTORE6F_SUPER_NERD
 
-GoldenrodDeptStore6F_MapScriptHeader:
+GoldenrodDeptStore6F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -147,7 +147,7 @@
 	para "6F TRANQUIL SQUARE"
 	done
 
-GoldenrodDeptStore6F_MapEventHeader:
+GoldenrodDeptStore6F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -8,7 +8,7 @@
 	const GOLDENRODDEPTSTOREB1F_BLACK_BELT3
 	const GOLDENRODDEPTSTOREB1F_MACHOP
 
-GoldenrodDeptStoreB1F_MapScriptHeader:
+GoldenrodDeptStoreB1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -109,7 +109,7 @@
 	text "MACHOKE: Maaacho!"
 	done
 
-GoldenrodDeptStoreB1F_MapEventHeader:
+GoldenrodDeptStoreB1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -1,4 +1,4 @@
-GoldenrodDeptStoreElevator_MapScriptHeader:
+GoldenrodDeptStoreElevator_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -54,7 +54,7 @@
 	elevfloor FLOOR_6F,  2, GOLDENROD_DEPT_STORE_6F
 	db -1 ; end
 
-GoldenrodDeptStoreElevator_MapEventHeader:
+GoldenrodDeptStoreElevator_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -8,7 +8,7 @@
 	const GOLDENRODDEPTSTOREROOF_TEACHER
 	const GOLDENRODDEPTSTOREROOF_BUG_CATCHER
 
-GoldenrodDeptStoreRoof_MapScriptHeader:
+GoldenrodDeptStoreRoof_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -211,7 +211,7 @@
 	line "empty…"
 	done
 
-GoldenrodDeptStoreRoof_MapEventHeader:
+GoldenrodDeptStoreRoof_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -2,7 +2,7 @@
 	const GOLDENRODFLOWERSHOP_TEACHER
 	const GOLDENRODFLOWERSHOP_FLORIA
 
-GoldenrodFlowerShop_MapScriptHeader:
+GoldenrodFlowerShop_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -159,7 +159,7 @@
 	line "#MON!"
 	done
 
-GoldenrodFlowerShop_MapEventHeader:
+GoldenrodFlowerShop_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -12,7 +12,7 @@
 	const GOLDENRODGAMECORNER_POKEFAN_M2
 	const GOLDENRODGAMECORNER_POKEFAN_M3
 
-GoldenrodGameCorner_MapScriptHeader:
+GoldenrodGameCorner_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -436,7 +436,7 @@
 	para "It smells sweet."
 	done
 
-GoldenrodGameCorner_MapEventHeader:
+GoldenrodGameCorner_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -6,7 +6,7 @@
 	const GOLDENRODGYM_BUENA2
 	const GOLDENRODGYM_GYM_GUY
 
-GoldenrodGym_MapScriptHeader:
+GoldenrodGym_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -379,7 +379,7 @@
 	cont "the ladies here."
 	done
 
-GoldenrodGym_MapEventHeader:
+GoldenrodGym_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -3,7 +3,7 @@
 	const GOLDENRODHAPPINESSRATER_POKEFAN_M
 	const GOLDENRODHAPPINESSRATER_TWIN
 
-GoldenrodHappinessRater_MapScriptHeader:
+GoldenrodHappinessRater_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -136,7 +136,7 @@
 	cont "acts really glad!"
 	done
 
-GoldenrodHappinessRater_MapEventHeader:
+GoldenrodHappinessRater_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -2,7 +2,7 @@
 	const GOLDENRODMAGNETTRAINSTATION_OFFICER
 	const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN
 
-GoldenrodMagnetTrainStation_MapScriptHeader:
+GoldenrodMagnetTrainStation_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -164,7 +164,7 @@
 	cont "to KANTO."
 	done
 
-GoldenrodMagnetTrainStation_MapEventHeader:
+GoldenrodMagnetTrainStation_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodNameRater.asm
+++ b/maps/GoldenrodNameRater.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const GOLDENRODNAMERATER_NAME_RATER
 
-GoldenrodNameRater_MapScriptHeader:
+GoldenrodNameRater_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -24,7 +24,7 @@
 
 INCLUDE "data/unused/sweet_honey_text.asm"
 
-GoldenrodNameRater_MapEventHeader:
+GoldenrodNameRater_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -2,7 +2,7 @@
 	const GOLDENRODPPSPEECHHOUSE_FISHER
 	const GOLDENRODPPSPEECHHOUSE_LASS
 
-GoldenrodPPSpeechHouse_MapScriptHeader:
+GoldenrodPPSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -51,7 +51,7 @@
 	cont "an item."
 	done
 
-GoldenrodPPSpeechHouse_MapEventHeader:
+GoldenrodPPSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodPokeComCenter2FMobile.asm
+++ b/maps/GoldenrodPokeComCenter2FMobile.asm
@@ -3,7 +3,7 @@
 	const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST2
 	const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST3
 
-GoldenrodPokeComCenter2FMobile_MapScriptHeader:
+GoldenrodPokeComCenter2FMobile_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -262,7 +262,7 @@
 	para "<......> <......> <......>"
 	done
 
-GoldenrodPokeComCenter2FMobile_MapEventHeader:
+GoldenrodPokeComCenter2FMobile_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -5,7 +5,7 @@
 	const GOLDENRODPOKECENTER1F_LASS
 	const GOLDENRODPOKECENTER1F_POKEFAN_F
 
-GoldenrodPokecenter1F_MapScriptHeader:
+GoldenrodPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -804,7 +804,7 @@
 	line "the EON MAIL."
 	done
 
-GoldenrodPokecenter1F_MapEventHeader:
+GoldenrodPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -9,7 +9,7 @@
 	const GOLDENRODUNDERGROUND_SUPER_NERD6
 	const GOLDENRODUNDERGROUND_GRANNY
 
-GoldenrodUnderground_MapScriptHeader:
+GoldenrodUnderground_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -646,7 +646,7 @@
 	line "THIS POINT"
 	done
 
-GoldenrodUnderground_MapEventHeader:
+GoldenrodUnderground_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -43,7 +43,7 @@
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_POKE_BALL2
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 
-GoldenrodUndergroundSwitchRoomEntrances_MapScriptHeader:
+GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -929,7 +929,7 @@
 	line "EMERGENCY."
 	done
 
-GoldenrodUndergroundSwitchRoomEntrances_MapEventHeader:
+GoldenrodUndergroundSwitchRoomEntrances_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -7,7 +7,7 @@
 	const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL2
 	const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL3
 
-GoldenrodUndergroundWarehouse_MapScriptHeader:
+GoldenrodUndergroundWarehouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -210,7 +210,7 @@
 	line "MON nationwide!"
 	done
 
-GoldenrodUndergroundWarehouse_MapEventHeader:
+GoldenrodUndergroundWarehouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/GuideGentsHouse.asm
+++ b/maps/GuideGentsHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const GUIDEGENTSHOUSE_GRAMPS
 
-GuideGentsHouse_MapScriptHeader:
+GuideGentsHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -27,7 +27,7 @@
 	line "with kindness!"
 	done
 
-GuideGentsHouse_MapEventHeader:
+GuideGentsHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const HALLOFFAME_LANCE
 
-HallOfFame_MapScriptHeader:
+HallOfFame_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .EnterHallOfFame
@@ -110,7 +110,7 @@
 	line "as CHAMPIONS!"
 	done
 
-HallOfFame_MapEventHeader:
+HallOfFame_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -3,7 +3,7 @@
 	const ICEPATH1F_POKE_BALL2
 	const ICEPATH1F_POKE_BALL3
 
-IcePath1F_MapScriptHeader:
+IcePath1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -19,7 +19,7 @@
 IcePath1FProtein:
 	itemball PROTEIN
 
-IcePath1F_MapEventHeader:
+IcePath1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -5,7 +5,7 @@
 	const ICEPATHB1F_BOULDER4
 	const ICEPATHB1F_POKE_BALL
 
-IcePathB1F_MapScriptHeader:
+IcePathB1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -75,7 +75,7 @@
 	line "through."
 	done
 
-IcePathB1F_MapEventHeader:
+IcePathB1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL
 
-IcePathB2FBlackthornSide_MapScriptHeader:
+IcePathB2FBlackthornSide_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -14,7 +14,7 @@
 IcePathB2FBlackthornSideHiddenIceHeal:
 	hiddenitem EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL
 
-IcePathB2FBlackthornSide_MapEventHeader:
+IcePathB2FBlackthornSide_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -6,7 +6,7 @@
 	const ICEPATHB2FMAHOGANYSIDE_POKE_BALL1
 	const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2
 
-IcePathB2FMahoganySide_MapScriptHeader:
+IcePathB2FMahoganySide_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -30,7 +30,7 @@
 	line "imbedded in ice."
 	done
 
-IcePathB2FMahoganySide_MapEventHeader:
+IcePathB2FMahoganySide_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -2,7 +2,7 @@
 	const ICEPATHB3F_POKE_BALL
 	const ICEPATHB3F_ROCK
 
-IcePathB3F_MapScriptHeader:
+IcePathB3F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -15,7 +15,7 @@
 IcePathB3FRock:
 	jumpstd smashrock
 
-IcePathB3F_MapEventHeader:
+IcePathB3F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -11,7 +11,7 @@
 	const ILEXFOREST_POKE_BALL3
 	const ILEXFOREST_POKE_BALL4
 
-IlexForest_MapScriptHeader:
+IlexForest_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -937,7 +937,7 @@
 	cont "places too."
 	done
 
-IlexForest_MapEventHeader:
+IlexForest_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -2,7 +2,7 @@
 	const ILEXFORESTAZALEAGATE_OFFICER
 	const ILEXFORESTAZALEAGATE_GRANNY
 
-IlexForestAzaleaGate_MapScriptHeader:
+IlexForestAzaleaGate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -30,7 +30,7 @@
 	line "mischief!"
 	done
 
-IlexForestAzaleaGate_MapEventHeader:
+IlexForestAzaleaGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -6,7 +6,7 @@
 	const INDIGOPLATEAUPOKECENTER1F_GRAMPS
 	const INDIGOPLATEAUPOKECENTER1F_ABRA
 
-IndigoPlateauPokecenter1F_MapScriptHeader:
+IndigoPlateauPokecenter1F_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -302,7 +302,7 @@
 	text "ABRA: Aabra…"
 	done
 
-IndigoPlateauPokecenter1F_MapEventHeader:
+IndigoPlateauPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const KARENSROOM_KAREN
 
-KarensRoom_MapScriptHeader:
+KarensRoom_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .LockDoor
@@ -132,7 +132,7 @@
 	line "PION is waiting."
 	done
 
-KarensRoom_MapEventHeader:
+KarensRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const KOGASROOM_KOGA
 
-KogasRoom_MapScriptHeader:
+KogasRoom_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .LockDoor
@@ -129,7 +129,7 @@
 	cont "abilities to test!"
 	done
 
-KogasRoom_MapEventHeader:
+KogasRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/KrissHouse1F.asm
+++ b/maps/KrissHouse1F.asm
@@ -5,7 +5,7 @@
 	const KRISSHOUSE1F_MOM4
 	const KRISSHOUSE1F_POKEFAN_F
 
-KrissHouse1F_MapScriptHeader:
+KrissHouse1F_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -385,7 +385,7 @@
 	line "rolling too!"
 	done
 
-KrissHouse1F_MapEventHeader:
+KrissHouse1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/KrissHouse2F.asm
+++ b/maps/KrissHouse2F.asm
@@ -4,7 +4,7 @@
 	const KRISSHOUSE2F_DOLL_2
 	const KRISSHOUSE2F_BIG_DOLL
 
-KrissHouse2F_MapScriptHeader:
+KrissHouse2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -115,7 +115,7 @@
 	line "#MON CHANNEL…"
 	done
 
-KrissHouse2F_MapEventHeader:
+KrissHouse2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/KrissNeighborsHouse.asm
+++ b/maps/KrissNeighborsHouse.asm
@@ -2,7 +2,7 @@
 	const KRISSNEIGHBORSHOUSE_COOLTRAINER_F
 	const KRISSNEIGHBORSHOUSE_POKEFAN_F
 
-KrissNeighborsHouse_MapScriptHeader:
+KrissNeighborsHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -98,7 +98,7 @@
 	line "#MON CHANNEL…"
 	done
 
-KrissNeighborsHouse_MapEventHeader:
+KrissNeighborsHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -5,7 +5,7 @@
 	const KURTSHOUSE_KURT2
 	const KURTSHOUSE_TWIN2
 
-KurtsHouse_MapScriptHeader:
+KurtsHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -676,7 +676,7 @@
 	cont "tector."
 	done
 
-KurtsHouse_MapEventHeader:
+KurtsHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -12,7 +12,7 @@
 	const LAKEOFRAGE_POKE_BALL1
 	const LAKEOFRAGE_POKE_BALL2
 
-LakeOfRage_MapScriptHeader:
+LakeOfRage_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -493,7 +493,7 @@
 	line "HOUSE"
 	done
 
-LakeOfRage_MapEventHeader:
+LakeOfRage_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/LakeOfRageHiddenPowerHouse.asm
+++ b/maps/LakeOfRageHiddenPowerHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER
 
-LakeOfRageHiddenPowerHouse_MapScriptHeader:
+LakeOfRageHiddenPowerHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -67,7 +67,7 @@
 	text "I am meditating…"
 	done
 
-LakeOfRageHiddenPowerHouse_MapEventHeader:
+LakeOfRageHiddenPowerHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU
 
-LakeOfRageMagikarpHouse_MapScriptHeader:
+LakeOfRageMagikarpHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -206,7 +206,7 @@
 	text_from_ram StringBuffer4
 	db "@@"
 
-LakeOfRageMagikarpHouse_MapEventHeader:
+LakeOfRageMagikarpHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -3,7 +3,7 @@
 	const LANCESROOM_MARY
 	const LANCESROOM_OAK
 
-LancesRoom_MapScriptHeader:
+LancesRoom_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .LockDoor
@@ -337,7 +337,7 @@
 	cont "the interview!"
 	done
 
-LancesRoom_MapEventHeader:
+LancesRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -5,7 +5,7 @@
 	const LAVRADIOTOWER1F_GENTLEMAN
 	const LAVRADIOTOWER1F_SUPER_NERD2
 
-LavRadioTower1F_MapScriptHeader:
+LavRadioTower1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -221,7 +221,7 @@
 	line "reference library."
 	done
 
-LavRadioTower1F_MapEventHeader:
+LavRadioTower1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -3,7 +3,7 @@
 	const LAVENDERMART_POKEFAN_M
 	const LAVENDERMART_ROCKER
 
-LavenderMart_MapScriptHeader:
+LavenderMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -47,7 +47,7 @@
 	line "I had some."
 	done
 
-LavenderMart_MapEventHeader:
+LavenderMart_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const LAVENDERNAMERATER_NAME_RATER
 
-LavenderNameRater_MapScriptHeader:
+LavenderNameRater_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -23,7 +23,7 @@
 LavenderNameRaterUnusedBookshelf:
 	jumpstd difficultbookshelf
 
-LavenderNameRater_MapEventHeader:
+LavenderNameRater_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/LavenderPokecenter1F.asm
+++ b/maps/LavenderPokecenter1F.asm
@@ -4,7 +4,7 @@
 	const LAVENDERPOKECENTER1F_TEACHER
 	const LAVENDERPOKECENTER1F_YOUNGSTER
 
-LavenderPokecenter1F_MapScriptHeader:
+LavenderPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -80,7 +80,7 @@
 	cont "smoothly again."
 	done
 
-LavenderPokecenter1F_MapEventHeader:
+LavenderPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/LavenderPokecenter2FBeta.asm
+++ b/maps/LavenderPokecenter2FBeta.asm
@@ -1,4 +1,4 @@
-LavenderPokecenter2FBeta_MapScriptHeader:
+LavenderPokecenter2FBeta_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-LavenderPokecenter2FBeta_MapEventHeader:
+LavenderPokecenter2FBeta_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/LavenderSpeechHouse.asm
+++ b/maps/LavenderSpeechHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const LAVENDERSPEECHHOUSE_POKEFAN_F
 
-LavenderSpeechHouse_MapScriptHeader:
+LavenderSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -28,7 +28,7 @@
 	line "built."
 	done
 
-LavenderSpeechHouse_MapEventHeader:
+LavenderSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -4,7 +4,7 @@
 	const LAVENDERTOWN_GRAMPS
 	const LAVENDERTOWN_YOUNGSTER
 
-LavenderTown_MapScriptHeader:
+LavenderTown_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -105,7 +105,7 @@
 	line "#MON Rest Easy"
 	done
 
-LavenderTown_MapEventHeader:
+LavenderTown_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -7,7 +7,7 @@
 	const MAHOGANYGYM_ROCKER3
 	const MAHOGANYGYM_GYM_GUY
 
-MahoganyGym_MapScriptHeader:
+MahoganyGym_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -372,7 +372,7 @@
 	line "eration gap!"
 	done
 
-MahoganyGym_MapEventHeader:
+MahoganyGym_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -5,7 +5,7 @@
 	const MAHOGANYMART1F_DRAGON
 	const MAHOGANYMART1F_GRANNY
 
-MahoganyMart1F_MapScriptHeader:
+MahoganyMart1F_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -220,7 +220,7 @@
 	line "I'll go first."
 	done
 
-MahoganyMart1F_MapEventHeader:
+MahoganyMart1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MahoganyPokecenter1F.asm
+++ b/maps/MahoganyPokecenter1F.asm
@@ -4,7 +4,7 @@
 	const MAHOGANYPOKECENTER1F_YOUNGSTER
 	const MAHOGANYPOKECENTER1F_COOLTRAINER_F
 
-MahoganyPokecenter1F_MapScriptHeader:
+MahoganyPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -53,7 +53,7 @@
 	cont "more slowly."
 	done
 
-MahoganyPokecenter1F_MapEventHeader:
+MahoganyPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -2,7 +2,7 @@
 	const MAHOGANYREDGYARADOSSPEECHHOUSE_BLACK_BELT
 	const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER
 
-MahoganyRedGyaradosSpeechHouse_MapScriptHeader:
+MahoganyRedGyaradosSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -60,7 +60,7 @@
 	line "It's creepy."
 	done
 
-MahoganyRedGyaradosSpeechHouse_MapEventHeader:
+MahoganyRedGyaradosSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -4,7 +4,7 @@
 	const MAHOGANYTOWN_FISHER
 	const MAHOGANYTOWN_LASS
 
-MahoganyTown_MapScriptHeader:
+MahoganyTown_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -244,7 +244,7 @@
 	line "Winter's Harshness"
 	done
 
-MahoganyTown_MapEventHeader:
+MahoganyTown_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const MANIASHOUSE_ROCKER
 
-ManiasHouse_MapScriptHeader:
+ManiasHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -199,7 +199,7 @@
 	line "in battle?"
 	done
 
-ManiasHouse_MapEventHeader:
+ManiasHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -1,4 +1,4 @@
-MobileBattleRoom_MapScriptHeader:
+MobileBattleRoom_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .InitializeMobileBattleRoom
@@ -66,7 +66,7 @@
 	cont "before battle."
 	done
 
-MobileBattleRoom_MapEventHeader:
+MobileBattleRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -1,4 +1,4 @@
-MobileTradeRoomMobile_MapScriptHeader:
+MobileTradeRoomMobile_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .InitializeMobileTradeRoomMobile
@@ -34,7 +34,7 @@
 	line "communications…"
 	done
 
-MobileTradeRoomMobile_MapEventHeader:
+MobileTradeRoomMobile_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const MOUNTMOON_SILVER
 
-MountMoon_MapScriptHeader:
+MountMoon_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .RivalEncounter
@@ -160,7 +160,7 @@
 	cont "greatest trainer."
 	done
 
-MountMoon_MapEventHeader:
+MountMoon_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -4,7 +4,7 @@
 	const MOUNTMOONGIFTSHOP_LASS1 ; morning only
 	const MOUNTMOONGIFTSHOP_LASS2 ; day only
 
-MountMoonGiftShop_MapScriptHeader:
+MountMoonGiftShop_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -27,7 +27,7 @@
 	cont "come out to play."
 	done
 
-MountMoonGiftShop_MapEventHeader:
+MountMoonGiftShop_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -3,7 +3,7 @@
 	const MOUNTMOONSQUARE_FAIRY2
 	const MOUNTMOONSQUARE_ROCK
 
-MountMoonSquare_MapScriptHeader:
+MountMoonSquare_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -132,7 +132,7 @@
 	line "DON'T LITTER"
 	done
 
-MountMoonSquare_MapEventHeader:
+MountMoonSquare_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -10,7 +10,7 @@
 	const MOUNTMORTAR1FINSIDE_POKE_BALL6
 	const MOUNTMORTAR1FINSIDE_POKE_BALL7
 
-MountMortar1FInside_MapScriptHeader:
+MountMortar1FInside_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -116,7 +116,7 @@
 	line "WATERFALL?"
 	done
 
-MountMortar1FInside_MapEventHeader:
+MountMortar1FInside_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -2,7 +2,7 @@
 	const MOUNTMORTAR1FOUTSIDE_POKE_BALL1
 	const MOUNTMORTAR1FOUTSIDE_POKE_BALL2
 
-MountMortar1FOutside_MapScriptHeader:
+MountMortar1FOutside_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -18,7 +18,7 @@
 MountMortar1FOutsideHiddenHyperPotion:
 	hiddenitem EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION
 
-MountMortar1FOutside_MapEventHeader:
+MountMortar1FOutside_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -7,7 +7,7 @@
 	const MOUNTMORTAR2FINSIDE_POKE_BALL6
 	const MOUNTMORTAR2FINSIDE_SUPER_NERD
 
-MountMortar2FInside_MapScriptHeader:
+MountMortar2FInside_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -66,7 +66,7 @@
 	line "use STRENGTH?"
 	done
 
-MountMortar2FInside_MapEventHeader:
+MountMortar2FInside_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -7,7 +7,7 @@
 	const MOUNTMORTARB1F_POKE_BALL4
 	const MOUNTMORTARB1F_POKE_BALL5
 
-MountMortarB1F_MapScriptHeader:
+MountMortarB1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -134,7 +134,7 @@
 	line "in your party!"
 	done
 
-MountMortarB1F_MapEventHeader:
+MountMortarB1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MoveDeletersHouse.asm
+++ b/maps/MoveDeletersHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const MOVEDELETERSHOUSE_SUPER_NERD
 
-MoveDeletersHouse_MapScriptHeader:
+MoveDeletersHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -19,7 +19,7 @@
 MoveDeletersHouseBookshelf:
 	jumpstd difficultbookshelf
 
-MoveDeletersHouse_MapEventHeader:
+MoveDeletersHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MrFujisHouse.asm
+++ b/maps/MrFujisHouse.asm
@@ -5,7 +5,7 @@
 	const MRFUJISHOUSE_NIDORINO
 	const MRFUJISHOUSE_PIDGEY
 
-MrFujisHouse_MapScriptHeader:
+MrFujisHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -79,7 +79,7 @@
 	text "PIDGEY: Pijji!"
 	done
 
-MrFujisHouse_MapEventHeader:
+MrFujisHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -2,7 +2,7 @@
 	const MRPOKEMONSHOUSE_GENTLEMAN
 	const MRPOKEMONSHOUSE_OAK
 
-MrPokemonsHouse_MapScriptHeader:
+MrPokemonsHouse_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .MeetMrPokemon
@@ -372,7 +372,7 @@
 	line "another country…"
 	done
 
-MrPokemonsHouse_MapEventHeader:
+MrPokemonsHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const MRPSYCHICSHOUSE_FISHING_GURU
 
-MrPsychicsHouse_MapScriptHeader:
+MrPsychicsHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -47,7 +47,7 @@
 	line "target's SPCL.DEF."
 	done
 
-MrPsychicsHouse_MapEventHeader:
+MrPsychicsHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -14,7 +14,7 @@
 	const NATIONALPARK_GAMEBOY_KID
 	const NATIONALPARK_POKE_BALL2
 
-NationalPark_MapScriptHeader:
+NationalPark_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -513,7 +513,7 @@
 	cont "pressing START."
 	done
 
-NationalPark_MapEventHeader:
+NationalPark_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -12,7 +12,7 @@
 	const NATIONALPARKBUGCONTEST_POKE_BALL1
 	const NATIONALPARKBUGCONTEST_POKE_BALL2
 
-NationalParkBugContest_MapScriptHeader:
+NationalParkBugContest_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -220,7 +220,7 @@
 	cont "pressing START."
 	done
 
-NationalParkBugContest_MapEventHeader:
+NationalParkBugContest_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -3,7 +3,7 @@
 	const NEWBARKTOWN_FISHER
 	const NEWBARKTOWN_SILVER
 
-NewBarkTown_MapScriptHeader:
+NewBarkTown_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -281,7 +281,7 @@
 	text "ELM'S HOUSE"
 	done
 
-NewBarkTown_MapEventHeader:
+NewBarkTown_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -4,7 +4,7 @@
 	const OAKSLAB_SCIENTIST2
 	const OAKSLAB_SCIENTIST3
 
-OaksLab_MapScriptHeader:
+OaksLab_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -256,7 +256,7 @@
 	line "TOWN 8-)"
 	done
 
-OaksLab_MapEventHeader:
+OaksLab_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -3,7 +3,7 @@
 	const OLIVINECAFE_FISHING_GURU
 	const OLIVINECAFE_SAILOR2
 
-OlivineCafe_MapScriptHeader:
+OlivineCafe_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -78,7 +78,7 @@
 	line "stop eating!"
 	done
 
-OlivineCafe_MapEventHeader:
+OlivineCafe_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -4,7 +4,7 @@
 	const OLIVINECITY_SAILOR2
 	const OLIVINECITY_OLIVINE_RIVAL
 
-OlivineCity_MapScriptHeader:
+OlivineCity_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -287,7 +287,7 @@
 	text "BATTLE TOWER AHEAD"
 	done
 
-OlivineCity_MapEventHeader:
+OlivineCity_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const OLIVINEGOODRODHOUSE_FISHING_GURU
 
-OlivineGoodRodHouse_MapScriptHeader:
+OlivineGoodRodHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -82,7 +82,7 @@
 	line "Land the big one?"
 	done
 
-OlivineGoodRodHouse_MapEventHeader:
+OlivineGoodRodHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -2,7 +2,7 @@
 	const OLIVINEGYM_JASMINE
 	const OLIVINEGYM_GYM_GUY
 
-OlivineGym_MapScriptHeader:
+OlivineGym_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -197,7 +197,7 @@
 	cont "sionate."
 	done
 
-OlivineGym_MapEventHeader:
+OlivineGym_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -2,7 +2,7 @@
 	const OLIVINEHOUSEBETA_TEACHER
 	const OLIVINEHOUSEBETA_RHYDON
 
-OlivineHouseBeta_MapScriptHeader:
+OlivineHouseBeta_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -39,7 +39,7 @@
 	text "RHYDON: Gugooh!"
 	done
 
-OlivineHouseBeta_MapEventHeader:
+OlivineHouseBeta_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivineLighthouse1F.asm
+++ b/maps/OlivineLighthouse1F.asm
@@ -2,7 +2,7 @@
 	const OLIVINELIGHTHOUSE1F_SAILOR
 	const OLIVINELIGHTHOUSE1F_POKEFAN_F
 
-OlivineLighthouse1F_MapScriptHeader:
+OlivineLighthouse1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -36,7 +36,7 @@
 	cont "those #MON."
 	done
 
-OlivineLighthouse1F_MapEventHeader:
+OlivineLighthouse1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -2,7 +2,7 @@
 	const OLIVINELIGHTHOUSE2F_SAILOR
 	const OLIVINELIGHTHOUSE2F_GENTLEMAN
 
-OlivineLighthouse2F_MapScriptHeader:
+OlivineLighthouse2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -204,7 +204,7 @@
 	cont "before."
 	done
 
-OlivineLighthouse2F_MapEventHeader:
+OlivineLighthouse2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -4,7 +4,7 @@
 	const OLIVINELIGHTHOUSE3F_YOUNGSTER
 	const OLIVINELIGHTHOUSE3F_POKE_BALL
 
-OlivineLighthouse3F_MapScriptHeader:
+OlivineLighthouse3F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -112,7 +112,7 @@
 	cont "like ONIX."
 	done
 
-OlivineLighthouse3F_MapEventHeader:
+OlivineLighthouse3F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -2,7 +2,7 @@
 	const OLIVINELIGHTHOUSE4F_SAILOR
 	const OLIVINELIGHTHOUSE4F_LASS
 
-OlivineLighthouse4F_MapScriptHeader:
+OlivineLighthouse4F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -81,7 +81,7 @@
 	line "back to the GYM."
 	done
 
-OlivineLighthouse4F_MapEventHeader:
+OlivineLighthouse4F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -5,7 +5,7 @@
 	const OLIVINELIGHTHOUSE5F_POKE_BALL2
 	const OLIVINELIGHTHOUSE5F_POKE_BALL3
 
-OlivineLighthouse5F_MapScriptHeader:
+OlivineLighthouse5F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -90,7 +90,7 @@
 	cont "across the sea…"
 	done
 
-OlivineLighthouse5F_MapEventHeader:
+OlivineLighthouse5F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -3,7 +3,7 @@
 	const OLIVINELIGHTHOUSE6F_MONSTER
 	const OLIVINELIGHTHOUSE6F_POKE_BALL
 
-OlivineLighthouse6F_MapScriptHeader:
+OlivineLighthouse6F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -257,7 +257,7 @@
 	line "Palulu!"
 	done
 
-OlivineLighthouse6F_MapEventHeader:
+OlivineLighthouse6F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -3,7 +3,7 @@
 	const OLIVINEMART_COOLTRAINER_F
 	const OLIVINEMART_LASS
 
-OlivineMart_MapScriptHeader:
+OlivineMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -45,7 +45,7 @@
 	line "It's a secret!"
 	done
 
-OlivineMart_MapEventHeader:
+OlivineMart_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivinePokecenter1F.asm
+++ b/maps/OlivinePokecenter1F.asm
@@ -4,7 +4,7 @@
 	const OLIVINEPOKECENTER1F_FISHER
 	const OLIVINEPOKECENTER1F_TEACHER
 
-OlivinePokecenter1F_MapScriptHeader:
+OlivinePokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -47,7 +47,7 @@
 	cont "rare #MON."
 	done
 
-OlivinePokecenter1F_MapEventHeader:
+OlivinePokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -7,7 +7,7 @@
 	const OLIVINEPORT_YOUNGSTER
 	const OLIVINEPORT_COOLTRAINER_F
 
-OlivinePort_MapScriptHeader:
+OlivinePort_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -384,7 +384,7 @@
 	line "allowed in."
 	done
 
-OlivinePort_MapEventHeader:
+OlivinePort_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivinePortPassage.asm
+++ b/maps/OlivinePortPassage.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const OLIVINEPORTPASSAGE_POKEFAN_M
 
-OlivinePortPassage_MapScriptHeader:
+OlivinePortPassage_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -19,7 +19,7 @@
 	line "days."
 	done
 
-OlivinePortPassage_MapEventHeader:
+OlivinePortPassage_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivinePunishmentSpeechHouse.asm
+++ b/maps/OlivinePunishmentSpeechHouse.asm
@@ -2,7 +2,7 @@
 	const OLIVINEPUNISHMENTSPEECHHOUSE_POKEFAN_M
 	const OLIVINEPUNISHMENTSPEECHHOUSE_LASS
 
-OlivinePunishmentSpeechHouse_MapScriptHeader:
+OlivinePunishmentSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -39,7 +39,7 @@
 	cont "always scares me."
 	done
 
-OlivinePunishmentSpeechHouse_MapEventHeader:
+OlivinePunishmentSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/OlivineTimsHouse.asm
+++ b/maps/OlivineTimsHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const OLIVINETIMSHOUSE_TIM
 
-OlivineTimsHouse_MapScriptHeader:
+OlivineTimsHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -19,7 +19,7 @@
 TimsHouseBookshelf:
 	jumpstd magazinebookshelf
 
-OlivineTimsHouse_MapEventHeader:
+OlivineTimsHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -2,7 +2,7 @@
 	const PALLETTOWN_TEACHER
 	const PALLETTOWN_FISHER
 
-PalletTown_MapScriptHeader:
+PalletTown_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -69,7 +69,7 @@
 	text "BLUE'S HOUSE"
 	done
 
-PalletTown_MapEventHeader:
+PalletTown_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -5,7 +5,7 @@
 	const PEWTERCITY_FRUIT_TREE1
 	const PEWTERCITY_FRUIT_TREE2
 
-PewterCity_MapScriptHeader:
+PewterCity_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -152,7 +152,7 @@
 	line "PEWTER CITY!"
 	done
 
-PewterCity_MapEventHeader:
+PewterCity_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -3,7 +3,7 @@
 	const PEWTERGYM_YOUNGSTER
 	const PEWTERGYM_GYM_GUY
 
-PewterGym_MapScriptHeader:
+PewterGym_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -208,7 +208,7 @@
 	line "that seriously."
 	done
 
-PewterGym_MapEventHeader:
+PewterGym_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -3,7 +3,7 @@
 	const PEWTERMART_YOUNGSTER
 	const PEWTERMART_SUPER_NERD
 
-PewterMart_MapScriptHeader:
+PewterMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -45,7 +45,7 @@
 	line "excellent."
 	done
 
-PewterMart_MapEventHeader:
+PewterMart_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -2,7 +2,7 @@
 	const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD
 	const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M
 
-PewterNidoranSpeechHouse_MapScriptHeader:
+PewterNidoranSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -28,7 +28,7 @@
 	text "NIDORAN: Gau gau!"
 	done
 
-PewterNidoranSpeechHouse_MapEventHeader:
+PewterNidoranSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/PewterPokecenter1F.asm
+++ b/maps/PewterPokecenter1F.asm
@@ -5,7 +5,7 @@
 	const PEWTERPOKECENTER1F_BUG_CATCHER
 	const PEWTERPOKECENTER1F_CHRIS
 
-PewterPokecenter1F_MapScriptHeader:
+PewterPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -67,7 +67,7 @@
 	line "#MON is asleep."
 	done
 
-PewterPokecenter1F_MapEventHeader:
+PewterPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/PewterPokecenter2FBeta.asm
+++ b/maps/PewterPokecenter2FBeta.asm
@@ -1,4 +1,4 @@
-PewterPokecenter2FBeta_MapScriptHeader:
+PewterPokecenter2FBeta_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-PewterPokecenter2FBeta_MapEventHeader:
+PewterPokecenter2FBeta_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/PewterSnoozeSpeechHouse.asm
+++ b/maps/PewterSnoozeSpeechHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const PEWTERSNOOZESPEECHHOUSE_GRAMPS
 
-PewterSnoozeSpeechHouse_MapScriptHeader:
+PewterSnoozeSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -20,7 +20,7 @@
 	cont "…Zzzz…"
 	done
 
-PewterSnoozeSpeechHouse_MapEventHeader:
+PewterSnoozeSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const POKESEERSHOUSE_GRANNY
 
-PokeSeersHouse_MapScriptHeader:
+PokeSeersHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -16,7 +16,7 @@
 	closetext
 	end
 
-PokeSeersHouse_MapEventHeader:
+PokeSeersHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -4,7 +4,7 @@
 	const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST
 	const POKECENTER2F_OFFICER
 
-Pokecenter2F_MapScriptHeader:
+Pokecenter2F_MapScripts:
 .SceneScripts:
 	db 6
 	scene_script .Scene0
@@ -1022,7 +1022,7 @@
 	line "when you're ready."
 	done
 
-Pokecenter2F_MapEventHeader:
+Pokecenter2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -6,7 +6,7 @@
 	const POKEMONFANCLUB_FAIRY
 	const POKEMONFANCLUB_ODDISH
 
-PokemonFanClub_MapScriptHeader:
+PokemonFanClub_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -296,7 +296,7 @@
 	line "brag right back!"
 	done
 
-PokemonFanClub_MapEventHeader:
+PokemonFanClub_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -7,7 +7,7 @@
 	const POWERPLANT_FISHER
 	const POWERPLANT_FOREST
 
-PowerPlant_MapScriptHeader:
+PowerPlant_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -388,7 +388,7 @@
 	line "electricity out!"
 	done
 
-PowerPlant_MapEventHeader:
+PowerPlant_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -6,7 +6,7 @@
 	const RADIOTOWER1F_GENTLEMAN
 	const RADIOTOWER1F_COOLTRAINER_F
 
-RadioTower1F_MapScriptHeader:
+RadioTower1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -472,7 +472,7 @@
 	cont "ent ID numbers!"
 	done
 
-RadioTower1F_MapEventHeader:
+RadioTower1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -11,7 +11,7 @@
 	const RADIOTOWER2F_BUENA
 	const RADIOTOWER2F_RECEPTIONIST
 
-RadioTower2F_MapScriptHeader:
+RadioTower2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -710,7 +710,7 @@
 	line "#MON Radio"
 	done
 
-RadioTower2F_MapEventHeader:
+RadioTower2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -7,7 +7,7 @@
 	const RADIOTOWER3F_ROCKET3
 	const RADIOTOWER3F_SCIENTIST
 
-RadioTower3F_MapScriptHeader:
+RadioTower3F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -328,7 +328,7 @@
 	line "Host DJ BEN"
 	done
 
-RadioTower3F_MapEventHeader:
+RadioTower3F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -7,7 +7,7 @@
 	const RADIOTOWER4F_ROCKET_GIRL
 	const RADIOTOWER4F_SCIENTIST
 
-RadioTower4F_MapScriptHeader:
+RadioTower4F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -245,7 +245,7 @@
 	text "4F STUDIO 2"
 	done
 
-RadioTower4F_MapEventHeader:
+RadioTower4F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -5,7 +5,7 @@
 	const RADIOTOWER5F_ROCKER
 	const RADIOTOWER5F_POKE_BALL
 
-RadioTower5F_MapScriptHeader:
+RadioTower5F_MapScripts:
 .SceneScripts:
 	db 3
 	scene_script .DummyScene0
@@ -420,7 +420,7 @@
 	text "5F STUDIO 1"
 	done
 
-RadioTower5F_MapEventHeader:
+RadioTower5F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const REDSHOUSE1F_REDS_MOM
 
-RedsHouse1F_MapScriptHeader:
+RedsHouse1F_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -74,7 +74,7 @@
 	cont "in JOHTO…"
 	done
 
-RedsHouse1F_MapEventHeader:
+RedsHouse1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RedsHouse2F.asm
+++ b/maps/RedsHouse2F.asm
@@ -1,4 +1,4 @@
-RedsHouse2F_MapScriptHeader:
+RedsHouse2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -25,7 +25,7 @@
 	cont "in a long time…"
 	done
 
-RedsHouse2F_MapEventHeader:
+RedsHouse2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -2,7 +2,7 @@
 	const ROCKTUNNEL1F_POKE_BALL1
 	const ROCKTUNNEL1F_POKE_BALL2
 
-RockTunnel1F_MapScriptHeader:
+RockTunnel1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -21,7 +21,7 @@
 RockTunnel1FHiddenXDefend:
 	hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND
 
-RockTunnel1F_MapEventHeader:
+RockTunnel1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -3,7 +3,7 @@
 	const ROCKTUNNELB1F_POKE_BALL2
 	const ROCKTUNNELB1F_POKE_BALL3
 
-RockTunnelB1F_MapScriptHeader:
+RockTunnelB1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -22,7 +22,7 @@
 RockTunnelB1FHiddenMaxPotion:
 	hiddenitem EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION
 
-RockTunnelB1F_MapEventHeader:
+RockTunnelB1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -3,7 +3,7 @@
 	const ROUTE1_COOLTRAINER_F
 	const ROUTE1_FRUIT_TREE
 
-Route1_MapScriptHeader:
+Route1_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -80,7 +80,7 @@
 	line "VIRIDIAN CITY"
 	done
 
-Route1_MapEventHeader:
+Route1_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route10North.asm
+++ b/maps/Route10North.asm
@@ -1,4 +1,4 @@
-Route10North_MapScriptHeader:
+Route10North_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -15,7 +15,7 @@
 	text "KANTO POWER PLANT"
 	done
 
-Route10North_MapEventHeader:
+Route10North_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route10Pokecenter1F.asm
+++ b/maps/Route10Pokecenter1F.asm
@@ -4,7 +4,7 @@
 	const ROUTE10POKECENTER1F_GYM_GUY
 	const ROUTE10POKECENTER1F_COOLTRAINER_F
 
-Route10Pokecenter1F_MapScriptHeader:
+Route10Pokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -80,7 +80,7 @@
 	line "PLANT."
 	done
 
-Route10Pokecenter1F_MapEventHeader:
+Route10Pokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route10Pokecenter2FBeta.asm
+++ b/maps/Route10Pokecenter2FBeta.asm
@@ -1,4 +1,4 @@
-Route10Pokecenter2FBeta_MapScriptHeader:
+Route10Pokecenter2FBeta_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-Route10Pokecenter2FBeta_MapEventHeader:
+Route10Pokecenter2FBeta_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -2,7 +2,7 @@
 	const ROUTE10SOUTH_POKEFAN_M1
 	const ROUTE10SOUTH_POKEFAN_M2
 
-Route10South_MapScriptHeader:
+Route10South_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -75,7 +75,7 @@
 	line "LAVENDER TOWN"
 	done
 
-Route10South_MapEventHeader:
+Route10South_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -5,7 +5,7 @@
 	const ROUTE11_YOUNGSTER4
 	const ROUTE11_FRUIT_TREE
 
-Route11_MapScriptHeader:
+Route11_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -145,7 +145,7 @@
 	text "ROUTE 11"
 	done
 
-Route11_MapEventHeader:
+Route11_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -6,7 +6,7 @@
 	const ROUTE12_POKE_BALL1
 	const ROUTE12_POKE_BALL2
 
-Route12_MapScriptHeader:
+Route12_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -166,7 +166,7 @@
 	text "FISHING SPOT"
 	done
 
-Route12_MapEventHeader:
+Route12_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE12SUPERRODHOUSE_FISHING_GURU
 
-Route12SuperRodHouse_MapScriptHeader:
+Route12SuperRodHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -79,7 +79,7 @@
 	line "deceived me?"
 	done
 
-Route12SuperRodHouse_MapEventHeader:
+Route12SuperRodHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -5,7 +5,7 @@
 	const ROUTE13_POKEFAN_M2
 	const ROUTE13_POKEFAN_M3
 
-Route13_MapScriptHeader:
+Route13_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -191,7 +191,7 @@
 	line "CITY"
 	done
 
-Route13_MapEventHeader:
+Route13_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -4,7 +4,7 @@
 	const ROUTE14_POKEFAN_M2
 	const ROUTE14_KIM
 
-Route14_MapScriptHeader:
+Route14_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -115,7 +115,7 @@
 	line "got my #MON…"
 	done
 
-Route14_MapEventHeader:
+Route14_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -7,7 +7,7 @@
 	const ROUTE15_TEACHER2
 	const ROUTE15_POKE_BALL
 
-Route15_MapScriptHeader:
+Route15_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -201,7 +201,7 @@
 	line "LAVENDER TOWN"
 	done
 
-Route15_MapEventHeader:
+Route15_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route15FuchsiaGate.asm
+++ b/maps/Route15FuchsiaGate.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE15FUCHSIAGATE_OFFICER
 
-Route15FuchsiaGate_MapScriptHeader:
+Route15FuchsiaGate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -19,7 +19,7 @@
 	line "Don't give up!"
 	done
 
-Route15FuchsiaGate_MapEventHeader:
+Route15FuchsiaGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -1,4 +1,4 @@
-Route16_MapScriptHeader:
+Route16_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -28,7 +28,7 @@
 	line "ALL THE WAY!"
 	done
 
-Route16_MapEventHeader:
+Route16_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route16FuchsiaSpeechHouse.asm
+++ b/maps/Route16FuchsiaSpeechHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD
 
-Route16FuchsiaSpeechHouse_MapScriptHeader:
+Route16FuchsiaSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -22,7 +22,7 @@
 	line "FUCHSIA CITY."
 	done
 
-Route16FuchsiaSpeechHouse_MapEventHeader:
+Route16FuchsiaSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE16GATE_OFFICER
 
-Route16Gate_MapScriptHeader:
+Route16Gate_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -60,7 +60,7 @@
 	line "BICYCLE."
 	done
 
-Route16Gate_MapEventHeader:
+Route16Gate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -4,7 +4,7 @@
 	const ROUTE17_BIKER3
 	const ROUTE17_BIKER4
 
-Route17_MapScriptHeader:
+Route17_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -132,7 +132,7 @@
 	cont "Take it easy!"
 	done
 
-Route17_MapEventHeader:
+Route17_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE17ROUTE18GATE_OFFICER
 
-Route17Route18Gate_MapScriptHeader:
+Route17Route18Gate_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -51,7 +51,7 @@
 	line "BICYCLE to go on."
 	done
 
-Route17Route18Gate_MapEventHeader:
+Route17Route18Gate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -2,7 +2,7 @@
 	const ROUTE18_YOUNGSTER1
 	const ROUTE18_YOUNGSTER2
 
-Route18_MapScriptHeader:
+Route18_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -77,7 +77,7 @@
 	line "FUCHSIA CITY"
 	done
 
-Route18_MapEventHeader:
+Route18_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -6,7 +6,7 @@
 	const ROUTE19_FISHER1
 	const ROUTE19_FISHER2
 
-Route19_MapScriptHeader:
+Route19_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -234,13 +234,13 @@
 	para "FUCHSIA POLICE"
 	done
 
-Route19_MapEventHeader:
+Route19_MapEvents:
 	; filler
 	db 0, 0
 
 .Warps:
 	db 1
-	warp_def 7, 3, 3, ROUTE_19___FUCHSIA_GATE
+	warp_def 7, 3, 3, ROUTE_19_FUCHSIA_GATE
 
 .CoordEvents:
 	db 0
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE19FUCHSIAGATE_OFFICER
 
-Route19FuchsiaGate_MapScriptHeader:
+Route19FuchsiaGate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -45,7 +45,7 @@
 	line "That's great!"
 	done
 
-Route19FuchsiaGate_MapEventHeader:
+Route19FuchsiaGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -8,7 +8,7 @@
 	const ROUTE2_POKE_BALL4
 	const ROUTE2_FRUIT_TREE
 
-Route2_MapScriptHeader:
+Route2_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -146,7 +146,7 @@
 	text "DIGLETT'S CAVE"
 	done
 
-Route2_MapEventHeader:
+Route2_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -3,7 +3,7 @@
 	const ROUTE20_SWIMMER_GIRL2
 	const ROUTE20_SWIMMER_GUY
 
-Route20_MapScriptHeader:
+Route20_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -112,7 +112,7 @@
 	line "LEADER: BLAINE"
 	done
 
-Route20_MapEventHeader:
+Route20_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route21.asm
+++ b/maps/Route21.asm
@@ -3,7 +3,7 @@
 	const ROUTE21_SWIMMER_GUY
 	const ROUTE21_FISHER
 
-Route21_MapScriptHeader:
+Route21_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -89,7 +89,7 @@
 	line "to fishing…"
 	done
 
-Route21_MapEventHeader:
+Route21_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route22.asm
+++ b/maps/Route22.asm
@@ -1,4 +1,4 @@
-Route22_MapScriptHeader:
+Route22_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -15,7 +15,7 @@
 	line "ENTRANCE"
 	done
 
-Route22_MapEventHeader:
+Route22_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route23.asm
+++ b/maps/Route23.asm
@@ -1,4 +1,4 @@
-Route23_MapScriptHeader:
+Route23_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -22,7 +22,7 @@
 	para "#MON LEAGUE HQ"
 	done
 
-Route23_MapEventHeader:
+Route23_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE24_ROCKET
 
-Route24_MapScriptHeader:
+Route24_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -118,7 +118,7 @@
 	cont "from, me?"
 	done
 
-Route24_MapEventHeader:
+Route24_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -11,7 +11,7 @@
 	const ROUTE25_COOLTRAINER_M2
 	const ROUTE25_POKE_BALL
 
-Route25_MapScriptHeader:
+Route25_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -429,7 +429,7 @@
 	text "BILL'S HOUSE"
 	done
 
-Route25_MapEventHeader:
+Route25_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -8,7 +8,7 @@
 	const ROUTE26_FRUIT_TREE
 	const ROUTE26_POKE_BALL
 
-Route26_MapScriptHeader:
+Route26_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -412,7 +412,7 @@
 	line "RECEPTION GATE"
 	done
 
-Route26_MapEventHeader:
+Route26_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route26DayofWeekSiblingsHouse.asm
+++ b/maps/Route26DayofWeekSiblingsHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE26DAYOFWEEKSIBLINGSHOUSE_POKEDEX
 
-Route26DayofWeekSiblingsHouse_MapScriptHeader:
+Route26DayofWeekSiblingsHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -70,7 +70,7 @@
 	line "ROUTE 37"
 	done
 
-Route26DayofWeekSiblingsHouse_MapEventHeader:
+Route26DayofWeekSiblingsHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route26HealSpeechHouse.asm
+++ b/maps/Route26HealSpeechHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE26HEALSPEECHHOUSE_TEACHER
 
-Route26HealSpeechHouse_MapScriptHeader:
+Route26HealSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -48,7 +48,7 @@
 	para "Keep at it!"
 	done
 
-Route26HealSpeechHouse_MapEventHeader:
+Route26HealSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -9,7 +9,7 @@
 	const ROUTE27_POKE_BALL2
 	const ROUTE27_FISHER
 
-Route27_MapScriptHeader:
+Route27_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -467,7 +467,7 @@
 	line "KANTO AND JOHTO"
 	done
 
-Route27_MapEventHeader:
+Route27_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE27SANDSTORMHOUSE_GRANNY
 
-Route27SandstormHouse_MapScriptHeader:
+Route27SandstormHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -93,7 +93,7 @@
 	cont "and trainers."
 	done
 
-Route27SandstormHouse_MapEventHeader:
+Route27SandstormHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route28.asm
+++ b/maps/Route28.asm
@@ -1,4 +1,4 @@
-Route28_MapScriptHeader:
+Route28_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -15,7 +15,7 @@
 	text "ROUTE 28"
 	done
 
-Route28_MapEventHeader:
+Route28_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route28FamousSpeechHouse.asm
+++ b/maps/Route28FamousSpeechHouse.asm
@@ -2,7 +2,7 @@
 	const ROUTE28FAMOUSSPEECHHOUSE_CELEBRITY
 	const ROUTE28FAMOUSSPEECHHOUSE_FEAROW
 
-Route28FamousSpeechHouse_MapScriptHeader:
+Route28FamousSpeechHouse_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -70,7 +70,7 @@
 	text "FEAROW: Feero!"
 	done
 
-Route28FamousSpeechHouse_MapEventHeader:
+Route28FamousSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -8,7 +8,7 @@
 	const ROUTE29_TUSCANY
 	const ROUTE29_POKE_BALL
 
-Route29_MapScriptHeader:
+Route29_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -415,7 +415,7 @@
 	line "NEW BARK TOWN"
 	done
 
-Route29_MapEventHeader:
+Route29_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route29Route46Gate.asm
+++ b/maps/Route29Route46Gate.asm
@@ -2,7 +2,7 @@
 	const ROUTE29ROUTE46GATE_OFFICER
 	const ROUTE29ROUTE46GATE_YOUNGSTER
 
-Route29Route46Gate_MapScriptHeader:
+Route29Route46Gate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -36,7 +36,7 @@
 	line "everywhere."
 	done
 
-Route29Route46Gate_MapEventHeader:
+Route29Route46Gate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE2GATE_SCIENTIST
 
-Route2Gate_MapScriptHeader:
+Route2Gate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -25,7 +25,7 @@
 	cont "TOWN."
 	done
 
-Route2Gate_MapEventHeader:
+Route2Gate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route2NuggetSpeechHouse.asm
+++ b/maps/Route2NuggetSpeechHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE2NUGGETSPEECHHOUSE_FISHER
 
-Route2NuggetSpeechHouse_MapScriptHeader:
+Route2NuggetSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -52,7 +52,7 @@
 	line "have to do!"
 	done
 
-Route2NuggetSpeechHouse_MapEventHeader:
+Route2NuggetSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -4,7 +4,7 @@
 	const ROUTE3_YOUNGSTER2
 	const ROUTE3_FISHER2
 
-Route3_MapScriptHeader:
+Route3_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -132,7 +132,7 @@
 	line "stairs."
 	done
 
-Route3_MapEventHeader:
+Route3_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -11,7 +11,7 @@
 	const ROUTE30_COOLTRAINER_F
 	const ROUTE30_POKE_BALL
 
-Route30_MapScriptHeader:
+Route30_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -406,7 +406,7 @@
 	line "tougher too."
 	done
 
-Route30_MapEventHeader:
+Route30_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route30BerrySpeechHouse.asm
+++ b/maps/Route30BerrySpeechHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE30BERRYSPEECHHOUSE_POKEFAN_M
 
-Route30BerrySpeechHouse_MapScriptHeader:
+Route30BerrySpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -46,7 +46,7 @@
 	cont "drop right off."
 	done
 
-Route30BerrySpeechHouse_MapEventHeader:
+Route30BerrySpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -7,7 +7,7 @@
 	const ROUTE31_POKE_BALL1
 	const ROUTE31_POKE_BALL2
 
-Route31_MapScriptHeader:
+Route31_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -417,7 +417,7 @@
 	text "DARK CAVE"
 	done
 
-Route31_MapEventHeader:
+Route31_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route31VioletGate.asm
+++ b/maps/Route31VioletGate.asm
@@ -2,7 +2,7 @@
 	const ROUTE31VIOLETGATE_OFFICER
 	const ROUTE31VIOLETGATE_COOLTRAINER_F
 
-Route31VioletGate_MapScriptHeader:
+Route31VioletGate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -27,7 +27,7 @@
 	cont "phone home!"
 	done
 
-Route31VioletGate_MapEventHeader:
+Route31VioletGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -14,7 +14,7 @@
 	const ROUTE32_FRIEDA
 	const ROUTE32_POKE_BALL2
 
-Route32_MapScriptHeader:
+Route32_MapScripts:
 .SceneScripts:
 	db 3
 	scene_script .DummyScene0
@@ -928,7 +928,7 @@
 	line "AHEAD"
 	done
 
-Route32_MapEventHeader:
+Route32_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route32Pokecenter1F.asm
+++ b/maps/Route32Pokecenter1F.asm
@@ -3,7 +3,7 @@
 	const ROUTE32POKECENTER1F_FISHING_GURU
 	const ROUTE32POKECENTER1F_COOLTRAINER_F
 
-Route32Pokecenter1F_MapScriptHeader:
+Route32Pokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -94,7 +94,7 @@
 	cont "power…"
 	done
 
-Route32Pokecenter1F_MapEventHeader:
+Route32Pokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route32RuinsOfAlphGate.asm
+++ b/maps/Route32RuinsOfAlphGate.asm
@@ -3,7 +3,7 @@
 	const ROUTE32RUINSOFALPHGATE_POKEFAN_M
 	const ROUTE32RUINSOFALPHGATE_YOUNGSTER
 
-Route32RuinsOfAlphGate_MapScriptHeader:
+Route32RuinsOfAlphGate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -46,7 +46,7 @@
 	cont "what they are."
 	done
 
-Route32RuinsOfAlphGate_MapEventHeader:
+Route32RuinsOfAlphGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -3,7 +3,7 @@
 	const ROUTE33_LASS
 	const ROUTE33_FRUIT_TREE
 
-Route33_MapScriptHeader:
+Route33_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -194,7 +194,7 @@
 	text "ROUTE 33"
 	done
 
-Route33_MapEventHeader:
+Route33_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -13,7 +13,7 @@
 	const ROUTE34_COOLTRAINER_F3
 	const ROUTE34_POKE_BALL
 
-Route34_MapScriptHeader:
+Route34_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -760,7 +760,7 @@
 	line "#MON FOR YOU!"
 	done
 
-Route34_MapEventHeader:
+Route34_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -4,7 +4,7 @@
 	const ROUTE34ILEXFORESTGATE_LASS
 	const ROUTE34ILEXFORESTGATE_TEACHER2
 
-Route34IlexForestGate_MapScriptHeader:
+Route34IlexForestGate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -135,7 +135,7 @@
 	cont "type #MON."
 	done
 
-Route34IlexForestGate_MapEventHeader:
+Route34IlexForestGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -11,7 +11,7 @@
 	const ROUTE35_FRUIT_TREE
 	const ROUTE35_POKE_BALL
 
-Route35_MapScriptHeader:
+Route35_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -462,7 +462,7 @@
 	text "ROUTE 35"
 	done
 
-Route35_MapEventHeader:
+Route35_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -3,7 +3,7 @@
 	const ROUTE35GOLDENRODGATE_POKEFAN_F
 	const ROUTE35GOLDENRODGATE_FISHER
 
-Route35GoldenrodGate_MapScriptHeader:
+Route35GoldenrodGate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -195,7 +195,7 @@
 	line "different kinds."
 	done
 
-Route35GoldenrodGate_MapEventHeader:
+Route35GoldenrodGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -3,7 +3,7 @@
 	const ROUTE35NATIONALPARKGATE_YOUNGSTER
 	const ROUTE35NATIONALPARKGATE_OFFICER2
 
-Route35NationalParkGate_MapScriptHeader:
+Route35NationalParkGate_MapScripts:
 .SceneScripts:
 	db 3
 	scene_script .DummyScene0
@@ -437,7 +437,7 @@
 	line "the contest."
 	done
 
-Route35NationalParkGate_MapEventHeader:
+Route35NationalParkGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -9,7 +9,7 @@
 	const ROUTE36_FLORIA
 	const ROUTE36_SUICUNE
 
-Route36_MapScriptHeader:
+Route36_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -659,7 +659,7 @@
 	line "landmarks."
 	done
 
-Route36_MapEventHeader:
+Route36_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -12,7 +12,7 @@
 	const ROUTE36NATIONALPARKGATE_YOUNGSTER7
 	const ROUTE36NATIONALPARKGATE_OFFICER2
 
-Route36NationalParkGate_MapScriptHeader:
+Route36NationalParkGate_MapScripts:
 .SceneScripts:
 	db 3
 	scene_script .DummyScene0
@@ -849,7 +849,7 @@
 	cont "for you."
 	done
 
-Route36NationalParkGate_MapEventHeader:
+Route36NationalParkGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route36RuinsOfAlphGate.asm
+++ b/maps/Route36RuinsOfAlphGate.asm
@@ -2,7 +2,7 @@
 	const ROUTE36RUINSOFALPHGATE_OFFICER
 	const ROUTE36RUINSOFALPHGATE_GRAMPS
 
-Route36RuinsOfAlphGate_MapScriptHeader:
+Route36RuinsOfAlphGate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -34,7 +34,7 @@
 	line "RUINS OF ALPH."
 	done
 
-Route36RuinsOfAlphGate_MapEventHeader:
+Route36RuinsOfAlphGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -7,7 +7,7 @@
 	const ROUTE37_FRUIT_TREE2
 	const ROUTE37_FRUIT_TREE3
 
-Route37_MapScriptHeader:
+Route37_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -237,7 +237,7 @@
 	text "ROUTE 37"
 	done
 
-Route37_MapEventHeader:
+Route37_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -7,7 +7,7 @@
 	const ROUTE38_FRUIT_TREE
 	const ROUTE38_BUENA2
 
-Route38_MapScriptHeader:
+Route38_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -472,7 +472,7 @@
 	cont "its evolution."
 	done
 
-Route38_MapEventHeader:
+Route38_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route38EcruteakGate.asm
+++ b/maps/Route38EcruteakGate.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE38ECRUTEAKGATE_OFFICER
 
-Route38EcruteakGate_MapScriptHeader:
+Route38EcruteakGate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -24,7 +24,7 @@
 	line "way to get here."
 	done
 
-Route38EcruteakGate_MapEventHeader:
+Route38EcruteakGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -10,7 +10,7 @@
 	const ROUTE39_FRUIT_TREE
 	const ROUTE39_POKEFAN_F2
 
-Route39_MapScriptHeader:
+Route39_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -343,7 +343,7 @@
 	line "any tree you see!"
 	done
 
-Route39_MapEventHeader:
+Route39_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -3,7 +3,7 @@
 	const ROUTE39BARN_TWIN2
 	const ROUTE39BARN_MOOMOO
 
-Route39Barn_MapScriptHeader:
+Route39Barn_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -188,7 +188,7 @@
 	para "MILTANK looks sad."
 	done
 
-Route39Barn_MapEventHeader:
+Route39Barn_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -2,7 +2,7 @@
 	const ROUTE39FARMHOUSE_POKEFAN_M
 	const ROUTE39FARMHOUSE_POKEFAN_F
 
-Route39Farmhouse_MapScriptHeader:
+Route39Farmhouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -192,7 +192,7 @@
 	cont "it, hon."
 	done
 
-Route39Farmhouse_MapEventHeader:
+Route39Farmhouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -4,7 +4,7 @@
 	const ROUTE4_LASS2
 	const ROUTE4_POKE_BALL
 
-Route4_MapScriptHeader:
+Route4_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -120,7 +120,7 @@
 	line "stairs."
 	done
 
-Route4_MapEventHeader:
+Route4_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -12,7 +12,7 @@
 	const ROUTE40_LASS2
 	const ROUTE40_STANDING_YOUNGSTER
 
-Route40_MapScriptHeader:
+Route40_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -337,7 +337,7 @@
 	line "OLIVINE CITY"
 	done
 
-Route40_MapEventHeader:
+Route40_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -2,7 +2,7 @@
 	const ROUTE40BATTLETOWERGATE_ROCKER
 	const ROUTE40BATTLETOWERGATE_TWIN
 
-Route40BattleTowerGate_MapScriptHeader:
+Route40BattleTowerGate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -70,7 +70,7 @@
 	line "them now!"
 	done
 
-Route40BattleTowerGate_MapEventHeader:
+Route40BattleTowerGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -10,7 +10,7 @@
 	const ROUTE41_SWIMMER_GIRL4
 	const ROUTE41_SWIMMER_GIRL5
 
-Route41_MapScriptHeader:
+Route41_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -341,7 +341,7 @@
 	line "it's scary."
 	done
 
-Route41_MapEventHeader:
+Route41_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -9,7 +9,7 @@
 	const ROUTE42_POKE_BALL2
 	const ROUTE42_SUICUNE
 
-Route42_MapScriptHeader:
+Route42_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -318,7 +318,7 @@
 	line "MAHOGANY TOWN"
 	done
 
-Route42_MapEventHeader:
+Route42_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route42EcruteakGate.asm
+++ b/maps/Route42EcruteakGate.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE42ECRUTEAKGATE_OFFICER
 
-Route42EcruteakGate_MapScriptHeader:
+Route42EcruteakGate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -19,7 +19,7 @@
 	line "get lost in there."
 	done
 
-Route42EcruteakGate_MapEventHeader:
+Route42EcruteakGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -8,7 +8,7 @@
 	const ROUTE43_FRUIT_TREE
 	const ROUTE43_POKE_BALL
 
-Route43_MapScriptHeader:
+Route43_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -500,7 +500,7 @@
 	line "#MON's type."
 	done
 
-Route43_MapEventHeader:
+Route43_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -5,7 +5,7 @@
 	const ROUTE43GATE_ROCKET1
 	const ROUTE43GATE_ROCKET2
 
-Route43Gate_MapScriptHeader:
+Route43Gate_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .RocketShakedown
@@ -247,7 +247,7 @@
 	cont "the grass."
 	done
 
-Route43Gate_MapEventHeader:
+Route43Gate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE43MAHOGANYGATE_OFFICER
 
-Route43MahoganyGate_MapScriptHeader:
+Route43MahoganyGate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -38,7 +38,7 @@
 	cont "days."
 	done
 
-Route43MahoganyGate_MapEventHeader:
+Route43MahoganyGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -11,7 +11,7 @@
 	const ROUTE44_POKE_BALL2
 	const ROUTE44_POKE_BALL3
 
-Route44_MapScriptHeader:
+Route44_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -506,7 +506,7 @@
 	line "BLACKTHORN CITY"
 	done
 
-Route44_MapEventHeader:
+Route44_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -13,7 +13,7 @@
 	const ROUTE45_POKE_BALL4
 	const ROUTE45_YOUNGSTER
 
-Route45_MapScriptHeader:
+Route45_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -531,7 +531,7 @@
 	line "MOUNTAIN RD. AHEAD"
 	done
 
-Route45_MapEventHeader:
+Route45_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -6,7 +6,7 @@
 	const ROUTE46_FRUIT_TREE2
 	const ROUTE46_POKE_BALL
 
-Route46_MapScriptHeader:
+Route46_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -250,7 +250,7 @@
 	line "MOUNTAIN RD. AHEAD"
 	done
 
-Route46_MapEventHeader:
+Route46_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE5_POKEFAN_M
 
-Route5_MapScriptHeader:
+Route5_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -39,7 +39,7 @@
 	line "Nobody lives here."
 	done
 
-Route5_MapEventHeader:
+Route5_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route5CleanseTagSpeechHouse.asm
+++ b/maps/Route5CleanseTagSpeechHouse.asm
@@ -2,7 +2,7 @@
 	const ROUTE5CLEANSETAGSPEECHHOUSE_GRANNY
 	const ROUTE5CLEANSETAGSPEECHHOUSE_TEACHER
 
-Route5CleanseTagSpeechHouse_MapScriptHeader:
+Route5CleanseTagSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -60,7 +60,7 @@
 	line "startled you."
 	done
 
-Route5CleanseTagSpeechHouse_MapEventHeader:
+Route5CleanseTagSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route5SaffronGate.asm
+++ b/maps/Route5SaffronGate.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE5SAFFRONGATE_OFFICER
 
-Route5SaffronGate_MapScriptHeader:
+Route5SaffronGate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -20,7 +20,7 @@
 	cont "don't you agree?"
 	done
 
-Route5SaffronGate_MapEventHeader:
+Route5SaffronGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route5UndergroundPathEntrance.asm
+++ b/maps/Route5UndergroundPathEntrance.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER
 
-Route5UndergroundPathEntrance_MapScriptHeader:
+Route5UndergroundPathEntrance_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -19,7 +19,7 @@
 	line "love to visit!"
 	done
 
-Route5UndergroundPathEntrance_MapEventHeader:
+Route5UndergroundPathEntrance_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -3,7 +3,7 @@
 	const ROUTE6_POKEFAN_M2
 	const ROUTE6_POKEFAN_M3
 
-Route6_MapScriptHeader:
+Route6_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -91,7 +91,7 @@
 	cont "your heart melt?"
 	done
 
-Route6_MapEventHeader:
+Route6_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE6SAFFRONGATE_OFFICER
 
-Route6SaffronGate_MapScriptHeader:
+Route6SaffronGate_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -57,7 +57,7 @@
 	line "FRON."
 	done
 
-Route6SaffronGate_MapEventHeader:
+Route6SaffronGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route6UndergroundPathEntrance.asm
+++ b/maps/Route6UndergroundPathEntrance.asm
@@ -1,4 +1,4 @@
-Route6UndergroundPathEntrance_MapScriptHeader:
+Route6UndergroundPathEntrance_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-Route6UndergroundPathEntrance_MapEventHeader:
+Route6UndergroundPathEntrance_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route7.asm
+++ b/maps/Route7.asm
@@ -1,4 +1,4 @@
-Route7_MapScriptHeader:
+Route7_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -34,7 +34,7 @@
 	text "It's locked…"
 	done
 
-Route7_MapEventHeader:
+Route7_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE7SAFFRONGATE_OFFICER
 
-Route7SaffronGate_MapScriptHeader:
+Route7SaffronGate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -45,7 +45,7 @@
 	line "through."
 	done
 
-Route7SaffronGate_MapEventHeader:
+Route7SaffronGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -6,7 +6,7 @@
 	const ROUTE8_SUPER_NERD2
 	const ROUTE8_FRUIT_TREE
 
-Route8_MapScriptHeader:
+Route8_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -172,7 +172,7 @@
 	line "read…"
 	done
 
-Route8_MapEventHeader:
+Route8_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route8SaffronGate.asm
+++ b/maps/Route8SaffronGate.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const ROUTE8SAFFRONGATE_OFFICER
 
-Route8SaffronGate_MapScriptHeader:
+Route8SaffronGate_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -19,7 +19,7 @@
 	line "RADIO TOWER there."
 	done
 
-Route8SaffronGate_MapEventHeader:
+Route8SaffronGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -6,7 +6,7 @@
 	const ROUTE9_POKEFAN_M1
 	const ROUTE9_POKEFAN_M2
 
-Route9_MapScriptHeader:
+Route9_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -205,7 +205,7 @@
 	line "ROCK TUNNEL"
 	done
 
-Route9_MapEventHeader:
+Route9_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -1,4 +1,4 @@
-RuinsOfAlphAerodactylChamber_MapScriptHeader:
+RuinsOfAlphAerodactylChamber_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .CheckWall
@@ -143,7 +143,7 @@
 	line "fangs."
 	done
 
-RuinsOfAlphAerodactylChamber_MapEventHeader:
+RuinsOfAlphAerodactylChamber_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RuinsOfAlphAerodactylItemRoom.asm
+++ b/maps/RuinsOfAlphAerodactylItemRoom.asm
@@ -4,7 +4,7 @@
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4
 
-RuinsOfAlphAerodactylItemRoom_MapScriptHeader:
+RuinsOfAlphAerodactylItemRoom_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -32,7 +32,7 @@
 	cont "MON."
 	done
 
-RuinsOfAlphAerodactylItemRoom_MapEventHeader:
+RuinsOfAlphAerodactylItemRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RuinsOfAlphAerodactylWordRoom.asm
+++ b/maps/RuinsOfAlphAerodactylWordRoom.asm
@@ -1,4 +1,4 @@
-RuinsOfAlphAerodactylWordRoom_MapScriptHeader:
+RuinsOfAlphAerodactylWordRoom_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-RuinsOfAlphAerodactylWordRoom_MapEventHeader:
+RuinsOfAlphAerodactylWordRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -1,4 +1,4 @@
-RuinsOfAlphHoOhChamber_MapScriptHeader:
+RuinsOfAlphHoOhChamber_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .CheckWall
@@ -144,7 +144,7 @@
 	line "wings."
 	done
 
-RuinsOfAlphHoOhChamber_MapEventHeader:
+RuinsOfAlphHoOhChamber_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RuinsOfAlphHoOhItemRoom.asm
+++ b/maps/RuinsOfAlphHoOhItemRoom.asm
@@ -4,7 +4,7 @@
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL3
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL4
 
-RuinsOfAlphHoOhItemRoom_MapScriptHeader:
+RuinsOfAlphHoOhItemRoom_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -32,7 +32,7 @@
 	cont "MON."
 	done
 
-RuinsOfAlphHoOhItemRoom_MapEventHeader:
+RuinsOfAlphHoOhItemRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RuinsOfAlphHoOhWordRoom.asm
+++ b/maps/RuinsOfAlphHoOhWordRoom.asm
@@ -1,4 +1,4 @@
-RuinsOfAlphHoOhWordRoom_MapScriptHeader:
+RuinsOfAlphHoOhWordRoom_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-RuinsOfAlphHoOhWordRoom_MapEventHeader:
+RuinsOfAlphHoOhWordRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -3,7 +3,7 @@
 	const RUINSOFALPHINNERCHAMBER_TEACHER
 	const RUINSOFALPHINNERCHAMBER_GRAMPS
 
-RuinsOfAlphInnerChamber_MapScriptHeader:
+RuinsOfAlphInnerChamber_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -76,7 +76,7 @@
 	cont "MON."
 	done
 
-RuinsOfAlphInnerChamber_MapEventHeader:
+RuinsOfAlphInnerChamber_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -2,7 +2,7 @@
 	const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST
 	const RUINSOFALPHKABUTOCHAMBER_SCIENTIST
 
-RuinsOfAlphKabutoChamber_MapScriptHeader:
+RuinsOfAlphKabutoChamber_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .CheckWall
@@ -255,7 +255,7 @@
 	line "scanned the area."
 	done
 
-RuinsOfAlphKabutoChamber_MapEventHeader:
+RuinsOfAlphKabutoChamber_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RuinsOfAlphKabutoItemRoom.asm
+++ b/maps/RuinsOfAlphKabutoItemRoom.asm
@@ -4,7 +4,7 @@
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4
 
-RuinsOfAlphKabutoItemRoom_MapScriptHeader:
+RuinsOfAlphKabutoItemRoom_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -32,7 +32,7 @@
 	cont "MON."
 	done
 
-RuinsOfAlphKabutoItemRoom_MapEventHeader:
+RuinsOfAlphKabutoItemRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RuinsOfAlphKabutoWordRoom.asm
+++ b/maps/RuinsOfAlphKabutoWordRoom.asm
@@ -1,4 +1,4 @@
-RuinsOfAlphKabutoWordRoom_MapScriptHeader:
+RuinsOfAlphKabutoWordRoom_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-RuinsOfAlphKabutoWordRoom_MapEventHeader:
+RuinsOfAlphKabutoWordRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -1,4 +1,4 @@
-RuinsOfAlphOmanyteChamber_MapScriptHeader:
+RuinsOfAlphOmanyteChamber_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .CheckWall
@@ -144,7 +144,7 @@
 	line "its ten tentacles."
 	done
 
-RuinsOfAlphOmanyteChamber_MapEventHeader:
+RuinsOfAlphOmanyteChamber_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RuinsOfAlphOmanyteItemRoom.asm
+++ b/maps/RuinsOfAlphOmanyteItemRoom.asm
@@ -4,7 +4,7 @@
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4
 
-RuinsOfAlphOmanyteItemRoom_MapScriptHeader:
+RuinsOfAlphOmanyteItemRoom_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -32,7 +32,7 @@
 	cont "MON."
 	done
 
-RuinsOfAlphOmanyteItemRoom_MapEventHeader:
+RuinsOfAlphOmanyteItemRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RuinsOfAlphOmanyteWordRoom.asm
+++ b/maps/RuinsOfAlphOmanyteWordRoom.asm
@@ -1,4 +1,4 @@
-RuinsOfAlphOmanyteWordRoom_MapScriptHeader:
+RuinsOfAlphOmanyteWordRoom_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-RuinsOfAlphOmanyteWordRoom_MapEventHeader:
+RuinsOfAlphOmanyteWordRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -5,7 +5,7 @@
 	const RUINSOFALPHOUTSIDE_YOUNGSTER2
 	const RUINSOFALPHOUTSIDE_YOUNGSTER3
 
-RuinsOfAlphOutside_MapScriptHeader:
+RuinsOfAlphOutside_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -280,7 +280,7 @@
 	line "message!"
 	done
 
-RuinsOfAlphOutside_MapEventHeader:
+RuinsOfAlphOutside_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -3,7 +3,7 @@
 	const RUINSOFALPHRESEARCHCENTER_SCIENTIST2
 	const RUINSOFALPHRESEARCHCENTER_SCIENTIST3
 
-RuinsOfAlphResearchCenter_MapScriptHeader:
+RuinsOfAlphResearchCenter_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -392,7 +392,7 @@
 	cont "Ancients…"
 	done
 
-RuinsOfAlphResearchCenter_MapEventHeader:
+RuinsOfAlphResearchCenter_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SafariZoneBeta.asm
+++ b/maps/SafariZoneBeta.asm
@@ -1,4 +1,4 @@
-SafariZoneBeta_MapScriptHeader:
+SafariZoneBeta_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-SafariZoneBeta_MapEventHeader:
+SafariZoneBeta_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SafariZoneFuchsiaGateBeta.asm
+++ b/maps/SafariZoneFuchsiaGateBeta.asm
@@ -1,4 +1,4 @@
-SafariZoneFuchsiaGateBeta_MapScriptHeader:
+SafariZoneFuchsiaGateBeta_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-SafariZoneFuchsiaGateBeta_MapEventHeader:
+SafariZoneFuchsiaGateBeta_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SafariZoneMainOffice.asm
+++ b/maps/SafariZoneMainOffice.asm
@@ -1,4 +1,4 @@
-SafariZoneMainOffice_MapScriptHeader:
+SafariZoneMainOffice_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-SafariZoneMainOffice_MapEventHeader:
+SafariZoneMainOffice_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SafariZoneWardensHome.asm
+++ b/maps/SafariZoneWardensHome.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const SAFARIZONEWARDENSHOME_LASS
 
-SafariZoneWardensHome_MapScriptHeader:
+SafariZoneWardensHome_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -76,7 +76,7 @@
 	line "frolicking in it."
 	done
 
-SafariZoneWardensHome_MapEventHeader:
+SafariZoneWardensHome_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -8,7 +8,7 @@
 	const SAFFRONCITY_YOUNGSTER2
 	const SAFFRONCITY_LASS2
 
-SaffronCity_MapScriptHeader:
+SaffronCity_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -265,7 +265,7 @@
 	cont "STATION"
 	done
 
-SaffronCity_MapEventHeader:
+SaffronCity_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -6,7 +6,7 @@
 	const SAFFRONGYM_YOUNGSTER2
 	const SAFFRONGYM_GYM_GUY
 
-SaffronGym_MapScriptHeader:
+SaffronGym_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -290,7 +290,7 @@
 	line "fantastic battle!"
 	done
 
-SaffronGym_MapEventHeader:
+SaffronGym_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -4,7 +4,7 @@
 	const SAFFRONMAGNETTRAINSTATION_TEACHER
 	const SAFFRONMAGNETTRAINSTATION_LASS
 
-SaffronMagnetTrainStation_MapScriptHeader:
+SaffronMagnetTrainStation_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -215,7 +215,7 @@
 	line "TRAIN have PASSES."
 	done
 
-SaffronMagnetTrainStation_MapEventHeader:
+SaffronMagnetTrainStation_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -3,7 +3,7 @@
 	const SAFFRONMART_COOLTRAINER_M
 	const SAFFRONMART_COOLTRAINER_F
 
-SaffronMart_MapScriptHeader:
+SaffronMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -37,7 +37,7 @@
 	line "how sometime?"
 	done
 
-SaffronMart_MapEventHeader:
+SaffronMart_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SaffronPokecenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -4,7 +4,7 @@
 	const SAFFRONPOKECENTER1F_FISHER
 	const SAFFRONPOKECENTER1F_YOUNGSTER
 
-SaffronPokecenter1F_MapScriptHeader:
+SaffronPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -111,7 +111,7 @@
 	line "SAFFRON."
 	done
 
-SaffronPokecenter1F_MapEventHeader:
+SaffronPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SaffronPokecenter2FBeta.asm
+++ b/maps/SaffronPokecenter2FBeta.asm
@@ -1,4 +1,4 @@
-SaffronPokecenter2FBeta_MapScriptHeader:
+SaffronPokecenter2FBeta_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-SaffronPokecenter2FBeta_MapEventHeader:
+SaffronPokecenter2FBeta_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -2,7 +2,7 @@
 	const SEAFOAMGYM_BLAINE
 	const SEAFOAMGYM_GYM_GUY
 
-SeafoamGym_MapScriptHeader:
+SeafoamGym_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -157,7 +157,7 @@
 	line "for a building."
 	done
 
-SeafoamGym_MapEventHeader:
+SeafoamGym_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -2,7 +2,7 @@
 	const SILPHCO1F_RECEPTIONIST
 	const SILPHCO1F_OFFICER
 
-SilphCo1F_MapScriptHeader:
+SilphCo1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -55,7 +55,7 @@
 	line "anywhere yet."
 	done
 
-SilphCo1F_MapEventHeader:
+SilphCo1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -2,7 +2,7 @@
 	const SILVERCAVEITEMROOMS_POKE_BALL1
 	const SILVERCAVEITEMROOMS_POKE_BALL2
 
-SilverCaveItemRooms_MapScriptHeader:
+SilverCaveItemRooms_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -15,7 +15,7 @@
 SilverCaveItemRoomsFullRestore:
 	itemball FULL_RESTORE
 
-SilverCaveItemRooms_MapEventHeader:
+SilverCaveItemRooms_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -1,4 +1,4 @@
-SilverCaveOutside_MapScriptHeader:
+SilverCaveOutside_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -23,7 +23,7 @@
 	text "MT.SILVER"
 	done
 
-SilverCaveOutside_MapEventHeader:
+SilverCaveOutside_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SilverCavePokecenter1F.asm
+++ b/maps/SilverCavePokecenter1F.asm
@@ -2,7 +2,7 @@
 	const SILVERCAVEPOKECENTER1F_NURSE
 	const SILVERCAVEPOKECENTER1F_GRANNY
 
-SilverCavePokecenter1F_MapScriptHeader:
+SilverCavePokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -29,7 +29,7 @@
 	line "anywhere…"
 	done
 
-SilverCavePokecenter1F_MapEventHeader:
+SilverCavePokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -4,7 +4,7 @@
 	const SILVERCAVEROOM1_POKE_BALL3
 	const SILVERCAVEROOM1_POKE_BALL4
 
-SilverCaveRoom1_MapScriptHeader:
+SilverCaveRoom1_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -29,7 +29,7 @@
 SilverCaveRoom1HiddenUltraBall:
 	hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL
 
-SilverCaveRoom1_MapEventHeader:
+SilverCaveRoom1_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -3,7 +3,7 @@
 	const SILVERCAVEROOM2_POKE_BALL2
 	const SILVERCAVEROOM2_POKE_BALL3
 
-SilverCaveRoom2_MapScriptHeader:
+SilverCaveRoom2_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -22,7 +22,7 @@
 SilverCaveRoom2HiddenMaxPotion:
 	hiddenitem EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION
 
-SilverCaveRoom2_MapEventHeader:
+SilverCaveRoom2_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const SILVERCAVEROOM3_RED
 
-SilverCaveRoom3_MapScriptHeader:
+SilverCaveRoom3_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -50,7 +50,7 @@
 	line "<......>"
 	done
 
-SilverCaveRoom3_MapEventHeader:
+SilverCaveRoom3_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -9,7 +9,7 @@
 	const SLOWPOKEWELLB1F_BOULDER
 	const SLOWPOKEWELLB1F_POKE_BALL
 
-SlowpokeWellB1F_MapScriptHeader:
+SlowpokeWellB1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -320,7 +320,7 @@
 	line "its TAIL cut off…"
 	done
 
-SlowpokeWellB1F_MapEventHeader:
+SlowpokeWellB1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -2,7 +2,7 @@
 	const SLOWPOKEWELLB2F_GYM_GUY
 	const SLOWPOKEWELLB2F_POKE_BALL
 
-SlowpokeWellB2F_MapScriptHeader:
+SlowpokeWellB2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -61,7 +61,7 @@
 	cont "one evolve."
 	done
 
-SlowpokeWellB2F_MapEventHeader:
+SlowpokeWellB2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SoulHouse.asm
+++ b/maps/SoulHouse.asm
@@ -4,7 +4,7 @@
 	const SOULHOUSE_LASS
 	const SOULHOUSE_GRANNY
 
-SoulHouse_MapScriptHeader:
+SoulHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -72,7 +72,7 @@
 	line "my grandchildren…"
 	done
 
-SoulHouse_MapEventHeader:
+SoulHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -6,7 +6,7 @@
 	const SPROUTTOWER1F_SAGE3
 	const SPROUTTOWER1F_POKE_BALL
 
-SproutTower1F_MapScriptHeader:
+SproutTower1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -102,7 +102,7 @@
 	line "distinguished."
 	done
 
-SproutTower1F_MapEventHeader:
+SproutTower1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -3,7 +3,7 @@
 	const SPROUTTOWER2F_SAGE2
 	const SPROUTTOWER2F_POKE_BALL
 
-SproutTower2F_MapScriptHeader:
+SproutTower2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -84,7 +84,7 @@
 	line "distinguished."
 	done
 
-SproutTower2F_MapEventHeader:
+SproutTower2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -7,7 +7,7 @@
 	const SPROUTTOWER3F_POKE_BALL2
 	const SPROUTTOWER3F_SILVER
 
-SproutTower3F_MapScriptHeader:
+SproutTower3F_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -329,7 +329,7 @@
 	line "distinguished."
 	done
 
-SproutTower3F_MapEventHeader:
+SproutTower3F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -6,7 +6,7 @@
 	const TEAMROCKETBASEB1F_POKE_BALL2
 	const TEAMROCKETBASEB1F_POKE_BALL3
 
-TeamRocketBaseB1F_MapScriptHeader:
+TeamRocketBaseB1F_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -726,7 +726,7 @@
 	line "turned off."
 	done
 
-TeamRocketBaseB1F_MapEventHeader:
+TeamRocketBaseB1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -14,7 +14,7 @@
 	const TEAMROCKETBASEB2F_ROCKET4
 	const TEAMROCKETBASEB2F_POKE_BALL
 
-TeamRocketBaseB2F_MapScriptHeader:
+TeamRocketBaseB2F_MapScripts:
 .SceneScripts:
 	db 4
 	scene_script .DummyScene0
@@ -908,7 +908,7 @@
 	line "broadcast."
 	done
 
-TeamRocketBaseB2F_MapEventHeader:
+TeamRocketBaseB2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -14,7 +14,7 @@
 	const TEAMROCKETBASEB3F_POKE_BALL4
 	const TEAMROCKETBASEB3F_POKE_BALL5
 
-TeamRocketBaseB3F_MapScriptHeader:
+TeamRocketBaseB3F_MapScripts:
 .SceneScripts:
 	db 4
 	scene_script .LanceGetsPassword
@@ -565,7 +565,7 @@
 	para "The door opened!"
 	done
 
-TeamRocketBaseB3F_MapEventHeader:
+TeamRocketBaseB3F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -2,7 +2,7 @@
 	const TIMECAPSULE_CHRIS1
 	const TIMECAPSULE_CHRIS2
 
-TimeCapsule_MapScriptHeader:
+TimeCapsule_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .InitializeTimeCapsule
@@ -53,7 +53,7 @@
 	line "ready."
 	done
 
-TimeCapsule_MapEventHeader:
+TimeCapsule_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -10,7 +10,7 @@
 	const TINTOWER1F_SAGE5
 	const TINTOWER1F_SAGE6
 
-TinTower1F_MapScriptHeader:
+TinTower1F_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .FaceSuicune
@@ -522,7 +522,7 @@
 	line "with SUICUNE."
 	done
 
-TinTower1F_MapEventHeader:
+TinTower1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TinTower2F.asm
+++ b/maps/TinTower2F.asm
@@ -1,4 +1,4 @@
-TinTower2F_MapScriptHeader:
+TinTower2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-TinTower2F_MapEventHeader:
+TinTower2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const TINTOWER3F_POKE_BALL
 
-TinTower3F_MapScriptHeader:
+TinTower3F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -11,7 +11,7 @@
 TinTower3FFullHeal:
 	itemball FULL_HEAL
 
-TinTower3F_MapEventHeader:
+TinTower3F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -3,7 +3,7 @@
 	const TINTOWER4F_POKE_BALL2
 	const TINTOWER4F_POKE_BALL3
 
-TinTower4F_MapScriptHeader:
+TinTower4F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -22,7 +22,7 @@
 TinTower4FHiddenMaxPotion:
 	hiddenitem EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION
 
-TinTower4F_MapEventHeader:
+TinTower4F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const TINTOWER5F_POKE_BALL
 
-TinTower5F_MapScriptHeader:
+TinTower5F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -17,7 +17,7 @@
 TinTower5FHiddenCarbos:
 	hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS
 
-TinTower5F_MapEventHeader:
+TinTower5F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const TINTOWER6F_POKE_BALL
 
-TinTower6F_MapScriptHeader:
+TinTower6F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -11,7 +11,7 @@
 TinTower6FMaxPotion:
 	itemball MAX_POTION
 
-TinTower6F_MapEventHeader:
+TinTower6F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const TINTOWER7F_POKE_BALL
 
-TinTower7F_MapScriptHeader:
+TinTower7F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -11,7 +11,7 @@
 TinTower7FMaxRevive:
 	itemball MAX_REVIVE
 
-TinTower7F_MapEventHeader:
+TinTower7F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -3,7 +3,7 @@
 	const TINTOWER8F_POKE_BALL2
 	const TINTOWER8F_POKE_BALL3
 
-TinTower8F_MapScriptHeader:
+TinTower8F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -19,7 +19,7 @@
 TinTower8FFullRestore:
 	itemball FULL_RESTORE
 
-TinTower8F_MapEventHeader:
+TinTower8F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const TINTOWER9F_POKE_BALL
 
-TinTower9F_MapScriptHeader:
+TinTower9F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -21,7 +21,7 @@
 	text "LUGIA: Gyaaan!"
 	done
 
-TinTower9F_MapEventHeader:
+TinTower9F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const TINTOWERROOF_HO_OH
 
-TinTowerRoof_MapScriptHeader:
+TinTowerRoof_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -44,7 +44,7 @@
 	text "Shaoooh!"
 	done
 
-TinTowerRoof_MapEventHeader:
+TinTowerRoof_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const TOHJOFALLS_POKE_BALL
 
-TohjoFalls_MapScriptHeader:
+TohjoFalls_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -11,7 +11,7 @@
 TohjoFallsMoonStone:
 	itemball MOON_STONE
 
-TohjoFalls_MapEventHeader:
+TohjoFalls_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -2,7 +2,7 @@
 	const TRADECENTER_CHRIS1
 	const TRADECENTER_CHRIS2
 
-TradeCenter_MapScriptHeader:
+TradeCenter_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .InitializeTradeCenter
@@ -53,7 +53,7 @@
 	line "ready."
 	done
 
-TradeCenter_MapEventHeader:
+TradeCenter_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -5,7 +5,7 @@
 	const TRAINERHOUSE1F_YOUNGSTER
 	const TRAINERHOUSE1F_GENTLEMAN
 
-TrainerHouse1F_MapScriptHeader:
+TrainerHouse1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -137,7 +137,7 @@
 	line "illegible…"
 	done
 
-TrainerHouse1F_MapEventHeader:
+TrainerHouse1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -2,7 +2,7 @@
 	const TRAINERHOUSEB1F_RECEPTIONIST
 	const TRAINERHOUSEB1F_CHRIS
 
-TrainerHouseB1F_MapScriptHeader:
+TrainerHouseB1F_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -169,7 +169,7 @@
 	cont "could battle you."
 	done
 
-TrainerHouseB1F_MapEventHeader:
+TrainerHouseB1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/UndergroundPath.asm
+++ b/maps/UndergroundPath.asm
@@ -1,4 +1,4 @@
-UndergroundPath_MapScriptHeader:
+UndergroundPath_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -11,7 +11,7 @@
 UndergroundPathHiddenXSpecial:
 	hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL
 
-UndergroundPath_MapEventHeader:
+UndergroundPath_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -9,7 +9,7 @@
 	const UNIONCAVE1F_POKE_BALL3
 	const UNIONCAVE1F_POKE_BALL4
 
-UnionCave1F_MapScriptHeader:
+UnionCave1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -199,7 +199,7 @@
 	text "UNION CAVE"
 	done
 
-UnionCave1F_MapEventHeader:
+UnionCave1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -7,7 +7,7 @@
 	const UNIONCAVEB1F_BOULDER
 	const UNIONCAVEB1F_POKE_BALL2
 
-UnionCaveB1F_MapScriptHeader:
+UnionCaveB1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -152,7 +152,7 @@
 	cont "PROF.ELM."
 	done
 
-UnionCaveB1F_MapEventHeader:
+UnionCaveB1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -6,7 +6,7 @@
 	const UNIONCAVEB2F_POKE_BALL2
 	const UNIONCAVEB2F_LAPRAS
 
-UnionCaveB2F_MapScriptHeader:
+UnionCaveB2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -141,7 +141,7 @@
 	line "that #MON…"
 	done
 
-UnionCaveB2F_MapEventHeader:
+UnionCaveB2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -6,7 +6,7 @@
 	const VERMILIONCITY_BIG_SNORLAX
 	const VERMILIONCITY_POKEFAN_M
 
-VermilionCity_MapScriptHeader:
+VermilionCity_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -267,7 +267,7 @@
 	line "ENTRANCE"
 	done
 
-VermilionCity_MapEventHeader:
+VermilionCity_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -5,7 +5,7 @@
 	const VERMILIONGYM_SUPER_NERD
 	const VERMILIONGYM_GYM_GUY
 
-VermilionGym_MapScriptHeader:
+VermilionGym_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -260,7 +260,7 @@
 	line "but trash."
 	done
 
-VermilionGym_MapEventHeader:
+VermilionGym_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
+++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const VERMILIONHOUSEDIGLETTSCAVESPEECHHOUSE_GENTLEMAN
 
-VermilionHouseDiglettsCaveSpeechHouse_MapScriptHeader:
+VermilionHouseDiglettsCaveSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -20,7 +20,7 @@
 	line "to a distant town."
 	done
 
-VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader:
+VermilionHouseDiglettsCaveSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VermilionHouseFishingSpeechHouse.asm
+++ b/maps/VermilionHouseFishingSpeechHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const VERMILIONHOUSEFISHINGSPEECHHOUSE_FISHING_GURU
 
-VermilionHouseFishingSpeechHouse_MapScriptHeader:
+VermilionHouseFishingSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -50,7 +50,7 @@
 	line "great time…"
 	done
 
-VermilionHouseFishingSpeechHouse_MapEventHeader:
+VermilionHouseFishingSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -2,7 +2,7 @@
 	const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F
 	const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER
 
-VermilionMagnetTrainSpeechHouse_MapScriptHeader:
+VermilionMagnetTrainSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -33,7 +33,7 @@
 	cont "the MAGNET TRAIN."
 	done
 
-VermilionMagnetTrainSpeechHouse_MapEventHeader:
+VermilionMagnetTrainSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -3,7 +3,7 @@
 	const VERMILIONMART_SUPER_NERD
 	const VERMILIONMART_BUENA
 
-VermilionMart_MapScriptHeader:
+VermilionMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -36,7 +36,7 @@
 	cont "SAFFRON."
 	done
 
-VermilionMart_MapEventHeader:
+VermilionMart_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VermilionPokecenter1F.asm
+++ b/maps/VermilionPokecenter1F.asm
@@ -4,7 +4,7 @@
 	const VERMILIONPOKECENTER1F_SAILOR
 	const VERMILIONPOKECENTER1F_BUG_CATCHER
 
-VermilionPokecenter1F_MapScriptHeader:
+VermilionPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -76,7 +76,7 @@
 	line "got them in JOHTO."
 	done
 
-VermilionPokecenter1F_MapEventHeader:
+VermilionPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VermilionPokecenter2FBeta.asm
+++ b/maps/VermilionPokecenter2FBeta.asm
@@ -1,4 +1,4 @@
-VermilionPokecenter2FBeta_MapScriptHeader:
+VermilionPokecenter2FBeta_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-VermilionPokecenter2FBeta_MapEventHeader:
+VermilionPokecenter2FBeta_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -3,7 +3,7 @@
 	const VERMILIONPORT_SAILOR2
 	const VERMILIONPORT_SUPER_NERD
 
-VermilionPort_MapScriptHeader:
+VermilionPort_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -298,7 +298,7 @@
 	cont "there."
 	done
 
-VermilionPort_MapEventHeader:
+VermilionPort_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VermilionPortPassage.asm
+++ b/maps/VermilionPortPassage.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const VERMILIONPORTPASSAGE_TEACHER
 
-VermilionPortPassage_MapScriptHeader:
+VermilionPortPassage_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -18,7 +18,7 @@
 	cont "every week."
 	done
 
-VermilionPortPassage_MapEventHeader:
+VermilionPortPassage_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -6,7 +6,7 @@
 	const VICTORYROAD_POKE_BALL4
 	const VICTORYROAD_POKE_BALL5
 
-VictoryRoad_MapScriptHeader:
+VictoryRoad_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -238,7 +238,7 @@
 	line "thing else."
 	done
 
-VictoryRoad_MapEventHeader:
+VictoryRoad_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -3,7 +3,7 @@
 	const VICTORYROADGATE_BLACK_BELT1
 	const VICTORYROADGATE_BLACK_BELT2
 
-VictoryRoadGate_MapScriptHeader:
+VictoryRoadGate_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -97,7 +97,7 @@
 	line "ready for you!"
 	done
 
-VictoryRoadGate_MapEventHeader:
+VictoryRoadGate_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -8,7 +8,7 @@
 	const VIOLETCITY_POKE_BALL1
 	const VIOLETCITY_POKE_BALL2
 
-VioletCity_MapScriptHeader:
+VioletCity_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -278,7 +278,7 @@
 	line "ACADEMY"
 	done
 
-VioletCity_MapEventHeader:
+VioletCity_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -4,7 +4,7 @@
 	const VIOLETGYM_YOUNGSTER2
 	const VIOLETGYM_GYM_GUY
 
-VioletGym_MapScriptHeader:
+VioletGym_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -281,7 +281,7 @@
 	line "time at all!"
 	done
 
-VioletGym_MapEventHeader:
+VioletGym_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VioletKylesHouse.asm
+++ b/maps/VioletKylesHouse.asm
@@ -2,7 +2,7 @@
 	const VIOLETKYLESHOUSE_POKEFAN_M
 	const VIOLETKYLESHOUSE_KYLE
 
-VioletKylesHouse_MapScriptHeader:
+VioletKylesHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -32,7 +32,7 @@
 	line "disobey you."
 	done
 
-VioletKylesHouse_MapEventHeader:
+VioletKylesHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -3,7 +3,7 @@
 	const VIOLETMART_GRANNY
 	const VIOLETMART_COOLTRAINER_M
 
-VioletMart_MapScriptHeader:
+VioletMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -48,7 +48,7 @@
 	line "items."
 	done
 
-VioletMart_MapEventHeader:
+VioletMart_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -3,7 +3,7 @@
 	const VIOLETNICKNAMESPEECHHOUSE_LASS
 	const VIOLETNICKNAMESPEECHHOUSE_BIRD
 
-VioletNicknameSpeechHouse_MapScriptHeader:
+VioletNicknameSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -44,7 +44,7 @@
 	text "STRAWBERRY: Pijji!"
 	done
 
-VioletNicknameSpeechHouse_MapEventHeader:
+VioletNicknameSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -5,7 +5,7 @@
 	const VIOLETPOKECENTER1F_YOUNGSTER
 	const VIOLETPOKECENTER1F_SCIENTIST
 
-VioletPokecenter1F_MapScriptHeader:
+VioletPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -215,7 +215,7 @@
 	line "they please."
 	done
 
-VioletPokecenter1F_MapEventHeader:
+VioletPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -4,7 +4,7 @@
 	const VIRIDIANCITY_FISHER
 	const VIRIDIANCITY_YOUNGSTER
 
-ViridianCity_MapScriptHeader:
+ViridianCity_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -215,7 +215,7 @@
 	line "Trainer Battles"
 	done
 
-ViridianCity_MapEventHeader:
+ViridianCity_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -2,7 +2,7 @@
 	const VIRIDIANGYM_BLUE
 	const VIRIDIANGYM_GYM_GUY
 
-ViridianGym_MapScriptHeader:
+ViridianGym_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -169,7 +169,7 @@
 	line "tears to my eyes."
 	done
 
-ViridianGym_MapEventHeader:
+ViridianGym_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -3,7 +3,7 @@
 	const VIRIDIANMART_LASS
 	const VIRIDIANMART_COOLTRAINER_M
 
-ViridianMart_MapScriptHeader:
+ViridianMart_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -36,7 +36,7 @@
 	line "south of here."
 	done
 
-ViridianMart_MapEventHeader:
+ViridianMart_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/ViridianNicknameSpeechHouse.asm
+++ b/maps/ViridianNicknameSpeechHouse.asm
@@ -4,7 +4,7 @@
 	const VIRIDIANNICKNAMESPEECHHOUSE_SPEARY
 	const VIRIDIANNICKNAMESPEECHHOUSE_RATTEY
 
-ViridianNicknameSpeechHouse_MapScriptHeader:
+ViridianNicknameSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -61,7 +61,7 @@
 	text "RATTEY: Kikiii!"
 	done
 
-ViridianNicknameSpeechHouse_MapEventHeader:
+ViridianNicknameSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/ViridianPokecenter1F.asm
+++ b/maps/ViridianPokecenter1F.asm
@@ -4,7 +4,7 @@
 	const VIRIDIANPOKECENTER1F_COOLTRAINER_F
 	const VIRIDIANPOKECENTER1F_BUG_CATCHER
 
-ViridianPokecenter1F_MapScriptHeader:
+ViridianPokecenter1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -71,7 +71,7 @@
 	line "come a GYM LEADER."
 	done
 
-ViridianPokecenter1F_MapEventHeader:
+ViridianPokecenter1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/ViridianPokecenter2FBeta.asm
+++ b/maps/ViridianPokecenter2FBeta.asm
@@ -1,4 +1,4 @@
-ViridianPokecenter2FBeta_MapScriptHeader:
+ViridianPokecenter2FBeta_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-ViridianPokecenter2FBeta_MapEventHeader:
+ViridianPokecenter2FBeta_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -6,7 +6,7 @@
 	const WHIRLISLANDB1F_POKE_BALL5
 	const WHIRLISLANDB1F_BOULDER
 
-WhirlIslandB1F_MapScriptHeader:
+WhirlIslandB1F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -40,7 +40,7 @@
 WhirlIslandB1FHiddenFullRestore:
 	hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE
 
-WhirlIslandB1F_MapEventHeader:
+WhirlIslandB1F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -3,7 +3,7 @@
 	const WHIRLISLANDB2F_POKE_BALL2
 	const WHIRLISLANDB2F_POKE_BALL3
 
-WhirlIslandB2F_MapScriptHeader:
+WhirlIslandB2F_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -19,7 +19,7 @@
 WhirlIslandB2FMaxElixer:
 	itemball MAX_ELIXER
 
-WhirlIslandB2F_MapEventHeader:
+WhirlIslandB2F_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/WhirlIslandCave.asm
+++ b/maps/WhirlIslandCave.asm
@@ -1,4 +1,4 @@
-WhirlIslandCave_MapScriptHeader:
+WhirlIslandCave_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-WhirlIslandCave_MapEventHeader:
+WhirlIslandCave_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const WHIRLISLANDLUGIACHAMBER_LUGIA
 
-WhirlIslandLugiaChamber_MapScriptHeader:
+WhirlIslandLugiaChamber_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -43,7 +43,7 @@
 	text "Gyaaas!"
 	done
 
-WhirlIslandLugiaChamber_MapEventHeader:
+WhirlIslandLugiaChamber_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const WHIRLISLANDNE_POKE_BALL
 
-WhirlIslandNE_MapScriptHeader:
+WhirlIslandNE_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -11,7 +11,7 @@
 WhirlIslandNEUltraBall:
 	itemball ULTRA_BALL
 
-WhirlIslandNE_MapEventHeader:
+WhirlIslandNE_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/WhirlIslandNW.asm
+++ b/maps/WhirlIslandNW.asm
@@ -1,4 +1,4 @@
-WhirlIslandNW_MapScriptHeader:
+WhirlIslandNW_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-WhirlIslandNW_MapEventHeader:
+WhirlIslandNW_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/WhirlIslandSE.asm
+++ b/maps/WhirlIslandSE.asm
@@ -1,4 +1,4 @@
-WhirlIslandSE_MapScriptHeader:
+WhirlIslandSE_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -5,7 +5,7 @@
 .MapCallbacks:
 	db 0
 
-WhirlIslandSE_MapEventHeader:
+WhirlIslandSE_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const WHIRLISLANDSW_POKE_BALL
 
-WhirlIslandSW_MapScriptHeader:
+WhirlIslandSW_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -11,7 +11,7 @@
 WhirlIslandSWUltraBall:
 	itemball ULTRA_BALL
 
-WhirlIslandSW_MapEventHeader:
+WhirlIslandSW_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -1,7 +1,7 @@
 const_value set 2
 	const WILLSROOM_WILL
 
-WillsRoom_MapScriptHeader:
+WillsRoom_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .LockDoor
@@ -128,7 +128,7 @@
 	line "of the ELITE FOUR."
 	done
 
-WillsRoom_MapEventHeader:
+WillsRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -6,7 +6,7 @@
 	const WISETRIOSROOM_SAGE5
 	const WISETRIOSROOM_SAGE6
 
-WiseTriosRoom_MapScriptHeader:
+WiseTriosRoom_MapScripts:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -344,7 +344,7 @@
 	line "you to the test."
 	done
 
-WiseTriosRoom_MapEventHeader:
+WiseTriosRoom_MapEvents:
 	; filler
 	db 0, 0
 
--- a/mobile/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
@@ -1,8 +1,8 @@
 Function8b342:: ; 8b342
-; Loads the secondary map header pointer, then runs through a
+; Loads the map data pointer, then runs through a
 ; dw with three dummy functions. Spends a lot of energy
 ; doing pretty much nothing.
-	call GetSecondaryMapHeaderPointer
+	call GetMapDataPointer
 	ld d, h
 	ld e, l
 
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -4329,7 +4329,7 @@
 	push hl
 	ld a, [wCurrMapCallbackCount]
 	ld l, a
-	ld a, [wCurrMapCallbackHeaderPointer]
+	ld a, [wCurrMapCallbacksPointer]
 	ld h, a
 	cp b
 	jr c, .asm_1158bb
@@ -4351,7 +4351,7 @@
 	ld a, l
 	ld [wCurrMapCallbackCount], a
 	ld a, h
-	ld [wCurrMapCallbackHeaderPointer], a
+	ld [wCurrMapCallbacksPointer], a
 	pop bc
 	pop hl
 	ld hl, wCurrMapSceneScriptCount
@@ -4896,7 +4896,7 @@
 	push hl
 	ld a, [wCurrMapCallbackCount]
 	ld l, a
-	ld a, [wCurrMapCallbackHeaderPointer]
+	ld a, [wCurrMapCallbacksPointer]
 	ld h, a
 	cp b
 	jr c, .asm_115b36
@@ -4918,7 +4918,7 @@
 	ld a, l
 	ld [wCurrMapCallbackCount], a
 	ld a, h
-	ld [wCurrMapCallbackHeaderPointer], a
+	ld [wCurrMapCallbacksPointer], a
 	pop bc
 	pop hl
 	ld hl, wCurrMapSceneScriptCount
--- a/pokecrystal.link
+++ b/pokecrystal.link
@@ -106,7 +106,7 @@
 ROMX $24
 	"bank24"
 ROMX $25
-	"Map Headers"
+	"Maps"
 	"Events"
 ROMX $26
 	"Map Scripts 11"
@@ -117,11 +117,11 @@
 ROMX $29
 	"Phone Text"
 ROMX $2a
-	"Map Blockdata 1"
+	"Map Blocks 1"
 ROMX $2b
-	"Map Blockdata 2"
+	"Map Blocks 2"
 ROMX $2c
-	"Map Blockdata 3"
+	"Map Blocks 3"
 ROMX $2d
 	"Tileset Data 5"
 ROMX $2e
--- a/sram.asm
+++ b/sram.asm
@@ -83,7 +83,7 @@
 
 sBackupGameData:: ; b209
 sBackupPlayerData::  ds wPlayerDataEnd - wPlayerData
-sBackupMapData::     ds wMapDataEnd - wMapData
+sBackupCurrMapData:: ds wCurrMapDataEnd - wCurrMapData
 sBackupPokemonData:: ds wPokemonDataEnd - wPokemonData
 sBackupGameDataEnd::
 
@@ -106,7 +106,7 @@
 
 sGameData:: ; a009
 sPlayerData::  ds wPlayerDataEnd - wPlayerData
-sMapData::     ds wMapDataEnd - wMapData
+sCurrMapData:: ds wCurrMapDataEnd - wCurrMapData
 sPokemonData:: ds wPokemonDataEnd - wPokemonData
 sGameDataEnd::
 
--- a/wram.asm
+++ b/wram.asm
@@ -899,7 +899,7 @@
 wca80:: db
 wPrinterRowIndex:: db
 
-; Printer data header
+; Printer data
 wPrinterData:: ds 4
 wPrinterChecksum:: dw ; ca86
 wPrinterHandshake:: db
@@ -1781,7 +1781,7 @@
 NEXTU ; d03e
 ; trainer data
 	ds 3
-wTempTrainerHeader::
+wTempTrainer::
 wTempTrainerEventFlag:: dw
 wTempTrainerClass:: db
 wTempTrainerID:: db
@@ -1790,7 +1790,7 @@
 wLossTextPointer:: dw
 wScriptAfterPointer:: dw
 wRunningTrainerBattleScript:: db
-wTempTrainerHeaderEnd::
+wTempTrainerEnd::
 
 NEXTU ; d03e
 ; player movement data
@@ -1992,23 +1992,26 @@
 wMetatileStandingY:: db ; d196
 wMetatileStandingX:: db ; d197
 
-wSecondMapHeaderBank:: db ; d198
+wPartialMapDef::
+wMapDataBank:: db ; d198
 wTileset:: db ; d199
 wEnvironment:: db ; d19a
-wSecondMapHeaderAddr:: dw ; d19b
+wMapDataPointer:: dw ; d19b
+wPartialMapDefEnd::
 
-; width/height are in blocks (2x2 walkable tiles, 4x4 graphics tiles)
-MapHeader:: ; d19d
+wMapData:: ; d19d
 MapBorderBlock:: db ; d19d
+; width/height are in blocks (2x2 walkable tiles, 4x4 graphics tiles)
 MapHeight:: db ; d19e
 MapWidth:: db ; d19f
-MapBlockDataBank:: db; d1a0
-MapBlockDataPointer:: dw ; d1a1
-MapScriptHeaderBank:: db ; d1a3
-MapScriptHeaderPointer:: dw ; d1a4
-MapEventHeaderPointer:: dw ; d1a6
+MapBlocksBank:: db; d1a0
+MapBlocksPointer:: dw ; d1a1
+MapScriptsBank:: db ; d1a3
+MapScriptsPointer:: dw ; d1a4
+MapEventsPointer:: dw ; d1a6
 ; bit set
 MapConnections:: db ; d1a8
+wMapDataEnd::
 
 NorthMapConnection:: map_connection_struct North ; d1a9
 SouthMapConnection:: map_connection_struct South ; d1b5
@@ -2630,17 +2633,17 @@
 
 wCurrentCaller:: dw ; dbf9
 wCurrMapWarpCount:: db ; dbfb
-wCurrMapWarpHeaderPointer:: dw ; dbfc
+wCurrMapWarpsPointer:: dw ; dbfc
 wCurrMapCoordEventCount:: db ; dbfe
-wCurrMapCoordEventHeaderPointer:: dw ; dbff
+wCurrMapCoordEventsPointer:: dw ; dbff
 wCurrMapBGEventCount:: db ; dc01
-wCurrMapBGEventHeaderPointer:: dw ; dc02
+wCurrMapBGEventsPointer:: dw ; dc02
 wCurrMapObjectEventCount:: db ; dc04
-wCurrMapObjectEventHeaderPointer:: dw ; dc05
+wCurrMapObjectEventsPointer:: dw ; dc05
 wCurrMapSceneScriptCount:: db ; dc07
-wCurrMapSceneScriptHeaderPointer:: dw ; dc08
+wCurrMapSceneScriptsPointer:: dw ; dc08
 wCurrMapCallbackCount:: db ; dc0a
-wCurrMapCallbackHeaderPointer:: dw ; dc0b
+wCurrMapCallbacksPointer:: dw ; dc0b
 
 	ds 2
 
@@ -2719,7 +2722,7 @@
 wPlayerDataEnd::
 
 
-wMapData::
+wCurrMapData::
 
 wVisitedSpawns:: flag_array NUM_SPAWNS ; dca5
 
@@ -2745,7 +2748,7 @@
 XCoord:: db ; dcb8 ; current x coordinate relative to top-left corner of current map
 wScreenSave:: ds 6 * 5
 
-wMapDataEnd::
+wCurrMapDataEnd::
 
 
 SECTION "Party", WRAMX
@@ -2845,7 +2848,7 @@
 ; 20x18 grid of 8x8 tiles
 	ds SCREEN_WIDTH * SCREEN_HEIGHT ; $168 = 360
 
-; PokeAnim Header
+; PokeAnim data
 wPokeAnimSceneIndex:: db
 wPokeAnimPointer:: dw
 wPokeAnimSpecies:: db