shithub: pokered

Download patch

ref: 4e4e72d02a5a202daea3a73363d2a4c3ba34e724
parent: e1a931df6affe154b57fa48e229ce299410032df
author: U-Fish-PC\Daniel <corrnondacqb@yahoo.com>
date: Sat May 17 13:18:23 EDT 2014 

Pull map headers out of main.asm

diff: cannot open b/data/mapHeaders//null: file does not exist: 'b/data/mapHeaders//null' 
--- /dev/null
+++ b/data/mapHeaders/agatha.asm
@@ -1,0 +1,6 @@
+Agatha_h: ; 0x76421 to 0x7642d (12 bytes) (id=247)
+	db CEMETERY ; tileset
+	db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x)
+	dw AgathaBlocks, AgathaTextPointers, AgathaScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw AgathaObject ; objects
--- /dev/null
+++ b/data/mapHeaders/battlecenterm.asm
@@ -1,0 +1,6 @@
+BattleCenterM_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239)
+	db CLUB ; tileset
+	db BATTLE_CENTER_HEIGHT, BATTLE_CENTER_WIDTH ; dimensions (y, x)
+	dw BattleCenterMBlocks, BattleCenterMTextPointers, BattleCenterMScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw BattleCenterMObject ; objects
--- /dev/null
+++ b/data/mapHeaders/bikeshop.asm
@@ -1,0 +1,6 @@
+BikeShop_h: ; 0x1d730 to 0x1d73c (12 bytes) (bank=7) (id=66)
+	db CLUB ; tileset
+	db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x)
+	dw BikeShopBlocks, BikeShopTextPointers, BikeShopScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw BikeShopObject ; objects
--- /dev/null
+++ b/data/mapHeaders/billshouse.asm
@@ -1,0 +1,6 @@
+BillsHouse_h: ; 0x1e75e to 0x1e76a (12 bytes) (bank=7) (id=88)
+	db INTERIOR ; tileset
+	db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x)
+	dw BillsHouseBlocks, BillsHouseTextPointers, BillsHouseScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw BillsHouseObject ; objects
--- /dev/null
+++ b/data/mapHeaders/blueshouse.asm
@@ -1,0 +1,6 @@
+BluesHouse_h: ; 0x19b2f id=39
+	db HOUSE ; tileset
+	db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions
+	dw BluesHouseBlocks, BluesHouseTextPointers, BluesHouseScript
+	db 0
+	dw BluesHouseObject
--- /dev/null
+++ b/data/mapHeaders/bruno.asm
@@ -1,0 +1,6 @@
+Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246)
+	db GYM ; tileset
+	db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x)
+	dw BrunoBlocks, BrunoTextPointers, BrunoScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw BrunoObject ; objects
--- /dev/null
+++ b/data/mapHeaders/celadoncity.asm
@@ -1,0 +1,8 @@
+CeladonCity_h: ; 18000 (6:4000)
+	db OVERWORLD ; tileset
+	db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x)
+	dw CeladonCityBlocks, CeladonCityTextPointers, CeladonCityScript ; blocks, texts, scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION ROUTE_16, ROUTE_16_WIDTH, 4, 0, ROUTE_16_HEIGHT, Route16Blocks, CELADON_CITY_WIDTH
+	EAST_MAP_CONNECTION ROUTE_7, ROUTE_7_WIDTH, 4, 0, ROUTE_7_HEIGHT, Route7Blocks, CELADON_CITY_WIDTH
+	dw CeladonCityObject ; objects
--- /dev/null
+++ b/data/mapHeaders/celadondiner.asm
@@ -1,0 +1,6 @@
+CeladonDiner_h: ; 0x49145 to 0x49151 (12 bytes) (bank=12) (id=138)
+	db LOBBY ; tileset
+	db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x)
+	dw CeladonDinerBlocks, CeladonDinerTextPointers, CeladonDinerScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonDinerObject ; objects
--- /dev/null
+++ b/data/mapHeaders/celadongamecorner.asm
@@ -1,0 +1,6 @@
+CeladonGameCorner_h: ; 0x48bb1 to 0x48bbd (12 bytes) (bank=12) (id=135)
+	db LOBBY ; tileset
+	db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x)
+	dw CeladonGameCornerBlocks, CeladonGameCornerTextPointers, CeladonGameCornerScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonGameCornerObject ; objects
--- /dev/null
+++ b/data/mapHeaders/celadongym.asm
@@ -1,0 +1,6 @@
+CeladonGym_h: ; 0x488fe to 0x4890a (12 bytes) (bank=12) (id=134)
+	db GYM ; tileset
+	db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x)
+	dw CeladonGymBlocks, CeladonGymTextPointers, CeladonGymScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonGymObject ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonhotel.asm
@@ -1,0 +1,6 @@
+CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140)
+	db POKECENTER ; tileset
+	db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x)
+	dw CeladonHotelBlocks, CeladonHotelTextPointers, CeladonHotelScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonHotelObject ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonhouse.asm
@@ -1,0 +1,6 @@
+CeladonHouse_h: ; 0x49202 to 0x4920e (12 bytes) (bank=12) (id=139)
+	db MANSION ; tileset
+	db CELADON_HOUSE_HEIGHT, CELADON_HOUSE_WIDTH ; dimensions (y, x)
+	dw CeladonHouseBlocks, CeladonHouseTextPointers, CeladonHouseScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonHouseObject ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonmansion1.asm
@@ -1,0 +1,6 @@
+CeladonMansion1_h: ; 0x48688 to 0x48694 (12 bytes) (bank=12) (id=128)
+	db MANSION ; tileset
+	db CELADON_MANSION_1_HEIGHT, CELADON_MANSION_1_WIDTH ; dimensions (y, x)
+	dw CeladonMansion1Blocks, CeladonMansion1TextPointers, CeladonMansion1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonMansion1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonmansion2.asm
@@ -1,0 +1,6 @@
+CeladonMansion2_h: ; 0x4872e to 0x4873a (12 bytes) (bank=12) (id=129)
+	db MANSION ; tileset
+	db CELADON_MANSION_2_HEIGHT, CELADON_MANSION_2_WIDTH ; dimensions (y, x)
+	dw CeladonMansion2Blocks, CeladonMansion2TextPointers, CeladonMansion2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonMansion2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonmansion3.asm
@@ -1,0 +1,6 @@
+CeladonMansion3_h: ; 0x48784 to 0x48790 (12 bytes) (bank=12) (id=130)
+	db MANSION ; tileset
+	db CELADON_MANSION_3_HEIGHT, CELADON_MANSION_3_WIDTH ; dimensions (y, x)
+	dw CeladonMansion3Blocks, CeladonMansion3TextPointers, CeladonMansion3Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonMansion3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonmansion4.asm
@@ -1,0 +1,6 @@
+CeladonMansion4_h: ; 0x4885f to 0x4886b (12 bytes) (bank=12) (id=131)
+	db MANSION ; tileset
+	db CELADON_MANSION_4_HEIGHT, CELADON_MANSION_4_WIDTH ; dimensions (y, x)
+	dw CeladonMansion4Blocks, CeladonMansion4TextPointers, CeladonMansion4Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonMansion4Object ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonmansion5.asm
@@ -1,0 +1,6 @@
+CeladonMansion5_h: ; 0x1dd2e to 0x1dd3a (12 bytes) (bank=7) (id=132)
+	db HOUSE ; tileset
+	db CELADON_MANSION_5_HEIGHT, CELADON_MANSION_5_WIDTH ; dimensions (y, x)
+	dw CeladonMansion5Blocks, CeladonMansion5TextPointers, CeladonMansion5Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonMansion5Object ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonmart1.asm
@@ -1,0 +1,6 @@
+CeladonMart1_h: ; 0x60f7a to 0x60f86 (12 bytes) (id=122)
+	db LOBBY ; tileset
+	db CELADON_MART_1_HEIGHT, CELADON_MART_1_WIDTH ; dimensions (y, x)
+	dw CeladonMart1Blocks, CeladonMart1TextPointers, CeladonMart1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonMart1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonmart2.asm
@@ -1,0 +1,6 @@
+CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123)
+	db LOBBY ; tileset
+	db CELADON_MART_2_HEIGHT, CELADON_MART_2_WIDTH ; dimensions (y, x)
+	dw CeladonMart2Blocks, CeladonMart2TextPointers, CeladonMart2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonMart2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonmart3.asm
@@ -1,0 +1,6 @@
+CeladonMart3_h: ; 0x48219 to 0x48225 (12 bytes) (bank=12) (id=124)
+	db LOBBY ; tileset
+	db CELADON_MART_3_HEIGHT, CELADON_MART_3_WIDTH ; dimensions (y, x)
+	dw CeladonMart3Blocks, CeladonMart3TextPointers, CeladonMart3Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonMart3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonmart4.asm
@@ -1,0 +1,6 @@
+CeladonMart4_h: ; 0x4834a to 0x48356 (12 bytes) (bank=12) (id=125)
+	db LOBBY ; tileset
+	db CELADON_MART_4_HEIGHT, CELADON_MART_4_WIDTH ; dimensions (y, x)
+	dw CeladonMart4Blocks, CeladonMart4TextPointers, CeladonMart4Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonMart4Object ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonmart5.asm
@@ -1,0 +1,6 @@
+CeladonMart5_h: ; 0x4905d to 0x49069 (12 bytes) (bank=12) (id=136)
+	db LOBBY ; tileset
+	db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x)
+	dw CeladonMart5Blocks, CeladonMart5TextPointers, CeladonMart5Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonMart5Object ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonmartelevator.asm
@@ -1,0 +1,6 @@
+CeladonMartElevator_h: ; 0x485f4 to 0x48600 (12 bytes) (bank=12) (id=127)
+	db LOBBY ; tileset
+	db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x)
+	dw CeladonMartElevatorBlocks, CeladonMartElevatorTextPointers, CeladonMartElevatorScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonMartElevatorObject ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonmartroof.asm
@@ -1,0 +1,6 @@
+CeladonMartRoof_h: ; 0x483c9 to 0x483d5 (12 bytes) (bank=12) (id=126)
+	db LOBBY ; tileset
+	db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x)
+	dw CeladonMartRoofBlocks, CeladonMartRoofTextPointers, CeladonMartRoofScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonMartRoofObject ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonpokecenter.asm
@@ -1,0 +1,6 @@
+CeladonPokecenter_h: ; 0x488ac to 0x488b8 (12 bytes) (bank=12) (id=133)
+	db POKECENTER ; tileset
+	db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x)
+	dw CeladonPokecenterBlocks, CeladonPokecenterTextPointers, CeladonPokecenterScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonPokecenterObject ; objects
--- /dev/null
+++ b/data/mapHeaders/celadonprizeroom.asm
@@ -1,0 +1,6 @@
+CeladonPrizeRoom_h: ; 0x490e4 to 0x490f0 (12 bytes) (bank=12) (id=137)
+	db LOBBY ; tileset
+	db CELADON_PRIZE_ROOM_HEIGHT, CELADON_PRIZE_ROOM_WIDTH ; dimensions (y, x)
+	dw CeladonPrizeRoomBlocks, CeladonPrizeRoomTextPointers, CeladonPrizeRoomScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeladonPrizeRoomObject ; objects
--- /dev/null
+++ b/data/mapHeaders/ceruleancity.asm
@@ -1,0 +1,10 @@
+CeruleanCity_h: ; 0x1874e to 0x18786 (56 bytes) (bank=6) (id=3)
+	db OVERWORLD ; tileset
+	db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x)
+	dw CeruleanCityBlocks, CeruleanCityTextPointers, CeruleanCityScript ; blocks, texts, scripts
+	db NORTH | SOUTH | WEST | EAST ; connections
+	NORTH_MAP_CONNECTION ROUTE_24, ROUTE_24_WIDTH, ROUTE_24_HEIGHT, 5, 0, ROUTE_24_WIDTH, Route24Blocks
+	SOUTH_MAP_CONNECTION ROUTE_5, ROUTE_5_WIDTH, 5, 0, ROUTE_5_WIDTH, Route5Blocks, CERULEAN_CITY_WIDTH, CERULEAN_CITY_HEIGHT
+	WEST_MAP_CONNECTION ROUTE_4, ROUTE_4_WIDTH, 4, 0, ROUTE_4_HEIGHT, Route4Blocks, CERULEAN_CITY_WIDTH
+	EAST_MAP_CONNECTION ROUTE_9, ROUTE_9_WIDTH, 4, 0, ROUTE_9_HEIGHT, Route9Blocks, CERULEAN_CITY_WIDTH
+	dw CeruleanCityObject ; objects
--- /dev/null
+++ b/data/mapHeaders/ceruleangym.asm
@@ -1,0 +1,6 @@
+CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65)
+	db GYM ; tileset
+	db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x)
+	dw CeruleanGymBlocks, CeruleanGymTextPointers, CeruleanGymScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeruleanGymObject ; objects
--- /dev/null
+++ b/data/mapHeaders/ceruleanhouse1.asm
@@ -1,0 +1,6 @@
+CeruleanHouse1_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63)
+	db HOUSE ; tileset
+	db CERULEAN_HOUSE_1_HEIGHT, CERULEAN_HOUSE_1_WIDTH ; dimensions (y, x)
+	dw CeruleanHouse1Blocks, CeruleanHouse1TextPointers, CeruleanHouse1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeruleanHouse1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/ceruleanhouse2.asm
@@ -1,0 +1,6 @@
+CeruleanHouse2_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230)
+	db SHIP ; tileset
+	db CERULEAN_HOUSE_2_HEIGHT, CERULEAN_HOUSE_2_WIDTH ; dimensions (y, x)
+	dw CeruleanHouse2Blocks, CeruleanHouse2TextPointers, CeruleanHouse2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeruleanHouse2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/ceruleanhousetrashed.asm
@@ -1,0 +1,6 @@
+CeruleanHouseTrashed_h: ; 0x1d679 to 0x1d685 (12 bytes) (bank=7) (id=62)
+	db HOUSE ; tileset
+	db TRASHED_HOUSE_HEIGHT, TRASHED_HOUSE_WIDTH ; dimensions (y, x)
+	dw CeruleanHouseTrashedBlocks, CeruleanHouseTrashedTextPointers, CeruleanHouseTrashedScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeruleanHouseTrashedObject ; objects
--- /dev/null
+++ b/data/mapHeaders/ceruleanmart.asm
@@ -1,0 +1,6 @@
+CeruleanMart_h: ; 0x5c889 to 0x5c895 (12 bytes) (id=67)
+	db MART ; tileset
+	db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x)
+	dw CeruleanMartBlocks, CeruleanMartTextPointers, CeruleanMartScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeruleanMartObject ; objects
--- /dev/null
+++ b/data/mapHeaders/ceruleanpokecenter.asm
@@ -1,0 +1,6 @@
+CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64)
+	db POKECENTER ; tileset
+	db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x)
+	dw CeruleanPokecenterBlocks, CeruleanPokecenterTextPointers, CeruleanPokecenterScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CeruleanPokecenterObject ; objects
--- /dev/null
+++ b/data/mapHeaders/cinnabargym.asm
@@ -1,0 +1,6 @@
+CinnabarGym_h: ; 0x7573e to 0x7574a (12 bytes) (id=166)
+	db FACILITY ; tileset
+	db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x)
+	dw CinnabarGymBlocks, CinnabarGymTextPointers, CinnabarGymScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CinnabarGymObject ; objects
--- /dev/null
+++ b/data/mapHeaders/cinnabarisland.asm
@@ -1,0 +1,8 @@
+CinnabarIsland_h: ; 0x1c000 to 0x1c022 (34 bytes) (bank=7) (id=8)
+	db OVERWORLD ; tileset
+	db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x)
+	dw CinnabarIslandBlocks, CinnabarIslandTextPointers, CinnabarIslandScript ; blocks, texts, scripts
+	db NORTH | EAST ; connections
+	NORTH_MAP_CONNECTION ROUTE_21, ROUTE_21_WIDTH, ROUTE_21_HEIGHT, 0, 0, ROUTE_21_WIDTH, Route21Blocks
+	EAST_MAP_CONNECTION ROUTE_20, ROUTE_20_WIDTH, 0, 0, ROUTE_20_HEIGHT, Route20Blocks, CINNABAR_ISLAND_WIDTH
+	dw CinnabarIslandObject ; objects
--- /dev/null
+++ b/data/mapHeaders/cinnabarmart.asm
@@ -1,0 +1,6 @@
+CinnabarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172)
+	db MART ; tileset
+	db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x)
+	dw CinnabarMartBlocks, CinnabarMartTextPointers, CinnabarMartScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CinnabarMartObject ; objects
--- /dev/null
+++ b/data/mapHeaders/cinnabarpokecenter.asm
@@ -1,0 +1,6 @@
+CinnabarPokecenter_h: ; 0x75e20 to 0x75e2c (12 bytes) (id=171)
+	db POKECENTER ; tileset
+	db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x)
+	dw CinnabarPokecenterBlocks, CinnabarPokecenterTextPointers, CinnabarPokecenterScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CinnabarPokecenterObject ; objects
--- /dev/null
+++ b/data/mapHeaders/copycatshouse1f.asm
@@ -1,0 +1,6 @@
+CopycatsHouse1F_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175)
+	db REDS_HOUSE_1 ; tileset
+	db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x)
+	dw CopycatsHouse1FBlocks, CopycatsHouse1FTextPointers, CopycatsHouse1FScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CopycatsHouse1FObject ; objects
--- /dev/null
+++ b/data/mapHeaders/copycatshouse2f.asm
@@ -1,0 +1,6 @@
+CopycatsHouse2F_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176)
+	db REDS_HOUSE_2 ; tileset
+	db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x)
+	dw CopycatsHouse2FBlocks, CopycatsHouse2FTextPointers, CopycatsHouse2FScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw CopycatsHouse2FObject ; objects
--- /dev/null
+++ b/data/mapHeaders/daycarem.asm
@@ -1,0 +1,6 @@
+DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72)
+	db HOUSE ; tileset
+	db DAYCAREM_HEIGHT, DAYCAREM_WIDTH ; dimensions (y, x)
+	dw DayCareMBlocks, DayCareMTextPointers, DayCareMScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw DayCareMObject ; objects
--- /dev/null
+++ b/data/mapHeaders/diglettscave.asm
@@ -1,0 +1,6 @@
+DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197)
+	db CAVERN ; tileset
+	db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x)
+	dw DiglettsCaveBlocks, DiglettsCaveTextPointers, DiglettsCaveScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw DiglettsCaveObject ; objects
--- /dev/null
+++ b/data/mapHeaders/diglettscaveroute11.asm
@@ -1,0 +1,6 @@
+DiglettsCaveEntranceRoute11_h: ; 0x1e5ae to 0x1e5ba (12 bytes) (bank=7) (id=85)
+	db CAVERN ; tileset
+	db DIGLETTS_CAVE_ENTRANCE_HEIGHT, DIGLETTS_CAVE_ENTRANCE_WIDTH ; dimensions (y, x)
+	dw DiglettsCaveEntranceRoute11Blocks, DiglettsCaveEntranceRoute11TextPointers, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw DiglettsCaveEntranceRoute11Object ; objects
--- /dev/null
+++ b/data/mapHeaders/diglettscaveroute2.asm
@@ -1,0 +1,6 @@
+DiglettsCaveRoute2_h: ; 0x1dea4 to 0x1deb0 (12 bytes) (bank=7) (id=46)
+	db CAVERN ; tileset
+	db DIGLETTS_CAVE_EXIT_HEIGHT, DIGLETTS_CAVE_EXIT_WIDTH ; dimensions (y, x)
+	dw DiglettsCaveRoute2Blocks, DiglettsCaveRoute2TextPointers, DiglettsCaveRoute2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw DiglettsCaveRoute2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/fanclub.asm
@@ -1,0 +1,6 @@
+FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90)
+	db INTERIOR ; tileset
+	db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x)
+	dw FanClubBlocks, FanClubTextPointers, FanClubScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw FanClubObject ; objects
--- /dev/null
+++ b/data/mapHeaders/fightingdojo.asm
@@ -1,0 +1,6 @@
+FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177)
+	db DOJO ; tileset
+	db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x)
+	dw FightingDojoBlocks, FightingDojoTextPointers, FightingDojoScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw FightingDojoObject ; objects
--- /dev/null
+++ b/data/mapHeaders/fuchsiacity.asm
@@ -1,0 +1,9 @@
+FuchsiaCity_h: ; 0x18ba7 to 0x18bd4 (45 bytes) (bank=6) (id=7)
+	db OVERWORLD ; tileset
+	db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x)
+	dw FuchsiaCityBlocks, FuchsiaCityTextPointers, FuchsiaCityScript ; blocks, texts, scripts
+	db SOUTH | WEST | EAST ; connections
+	SOUTH_MAP_CONNECTION ROUTE_19, ROUTE_19_WIDTH, 5, 0, ROUTE_19_WIDTH, Route19Blocks, FUCHSIA_CITY_WIDTH, FUCHSIA_CITY_HEIGHT
+	WEST_MAP_CONNECTION ROUTE_18, ROUTE_18_WIDTH, 4, 0, ROUTE_18_HEIGHT, Route18Blocks, FUCHSIA_CITY_WIDTH
+	EAST_MAP_CONNECTION ROUTE_15, ROUTE_15_WIDTH, 4, 0, ROUTE_15_HEIGHT, Route15Blocks, FUCHSIA_CITY_WIDTH
+	dw FuchsiaCityObject ; objects
--- /dev/null
+++ b/data/mapHeaders/fuchsiagym.asm
@@ -1,0 +1,6 @@
+FuchsiaGym_h: ; 0x75431 to 0x7543d (12 bytes) (id=157)
+	db GYM ; tileset
+	db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x)
+	dw FuchsiaGymBlocks, FuchsiaGymTextPointers, FuchsiaGymScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw FuchsiaGymObject ; objects
--- /dev/null
+++ b/data/mapHeaders/fuchsiahouse1.asm
@@ -1,0 +1,6 @@
+FuchsiaHouse1_h: ; 0x7500c to 0x75018 (12 bytes) (id=153)
+	db HOUSE ; tileset
+	db FUCHSIA_HOUSE_1_HEIGHT, FUCHSIA_HOUSE_1_WIDTH ; dimensions (y, x)
+	dw FuchsiaHouse1Blocks, FuchsiaHouse1TextPointers, FuchsiaHouse1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw FuchsiaHouse1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/fuchsiahouse2.asm
@@ -1,0 +1,6 @@
+FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155)
+	db LAB ; tileset
+	db FUCHSIA_HOUSE_2_HEIGHT, FUCHSIA_HOUSE_2_WIDTH ; dimensions (y, x)
+	dw FuchsiaHouse2Blocks, FuchsiaHouse2TextPointers, FuchsiaHouse2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw FuchsiaHouse2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/fuchsiahouse3.asm
@@ -1,0 +1,6 @@
+FuchsiaHouse3_h: ; 0x56170 to 0x5617c (12 bytes) (id=164)
+	db SHIP ; tileset
+	db FUCHSIA_HOUSE_3_HEIGHT, FUCHSIA_HOUSE_3_WIDTH ; dimensions (y, x)
+	dw FuchsiaHouse3Blocks, FuchsiaHouse3TextPointers, FuchsiaHouse3Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw FuchsiaHouse3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/fuchsiamart.asm
@@ -1,0 +1,6 @@
+FuchsiaMart_h: ; 0x1dd7c to 0x1dd88 (12 bytes) (bank=7) (id=152)
+	db MART ; tileset
+	db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x)
+	dw FuchsiaMartBlocks, FuchsiaMartTextPointers, FuchsiaMartScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw FuchsiaMartObject ; objects
--- /dev/null
+++ b/data/mapHeaders/fuchsiameetingroom.asm
@@ -1,0 +1,6 @@
+FuchsiaMeetingRoom_h: ; 0x756d7 to 0x756e3 (12 bytes) (id=158)
+	db LAB ; tileset
+	db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x)
+	dw FuchsiaMeetingRoomBlocks, FuchsiaMeetingRoomTextPointers, FuchsiaMeetingRoomScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw FuchsiaMeetingRoomObject ; objects
--- /dev/null
+++ b/data/mapHeaders/fuchsiapokecenter.asm
@@ -1,0 +1,6 @@
+FuchsiaPokecenter_h: ; 0x75057 to 0x75063 (12 bytes) (id=154)
+	db POKECENTER ; tileset
+	db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x)
+	dw FuchsiaPokecenterBlocks, FuchsiaPokecenterTextPointers, FuchsiaPokecenterScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw FuchsiaPokecenterObject ; objects
--- /dev/null
+++ b/data/mapHeaders/gary.asm
@@ -1,0 +1,6 @@
+Gary_h: ; 75f11 (1d:5f11)
+	db GYM ;tileset
+	db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; Height, Width
+	dw GaryBlocks, GaryTextPointers, GaryScript
+	db $0 ;No Connections
+	dw GaryObject
--- /dev/null
+++ b/data/mapHeaders/halloffameroom.asm
@@ -1,0 +1,6 @@
+HallofFameRoom_h: ; 0x5a492 to 0x5a49e (12 bytes) (id=118)
+	db GYM ; tileset
+	db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x)
+	dw HallofFameRoomBlocks, HallofFameRoomTextPointers, HallofFameRoomScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw HallofFameRoomObject ; objects
--- /dev/null
+++ b/data/mapHeaders/indigoplateau.asm
@@ -1,0 +1,7 @@
+IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9)
+	db PLATEAU ; tileset
+	db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x)
+	dw IndigoPlateauBlocks, IndigoPlateauTextPointers, IndigoPlateauScript ; blocks, texts, scripts
+	db SOUTH ; connections
+	SOUTH_MAP_CONNECTION ROUTE_23, ROUTE_23_WIDTH, 0, 0, ROUTE_23_WIDTH, Route23Blocks, INDIGO_PLATEAU_WIDTH, INDIGO_PLATEAU_HEIGHT
+	dw IndigoPlateauObject ; objects
--- /dev/null
+++ b/data/mapHeaders/indigoplateaulobby.asm
@@ -1,0 +1,6 @@
+IndigoPlateauLobby_h: ; 0x19c4f to 0x19c5b (12 bytes) (bank=6) (id=174)
+	db MART ; tileset
+	db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x)
+	dw IndigoPlateauLobbyBlocks, IndigoPlateauLobbyTextPointers, IndigoPlateauLobbyScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw IndigoPlateauLobbyObject ; objects
--- /dev/null
+++ b/data/mapHeaders/lab1.asm
@@ -1,0 +1,6 @@
+Lab1_h: ; 0x75b80 to 0x75b8c (12 bytes) (id=167)
+	db LAB ; tileset
+	db CINNABAR_LAB_1_HEIGHT, CINNABAR_LAB_1_WIDTH ; dimensions (y, x)
+	dw Lab1Blocks, Lab1TextPointers, Lab1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw Lab1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/lab2.asm
@@ -1,0 +1,6 @@
+Lab2_h: ; 0x75c15 to 0x75c21 (12 bytes) (id=168)
+	db LAB ; tileset
+	db CINNABAR_LAB_2_HEIGHT, CINNABAR_LAB_2_WIDTH ; dimensions (y, x)
+	dw Lab2Blocks, Lab2TextPointers, Lab2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw Lab2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/lab3.asm
@@ -1,0 +1,6 @@
+Lab3_h: ; 0x75c7b to 0x75c87 (12 bytes) (id=169)
+	db LAB ; tileset
+	db CINNABAR_LAB_3_HEIGHT, CINNABAR_LAB_3_WIDTH ; dimensions (y, x)
+	dw Lab3Blocks, Lab3TextPointers, Lab3Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw Lab3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/lab4.asm
@@ -1,0 +1,6 @@
+Lab4_h: ; 0x75d25 to 0x75d31 (12 bytes) (id=170)
+	db LAB ; tileset
+	db CINNABAR_LAB_4_HEIGHT, CINNABAR_LAB_4_WIDTH ; dimensions (y, x)
+	dw Lab4Blocks, Lab4TextPointers, Lab4Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw Lab4Object ; objects
--- /dev/null
+++ b/data/mapHeaders/lance.asm
@@ -1,0 +1,6 @@
+Lance_h: ; 0x5a2a2 to 0x5a2ae (12 bytes) (id=113)
+	db DOJO ; tileset
+	db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x)
+	dw LanceBlocks, LanceTextPointers, LanceScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw LanceObject ; objects
--- /dev/null
+++ b/data/mapHeaders/lavenderhouse1.asm
@@ -1,0 +1,6 @@
+LavenderHouse1_h: ; 0x1d89c to 0x1d8a8 (12 bytes) (bank=7) (id=149)
+	db HOUSE ; tileset
+	db LAVENDER_HOUSE_1_HEIGHT, LAVENDER_HOUSE_1_WIDTH ; dimensions (y, x)
+	dw LavenderHouse1Blocks, LavenderHouse1TextPointers, LavenderHouse1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw LavenderHouse1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/lavenderhouse2.asm
@@ -1,0 +1,6 @@
+LavenderHouse2_h: ; 0x1d9a2 to 0x1d9ae (12 bytes) (bank=7) (id=151)
+	db HOUSE ; tileset
+	db LAVENDER_HOUSE_2_HEIGHT, LAVENDER_HOUSE_2_WIDTH ; dimensions (y, x)
+	dw LavenderHouse2Blocks, LavenderHouse2TextPointers, LavenderHouse2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw LavenderHouse2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/lavendermart.asm
@@ -1,0 +1,6 @@
+LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150)
+	db MART ; tileset
+	db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x)
+	dw LavenderMartBlocks, LavenderMartTextPointers, LavenderMartScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw LavenderMartObject ; objects
--- /dev/null
+++ b/data/mapHeaders/lavenderpokecenter.asm
@@ -1,0 +1,6 @@
+LavenderPokecenter_h: ; 0x5c8ce to 0x5c8da (12 bytes) (id=141)
+	db POKECENTER ; tileset
+	db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x)
+	dw LavenderPokecenterBlocks, LavenderPokecenterTextPointers, LavenderPokecenterScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw LavenderPokecenterObject ; objects
--- /dev/null
+++ b/data/mapHeaders/lavendertown.asm
@@ -1,0 +1,9 @@
+LavenderTown_h: ; 0x44000 to 0x4402d (45 bytes) (bank=11) (id=4)
+	db OVERWORLD ; tileset
+	db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x)
+	dw LavenderTownBlocks, LavenderTownTextPointers, LavenderTownScript ; blocks, texts, scripts
+	db NORTH | SOUTH | WEST ; connections
+	NORTH_MAP_CONNECTION ROUTE_10, ROUTE_10_WIDTH, ROUTE_10_HEIGHT, 0, 0, ROUTE_10_WIDTH, Route10Blocks
+	SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_12_WIDTH, 0, 0, ROUTE_12_WIDTH, Route12Blocks, LAVENDER_TOWN_WIDTH, LAVENDER_TOWN_HEIGHT
+	WEST_MAP_CONNECTION ROUTE_8, ROUTE_8_WIDTH, 0, 0, ROUTE_8_HEIGHT, Route8Blocks, LAVENDER_TOWN_WIDTH
+	dw LavenderTownObject ; objects
--- /dev/null
+++ b/data/mapHeaders/lorelei.asm
@@ -1,0 +1,6 @@
+Lorelei_h: ; 0x7616f to 0x7617b (12 bytes) (id=245)
+	db GYM ; tileset
+	db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x)
+	dw LoreleiBlocks, LoreleiTextPointers, LoreleiScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw LoreleiObject ; objects
--- /dev/null
+++ b/data/mapHeaders/mansion1.asm
@@ -1,0 +1,6 @@
+Mansion1_h: ; 0x442a3 to 0x442af (12 bytes) (bank=11) (id=165)
+	db FACILITY ; tileset
+	db MANSION_1_HEIGHT, MANSION_1_WIDTH ; dimensions (y, x)
+	dw Mansion1Blocks, Mansion1TextPointers, Mansion1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw Mansion1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/mansion2.asm
@@ -1,0 +1,6 @@
+Mansion2_h: ; 0x51fcc to 0x51fd8 (12 bytes) (id=214)
+	db FACILITY ; tileset
+	db MANSION_2_HEIGHT, MANSION_2_WIDTH ; dimensions (y, x)
+	dw Mansion2Blocks, Mansion2TextPointers, Mansion2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw Mansion2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/mansion3.asm
@@ -1,0 +1,6 @@
+Mansion3_h: ; 0x521e2 to 0x521ee (12 bytes) (id=215)
+	db FACILITY ; tileset
+	db MANSION_3_HEIGHT, MANSION_3_WIDTH ; dimensions (y, x)
+	dw Mansion3Blocks, Mansion3TextPointers, Mansion3Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw Mansion3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/mansion4.asm
@@ -1,0 +1,6 @@
+Mansion4_h: ; 0x523ad to 0x523b9 (12 bytes) (id=216)
+	db FACILITY ; tileset
+	db MANSION_4_HEIGHT, MANSION_4_WIDTH ; dimensions (y, x)
+	dw Mansion4Blocks, Mansion4TextPointers, Mansion4Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw Mansion4Object ; objects
--- /dev/null
+++ b/data/mapHeaders/mtmoon1.asm
@@ -1,0 +1,6 @@
+MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59)
+	db CAVERN ; tileset
+	db MT_MOON_1_HEIGHT, MT_MOON_1_WIDTH ; dimensions (y, x)
+	dw MtMoon1Blocks, MtMoon1TextPointers, MtMoon1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw MtMoon1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/mtmoon2.asm
@@ -1,0 +1,6 @@
+MtMoon2_h: ; 0x51a36 to 0x51a42 (12 bytes) (id=60)
+	db CAVERN ; tileset
+	db MT_MOON_2_HEIGHT, MT_MOON_2_WIDTH ; dimensions (y, x)
+	dw MtMoon2Blocks, MtMoon2TextPointers, MtMoon2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw MtMoon2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/mtmoon3.asm
@@ -1,0 +1,6 @@
+MtMoon3_h: ; 0x49cff to 0x49d0b (12 bytes) (id=61)
+	db CAVERN ; tileset
+	db MT_MOON_3_HEIGHT, MT_MOON_3_WIDTH ; dimensions (y, x)
+	dw MtMoon3Blocks, MtMoon3TextPointers, MtMoon3Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw MtMoon3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/mtmoonpokecenter.asm
@@ -1,0 +1,6 @@
+MtMoonPokecenter_h: ; 0x492c3 to 0x492cf (12 bytes) (bank=12) (id=68)
+	db POKECENTER ; tileset
+	db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x)
+	dw MtMoonPokecenterBlocks, MtMoonPokecenterTextPointers, MtMoonPokecenterScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw MtMoonPokecenterObject ; objects
--- /dev/null
+++ b/data/mapHeaders/museum1f.asm
@@ -1,0 +1,6 @@
+Museum1F_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52)
+	db MUSEUM ; tileset
+	db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x)
+	dw Museum1FBlocks, Museum1FTextPointers, Museum1FScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Museum1FObject ; objects
--- /dev/null
+++ b/data/mapHeaders/museum2f.asm
@@ -1,0 +1,6 @@
+Museum2F_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53)
+	db MUSEUM ; tileset
+	db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x)
+	dw Museum2FBlocks, Museum2FTextPointers, Museum2FScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Museum2FObject ; objects
--- /dev/null
+++ b/data/mapHeaders/namerater.asm
@@ -1,0 +1,6 @@
+NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229)
+	db HOUSE ; tileset
+	db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x)
+	dw NameRaterBlocks, NameRaterTextPointers, NameRaterScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw NameRaterObject ; objects
--- /dev/null
+++ b/data/mapHeaders/oakslab.asm
@@ -1,0 +1,6 @@
+OaksLab_h: ; 0x1cb02 to 0x1cb0e (12 bytes) (bank=7) (id=40)
+	db DOJO ; tileset
+	db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x)
+	dw OaksLabBlocks, OaksLabTextPointers, OaksLabScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw OaksLabObject ; objects
--- /dev/null
+++ b/data/mapHeaders/pallettown.asm
@@ -1,0 +1,8 @@
+PalletTown_h: ; 182a1 (6:42a1)
+	db OVERWORLD ; tileset
+	db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions
+	dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript
+	db NORTH | SOUTH ; connections
+	NORTH_MAP_CONNECTION ROUTE_1, ROUTE_1_WIDTH, ROUTE_1_HEIGHT, 0, 0, ROUTE_1_WIDTH, Route1Blocks
+	SOUTH_MAP_CONNECTION ROUTE_21, ROUTE_21_WIDTH, 0, 0, ROUTE_21_WIDTH, Route21Blocks, PALLET_TOWN_WIDTH, PALLET_TOWN_HEIGHT
+	dw PalletTownObject
--- /dev/null
+++ b/data/mapHeaders/pewtercity.asm
@@ -1,0 +1,10 @@
+PewterCity_h: ; 0x18554 to 0x18576 (34 bytes) (bank=6) (id=2)
+	db OVERWORLD ; tileset
+	db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x)
+	dw PewterCityBlocks, PewterCityTextPointers, PewterCityScript ; blocks, texts, scripts
+	db SOUTH | EAST ; connections
+	SOUTH_MAP_CONNECTION ROUTE_2, ROUTE_2_WIDTH, 5, 0, ROUTE_2_WIDTH, Route2Blocks, PEWTER_CITY_WIDTH, PEWTER_CITY_HEIGHT
+	EAST_MAP_CONNECTION ROUTE_3, ROUTE_3_WIDTH, 4, 0, ROUTE_3_HEIGHT, Route3Blocks, PEWTER_CITY_WIDTH
+	dw PewterCityObject ; objects
+
+	db $0
--- /dev/null
+++ b/data/mapHeaders/pewtergym.asm
@@ -1,0 +1,6 @@
+PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54)
+	db GYM ; tileset
+	db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x)
+	dw PewterGymBlocks, PewterGymTextPointers, PewterGymScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw PewterGymObject ; objects
--- /dev/null
+++ b/data/mapHeaders/pewterhouse1.asm
@@ -1,0 +1,6 @@
+PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55)
+	db HOUSE ; tileset
+	db PEWTER_HOUSE_1_HEIGHT, PEWTER_HOUSE_1_WIDTH ; dimensions (y, x)
+	dw PewterHouse1Blocks, PewterHouse1TextPointers, PewterHouse1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw PewterHouse1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/pewterhouse2.asm
@@ -1,0 +1,6 @@
+PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57)
+	db HOUSE ; tileset
+	db PEWTER_HOUSE_2_HEIGHT, PEWTER_HOUSE_2_WIDTH ; dimensions (y, x)
+	dw PewterHouse2Blocks, PewterHouse2TextPointers, PewterHouse2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw PewterHouse2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/pewtermart.asm
@@ -1,0 +1,6 @@
+PewterMart_h: ; 0x74ca1 to 0x74cad (12 bytes) (id=56)
+	db MART ; tileset
+	db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x)
+	dw PewterMartBlocks, PewterMartTextPointers, PewterMartScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw PewterMartObject ; objects
--- /dev/null
+++ b/data/mapHeaders/pewterpokecenter.asm
@@ -1,0 +1,6 @@
+PewterPokecenter_h: ; 0x5c57b to 0x5c587 (12 bytes) (id=58)
+	db POKECENTER ; tileset
+	db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x)
+	dw PewterPokecenterBlocks, PewterPokecenterTextPointers, PewterPokecenterScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw PewterPokecenterObject ; objects
--- /dev/null
+++ b/data/mapHeaders/pokemontower1.asm
@@ -1,0 +1,6 @@
+PokemonTower1_h: ; 0x60420 to 0x6042c (12 bytes) (id=142)
+	db CEMETERY ; tileset
+	db POKEMONTOWER_1_HEIGHT, POKEMONTOWER_1_WIDTH ; dimensions (y, x)
+	dw PokemonTower1Blocks, PokemonTower1TextPointers, PokemonTower1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw PokemonTower1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/pokemontower2.asm
@@ -1,0 +1,6 @@
+PokemonTower2_h: ; 0x604e6 to 0x604f2 (12 bytes) (id=143)
+	db CEMETERY ; tileset
+	db POKEMONTOWER_2_HEIGHT, POKEMONTOWER_2_WIDTH ; dimensions (y, x)
+	dw PokemonTower2Blocks, PokemonTower2TextPointers, PokemonTower2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw PokemonTower2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/pokemontower3.asm
@@ -1,0 +1,6 @@
+PokemonTower3_h: ; 0x606c0 to 0x606cc (12 bytes) (id=144)
+	db CEMETERY ; tileset
+	db POKEMONTOWER_3_HEIGHT, POKEMONTOWER_3_WIDTH ; dimensions (y, x)
+	dw PokemonTower3Blocks, PokemonTower3TextPointers, PokemonTower3Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw PokemonTower3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/pokemontower4.asm
@@ -1,0 +1,6 @@
+PokemonTower4_h: ; 0x607ea to 0x607f6 (12 bytes) (id=145)
+	db CEMETERY ; tileset
+	db POKEMONTOWER_4_HEIGHT, POKEMONTOWER_4_WIDTH ; dimensions (y, x)
+	dw PokemonTower4Blocks, PokemonTower4TextPointers, PokemonTower4Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw PokemonTower4Object ; objects
--- /dev/null
+++ b/data/mapHeaders/pokemontower5.asm
@@ -1,0 +1,6 @@
+PokemonTower5_h: ; 0x60926 to 0x60932 (12 bytes) (id=146)
+	db CEMETERY ; tileset
+	db POKEMONTOWER_5_HEIGHT, POKEMONTOWER_5_WIDTH ; dimensions (y, x)
+	dw PokemonTower5Blocks, PokemonTower5TextPointers, PokemonTower5Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw PokemonTower5Object ; objects
--- /dev/null
+++ b/data/mapHeaders/pokemontower6.asm
@@ -1,0 +1,6 @@
+PokemonTower6_h: ; 0x60ae3 to 0x60aef (12 bytes) (id=147)
+	db CEMETERY ; tileset
+	db POKEMONTOWER_6_HEIGHT, POKEMONTOWER_6_WIDTH ; dimensions (y, x)
+	dw PokemonTower6Blocks, PokemonTower6TextPointers, PokemonTower6Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw PokemonTower6Object ; objects
--- /dev/null
+++ b/data/mapHeaders/pokemontower7.asm
@@ -1,0 +1,6 @@
+PokemonTower7_h: ; 0x60cf9 to 0x60d05 (12 bytes) (id=148)
+	db CEMETERY ; tileset
+	db POKEMONTOWER_7_HEIGHT, POKEMONTOWER_7_WIDTH ; dimensions (y, x)
+	dw PokemonTower7Blocks, PokemonTower7TextPointers, PokemonTower7Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw PokemonTower7Object ; objects
--- /dev/null
+++ b/data/mapHeaders/powerplant.asm
@@ -1,0 +1,6 @@
+PowerPlant_h: ; 0x1e2ba to 0x1e2c6 (12 bytes) (bank=7) (id=83)
+	db FACILITY ; tileset
+	db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x)
+	dw PowerPlantBlocks, PowerPlantTextPointers, PowerPlantScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw PowerPlantObject ; objects
--- /dev/null
+++ b/data/mapHeaders/redshouse1f.asm
@@ -1,0 +1,6 @@
+RedsHouse1F_h: ; 4815c (12:415c)
+	db REDS_HOUSE_1 ; tileset
+	db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions
+	dw RedsHouse1FBlocks, RedsHouse1FTextPointers, RedsHouse1FScript
+	db 0 ; no connections
+	dw RedsHouse1FObject
--- /dev/null
+++ b/data/mapHeaders/redshouse2f.asm
@@ -1,0 +1,6 @@
+RedsHouse2F_h: ; 5c0a4 (17:40a4)
+	db REDS_HOUSE_2 ; tileset
+	db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions
+	dw RedsHouse2FBlocks, RedsHouse2FTextPointers, RedsHouse2FScript
+	db $00 ; no connections
+	dw RedsHouse2FObject
--- /dev/null
+++ b/data/mapHeaders/rockethideout1.asm
@@ -1,0 +1,6 @@
+RocketHideout1_h: ; 0x44bbe to 0x44bca (12 bytes) (bank=11) (id=199)
+	db FACILITY ; tileset
+	db ROCKET_HIDEOUT_1_HEIGHT, ROCKET_HIDEOUT_1_WIDTH ; dimensions (y, x)
+	dw RocketHideout1Blocks, RocketHideout1TextPointers, RocketHideout1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw RocketHideout1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/rockethideout2.asm
@@ -1,0 +1,6 @@
+RocketHideout2_h: ; 0x44e1b to 0x44e27 (12 bytes) (bank=11) (id=200)
+	db FACILITY ; tileset
+	db ROCKET_HIDEOUT_2_HEIGHT, ROCKET_HIDEOUT_2_WIDTH ; dimensions (y, x)
+	dw RocketHideout2Blocks, RocketHideout2TextPointers, RocketHideout2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw RocketHideout2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/rockethideout3.asm
@@ -1,0 +1,6 @@
+RocketHideout3_h: ; 0x45219 to 0x45225 (12 bytes) (bank=11) (id=201)
+	db FACILITY ; tileset
+	db ROCKET_HIDEOUT_3_HEIGHT, ROCKET_HIDEOUT_3_WIDTH ; dimensions (y, x)
+	dw RocketHideout3Blocks, RocketHideout3TextPointers, RocketHideout3Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw RocketHideout3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/rockethideout4.asm
@@ -1,0 +1,6 @@
+RocketHideout4_h: ; 0x45451 to 0x4545d (12 bytes) (bank=11) (id=202)
+	db FACILITY ; tileset
+	db ROCKET_HIDEOUT_4_HEIGHT, ROCKET_HIDEOUT_4_WIDTH ; dimensions (y, x)
+	dw RocketHideout4Blocks, RocketHideout4TextPointers, RocketHideout4Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw RocketHideout4Object ; objects
--- /dev/null
+++ b/data/mapHeaders/rockethideoutelevator.asm
@@ -1,0 +1,6 @@
+RocketHideoutElevator_h: ; 0x45704 to 0x45710 (12 bytes) (bank=11) (id=203)
+	db LOBBY ; tileset
+	db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x)
+	dw RocketHideoutElevatorBlocks, RocketHideoutElevatorTextPointers, RocketHideoutElevatorScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw RocketHideoutElevatorObject ; objects
--- /dev/null
+++ b/data/mapHeaders/rocktunnel1.asm
@@ -1,0 +1,6 @@
+RockTunnel1_h: ; 0x444d0 to 0x444dc (12 bytes) (bank=11) (id=82)
+	db CAVERN ; tileset
+	db ROCK_TUNNEL_1_HEIGHT, ROCK_TUNNEL_1_WIDTH ; dimensions (y, x)
+	dw RockTunnel1Blocks, RockTunnel1TextPointers, RockTunnel1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw RockTunnel1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/rocktunnel2.asm
@@ -1,0 +1,6 @@
+RockTunnel2_h: ; 0x45fdf to 0x45feb (12 bytes) (bank=11) (id=232)
+	db CAVERN ; tileset
+	db ROCK_TUNNEL_2_HEIGHT, ROCK_TUNNEL_2_WIDTH ; dimensions (y, x)
+	dw RockTunnel2Blocks, RockTunnel2TextPointers, RockTunnel2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw RockTunnel2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/rocktunnelpokecenter.asm
@@ -1,0 +1,6 @@
+RockTunnelPokecenter_h: ; 0x493ae to 0x493ba (12 bytes) (id=81)
+	db POKECENTER ; tileset
+	db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x)
+	dw RockTunnelPokecenterBlocks, RockTunnelPokecenterTextPointers, RockTunnelPokecenterScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw RockTunnelPokecenterObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route1.asm
@@ -1,0 +1,8 @@
+Route1_h: ; 0x1c0c3 to 0x1c0e5 (34 bytes) (bank=7) (id=12)
+	db OVERWORLD ; tileset
+	db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x)
+	dw Route1Blocks, Route1TextPointers, Route1Script ; blocks, texts, scripts
+	db NORTH | SOUTH ; connections
+	NORTH_MAP_CONNECTION VIRIDIAN_CITY, VIRIDIAN_CITY_WIDTH, VIRIDIAN_CITY_HEIGHT, -3, 2, VIRIDIAN_CITY_WIDTH - 4, ViridianCityBlocks
+	SOUTH_MAP_CONNECTION PALLET_TOWN, PALLET_TOWN_WIDTH, 0, 0, PALLET_TOWN_WIDTH, PalletTownBlocks, ROUTE_1_WIDTH, ROUTE_1_HEIGHT
+	dw Route1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route10.asm
@@ -1,0 +1,8 @@
+Route10_h: ; 0x582d4 to 0x582f6 (34 bytes) (id=21)
+	db OVERWORLD ; tileset
+	db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x)
+	dw Route10Blocks, Route10TextPointers, Route10Script ; blocks, texts, scripts
+	db SOUTH | WEST ; connections
+	SOUTH_MAP_CONNECTION LAVENDER_TOWN, LAVENDER_TOWN_WIDTH, 0, 0, LAVENDER_TOWN_WIDTH, LavenderTownBlocks, ROUTE_10_WIDTH, ROUTE_10_HEIGHT
+	WEST_MAP_CONNECTION ROUTE_9, ROUTE_9_WIDTH, 0, 0, ROUTE_9_HEIGHT, Route9Blocks, ROUTE_10_WIDTH
+	dw Route10Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route11.asm
@@ -1,0 +1,8 @@
+Route11_h: ; 0x584be to 0x584e0 (34 bytes) (id=22)
+	db OVERWORLD ; tileset
+	db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x)
+	dw Route11Blocks, Route11TextPointers, Route11Script ; blocks, texts, scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION VERMILION_CITY, VERMILION_CITY_WIDTH, -3, 1, VERMILION_CITY_HEIGHT - 3, VermilionCityBlocks, ROUTE_11_WIDTH
+	EAST_MAP_CONNECTION ROUTE_12, ROUTE_12_WIDTH, -3, 24, ROUTE_12_HEIGHT - 39, Route12Blocks, ROUTE_11_WIDTH
+	dw Route11Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route11gate.asm
@@ -1,0 +1,6 @@
+Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84)
+	db GATE ; tileset
+	db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x)
+	dw Route11GateBlocks, Route11GateTextPointers, Route11GateScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route11GateObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route11gateupstairs.asm
@@ -1,0 +1,6 @@
+Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86)
+	db GATE ; tileset
+	db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x)
+	dw Route11GateUpstairsBlocks, Route11GateUpstairsTextPointers, Route11GateUpstairsScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route11GateUpstairsObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route12.asm
@@ -1,0 +1,9 @@
+Route12_h: ; 0x5866d to 0x5869a (45 bytes) (id=23)
+	db OVERWORLD ; tileset
+	db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x)
+	dw Route12Blocks, Route12TextPointers, Route12Script ; blocks, texts, scripts
+	db NORTH | SOUTH | WEST ; connections
+	NORTH_MAP_CONNECTION LAVENDER_TOWN, LAVENDER_TOWN_WIDTH, LAVENDER_TOWN_HEIGHT, 0, 0, LAVENDER_TOWN_WIDTH, LavenderTownBlocks
+	SOUTH_MAP_CONNECTION ROUTE_13, ROUTE_13_WIDTH, -3, 17, ROUTE_13_WIDTH - 17, Route13Blocks, ROUTE_12_WIDTH, ROUTE_12_HEIGHT
+	WEST_MAP_CONNECTION ROUTE_11, ROUTE_11_WIDTH, 27, 0, ROUTE_11_HEIGHT, Route11Blocks, ROUTE_12_WIDTH
+	dw Route12Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route12gate.asm
@@ -1,0 +1,6 @@
+Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87)
+	db GATE ; tileset
+	db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x)
+	dw Route12GateBlocks, Route12GateTextPointers, Route12GateScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route12GateObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route12gateupstairs.asm
@@ -1,0 +1,6 @@
+Route12GateUpstairs_h: ; 0x49554 to 0x49560 (12 bytes) (id=195)
+	db GATE ; tileset
+	db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x)
+	dw Route12GateUpstairsBlocks, Route12GateUpstairsTextPointers, Route12GateUpstairsScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route12GateUpstairsObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route12house.asm
@@ -1,0 +1,6 @@
+Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189)
+	db HOUSE ; tileset
+	db ROUTE_12_HOUSE_HEIGHT, ROUTE_12_HOUSE_WIDTH ; dimensions (y, x)
+	dw Route12HouseBlocks, Route12HouseTextPointers, Route12HouseScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route12HouseObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route13.asm
@@ -1,0 +1,8 @@
+Route13_h: ; 0x5480c to 0x5482e (34 bytes) (id=24)
+	db OVERWORLD ; tileset
+	db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x)
+	dw Route13Blocks, Route13TextPointers, Route13Script ; blocks, texts, scripts
+	db NORTH | WEST ; connections
+	NORTH_MAP_CONNECTION ROUTE_12, ROUTE_12_WIDTH, ROUTE_12_HEIGHT, 20, 0, ROUTE_12_WIDTH, Route12Blocks
+	WEST_MAP_CONNECTION ROUTE_14, ROUTE_14_WIDTH, 0, 0, ROUTE_14_HEIGHT - 15, Route14Blocks, ROUTE_13_WIDTH
+	dw Route13Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route14.asm
@@ -1,0 +1,8 @@
+Route14_h: ; 0x54999 to 0x549bb (34 bytes) (id=25)
+	db OVERWORLD ; tileset
+	db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x)
+	dw Route14Blocks, Route14TextPointers, Route14Script ; blocks, texts, scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION ROUTE_15, ROUTE_15_WIDTH, 18, 0, ROUTE_15_HEIGHT, Route15Blocks, ROUTE_14_WIDTH
+	EAST_MAP_CONNECTION ROUTE_13, ROUTE_13_WIDTH, 0, 0, ROUTE_13_HEIGHT, Route13Blocks, ROUTE_14_WIDTH
+	dw Route14Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route15.asm
@@ -1,0 +1,8 @@
+Route15_h: ; 0x5892c to 0x5894e (34 bytes) (id=26)
+	db OVERWORLD ; tileset
+	db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x)
+	dw Route15Blocks, Route15TextPointers, Route15Script ; blocks, texts, scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION FUCHSIA_CITY, FUCHSIA_CITY_WIDTH, -3, 1, FUCHSIA_CITY_HEIGHT - 3, FuchsiaCityBlocks, ROUTE_15_WIDTH
+	EAST_MAP_CONNECTION ROUTE_14, ROUTE_14_WIDTH, -3, 15, ROUTE_14_HEIGHT - 15, Route14Blocks, ROUTE_15_WIDTH
+	dw Route15Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route15gate.asm
@@ -1,0 +1,6 @@
+Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184)
+	db GATE ; tileset
+	db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x)
+	dw Route15GateBlocks, Route15GateTextPointers, Route15GateScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route15GateObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route15gateupstairs.asm
@@ -1,0 +1,6 @@
+Route15GateUpstairs_h: ; 4963e (12:563e)
+	db GATE ; tileset
+	db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x)
+	dw Route15GateUpstairsBlocks, Route15GateUpstairsTextPointers, Route15GateUpstairsScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route15GateUpstairsObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route16.asm
@@ -1,0 +1,8 @@
+Route16_h: ; 0x58ada to 0x58afc (34 bytes) (id=27)
+	db OVERWORLD ; tileset
+	db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x)
+	dw Route16Blocks, Route16TextPointers, Route16Script ; blocks, texts, scripts
+	db SOUTH | EAST ; connections
+	SOUTH_MAP_CONNECTION ROUTE_17, ROUTE_17_WIDTH, 0, 0, ROUTE_17_WIDTH, Route17Blocks, ROUTE_16_WIDTH, ROUTE_16_HEIGHT
+	EAST_MAP_CONNECTION CELADON_CITY, CELADON_CITY_WIDTH, -3, 1, CELADON_CITY_HEIGHT - 3, CeladonCityBlocks, ROUTE_16_WIDTH
+	dw Route16Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route16gate.asm
@@ -1,0 +1,6 @@
+Route16Gate_h: ; 0x496b2 to 0x496be (12 bytes) (id=186)
+	db GATE ; tileset
+	db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x)
+	dw Route16GateBlocks, Route16GateTextPointers, Route16GateScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route16GateObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route16gateupstairs.asm
@@ -1,0 +1,6 @@
+Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187)
+	db GATE ; tileset
+	db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x)
+	dw Route16GateUpstairsBlocks, Route16GateUpstairsTextPointers, Route16GateUpstairsScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route16GateUpstairsObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route16house.asm
@@ -1,0 +1,6 @@
+Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188)
+	db HOUSE ; tileset
+	db ROUTE_16_HOUSE_HEIGHT, ROUTE_16_HOUSE_WIDTH ; dimensions (y, x)
+	dw Route16HouseBlocks, Route16HouseTextPointers, Route16HouseScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route16HouseObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route17.asm
@@ -1,0 +1,8 @@
+Route17_h: ; 0x54b20 to 0x54b42 (34 bytes) (id=28)
+	db OVERWORLD ; tileset
+	db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x)
+	dw Route17Blocks, Route17TextPointers, Route17Script ; blocks, texts, scripts
+	db NORTH | SOUTH ; connections
+	NORTH_MAP_CONNECTION ROUTE_16, ROUTE_16_WIDTH, ROUTE_16_HEIGHT, 0, 0, ROUTE_16_WIDTH - 7, Route16Blocks
+	SOUTH_MAP_CONNECTION ROUTE_18, ROUTE_18_WIDTH, 0, 0, ROUTE_18_WIDTH - 12, Route18Blocks, ROUTE_17_WIDTH, ROUTE_17_HEIGHT
+	dw Route17Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route18.asm
@@ -1,0 +1,8 @@
+Route18_h: ; 0x58c38 to 0x58c5a (34 bytes) (id=29)
+	db OVERWORLD ; tileset
+	db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x)
+	dw Route18Blocks, Route18TextPointers, Route18Script ; blocks, texts, scripts
+	db NORTH | EAST ; connections
+	NORTH_MAP_CONNECTION ROUTE_17, ROUTE_17_WIDTH, ROUTE_17_HEIGHT, 0, 0, ROUTE_17_WIDTH, Route17Blocks
+	EAST_MAP_CONNECTION FUCHSIA_CITY, FUCHSIA_CITY_WIDTH, -3, 1, FUCHSIA_CITY_HEIGHT - 3, FuchsiaCityBlocks, ROUTE_18_WIDTH
+	dw Route18Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route18gate.asm
@@ -1,0 +1,6 @@
+Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190)
+	db GATE ; tileset
+	db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x)
+	dw Route18GateBlocks, Route18GateTextPointers, Route18GateScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route18GateObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route18gateupstairs.asm
@@ -1,0 +1,6 @@
+Route18GateUpstairs_h: ; 0x49969 to 0x49975 (12 bytes) (id=191)
+	db GATE ; tileset
+	db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x)
+	dw Route18GateUpstairsBlocks, Route18GateUpstairsTextPointers, Route18GateUpstairsScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route18GateUpstairsObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route19.asm
@@ -1,0 +1,8 @@
+Route19_h: ; 0x54e78 to 0x54e9a (34 bytes) (id=30)
+	db OVERWORLD ; tileset
+	db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x)
+	dw Route19Blocks, Route19TextPointers, Route19Script ; blocks, texts, scripts
+	db NORTH | WEST ; connections
+	NORTH_MAP_CONNECTION FUCHSIA_CITY, FUCHSIA_CITY_WIDTH, FUCHSIA_CITY_HEIGHT, -3, 2, FUCHSIA_CITY_WIDTH - 4, FuchsiaCityBlocks
+	WEST_MAP_CONNECTION ROUTE_20, ROUTE_20_WIDTH, 18, 0, ROUTE_20_HEIGHT, Route20Blocks, ROUTE_19_WIDTH
+	dw Route19Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route2.asm
@@ -1,0 +1,8 @@
+Route2_h: ; 54000 (15:4000)
+	db 00 ; Tileset
+	db ROUTE_2_HEIGHT,ROUTE_2_WIDTH ;Height,Width blocks (1 block = 4x4 tiles)
+	dw Route2Blocks, Route2TextPointers, Route2Script
+	db NORTH | SOUTH ;Connection Byte
+	NORTH_MAP_CONNECTION PEWTER_CITY, PEWTER_CITY_WIDTH, PEWTER_CITY_HEIGHT, -3, 2, PEWTER_CITY_WIDTH - 4, PewterCityBlocks
+	SOUTH_MAP_CONNECTION VIRIDIAN_CITY, VIRIDIAN_CITY_WIDTH, -3, 2, VIRIDIAN_CITY_WIDTH - 4, ViridianCityBlocks, ROUTE_2_WIDTH, ROUTE_2_HEIGHT
+	dw Route2Object ;Object Data Pointer
--- /dev/null
+++ b/data/mapHeaders/route20.asm
@@ -1,0 +1,8 @@
+Route20_h: ; 0x500f1 to 0x50113 (34 bytes) (id=31)
+	db OVERWORLD ; tileset
+	db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x)
+	dw Route20Blocks, Route20TextPointers, Route20Script ; blocks, texts, scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION CINNABAR_ISLAND, CINNABAR_ISLAND_WIDTH, 0, 0, CINNABAR_ISLAND_HEIGHT, CinnabarIslandBlocks, ROUTE_20_WIDTH
+	EAST_MAP_CONNECTION ROUTE_19, ROUTE_19_WIDTH, -3, 15, ROUTE_19_HEIGHT - 15, Route19Blocks, ROUTE_20_WIDTH
+	dw Route20Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route21.asm
@@ -1,0 +1,8 @@
+Route21_h: ; 0x54fff to 0x55021 (34 bytes) (id=32)
+	db OVERWORLD ; tileset
+	db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x)
+	dw Route21Blocks, Route21TextPointers, Route21Script ; blocks, texts, scripts
+	db NORTH | SOUTH ; connections
+	NORTH_MAP_CONNECTION PALLET_TOWN, PALLET_TOWN_WIDTH, PALLET_TOWN_HEIGHT, 0, 0, PALLET_TOWN_WIDTH, PalletTownBlocks
+	SOUTH_MAP_CONNECTION CINNABAR_ISLAND, CINNABAR_ISLAND_WIDTH, 0, 0, CINNABAR_ISLAND_WIDTH, CinnabarIslandBlocks, ROUTE_21_WIDTH, ROUTE_21_HEIGHT
+	dw Route21Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route22.asm
@@ -1,0 +1,8 @@
+Route22_h: ; 0x50000 to 0x50022 (34 bytes) (id=33)
+	db OVERWORLD ; tileset
+	db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x)
+	dw Route22Blocks, Route22TextPointers, Route22Script ; blocks, texts, scripts
+	db NORTH | EAST ; connections
+	NORTH_MAP_CONNECTION ROUTE_23, ROUTE_23_WIDTH, ROUTE_23_HEIGHT, 0, 0, ROUTE_23_WIDTH, Route23Blocks
+	EAST_MAP_CONNECTION VIRIDIAN_CITY, VIRIDIAN_CITY_WIDTH, -3, 1, VIRIDIAN_CITY_HEIGHT - 3, ViridianCityBlocks, ROUTE_22_WIDTH
+	dw Route22Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route22gate.asm
@@ -1,0 +1,6 @@
+Route22Gate_h: ; 0x1e677 to 0x1e683 (12 bytes) (bank=7) (id=193)
+	db GATE ; tileset
+	db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x)
+	dw Route22GateBlocks, Route22GateTextPointers, Route22GateScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route22GateObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route23.asm
@@ -1,0 +1,8 @@
+Route23_h: ; 0x5033f to 0x50361 (34 bytes) (id=34)
+	db PLATEAU ; tileset
+	db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x)
+	dw Route23Blocks, Route23TextPointers, Route23Script ; blocks, texts, scripts
+	db NORTH | SOUTH ; connections
+	NORTH_MAP_CONNECTION INDIGO_PLATEAU, INDIGO_PLATEAU_WIDTH, INDIGO_PLATEAU_HEIGHT, 0, 0, INDIGO_PLATEAU_WIDTH, IndigoPlateauBlocks
+	SOUTH_MAP_CONNECTION ROUTE_22, ROUTE_22_WIDTH, 0, 0, ROUTE_22_WIDTH - 7, Route22Blocks, ROUTE_23_WIDTH, ROUTE_23_HEIGHT
+	dw Route23Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route24.asm
@@ -1,0 +1,8 @@
+Route24_h: ; 0x50682 to 0x506a4 (34 bytes) (id=35)
+	db OVERWORLD ; tileset
+	db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x)
+	dw Route24Blocks, Route24TextPointers, Route24Script ; blocks, texts, scripts
+	db SOUTH | EAST ; connections
+	SOUTH_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, -3, 2, CERULEAN_CITY_WIDTH - 4, CeruleanCityBlocks, ROUTE_24_WIDTH, ROUTE_24_HEIGHT
+	EAST_MAP_CONNECTION ROUTE_25, ROUTE_25_WIDTH, 0, 0, ROUTE_25_HEIGHT, Route25Blocks, ROUTE_24_WIDTH
+	dw Route24Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route25.asm
@@ -1,0 +1,7 @@
+Route25_h: ; 0x5079b to 0x507b2 (23 bytes) (id=36)
+	db OVERWORLD ; tileset
+	db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x)
+	dw Route25Blocks, Route25TextPointers, Route25Script ; blocks, texts, scripts
+	db WEST ; connections
+	WEST_MAP_CONNECTION ROUTE_24, ROUTE_24_WIDTH, 0, 0, ROUTE_24_HEIGHT - 6, Route24Blocks, ROUTE_25_WIDTH
+	dw Route25Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route2gate.asm
@@ -1,0 +1,6 @@
+Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49)
+	db GATE ; tileset
+	db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x)
+	dw Route2GateBlocks, Route2GateTextPointers, Route2GateScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route2GateObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route2house.asm
@@ -1,0 +1,6 @@
+Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48)
+	db HOUSE ; tileset
+	db ROUTE_2_HOUSE_HEIGHT, ROUTE_2_HOUSE_WIDTH ; dimensions (y, x)
+	dw Route2HouseBlocks, Route2HouseTextPointers, Route2HouseScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route2HouseObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route3.asm
@@ -1,0 +1,8 @@
+Route3_h: ; 0x541e6 to 0x54208 (34 bytes) (id=14)
+	db OVERWORLD ; tileset
+	db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x)
+	dw Route3Blocks, Route3TextPointers, Route3Script ; blocks, texts, scripts
+	db NORTH | WEST ; connections
+	NORTH_MAP_CONNECTION ROUTE_4, ROUTE_4_WIDTH, ROUTE_4_HEIGHT, 25, 0, ROUTE_4_WIDTH - 32, Route4Blocks
+	WEST_MAP_CONNECTION PEWTER_CITY, PEWTER_CITY_WIDTH, -3, 1, PEWTER_CITY_HEIGHT - 3, PewterCityBlocks, ROUTE_3_WIDTH
+	dw Route3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route4.asm
@@ -1,0 +1,8 @@
+Route4_h: ; 0x54390 to 0x543b2 (34 bytes) (id=15)
+	db OVERWORLD ; tileset
+	db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x)
+	dw Route4Blocks, Route4TextPointers, Route4Script; blocks, texts, scripts
+	db SOUTH | EAST ; connections
+	SOUTH_MAP_CONNECTION ROUTE_3, ROUTE_3_WIDTH, -3, 22, ROUTE_3_WIDTH - 22, Route3Blocks, ROUTE_4_WIDTH, ROUTE_4_HEIGHT
+	EAST_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, -3, 1, CERULEAN_CITY_HEIGHT - 3, CeruleanCityBlocks, ROUTE_4_WIDTH
+	dw Route4Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route5.asm
@@ -1,0 +1,8 @@
+Route5_h: ; 0x54581 to 0x545a3 (34 bytes) (id=16)
+	db OVERWORLD ; tileset
+	db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x)
+	dw Route5Blocks, Route5TextPointers, Route5Script ; blocks, texts, scripts
+	db NORTH | SOUTH ; connections
+	NORTH_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, CERULEAN_CITY_HEIGHT, -3, 2, CERULEAN_CITY_WIDTH - 4, CeruleanCityBlocks
+	SOUTH_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, -3, 2, SAFFRON_CITY_WIDTH - 4, SaffronCityBlocks, ROUTE_5_WIDTH, ROUTE_5_HEIGHT
+	dw Route5Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route5gate.asm
@@ -1,0 +1,6 @@
+Route5Gate_h: ; 0x1df27 to 0x1df33 (12 bytes) (bank=7) (id=70)
+	db GATE ; tileset
+	db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x)
+	dw Route5GateBlocks, Route5GateTextPointers, Route5GateScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route5GateObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route6.asm
@@ -1,0 +1,8 @@
+Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17)
+	db OVERWORLD ; tileset
+	db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x)
+	dw Route6Blocks, Route6TextPointers, Route6Script ; blocks, texts, scripts
+	db NORTH | SOUTH ; connections
+	NORTH_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, SAFFRON_CITY_HEIGHT, -3, 2, SAFFRON_CITY_WIDTH - 4, SaffronCityBlocks
+	SOUTH_MAP_CONNECTION VERMILION_CITY, VERMILION_CITY_WIDTH, -3, 2, VERMILION_CITY_WIDTH - 4, VermilionCityBlocks, ROUTE_6_WIDTH, ROUTE_6_HEIGHT
+	dw Route6Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route6gate.asm
@@ -1,0 +1,6 @@
+Route6Gate_h: ; 0x1e031 to 0x1e03d (12 bytes) (bank=7) (id=73)
+	db GATE ; tileset
+	db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x)
+	dw Route6GateBlocks, Route6GateTextPointers, Route6GateScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route6GateObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route7.asm
@@ -1,0 +1,8 @@
+Route7_h: ; 0x48000 to 0x48022 (34 bytes) (bank=12) (id=18)
+	db OVERWORLD ; tileset
+	db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x)
+	dw Route7Blocks, Route7TextPointers, Route7Script ; blocks, texts, scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION CELADON_CITY, CELADON_CITY_WIDTH, -3, 1, CELADON_CITY_HEIGHT - 3, CeladonCityBlocks, ROUTE_7_WIDTH
+	EAST_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, -3, 1, SAFFRON_CITY_HEIGHT - 3, SaffronCityBlocks, ROUTE_7_WIDTH
+	dw Route7Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route7gate.asm
@@ -1,0 +1,6 @@
+Route7Gate_h: ; 0x1e0f4 to 0x1e100 (12 bytes) (bank=7) (id=76)
+	db GATE ; tileset
+	db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x)
+	dw Route7GateBlocks, Route7GateTextPointers, Route7GateScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route7GateObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route8.asm
@@ -1,0 +1,8 @@
+Route8_h: ; 0x5812d to 0x5814f (34 bytes) (id=19)
+	db OVERWORLD ; tileset
+	db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x)
+	dw Route8Blocks, Route8TextPointers, Route8Script ; blocks, texts, scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, -3, 1, SAFFRON_CITY_HEIGHT - 3, SaffronCityBlocks, ROUTE_8_WIDTH
+	EAST_MAP_CONNECTION LAVENDER_TOWN, LAVENDER_TOWN_WIDTH, 0, 0, LAVENDER_TOWN_HEIGHT, LavenderTownBlocks, ROUTE_8_WIDTH
+	dw Route8Object ; objects
--- /dev/null
+++ b/data/mapHeaders/route8gate.asm
@@ -1,0 +1,6 @@
+Route8Gate_h: ; 0x1e1bb to 0x1e1c7 (12 bytes) (bank=7) (id=79)
+	db GATE ; tileset
+	db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x)
+	dw Route8GateBlocks, Route8GateTextPointers, Route8GateScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw Route8GateObject ; objects
--- /dev/null
+++ b/data/mapHeaders/route9.asm
@@ -1,0 +1,8 @@
+Route9_h: ; 0x54686 to 0x546a8 (34 bytes) (id=20)
+	db OVERWORLD ; tileset
+	db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x)
+	dw Route9Blocks, Route9TextPointers, Route9Script ; blocks, texts, scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, -3, 1, CERULEAN_CITY_HEIGHT - 3, CeruleanCityBlocks, ROUTE_9_WIDTH
+	EAST_MAP_CONNECTION ROUTE_10, ROUTE_10_WIDTH, 0, 0, ROUTE_10_HEIGHT - 24, Route10Blocks, ROUTE_9_WIDTH
+	dw Route9Object ; objects
--- /dev/null
+++ b/data/mapHeaders/safarizonecenter.asm
@@ -1,0 +1,6 @@
+SafariZoneCenter_h: ; 0x45ba6 to 0x45bb2 (12 bytes) (bank=11) (id=220)
+	db FOREST ; tileset
+	db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x)
+	dw SafariZoneCenterBlocks, SafariZoneCenterTextPointers, SafariZoneCenterScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw SafariZoneCenterObject ; objects
--- /dev/null
+++ b/data/mapHeaders/safarizoneeast.asm
@@ -1,0 +1,6 @@
+SafariZoneEast_h: ; 0x4585f to 0x4586b (12 bytes) (bank=11) (id=217)
+	db FOREST ; tileset
+	db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x)
+	dw SafariZoneEastBlocks, SafariZoneEastTextPointers, SafariZoneEastScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw SafariZoneEastObject ; objects
--- /dev/null
+++ b/data/mapHeaders/safarizoneentrance.asm
@@ -1,0 +1,6 @@
+SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156)
+	db GATE ; tileset
+	db SAFARI_ZONE_ENTRANCE_HEIGHT, SAFARI_ZONE_ENTRANCE_WIDTH ; dimensions (y, x)
+	dw SafariZoneEntranceBlocks, SafariZoneEntranceTextPointers, SafariZoneEntranceScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw SafariZoneEntranceObject ; objects
--- /dev/null
+++ b/data/mapHeaders/safarizonenorth.asm
@@ -1,0 +1,6 @@
+SafariZoneNorth_h: ; 0x4599f to 0x459ab (12 bytes) (bank=11) (id=218)
+	db FOREST ; tileset
+	db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x)
+	dw SafariZoneNorthBlocks, SafariZoneNorthTextPointers, SafariZoneNorthScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw SafariZoneNorthObject ; objects
--- /dev/null
+++ b/data/mapHeaders/safarizoneresthouse1.asm
@@ -1,0 +1,6 @@
+SafariZoneRestHouse1_h: ; 0x45ce1 to 0x45ced (12 bytes) (bank=11) (id=221)
+	db GATE ; tileset
+	db SAFARI_ZONE_REST_HOUSE_1_HEIGHT, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; dimensions (y, x)
+	dw SafariZoneRestHouse1Blocks, SafariZoneRestHouse1TextPointers, SafariZoneRestHouse1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SafariZoneRestHouse1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/safarizoneresthouse2.asm
@@ -1,0 +1,6 @@
+SafariZoneRestHouse2_h: ; 0x45d1e to 0x45d2a (12 bytes) (bank=11) (id=223)
+	db GATE ; tileset
+	db SAFARI_ZONE_REST_HOUSE_2_HEIGHT, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; dimensions (y, x)
+	dw SafariZoneRestHouse2Blocks, SafariZoneRestHouse2TextPointers, SafariZoneRestHouse2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SafariZoneRestHouse2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/safarizoneresthouse3.asm
@@ -1,0 +1,6 @@
+SafariZoneRestHouse3_h: ; 0x45d69 to 0x45d75 (12 bytes) (bank=11) (id=224)
+	db GATE ; tileset
+	db SAFARI_ZONE_REST_HOUSE_3_HEIGHT, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; dimensions (y, x)
+	dw SafariZoneRestHouse3Blocks, SafariZoneRestHouse3TextPointers, SafariZoneRestHouse3Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SafariZoneRestHouse3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/safarizoneresthouse4.asm
@@ -1,0 +1,6 @@
+SafariZoneRestHouse4_h: ; 0x45db4 to 0x45dc0 (12 bytes) (bank=11) (id=225)
+	db GATE ; tileset
+	db SAFARI_ZONE_REST_HOUSE_4_HEIGHT, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; dimensions (y, x)
+	dw SafariZoneRestHouse4Blocks, SafariZoneRestHouse4TextPointers, SafariZoneRestHouse4Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SafariZoneRestHouse4Object ; objects
--- /dev/null
+++ b/data/mapHeaders/safarizonesecrethouse.asm
@@ -1,0 +1,6 @@
+SafariZoneSecretHouse_h: ; 0x4a30b to 0x4a317 (12 bytes) (id=222)
+	db LAB ; tileset
+	db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x)
+	dw SafariZoneSecretHouseBlocks, SafariZoneSecretHouseTextPointers, SafariZoneSecretHouseScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw SafariZoneSecretHouseObject ; objects
--- /dev/null
+++ b/data/mapHeaders/safarizonewest.asm
@@ -1,0 +1,6 @@
+SafariZoneWest_h: ; 0x4a1a9 to 0x4a1b5 (12 bytes) (id=219)
+	db FOREST ; tileset
+	db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x)
+	dw SafariZoneWestBlocks, SafariZoneWestTextPointers, SafariZoneWestScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw SafariZoneWestObject ; objects
--- /dev/null
+++ b/data/mapHeaders/saffroncity.asm
@@ -1,0 +1,10 @@
+SaffronCity_h: ; 0x509a4 to 0x509dc (56 bytes) (id=10)
+	db OVERWORLD ; tileset
+	db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x)
+	dw SaffronCityBlocks, SaffronCityTextPointers, SaffronCityScript ; blocks, texts, scripts
+	db NORTH | SOUTH | WEST | EAST ; connections
+	NORTH_MAP_CONNECTION ROUTE_5, ROUTE_5_WIDTH, ROUTE_5_HEIGHT, 5, 0, ROUTE_5_WIDTH, Route5Blocks
+	SOUTH_MAP_CONNECTION ROUTE_6, ROUTE_6_WIDTH, 5, 0, ROUTE_6_WIDTH, Route6Blocks, SAFFRON_CITY_WIDTH, SAFFRON_CITY_HEIGHT
+	WEST_MAP_CONNECTION ROUTE_7, ROUTE_7_WIDTH, 4, 0, ROUTE_7_HEIGHT, Route7Blocks, SAFFRON_CITY_WIDTH
+	EAST_MAP_CONNECTION ROUTE_8, ROUTE_8_WIDTH, 4, 0, ROUTE_8_HEIGHT, Route8Blocks, SAFFRON_CITY_WIDTH
+	dw SaffronCityObject ; objects
--- /dev/null
+++ b/data/mapHeaders/saffrongym.asm
@@ -1,0 +1,6 @@
+SaffronGym_h: ; 0x5d001 to 0x5d00d (12 bytes) (id=178)
+	db FACILITY ; tileset
+	db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x)
+	dw SaffronGymBlocks, SaffronGymTextPointers, SaffronGymScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw SaffronGymObject ; objects
--- /dev/null
+++ b/data/mapHeaders/saffronhouse1.asm
@@ -1,0 +1,6 @@
+SaffronHouse1_h: ; 0x1ddd1 to 0x1dddd (12 bytes) (bank=7) (id=179)
+	db HOUSE ; tileset
+	db SAFFRON_HOUSE_1_HEIGHT, SAFFRON_HOUSE_1_WIDTH ; dimensions (y, x)
+	dw SaffronHouse1Blocks, SaffronHouse1TextPointers, SaffronHouse1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SaffronHouse1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/saffronhouse2.asm
@@ -1,0 +1,6 @@
+SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183)
+	db HOUSE ; tileset
+	db SAFFRON_HOUSE_2_HEIGHT, SAFFRON_HOUSE_2_WIDTH ; dimensions (y, x)
+	dw SaffronHouse2Blocks, SaffronHouse2TextPointers, SaffronHouse2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SaffronHouse2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/saffronmart.asm
@@ -1,0 +1,6 @@
+SaffronMart_h: ; 0x5d3fd to 0x5d409 (12 bytes) (id=180)
+	db MART ; tileset
+	db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x)
+	dw SaffronMartBlocks, SaffronMartTextPointers, SaffronMartScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw SaffronMartObject ; objects
--- /dev/null
+++ b/data/mapHeaders/saffronpokecenter.asm
@@ -1,0 +1,6 @@
+SaffronPokecenter_h: ; 0x5d529 to 0x5d535 (12 bytes) (id=182)
+	db POKECENTER ; tileset
+	db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x)
+	dw SaffronPokecenterBlocks, SaffronPokecenterTextPointers, SaffronPokecenterScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw SaffronPokecenterObject ; objects
--- /dev/null
+++ b/data/mapHeaders/school.asm
@@ -1,0 +1,6 @@
+School_h: ; 0x1d540 to 0x1d54c (12 bytes) (bank=7) (id=43)
+	db HOUSE ; tileset
+	db VIRIDIAN_SCHOOL_HEIGHT, VIRIDIAN_SCHOOL_WIDTH ; dimensions (y, x)
+	dw SchoolBlocks, SchoolTextPointers, SchoolScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw SchoolObject ; objects
--- /dev/null
+++ b/data/mapHeaders/seafoamislands1.asm
@@ -1,0 +1,6 @@
+SeafoamIslands1_h: ; 0x447dd to 0x447e9 (12 bytes) (bank=11) (id=192)
+	db CAVERN ; tileset
+	db SEAFOAM_ISLANDS_1_HEIGHT, SEAFOAM_ISLANDS_1_WIDTH ; dimensions (y, x)
+	dw SeafoamIslands1Blocks, SeafoamIslands1TextPointers, SeafoamIslands1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SeafoamIslands1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/seafoamislands2.asm
@@ -1,0 +1,6 @@
+SeafoamIslands2_h: ; 0x46309 to 0x46315 (12 bytes) (bank=11) (id=159)
+	db CAVERN ; tileset
+	db SEAFOAM_ISLANDS_2_HEIGHT, SEAFOAM_ISLANDS_2_WIDTH ; dimensions (y, x)
+	dw SeafoamIslands2Blocks, SeafoamIslands2TextPointers, SeafoamIslands2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SeafoamIslands2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/seafoamislands3.asm
@@ -1,0 +1,6 @@
+SeafoamIslands3_h: ; 0x46445 to 0x46451 (12 bytes) (bank=11) (id=160)
+	db CAVERN ; tileset
+	db SEAFOAM_ISLANDS_3_HEIGHT, SEAFOAM_ISLANDS_3_WIDTH ; dimensions (y, x)
+	dw SeafoamIslands3Blocks, SeafoamIslands3TextPointers, SeafoamIslands3Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SeafoamIslands3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/seafoamislands4.asm
@@ -1,0 +1,6 @@
+SeafoamIslands4_h: ; 0x46581 to 0x4658d (12 bytes) (bank=11) (id=161)
+	db CAVERN ; tileset
+	db SEAFOAM_ISLANDS_4_HEIGHT, SEAFOAM_ISLANDS_4_WIDTH ; dimensions (y, x)
+	dw SeafoamIslands4Blocks, SeafoamIslands4TextPointers, SeafoamIslands4Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SeafoamIslands4Object ; objects
--- /dev/null
+++ b/data/mapHeaders/seafoamislands5.asm
@@ -1,0 +1,6 @@
+SeafoamIslands5_h: ; 0x4678d to 0x46799 (12 bytes) (bank=11) (id=162)
+	db CAVERN ; tileset
+	db SEAFOAM_ISLANDS_5_HEIGHT, SEAFOAM_ISLANDS_5_WIDTH ; dimensions (y, x)
+	dw SeafoamIslands5Blocks, SeafoamIslands5TextPointers, SeafoamIslands5Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SeafoamIslands5Object ; objects
--- /dev/null
+++ b/data/mapHeaders/silphco1.asm
@@ -1,0 +1,6 @@
+SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181)
+	db FACILITY ; tileset
+	db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x)
+	dw SilphCo1Blocks, SilphCo1TextPointers, SilphCo1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SilphCo1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/silphco10.asm
@@ -1,0 +1,6 @@
+SilphCo10_h: ; 0x5a12d to 0x5a139 (12 bytes) (id=234)
+	db FACILITY ; tileset
+	db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x)
+	dw SilphCo10Blocks, SilphCo10TextPointers, SilphCo10Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SilphCo10Object ; objects
--- /dev/null
+++ b/data/mapHeaders/silphco11.asm
@@ -1,0 +1,6 @@
+SilphCo11_h: ; 0x620ee to 0x620fa (12 bytes) (id=235)
+	db INTERIOR ; tileset
+	db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x)
+	dw SilphCo11Blocks, SilphCo11TextPointers, SilphCo11Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SilphCo11Object ; objects
--- /dev/null
+++ b/data/mapHeaders/silphco2.asm
@@ -1,0 +1,6 @@
+SilphCo2_h: ; 0x59ce5 to 0x59cf1 (12 bytes) (id=207)
+	db FACILITY ; tileset
+	db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x)
+	dw SilphCo2Blocks, SilphCo2TextPointers, SilphCo2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SilphCo2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/silphco3.asm
@@ -1,0 +1,6 @@
+SilphCo3_h: ; 0x59f4f to 0x59f5b (12 bytes) (id=208)
+	db FACILITY ; tileset
+	db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x)
+	dw SilphCo3Blocks, SilphCo3TextPointers, SilphCo3Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SilphCo3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/silphco4.asm
@@ -1,0 +1,6 @@
+SilphCo4_h: ; 0x19cff to 0x19d0b (12 bytes) (bank=6) (id=209)
+	db FACILITY ; tileset
+	db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x)
+	dw SilphCo4Blocks, SilphCo4TextPointers, SilphCo4Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SilphCo4Object ; objects
--- /dev/null
+++ b/data/mapHeaders/silphco5.asm
@@ -1,0 +1,6 @@
+SilphCo5_h: ; 0x19f2b to 0x19f37 (12 bytes) (bank=6) (id=210)
+	db FACILITY ; tileset
+	db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x)
+	dw SilphCo5Blocks, SilphCo5TextPointers, SilphCo5Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SilphCo5Object ; objects
--- /dev/null
+++ b/data/mapHeaders/silphco6.asm
@@ -1,0 +1,6 @@
+SilphCo6_h: ; 0x1a19d to 0x1a1a9 (12 bytes) (bank=6) (id=211)
+	db FACILITY ; tileset
+	db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x)
+	dw SilphCo6Blocks, SilphCo6TextPointers, SilphCo6Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SilphCo6Object ; objects
--- /dev/null
+++ b/data/mapHeaders/silphco7.asm
@@ -1,0 +1,6 @@
+SilphCo7_h: ; 0x51b55 to 0x51b61 (12 bytes) (id=212)
+	db FACILITY ; tileset
+	db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x)
+	dw SilphCo7Blocks, SilphCo7TextPointers, SilphCo7Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SilphCo7Object ; objects
--- /dev/null
+++ b/data/mapHeaders/silphco8.asm
@@ -1,0 +1,6 @@
+SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213)
+	db FACILITY ; tileset
+	db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x)
+	dw SilphCo8Blocks, SilphCo8TextPointers, SilphCo8Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SilphCo8Object ; objects
--- /dev/null
+++ b/data/mapHeaders/silphco9.asm
@@ -1,0 +1,6 @@
+SilphCo9_h: ; 0x5d7af to 0x5d7bb (12 bytes) (id=233)
+	db FACILITY ; tileset
+	db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x)
+	dw SilphCo9Blocks, SilphCo9TextPointers, SilphCo9Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SilphCo9Object ; objects
--- /dev/null
+++ b/data/mapHeaders/silphcoelevator.asm
@@ -1,0 +1,6 @@
+SilphCoElevator_h: ; 0x457b4 to 0x457c0 (12 bytes) (bank=11) (id=236)
+	db LOBBY ; tileset
+	db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x)
+	dw SilphCoElevatorBlocks, SilphCoElevatorTextPointers, SilphCoElevatorScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw SilphCoElevatorObject ; objects
--- /dev/null
+++ b/data/mapHeaders/ssanne1.asm
@@ -1,0 +1,6 @@
+SSAnne1_h: ; 0x61259 to 0x61265 (12 bytes) (id=95)
+	db SHIP ; tileset
+	db SS_ANNE_1_HEIGHT, SS_ANNE_1_WIDTH ; dimensions (y, x)
+	dw SSAnne1Blocks, SSAnne1TextPointers, SSAnne1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SSAnne1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/ssanne10.asm
@@ -1,0 +1,6 @@
+SSAnne10_h: ; 0x61d49 to 0x61d55 (12 bytes) (id=104)
+	db SHIP ; tileset
+	db SS_ANNE_10_HEIGHT, SS_ANNE_10_WIDTH ; dimensions (y, x)
+	dw SSAnne10Blocks, SSAnne10TextPointers, SSAnne10Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SSAnne10Object ; objects
--- /dev/null
+++ b/data/mapHeaders/ssanne2.asm
@@ -1,0 +1,6 @@
+SSAnne2_h: ; 0x61393 to 0x6139f (12 bytes) (id=96)
+	db SHIP ; tileset
+	db SS_ANNE_2_HEIGHT, SS_ANNE_2_WIDTH ; dimensions (y, x)
+	dw SSAnne2Blocks, SSAnne2TextPointers, SSAnne2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SSAnne2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/ssanne3.asm
@@ -1,0 +1,6 @@
+SSAnne3_h: ; 0x44926 to 0x44932 (12 bytes) (bank=11) (id=97)
+	db SHIP ; tileset
+	db SS_ANNE_3_HEIGHT, SS_ANNE_3_WIDTH ; dimensions (y, x)
+	dw SSAnne3Blocks, SSAnne3TextPointers, SSAnne3Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SSAnne3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/ssanne4.asm
@@ -1,0 +1,6 @@
+SSAnne4_h: ; 0x61622 to 0x6162e (12 bytes) (id=98)
+	db SHIP ; tileset
+	db SS_ANNE_4_HEIGHT, SS_ANNE_4_WIDTH ; dimensions (y, x)
+	dw SSAnne4Blocks, SSAnne4TextPointers, SSAnne4Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SSAnne4Object ; objects
--- /dev/null
+++ b/data/mapHeaders/ssanne5.asm
@@ -1,0 +1,6 @@
+SSAnne5_h: ; 0x616a2 to 0x616ae (12 bytes) (id=99)
+	db SHIP ; tileset
+	db SS_ANNE_5_HEIGHT, SS_ANNE_5_WIDTH ; dimensions (y, x)
+	dw SSAnne5Blocks, SSAnne5TextPointers, SSAnne5Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SSAnne5Object ; objects
--- /dev/null
+++ b/data/mapHeaders/ssanne6.asm
@@ -1,0 +1,6 @@
+SSAnne6_h: ; 0x617a7 to 0x617b3 (12 bytes) (id=100)
+	db SHIP ; tileset
+	db SS_ANNE_6_HEIGHT, SS_ANNE_6_WIDTH ; dimensions (y, x)
+	dw SSAnne6Blocks, SSAnne6TextPointers, SSAnne6Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SSAnne6Object ; objects
--- /dev/null
+++ b/data/mapHeaders/ssanne7.asm
@@ -1,0 +1,6 @@
+SSAnne7_h: ; 0x61889 to 0x61895 (12 bytes) (id=101)
+	db SHIP ; tileset
+	db SS_ANNE_7_HEIGHT, SS_ANNE_7_WIDTH ; dimensions (y, x)
+	dw SSAnne7Blocks, SSAnne7TextPointers, SSAnne7Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SSAnne7Object ; objects
--- /dev/null
+++ b/data/mapHeaders/ssanne8.asm
@@ -1,0 +1,6 @@
+SSAnne8_h: ; 0x6196a to 0x61976 (12 bytes) (id=102)
+	db SHIP ; tileset
+	db SS_ANNE_8_HEIGHT, SS_ANNE_8_WIDTH ; dimensions (y, x)
+	dw SSAnne8Blocks, SSAnne8TextPointers, SSAnne8Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SSAnne8Object ; objects
--- /dev/null
+++ b/data/mapHeaders/ssanne9.asm
@@ -1,0 +1,6 @@
+SSAnne9_h: ; 0x61b3f to 0x61b4b (12 bytes) (id=103)
+	db SHIP ; tileset
+	db SS_ANNE_9_HEIGHT, SS_ANNE_9_WIDTH ; dimensions (y, x)
+	dw SSAnne9Blocks, SSAnne9TextPointers, SSAnne9Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw SSAnne9Object ; objects
--- /dev/null
+++ b/data/mapHeaders/tradecenterm.asm
@@ -1,0 +1,6 @@
+TradeCenterM_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240)
+	db CLUB ; tileset
+	db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x)
+	dw TradeCenterMBlocks, TradeCenterMTextPointers, TradeCenterMScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw TradeCenterMObject ; objects
--- /dev/null
+++ b/data/mapHeaders/undergroundpathentranceroute5.asm
@@ -1,0 +1,6 @@
+UndergroundPathEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71)
+	db GATE ; tileset
+	db PATH_ENTRANCE_ROUTE_5_HEIGHT, PATH_ENTRANCE_ROUTE_5_WIDTH ; dimensions (y, x)
+	dw UndergroundPathEntranceRoute5Blocks, UndergroundPathEntranceRoute5TextPointers, UndergroundPathEntranceRoute5Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw UndergroundPathEntranceRoute5Object ; objects
--- /dev/null
+++ b/data/mapHeaders/undergroundpathentranceroute6.asm
@@ -1,0 +1,6 @@
+UndergroundPathEntranceRoute6_h: ; 0x5d6e3 to 0x5d6ef (12 bytes) (id=74)
+	db GATE ; tileset
+	db PATH_ENTRANCE_ROUTE_6_HEIGHT, PATH_ENTRANCE_ROUTE_6_WIDTH ; dimensions (y, x)
+	dw UndergroundPathEntranceRoute6Blocks, UndergroundPathEntranceRoute6TextPointers, UndergroundPathEntranceRoute6Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw UndergroundPathEntranceRoute6Object ; objects
--- /dev/null
+++ b/data/mapHeaders/undergroundpathentranceroute7.asm
@@ -1,0 +1,6 @@
+UndergroundPathEntranceRoute7_h: ; 0x5d720 to 0x5d72c (12 bytes) (id=77)
+	db GATE ; tileset
+	db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x)
+	dw UndergroundPathEntranceRoute7Blocks, UndergroundPathEntranceRoute7TextPointers, UndergroundPathEntranceRoute7Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw UndergroundPathEntranceRoute7Object ; objects
--- /dev/null
+++ b/data/mapHeaders/undergroundpathentranceroute7copy.asm
@@ -1,0 +1,6 @@
+UndergroundPathEntranceRoute7Copy_h: ; 5d75d (17:575d)
+	db GATE ; tileset
+	db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x)
+	dw UndergroundPathEntranceRoute7CopyBlocks, UndergroundPathEntranceRoute7CopyTextPointers, UndergroundPathEntranceRoute7CopyScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw UndergroundPathEntranceRoute7CopyObject ; objects
--- /dev/null
+++ b/data/mapHeaders/undergroundpathentranceroute8.asm
@@ -1,0 +1,6 @@
+UndergroundPathEntranceRoute8_h: ; 0x1e27d to 0x1e289 (12 bytes) (bank=7) (id=80)
+	db GATE ; tileset
+	db PATH_ENTRANCE_ROUTE_8_HEIGHT, PATH_ENTRANCE_ROUTE_8_WIDTH ; dimensions (y, x)
+	dw UndergroundPathEntranceRoute8Blocks, UndergroundPathEntranceRoute8TextPointers, UndergroundPathEntranceRoute8Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw UndergroundPathEntranceRoute8Object ; objects
--- /dev/null
+++ b/data/mapHeaders/undergroundpathns.asm
@@ -1,0 +1,6 @@
+UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119)
+	db UNDERGROUND ; tileset
+	db UNDERGROUND_PATH_NS_HEIGHT, UNDERGROUND_PATH_NS_WIDTH ; dimensions (y, x)
+	dw UndergroundPathNSBlocks, UndergroundPathNSTextPointers, UndergroundPathNSScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw UndergroundPathNSObject ; objects
--- /dev/null
+++ b/data/mapHeaders/undergroundpathwe.asm
@@ -1,0 +1,6 @@
+UndergroundPathWE_h: ; 0x61f3e to 0x61f4a (12 bytes) (id=121)
+	db UNDERGROUND ; tileset
+	db UNDERGROUND_PATH_WE_HEIGHT, UNDERGROUND_PATH_WE_WIDTH ; dimensions (y, x)
+	dw UndergroundPathWEBlocks, UndergroundPathWETextPointers, UndergroundPathWEScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw UndergroundPathWEObject ; objects
--- /dev/null
+++ b/data/mapHeaders/unknowndungeon1.asm
@@ -1,0 +1,6 @@
+UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228)
+	db CAVERN ; tileset
+	db UNKNOWN_DUNGEON_1_HEIGHT, UNKNOWN_DUNGEON_1_WIDTH ; dimensions (y, x)
+	dw UnknownDungeon1Blocks, UnknownDungeon1TextPointers, UnknownDungeon1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw UnknownDungeon1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/unknowndungeon2.asm
@@ -1,0 +1,6 @@
+UnknownDungeon2_h: ; 0x45dff to 0x45e0b (12 bytes) (bank=11) (id=226)
+	db CAVERN ; tileset
+	db UNKNOWN_DUNGEON_2_HEIGHT, UNKNOWN_DUNGEON_2_WIDTH ; dimensions (y, x)
+	dw UnknownDungeon2Blocks, UnknownDungeon2TextPointers, UnknownDungeon2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw UnknownDungeon2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/unknowndungeon3.asm
@@ -1,0 +1,6 @@
+UnknownDungeon3_h: ; 0x45ee4 to 0x45ef0 (12 bytes) (bank=11) (id=227)
+	db CAVERN ; tileset
+	db UNKNOWN_DUNGEON_3_HEIGHT, UNKNOWN_DUNGEON_3_WIDTH ; dimensions (y, x)
+	dw UnknownDungeon3Blocks, UnknownDungeon3TextPointers, UnknownDungeon3Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw UnknownDungeon3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/vermilioncity.asm
@@ -1,0 +1,8 @@
+VermilionCity_h: ; 0x18998 to 0x189ba (34 bytes) (bank=6) (id=5)
+	db OVERWORLD ; tileset
+	db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x)
+	dw VermilionCityBlocks, VermilionCityTextPointers, VermilionCityScript ; blocks, texts, scripts
+	db NORTH | EAST ; connections
+	NORTH_MAP_CONNECTION ROUTE_6, ROUTE_6_WIDTH, ROUTE_6_HEIGHT, 5, 0, ROUTE_6_WIDTH, Route6Blocks
+	EAST_MAP_CONNECTION ROUTE_11, ROUTE_11_WIDTH, 4, 0, ROUTE_11_HEIGHT, Route11Blocks, VERMILION_CITY_WIDTH
+	dw VermilionCityObject ; objects
--- /dev/null
+++ b/data/mapHeaders/vermiliondock.asm
@@ -1,0 +1,6 @@
+VermilionDock_h: ; 0x1db46 to 0x1db52 (12 bytes) (bank=7) (id=94)
+	db SHIP_PORT ; tileset
+	db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x)
+	dw VermilionDockBlocks, VermilionDockTextPointers, VermilionDockScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw VermilionDockObject ; objects
--- /dev/null
+++ b/data/mapHeaders/vermiliongym.asm
@@ -1,0 +1,6 @@
+VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92)
+	db GYM ; tileset
+	db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x)
+	dw VermilionGymBlocks, VermilionGymTextPointers, VermilionGymScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw VermilionGymObject ; objects
--- /dev/null
+++ b/data/mapHeaders/vermilionhouse1.asm
@@ -1,0 +1,6 @@
+VermilionHouse1_h: ; 0x1daf0 to 0x1dafc (12 bytes) (bank=7) (id=93)
+	db HOUSE ; tileset
+	db VERMILION_HOUSE_1_HEIGHT, VERMILION_HOUSE_1_WIDTH ; dimensions (y, x)
+	dw VermilionHouse1Blocks, VermilionHouse1TextPointers, VermilionHouse1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw VermilionHouse1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/vermilionhouse2.asm
@@ -1,0 +1,6 @@
+VermilionHouse2_h: ; 0x56064 to 0x56070 (12 bytes) (id=163)
+	db HOUSE ; tileset
+	db VERMILION_HOUSE_2_HEIGHT, VERMILION_HOUSE_2_WIDTH ; dimensions (y, x)
+	dw VermilionHouse2Blocks, VermilionHouse2TextPointers, VermilionHouse2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw VermilionHouse2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/vermilionhouse3.asm
@@ -1,0 +1,6 @@
+VermilionHouse3_h: ; 0x19c06 to 0x19c12 (12 bytes) (bank=6) (id=196)
+	db HOUSE ; tileset
+	db VERMILION_HOUSE_3_HEIGHT, VERMILION_HOUSE_3_WIDTH ; dimensions (y, x)
+	dw VermilionHouse3Blocks, VermilionHouse3TextPointers, VermilionHouse3Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw VermilionHouse3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/vermilionmart.asm
@@ -1,0 +1,6 @@
+VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91)
+	db MART ; tileset
+	db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x)
+	dw VermilionMartBlocks, VermilionMartTextPointers, VermilionMartScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw VermilionMartObject ; objects
--- /dev/null
+++ b/data/mapHeaders/vermilionpokecenter.asm
@@ -1,0 +1,6 @@
+VermilionPokecenter_h: ; 0x5c983 to 0x5c98f (12 bytes) (id=89)
+	db POKECENTER ; tileset
+	db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x)
+	dw VermilionPokecenterBlocks, VermilionPokecenterTextPointers, VermilionPokecenterScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw VermilionPokecenterObject ; objects
--- /dev/null
+++ b/data/mapHeaders/victoryroad1.asm
@@ -1,0 +1,6 @@
+VictoryRoad1_h: ; 0x5d9fe to 0x5da0a (12 bytes) (id=108)
+	db CAVERN ; tileset
+	db VICTORY_ROAD_1_HEIGHT, VICTORY_ROAD_1_WIDTH ; dimensions (y, x)
+	dw VictoryRoad1Blocks, VictoryRoad1TextPointers, VictoryRoad1Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw VictoryRoad1Object ; objects
--- /dev/null
+++ b/data/mapHeaders/victoryroad2.asm
@@ -1,0 +1,6 @@
+VictoryRoad2_h: ; 0x51791 to 0x5179d (12 bytes) (id=194)
+	db CAVERN ; tileset
+	db VICTORY_ROAD_2_HEIGHT, VICTORY_ROAD_2_WIDTH ; dimensions (y, x)
+	dw VictoryRoad2Blocks, VictoryRoad2TextPointers, VictoryRoad2Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw VictoryRoad2Object ; objects
--- /dev/null
+++ b/data/mapHeaders/victoryroad3.asm
@@ -1,0 +1,6 @@
+VictoryRoad3_h: ; 0x44974 to 0x44980 (12 bytes) (bank=11) (id=198)
+	db CAVERN ; tileset
+	db VICTORY_ROAD_3_HEIGHT, VICTORY_ROAD_3_WIDTH ; dimensions (y, x)
+	dw VictoryRoad3Blocks, VictoryRoad3TextPointers, VictoryRoad3Script ; blocks, texts, scripts
+	db $00 ; connections
+	dw VictoryRoad3Object ; objects
--- /dev/null
+++ b/data/mapHeaders/viridiancity.asm
@@ -1,0 +1,9 @@
+ViridianCity_h: ; 0x18357 to 0x18384 (45 bytes) (bank=6) (id=1)
+	db OVERWORLD ; tileset
+	db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x)
+	dw ViridianCityBlocks, ViridianCityTextPointers, ViridianCityScript ; blocks, texts, scripts
+	db NORTH | SOUTH | WEST ; connections
+	NORTH_MAP_CONNECTION ROUTE_2, ROUTE_2_WIDTH, ROUTE_2_HEIGHT, 5, 0, ROUTE_2_WIDTH, Route2Blocks
+	SOUTH_MAP_CONNECTION ROUTE_1, ROUTE_1_WIDTH, 5, 0, ROUTE_1_WIDTH, Route1Blocks, VIRIDIAN_CITY_WIDTH, VIRIDIAN_CITY_HEIGHT
+	WEST_MAP_CONNECTION ROUTE_22, ROUTE_22_WIDTH, 4, 0, ROUTE_22_HEIGHT, Route22Blocks, VIRIDIAN_CITY_WIDTH
+	dw ViridianCityObject ; objects
--- /dev/null
+++ b/data/mapHeaders/viridianforest.asm
@@ -1,0 +1,6 @@
+ViridianForest_h: ; 0x61101 to 0x6110d (12 bytes) (id=51)
+	db FOREST ; tileset
+	db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x)
+	dw ViridianForestBlocks, ViridianForestTextPointers, ViridianForestScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw ViridianForestObject ; objects
--- /dev/null
+++ b/data/mapHeaders/viridianforestentrance.asm
@@ -1,0 +1,6 @@
+ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50)
+	db FOREST_GATE ; tileset
+	db VIRIDIAN_FOREST_ENTRANCE_HEIGHT, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; dimensions (y, x)
+	dw ViridianForestEntranceBlocks, ViridianForestEntranceTextPointers, ViridianForestEntranceScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw ViridianForestEntranceObject ; objects
--- /dev/null
+++ b/data/mapHeaders/viridianforestexit.asm
@@ -1,0 +1,6 @@
+ViridianForestExit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47)
+	db FOREST_GATE ; tileset
+	db VIRIDIAN_FOREST_EXIT_HEIGHT, VIRIDIAN_FOREST_EXIT_WIDTH ; dimensions (y, x)
+	dw ViridianForestExitBlocks, ViridianForestExitTextPointers, ViridianForestExitScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw ViridianForestExitObject ; objects
--- /dev/null
+++ b/data/mapHeaders/viridiangym.asm
@@ -1,0 +1,6 @@
+ViridianGym_h: ; 0x74897 to 0x748a3 (12 bytes) (id=45)
+	db GYM ; tileset
+	db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x)
+	dw ViridianGymBlocks, ViridianGymTextPointers, ViridianGymScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw ViridianGymObject ; objects
--- /dev/null
+++ b/data/mapHeaders/viridianhouse.asm
@@ -1,0 +1,8 @@
+ViridianHouse_h: ; 0x1d57d to 0x1d589 (12 bytes) (bank=7) (id=44)
+	db HOUSE ; tileset
+	db VIRIDIAN_HOUSE_HEIGHT, VIRIDIAN_HOUSE_WIDTH ; dimensions (y, x)
+	dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw ViridianHouseObject ; objects
+
+	db $0
--- /dev/null
+++ b/data/mapHeaders/viridianmart.asm
@@ -1,0 +1,6 @@
+ViridianMart_h: ; 0x1d462 to 0x1d46e (12 bytes) (bank=7) (id=42)
+	db MART ; tileset
+	db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x)
+	dw ViridianMartBlocks, ViridianMartTextPointers, ViridianMartScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw ViridianMartObject ; objects
--- /dev/null
+++ b/data/mapHeaders/viridianpokecenter.asm
@@ -1,0 +1,6 @@
+ViridianPokecenter_h: ; 0x44251 to 0x4425d (12 bytes) (bank=11) (id=41)
+	db POKECENTER ; tileset
+	db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x)
+	dw ViridianPokecenterBlocks, ViridianPokecenterTextPointers, ViridianPokeCenterScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw ViridianPokecenterObject ; objects
--- a/data/mapObjects/route6.asm
+++ b/data/mapObjects/route6.asm
@@ -17,3 +17,9 @@
 	db SPRITE_BLACK_HAIR_BOY_1, $1f + 4, $b + 4, $ff, $d2, $44, JR__TRAINER_M + $C8, $5 ; trainer
 	db SPRITE_LASS, $1e + 4, $b + 4, $ff, $d2, $45, JR__TRAINER_F + $C8, $3 ; trainer
 	db SPRITE_BUG_CATCHER, $1a + 4, $13 + 4, $ff, $d2, $46, BUG_CATCHER + $C8, $b ; trainer
+
+	; warp-to
+	EVENT_DISP ROUTE_6_WIDTH, $1, $9 ; ROUTE_6_GATE
+	EVENT_DISP ROUTE_6_WIDTH, $1, $a ; ROUTE_6_GATE
+	EVENT_DISP ROUTE_6_WIDTH, $7, $a ; ROUTE_6_GATE
+	EVENT_DISP ROUTE_6_WIDTH, $d, $11 ; PATH_ENTRANCE_ROUTE_6
--- a/main.asm
+++ b/main.asm
@@ -28891,14 +28891,7 @@
 
 SECTION "bank6",ROMX,BANK[$6]
 
-CeladonCity_h: ; 18000 (6:4000)
-	db OVERWORLD ; tileset
-	db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x)
-	dw CeladonCityBlocks, CeladonCityTextPointers, CeladonCityScript ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_16, ROUTE_16_WIDTH, 4, 0, ROUTE_16_HEIGHT, Route16Blocks, CELADON_CITY_WIDTH
-	EAST_MAP_CONNECTION ROUTE_7, ROUTE_7_WIDTH, 4, 0, ROUTE_7_HEIGHT, Route7Blocks, CELADON_CITY_WIDTH
-	dw CeladonCityObject ; objects
+INCLUDE "data/mapHeaders/celadoncity.asm"
 
 INCLUDE "data/mapObjects/celadoncity.asm"
 
@@ -28905,14 +28898,7 @@
 CeladonCityBlocks: ; 180df (6:40df)
 	INCBIN "maps/celadoncity.blk"
 
-PalletTown_h: ; 182a1 (6:42a1)
-	db OVERWORLD ; tileset
-	db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions
-	dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_1, ROUTE_1_WIDTH, ROUTE_1_HEIGHT, 0, 0, ROUTE_1_WIDTH, Route1Blocks
-	SOUTH_MAP_CONNECTION ROUTE_21, ROUTE_21_WIDTH, 0, 0, ROUTE_21_WIDTH, Route21Blocks, PALLET_TOWN_WIDTH, PALLET_TOWN_HEIGHT
-	dw PalletTownObject
+INCLUDE "data/mapHeaders/pallettown.asm"
 
 INCLUDE "data/mapObjects/pallettown.asm"
 
@@ -28919,15 +28905,7 @@
 PalletTownBlocks: ; 182fd (6:42fd)
 	INCBIN "maps/pallettown.blk"
 
-ViridianCity_h: ; 0x18357 to 0x18384 (45 bytes) (bank=6) (id=1)
-	db OVERWORLD ; tileset
-	db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x)
-	dw ViridianCityBlocks, ViridianCityTextPointers, ViridianCityScript ; blocks, texts, scripts
-	db NORTH | SOUTH | WEST ; connections
-	NORTH_MAP_CONNECTION ROUTE_2, ROUTE_2_WIDTH, ROUTE_2_HEIGHT, 5, 0, ROUTE_2_WIDTH, Route2Blocks
-	SOUTH_MAP_CONNECTION ROUTE_1, ROUTE_1_WIDTH, 5, 0, ROUTE_1_WIDTH, Route1Blocks, VIRIDIAN_CITY_WIDTH, VIRIDIAN_CITY_HEIGHT
-	WEST_MAP_CONNECTION ROUTE_22, ROUTE_22_WIDTH, 4, 0, ROUTE_22_HEIGHT, Route22Blocks, VIRIDIAN_CITY_WIDTH
-	dw ViridianCityObject ; objects
+INCLUDE "data/mapHeaders/viridiancity.asm"
 
 INCLUDE "data/mapObjects/viridiancity.asm"
 
@@ -28934,32 +28912,14 @@
 ViridianCityBlocks: ; 183ec (6:43ec)
 	INCBIN "maps/viridiancity.blk"
 
-PewterCity_h: ; 0x18554 to 0x18576 (34 bytes) (bank=6) (id=2)
-	db OVERWORLD ; tileset
-	db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x)
-	dw PewterCityBlocks, PewterCityTextPointers, PewterCityScript ; blocks, texts, scripts
-	db SOUTH | EAST ; connections
-	SOUTH_MAP_CONNECTION ROUTE_2, ROUTE_2_WIDTH, 5, 0, ROUTE_2_WIDTH, Route2Blocks, PEWTER_CITY_WIDTH, PEWTER_CITY_HEIGHT
-	EAST_MAP_CONNECTION ROUTE_3, ROUTE_3_WIDTH, 4, 0, ROUTE_3_HEIGHT, Route3Blocks, PEWTER_CITY_WIDTH
-	dw PewterCityObject ; objects
+INCLUDE "data/mapHeaders/pewtercity.asm"
 
-	db $0
-
 INCLUDE "data/mapObjects/pewtercity.asm"
 
 PewterCityBlocks: ; 185e6 (6:45e6)
 	INCBIN "maps/pewtercity.blk"
 
-CeruleanCity_h: ; 0x1874e to 0x18786 (56 bytes) (bank=6) (id=3)
-	db OVERWORLD ; tileset
-	db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x)
-	dw CeruleanCityBlocks, CeruleanCityTextPointers, CeruleanCityScript ; blocks, texts, scripts
-	db NORTH | SOUTH | WEST | EAST ; connections
-	NORTH_MAP_CONNECTION ROUTE_24, ROUTE_24_WIDTH, ROUTE_24_HEIGHT, 5, 0, ROUTE_24_WIDTH, Route24Blocks
-	SOUTH_MAP_CONNECTION ROUTE_5, ROUTE_5_WIDTH, 5, 0, ROUTE_5_WIDTH, Route5Blocks, CERULEAN_CITY_WIDTH, CERULEAN_CITY_HEIGHT
-	WEST_MAP_CONNECTION ROUTE_4, ROUTE_4_WIDTH, 4, 0, ROUTE_4_HEIGHT, Route4Blocks, CERULEAN_CITY_WIDTH
-	EAST_MAP_CONNECTION ROUTE_9, ROUTE_9_WIDTH, 4, 0, ROUTE_9_HEIGHT, Route9Blocks, CERULEAN_CITY_WIDTH
-	dw CeruleanCityObject ; objects
+INCLUDE "data/mapHeaders/ceruleancity.asm"
 
 INCLUDE "data/mapObjects/ceruleancity.asm"
 
@@ -28966,14 +28926,7 @@
 CeruleanCityBlocks: ; 18830 (6:4830)
 	INCBIN "maps/ceruleancity.blk"
 
-VermilionCity_h: ; 0x18998 to 0x189ba (34 bytes) (bank=6) (id=5)
-	db OVERWORLD ; tileset
-	db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x)
-	dw VermilionCityBlocks, VermilionCityTextPointers, VermilionCityScript ; blocks, texts, scripts
-	db NORTH | EAST ; connections
-	NORTH_MAP_CONNECTION ROUTE_6, ROUTE_6_WIDTH, ROUTE_6_HEIGHT, 5, 0, ROUTE_6_WIDTH, Route6Blocks
-	EAST_MAP_CONNECTION ROUTE_11, ROUTE_11_WIDTH, 4, 0, ROUTE_11_HEIGHT, Route11Blocks, VERMILION_CITY_WIDTH
-	dw VermilionCityObject ; objects
+INCLUDE "data/mapHeaders/vermilioncity.asm"
 
 INCLUDE "data/mapObjects/vermilioncity.asm"
 
@@ -28980,15 +28933,7 @@
 VermilionCityBlocks: ; 18a3f (6:4a3f)
 	INCBIN "maps/vermilioncity.blk"
 
-FuchsiaCity_h: ; 0x18ba7 to 0x18bd4 (45 bytes) (bank=6) (id=7)
-	db OVERWORLD ; tileset
-	db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x)
-	dw FuchsiaCityBlocks, FuchsiaCityTextPointers, FuchsiaCityScript ; blocks, texts, scripts
-	db SOUTH | WEST | EAST ; connections
-	SOUTH_MAP_CONNECTION ROUTE_19, ROUTE_19_WIDTH, 5, 0, ROUTE_19_WIDTH, Route19Blocks, FUCHSIA_CITY_WIDTH, FUCHSIA_CITY_HEIGHT
-	WEST_MAP_CONNECTION ROUTE_18, ROUTE_18_WIDTH, 4, 0, ROUTE_18_HEIGHT, Route18Blocks, FUCHSIA_CITY_WIDTH
-	EAST_MAP_CONNECTION ROUTE_15, ROUTE_15_WIDTH, 4, 0, ROUTE_15_HEIGHT, Route15Blocks, FUCHSIA_CITY_WIDTH
-	dw FuchsiaCityObject ; objects
+INCLUDE "data/mapHeaders/fuchsiacity.asm"
 
 INCLUDE "data/mapObjects/fuchsiacity.asm"
 
@@ -30963,12 +30908,7 @@
 	TX_FAR _UnnamedText_19b2a
 	db "@"
 
-BluesHouse_h: ; 0x19b2f id=39
-	db HOUSE ; tileset
-	db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions
-	dw BluesHouseBlocks, BluesHouseTextPointers, BluesHouseScript
-	db 0
-	dw BluesHouseObject
+INCLUDE "data/mapHeaders/blueshouse.asm"
 
 BluesHouseScript: ; 19b3b (6:5b3b)
 	call EnableAutoTextBoxDrawing
@@ -31066,12 +31006,7 @@
 BluesHouseBlocks: ; 19bf6 (6:5bf6)
 	INCBIN "maps/blueshouse.blk"
 
-VermilionHouse3_h: ; 0x19c06 to 0x19c12 (12 bytes) (bank=6) (id=196)
-	db HOUSE ; tileset
-	db VERMILION_HOUSE_3_HEIGHT, VERMILION_HOUSE_3_WIDTH ; dimensions (y, x)
-	dw VermilionHouse3Blocks, VermilionHouse3TextPointers, VermilionHouse3Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw VermilionHouse3Object ; objects
+INCLUDE "data/mapHeaders/vermilionhouse3.asm"
 
 VermilionHouse3Script: ; 19c12 (6:5c12)
 	jp EnableAutoTextBoxDrawing
@@ -31092,12 +31027,7 @@
 VermilionHouse3Blocks: ; 19c3f (6:5c3f)
 	INCBIN "maps/vermilionhouse3.blk"
 
-IndigoPlateauLobby_h: ; 0x19c4f to 0x19c5b (12 bytes) (bank=6) (id=174)
-	db MART ; tileset
-	db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x)
-	dw IndigoPlateauLobbyBlocks, IndigoPlateauLobbyTextPointers, IndigoPlateauLobbyScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw IndigoPlateauLobbyObject ; objects
+INCLUDE "data/mapHeaders/indigoplateaulobby.asm"
 
 IndigoPlateauLobbyScript: ; 19c5b (6:5c5b)
 	call Func_22fa
@@ -31146,12 +31076,7 @@
 IndigoPlateauLobbyBlocks: ; 19ccf (6:5ccf)
 	INCBIN "maps/indigoplateaulobby.blk"
 
-SilphCo4_h: ; 0x19cff to 0x19d0b (12 bytes) (bank=6) (id=209)
-	db FACILITY ; tileset
-	db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x)
-	dw SilphCo4Blocks, SilphCo4TextPointers, SilphCo4Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SilphCo4Object ; objects
+INCLUDE "data/mapHeaders/silphco4.asm"
 
 SilphCo4Script: ; 19d0b (6:5d0b)
 	call SilphCo4Script_19d21
@@ -31360,12 +31285,7 @@
 SilphCo4Blocks: ; 19ea4 (6:5ea4)
 	INCBIN "maps/silphco4.blk"
 
-SilphCo5_h: ; 0x19f2b to 0x19f37 (12 bytes) (bank=6) (id=210)
-	db FACILITY ; tileset
-	db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x)
-	dw SilphCo5Blocks, SilphCo5TextPointers, SilphCo5Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SilphCo5Object ; objects
+INCLUDE "data/mapHeaders/silphco5.asm"
 
 SilphCo5Script: ; 19f37 (6:5f37)
 	call SilphCo5Script_19f4d
@@ -31596,12 +31516,7 @@
 SilphCo5Blocks: ; 1a116 (6:6116)
 	INCBIN "maps/silphco5.blk"
 
-SilphCo6_h: ; 0x1a19d to 0x1a1a9 (12 bytes) (bank=6) (id=211)
-	db FACILITY ; tileset
-	db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x)
-	dw SilphCo6Blocks, SilphCo6TextPointers, SilphCo6Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SilphCo6Object ; objects
+INCLUDE "data/mapHeaders/silphco6.asm"
 
 SilphCo6Script: ; 1a1a9 (6:61a9)
 	call SilphCo6Script_1a1bf
@@ -32305,14 +32220,7 @@
 
 SECTION "bank7",ROMX,BANK[$7]
 
-CinnabarIsland_h: ; 0x1c000 to 0x1c022 (34 bytes) (bank=7) (id=8)
-	db OVERWORLD ; tileset
-	db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x)
-	dw CinnabarIslandBlocks, CinnabarIslandTextPointers, CinnabarIslandScript ; blocks, texts, scripts
-	db NORTH | EAST ; connections
-	NORTH_MAP_CONNECTION ROUTE_21, ROUTE_21_WIDTH, ROUTE_21_HEIGHT, 0, 0, ROUTE_21_WIDTH, Route21Blocks
-	EAST_MAP_CONNECTION ROUTE_20, ROUTE_20_WIDTH, 0, 0, ROUTE_20_HEIGHT, Route20Blocks, CINNABAR_ISLAND_WIDTH
-	dw CinnabarIslandObject ; objects
+INCLUDE "data/mapHeaders/cinnabarisland.asm"
 
 INCLUDE "data/mapObjects/cinnabarisland.asm"
 
@@ -32319,14 +32227,7 @@
 CinnabarIslandBlocks: ; 1c069 (7:4069)
 	INCBIN "maps/cinnabarisland.blk"
 
-Route1_h: ; 0x1c0c3 to 0x1c0e5 (34 bytes) (bank=7) (id=12)
-	db OVERWORLD ; tileset
-	db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x)
-	dw Route1Blocks, Route1TextPointers, Route1Script ; blocks, texts, scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION VIRIDIAN_CITY, VIRIDIAN_CITY_WIDTH, VIRIDIAN_CITY_HEIGHT, -3, 2, VIRIDIAN_CITY_WIDTH - 4, ViridianCityBlocks
-	SOUTH_MAP_CONNECTION PALLET_TOWN, PALLET_TOWN_WIDTH, 0, 0, PALLET_TOWN_WIDTH, PalletTownBlocks, ROUTE_1_WIDTH, ROUTE_1_HEIGHT
-	dw Route1Object ; objects
+INCLUDE "data/mapHeaders/route1.asm"
 
 INCLUDE "data/mapObjects/route1.asm"
 
@@ -32584,12 +32485,7 @@
 	TX_FAR _Route1Text3
 	db "@"
 
-OaksLab_h: ; 0x1cb02 to 0x1cb0e (12 bytes) (bank=7) (id=40)
-	db DOJO ; tileset
-	db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x)
-	dw OaksLabBlocks, OaksLabTextPointers, OaksLabScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw OaksLabObject ; objects
+INCLUDE "data/mapHeaders/oakslab.asm"
 
 OaksLabScript: ; 1cb0e (7:4b0e)
 	ld a, [$d74b]
@@ -33838,12 +33734,7 @@
 
 INCLUDE "data/mapObjects/oakslab.asm"
 
-ViridianMart_h: ; 0x1d462 to 0x1d46e (12 bytes) (bank=7) (id=42)
-	db MART ; tileset
-	db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x)
-	dw ViridianMartBlocks, ViridianMartTextPointers, ViridianMartScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw ViridianMartObject ; objects
+INCLUDE "data/mapHeaders/viridianmart.asm"
 
 ViridianMartScript: ; 1d46e (7:546e)
 	call ViridianMartScript_1d47d
@@ -33946,12 +33837,7 @@
 ViridianMartBlocks: ; 1d530 (7:5530)
 	INCBIN "maps/viridianmart.blk"
 
-School_h: ; 0x1d540 to 0x1d54c (12 bytes) (bank=7) (id=43)
-	db HOUSE ; tileset
-	db VIRIDIAN_SCHOOL_HEIGHT, VIRIDIAN_SCHOOL_WIDTH ; dimensions (y, x)
-	dw SchoolBlocks, SchoolTextPointers, SchoolScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw SchoolObject ; objects
+INCLUDE "data/mapHeaders/school.asm"
 
 SchoolScript: ; 1d54c (7:554c)
 	jp EnableAutoTextBoxDrawing
@@ -33970,15 +33856,8 @@
 
 INCLUDE "data/mapObjects/school.asm"
 
-ViridianHouse_h: ; 0x1d57d to 0x1d589 (12 bytes) (bank=7) (id=44)
-	db HOUSE ; tileset
-	db VIRIDIAN_HOUSE_HEIGHT, VIRIDIAN_HOUSE_WIDTH ; dimensions (y, x)
-	dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw ViridianHouseObject ; objects
+INCLUDE "data/mapHeaders/viridianhouse.asm"
 
-	db $0
-
 ViridianHouseScript: ; 1d58a (7:558a)
 	jp EnableAutoTextBoxDrawing
 
@@ -34015,12 +33894,7 @@
 
 INCLUDE "data/mapObjects/viridianhouse.asm"
 
-PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55)
-	db HOUSE ; tileset
-	db PEWTER_HOUSE_1_HEIGHT, PEWTER_HOUSE_1_WIDTH ; dimensions (y, x)
-	dw PewterHouse1Blocks, PewterHouse1TextPointers, PewterHouse1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw PewterHouse1Object ; objects
+INCLUDE "data/mapHeaders/pewterhouse1.asm"
 
 PewterHouse1Script: ; 1d5f3 (7:55f3)
 	jp EnableAutoTextBoxDrawing
@@ -34048,12 +33922,7 @@
 
 INCLUDE "data/mapObjects/pewterhouse1.asm"
 
-PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57)
-	db HOUSE ; tileset
-	db PEWTER_HOUSE_2_HEIGHT, PEWTER_HOUSE_2_WIDTH ; dimensions (y, x)
-	dw PewterHouse2Blocks, PewterHouse2TextPointers, PewterHouse2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw PewterHouse2Object ; objects
+INCLUDE "data/mapHeaders/pewterhouse2.asm"
 
 PewterHouse2Script: ; 1d648 (7:5648)
 	jp EnableAutoTextBoxDrawing
@@ -34072,12 +33941,7 @@
 
 INCLUDE "data/mapObjects/pewterhouse2.asm"
 
-CeruleanHouseTrashed_h: ; 0x1d679 to 0x1d685 (12 bytes) (bank=7) (id=62)
-	db HOUSE ; tileset
-	db TRASHED_HOUSE_HEIGHT, TRASHED_HOUSE_WIDTH ; dimensions (y, x)
-	dw CeruleanHouseTrashedBlocks, CeruleanHouseTrashedTextPointers, CeruleanHouseTrashedScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeruleanHouseTrashedObject ; objects
+INCLUDE "data/mapHeaders/ceruleanhousetrashed.asm"
 
 CeruleanHouseTrashedScript: ; 1d685 (7:5685)
 	call EnableAutoTextBoxDrawing
@@ -34122,12 +33986,7 @@
 
 INCLUDE "data/mapObjects/ceruleanhousetrashed.asm"
 
-CeruleanHouse1_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63)
-	db HOUSE ; tileset
-	db CERULEAN_HOUSE_1_HEIGHT, CERULEAN_HOUSE_1_WIDTH ; dimensions (y, x)
-	dw CeruleanHouse1Blocks, CeruleanHouse1TextPointers, CeruleanHouse1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeruleanHouse1Object ; objects
+INCLUDE "data/mapHeaders/ceruleanhouse1.asm"
 
 CeruleanHouse1Script: ; 1d6f6 (7:56f6)
 	jp EnableAutoTextBoxDrawing
@@ -34150,12 +34009,7 @@
 
 INCLUDE "data/mapObjects/ceruleanhouse1.asm"
 
-BikeShop_h: ; 0x1d730 to 0x1d73c (12 bytes) (bank=7) (id=66)
-	db CLUB ; tileset
-	db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x)
-	dw BikeShopBlocks, BikeShopTextPointers, BikeShopScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw BikeShopObject ; objects
+INCLUDE "data/mapHeaders/bikeshop.asm"
 
 BikeShopScript: ; 1d73c (7:573c)
 	jp EnableAutoTextBoxDrawing
@@ -34316,12 +34170,7 @@
 BikeShopBlocks: ; 1d88c (7:588c)
 	INCBIN "maps/bikeshop.blk"
 
-LavenderHouse1_h: ; 0x1d89c to 0x1d8a8 (12 bytes) (bank=7) (id=149)
-	db HOUSE ; tileset
-	db LAVENDER_HOUSE_1_HEIGHT, LAVENDER_HOUSE_1_WIDTH ; dimensions (y, x)
-	dw LavenderHouse1Blocks, LavenderHouse1TextPointers, LavenderHouse1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw LavenderHouse1Object ; objects
+INCLUDE "data/mapHeaders/lavenderhouse1.asm"
 
 LavenderHouse1Script: ; 1d8a8 (7:58a8)
 	call EnableAutoTextBoxDrawing
@@ -34442,12 +34291,7 @@
 
 INCLUDE "data/mapObjects/lavenderhouse1.asm"
 
-LavenderHouse2_h: ; 0x1d9a2 to 0x1d9ae (12 bytes) (bank=7) (id=151)
-	db HOUSE ; tileset
-	db LAVENDER_HOUSE_2_HEIGHT, LAVENDER_HOUSE_2_WIDTH ; dimensions (y, x)
-	dw LavenderHouse2Blocks, LavenderHouse2TextPointers, LavenderHouse2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw LavenderHouse2Object ; objects
+INCLUDE "data/mapHeaders/lavenderhouse2.asm"
 
 LavenderHouse2Script: ; 1d9ae (7:59ae)
 	call EnableAutoTextBoxDrawing
@@ -34488,12 +34332,7 @@
 
 INCLUDE "data/mapObjects/lavenderhouse2.asm"
 
-NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229)
-	db HOUSE ; tileset
-	db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x)
-	dw NameRaterBlocks, NameRaterTextPointers, NameRaterScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw NameRaterObject ; objects
+INCLUDE "data/mapHeaders/namerater.asm"
 
 NameRaterScript: ; 1da12 (7:5a12)
 	jp EnableAutoTextBoxDrawing
@@ -34607,12 +34446,7 @@
 
 INCLUDE "data/mapObjects/namerater.asm"
 
-VermilionHouse1_h: ; 0x1daf0 to 0x1dafc (12 bytes) (bank=7) (id=93)
-	db HOUSE ; tileset
-	db VERMILION_HOUSE_1_HEIGHT, VERMILION_HOUSE_1_WIDTH ; dimensions (y, x)
-	dw VermilionHouse1Blocks, VermilionHouse1TextPointers, VermilionHouse1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw VermilionHouse1Object ; objects
+INCLUDE "data/mapHeaders/vermilionhouse1.asm"
 
 VermilionHouse1Script: ; 1dafc (7:5afc)
 	call EnableAutoTextBoxDrawing
@@ -34641,12 +34475,7 @@
 
 INCLUDE "data/mapObjects/vermilionhouse1.asm"
 
-VermilionDock_h: ; 0x1db46 to 0x1db52 (12 bytes) (bank=7) (id=94)
-	db SHIP_PORT ; tileset
-	db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x)
-	dw VermilionDockBlocks, VermilionDockTextPointers, VermilionDockScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw VermilionDockObject ; objects
+INCLUDE "data/mapHeaders/vermiliondock.asm"
 
 VermilionDockScript: ; 1db52 (7:5b52)
 	call EnableAutoTextBoxDrawing
@@ -34864,12 +34693,7 @@
 VermilionDockBlocks: ; 1dcda (7:5cda)
 	INCBIN "maps/vermiliondock.blk"
 
-CeladonMansion5_h: ; 0x1dd2e to 0x1dd3a (12 bytes) (bank=7) (id=132)
-	db HOUSE ; tileset
-	db CELADON_MANSION_5_HEIGHT, CELADON_MANSION_5_WIDTH ; dimensions (y, x)
-	dw CeladonMansion5Blocks, CeladonMansion5TextPointers, CeladonMansion5Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonMansion5Object ; objects
+INCLUDE "data/mapHeaders/celadonmansion5.asm"
 
 CeladonMansion5Script: ; 1dd3a (7:5d3a)
 	jp EnableAutoTextBoxDrawing
@@ -34896,12 +34720,7 @@
 
 INCLUDE "data/mapObjects/celadonmansion5.asm"
 
-FuchsiaMart_h: ; 0x1dd7c to 0x1dd88 (12 bytes) (bank=7) (id=152)
-	db MART ; tileset
-	db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x)
-	dw FuchsiaMartBlocks, FuchsiaMartTextPointers, FuchsiaMartScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw FuchsiaMartObject ; objects
+INCLUDE "data/mapHeaders/fuchsiamart.asm"
 
 FuchsiaMartScript: ; 1dd88 (7:5d88)
 	jp EnableAutoTextBoxDrawing
@@ -34924,12 +34743,7 @@
 FuchsiaMartBlocks: ; 1ddc1 (7:5dc1)
 	INCBIN "maps/fuchsiamart.blk"
 
-SaffronHouse1_h: ; 0x1ddd1 to 0x1dddd (12 bytes) (bank=7) (id=179)
-	db HOUSE ; tileset
-	db SAFFRON_HOUSE_1_HEIGHT, SAFFRON_HOUSE_1_WIDTH ; dimensions (y, x)
-	dw SaffronHouse1Blocks, SaffronHouse1TextPointers, SaffronHouse1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SaffronHouse1Object ; objects
+INCLUDE "data/mapHeaders/saffronhouse1.asm"
 
 SaffronHouse1Script: ; 1dddd (7:5ddd)
 	jp EnableAutoTextBoxDrawing
@@ -34961,12 +34775,7 @@
 
 INCLUDE "data/mapObjects/saffronhouse1.asm"
 
-SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183)
-	db HOUSE ; tileset
-	db SAFFRON_HOUSE_2_HEIGHT, SAFFRON_HOUSE_2_WIDTH ; dimensions (y, x)
-	dw SaffronHouse2Blocks, SaffronHouse2TextPointers, SaffronHouse2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SaffronHouse2Object ; objects
+INCLUDE "data/mapHeaders/saffronhouse2.asm"
 
 SaffronHouse2Script: ; 1de3c (7:5e3c)
 	jp EnableAutoTextBoxDrawing
@@ -35017,12 +34826,7 @@
 
 INCLUDE "data/mapObjects/saffronhouse2.asm"
 
-DiglettsCaveRoute2_h: ; 0x1dea4 to 0x1deb0 (12 bytes) (bank=7) (id=46)
-	db CAVERN ; tileset
-	db DIGLETTS_CAVE_EXIT_HEIGHT, DIGLETTS_CAVE_EXIT_WIDTH ; dimensions (y, x)
-	dw DiglettsCaveRoute2Blocks, DiglettsCaveRoute2TextPointers, DiglettsCaveRoute2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw DiglettsCaveRoute2Object ; objects
+INCLUDE "data/mapHeaders/diglettscaveroute2.asm"
 
 DiglettsCaveRoute2Script: ; 1deb0 (7:5eb0)
 	ld a, $d
@@ -35038,12 +34842,7 @@
 
 INCLUDE "data/mapObjects/diglettscaveroute2.asm"
 
-Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48)
-	db HOUSE ; tileset
-	db ROUTE_2_HOUSE_HEIGHT, ROUTE_2_HOUSE_WIDTH ; dimensions (y, x)
-	dw Route2HouseBlocks, Route2HouseTextPointers, Route2HouseScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route2HouseObject ; objects
+INCLUDE "data/mapHeaders/route2house.asm"
 
 Route2HouseScript: ; 1deed (7:5eed)
 	jp EnableAutoTextBoxDrawing
@@ -35066,12 +34865,7 @@
 
 INCLUDE "data/mapObjects/route2house.asm"
 
-Route5Gate_h: ; 0x1df27 to 0x1df33 (12 bytes) (bank=7) (id=70)
-	db GATE ; tileset
-	db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x)
-	dw Route5GateBlocks, Route5GateTextPointers, Route5GateScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route5GateObject ; objects
+INCLUDE "data/mapHeaders/route5gate.asm"
 
 Route5GateScript: ; 1df33 (7:5f33)
 	call EnableAutoTextBoxDrawing
@@ -35200,12 +34994,7 @@
 Route5GateBlocks: ; 1e025 (7:6025)
 	INCBIN "maps/route5gate.blk"
 
-Route6Gate_h: ; 0x1e031 to 0x1e03d (12 bytes) (bank=7) (id=73)
-	db GATE ; tileset
-	db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x)
-	dw Route6GateBlocks, Route6GateTextPointers, Route6GateScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route6GateObject ; objects
+INCLUDE "data/mapHeaders/route6gate.asm"
 
 Route6GateScript: ; 1e03d (7:603d)
 	call EnableAutoTextBoxDrawing
@@ -35285,12 +35074,7 @@
 Route6GateBlocks: ; 1e0e8 (7:60e8)
 	INCBIN "maps/route6gate.blk"
 
-Route7Gate_h: ; 0x1e0f4 to 0x1e100 (12 bytes) (bank=7) (id=76)
-	db GATE ; tileset
-	db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x)
-	dw Route7GateBlocks, Route7GateTextPointers, Route7GateScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route7GateObject ; objects
+INCLUDE "data/mapHeaders/route7gate.asm"
 
 Route7GateScript: ; 1e100 (7:6100)
 	call EnableAutoTextBoxDrawing
@@ -35373,12 +35157,7 @@
 Route7GateBlocks: ; 1e1af (7:61af)
 	INCBIN "maps/route7gate.blk"
 
-Route8Gate_h: ; 0x1e1bb to 0x1e1c7 (12 bytes) (bank=7) (id=79)
-	db GATE ; tileset
-	db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x)
-	dw Route8GateBlocks, Route8GateTextPointers, Route8GateScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route8GateObject ; objects
+INCLUDE "data/mapHeaders/route8gate.asm"
 
 Route8GateScript: ; 1e1c7 (7:61c7)
 	call EnableAutoTextBoxDrawing
@@ -35458,12 +35237,7 @@
 Route8GateBlocks: ; 1e271 (7:6271)
 	INCBIN "maps/route8gate.blk"
 
-UndergroundPathEntranceRoute8_h: ; 0x1e27d to 0x1e289 (12 bytes) (bank=7) (id=80)
-	db GATE ; tileset
-	db PATH_ENTRANCE_ROUTE_8_HEIGHT, PATH_ENTRANCE_ROUTE_8_WIDTH ; dimensions (y, x)
-	dw UndergroundPathEntranceRoute8Blocks, UndergroundPathEntranceRoute8TextPointers, UndergroundPathEntranceRoute8Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw UndergroundPathEntranceRoute8Object ; objects
+INCLUDE "data/mapHeaders/undergroundpathentranceroute8.asm"
 
 UndergroundPathEntranceRoute8Script: ; 1e289 (7:6289)
 	ld a, $13
@@ -35479,12 +35253,7 @@
 
 INCLUDE "data/mapObjects/undergroundpathentranceroute8.asm"
 
-PowerPlant_h: ; 0x1e2ba to 0x1e2c6 (12 bytes) (bank=7) (id=83)
-	db FACILITY ; tileset
-	db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x)
-	dw PowerPlantBlocks, PowerPlantTextPointers, PowerPlantScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw PowerPlantObject ; objects
+INCLUDE "data/mapHeaders/powerplant.asm"
 
 PowerPlantScript: ; 1e2c6 (7:62c6)
 	call EnableAutoTextBoxDrawing
@@ -35668,12 +35437,7 @@
 PowerPlantBlocks: ; 1e446 (7:6446)
 	INCBIN "maps/powerplant.blk"
 
-DiglettsCaveEntranceRoute11_h: ; 0x1e5ae to 0x1e5ba (12 bytes) (bank=7) (id=85)
-	db CAVERN ; tileset
-	db DIGLETTS_CAVE_ENTRANCE_HEIGHT, DIGLETTS_CAVE_ENTRANCE_WIDTH ; dimensions (y, x)
-	dw DiglettsCaveEntranceRoute11Blocks, DiglettsCaveEntranceRoute11TextPointers, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw DiglettsCaveEntranceRoute11Object ; objects
+INCLUDE "data/mapHeaders/diglettscaveroute11.asm"
 
 DiglettsCaveEntranceRoute11Script: ; 1e5ba (7:65ba)
 	call EnableAutoTextBoxDrawing
@@ -35690,12 +35454,7 @@
 
 INCLUDE "data/mapObjects/diglettscaveroute11.asm"
 
-Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188)
-	db HOUSE ; tileset
-	db ROUTE_16_HOUSE_HEIGHT, ROUTE_16_HOUSE_WIDTH ; dimensions (y, x)
-	dw Route16HouseBlocks, Route16HouseTextPointers, Route16HouseScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route16HouseObject ; objects
+INCLUDE "data/mapHeaders/route16house.asm"
 
 Route16HouseScript: ; 1e5f8 (7:65f8)
 	jp EnableAutoTextBoxDrawing
@@ -35756,12 +35515,7 @@
 
 INCLUDE "data/mapObjects/route16house.asm"
 
-Route22Gate_h: ; 0x1e677 to 0x1e683 (12 bytes) (bank=7) (id=193)
-	db GATE ; tileset
-	db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x)
-	dw Route22GateBlocks, Route22GateTextPointers, Route22GateScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route22GateObject ; objects
+INCLUDE "data/mapHeaders/route22gate.asm"
 
 Route22GateScript: ; 1e683 (7:6683)
 	call EnableAutoTextBoxDrawing
@@ -35861,12 +35615,7 @@
 Route22GateBlocks: ; 1e74a (7:674a)
 	INCBIN "maps/route22gate.blk"
 
-BillsHouse_h: ; 0x1e75e to 0x1e76a (12 bytes) (bank=7) (id=88)
-	db INTERIOR ; tileset
-	db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x)
-	dw BillsHouseBlocks, BillsHouseTextPointers, BillsHouseScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw BillsHouseObject ; objects
+INCLUDE "data/mapHeaders/billshouse.asm"
 
 BillsHouseScript: ; 1e76a (7:676a)
 	call EnableAutoTextBoxDrawing
@@ -51998,15 +51747,7 @@
 
 SECTION "bank11",ROMX,BANK[$11]
 
-LavenderTown_h: ; 0x44000 to 0x4402d (45 bytes) (bank=11) (id=4)
-	db OVERWORLD ; tileset
-	db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x)
-	dw LavenderTownBlocks, LavenderTownTextPointers, LavenderTownScript ; blocks, texts, scripts
-	db NORTH | SOUTH | WEST ; connections
-	NORTH_MAP_CONNECTION ROUTE_10, ROUTE_10_WIDTH, ROUTE_10_HEIGHT, 0, 0, ROUTE_10_WIDTH, Route10Blocks
-	SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_12_WIDTH, 0, 0, ROUTE_12_WIDTH, Route12Blocks, LAVENDER_TOWN_WIDTH, LAVENDER_TOWN_HEIGHT
-	WEST_MAP_CONNECTION ROUTE_8, ROUTE_8_WIDTH, 0, 0, ROUTE_8_HEIGHT, Route8Blocks, LAVENDER_TOWN_WIDTH
-	dw LavenderTownObject ; objects
+INCLUDE "data/mapHeaders/lavendertown.asm"
 
 INCLUDE "data/mapObjects/lavendertown.asm"
 
@@ -52246,12 +51987,7 @@
 	TX_FAR _UnnamedText_4424c
 	db "@"
 
-ViridianPokecenter_h: ; 0x44251 to 0x4425d (12 bytes) (bank=11) (id=41)
-	db POKECENTER ; tileset
-	db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x)
-	dw ViridianPokecenterBlocks, ViridianPokecenterTextPointers, ViridianPokeCenterScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw ViridianPokecenterObject ; objects
+INCLUDE "data/mapHeaders/viridianpokecenter.asm"
 
 ViridianPokeCenterScript: ; 4425d (11:425d)
 	call Func_22fa
@@ -52279,12 +52015,7 @@
 
 INCLUDE "data/mapObjects/viridianpokecenter.asm"
 
-Mansion1_h: ; 0x442a3 to 0x442af (12 bytes) (bank=11) (id=165)
-	db FACILITY ; tileset
-	db MANSION_1_HEIGHT, MANSION_1_WIDTH ; dimensions (y, x)
-	dw Mansion1Blocks, Mansion1TextPointers, Mansion1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw Mansion1Object ; objects
+INCLUDE "data/mapHeaders/mansion1.asm"
 
 Mansion1Script: ; 442af (11:42af)
 	call Mansion1Subscript1
@@ -52431,12 +52162,7 @@
 Mansion1Blocks: ; 443fe (11:43fe)
 	INCBIN "maps/mansion1.blk"
 
-RockTunnel1_h: ; 0x444d0 to 0x444dc (12 bytes) (bank=11) (id=82)
-	db CAVERN ; tileset
-	db ROCK_TUNNEL_1_HEIGHT, ROCK_TUNNEL_1_WIDTH ; dimensions (y, x)
-	dw RockTunnel1Blocks, RockTunnel1TextPointers, RockTunnel1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw RockTunnel1Object ; objects
+INCLUDE "data/mapHeaders/rocktunnel1.asm"
 
 RockTunnel1Script: ; 444dc (11:44dc)
 	call EnableAutoTextBoxDrawing
@@ -52658,12 +52384,7 @@
 RockTunnel1Blocks: ; 44675 (11:4675)
 	INCBIN "maps/rocktunnel1.blk"
 
-SeafoamIslands1_h: ; 0x447dd to 0x447e9 (12 bytes) (bank=11) (id=192)
-	db CAVERN ; tileset
-	db SEAFOAM_ISLANDS_1_HEIGHT, SEAFOAM_ISLANDS_1_WIDTH ; dimensions (y, x)
-	dw SeafoamIslands1Blocks, SeafoamIslands1TextPointers, SeafoamIslands1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SeafoamIslands1Object ; objects
+INCLUDE "data/mapHeaders/seafoamislands1.asm"
 
 SeafoamIslands1Script: ; 447e9 (11:47e9)
 	call EnableAutoTextBoxDrawing
@@ -52721,12 +52442,7 @@
 SeafoamIslands1Blocks: ; 4489f (11:489f)
 	INCBIN "maps/seafoamislands1.blk"
 
-SSAnne3_h: ; 0x44926 to 0x44932 (12 bytes) (bank=11) (id=97)
-	db SHIP ; tileset
-	db SS_ANNE_3_HEIGHT, SS_ANNE_3_WIDTH ; dimensions (y, x)
-	dw SSAnne3Blocks, SSAnne3TextPointers, SSAnne3Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SSAnne3Object ; objects
+INCLUDE "data/mapHeaders/ssanne3.asm"
 
 SSAnne3Script: ; 44932 (11:4932)
 	jp EnableAutoTextBoxDrawing
@@ -52743,12 +52459,7 @@
 SSAnne3Blocks: ; 44956 (11:4956)
 	INCBIN "maps/ssanne3.blk"
 
-VictoryRoad3_h: ; 0x44974 to 0x44980 (12 bytes) (bank=11) (id=198)
-	db CAVERN ; tileset
-	db VICTORY_ROAD_3_HEIGHT, VICTORY_ROAD_3_WIDTH ; dimensions (y, x)
-	dw VictoryRoad3Blocks, VictoryRoad3TextPointers, VictoryRoad3Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw VictoryRoad3Object ; objects
+INCLUDE "data/mapHeaders/victoryroad3.asm"
 
 VictoryRoad3Script: ; 44980 (11:4980)
 	call VictoryRoad3Script_44996
@@ -52961,12 +52672,7 @@
 VictoryRoad3Blocks: ; 44b37 (11:4b37)
 	INCBIN "maps/victoryroad3.blk"
 
-RocketHideout1_h: ; 0x44bbe to 0x44bca (12 bytes) (bank=11) (id=199)
-	db FACILITY ; tileset
-	db ROCKET_HIDEOUT_1_HEIGHT, ROCKET_HIDEOUT_1_WIDTH ; dimensions (y, x)
-	dw RocketHideout1Blocks, RocketHideout1TextPointers, RocketHideout1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw RocketHideout1Object ; objects
+INCLUDE "data/mapHeaders/rockethideout1.asm"
 
 RocketHideout1Script: ; 44bca (11:4bca)
 	call Func_44be0
@@ -53167,12 +52873,7 @@
 RocketHideout1Blocks: ; 44d49 (11:4d49)
 	INCBIN "maps/rockethideout1.blk"
 
-RocketHideout2_h: ; 0x44e1b to 0x44e27 (12 bytes) (bank=11) (id=200)
-	db FACILITY ; tileset
-	db ROCKET_HIDEOUT_2_HEIGHT, ROCKET_HIDEOUT_2_WIDTH ; dimensions (y, x)
-	dw RocketHideout2Blocks, RocketHideout2TextPointers, RocketHideout2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw RocketHideout2Object ; objects
+INCLUDE "data/mapHeaders/rockethideout2.asm"
 
 RocketHideout2Script: ; 44e27 (11:4e27)
 	call EnableAutoTextBoxDrawing
@@ -53681,12 +53382,7 @@
 RocketHideout2Blocks: ; 45147 (11:5147)
 	INCBIN "maps/rockethideout2.blk"
 
-RocketHideout3_h: ; 0x45219 to 0x45225 (12 bytes) (bank=11) (id=201)
-	db FACILITY ; tileset
-	db ROCKET_HIDEOUT_3_HEIGHT, ROCKET_HIDEOUT_3_WIDTH ; dimensions (y, x)
-	dw RocketHideout3Blocks, RocketHideout3TextPointers, RocketHideout3Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw RocketHideout3Object ; objects
+INCLUDE "data/mapHeaders/rockethideout3.asm"
 
 RocketHideout3Script: ; 45225 (11:5225)
 	call EnableAutoTextBoxDrawing
@@ -53905,12 +53601,7 @@
 RocketHideout3Blocks: ; 4537f (11:537f)
 	INCBIN "maps/rockethideout3.blk"
 
-RocketHideout4_h: ; 0x45451 to 0x4545d (12 bytes) (bank=11) (id=202)
-	db FACILITY ; tileset
-	db ROCKET_HIDEOUT_4_HEIGHT, ROCKET_HIDEOUT_4_WIDTH ; dimensions (y, x)
-	dw RocketHideout4Blocks, RocketHideout4TextPointers, RocketHideout4Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw RocketHideout4Object ; objects
+INCLUDE "data/mapHeaders/rockethideout4.asm"
 
 RocketHideout4Script: ; 4545d (11:545d)
 	call Func_45473
@@ -54150,12 +53841,7 @@
 RocketHideout4Blocks: ; 45650 (11:5650)
 	INCBIN "maps/rockethideout4.blk"
 
-RocketHideoutElevator_h: ; 0x45704 to 0x45710 (12 bytes) (bank=11) (id=203)
-	db LOBBY ; tileset
-	db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x)
-	dw RocketHideoutElevatorBlocks, RocketHideoutElevatorTextPointers, RocketHideoutElevatorScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw RocketHideoutElevatorObject ; objects
+INCLUDE "data/mapHeaders/rockethideoutelevator.asm"
 
 RocketHideoutElevatorScript: ; 45710 (11:5710)
 	ld hl, $d126
@@ -54247,12 +53933,7 @@
 RocketHideoutElevatorBlocks: ; 457a8 (11:57a8)
 	INCBIN "maps/rockethideoutelevator.blk"
 
-SilphCoElevator_h: ; 0x457b4 to 0x457c0 (12 bytes) (bank=11) (id=236)
-	db LOBBY ; tileset
-	db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x)
-	dw SilphCoElevatorBlocks, SilphCoElevatorTextPointers, SilphCoElevatorScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw SilphCoElevatorObject ; objects
+INCLUDE "data/mapHeaders/silphcoelevator.asm"
 
 SilphCoElevatorScript: ; 457c0 (11:57c0)
 	ld hl, $d126
@@ -54340,12 +54021,7 @@
 SilphCoElevatorBlocks: ; 4585b (11:585b)
 	INCBIN "maps/silphcoelevator.blk"
 
-SafariZoneEast_h: ; 0x4585f to 0x4586b (12 bytes) (bank=11) (id=217)
-	db FOREST ; tileset
-	db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x)
-	dw SafariZoneEastBlocks, SafariZoneEastTextPointers, SafariZoneEastScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw SafariZoneEastObject ; objects
+INCLUDE "data/mapHeaders/safarizoneeast.asm"
 
 SafariZoneEastScript: ; 4586b (11:586b)
 	jp EnableAutoTextBoxDrawing
@@ -54376,12 +54052,7 @@
 SafariZoneEastBlocks: ; 458dc (11:58dc)
 	INCBIN "maps/safarizoneeast.blk"
 
-SafariZoneNorth_h: ; 0x4599f to 0x459ab (12 bytes) (bank=11) (id=218)
-	db FOREST ; tileset
-	db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x)
-	dw SafariZoneNorthBlocks, SafariZoneNorthTextPointers, SafariZoneNorthScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw SafariZoneNorthObject ; objects
+INCLUDE "data/mapHeaders/safarizonenorth.asm"
 
 SafariZoneNorthScript: ; 459ab (11:59ab)
 	jp EnableAutoTextBoxDrawing
@@ -54420,12 +54091,7 @@
 SafariZoneNorthBlocks: ; 45a3e (11:5a3e)
 	INCBIN "maps/safarizonenorth.blk"
 
-SafariZoneCenter_h: ; 0x45ba6 to 0x45bb2 (12 bytes) (bank=11) (id=220)
-	db FOREST ; tileset
-	db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x)
-	dw SafariZoneCenterBlocks, SafariZoneCenterTextPointers, SafariZoneCenterScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw SafariZoneCenterObject ; objects
+INCLUDE "data/mapHeaders/safarizonecenter.asm"
 
 SafariZoneCenterScript: ; 45bb2 (11:5bb2)
 	jp EnableAutoTextBoxDrawing
@@ -54448,12 +54114,7 @@
 SafariZoneCenterBlocks: ; 45c1e (11:5c1e)
 	INCBIN "maps/safarizonecenter.blk"
 
-SafariZoneRestHouse1_h: ; 0x45ce1 to 0x45ced (12 bytes) (bank=11) (id=221)
-	db GATE ; tileset
-	db SAFARI_ZONE_REST_HOUSE_1_HEIGHT, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; dimensions (y, x)
-	dw SafariZoneRestHouse1Blocks, SafariZoneRestHouse1TextPointers, SafariZoneRestHouse1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SafariZoneRestHouse1Object ; objects
+INCLUDE "data/mapHeaders/safarizoneresthouse1.asm"
 
 SafariZoneRestHouse1Script: ; 45ced (11:5ced)
 	jp EnableAutoTextBoxDrawing
@@ -54472,12 +54133,7 @@
 
 INCLUDE "data/mapObjects/safarizoneresthouse1.asm"
 
-SafariZoneRestHouse2_h: ; 0x45d1e to 0x45d2a (12 bytes) (bank=11) (id=223)
-	db GATE ; tileset
-	db SAFARI_ZONE_REST_HOUSE_2_HEIGHT, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; dimensions (y, x)
-	dw SafariZoneRestHouse2Blocks, SafariZoneRestHouse2TextPointers, SafariZoneRestHouse2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SafariZoneRestHouse2Object ; objects
+INCLUDE "data/mapHeaders/safarizoneresthouse2.asm"
 
 SafariZoneRestHouse2Script: ; 45d2a (11:5d2a)
 	call EnableAutoTextBoxDrawing
@@ -54502,12 +54158,7 @@
 
 INCLUDE "data/mapObjects/safarizoneresthouse2.asm"
 
-SafariZoneRestHouse3_h: ; 0x45d69 to 0x45d75 (12 bytes) (bank=11) (id=224)
-	db GATE ; tileset
-	db SAFARI_ZONE_REST_HOUSE_3_HEIGHT, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; dimensions (y, x)
-	dw SafariZoneRestHouse3Blocks, SafariZoneRestHouse3TextPointers, SafariZoneRestHouse3Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SafariZoneRestHouse3Object ; objects
+INCLUDE "data/mapHeaders/safarizoneresthouse3.asm"
 
 SafariZoneRestHouse3Script: ; 45d75 (11:5d75)
 	call EnableAutoTextBoxDrawing
@@ -54532,12 +54183,7 @@
 
 INCLUDE "data/mapObjects/safarizoneresthouse3.asm"
 
-SafariZoneRestHouse4_h: ; 0x45db4 to 0x45dc0 (12 bytes) (bank=11) (id=225)
-	db GATE ; tileset
-	db SAFARI_ZONE_REST_HOUSE_4_HEIGHT, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; dimensions (y, x)
-	dw SafariZoneRestHouse4Blocks, SafariZoneRestHouse4TextPointers, SafariZoneRestHouse4Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SafariZoneRestHouse4Object ; objects
+INCLUDE "data/mapHeaders/safarizoneresthouse4.asm"
 
 SafariZoneRestHouse4Script: ; 45dc0 (11:5dc0)
 	call EnableAutoTextBoxDrawing
@@ -54562,12 +54208,7 @@
 
 INCLUDE "data/mapObjects/safarizoneresthouse4.asm"
 
-UnknownDungeon2_h: ; 0x45dff to 0x45e0b (12 bytes) (bank=11) (id=226)
-	db CAVERN ; tileset
-	db UNKNOWN_DUNGEON_2_HEIGHT, UNKNOWN_DUNGEON_2_WIDTH ; dimensions (y, x)
-	dw UnknownDungeon2Blocks, UnknownDungeon2TextPointers, UnknownDungeon2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw UnknownDungeon2Object ; objects
+INCLUDE "data/mapHeaders/unknowndungeon2.asm"
 
 UnknownDungeon2Script: ; 45e0b (11:5e0b)
 	jp EnableAutoTextBoxDrawing
@@ -54582,12 +54223,7 @@
 UnknownDungeon2Blocks: ; 45e5d (11:5e5d)
 	INCBIN "maps/unknowndungeon2.blk"
 
-UnknownDungeon3_h: ; 0x45ee4 to 0x45ef0 (12 bytes) (bank=11) (id=227)
-	db CAVERN ; tileset
-	db UNKNOWN_DUNGEON_3_HEIGHT, UNKNOWN_DUNGEON_3_WIDTH ; dimensions (y, x)
-	dw UnknownDungeon3Blocks, UnknownDungeon3TextPointers, UnknownDungeon3Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw UnknownDungeon3Object ; objects
+INCLUDE "data/mapHeaders/unknowndungeon3.asm"
 
 UnknownDungeon3Script: ; 45ef0 (11:5ef0)
 	call EnableAutoTextBoxDrawing
@@ -54639,12 +54275,7 @@
 UnknownDungeon3Blocks: ; 45f58 (11:5f58)
 	INCBIN "maps/unknowndungeon3.blk"
 
-RockTunnel2_h: ; 0x45fdf to 0x45feb (12 bytes) (bank=11) (id=232)
-	db CAVERN ; tileset
-	db ROCK_TUNNEL_2_HEIGHT, ROCK_TUNNEL_2_WIDTH ; dimensions (y, x)
-	dw RockTunnel2Blocks, RockTunnel2TextPointers, RockTunnel2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw RockTunnel2Object ; objects
+INCLUDE "data/mapHeaders/rocktunnel2.asm"
 
 RockTunnel2Script: ; 45feb (11:5feb)
 	call EnableAutoTextBoxDrawing
@@ -54894,12 +54525,7 @@
 RockTunnel2Blocks: ; 461a1 (11:61a1)
 	INCBIN "maps/rocktunnel2.blk"
 
-SeafoamIslands2_h: ; 0x46309 to 0x46315 (12 bytes) (bank=11) (id=159)
-	db CAVERN ; tileset
-	db SEAFOAM_ISLANDS_2_HEIGHT, SEAFOAM_ISLANDS_2_WIDTH ; dimensions (y, x)
-	dw SeafoamIslands2Blocks, SeafoamIslands2TextPointers, SeafoamIslands2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SeafoamIslands2Object ; objects
+INCLUDE "data/mapHeaders/seafoamislands2.asm"
 
 SeafoamIslands2Script: ; 46315 (11:6315)
 	call EnableAutoTextBoxDrawing
@@ -54955,12 +54581,7 @@
 SeafoamIslands2Blocks: ; 463be (11:63be)
 	INCBIN "maps/seafoamislands2.blk"
 
-SeafoamIslands3_h: ; 0x46445 to 0x46451 (12 bytes) (bank=11) (id=160)
-	db CAVERN ; tileset
-	db SEAFOAM_ISLANDS_3_HEIGHT, SEAFOAM_ISLANDS_3_WIDTH ; dimensions (y, x)
-	dw SeafoamIslands3Blocks, SeafoamIslands3TextPointers, SeafoamIslands3Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SeafoamIslands3Object ; objects
+INCLUDE "data/mapHeaders/seafoamislands3.asm"
 
 SeafoamIslands3Script: ; 46451 (11:6451)
 	call EnableAutoTextBoxDrawing
@@ -55016,12 +54637,7 @@
 SeafoamIslands3Blocks: ; 464fa (11:64fa)
 	INCBIN "maps/seafoamislands3.blk"
 
-SeafoamIslands4_h: ; 0x46581 to 0x4658d (12 bytes) (bank=11) (id=161)
-	db CAVERN ; tileset
-	db SEAFOAM_ISLANDS_4_HEIGHT, SEAFOAM_ISLANDS_4_WIDTH ; dimensions (y, x)
-	dw SeafoamIslands4Blocks, SeafoamIslands4TextPointers, SeafoamIslands4Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SeafoamIslands4Object ; objects
+INCLUDE "data/mapHeaders/seafoamislands4.asm"
 
 SeafoamIslands4Script: ; 4658d (11:658d)
 	call EnableAutoTextBoxDrawing
@@ -55177,12 +54793,7 @@
 SeafoamIslands4Blocks: ; 46706 (11:6706)
 	INCBIN "maps/seafoamislands4.blk"
 
-SeafoamIslands5_h: ; 0x4678d to 0x46799 (12 bytes) (bank=11) (id=162)
-	db CAVERN ; tileset
-	db SEAFOAM_ISLANDS_5_HEIGHT, SEAFOAM_ISLANDS_5_WIDTH ; dimensions (y, x)
-	dw SeafoamIslands5Blocks, SeafoamIslands5TextPointers, SeafoamIslands5Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SeafoamIslands5Object ; objects
+INCLUDE "data/mapHeaders/seafoamislands5.asm"
 
 SeafoamIslands5Script: ; 46799 (11:6799)
 	call EnableAutoTextBoxDrawing
@@ -55500,14 +55111,7 @@
 
 SECTION "bank12",ROMX,BANK[$12]
 
-Route7_h: ; 0x48000 to 0x48022 (34 bytes) (bank=12) (id=18)
-	db OVERWORLD ; tileset
-	db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x)
-	dw Route7Blocks, Route7TextPointers, Route7Script ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION CELADON_CITY, CELADON_CITY_WIDTH, -3, 1, CELADON_CITY_HEIGHT - 3, CeladonCityBlocks, ROUTE_7_WIDTH
-	EAST_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, -3, 1, SAFFRON_CITY_HEIGHT - 3, SaffronCityBlocks, ROUTE_7_WIDTH
-	dw Route7Object ; objects
+INCLUDE "data/mapHeaders/route7.asm"
 
 INCLUDE "data/mapObjects/route7.asm"
 
@@ -55606,12 +55210,7 @@
 	TX_FAR _Route7Text1
 	db "@"
 
-RedsHouse1F_h: ; 4815c (12:415c)
-	db REDS_HOUSE_1 ; tileset
-	db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions
-	dw RedsHouse1FBlocks, RedsHouse1FTextPointers, RedsHouse1FScript
-	db 0 ; no connections
-	dw RedsHouse1FObject
+INCLUDE "data/mapHeaders/redshouse1f.asm"
 
 RedsHouse1FScript: ; 48168 (12:4168)
 	jp EnableAutoTextBoxDrawing
@@ -55688,12 +55287,7 @@
 RedsHouse1FBlocks: ; 48209 (12:4209)
 	INCBIN "maps/redshouse1f.blk"
 
-CeladonMart3_h: ; 0x48219 to 0x48225 (12 bytes) (bank=12) (id=124)
-	db LOBBY ; tileset
-	db CELADON_MART_3_HEIGHT, CELADON_MART_3_WIDTH ; dimensions (y, x)
-	dw CeladonMart3Blocks, CeladonMart3TextPointers, CeladonMart3Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonMart3Object ; objects
+INCLUDE "data/mapHeaders/celadonmart3.asm"
 
 CeladonMart3Script: ; 48225 (12:4225)
 	jp EnableAutoTextBoxDrawing
@@ -55810,12 +55404,7 @@
 CeladonMart3Blocks: ; 48322 (12:4322)
 	INCBIN "maps/celadonmart3.blk"
 
-CeladonMart4_h: ; 0x4834a to 0x48356 (12 bytes) (bank=12) (id=125)
-	db LOBBY ; tileset
-	db CELADON_MART_4_HEIGHT, CELADON_MART_4_WIDTH ; dimensions (y, x)
-	dw CeladonMart4Blocks, CeladonMart4TextPointers, CeladonMart4Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonMart4Object ; objects
+INCLUDE "data/mapHeaders/celadonmart4.asm"
 
 CeladonMart4Script: ; 48356 (12:4356)
 	jp EnableAutoTextBoxDrawing
@@ -55843,12 +55432,7 @@
 CeladonMart4Blocks: ; 483a1 (12:43a1)
 	INCBIN "maps/celadonmart4.blk"
 
-CeladonMartRoof_h: ; 0x483c9 to 0x483d5 (12 bytes) (bank=12) (id=126)
-	db LOBBY ; tileset
-	db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x)
-	dw CeladonMartRoofBlocks, CeladonMartRoofTextPointers, CeladonMartRoofScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonMartRoofObject ; objects
+INCLUDE "data/mapHeaders/celadonmartroof.asm"
 
 CeladonMartRoofScript: ; 483d5 (12:43d5)
 	jp EnableAutoTextBoxDrawing
@@ -56119,12 +55703,7 @@
 CeladonMartRoofBlocks: ; 485cc (12:45cc)
 	INCBIN "maps/celadonmartroof.blk"
 
-CeladonMartElevator_h: ; 0x485f4 to 0x48600 (12 bytes) (bank=12) (id=127)
-	db LOBBY ; tileset
-	db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x)
-	dw CeladonMartElevatorBlocks, CeladonMartElevatorTextPointers, CeladonMartElevatorScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonMartElevatorObject ; objects
+INCLUDE "data/mapHeaders/celadonmartelevator.asm"
 
 CeladonMartElevatorScript: ; 48600 (12:4600)
 	ld hl, $d126
@@ -56203,12 +55782,7 @@
 CeladonMartElevatorBlocks: ; 48684 (12:4684)
 	INCBIN "maps/celadonmartelevator.blk"
 
-CeladonMansion1_h: ; 0x48688 to 0x48694 (12 bytes) (bank=12) (id=128)
-	db MANSION ; tileset
-	db CELADON_MANSION_1_HEIGHT, CELADON_MANSION_1_WIDTH ; dimensions (y, x)
-	dw CeladonMansion1Blocks, CeladonMansion1TextPointers, CeladonMansion1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonMansion1Object ; objects
+INCLUDE "data/mapHeaders/celadonmansion1.asm"
 
 CeladonMansion1Script: ; 48694 (12:4694)
 	jp EnableAutoTextBoxDrawing
@@ -56255,12 +55829,7 @@
 CeladonMansion1Blocks: ; 48716 (12:4716)
 	INCBIN "maps/celadonmansion1.blk"
 
-CeladonMansion2_h: ; 0x4872e to 0x4873a (12 bytes) (bank=12) (id=129)
-	db MANSION ; tileset
-	db CELADON_MANSION_2_HEIGHT, CELADON_MANSION_2_WIDTH ; dimensions (y, x)
-	dw CeladonMansion2Blocks, CeladonMansion2TextPointers, CeladonMansion2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonMansion2Object ; objects
+INCLUDE "data/mapHeaders/celadonmansion2.asm"
 
 CeladonMansion2Script: ; 4873a (12:473a)
 	call EnableAutoTextBoxDrawing
@@ -56278,12 +55847,7 @@
 CeladonMansion2Blocks: ; 4876c (12:476c)
 	INCBIN "maps/celadonmansion2.blk"
 
-CeladonMansion3_h: ; 0x48784 to 0x48790 (12 bytes) (bank=12) (id=130)
-	db MANSION ; tileset
-	db CELADON_MANSION_3_HEIGHT, CELADON_MANSION_3_WIDTH ; dimensions (y, x)
-	dw CeladonMansion3Blocks, CeladonMansion3TextPointers, CeladonMansion3Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonMansion3Object ; objects
+INCLUDE "data/mapHeaders/celadonmansion3.asm"
 
 CeladonMansion3Script: ; 48790 (12:4790)
 	jp EnableAutoTextBoxDrawing
@@ -56364,12 +55928,7 @@
 CeladonMansion3Blocks: ; 48847 (12:4847)
 	INCBIN "maps/celadonmansion3.blk"
 
-CeladonMansion4_h: ; 0x4885f to 0x4886b (12 bytes) (bank=12) (id=131)
-	db MANSION ; tileset
-	db CELADON_MANSION_4_HEIGHT, CELADON_MANSION_4_WIDTH ; dimensions (y, x)
-	dw CeladonMansion4Blocks, CeladonMansion4TextPointers, CeladonMansion4Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonMansion4Object ; objects
+INCLUDE "data/mapHeaders/celadonmansion4.asm"
 
 CeladonMansion4Script: ; 4886b (12:486b)
 	jp EnableAutoTextBoxDrawing
@@ -56386,12 +55945,7 @@
 CeladonMansion4Blocks: ; 48894 (12:4894)
 	INCBIN "maps/celadonmansion4.blk"
 
-CeladonPokecenter_h: ; 0x488ac to 0x488b8 (12 bytes) (bank=12) (id=133)
-	db POKECENTER ; tileset
-	db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x)
-	dw CeladonPokecenterBlocks, CeladonPokecenterTextPointers, CeladonPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonPokecenterObject ; objects
+INCLUDE "data/mapHeaders/celadonpokecenter.asm"
 
 CeladonPokecenterScript: ; 488b8 (12:48b8)
 	call Func_22fa
@@ -56419,12 +55973,7 @@
 
 INCLUDE "data/mapObjects/celadonpokecenter.asm"
 
-CeladonGym_h: ; 0x488fe to 0x4890a (12 bytes) (bank=12) (id=134)
-	db GYM ; tileset
-	db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x)
-	dw CeladonGymBlocks, CeladonGymTextPointers, CeladonGymScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonGymObject ; objects
+INCLUDE "data/mapHeaders/celadongym.asm"
 
 CeladonGymScript: ; 4890a (12:490a)
 	ld hl, $d126
@@ -56776,12 +56325,7 @@
 CeladonGymBlocks: ; 48b84 (12:4b84)
 	INCBIN "maps/celadongym.blk"
 
-CeladonGameCorner_h: ; 0x48bb1 to 0x48bbd (12 bytes) (bank=12) (id=135)
-	db LOBBY ; tileset
-	db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x)
-	dw CeladonGameCornerBlocks, CeladonGameCornerTextPointers, CeladonGameCornerScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonGameCornerObject ; objects
+INCLUDE "data/mapHeaders/celadongamecorner.asm"
 
 CeladonGameCornerScript: ; 48bbd (12:4bbd)
 	call CeladonGameCornerScript_48bcf
@@ -57325,12 +56869,7 @@
 CeladonGameCornerBlocks: ; 49003 (12:5003)
 	INCBIN "maps/celadongamecorner.blk"
 
-CeladonMart5_h: ; 0x4905d to 0x49069 (12 bytes) (bank=12) (id=136)
-	db LOBBY ; tileset
-	db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x)
-	dw CeladonMart5Blocks, CeladonMart5TextPointers, CeladonMart5Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonMart5Object ; objects
+INCLUDE "data/mapHeaders/celadonmart5.asm"
 
 CeladonMart5Script: ; 49069 (12:5069)
 	jp EnableAutoTextBoxDrawing
@@ -57359,12 +56898,7 @@
 CeladonMart5Blocks: ; 490bc (12:50bc)
 	INCBIN "maps/celadonmart5.blk"
 
-CeladonPrizeRoom_h: ; 0x490e4 to 0x490f0 (12 bytes) (bank=12) (id=137)
-	db LOBBY ; tileset
-	db CELADON_PRIZE_ROOM_HEIGHT, CELADON_PRIZE_ROOM_WIDTH ; dimensions (y, x)
-	dw CeladonPrizeRoomBlocks, CeladonPrizeRoomTextPointers, CeladonPrizeRoomScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonPrizeRoomObject ; objects
+INCLUDE "data/mapHeaders/celadonprizeroom.asm"
 
 CeladonPrizeRoomScript: ; 490f0 (12:50f0)
 	jp EnableAutoTextBoxDrawing
@@ -57392,12 +56926,7 @@
 CeladonPrizeRoomBlocks: ; 49131 (12:5131)
 	INCBIN "maps/celadonprizeroom.blk"
 
-CeladonDiner_h: ; 0x49145 to 0x49151 (12 bytes) (bank=12) (id=138)
-	db LOBBY ; tileset
-	db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x)
-	dw CeladonDinerBlocks, CeladonDinerTextPointers, CeladonDinerScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonDinerObject ; objects
+INCLUDE "data/mapHeaders/celadondiner.asm"
 
 CeladonDinerScript: ; 49151 (12:5151)
 	call EnableAutoTextBoxDrawing
@@ -57472,12 +57001,7 @@
 CeladonDinerBlocks: ; 491ee (12:51ee)
 	INCBIN "maps/celadondiner.blk"
 
-CeladonHouse_h: ; 0x49202 to 0x4920e (12 bytes) (bank=12) (id=139)
-	db MANSION ; tileset
-	db CELADON_HOUSE_HEIGHT, CELADON_HOUSE_WIDTH ; dimensions (y, x)
-	dw CeladonHouseBlocks, CeladonHouseTextPointers, CeladonHouseScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonHouseObject ; objects
+INCLUDE "data/mapHeaders/celadonhouse.asm"
 
 CeladonHouseScript: ; 4920e (12:520e)
 	call EnableAutoTextBoxDrawing
@@ -57505,12 +57029,7 @@
 CeladonHouseBlocks: ; 4924d (12:524d)
 	INCBIN "maps/celadonhouse.blk"
 
-CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140)
-	db POKECENTER ; tileset
-	db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x)
-	dw CeladonHotelBlocks, CeladonHotelTextPointers, CeladonHotelScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonHotelObject ; objects
+INCLUDE "data/mapHeaders/celadonhotel.asm"
 
 CeladonHotelScript: ; 49269 (12:5269)
 	jp EnableAutoTextBoxDrawing
@@ -57537,12 +57056,7 @@
 CeladonHotelBlocks: ; 492a7 (12:52a7)
 	INCBIN "maps/celadonhotel.blk"
 
-MtMoonPokecenter_h: ; 0x492c3 to 0x492cf (12 bytes) (bank=12) (id=68)
-	db POKECENTER ; tileset
-	db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x)
-	dw MtMoonPokecenterBlocks, MtMoonPokecenterTextPointers, MtMoonPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw MtMoonPokecenterObject ; objects
+INCLUDE "data/mapHeaders/mtmoonpokecenter.asm"
 
 MtMoonPokecenterScript: ; 492cf (12:52cf)
 	call Func_22fa
@@ -57644,12 +57158,7 @@
 
 INCLUDE "data/mapObjects/mtmoonpokecenter.asm"
 
-RockTunnelPokecenter_h: ; 0x493ae to 0x493ba (12 bytes) (id=81)
-	db POKECENTER ; tileset
-	db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x)
-	dw RockTunnelPokecenterBlocks, RockTunnelPokecenterTextPointers, RockTunnelPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw RockTunnelPokecenterObject ; objects
+INCLUDE "data/mapHeaders/rocktunnelpokecenter.asm"
 
 RockTunnelPokecenterScript: ; 493ba (12:53ba)
 	call Func_22fa
@@ -57677,12 +57186,7 @@
 
 INCLUDE "data/mapObjects/rocktunnelpokecenter.asm"
 
-Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84)
-	db GATE ; tileset
-	db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route11GateBlocks, Route11GateTextPointers, Route11GateScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route11GateObject ; objects
+INCLUDE "data/mapHeaders/route11gate.asm"
 
 Route11GateScript: ; 4940c (12:540c)
 	jp EnableAutoTextBoxDrawing
@@ -57696,12 +57200,7 @@
 
 INCLUDE "data/mapObjects/route11gate.asm"
 
-Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86)
-	db GATE ; tileset
-	db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x)
-	dw Route11GateUpstairsBlocks, Route11GateUpstairsTextPointers, Route11GateUpstairsScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route11GateUpstairsObject ; objects
+INCLUDE "data/mapHeaders/route11gateupstairs.asm"
 
 Route11GateUpstairsScript: ; 49454 (12:5454)
 	jp DisableAutoTextBoxDrawing
@@ -57787,12 +57286,7 @@
 
 INCLUDE "data/mapObjects/route11gateupstairs.asm"
 
-Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87)
-	db GATE ; tileset
-	db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route12GateBlocks, Route12GateTextPointers, Route12GateScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route12GateObject ; objects
+INCLUDE "data/mapHeaders/route12gate.asm"
 
 Route12GateScript: ; 49504 (12:5504)
 	jp EnableAutoTextBoxDrawing
@@ -57809,12 +57303,7 @@
 Route12GateBlocks: ; 49540 (12:5540)
 	INCBIN "maps/route12gate.blk"
 
-Route12GateUpstairs_h: ; 0x49554 to 0x49560 (12 bytes) (id=195)
-	db GATE ; tileset
-	db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x)
-	dw Route12GateUpstairsBlocks, Route12GateUpstairsTextPointers, Route12GateUpstairsScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route12GateUpstairsObject ; objects
+INCLUDE "data/mapHeaders/route12gateupstairs.asm"
 
 Route12GateUpstairsScript: ; 49560 (12:5560)
 	jp DisableAutoTextBoxDrawing
@@ -57898,12 +57387,7 @@
 
 INCLUDE "data/mapObjects/route12gateupstairs.asm"
 
-Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184)
-	db GATE ; tileset
-	db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route15GateBlocks, Route15GateTextPointers, Route15GateScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route15GateObject ; objects
+INCLUDE "data/mapHeaders/route15gate.asm"
 
 Route15GateScript: ; 49602 (12:5602)
 	jp EnableAutoTextBoxDrawing
@@ -57917,12 +57401,7 @@
 
 INCLUDE "data/mapObjects/route15gate.asm"
 
-Route15GateUpstairs_h: ; 4963e (12:563e)
-	db GATE ; tileset
-	db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x)
-	dw Route15GateUpstairsBlocks, Route15GateUpstairsTextPointers, Route15GateUpstairsScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route15GateUpstairsObject ; objects
+INCLUDE "data/mapHeaders/route15gateupstairs.asm"
 
 Route15GateUpstairsScript: ; 4964a (12:564a)
 	jp DisableAutoTextBoxDrawing
@@ -57974,12 +57453,7 @@
 
 INCLUDE "data/mapObjects/route15gateupstairs.asm"
 
-Route16Gate_h: ; 0x496b2 to 0x496be (12 bytes) (id=186)
-	db GATE ; tileset
-	db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route16GateBlocks, Route16GateTextPointers, Route16GateScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route16GateObject ; objects
+INCLUDE "data/mapHeaders/route16gate.asm"
 
 Route16GateScript: ; 496be (12:56be)
 	ld hl, $d732
@@ -58108,12 +57582,7 @@
 Route16GateBlocks: ; 497e3 (12:57e3)
 	INCBIN "maps/route16gate.blk"
 
-Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187)
-	db GATE ; tileset
-	db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x)
-	dw Route16GateUpstairsBlocks, Route16GateUpstairsTextPointers, Route16GateUpstairsScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route16GateUpstairsObject ; objects
+INCLUDE "data/mapHeaders/route16gateupstairs.asm"
 
 Route16GateUpstairsScript: ; 4980b (12:580b)
 	jp DisableAutoTextBoxDrawing
@@ -58164,12 +57633,7 @@
 
 INCLUDE "data/mapObjects/route16gateupstairs.asm"
 
-Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190)
-	db GATE ; tileset
-	db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route18GateBlocks, Route18GateTextPointers, Route18GateScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route18GateObject ; objects
+INCLUDE "data/mapHeaders/route18gate.asm"
 
 Route18GateScript: ; 49876 (12:5876)
 	ld hl, $d732
@@ -58286,12 +57750,7 @@
 
 INCLUDE "data/mapObjects/route18gate.asm"
 
-Route18GateUpstairs_h: ; 0x49969 to 0x49975 (12 bytes) (id=191)
-	db GATE ; tileset
-	db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x)
-	dw Route18GateUpstairsBlocks, Route18GateUpstairsTextPointers, Route18GateUpstairsScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route18GateUpstairsObject ; objects
+INCLUDE "data/mapHeaders/route18gateupstairs.asm"
 
 Route18GateUpstairsScript: ; 49975 (12:5975)
 	jp DisableAutoTextBoxDrawing
@@ -58329,12 +57788,7 @@
 
 INCLUDE "data/mapObjects/route18gateupstairs.asm"
 
-MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59)
-	db CAVERN ; tileset
-	db MT_MOON_1_HEIGHT, MT_MOON_1_WIDTH ; dimensions (y, x)
-	dw MtMoon1Blocks, MtMoon1TextPointers, MtMoon1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw MtMoon1Object ; objects
+INCLUDE "data/mapHeaders/mtmoon1.asm"
 
 MtMoon1Script: ; 499c8 (12:59c8)
 	call EnableAutoTextBoxDrawing
@@ -58567,12 +58021,7 @@
 MtMoon1Blocks: ; 49b97 (12:5b97)
 	INCBIN "maps/mtmoon1.blk"
 
-MtMoon3_h: ; 0x49cff to 0x49d0b (12 bytes) (id=61)
-	db CAVERN ; tileset
-	db MT_MOON_3_HEIGHT, MT_MOON_3_WIDTH ; dimensions (y, x)
-	dw MtMoon3Blocks, MtMoon3TextPointers, MtMoon3Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw MtMoon3Object ; objects
+INCLUDE "data/mapHeaders/mtmoon3.asm"
 
 MtMoon3Script: ; 49d0b (12:5d0b)
 	call EnableAutoTextBoxDrawing
@@ -58994,12 +58443,7 @@
 MtMoon3Blocks: ; 4a041 (12:6041)
 	INCBIN "maps/mtmoon3.blk"
 
-SafariZoneWest_h: ; 0x4a1a9 to 0x4a1b5 (12 bytes) (id=219)
-	db FOREST ; tileset
-	db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x)
-	dw SafariZoneWestBlocks, SafariZoneWestTextPointers, SafariZoneWestScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw SafariZoneWestObject ; objects
+INCLUDE "data/mapHeaders/safarizonewest.asm"
 
 SafariZoneWestScript: ; 4a1b5 (12:61b5)
 	jp EnableAutoTextBoxDrawing
@@ -59035,12 +58479,7 @@
 SafariZoneWestBlocks: ; 4a248 (12:6248)
 	INCBIN "maps/safarizonewest.blk"
 
-SafariZoneSecretHouse_h: ; 0x4a30b to 0x4a317 (12 bytes) (id=222)
-	db LAB ; tileset
-	db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x)
-	dw SafariZoneSecretHouseBlocks, SafariZoneSecretHouseTextPointers, SafariZoneSecretHouseScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw SafariZoneSecretHouseObject ; objects
+INCLUDE "data/mapHeaders/safarizonesecrethouse.asm"
 
 SafariZoneSecretHouseScript: ; 4a317 (12:6317)
 	jp EnableAutoTextBoxDrawing
@@ -59190,12 +58629,7 @@
 LancePic: ; 4fba2 (13:7ba2)
 	INCBIN "pic/trainer/lance.pic"
 
-BattleCenterM_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239)
-	db CLUB ; tileset
-	db BATTLE_CENTER_HEIGHT, BATTLE_CENTER_WIDTH ; dimensions (y, x)
-	dw BattleCenterMBlocks, BattleCenterMTextPointers, BattleCenterMScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw BattleCenterMObject ; objects
+INCLUDE "data/mapHeaders/battlecenterm.asm"
 
 BattleCenterMScript: ; 4fd10 (13:7d10)
 	call EnableAutoTextBoxDrawing
@@ -59241,12 +58675,7 @@
 BattleCenterMBlocks: ; 4fd5d (13:7d5d)
 	INCBIN "maps/battlecenterm.blk"
 
-TradeCenterM_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240)
-	db CLUB ; tileset
-	db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x)
-	dw TradeCenterMBlocks, TradeCenterMTextPointers, TradeCenterMScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw TradeCenterMObject ; objects
+INCLUDE "data/mapHeaders/tradecenterm.asm"
 
 TradeCenterMScript: ; 4fd7d (13:7d7d)
 	jp BattleCenterMScript
@@ -59531,14 +58960,7 @@
 
 SECTION "bank14",ROMX,BANK[$14]
 
-Route22_h: ; 0x50000 to 0x50022 (34 bytes) (id=33)
-	db OVERWORLD ; tileset
-	db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x)
-	dw Route22Blocks, Route22TextPointers, Route22Script ; blocks, texts, scripts
-	db NORTH | EAST ; connections
-	NORTH_MAP_CONNECTION ROUTE_23, ROUTE_23_WIDTH, ROUTE_23_HEIGHT, 0, 0, ROUTE_23_WIDTH, Route23Blocks
-	EAST_MAP_CONNECTION VIRIDIAN_CITY, VIRIDIAN_CITY_WIDTH, -3, 1, VIRIDIAN_CITY_HEIGHT - 3, ViridianCityBlocks, ROUTE_22_WIDTH
-	dw Route22Object ; objects
+INCLUDE "data/mapHeaders/route22.asm"
 
 INCLUDE "data/mapObjects/route22.asm"
 
@@ -59545,14 +58967,7 @@
 Route22Blocks: ; 5003d (14:403d)
 	INCBIN "maps/route22.blk"
 
-Route20_h: ; 0x500f1 to 0x50113 (34 bytes) (id=31)
-	db OVERWORLD ; tileset
-	db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x)
-	dw Route20Blocks, Route20TextPointers, Route20Script ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION CINNABAR_ISLAND, CINNABAR_ISLAND_WIDTH, 0, 0, CINNABAR_ISLAND_HEIGHT, CinnabarIslandBlocks, ROUTE_20_WIDTH
-	EAST_MAP_CONNECTION ROUTE_19, ROUTE_19_WIDTH, -3, 15, ROUTE_19_HEIGHT - 15, Route19Blocks, ROUTE_20_WIDTH
-	dw Route20Object ; objects
+INCLUDE "data/mapHeaders/route20.asm"
 
 INCLUDE "data/mapObjects/route20.asm"
 
@@ -59559,14 +58974,7 @@
 Route20Blocks: ; 5017d (14:417d)
 	INCBIN "maps/route20.blk"
 
-Route23_h: ; 0x5033f to 0x50361 (34 bytes) (id=34)
-	db PLATEAU ; tileset
-	db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x)
-	dw Route23Blocks, Route23TextPointers, Route23Script ; blocks, texts, scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION INDIGO_PLATEAU, INDIGO_PLATEAU_WIDTH, INDIGO_PLATEAU_HEIGHT, 0, 0, INDIGO_PLATEAU_WIDTH, IndigoPlateauBlocks
-	SOUTH_MAP_CONNECTION ROUTE_22, ROUTE_22_WIDTH, 0, 0, ROUTE_22_WIDTH - 7, Route22Blocks, ROUTE_23_WIDTH, ROUTE_23_HEIGHT
-	dw Route23Object ; objects
+INCLUDE "data/mapHeaders/route23.asm"
 
 INCLUDE "data/mapObjects/route23.asm"
 
@@ -59573,14 +58981,7 @@
 Route23Blocks: ; 503b2 (14:43b2)
 	INCBIN "maps/route23.blk"
 
-Route24_h: ; 0x50682 to 0x506a4 (34 bytes) (id=35)
-	db OVERWORLD ; tileset
-	db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x)
-	dw Route24Blocks, Route24TextPointers, Route24Script ; blocks, texts, scripts
-	db SOUTH | EAST ; connections
-	SOUTH_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, -3, 2, CERULEAN_CITY_WIDTH - 4, CeruleanCityBlocks, ROUTE_24_WIDTH, ROUTE_24_HEIGHT
-	EAST_MAP_CONNECTION ROUTE_25, ROUTE_25_WIDTH, 0, 0, ROUTE_25_HEIGHT, Route25Blocks, ROUTE_24_WIDTH
-	dw Route24Object ; objects
+INCLUDE "data/mapHeaders/route24.asm"
 
 INCLUDE "data/mapObjects/route24.asm"
 
@@ -59587,13 +58988,7 @@
 Route24Blocks: ; 506e7 (14:46e7)
 	INCBIN "maps/route24.blk"
 
-Route25_h: ; 0x5079b to 0x507b2 (23 bytes) (id=36)
-	db OVERWORLD ; tileset
-	db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x)
-	dw Route25Blocks, Route25TextPointers, Route25Script ; blocks, texts, scripts
-	db WEST ; connections
-	WEST_MAP_CONNECTION ROUTE_24, ROUTE_24_WIDTH, 0, 0, ROUTE_24_HEIGHT - 6, Route24Blocks, ROUTE_25_WIDTH
-	dw Route25Object ; objects
+INCLUDE "data/mapHeaders/route25.asm"
 
 INCLUDE "data/mapObjects/route25.asm"
 
@@ -59600,13 +58995,7 @@
 Route25Blocks: ; 50810 (14:4810)
 	INCBIN "maps/route25.blk"
 
-IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9)
-	db PLATEAU ; tileset
-	db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x)
-	dw IndigoPlateauBlocks, IndigoPlateauTextPointers, IndigoPlateauScript ; blocks, texts, scripts
-	db SOUTH ; connections
-	SOUTH_MAP_CONNECTION ROUTE_23, ROUTE_23_WIDTH, 0, 0, ROUTE_23_WIDTH, Route23Blocks, INDIGO_PLATEAU_WIDTH, INDIGO_PLATEAU_HEIGHT
-	dw IndigoPlateauObject ; objects
+INCLUDE "data/mapHeaders/indigoplateau.asm"
 
 IndigoPlateauScript: ; 50935 (14:4935)
 	ret
@@ -59617,16 +59006,7 @@
 IndigoPlateauBlocks: ; 5094a (14:494a)
 	INCBIN "maps/indigoplateau.blk"
 
-SaffronCity_h: ; 0x509a4 to 0x509dc (56 bytes) (id=10)
-	db OVERWORLD ; tileset
-	db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x)
-	dw SaffronCityBlocks, SaffronCityTextPointers, SaffronCityScript ; blocks, texts, scripts
-	db NORTH | SOUTH | WEST | EAST ; connections
-	NORTH_MAP_CONNECTION ROUTE_5, ROUTE_5_WIDTH, ROUTE_5_HEIGHT, 5, 0, ROUTE_5_WIDTH, Route5Blocks
-	SOUTH_MAP_CONNECTION ROUTE_6, ROUTE_6_WIDTH, 5, 0, ROUTE_6_WIDTH, Route6Blocks, SAFFRON_CITY_WIDTH, SAFFRON_CITY_HEIGHT
-	WEST_MAP_CONNECTION ROUTE_7, ROUTE_7_WIDTH, 4, 0, ROUTE_7_HEIGHT, Route7Blocks, SAFFRON_CITY_WIDTH
-	EAST_MAP_CONNECTION ROUTE_8, ROUTE_8_WIDTH, 4, 0, ROUTE_8_HEIGHT, Route8Blocks, SAFFRON_CITY_WIDTH
-	dw SaffronCityObject ; objects
+INCLUDE "data/mapHeaders/saffroncity.asm"
 
 INCLUDE "data/mapObjects/saffroncity.asm"
 
@@ -61436,12 +60816,7 @@
 	TX_FAR _Route25Text11
 	db "@"
 
-VictoryRoad2_h: ; 0x51791 to 0x5179d (12 bytes) (id=194)
-	db CAVERN ; tileset
-	db VICTORY_ROAD_2_HEIGHT, VICTORY_ROAD_2_WIDTH ; dimensions (y, x)
-	dw VictoryRoad2Blocks, VictoryRoad2TextPointers, VictoryRoad2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw VictoryRoad2Object ; objects
+INCLUDE "data/mapHeaders/victoryroad2.asm"
 
 VictoryRoad2Script: ; 5179d (14:579d)
 	ld hl, $d126
@@ -61697,12 +61072,7 @@
 VictoryRoad2Blocks: ; 519af (14:59af)
 	INCBIN "maps/victoryroad2.blk"
 
-MtMoon2_h: ; 0x51a36 to 0x51a42 (12 bytes) (id=60)
-	db CAVERN ; tileset
-	db MT_MOON_2_HEIGHT, MT_MOON_2_WIDTH ; dimensions (y, x)
-	dw MtMoon2Blocks, MtMoon2TextPointers, MtMoon2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw MtMoon2Object ; objects
+INCLUDE "data/mapHeaders/mtmoon2.asm"
 
 MtMoon2Script: ; 51a42 (14:5a42)
 	call EnableAutoTextBoxDrawing
@@ -61720,12 +61090,7 @@
 MtMoon2Blocks: ; 51a91 (14:5a91)
 	INCBIN "maps/mtmoon2.blk"
 
-SilphCo7_h: ; 0x51b55 to 0x51b61 (12 bytes) (id=212)
-	db FACILITY ; tileset
-	db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x)
-	dw SilphCo7Blocks, SilphCo7TextPointers, SilphCo7Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SilphCo7Object ; objects
+INCLUDE "data/mapHeaders/silphco7.asm"
 
 SilphCo7Script: ; 51b61 (14:5b61)
 	call SilphCo7Script_51b77
@@ -62258,12 +61623,7 @@
 SilphCo7Blocks: ; 51f57 (14:5f57)
 	INCBIN "maps/silphco7.blk"
 
-Mansion2_h: ; 0x51fcc to 0x51fd8 (12 bytes) (id=214)
-	db FACILITY ; tileset
-	db MANSION_2_HEIGHT, MANSION_2_WIDTH ; dimensions (y, x)
-	dw Mansion2Blocks, Mansion2TextPointers, Mansion2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw Mansion2Object ; objects
+INCLUDE "data/mapHeaders/mansion2.asm"
 
 Mansion2Script: ; 51fd8 (14:5fd8)
 	call Mansion2Script_51fee
@@ -62416,12 +61776,7 @@
 Mansion2Blocks: ; 52110 (14:6110)
 	INCBIN "maps/mansion2.blk"
 
-Mansion3_h: ; 0x521e2 to 0x521ee (12 bytes) (id=215)
-	db FACILITY ; tileset
-	db MANSION_3_HEIGHT, MANSION_3_WIDTH ; dimensions (y, x)
-	dw Mansion3Blocks, Mansion3TextPointers, Mansion3Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw Mansion3Object ; objects
+INCLUDE "data/mapHeaders/mansion3.asm"
 
 Mansion3Script: ; 521ee (14:61ee)
 	call Mansion3Script_52204
@@ -62582,12 +61937,7 @@
 Mansion3Blocks: ; 52326 (14:6326)
 	INCBIN "maps/mansion3.blk"
 
-Mansion4_h: ; 0x523ad to 0x523b9 (12 bytes) (id=216)
-	db FACILITY ; tileset
-	db MANSION_4_HEIGHT, MANSION_4_WIDTH ; dimensions (y, x)
-	dw Mansion4Blocks, Mansion4TextPointers, Mansion4Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw Mansion4Object ; objects
+INCLUDE "data/mapHeaders/mansion4.asm"
 
 Mansion4Script: ; 523b9 (14:63b9)
 	call Mansion4Script_523cf
@@ -63379,14 +62729,7 @@
 
 SECTION "bank15",ROMX,BANK[$15]
 
-Route2_h: ; 54000 (15:4000)
-	db 00 ; Tileset
-	db ROUTE_2_HEIGHT,ROUTE_2_WIDTH ;Height,Width blocks (1 block = 4x4 tiles)
-	dw Route2Blocks, Route2TextPointers, Route2Script
-	db NORTH | SOUTH ;Connection Byte
-	NORTH_MAP_CONNECTION PEWTER_CITY, PEWTER_CITY_WIDTH, PEWTER_CITY_HEIGHT, -3, 2, PEWTER_CITY_WIDTH - 4, PewterCityBlocks
-	SOUTH_MAP_CONNECTION VIRIDIAN_CITY, VIRIDIAN_CITY_WIDTH, -3, 2, VIRIDIAN_CITY_WIDTH - 4, ViridianCityBlocks, ROUTE_2_WIDTH, ROUTE_2_HEIGHT
-	dw Route2Object ;Object Data Pointer
+INCLUDE "data/mapHeaders/route2.asm"
 
 INCLUDE "data/mapObjects/route2.asm"
 
@@ -63393,14 +62736,7 @@
 Route2Blocks: ; 5407e (15:407e)
 	INCBIN "maps/route2.blk"
 
-Route3_h: ; 0x541e6 to 0x54208 (34 bytes) (id=14)
-	db OVERWORLD ; tileset
-	db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x)
-	dw Route3Blocks, Route3TextPointers, Route3Script ; blocks, texts, scripts
-	db NORTH | WEST ; connections
-	NORTH_MAP_CONNECTION ROUTE_4, ROUTE_4_WIDTH, ROUTE_4_HEIGHT, 25, 0, ROUTE_4_WIDTH - 32, Route4Blocks
-	WEST_MAP_CONNECTION PEWTER_CITY, PEWTER_CITY_WIDTH, -3, 1, PEWTER_CITY_HEIGHT - 3, PewterCityBlocks, ROUTE_3_WIDTH
-	dw Route3Object ; objects
+INCLUDE "data/mapHeaders/route3.asm"
 
 INCLUDE "data/mapObjects/route3.asm"
 
@@ -63407,14 +62743,7 @@
 Route3Blocks: ; 54255 (15:4255)
 	INCBIN "maps/route3.blk"
 
-Route4_h: ; 0x54390 to 0x543b2 (34 bytes) (id=15)
-	db OVERWORLD ; tileset
-	db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x)
-	dw Route4Blocks, Route4TextPointers, Route4Script; blocks, texts, scripts
-	db SOUTH | EAST ; connections
-	SOUTH_MAP_CONNECTION ROUTE_3, ROUTE_3_WIDTH, -3, 22, ROUTE_3_WIDTH - 22, Route3Blocks, ROUTE_4_WIDTH, ROUTE_4_HEIGHT
-	EAST_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, -3, 1, CERULEAN_CITY_HEIGHT - 3, CeruleanCityBlocks, ROUTE_4_WIDTH
-	dw Route4Object ; objects
+INCLUDE "data/mapHeaders/route4.asm"
 
 INCLUDE "data/mapObjects/route4.asm"
 
@@ -63421,14 +62750,7 @@
 Route4Blocks: ; 543ec (15:43ec)
 	INCBIN "maps/route4.blk"
 
-Route5_h: ; 0x54581 to 0x545a3 (34 bytes) (id=16)
-	db OVERWORLD ; tileset
-	db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x)
-	dw Route5Blocks, Route5TextPointers, Route5Script ; blocks, texts, scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, CERULEAN_CITY_HEIGHT, -3, 2, CERULEAN_CITY_WIDTH - 4, CeruleanCityBlocks
-	SOUTH_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, -3, 2, SAFFRON_CITY_WIDTH - 4, SaffronCityBlocks, ROUTE_5_WIDTH, ROUTE_5_HEIGHT
-	dw Route5Object ; objects
+INCLUDE "data/mapHeaders/route5.asm"
 
 INCLUDE "data/mapObjects/route5.asm"
 
@@ -63435,14 +62757,7 @@
 Route5Blocks: ; 545d2 (15:45d2)
 	INCBIN "maps/route5.blk"
 
-Route9_h: ; 0x54686 to 0x546a8 (34 bytes) (id=20)
-	db OVERWORLD ; tileset
-	db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x)
-	dw Route9Blocks, Route9TextPointers, Route9Script ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, -3, 1, CERULEAN_CITY_HEIGHT - 3, CeruleanCityBlocks, ROUTE_9_WIDTH
-	EAST_MAP_CONNECTION ROUTE_10, ROUTE_10_WIDTH, 0, 0, ROUTE_10_HEIGHT - 24, Route10Blocks, ROUTE_9_WIDTH
-	dw Route9Object ; objects
+INCLUDE "data/mapHeaders/route9.asm"
 
 INCLUDE "data/mapObjects/route9.asm"
 
@@ -63449,14 +62764,7 @@
 Route9Blocks: ; 546fe (15:46fe)
 	INCBIN "maps/route9.blk"
 
-Route13_h: ; 0x5480c to 0x5482e (34 bytes) (id=24)
-	db OVERWORLD ; tileset
-	db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x)
-	dw Route13Blocks, Route13TextPointers, Route13Script ; blocks, texts, scripts
-	db NORTH | WEST ; connections
-	NORTH_MAP_CONNECTION ROUTE_12, ROUTE_12_WIDTH, ROUTE_12_HEIGHT, 20, 0, ROUTE_12_WIDTH, Route12Blocks
-	WEST_MAP_CONNECTION ROUTE_14, ROUTE_14_WIDTH, 0, 0, ROUTE_14_HEIGHT - 15, Route14Blocks, ROUTE_13_WIDTH
-	dw Route13Object ; objects
+INCLUDE "data/mapHeaders/route13.asm"
 
 INCLUDE "data/mapObjects/route13.asm"
 
@@ -63463,14 +62771,7 @@
 Route13Blocks: ; 5488b (15:488b)
 	INCBIN "maps/route13.blk"
 
-Route14_h: ; 0x54999 to 0x549bb (34 bytes) (id=25)
-	db OVERWORLD ; tileset
-	db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x)
-	dw Route14Blocks, Route14TextPointers, Route14Script ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_15, ROUTE_15_WIDTH, 18, 0, ROUTE_15_HEIGHT, Route15Blocks, ROUTE_14_WIDTH
-	EAST_MAP_CONNECTION ROUTE_13, ROUTE_13_WIDTH, 0, 0, ROUTE_13_HEIGHT, Route13Blocks, ROUTE_14_WIDTH
-	dw Route14Object ; objects
+INCLUDE "data/mapHeaders/route14.asm"
 
 INCLUDE "data/mapObjects/route14.asm"
 
@@ -63477,14 +62778,7 @@
 Route14Blocks: ; 54a12 (15:4a12)
 	INCBIN "maps/route14.blk"
 
-Route17_h: ; 0x54b20 to 0x54b42 (34 bytes) (id=28)
-	db OVERWORLD ; tileset
-	db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x)
-	dw Route17Blocks, Route17TextPointers, Route17Script ; blocks, texts, scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_16, ROUTE_16_WIDTH, ROUTE_16_HEIGHT, 0, 0, ROUTE_16_WIDTH - 7, Route16Blocks
-	SOUTH_MAP_CONNECTION ROUTE_18, ROUTE_18_WIDTH, 0, 0, ROUTE_18_WIDTH - 12, Route18Blocks, ROUTE_17_WIDTH, ROUTE_17_HEIGHT
-	dw Route17Object ; objects
+INCLUDE "data/mapHeaders/route17.asm"
 
 INCLUDE "data/mapObjects/route17.asm"
 
@@ -63491,14 +62785,7 @@
 Route17Blocks: ; 54ba8 (15:4ba8)
 	INCBIN "maps/route17.blk"
 
-Route19_h: ; 0x54e78 to 0x54e9a (34 bytes) (id=30)
-	db OVERWORLD ; tileset
-	db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x)
-	dw Route19Blocks, Route19TextPointers, Route19Script ; blocks, texts, scripts
-	db NORTH | WEST ; connections
-	NORTH_MAP_CONNECTION FUCHSIA_CITY, FUCHSIA_CITY_WIDTH, FUCHSIA_CITY_HEIGHT, -3, 2, FUCHSIA_CITY_WIDTH - 4, FuchsiaCityBlocks
-	WEST_MAP_CONNECTION ROUTE_20, ROUTE_20_WIDTH, 18, 0, ROUTE_20_HEIGHT, Route20Blocks, ROUTE_19_WIDTH
-	dw Route19Object ; objects
+INCLUDE "data/mapHeaders/route19.asm"
 
 INCLUDE "data/mapObjects/route19.asm"
 
@@ -63505,14 +62792,7 @@
 Route19Blocks: ; 54ef1 (15:4ef1)
 	INCBIN "maps/route19.blk"
 
-Route21_h: ; 0x54fff to 0x55021 (34 bytes) (id=32)
-	db OVERWORLD ; tileset
-	db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x)
-	dw Route21Blocks, Route21TextPointers, Route21Script ; blocks, texts, scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION PALLET_TOWN, PALLET_TOWN_WIDTH, PALLET_TOWN_HEIGHT, 0, 0, PALLET_TOWN_WIDTH, PalletTownBlocks
-	SOUTH_MAP_CONNECTION CINNABAR_ISLAND, CINNABAR_ISLAND_WIDTH, 0, 0, CINNABAR_ISLAND_WIDTH, CinnabarIslandBlocks, ROUTE_21_WIDTH, ROUTE_21_HEIGHT
-	dw Route21Object ; objects
+INCLUDE "data/mapHeaders/route21.asm"
 
 INCLUDE "data/mapObjects/route21.asm"
 
@@ -66046,12 +65326,7 @@
 	TX_FAR _Route21AfterBattleText9
 	db "@"
 
-VermilionHouse2_h: ; 0x56064 to 0x56070 (12 bytes) (id=163)
-	db HOUSE ; tileset
-	db VERMILION_HOUSE_2_HEIGHT, VERMILION_HOUSE_2_WIDTH ; dimensions (y, x)
-	dw VermilionHouse2Blocks, VermilionHouse2TextPointers, VermilionHouse2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw VermilionHouse2Object ; objects
+INCLUDE "data/mapHeaders/vermilionhouse2.asm"
 
 VermilionHouse2Script: ; 56070 (15:6070)
 	jp EnableAutoTextBoxDrawing
@@ -66113,12 +65388,7 @@
 
 INCLUDE "data/mapObjects/vermilionhouse2.asm"
 
-CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123)
-	db LOBBY ; tileset
-	db CELADON_MART_2_HEIGHT, CELADON_MART_2_WIDTH ; dimensions (y, x)
-	dw CeladonMart2Blocks, CeladonMart2TextPointers, CeladonMart2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonMart2Object ; objects
+INCLUDE "data/mapHeaders/celadonmart2.asm"
 
 CeladonMart2Script: ; 560f5 (15:60f5)
 	jp EnableAutoTextBoxDrawing
@@ -66147,12 +65417,7 @@
 CeladonMart2Blocks: ; 56148 (15:6148)
 	INCBIN "maps/celadonmart2.blk"
 
-FuchsiaHouse3_h: ; 0x56170 to 0x5617c (12 bytes) (id=164)
-	db SHIP ; tileset
-	db FUCHSIA_HOUSE_3_HEIGHT, FUCHSIA_HOUSE_3_WIDTH ; dimensions (y, x)
-	dw FuchsiaHouse3Blocks, FuchsiaHouse3TextPointers, FuchsiaHouse3Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw FuchsiaHouse3Object ; objects
+INCLUDE "data/mapHeaders/fuchsiahouse3.asm"
 
 FuchsiaHouse3Script: ; 5617c (15:617c)
 	jp EnableAutoTextBoxDrawing
@@ -66232,12 +65497,7 @@
 
 INCLUDE "data/mapObjects/fuchsiahouse3.asm"
 
-DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72)
-	db HOUSE ; tileset
-	db DAYCAREM_HEIGHT, DAYCAREM_WIDTH ; dimensions (y, x)
-	dw DayCareMBlocks, DayCareMTextPointers, DayCareMScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw DayCareMObject ; objects
+INCLUDE "data/mapHeaders/daycarem.asm"
 
 DayCareMScript: ; 5624f (15:624f)
 	jp EnableAutoTextBoxDrawing
@@ -66516,12 +65776,7 @@
 
 INCLUDE "data/mapObjects/daycarem.asm"
 
-Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189)
-	db HOUSE ; tileset
-	db ROUTE_12_HOUSE_HEIGHT, ROUTE_12_HOUSE_WIDTH ; dimensions (y, x)
-	dw Route12HouseBlocks, Route12HouseTextPointers, Route12HouseScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route12HouseObject ; objects
+INCLUDE "data/mapHeaders/route12house.asm"
 
 Route12HouseScript: ; 5647f (15:647f)
 	jp EnableAutoTextBoxDrawing
@@ -66583,12 +65838,7 @@
 
 INCLUDE "data/mapObjects/route12house.asm"
 
-SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213)
-	db FACILITY ; tileset
-	db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x)
-	dw SilphCo8Blocks, SilphCo8TextPointers, SilphCo8Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SilphCo8Object ; objects
+INCLUDE "data/mapHeaders/silphco8.asm"
 
 SilphCo8Script: ; 56504 (15:6504)
 	call SilphCo8Script_5651a
@@ -67247,34 +66497,14 @@
 
 SECTION "bank16",ROMX,BANK[$16]
 
-Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17)
-	db OVERWORLD ; tileset
-	db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x)
-	dw Route6Blocks, Route6TextPointers, Route6Script ; blocks, texts, scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, SAFFRON_CITY_HEIGHT, -3, 2, SAFFRON_CITY_WIDTH - 4, SaffronCityBlocks
-	SOUTH_MAP_CONNECTION VERMILION_CITY, VERMILION_CITY_WIDTH, -3, 2, VERMILION_CITY_WIDTH - 4, VermilionCityBlocks, ROUTE_6_WIDTH, ROUTE_6_HEIGHT
-	dw Route6Object ; objects
+INCLUDE "data/mapHeaders/route6.asm"
 
 INCLUDE "data/mapObjects/route6.asm"
 
-	; warp-to
-	EVENT_DISP ROUTE_6_WIDTH, $1, $9 ; ROUTE_6_GATE
-	EVENT_DISP ROUTE_6_WIDTH, $1, $a ; ROUTE_6_GATE
-	EVENT_DISP ROUTE_6_WIDTH, $7, $a ; ROUTE_6_GATE
-	EVENT_DISP ROUTE_6_WIDTH, $d, $11 ; PATH_ENTRANCE_ROUTE_6
-
 Route6Blocks: ; 58079 (16:4079)
 	INCBIN "maps/route6.blk"
 
-Route8_h: ; 0x5812d to 0x5814f (34 bytes) (id=19)
-	db OVERWORLD ; tileset
-	db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x)
-	dw Route8Blocks, Route8TextPointers, Route8Script ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, -3, 1, SAFFRON_CITY_HEIGHT - 3, SaffronCityBlocks, ROUTE_8_WIDTH
-	EAST_MAP_CONNECTION LAVENDER_TOWN, LAVENDER_TOWN_WIDTH, 0, 0, LAVENDER_TOWN_HEIGHT, LavenderTownBlocks, ROUTE_8_WIDTH
-	dw Route8Object ; objects
+INCLUDE "data/mapHeaders/route8.asm"
 
 INCLUDE "data/mapObjects/route8.asm"
 
@@ -67281,14 +66511,7 @@
 Route8Blocks: ; 581c6 (16:41c6)
 	INCBIN "maps/route8.blk"
 
-Route10_h: ; 0x582d4 to 0x582f6 (34 bytes) (id=21)
-	db OVERWORLD ; tileset
-	db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x)
-	dw Route10Blocks, Route10TextPointers, Route10Script ; blocks, texts, scripts
-	db SOUTH | WEST ; connections
-	SOUTH_MAP_CONNECTION LAVENDER_TOWN, LAVENDER_TOWN_WIDTH, 0, 0, LAVENDER_TOWN_WIDTH, LavenderTownBlocks, ROUTE_10_WIDTH, ROUTE_10_HEIGHT
-	WEST_MAP_CONNECTION ROUTE_9, ROUTE_9_WIDTH, 0, 0, ROUTE_9_HEIGHT, Route9Blocks, ROUTE_10_WIDTH
-	dw Route10Object ; objects
+INCLUDE "data/mapHeaders/route10.asm"
 
 INCLUDE "data/mapObjects/route10.asm"
 
@@ -67295,14 +66518,7 @@
 Route10Blocks: ; 58356 (16:4356)
 	INCBIN "maps/route10.blk"
 
-Route11_h: ; 0x584be to 0x584e0 (34 bytes) (id=22)
-	db OVERWORLD ; tileset
-	db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x)
-	dw Route11Blocks, Route11TextPointers, Route11Script ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION VERMILION_CITY, VERMILION_CITY_WIDTH, -3, 1, VERMILION_CITY_HEIGHT - 3, VermilionCityBlocks, ROUTE_11_WIDTH
-	EAST_MAP_CONNECTION ROUTE_12, ROUTE_12_WIDTH, -3, 24, ROUTE_12_HEIGHT - 39, Route12Blocks, ROUTE_11_WIDTH
-	dw Route11Object ; objects
+INCLUDE "data/mapHeaders/route11.asm"
 
 INCLUDE "data/mapObjects/route11.asm"
 
@@ -67309,15 +66525,7 @@
 Route11Blocks: ; 5855f (16:455f)
 	INCBIN "maps/route11.blk"
 
-Route12_h: ; 0x5866d to 0x5869a (45 bytes) (id=23)
-	db OVERWORLD ; tileset
-	db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x)
-	dw Route12Blocks, Route12TextPointers, Route12Script ; blocks, texts, scripts
-	db NORTH | SOUTH | WEST ; connections
-	NORTH_MAP_CONNECTION LAVENDER_TOWN, LAVENDER_TOWN_WIDTH, LAVENDER_TOWN_HEIGHT, 0, 0, LAVENDER_TOWN_WIDTH, LavenderTownBlocks
-	SOUTH_MAP_CONNECTION ROUTE_13, ROUTE_13_WIDTH, -3, 17, ROUTE_13_WIDTH - 17, Route13Blocks, ROUTE_12_WIDTH, ROUTE_12_HEIGHT
-	WEST_MAP_CONNECTION ROUTE_11, ROUTE_11_WIDTH, 27, 0, ROUTE_11_HEIGHT, Route11Blocks, ROUTE_12_WIDTH
-	dw Route12Object ; objects
+INCLUDE "data/mapHeaders/route12.asm"
 
 INCLUDE "data/mapObjects/route12.asm"
 
@@ -67324,14 +66532,7 @@
 Route12Blocks: ; 58710 (16:4710)
 	INCBIN "maps/route12.blk"
 
-Route15_h: ; 0x5892c to 0x5894e (34 bytes) (id=26)
-	db OVERWORLD ; tileset
-	db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x)
-	dw Route15Blocks, Route15TextPointers, Route15Script ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION FUCHSIA_CITY, FUCHSIA_CITY_WIDTH, -3, 1, FUCHSIA_CITY_HEIGHT - 3, FuchsiaCityBlocks, ROUTE_15_WIDTH
-	EAST_MAP_CONNECTION ROUTE_14, ROUTE_14_WIDTH, -3, 15, ROUTE_14_HEIGHT - 15, Route14Blocks, ROUTE_15_WIDTH
-	dw Route15Object ; objects
+INCLUDE "data/mapHeaders/route15.asm"
 
 INCLUDE "data/mapObjects/route15.asm"
 
@@ -67338,14 +66539,7 @@
 Route15Blocks: ; 589cc (16:49cc)
 	INCBIN "maps/route15.blk"
 
-Route16_h: ; 0x58ada to 0x58afc (34 bytes) (id=27)
-	db OVERWORLD ; tileset
-	db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x)
-	dw Route16Blocks, Route16TextPointers, Route16Script ; blocks, texts, scripts
-	db SOUTH | EAST ; connections
-	SOUTH_MAP_CONNECTION ROUTE_17, ROUTE_17_WIDTH, 0, 0, ROUTE_17_WIDTH, Route17Blocks, ROUTE_16_WIDTH, ROUTE_16_HEIGHT
-	EAST_MAP_CONNECTION CELADON_CITY, CELADON_CITY_WIDTH, -3, 1, CELADON_CITY_HEIGHT - 3, CeladonCityBlocks, ROUTE_16_WIDTH
-	dw Route16Object ; objects
+INCLUDE "data/mapHeaders/route16.asm"
 
 INCLUDE "data/mapObjects/route16.asm"
 
@@ -67352,14 +66546,7 @@
 Route16Blocks: ; 58b84 (16:4b84)
 	INCBIN "maps/route16.blk"
 
-Route18_h: ; 0x58c38 to 0x58c5a (34 bytes) (id=29)
-	db OVERWORLD ; tileset
-	db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x)
-	dw Route18Blocks, Route18TextPointers, Route18Script ; blocks, texts, scripts
-	db NORTH | EAST ; connections
-	NORTH_MAP_CONNECTION ROUTE_17, ROUTE_17_WIDTH, ROUTE_17_HEIGHT, 0, 0, ROUTE_17_WIDTH, Route17Blocks
-	EAST_MAP_CONNECTION FUCHSIA_CITY, FUCHSIA_CITY_WIDTH, -3, 1, FUCHSIA_CITY_HEIGHT - 3, FuchsiaCityBlocks, ROUTE_18_WIDTH
-	dw Route18Object ; objects
+INCLUDE "data/mapHeaders/route18.asm"
 
 INCLUDE "data/mapObjects/route18.asm"
 
@@ -69779,12 +68966,7 @@
 	TX_FAR _Route18Text5
 	db "@"
 
-FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90)
-	db INTERIOR ; tileset
-	db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x)
-	dw FanClubBlocks, FanClubTextPointers, FanClubScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw FanClubObject ; objects
+INCLUDE "data/mapHeaders/fanclub.asm"
 
 FanClubScript: ; 59b70 (16:5b70)
 	jp EnableAutoTextBoxDrawing
@@ -69973,12 +69155,7 @@
 FanClubBlocks: ; 59cd5 (16:5cd5)
 	INCBIN "maps/fanclub.blk"
 
-SilphCo2_h: ; 0x59ce5 to 0x59cf1 (12 bytes) (id=207)
-	db FACILITY ; tileset
-	db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x)
-	dw SilphCo2Blocks, SilphCo2TextPointers, SilphCo2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SilphCo2Object ; objects
+INCLUDE "data/mapHeaders/silphco2.asm"
 
 SilphCo2Script: ; 59cf1 (16:5cf1)
 	call SilphCo2Script_59d07
@@ -70234,12 +69411,7 @@
 SilphCo2Blocks: ; 59ec8 (16:5ec8)
 	INCBIN "maps/silphco2.blk"
 
-SilphCo3_h: ; 0x59f4f to 0x59f5b (12 bytes) (id=208)
-	db FACILITY ; tileset
-	db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x)
-	dw SilphCo3Blocks, SilphCo3TextPointers, SilphCo3Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SilphCo3Object ; objects
+INCLUDE "data/mapHeaders/silphco3.asm"
 
 SilphCo3Script: ; 59f5b (16:5f5b)
 	call SilphCo3Script_59f71
@@ -70386,12 +69558,7 @@
 SilphCo3Blocks: ; 5a0a6 (16:60a6)
 	INCBIN "maps/silphco3.blk"
 
-SilphCo10_h: ; 0x5a12d to 0x5a139 (12 bytes) (id=234)
-	db FACILITY ; tileset
-	db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x)
-	dw SilphCo10Blocks, SilphCo10TextPointers, SilphCo10Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SilphCo10Object ; objects
+INCLUDE "data/mapHeaders/silphco10.asm"
 
 SilphCo10Script: ; 5a139 (16:6139)
 	call SilphCo10Script_5a14f
@@ -70525,12 +69692,7 @@
 SilphCo10Blocks: ; 5a25a (16:625a)
 	INCBIN "maps/silphco10.blk"
 
-Lance_h: ; 0x5a2a2 to 0x5a2ae (12 bytes) (id=113)
-	db DOJO ; tileset
-	db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x)
-	dw LanceBlocks, LanceTextPointers, LanceScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw LanceObject ; objects
+INCLUDE "data/mapHeaders/lance.asm"
 
 LanceScript: ; 5a2ae (16:62ae)
 	call LanceScript_5a2c4
@@ -70704,12 +69866,7 @@
 LanceBlocks: ; 5a3e9 (16:63e9)
 	INCBIN "maps/lance.blk"
 
-HallofFameRoom_h: ; 0x5a492 to 0x5a49e (12 bytes) (id=118)
-	db GYM ; tileset
-	db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x)
-	dw HallofFameRoomBlocks, HallofFameRoomTextPointers, HallofFameRoomScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw HallofFameRoomObject ; objects
+INCLUDE "data/mapHeaders/halloffameroom.asm"
 
 HallofFameRoomScript: ; 5a49e (16:649e)
 	call EnableAutoTextBoxDrawing
@@ -70888,12 +70045,7 @@
 ViridianForestExitBlocks: ; 5c090 (17:4090)
 	INCBIN "maps/viridianforestexit.blk"
 
-RedsHouse2F_h: ; 5c0a4 (17:40a4)
-	db REDS_HOUSE_2 ; tileset
-	db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions
-	dw RedsHouse2FBlocks, RedsHouse2FTextPointers, RedsHouse2FScript
-	db $00 ; no connections
-	dw RedsHouse2FObject
+INCLUDE "data/mapHeaders/redshouse2f.asm"
 
 RedsHouse2FScript: ; 5c0b0 (17:40b0)
 	call EnableAutoTextBoxDrawing
@@ -70931,12 +70083,7 @@
 	ld [wPokedexOwned], a ; $d2f7
 	ret
 
-Museum1F_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52)
-	db MUSEUM ; tileset
-	db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x)
-	dw Museum1FBlocks, Museum1FTextPointers, Museum1FScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Museum1FObject ; objects
+INCLUDE "data/mapHeaders/museum1f.asm"
 
 Museum1FScript: ; 5c0f7 (17:40f7)
 	ld a, $1
@@ -71194,12 +70341,7 @@
 
 INCLUDE "data/mapObjects/museum1f.asm"
 
-Museum2F_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53)
-	db MUSEUM ; tileset
-	db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x)
-	dw Museum2FBlocks, Museum2FTextPointers, Museum2FScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Museum2FObject ; objects
+INCLUDE "data/mapHeaders/museum2f.asm"
 
 Museum2FScript: ; 5c317 (17:4317)
 	jp EnableAutoTextBoxDrawing
@@ -71243,12 +70385,7 @@
 
 INCLUDE "data/mapObjects/museum2f.asm"
 
-PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54)
-	db GYM ; tileset
-	db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x)
-	dw PewterGymBlocks, PewterGymTextPointers, PewterGymScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw PewterGymObject ; objects
+INCLUDE "data/mapHeaders/pewtergym.asm"
 
 PewterGymScript: ; 5c387 (17:4387)
 	ld hl, $d126
@@ -71493,12 +70630,7 @@
 PewterGymBlocks: ; 5c558 (17:4558)
 	INCBIN "maps/pewtergym.blk"
 
-PewterPokecenter_h: ; 0x5c57b to 0x5c587 (12 bytes) (id=58)
-	db POKECENTER ; tileset
-	db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x)
-	dw PewterPokecenterBlocks, PewterPokecenterTextPointers, PewterPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw PewterPokecenterObject ; objects
+INCLUDE "data/mapHeaders/pewterpokecenter.asm"
 
 PewterPokecenterScript: ; 5c587 (17:4587)
 	call Func_22fa
@@ -71578,12 +70710,7 @@
 
 INCLUDE "data/mapObjects/pewterpokecenter.asm"
 
-CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64)
-	db POKECENTER ; tileset
-	db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x)
-	dw CeruleanPokecenterBlocks, CeruleanPokecenterTextPointers, CeruleanPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeruleanPokecenterObject ; objects
+INCLUDE "data/mapHeaders/ceruleanpokecenter.asm"
 
 CeruleanPokecenterScript: ; 5c645 (17:4645)
 	call Func_22fa
@@ -71614,12 +70741,7 @@
 CeruleanPokecenterBlocks: ; 5c68b (17:468b)
 	INCBIN "maps/ceruleanpokecenter.blk"
 
-CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65)
-	db GYM ; tileset
-	db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x)
-	dw CeruleanGymBlocks, CeruleanGymTextPointers, CeruleanGymScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeruleanGymObject ; objects
+INCLUDE "data/mapHeaders/ceruleangym.asm"
 
 CeruleanGymScript: ; 5c6b3 (17:46b3)
 	ld hl, $d126
@@ -71851,12 +70973,7 @@
 CeruleanGymBlocks: ; 5c866 (17:4866)
 	INCBIN "maps/ceruleangym.blk"
 
-CeruleanMart_h: ; 0x5c889 to 0x5c895 (12 bytes) (id=67)
-	db MART ; tileset
-	db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x)
-	dw CeruleanMartBlocks, CeruleanMartTextPointers, CeruleanMartScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeruleanMartObject ; objects
+INCLUDE "data/mapHeaders/ceruleanmart.asm"
 
 CeruleanMartScript: ; 5c895 (17:4895)
 	jp EnableAutoTextBoxDrawing
@@ -71876,12 +70993,7 @@
 
 INCLUDE "data/mapObjects/ceruleanmart.asm"
 
-LavenderPokecenter_h: ; 0x5c8ce to 0x5c8da (12 bytes) (id=141)
-	db POKECENTER ; tileset
-	db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x)
-	dw LavenderPokecenterBlocks, LavenderPokecenterTextPointers, LavenderPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw LavenderPokecenterObject ; objects
+INCLUDE "data/mapHeaders/lavenderpokecenter.asm"
 
 LavenderPokecenterScript: ; 5c8da (17:48da)
 	call Func_22fa
@@ -71909,12 +71021,7 @@
 
 INCLUDE "data/mapObjects/lavenderpokecenter.asm"
 
-LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150)
-	db MART ; tileset
-	db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x)
-	dw LavenderMartBlocks, LavenderMartTextPointers, LavenderMartScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw LavenderMartObject ; objects
+INCLUDE "data/mapHeaders/lavendermart.asm"
 
 LavenderMartScript: ; 5c92c (17:492c)
 	jp EnableAutoTextBoxDrawing
@@ -71952,12 +71059,7 @@
 
 INCLUDE "data/mapObjects/lavendermart.asm"
 
-VermilionPokecenter_h: ; 0x5c983 to 0x5c98f (12 bytes) (id=89)
-	db POKECENTER ; tileset
-	db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x)
-	dw VermilionPokecenterBlocks, VermilionPokecenterTextPointers, VermilionPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw VermilionPokecenterObject ; objects
+INCLUDE "data/mapHeaders/vermilionpokecenter.asm"
 
 VermilionPokecenterScript: ; 5c98f (17:498f)
 	call Func_22fa
@@ -71985,12 +71087,7 @@
 
 INCLUDE "data/mapObjects/vermilionpokecenter.asm"
 
-VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91)
-	db MART ; tileset
-	db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x)
-	dw VermilionMartBlocks, VermilionMartTextPointers, VermilionMartScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw VermilionMartObject ; objects
+INCLUDE "data/mapHeaders/vermilionmart.asm"
 
 VermilionMartScript: ; 5c9e1 (17:49e1)
 	jp EnableAutoTextBoxDrawing
@@ -72010,12 +71107,7 @@
 
 INCLUDE "data/mapObjects/vermilionmart.asm"
 
-VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92)
-	db GYM ; tileset
-	db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x)
-	dw VermilionGymBlocks, VermilionGymTextPointers, VermilionGymScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw VermilionGymObject ; objects
+INCLUDE "data/mapHeaders/vermiliongym.asm"
 
 VermilionGymScript: ; 5ca26 (17:4a26)
 	ld hl, $d126
@@ -72298,12 +71390,7 @@
 VermilionGymBlocks: ; 5cc38 (17:4c38)
 	INCBIN "maps/vermiliongym.blk"
 
-CopycatsHouse2F_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176)
-	db REDS_HOUSE_2 ; tileset
-	db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x)
-	dw CopycatsHouse2FBlocks, CopycatsHouse2FTextPointers, CopycatsHouse2FScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CopycatsHouse2FObject ; objects
+INCLUDE "data/mapHeaders/copycatshouse2f.asm"
 
 CopycatsHouse2FScript: ; 5cc71 (17:4c71)
 	jp EnableAutoTextBoxDrawing
@@ -72412,12 +71499,7 @@
 
 INCLUDE "data/mapObjects/copycatshouse2f.asm"
 
-FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177)
-	db DOJO ; tileset
-	db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x)
-	dw FightingDojoBlocks, FightingDojoTextPointers, FightingDojoScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw FightingDojoObject ; objects
+INCLUDE "data/mapHeaders/fightingdojo.asm"
 
 FightingDojoScript: ; 5cd5d (17:4d5d)
 	call EnableAutoTextBoxDrawing
@@ -72762,12 +71844,7 @@
 FightingDojoBlocks: ; 5cfe3 (17:4fe3)
 	INCBIN "maps/fightingdojo.blk"
 
-SaffronGym_h: ; 0x5d001 to 0x5d00d (12 bytes) (id=178)
-	db FACILITY ; tileset
-	db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x)
-	dw SaffronGymBlocks, SaffronGymTextPointers, SaffronGymScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw SaffronGymObject ; objects
+INCLUDE "data/mapHeaders/saffrongym.asm"
 
 SaffronGymScript: ; 5d00d (17:500d)
 	ld hl, $d126
@@ -73142,12 +72219,7 @@
 SaffronGymBlocks: ; 5d3a3 (17:53a3)
 	INCBIN "maps/saffrongym.blk"
 
-SaffronMart_h: ; 0x5d3fd to 0x5d409 (12 bytes) (id=180)
-	db MART ; tileset
-	db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x)
-	dw SaffronMartBlocks, SaffronMartTextPointers, SaffronMartScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw SaffronMartObject ; objects
+INCLUDE "data/mapHeaders/saffronmart.asm"
 
 SaffronMartScript: ; 5d409 (17:5409)
 	jp EnableAutoTextBoxDrawing
@@ -73167,12 +72239,7 @@
 
 INCLUDE "data/mapObjects/saffronmart.asm"
 
-SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181)
-	db FACILITY ; tileset
-	db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x)
-	dw SilphCo1Blocks, SilphCo1TextPointers, SilphCo1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SilphCo1Object ; objects
+INCLUDE "data/mapHeaders/silphco1.asm"
 
 SilphCo1Script: ; 5d44e (17:544e)
 	call EnableAutoTextBoxDrawing
@@ -73200,12 +72267,7 @@
 SilphCo1Blocks: ; 5d4a2 (17:54a2)
 	INCBIN "maps/silphco1.blk"
 
-SaffronPokecenter_h: ; 0x5d529 to 0x5d535 (12 bytes) (id=182)
-	db POKECENTER ; tileset
-	db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x)
-	dw SaffronPokecenterBlocks, SaffronPokecenterTextPointers, SaffronPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw SaffronPokecenterObject ; objects
+INCLUDE "data/mapHeaders/saffronpokecenter.asm"
 
 SaffronPokecenterScript: ; 5d535 (17:5535)
 	call Func_22fa
@@ -73233,12 +72295,7 @@
 
 INCLUDE "data/mapObjects/saffronpokecenter.asm"
 
-ViridianForestExit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47)
-	db FOREST_GATE ; tileset
-	db VIRIDIAN_FOREST_EXIT_HEIGHT, VIRIDIAN_FOREST_EXIT_WIDTH ; dimensions (y, x)
-	dw ViridianForestExitBlocks, ViridianForestExitTextPointers, ViridianForestExitScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw ViridianForestExitObject ; objects
+INCLUDE "data/mapHeaders/viridianforestexit.asm"
 
 ViridianForestExitScript: ; 5d587 (17:5587)
 	jp EnableAutoTextBoxDrawing
@@ -73257,12 +72314,7 @@
 
 INCLUDE "data/mapObjects/viridianforestexit.asm"
 
-Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49)
-	db GATE ; tileset
-	db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x)
-	dw Route2GateBlocks, Route2GateTextPointers, Route2GateScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw Route2GateObject ; objects
+INCLUDE "data/mapHeaders/route2gate.asm"
 
 Route2GateScript: ; 5d5d4 (17:55d4)
 	jp EnableAutoTextBoxDrawing
@@ -73309,12 +72361,7 @@
 
 INCLUDE "data/mapObjects/route2gate.asm"
 
-ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50)
-	db FOREST_GATE ; tileset
-	db VIRIDIAN_FOREST_ENTRANCE_HEIGHT, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; dimensions (y, x)
-	dw ViridianForestEntranceBlocks, ViridianForestEntranceTextPointers, ViridianForestEntranceScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw ViridianForestEntranceObject ; objects
+INCLUDE "data/mapHeaders/viridianforestentrance.asm"
 
 ViridianForestEntranceScript: ; 5d65c (17:565c)
 	jp EnableAutoTextBoxDrawing
@@ -73333,12 +72380,7 @@
 
 INCLUDE "data/mapObjects/viridianforestentrance.asm"
 
-UndergroundPathEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71)
-	db GATE ; tileset
-	db PATH_ENTRANCE_ROUTE_5_HEIGHT, PATH_ENTRANCE_ROUTE_5_WIDTH ; dimensions (y, x)
-	dw UndergroundPathEntranceRoute5Blocks, UndergroundPathEntranceRoute5TextPointers, UndergroundPathEntranceRoute5Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw UndergroundPathEntranceRoute5Object ; objects
+INCLUDE "data/mapHeaders/undergroundpathentranceroute5.asm"
 
 UndergroundPathEntranceRoute5Script: ; 5d6a9 (17:56a9)
 	ld a, $10
@@ -73362,12 +72404,7 @@
 
 INCLUDE "data/mapObjects/undergroundpathentranceroute5.asm"
 
-UndergroundPathEntranceRoute6_h: ; 0x5d6e3 to 0x5d6ef (12 bytes) (id=74)
-	db GATE ; tileset
-	db PATH_ENTRANCE_ROUTE_6_HEIGHT, PATH_ENTRANCE_ROUTE_6_WIDTH ; dimensions (y, x)
-	dw UndergroundPathEntranceRoute6Blocks, UndergroundPathEntranceRoute6TextPointers, UndergroundPathEntranceRoute6Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw UndergroundPathEntranceRoute6Object ; objects
+INCLUDE "data/mapHeaders/undergroundpathentranceroute6.asm"
 
 UndergroundPathEntranceRoute6Script: ; 5d6ef (17:56ef)
 	ld a, $11
@@ -73383,12 +72420,7 @@
 
 INCLUDE "data/mapObjects/undergroundpathentranceroute6.asm"
 
-UndergroundPathEntranceRoute7_h: ; 0x5d720 to 0x5d72c (12 bytes) (id=77)
-	db GATE ; tileset
-	db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x)
-	dw UndergroundPathEntranceRoute7Blocks, UndergroundPathEntranceRoute7TextPointers, UndergroundPathEntranceRoute7Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw UndergroundPathEntranceRoute7Object ; objects
+INCLUDE "data/mapHeaders/undergroundpathentranceroute7.asm"
 
 UndergroundPathEntranceRoute7Script: ; 5d72c (17:572c)
 	ld a, $12
@@ -73404,12 +72436,7 @@
 
 INCLUDE "data/mapObjects/undergroundpathentranceroute7.asm"
 
-UndergroundPathEntranceRoute7Copy_h: ; 5d75d (17:575d)
-	db GATE ; tileset
-	db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x)
-	dw UndergroundPathEntranceRoute7CopyBlocks, UndergroundPathEntranceRoute7CopyTextPointers, UndergroundPathEntranceRoute7CopyScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw UndergroundPathEntranceRoute7CopyObject ; objects
+INCLUDE "data/mapHeaders/undergroundpathentranceroute7copy.asm"
 
 UndergroundPathEntranceRoute7CopyScript: ; 5d769 (17:5769)
 	ld a, $12
@@ -73438,12 +72465,7 @@
 
 INCLUDE "data/mapObjects/undergroundpathentranceroute7copy.asm"
 
-SilphCo9_h: ; 0x5d7af to 0x5d7bb (12 bytes) (id=233)
-	db FACILITY ; tileset
-	db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x)
-	dw SilphCo9Blocks, SilphCo9TextPointers, SilphCo9Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SilphCo9Object ; objects
+INCLUDE "data/mapHeaders/silphco9.asm"
 
 SilphCo9Script: ; 5d7bb (17:57bb)
 	call SilphCo9Script_5d7d1
@@ -73699,12 +72721,7 @@
 SilphCo9Blocks: ; 5d989 (17:5989)
 	INCBIN "maps/silphco9.blk"
 
-VictoryRoad1_h: ; 0x5d9fe to 0x5da0a (12 bytes) (id=108)
-	db CAVERN ; tileset
-	db VICTORY_ROAD_1_HEIGHT, VICTORY_ROAD_1_WIDTH ; dimensions (y, x)
-	dw VictoryRoad1Blocks, VictoryRoad1TextPointers, VictoryRoad1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw VictoryRoad1Object ; objects
+INCLUDE "data/mapHeaders/victoryroad1.asm"
 
 VictoryRoad1Script: ; 5da0a (17:5a0a)
 	ld hl, $d126
@@ -74321,12 +73338,7 @@
 SSAnne9Blocks: ; 603c0 (18:43c0)
 	INCBIN "maps/ssanne9.blk"
 
-PokemonTower1_h: ; 0x60420 to 0x6042c (12 bytes) (id=142)
-	db CEMETERY ; tileset
-	db POKEMONTOWER_1_HEIGHT, POKEMONTOWER_1_WIDTH ; dimensions (y, x)
-	dw PokemonTower1Blocks, PokemonTower1TextPointers, PokemonTower1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw PokemonTower1Object ; objects
+INCLUDE "data/mapHeaders/pokemontower1.asm"
 
 PokemonTower1Script: ; 6042c (18:442c)
 	jp EnableAutoTextBoxDrawing
@@ -74363,12 +73375,7 @@
 PokemonTower1Blocks: ; 6048c (18:448c)
 	INCBIN "maps/pokemontower1.blk"
 
-PokemonTower2_h: ; 0x604e6 to 0x604f2 (12 bytes) (id=143)
-	db CEMETERY ; tileset
-	db POKEMONTOWER_2_HEIGHT, POKEMONTOWER_2_WIDTH ; dimensions (y, x)
-	dw PokemonTower2Blocks, PokemonTower2TextPointers, PokemonTower2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw PokemonTower2Object ; objects
+INCLUDE "data/mapHeaders/pokemontower2.asm"
 
 PokemonTower2Script: ; 604f2 (18:44f2)
 	call EnableAutoTextBoxDrawing
@@ -74556,12 +73563,7 @@
 PokemonTower2Blocks: ; 60666 (18:4666)
 	INCBIN "maps/pokemontower2.blk"
 
-PokemonTower3_h: ; 0x606c0 to 0x606cc (12 bytes) (id=144)
-	db CEMETERY ; tileset
-	db POKEMONTOWER_3_HEIGHT, POKEMONTOWER_3_WIDTH ; dimensions (y, x)
-	dw PokemonTower3Blocks, PokemonTower3TextPointers, PokemonTower3Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw PokemonTower3Object ; objects
+INCLUDE "data/mapHeaders/pokemontower3.asm"
 
 PokemonTower3Script: ; 606cc (18:46cc)
 	call EnableAutoTextBoxDrawing
@@ -74671,12 +73673,7 @@
 PokemonTower3Blocks: ; 60790 (18:4790)
 	INCBIN "maps/pokemontower3.blk"
 
-PokemonTower4_h: ; 0x607ea to 0x607f6 (12 bytes) (id=145)
-	db CEMETERY ; tileset
-	db POKEMONTOWER_4_HEIGHT, POKEMONTOWER_4_WIDTH ; dimensions (y, x)
-	dw PokemonTower4Blocks, PokemonTower4TextPointers, PokemonTower4Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw PokemonTower4Object ; objects
+INCLUDE "data/mapHeaders/pokemontower4.asm"
 
 PokemonTower4Script: ; 607f6 (18:47f6)
 	call EnableAutoTextBoxDrawing
@@ -74789,12 +73786,7 @@
 PokemonTower4Blocks: ; 608cc (18:48cc)
 	INCBIN "maps/pokemontower4.blk"
 
-PokemonTower5_h: ; 0x60926 to 0x60932 (12 bytes) (id=146)
-	db CEMETERY ; tileset
-	db POKEMONTOWER_5_HEIGHT, POKEMONTOWER_5_WIDTH ; dimensions (y, x)
-	dw PokemonTower5Blocks, PokemonTower5TextPointers, PokemonTower5Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw PokemonTower5Object ; objects
+INCLUDE "data/mapHeaders/pokemontower5.asm"
 
 PokemonTower5Script: ; 60932 (18:4932)
 	call EnableAutoTextBoxDrawing
@@ -74983,12 +73975,7 @@
 PokemonTower5Blocks: ; 60a89 (18:4a89)
 	INCBIN "maps/pokemontower5.blk"
 
-PokemonTower6_h: ; 0x60ae3 to 0x60aef (12 bytes) (id=147)
-	db CEMETERY ; tileset
-	db POKEMONTOWER_6_HEIGHT, POKEMONTOWER_6_WIDTH ; dimensions (y, x)
-	dw PokemonTower6Blocks, PokemonTower6TextPointers, PokemonTower6Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw PokemonTower6Object ; objects
+INCLUDE "data/mapHeaders/pokemontower6.asm"
 
 PokemonTower6Script: ; 60aef (18:4aef)
 	call EnableAutoTextBoxDrawing
@@ -75213,12 +74200,7 @@
 
 	INCBIN "maps/unusedblocks60cef.blk"
 
-PokemonTower7_h: ; 0x60cf9 to 0x60d05 (12 bytes) (id=148)
-	db CEMETERY ; tileset
-	db POKEMONTOWER_7_HEIGHT, POKEMONTOWER_7_WIDTH ; dimensions (y, x)
-	dw PokemonTower7Blocks, PokemonTower7TextPointers, PokemonTower7Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw PokemonTower7Object ; objects
+INCLUDE "data/mapHeaders/pokemontower7.asm"
 
 PokemonTower7Script: ; 60d05 (18:4d05)
 	call EnableAutoTextBoxDrawing
@@ -75508,12 +74490,7 @@
 PokemonTower7Blocks: ; 60f20 (18:4f20)
 	INCBIN "maps/pokemontower7.blk"
 
-CeladonMart1_h: ; 0x60f7a to 0x60f86 (12 bytes) (id=122)
-	db LOBBY ; tileset
-	db CELADON_MART_1_HEIGHT, CELADON_MART_1_WIDTH ; dimensions (y, x)
-	dw CeladonMart1Blocks, CeladonMart1TextPointers, CeladonMart1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeladonMart1Object ; objects
+INCLUDE "data/mapHeaders/celadonmart1.asm"
 
 CeladonMart1Script: ; 60f86 (18:4f86)
 	jp EnableAutoTextBoxDrawing
@@ -75668,12 +74645,7 @@
 	call GetItemName
 	ret
 
-ViridianForest_h: ; 0x61101 to 0x6110d (12 bytes) (id=51)
-	db FOREST ; tileset
-	db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x)
-	dw ViridianForestBlocks, ViridianForestTextPointers, ViridianForestScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw ViridianForestObject ; objects
+INCLUDE "data/mapHeaders/viridianforest.asm"
 
 ViridianForestScript: ; 6110d (18:510d)
 	call EnableAutoTextBoxDrawing
@@ -75823,12 +74795,7 @@
 
 INCLUDE "data/mapObjects/viridianforest.asm"
 
-SSAnne1_h: ; 0x61259 to 0x61265 (12 bytes) (id=95)
-	db SHIP ; tileset
-	db SS_ANNE_1_HEIGHT, SS_ANNE_1_WIDTH ; dimensions (y, x)
-	dw SSAnne1Blocks, SSAnne1TextPointers, SSAnne1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SSAnne1Object ; objects
+INCLUDE "data/mapHeaders/ssanne1.asm"
 
 SSAnne1Script: ; 61265 (18:5265)
 	call EnableAutoTextBoxDrawing
@@ -75851,12 +74818,7 @@
 SSAnne1Blocks: ; 612df (18:52df)
 	INCBIN "maps/ssanne1.blk"
 
-SSAnne2_h: ; 0x61393 to 0x6139f (12 bytes) (id=96)
-	db SHIP ; tileset
-	db SS_ANNE_2_HEIGHT, SS_ANNE_2_WIDTH ; dimensions (y, x)
-	dw SSAnne2Blocks, SSAnne2TextPointers, SSAnne2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SSAnne2Object ; objects
+INCLUDE "data/mapHeaders/ssanne2.asm"
 
 SSAnne2Script: ; 6139f (18:539f)
 	call EnableAutoTextBoxDrawing
@@ -76074,12 +75036,7 @@
 SSAnne2Blocks: ; 6156e (18:556e)
 	INCBIN "maps/ssanne2.blk"
 
-SSAnne4_h: ; 0x61622 to 0x6162e (12 bytes) (id=98)
-	db SHIP ; tileset
-	db SS_ANNE_4_HEIGHT, SS_ANNE_4_WIDTH ; dimensions (y, x)
-	dw SSAnne4Blocks, SSAnne4TextPointers, SSAnne4Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SSAnne4Object ; objects
+INCLUDE "data/mapHeaders/ssanne4.asm"
 
 SSAnne4Script: ; 6162e (18:562e)
 	jp EnableAutoTextBoxDrawing
@@ -76092,12 +75049,7 @@
 SSAnne4Blocks: ; 61666 (18:5666)
 	INCBIN "maps/ssanne4.blk"
 
-SSAnne5_h: ; 0x616a2 to 0x616ae (12 bytes) (id=99)
-	db SHIP ; tileset
-	db SS_ANNE_5_HEIGHT, SS_ANNE_5_WIDTH ; dimensions (y, x)
-	dw SSAnne5Blocks, SSAnne5TextPointers, SSAnne5Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SSAnne5Object ; objects
+INCLUDE "data/mapHeaders/ssanne5.asm"
 
 SSAnne5Script: ; 616ae (18:56ae)
 	call EnableAutoTextBoxDrawing
@@ -76194,12 +75146,7 @@
 SSAnne5Blocks: ; 61761 (18:5761)
 	INCBIN "maps/ssanne5.blk"
 
-SSAnne6_h: ; 0x617a7 to 0x617b3 (12 bytes) (id=100)
-	db SHIP ; tileset
-	db SS_ANNE_6_HEIGHT, SS_ANNE_6_WIDTH ; dimensions (y, x)
-	dw SSAnne6Blocks, SSAnne6TextPointers, SSAnne6Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SSAnne6Object ; objects
+INCLUDE "data/mapHeaders/ssanne6.asm"
 
 SSAnne6Script: ; 617b3 (18:57b3)
 	call EnableAutoTextBoxDrawing
@@ -76279,12 +75226,7 @@
 SSAnne6Blocks: ; 61851 (18:5851)
 	INCBIN "maps/ssanne6.blk"
 
-SSAnne7_h: ; 0x61889 to 0x61895 (12 bytes) (id=101)
-	db SHIP ; tileset
-	db SS_ANNE_7_HEIGHT, SS_ANNE_7_WIDTH ; dimensions (y, x)
-	dw SSAnne7Blocks, SSAnne7TextPointers, SSAnne7Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SSAnne7Object ; objects
+INCLUDE "data/mapHeaders/ssanne7.asm"
 
 SSAnne7Script: ; 61895 (18:5895)
 	call SSAnne7Script_6189b
@@ -76388,12 +75330,7 @@
 SSAnne7Blocks: ; 6195e (18:595e)
 	INCBIN "maps/ssanne7.blk"
 
-SSAnne8_h: ; 0x6196a to 0x61976 (12 bytes) (id=102)
-	db SHIP ; tileset
-	db SS_ANNE_8_HEIGHT, SS_ANNE_8_WIDTH ; dimensions (y, x)
-	dw SSAnne8Blocks, SSAnne8TextPointers, SSAnne8Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SSAnne8Object ; objects
+INCLUDE "data/mapHeaders/ssanne8.asm"
 
 SSAnne8Script: ; 61976 (18:5976)
 	call EnableAutoTextBoxDrawing
@@ -76565,12 +75502,7 @@
 SSAnne8Blocks: ; 61adf (18:5adf)
 	INCBIN "maps/ssanne8.blk"
 
-SSAnne9_h: ; 0x61b3f to 0x61b4b (12 bytes) (id=103)
-	db SHIP ; tileset
-	db SS_ANNE_9_HEIGHT, SS_ANNE_9_WIDTH ; dimensions (y, x)
-	dw SSAnne9Blocks, SSAnne9TextPointers, SSAnne9Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SSAnne9Object ; objects
+INCLUDE "data/mapHeaders/ssanne9.asm"
 
 SSAnne9Script: ; 61b4b (18:5b4b)
 	ld a, $1
@@ -76791,12 +75723,7 @@
 
 INCLUDE "data/mapObjects/ssanne9.asm"
 
-SSAnne10_h: ; 0x61d49 to 0x61d55 (12 bytes) (id=104)
-	db SHIP ; tileset
-	db SS_ANNE_10_HEIGHT, SS_ANNE_10_WIDTH ; dimensions (y, x)
-	dw SSAnne10Blocks, SSAnne10TextPointers, SSAnne10Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SSAnne10Object ; objects
+INCLUDE "data/mapHeaders/ssanne10.asm"
 
 SSAnne10Script: ; 61d55 (18:5d55)
 	call EnableAutoTextBoxDrawing
@@ -77003,12 +75930,7 @@
 
 INCLUDE "data/mapObjects/ssanne10.asm"
 
-UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119)
-	db UNDERGROUND ; tileset
-	db UNDERGROUND_PATH_NS_HEIGHT, UNDERGROUND_PATH_NS_WIDTH ; dimensions (y, x)
-	dw UndergroundPathNSBlocks, UndergroundPathNSTextPointers, UndergroundPathNSScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw UndergroundPathNSObject ; objects
+INCLUDE "data/mapHeaders/undergroundpathns.asm"
 
 UndergroundPathNSScript: ; 61f26 (18:5f26)
 	jp EnableAutoTextBoxDrawing
@@ -77018,12 +75940,7 @@
 
 INCLUDE "data/mapObjects/undergroundpathns.asm"
 
-UndergroundPathWE_h: ; 0x61f3e to 0x61f4a (12 bytes) (id=121)
-	db UNDERGROUND ; tileset
-	db UNDERGROUND_PATH_WE_HEIGHT, UNDERGROUND_PATH_WE_WIDTH ; dimensions (y, x)
-	dw UndergroundPathWEBlocks, UndergroundPathWETextPointers, UndergroundPathWEScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw UndergroundPathWEObject ; objects
+INCLUDE "data/mapHeaders/undergroundpathwe.asm"
 
 UndergroundPathWEScript: ; 61f4a (18:5f4a)
 	jp EnableAutoTextBoxDrawing
@@ -77033,12 +75950,7 @@
 
 INCLUDE "data/mapObjects/undergroundpathwe.asm"
 
-DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197)
-	db CAVERN ; tileset
-	db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x)
-	dw DiglettsCaveBlocks, DiglettsCaveTextPointers, DiglettsCaveScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw DiglettsCaveObject ; objects
+INCLUDE "data/mapHeaders/diglettscave.asm"
 
 DiglettsCaveScript: ; 61f6e (18:5f6e)
 	jp EnableAutoTextBoxDrawing
@@ -77051,12 +75963,7 @@
 DiglettsCaveBlocks: ; 61f86 (18:5f86)
 	INCBIN "maps/diglettscave.blk"
 
-SilphCo11_h: ; 0x620ee to 0x620fa (12 bytes) (id=235)
-	db INTERIOR ; tileset
-	db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x)
-	dw SilphCo11Blocks, SilphCo11TextPointers, SilphCo11Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw SilphCo11Object ; objects
+INCLUDE "data/mapHeaders/silphco11.asm"
 
 SilphCo11Script: ; 620fa (18:60fa)
 	call SilphCo11Script_62110
@@ -83356,12 +82263,7 @@
 	call GBFadeOut1
 	ret
 
-ViridianGym_h: ; 0x74897 to 0x748a3 (12 bytes) (id=45)
-	db GYM ; tileset
-	db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x)
-	dw ViridianGymBlocks, ViridianGymTextPointers, ViridianGymScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw ViridianGymObject ; objects
+INCLUDE "data/mapHeaders/viridiangym.asm"
 
 ViridianGymScript: ; 748a3 (1d:48a3)
 	ld hl, Gym8CityName
@@ -83883,12 +82785,7 @@
 ViridianGymBlocks: ; 74c47 (1d:4c47)
 	INCBIN "maps/viridiangym.blk"
 
-PewterMart_h: ; 0x74ca1 to 0x74cad (12 bytes) (id=56)
-	db MART ; tileset
-	db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x)
-	dw PewterMartBlocks, PewterMartTextPointers, PewterMartScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw PewterMartObject ; objects
+INCLUDE "data/mapHeaders/pewtermart.asm"
 
 PewterMartScript: ; 74cad (1d:4cad)
 	call EnableAutoTextBoxDrawing
@@ -83923,12 +82820,7 @@
 
 INCLUDE "data/mapObjects/pewtermart.asm"
 
-UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228)
-	db CAVERN ; tileset
-	db UNKNOWN_DUNGEON_1_HEIGHT, UNKNOWN_DUNGEON_1_WIDTH ; dimensions (y, x)
-	dw UnknownDungeon1Blocks, UnknownDungeon1TextPointers, UnknownDungeon1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw UnknownDungeon1Object ; objects
+INCLUDE "data/mapHeaders/unknowndungeon1.asm"
 
 UnknownDungeon1Script: ; 74d0c (1d:4d0c)
 	jp EnableAutoTextBoxDrawing
@@ -83943,12 +82835,7 @@
 UnknownDungeon1Blocks: ; 74d76 (1d:4d76)
 	INCBIN "maps/unknowndungeon1.blk"
 
-CeruleanHouse2_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230)
-	db SHIP ; tileset
-	db CERULEAN_HOUSE_2_HEIGHT, CERULEAN_HOUSE_2_WIDTH ; dimensions (y, x)
-	dw CeruleanHouse2Blocks, CeruleanHouse2TextPointers, CeruleanHouse2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw CeruleanHouse2Object ; objects
+INCLUDE "data/mapHeaders/ceruleanhouse2.asm"
 
 CeruleanHouse2Script: ; 74e09 (1d:4e09)
 	ld a, $1
@@ -84201,12 +83088,7 @@
 	db SODA_POP,   $00,$03,$00
 	db LEMONADE,   $00,$03,$50
 
-FuchsiaHouse1_h: ; 0x7500c to 0x75018 (12 bytes) (id=153)
-	db HOUSE ; tileset
-	db FUCHSIA_HOUSE_1_HEIGHT, FUCHSIA_HOUSE_1_WIDTH ; dimensions (y, x)
-	dw FuchsiaHouse1Blocks, FuchsiaHouse1TextPointers, FuchsiaHouse1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw FuchsiaHouse1Object ; objects
+INCLUDE "data/mapHeaders/fuchsiahouse1.asm"
 
 FuchsiaHouse1Script: ; 75018 (1d:5018)
 	call EnableAutoTextBoxDrawing
@@ -84231,12 +83113,7 @@
 
 INCLUDE "data/mapObjects/fuchsiahouse1.asm"
 
-FuchsiaPokecenter_h: ; 0x75057 to 0x75063 (12 bytes) (id=154)
-	db POKECENTER ; tileset
-	db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x)
-	dw FuchsiaPokecenterBlocks, FuchsiaPokecenterTextPointers, FuchsiaPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw FuchsiaPokecenterObject ; objects
+INCLUDE "data/mapHeaders/fuchsiapokecenter.asm"
 
 FuchsiaPokecenterScript: ; 75063 (1d:5063)
 	call Func_22fa
@@ -84264,12 +83141,7 @@
 
 INCLUDE "data/mapObjects/fuchsiapokecenter.asm"
 
-FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155)
-	db LAB ; tileset
-	db FUCHSIA_HOUSE_2_HEIGHT, FUCHSIA_HOUSE_2_WIDTH ; dimensions (y, x)
-	dw FuchsiaHouse2Blocks, FuchsiaHouse2TextPointers, FuchsiaHouse2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw FuchsiaHouse2Object ; objects
+INCLUDE "data/mapHeaders/fuchsiahouse2.asm"
 
 FuchsiaHouse2Script: ; 750b5 (1d:50b5)
 	jp EnableAutoTextBoxDrawing
@@ -84395,12 +83267,7 @@
 FuchsiaHouse2Blocks: ; 751ad (1d:51ad)
 	INCBIN "maps/fuchsiahouse2.blk"
 
-SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156)
-	db GATE ; tileset
-	db SAFARI_ZONE_ENTRANCE_HEIGHT, SAFARI_ZONE_ENTRANCE_WIDTH ; dimensions (y, x)
-	dw SafariZoneEntranceBlocks, SafariZoneEntranceTextPointers, SafariZoneEntranceScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw SafariZoneEntranceObject ; objects
+INCLUDE "data/mapHeaders/safarizoneentrance.asm"
 
 SafariZoneEntranceScript: ; 751cd (1d:51cd)
 	call EnableAutoTextBoxDrawing
@@ -84708,12 +83575,7 @@
 SafariZoneEntranceBlocks: ; 75425 (1d:5425)
 	INCBIN "maps/safarizoneentrance.blk"
 
-FuchsiaGym_h: ; 0x75431 to 0x7543d (12 bytes) (id=157)
-	db GYM ; tileset
-	db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x)
-	dw FuchsiaGymBlocks, FuchsiaGymTextPointers, FuchsiaGymScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw FuchsiaGymObject ; objects
+INCLUDE "data/mapHeaders/fuchsiagym.asm"
 
 FuchsiaGymScript: ; 7543d (1d:543d)
 	call FuchsiaGymScript_75453
@@ -85057,12 +83919,7 @@
 FuchsiaGymBlocks: ; 756aa (1d:56aa)
 	INCBIN "maps/fuchsiagym.blk"
 
-FuchsiaMeetingRoom_h: ; 0x756d7 to 0x756e3 (12 bytes) (id=158)
-	db LAB ; tileset
-	db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x)
-	dw FuchsiaMeetingRoomBlocks, FuchsiaMeetingRoomTextPointers, FuchsiaMeetingRoomScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw FuchsiaMeetingRoomObject ; objects
+INCLUDE "data/mapHeaders/fuchsiameetingroom.asm"
 
 FuchsiaMeetingRoomScript: ; 756e3 (1d:56e3)
 	call EnableAutoTextBoxDrawing
@@ -85090,12 +83947,7 @@
 FuchsiaMeetingRoomBlocks: ; 75722 (1d:5722)
 	INCBIN "maps/fuchsiameetingroom.blk"
 
-CinnabarGym_h: ; 0x7573e to 0x7574a (12 bytes) (id=166)
-	db FACILITY ; tileset
-	db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x)
-	dw CinnabarGymBlocks, CinnabarGymTextPointers, CinnabarGymScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CinnabarGymObject ; objects
+INCLUDE "data/mapHeaders/cinnabargym.asm"
 
 CinnabarGymScript: ; 7574a (1d:574a)
 	call CinnabarGymScript_75759
@@ -85586,12 +84438,7 @@
 CinnabarGymBlocks: ; 75b26 (1d:5b26)
 	INCBIN "maps/cinnabargym.blk"
 
-Lab1_h: ; 0x75b80 to 0x75b8c (12 bytes) (id=167)
-	db LAB ; tileset
-	db CINNABAR_LAB_1_HEIGHT, CINNABAR_LAB_1_WIDTH ; dimensions (y, x)
-	dw Lab1Blocks, Lab1TextPointers, Lab1Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw Lab1Object ; objects
+INCLUDE "data/mapHeaders/lab1.asm"
 
 Lab1Script: ; 75b8c (1d:5b8c)
 	call EnableAutoTextBoxDrawing
@@ -85629,12 +84476,7 @@
 Lab1Blocks: ; 75bf1 (1d:5bf1)
 	INCBIN "maps/lab1.blk"
 
-Lab2_h: ; 0x75c15 to 0x75c21 (12 bytes) (id=168)
-	db LAB ; tileset
-	db CINNABAR_LAB_2_HEIGHT, CINNABAR_LAB_2_WIDTH ; dimensions (y, x)
-	dw Lab2Blocks, Lab2TextPointers, Lab2Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw Lab2Object ; objects
+INCLUDE "data/mapHeaders/lab2.asm"
 
 Lab2Script: ; 75c21 (1d:5c21)
 	jp EnableAutoTextBoxDrawing
@@ -85668,12 +84510,7 @@
 Lab2Blocks: ; 75c6b (1d:5c6b)
 	INCBIN "maps/lab2.blk"
 
-Lab3_h: ; 0x75c7b to 0x75c87 (12 bytes) (id=169)
-	db LAB ; tileset
-	db CINNABAR_LAB_3_HEIGHT, CINNABAR_LAB_3_WIDTH ; dimensions (y, x)
-	dw Lab3Blocks, Lab3TextPointers, Lab3Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw Lab3Object ; objects
+INCLUDE "data/mapHeaders/lab3.asm"
 
 Lab3Script: ; 75c87 (1d:5c87)
 	jp EnableAutoTextBoxDrawing
@@ -85744,12 +84581,7 @@
 Lab3Blocks: ; 75d15 (1d:5d15)
 	INCBIN "maps/lab3.blk"
 
-Lab4_h: ; 0x75d25 to 0x75d31 (12 bytes) (id=170)
-	db LAB ; tileset
-	db CINNABAR_LAB_4_HEIGHT, CINNABAR_LAB_4_WIDTH ; dimensions (y, x)
-	dw Lab4Blocks, Lab4TextPointers, Lab4Script ; blocks, texts, scripts
-	db $00 ; connections
-	dw Lab4Object ; objects
+INCLUDE "data/mapHeaders/lab4.asm"
 
 Lab4Script: ; 75d31 (1d:5d31)
 	jp EnableAutoTextBoxDrawing
@@ -85874,12 +84706,7 @@
 Lab4Blocks: ; 75e10 (1d:5e10)
 	INCBIN "maps/lab4.blk"
 
-CinnabarPokecenter_h: ; 0x75e20 to 0x75e2c (12 bytes) (id=171)
-	db POKECENTER ; tileset
-	db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x)
-	dw CinnabarPokecenterBlocks, CinnabarPokecenterTextPointers, CinnabarPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CinnabarPokecenterObject ; objects
+INCLUDE "data/mapHeaders/cinnabarpokecenter.asm"
 
 CinnabarPokecenterScript: ; 75e2c (1d:5e2c)
 	call Func_22fa
@@ -85907,12 +84734,7 @@
 
 INCLUDE "data/mapObjects/cinnabarpokecenter.asm"
 
-CinnabarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172)
-	db MART ; tileset
-	db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x)
-	dw CinnabarMartBlocks, CinnabarMartTextPointers, CinnabarMartScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CinnabarMartObject ; objects
+INCLUDE "data/mapHeaders/cinnabarmart.asm"
 
 CinnabarMartScript: ; 75e7e (1d:5e7e)
 	jp EnableAutoTextBoxDrawing
@@ -85932,12 +84754,7 @@
 
 INCLUDE "data/mapObjects/cinnabarmart.asm"
 
-CopycatsHouse1F_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175)
-	db REDS_HOUSE_1 ; tileset
-	db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x)
-	dw CopycatsHouse1FBlocks, CopycatsHouse1FTextPointers, CopycatsHouse1FScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw CopycatsHouse1FObject ; objects
+INCLUDE "data/mapHeaders/copycatshouse1f.asm"
 
 CopycatsHouse1FScript: ; 75ec3 (1d:5ec3)
 	jp EnableAutoTextBoxDrawing
@@ -85964,12 +84781,7 @@
 
 INCLUDE "data/mapObjects/copycatshouse1f.asm"
 
-Gary_h: ; 75f11 (1d:5f11)
-	db GYM ;tileset
-	db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; Height, Width
-	dw GaryBlocks, GaryTextPointers, GaryScript
-	db $0 ;No Connections
-	dw GaryObject
+INCLUDE "data/mapHeaders/gary.asm"
 
 GaryScript: ; 75f1d (1d:5f1d)
 	call EnableAutoTextBoxDrawing
@@ -86274,12 +85086,7 @@
 GaryBlocks: ; 7615f (1d:615f)
 	INCBIN "maps/gary.blk"
 
-Lorelei_h: ; 0x7616f to 0x7617b (12 bytes) (id=245)
-	db GYM ; tileset
-	db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x)
-	dw LoreleiBlocks, LoreleiTextPointers, LoreleiScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw LoreleiObject ; objects
+INCLUDE "data/mapHeaders/lorelei.asm"
 
 LoreleiScript: ; 7617b (1d:617b)
 	call LoreleiScript_76191
@@ -86440,12 +85247,7 @@
 LoreleiBlocks: ; 762ac (1d:62ac)
 	INCBIN "maps/lorelei.blk"
 
-Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246)
-	db GYM ; tileset
-	db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x)
-	dw BrunoBlocks, BrunoTextPointers, BrunoScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw BrunoObject ; objects
+INCLUDE "data/mapHeaders/bruno.asm"
 
 BrunoScript: ; 762d6 (1d:62d6)
 	call BrunoScript_762ec
@@ -86607,12 +85409,7 @@
 BrunoBlocks: ; 76403 (1d:6403)
 	INCBIN "maps/bruno.blk"
 
-Agatha_h: ; 0x76421 to 0x7642d (12 bytes) (id=247)
-	db CEMETERY ; tileset
-	db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x)
-	dw AgathaBlocks, AgathaTextPointers, AgathaScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw AgathaObject ; objects
+INCLUDE "data/mapHeaders/agatha.asm"
 
 AgathaScript: ; 7642d (1d:642d)
 	call AgathaScript_76443