split unused layout incbins, dump layouts table

7 files changed, 1618 insertions, 1053 deletions

diff --git a/asm/overworld.s b/asm/overworld.s
index 04386a645..e7121d398 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -722,7 +722,7 @@ get_mapdata_header: @ 8055170
 	.align 2, 0
 _08055180: .4byte gSaveBlock1Ptr
 _08055184:
-	ldr r0, _08055194 @ =gUnknown_834EB8C
+	ldr r0, _08055194 @ =gMapLayouts
 	subs r1, 0x1
 	lsls r1, 2
 	adds r1, r0
@@ -731,7 +731,7 @@ _0805518E:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08055194: .4byte gUnknown_834EB8C
+_08055194: .4byte gMapLayouts
 	thumb_func_end get_mapdata_header
 
 	thumb_func_start warp_shift
diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s
index b7875e7a9..56a3a78e8 100644
--- a/asm/teachy_tv.s
+++ b/asm/teachy_tv.s
@@ -2273,7 +2273,7 @@ sub_815BD80: @ 815BD80
 	str r0, [sp, 0x4]
 	movs r0, 0
 	str r0, [sp, 0x10]
-	ldr r1, _0815BE1C @ =gUnknown_82E55CC
+	ldr r1, _0815BE1C @ =gMapData_82E55CC
 	mov r8, r1
 	movs r0, 0x80
 	lsls r0, 4
@@ -2339,7 +2339,7 @@ _0815BDF0:
 	ldrh r0, [r6]
 	b _0815BE34
 	.align 2, 0
-_0815BE1C: .4byte gUnknown_82E55CC
+_0815BE1C: .4byte gMapData_82E55CC
 _0815BE20: .4byte 0x000003ff
 _0815BE24:
 	adds r0, r3, 0x1
diff --git a/data/data.s b/data/data.s
index f8b4a86ca..a17d53794 100644
--- a/data/data.s
+++ b/data/data.s
@@ -919,1052 +919,3 @@ gUnknown_826D374:: @ 826D374
 
 gUnknown_826D37C:: @ 826D37C
 	.incbin "baserom.gba", 0x26D37C, 0x67E84
-
-gMapData_PalletTown_PlayersHouse_1F:: @ 82D5200
-	.incbin "baserom.gba", 0x2D5200, 0xFC
-
-gMapData_PalletTown_PlayersHouse_2F:: @ 82D52FC
-	.incbin "baserom.gba", 0x2D52FC, 0x128
-
-gMapData_PalletTown_GarysHouse:: @ 82D5424
-	.incbin "baserom.gba", 0x2D5424, 0x244
-
-gMapData_PalletTown_ProfessorOaksLab:: @ 82D5668
-	.incbin "baserom.gba", 0x2D5668, 0xEC
-
-gMapData_CeruleanCity_House3:: @ 82D5754
-gMapData_CeruleanCity_House4:: @ 82D5754
-gMapData_VermilionCity_House1:: @ 82D5754
-gMapData_VermilionCity_House2:: @ 82D5754
-gMapData_VermilionCity_House3:: @ 82D5754
-gMapData_FuchsiaCity_House1:: @ 82D5754
-gMapData_FuchsiaCity_House3:: @ 82D5754
-gMapData_Route16_House:: @ 82D5754
-	.incbin "baserom.gba", 0x2D5754, 0xEC
-
-gMapData_PewterCity_House1:: @ 82D5840
-gMapData_PewterCity_House2:: @ 82D5840
-gMapData_Route2_House:: @ 82D5840
-gMapData_UnknownMap_18_01:: @ 82D5840
-gMapData_UnusedHouse_27_00:: @ 82D5840
-gMapData_UnusedHouse_29_00:: @ 82D5840
-	.incbin "baserom.gba", 0x2D5840, 0x150
-
-gMapData_ViridianCity_PokemonCenter_1F:: @ 82D5990
-gMapData_PewterCity_PokemonCenter_1F:: @ 82D5990
-gMapData_CeruleanCity_PokemonCenter_1F:: @ 82D5990
-gMapData_LavenderTown_PokemonCenter_1F:: @ 82D5990
-gMapData_VermilionCity_PokemonCenter_1F:: @ 82D5990
-gMapData_CeladonCity_PokemonCenter_1F:: @ 82D5990
-gMapData_FuchsiaCity_PokemonCenter_1F:: @ 82D5990
-gMapData_CinnabarIsland_PokemonCenter_1F:: @ 82D5990
-gMapData_SaffronCity_PokemonCenter_1F:: @ 82D5990
-gMapData_Route4_PokemonCenter_1F:: @ 82D5990
-gMapData_Route10_PokemonCenter_1F:: @ 82D5990
-gMapData_SevenIsland_PokemonCenter_1F:: @ 82D5990
-gMapData_TwoIsland_PokemonCenter_1F:: @ 82D5990
-gMapData_ThreeIsland_PokemonCenter_1F:: @ 82D5990
-gMapData_FourIsland_PokemonCenter_1F:: @ 82D5990
-gMapData_FiveIsland_PokemonCenter_1F:: @ 82D5990
-gMapData_SixIsland_PokemonCenter_1F:: @ 82D5990
-	.incbin "baserom.gba", 0x2D5990, 0x150
-
-gMapData_ViridianCity_PokemonCenter_2F:: @ 82D5AE0
-gMapData_PewterCity_PokemonCenter_2F:: @ 82D5AE0
-gMapData_CeruleanCity_PokemonCenter_2F:: @ 82D5AE0
-gMapData_LavenderTown_PokemonCenter_2F:: @ 82D5AE0
-gMapData_VermilionCity_PokemonCenter_2F:: @ 82D5AE0
-gMapData_CeladonCity_PokemonCenter_2F:: @ 82D5AE0
-gMapData_FuchsiaCity_PokemonCenter_2F:: @ 82D5AE0
-gMapData_CinnabarIsland_PokemonCenter_2F:: @ 82D5AE0
-gMapData_IndigoPlateau_PokemonCenter_2F:: @ 82D5AE0
-gMapData_SaffronCity_PokemonCenter_2F:: @ 82D5AE0
-gMapData_Route4_PokemonCenter_2F:: @ 82D5AE0
-gMapData_Route10_PokemonCenter_2F:: @ 82D5AE0
-gMapData_SevenIsland_PokemonCenter_2F:: @ 82D5AE0
-gMapData_TwoIsland_PokemonCenter_2F:: @ 82D5AE0
-gMapData_ThreeIsland_PokemonCenter_2F:: @ 82D5AE0
-gMapData_FourIsland_PokemonCenter_2F:: @ 82D5AE0
-gMapData_FiveIsland_PokemonCenter_2F:: @ 82D5AE0
-gMapData_SixIsland_PokemonCenter_2F:: @ 82D5AE0
-	.incbin "baserom.gba", 0x2D5AE0, 0xEC
-
-gMapData_ViridianCity_Mart:: @ 82D5BCC
-gMapData_PewterCity_Mart:: @ 82D5BCC
-gMapData_CeruleanCity_Mart:: @ 82D5BCC
-gMapData_LavenderTown_Mart:: @ 82D5BCC
-gMapData_VermilionCity_Mart:: @ 82D5BCC
-gMapData_FuchsiaCity_Mart:: @ 82D5BCC
-gMapData_CinnabarIsland_Mart:: @ 82D5BCC
-gMapData_SaffronCity_Mart:: @ 82D5BCC
-gMapData_SevenIsland_Mart:: @ 82D5BCC
-gMapData_ThreeIsland_Mart:: @ 82D5BCC
-gMapData_FourIsland_Mart:: @ 82D5BCC
-gMapData_SixIsland_Mart:: @ 82D5BCC
-	.incbin "baserom.gba", 0x2D5BCC, 0xEC
-
-gMapData_OneIsland_House1:: @ 82D5CB8
-gMapData_OneIsland_House2:: @ 82D5CB8
-gMapData_TwoIsland_House:: @ 82D5CB8
-gMapData_ThreeIsland_House2:: @ 82D5CB8
-gMapData_ThreeIsland_House3:: @ 82D5CB8
-gMapData_ThreeIsland_House4:: @ 82D5CB8
-gMapData_ThreeIsland_House5:: @ 82D5CB8
-gMapData_FourIsland_House1:: @ 82D5CB8
-gMapData_FourIsland_House2:: @ 82D5CB8
-gMapData_FiveIsland_House1:: @ 82D5CB8
-gMapData_FiveIsland_House2:: @ 82D5CB8
-gMapData_SixIsland_House:: @ 82D5CB8
-gMapData_TwoIsland_CapeBrink_House:: @ 82D5CB8
-gMapData_SixIsland_WaterPath_House2:: @ 82D5CB8
-gMapData_SevenIsland_SevaultCanyon_House:: @ 82D5CB8
-	.incbin "baserom.gba", 0x2D5CB8, 0x2CC
-
-gMapData_CeruleanCity_Gym:: @ 82D5F84
-	.incbin "baserom.gba", 0x2D5F84, 0xEC
-
-gMapData_Route12_FishingHouse:: @ 82D6070
-gMapData_UnusedHouse_31_05:: @ 82D6070
-gMapData_SixIsland_WaterPath_House1:: @ 82D6070
-	.incbin "baserom.gba", 0x2D6070, 0x300
-
-gMapData_CeladonCity_Gym:: @ 82D6370
-	.incbin "baserom.gba", 0x2D6370, 0x20C
-
-gMapData_FiveIsland_ResortGorgeous_House:: @ 82D657C
-	.incbin "baserom.gba", 0x2D657C, 0x488
-
-gMapData_FuchsiaCity_Gym:: @ 82D6A04
-	.incbin "baserom.gba", 0x2D6A04, 0xEC
-
-gMapData_LavenderTown_House1:: @ 82D6AF0
-gMapData_LavenderTown_House2:: @ 82D6AF0
-gMapData_CeladonCity_House1:: @ 82D6AF0
-gMapData_SaffronCity_House2:: @ 82D6AF0
-gMapData_SaffronCity_House3:: @ 82D6AF0
-	.incbin "baserom.gba", 0x2D6AF0, 0x338
-
-gMapData_VermilionCity_Gym:: @ 82D6E28
-	.incbin "baserom.gba", 0x2D6E28, 0x100
-
-gMapData_CeruleanCity_BikeShop:: @ 82D6F28
-	.incbin "baserom.gba", 0x2D6F28, 0x240
-
-gMapData_CeladonCity_GameCorner:: @ 82D7168
-	.incbin "baserom.gba", 0x2D7168, 0x1C4
-
-gMapData_PewterCity_Gym:: @ 82D732C
-	.incbin "baserom.gba", 0x2D732C, 0xEC
-
-gMapData_FourIsland_LoreleisHouse:: @ 82D7418
-	.incbin "baserom.gba", 0x2D7418, 0xEC
-
-gMapData_ThreeIsland_House1:: @ 82D7504
-	.incbin "baserom.gba", 0x2D7504, 0x740
-
-gMapData_SaffronCity_Gym:: @ 82D7C44
-	.incbin "baserom.gba", 0x2D7C44, 0x684
-
-gMapData_CinnabarIsland_Gym:: @ 82D82C8
-	.incbin "baserom.gba", 0x2D82C8, 0x3E4
-
-gMapData_ViridianCity_Gym:: @ 82D86AC
-	.incbin "baserom.gba", 0x2D86AC, 0x33C
-
-gMapData_UnknownMap_00_00:: @ 82D89E8
-	.incbin "baserom.gba", 0x2D89E8, 0xFC
-
-gMapData_UnknownMap_00_01:: @ 82D8AE4
-	.incbin "baserom.gba", 0x2D8AE4, 0x1B4
-
-gMapData_UnknownMap_00_02:: @ 82D8C98
-	.incbin "baserom.gba", 0x2D8C98, 0x120
-
-gMapData_UnknownMap_00_03:: @ 82D8DB8
-	.incbin "baserom.gba", 0x2D8DB8, 0xC8
-
-gMapData_FuchsiaCity_SafariZone_Entrance:: @ 82D8E80
-	.incbin "baserom.gba", 0x2D8E80, 0x4640
-
-gMapData_PalletTown:: @ 82DD4C0
-	.incbin "baserom.gba", 0x2DD4C0, 0xF24
-
-gMapData_ViridianCity:: @ 82DE3E4
-	.incbin "baserom.gba", 0x2DE3E4, 0xF24
-
-gMapData_PewterCity:: @ 82DF308
-	.incbin "baserom.gba", 0x2DF308, 0xF24
-
-gMapData_CeruleanCity:: @ 82E022C
-	.incbin "baserom.gba", 0x2E022C, 0x3E4
-
-gMapData_LavenderTown:: @ 82E0610
-	.incbin "baserom.gba", 0x2E0610, 0xF24
-
-gMapData_VermilionCity:: @ 82E1534
-	.incbin "baserom.gba", 0x2E1534, 0x12E4
-
-gMapData_CeladonCity:: @ 82E2818
-	.incbin "baserom.gba", 0x2E2818, 0xF24
-
-gMapData_FuchsiaCity:: @ 82E373C
-	.incbin "baserom.gba", 0x2E373C, 0x3E4
-
-gMapData_CinnabarIsland:: @ 82E3B20
-	.incbin "baserom.gba", 0x2E3B20, 0x3E4
-
-gMapData_IndigoPlateau_Exterior:: @ 82E3F04
-	.incbin "baserom.gba", 0x2E3F04, 0xF24
-
-gMapData_SaffronCity:: @ 82E4E28
-	.incbin "baserom.gba", 0x2E4E28, 0x7A4
-
-gMapData_Route1:: @ 82E55CC
-gUnknown_82E55CC:: @ 82E55CC
-	.incbin "baserom.gba", 0x2E55CC, 0xF24
-
-gMapData_Route2:: @ 82E64F0
-	.incbin "baserom.gba", 0x2E64F0, 0xD44
-
-gMapData_Route3:: @ 82E7234
-	.incbin "baserom.gba", 0x2E7234, 0x1104
-
-gMapData_Route4:: @ 82E8338
-	.incbin "baserom.gba", 0x2E8338, 0xF24
-
-gMapData_Route5:: @ 82E925C
-	.incbin "baserom.gba", 0x2E925C, 0x7A4
-
-gMapData_Route6:: @ 82E9A00
-	.incbin "baserom.gba", 0x2E9A00, 0x3E4
-
-gMapData_Route7:: @ 82E9DE4
-	.incbin "baserom.gba", 0x2E9DE4, 0xB64
-
-gMapData_Route8:: @ 82EA948
-	.incbin "baserom.gba", 0x2EA948, 0xB64
-
-gMapData_Route9:: @ 82EB4AC
-	.incbin "baserom.gba", 0x2EB4AC, 0xF24
-
-gMapData_Route10:: @ 82EC3D0
-	.incbin "baserom.gba", 0x2EC3D0, 0xB64
-
-gMapData_Route11:: @ 82ECF34
-	.incbin "baserom.gba", 0x2ECF34, 0x16A4
-
-gMapData_Route12:: @ 82EE5D8
-	.incbin "baserom.gba", 0x2EE5D8, 0xB64
-
-gMapData_Route13:: @ 82EF13C
-	.incbin "baserom.gba", 0x2EF13C, 0xB64
-
-gMapData_Route14:: @ 82EFCA0
-	.incbin "baserom.gba", 0x2EFCA0, 0xB64
-
-gMapData_Route15:: @ 82F0804
-	.incbin "baserom.gba", 0x2F0804, 0x7A4
-
-gMapData_Route16:: @ 82F0FA8
-	.incbin "baserom.gba", 0x2F0FA8, 0x1E24
-
-gMapData_Route17:: @ 82F2DCC
-	.incbin "baserom.gba", 0x2F2DCC, 0x984
-
-gMapData_Route18:: @ 82F3750
-	.incbin "baserom.gba", 0x2F3750, 0xB64
-
-gMapData_Route19:: @ 82F42B4
-	.incbin "baserom.gba", 0x2F42B4, 0x12E4
-
-gMapData_Route20:: @ 82F5598
-	.incbin "baserom.gba", 0x2F5598, 0x984
-
-gMapData_Route21_North:: @ 82F5F1C
-	.incbin "baserom.gba", 0x2F5F1C, 0x924
-
-gMapData_Route22:: @ 82F6840
-	.incbin "baserom.gba", 0x2F6840, 0x1E24
-
-gMapData_Route23:: @ 82F8664
-	.incbin "baserom.gba", 0x2F8664, 0x7A4
-
-gMapData_Route24:: @ 82F8E08
-	.incbin "baserom.gba", 0x2F8E08, 0xB64
-
-gMapData_Route25:: @ 82F996C
-	.incbin "baserom.gba", 0x2F996C, 0xF24
-
-gMapData_MtMoon_1F:: @ 82FA890
-	.incbin "baserom.gba", 0x2FA890, 0xF74
-
-gMapData_MtMoon_B1F:: @ 82FB804
-	.incbin "baserom.gba", 0x2FB804, 0xF24
-
-gMapData_MtMoon_B2F:: @ 82FC728
-	.incbin "baserom.gba", 0x2FC728, 0x1D44
-
-gMapData_ViridianForest:: @ 82FE46C
-	.incbin "baserom.gba", 0x2FE46C, 0x11A4
-
-gMapData_SSAnne_Exterior:: @ 82FF610
-	.incbin "baserom.gba", 0x2FF610, 0x53C
-
-gMapData_SSAnne_1F_Corridor:: @ 82FFB4C
-	.incbin "baserom.gba", 0x2FFB4C, 0x464
-
-gMapData_SSAnne_2F_Corridor:: @ 82FFFB0
-	.incbin "baserom.gba", 0x2FFFB0, 0x158
-
-gMapData_SSAnne_3F_Corridor:: @ 8300108
-	.incbin "baserom.gba", 0x300108, 0x168
-
-gMapData_SSAnne_B1F_Corridor:: @ 8300270
-	.incbin "baserom.gba", 0x300270, 0x3B4
-
-gMapData_SSAnne_Deck:: @ 8300624
-	.incbin "baserom.gba", 0x300624, 0x3544
-
-gMapData_DiglettsCave_B1F:: @ 8303B68
-	.incbin "baserom.gba", 0x303B68, 0x864
-
-gMapData_VictoryRoad_1F:: @ 83043CC
-	.incbin "baserom.gba", 0x3043CC, 0x8E8
-
-gMapData_VictoryRoad_2F:: @ 8304CB4
-	.incbin "baserom.gba", 0x304CB4, 0x7E0
-
-gMapData_VictoryRoad_3F:: @ 8305494
-	.incbin "baserom.gba", 0x305494, 0x794
-
-gMapData_RocketHideout_B1F:: @ 8305C28
-	.incbin "baserom.gba", 0x305C28, 0x5A4
-
-gMapData_RocketHideout_B2F:: @ 83061CC
-	.incbin "baserom.gba", 0x3061CC, 0x4C8
-
-gMapData_RocketHideout_B3F:: @ 8306694
-	.incbin "baserom.gba", 0x306694, 0x504
-
-gMapData_RocketHideout_B4F:: @ 8306B98
-	.incbin "baserom.gba", 0x306B98, 0x654
-
-gMapData_SilphCo_1F:: @ 83071EC
-	.incbin "baserom.gba", 0x3071EC, 0x654
-
-gMapData_SilphCo_2F:: @ 8307840
-	.incbin "baserom.gba", 0x307840, 0x654
-
-gMapData_SilphCo_3F:: @ 8307E94
-	.incbin "baserom.gba", 0x307E94, 0x654
-
-gMapData_SilphCo_4F:: @ 83084E8
-	.incbin "baserom.gba", 0x3084E8, 0x654
-
-gMapData_SilphCo_5F:: @ 8308B3C
-	.incbin "baserom.gba", 0x308B3C, 0x4C0
-
-gMapData_SilphCo_6F:: @ 8308FFC
-	.incbin "baserom.gba", 0x308FFC, 0x4C0
-
-gMapData_SilphCo_7F:: @ 83094BC
-	.incbin "baserom.gba", 0x3094BC, 0x4C0
-
-gMapData_SilphCo_8F:: @ 830997C
-	.incbin "baserom.gba", 0x30997C, 0x4C0
-
-gMapData_SilphCo_9F:: @ 8309E3C
-	.incbin "baserom.gba", 0x309E3C, 0x2AC
-
-gMapData_SilphCo_10F:: @ 830A0E8
-	.incbin "baserom.gba", 0x30A0E8, 0x2CC
-
-gMapData_SilphCo_11F:: @ 830A3B4
-	.incbin "baserom.gba", 0x30A3B4, 0xA88
-
-gMapData_PokemonMansion_1F:: @ 830AE3C
-	.incbin "baserom.gba", 0x30AE3C, 0xB6C
-
-gMapData_PokemonMansion_2F:: @ 830B9A8
-	.incbin "baserom.gba", 0x30B9A8, 0xA88
-
-gMapData_PokemonMansion_3F:: @ 830C430
-	.incbin "baserom.gba", 0x30C430, 0xA88
-
-gMapData_PokemonMansion_B1F:: @ 830CEB8
-	.incbin "baserom.gba", 0x30CEB8, 0xE80
-
-gMapData_SafariZone_Center:: @ 830DD38
-	.incbin "baserom.gba", 0x30DD38, 0xEEC
-
-gMapData_SafariZone_East:: @ 830EC24
-	.incbin "baserom.gba", 0x30EC24, 0x11F8
-
-gMapData_SafariZone_North:: @ 830FE1C
-	.incbin "baserom.gba", 0x30FE1C, 0xDA8
-
-gMapData_SafariZone_West:: @ 8310BC4
-	.incbin "baserom.gba", 0x310BC4, 0x754
-
-gMapData_CeruleanCave_1F:: @ 8311318
-	.incbin "baserom.gba", 0x311318, 0x754
-
-gMapData_CeruleanCave_2F:: @ 8311A6C
-	.incbin "baserom.gba", 0x311A6C, 0x754
-
-gMapData_CeruleanCave_B1F:: @ 83121C0
-	.incbin "baserom.gba", 0x3121C0, 0xF24
-
-gMapData_RockTunnel_1F:: @ 83130E4
-	.incbin "baserom.gba", 0x3130E4, 0xF24
-
-gMapData_RockTunnel_B1F:: @ 8314008
-	.incbin "baserom.gba", 0x314008, 0x744
-
-gMapData_SeafoamIslands_1F:: @ 831474C
-	.incbin "baserom.gba", 0x31474C, 0x6F8
-
-gMapData_SeafoamIslands_B1F:: @ 8314E44
-	.incbin "baserom.gba", 0x314E44, 0x744
-
-gMapData_SeafoamIslands_B2F:: @ 8315588
-	.incbin "baserom.gba", 0x315588, 0x744
-
-gMapData_SeafoamIslands_B3F:: @ 8315CCC
-	.incbin "baserom.gba", 0x315CCC, 0x744
-
-gMapData_SeafoamIslands_B4F:: @ 8316410
-	.incbin "baserom.gba", 0x316410, 0x3E4
-
-gMapData_PokemonTower_1F:: @ 83167F4
-	.incbin "baserom.gba", 0x3167F4, 0x3E4
-
-gMapData_PokemonTower_2F:: @ 8316BD8
-	.incbin "baserom.gba", 0x316BD8, 0x3E4
-
-gMapData_PokemonTower_3F:: @ 8316FBC
-	.incbin "baserom.gba", 0x316FBC, 0x3E4
-
-gMapData_PokemonTower_4F:: @ 83173A0
-	.incbin "baserom.gba", 0x3173A0, 0x3E4
-
-gMapData_PokemonTower_5F:: @ 8317784
-	.incbin "baserom.gba", 0x317784, 0x3E4
-
-gMapData_PokemonTower_6F:: @ 8317B68
-	.incbin "baserom.gba", 0x317B68, 0x3E4
-
-gMapData_PokemonTower_7F:: @ 8317F4C
-	.incbin "baserom.gba", 0x317F4C, 0xF74
-
-gMapData_PowerPlant:: @ 8318EC0
-	.incbin "baserom.gba", 0x318EC0, 0x170
-
-gMapData_Route25_SeaCottage:: @ 8319030
-	.incbin "baserom.gba", 0x319030, 0x1E4
-
-gMapData_SSAnne_Kitchen:: @ 8319214
-	.incbin "baserom.gba", 0x319214, 0xD8
-
-gMapData_SSAnne_CaptainsOffice:: @ 83192EC
-	.incbin "baserom.gba", 0x3192EC, 0x128
-
-gMapData_UndergroundPath_NorthEntrance:: @ 8319414
-gMapData_UndergroundPath_SouthEntrance:: @ 8319414
-gMapData_UndergroundPath_WestEntrance:: @ 8319414
-gMapData_UndergroundPath_EastEntrance:: @ 8319414
-	.incbin "baserom.gba", 0x319414, 0x484
-
-gMapData_UndergroundPath_EastWestTunnel:: @ 8319898
-	.incbin "baserom.gba", 0x319898, 0x414
-
-gMapData_UndergroundPath_NorthSouthTunnel:: @ 8319CAC
-	.incbin "baserom.gba", 0x319CAC, 0x144
-
-gMapData_Route12_NorthEntrance_1F:: @ 8319DF0
-	.incbin "baserom.gba", 0x319DF0, 0x84
-
-gMapData_SSAnne_1F_Room1:: @ 8319E74
-gMapData_SSAnne_1F_Room2:: @ 8319E74
-gMapData_SSAnne_1F_Room3:: @ 8319E74
-gMapData_SSAnne_1F_Room4:: @ 8319E74
-gMapData_SSAnne_1F_Room5:: @ 8319E74
-gMapData_SSAnne_1F_Room7:: @ 8319E74
-gMapData_SSAnne_1F_Room6:: @ 8319E74
-	.incbin "baserom.gba", 0x319E74, 0x90
-
-gMapData_SSAnne_2F_Room1:: @ 8319F04
-gMapData_SSAnne_2F_Room2:: @ 8319F04
-gMapData_SSAnne_2F_Room3:: @ 8319F04
-gMapData_SSAnne_2F_Room4:: @ 8319F04
-gMapData_SSAnne_2F_Room5:: @ 8319F04
-gMapData_SSAnne_2F_Room6:: @ 8319F04
-gMapData_SSAnne_B1F_Room1:: @ 8319F04
-gMapData_SSAnne_B1F_Room2:: @ 8319F04
-gMapData_SSAnne_B1F_Room3:: @ 8319F04
-gMapData_SSAnne_B1F_Room4:: @ 8319F04
-gMapData_SSAnne_B1F_Room5:: @ 8319F04
-	.incbin "baserom.gba", 0x319F04, 0x6C
-
-gMapData_CeladonCity_DepartmentStore_Elevator:: @ 8319F70
-	.incbin "baserom.gba", 0x319F70, 0x28C
-
-gMapData_PewterCity_Museum_1F:: @ 831A1FC
-	.incbin "baserom.gba", 0x31A1FC, 0x1A0
-
-gMapData_PewterCity_Museum_2F:: @ 831A39C
-	.incbin "baserom.gba", 0x31A39C, 0xD8
-
-gMapData_CeruleanCity_House2:: @ 831A474
-	.incbin "baserom.gba", 0x31A474, 0xEC
-
-gMapData_CeruleanCity_House1:: @ 831A560
-	.incbin "baserom.gba", 0x31A560, 0x27C
-
-gMapData_CeladonCity_Condominiums_1F:: @ 831A7DC
-	.incbin "baserom.gba", 0x31A7DC, 0x27C
-
-gMapData_CeladonCity_Condominiums_2F:: @ 831AA58
-	.incbin "baserom.gba", 0x31AA58, 0x27C
-
-gMapData_CeladonCity_Condominiums_3F:: @ 831ACD4
-	.incbin "baserom.gba", 0x31ACD4, 0x2A8
-
-gMapData_CeladonCity_Condominiums_Roof:: @ 831AF7C
-	.incbin "baserom.gba", 0x31AF7C, 0xD8
-
-gMapData_CeladonCity_Condominiums_RoofRoom:: @ 831B054
-	.incbin "baserom.gba", 0x31B054, 0xD8
-
-gMapData_CeladonCity_GameCorner_PrizeRoom:: @ 831B12C
-	.incbin "baserom.gba", 0x31B12C, 0x170
-
-gMapData_CeladonCity_Restaurant:: @ 831B29C
-	.incbin "baserom.gba", 0x31B29C, 0x19C
-
-gMapData_CeladonCity_Hotel:: @ 831B438
-	.incbin "baserom.gba", 0x31B438, 0x1C4
-
-gMapData_CeladonCity_DepartmentStore_1F:: @ 831B5FC
-	.incbin "baserom.gba", 0x31B5FC, 0x1AC
-
-gMapData_CeladonCity_DepartmentStore_2F:: @ 831B7A8
-	.incbin "baserom.gba", 0x31B7A8, 0x1AC
-
-gMapData_CeladonCity_DepartmentStore_3F:: @ 831B954
-	.incbin "baserom.gba", 0x31B954, 0x1AC
-
-gMapData_CeladonCity_DepartmentStore_4F:: @ 831BB00
-	.incbin "baserom.gba", 0x31BB00, 0x1AC
-
-gMapData_CeladonCity_DepartmentStore_5F:: @ 831BCAC
-	.incbin "baserom.gba", 0x31BCAC, 0x238
-
-gMapData_CeladonCity_DepartmentStore_Roof:: @ 831BEE4
-	.incbin "baserom.gba", 0x31BEE4, 0x144
-
-gMapData_SafariZone_Building1:: @ 831C028
-gMapData_SafariZone_Building2:: @ 831C028
-gMapData_SafariZone_Building3:: @ 831C028
-gMapData_SafariZone_Building4:: @ 831C028
-	.incbin "baserom.gba", 0x31C028, 0x144
-
-gMapData_SafariZone_SecretHouse:: @ 831C16C
-	.incbin "baserom.gba", 0x31C16C, 0x1DC
-
-gMapData_FuchsiaCity_ZooBuilding:: @ 831C348
-	.incbin "baserom.gba", 0x31C348, 0x144
-
-gMapData_FuchsiaCity_Building1:: @ 831C48C
-	.incbin "baserom.gba", 0x31C48C, 0xEC
-
-gMapData_FuchsiaCity_House2:: @ 831C578
-	.incbin "baserom.gba", 0x31C578, 0x28C
-
-gMapData_CinnabarIsland_PokemonLab_Entrance:: @ 831C804
-	.incbin "baserom.gba", 0x31C804, 0x170
-
-gMapData_CinnabarIsland_PokemonLab_Lounge:: @ 831C974
-	.incbin "baserom.gba", 0x31C974, 0x170
-
-gMapData_CinnabarIsland_PokemonLab_ResearchRoom:: @ 831CAE4
-	.incbin "baserom.gba", 0x31CAE4, 0x170
-
-gMapData_CinnabarIsland_PokemonLab_ExperimentRoom:: @ 831CC54
-	.incbin "baserom.gba", 0x31CC54, 0x1C80
-
-gMapData_SaffronCity_Duplicate:: @ 831E8D4
-	.incbin "baserom.gba", 0x31E8D4, 0xEC
-
-gMapData_Route5_SouthEntrance:: @ 831E9C0
-gMapData_Route6_NorthEntrance:: @ 831E9C0
-	.incbin "baserom.gba", 0x31E9C0, 0x110
-
-gMapData_Route7_EastEntrance:: @ 831EAD0
-gMapData_Route8_WestEntrance:: @ 831EAD0
-	.incbin "baserom.gba", 0x31EAD0, 0xC4
-
-gMapData_DiglettsCave_NorthEntrance:: @ 831EB94
-	.incbin "baserom.gba", 0x31EB94, 0xC4
-
-gMapData_DiglettsCave_SouthEntrance:: @ 831EC58
-	.incbin "baserom.gba", 0x31EC58, 0x3A8
-
-gMapData_IndigoPlateau_PokemonCenter_1F:: @ 831F000
-	.incbin "baserom.gba", 0x31F000, 0x178
-
-gMapData_PokemonLeague_LoreleisRoom:: @ 831F178
-	.incbin "baserom.gba", 0x31F178, 0x178
-
-gMapData_PokemonLeague_BrunosRoom:: @ 831F2F0
-	.incbin "baserom.gba", 0x31F2F0, 0x178
-
-gMapData_PokemonLeague_AgathasRoom:: @ 831F468
-	.incbin "baserom.gba", 0x31F468, 0x564
-
-gMapData_PokemonLeague_LancesRoom:: @ 831F9CC
-	.incbin "baserom.gba", 0x31F9CC, 0x22C
-
-gMapData_PokemonLeague_ChampionsRoom:: @ 831FBF8
-	.incbin "baserom.gba", 0x31FBF8, 0x144
-
-gMapData_PokemonLeague_HallOfFame:: @ 831FD3C
-	.incbin "baserom.gba", 0x31FD3C, 0x984
-
-gMapData_Route21_South:: @ 83206C0
-	.incbin "baserom.gba", 0x3206C0, 0x144
-
-gMapData_Route11_EastEntrance_2F:: @ 8320804
-gMapData_Route12_NorthEntrance_2F:: @ 8320804
-gMapData_Route15_WestEntrance_2F:: @ 8320804
-gMapData_Route16_NorthEntrance_2F:: @ 8320804
-gMapData_Route18_EastEntrance_2F:: @ 8320804
-	.incbin "baserom.gba", 0x320804, 0x18C
-
-gMapData_Route2_ViridianForest_SouthEntrance:: @ 8320990
-gMapData_Route2_EastBuilding:: @ 8320990
-gMapData_Route2_ViridianForest_NorthEntrance:: @ 8320990
-	.incbin "baserom.gba", 0x320990, 0x18C
-
-gMapData_Route22_NorthEntrance:: @ 8320B1C
-	.incbin "baserom.gba", 0x320B1C, 0x1F8
-
-gMapData_Route16_NorthEntrance_1F:: @ 8320D14
-	.incbin "baserom.gba", 0x320D14, 0x15C
-
-gMapData_Route11_EastEntrance_1F:: @ 8320E70
-gMapData_Route15_WestEntrance_1F:: @ 8320E70
-gMapData_Route18_EastEntrance_1F:: @ 8320E70
-	.incbin "baserom.gba", 0x320E70, 0x6C
-
-gMapData_RocketHideout_Elevator:: @ 8320EDC
-	.incbin "baserom.gba", 0x320EDC, 0x128
-
-gMapData_SaffronCity_House1_1F:: @ 8321004
-	.incbin "baserom.gba", 0x321004, 0xFC
-
-gMapData_SaffronCity_House1_2F:: @ 8321100
-	.incbin "baserom.gba", 0x321100, 0x1C4
-
-gMapData_SaffronCity_Dojo:: @ 83212C4
-	.incbin "baserom.gba", 0x3212C4, 0x6C
-
-gMapData_SilphCo_Elevator:: @ 8321330
-	.incbin "baserom.gba", 0x321330, 0x3E4
-
-gMapData_OneIsland:: @ 8321714
-	.incbin "baserom.gba", 0x321714, 0x7A4
-
-gMapData_TwoIsland:: @ 8321EB8
-	.incbin "baserom.gba", 0x321EB8, 0x7A4
-
-gMapData_ThreeIsland:: @ 832265C
-	.incbin "baserom.gba", 0x32265C, 0xF24
-
-gMapData_FourIsland:: @ 8323580
-	.incbin "baserom.gba", 0x323580, 0x3E4
-
-gMapData_FiveIsland:: @ 8323964
-	.incbin "baserom.gba", 0x323964, 0x3E4
-
-gMapData_SevenIsland:: @ 8323D48
-	.incbin "baserom.gba", 0x323D48, 0x5C4
-
-gMapData_SixIsland:: @ 832430C
-	.incbin "baserom.gba", 0x32430C, 0x1A64
-
-gMapData_OneIsland_KindleRoad:: @ 8325D70
-	.incbin "baserom.gba", 0x325D70, 0x7A4
-
-gMapData_OneIsland_TreasureBeach:: @ 8326514
-	.incbin "baserom.gba", 0x326514, 0x7A4
-
-gMapData_TwoIsland_CapeBrink:: @ 8326CB8
-	.incbin "baserom.gba", 0x326CB8, 0xF24
-
-gMapData_ThreeIsland_BondBridge:: @ 8327BDC
-	.incbin "baserom.gba", 0x327BDC, 0x7A4
-
-gMapData_ThreeIsland_Port:: @ 8328380
-	.incbin "baserom.gba", 0x328380, 0x28
-
-gMapData_UnknownMap_03_50:: @ 83283A8
-	.incbin "baserom.gba", 0x3283A8, 0x28
-
-gMapData_UnknownMap_03_51:: @ 83283D0
-	.incbin "baserom.gba", 0x3283D0, 0xD44
-
-gMapData_UnknownMap_03_52:: @ 8329114
-	.incbin "baserom.gba", 0x329114, 0xB64
-
-gMapData_UnknownMap_03_53:: @ 8329C78
-	.incbin "baserom.gba", 0x329C78, 0xB64
-
-gMapData_FiveIsland_ResortGorgeous:: @ 832A7DC
-	.incbin "baserom.gba", 0x32A7DC, 0xB64
-
-gMapData_FiveIsland_WaterLabyrinth:: @ 832B340
-	.incbin "baserom.gba", 0x32B340, 0x7A4
-
-gMapData_FiveIsland_Meadow:: @ 832BAE4
-	.incbin "baserom.gba", 0x32BAE4, 0xB64
-
-gMapData_FiveIsland_MemorialPillar:: @ 832C648
-	.incbin "baserom.gba", 0x32C648, 0xF24
-
-gMapData_SixIsland_OutcastIsland:: @ 832D56C
-	.incbin "baserom.gba", 0x32D56C, 0xB64
-
-gMapData_SixIsland_GreenPath:: @ 832E0D0
-	.incbin "baserom.gba", 0x32E0D0, 0x12E4
-
-gMapData_SixIsland_WaterPath:: @ 832F3B4
-	.incbin "baserom.gba", 0x32F3B4, 0xF24
-
-gMapData_SixIsland_RuinValley:: @ 83302D8
-	.incbin "baserom.gba", 0x3302D8, 0x25A4
-
-gMapData_SevenIsland_TrainerTower:: @ 833287C
-	.incbin "baserom.gba", 0x33287C, 0x7A4
-
-gMapData_SevenIsland_SevaultCanyon_Entrance:: @ 8333020
-	.incbin "baserom.gba", 0x333020, 0xF24
-
-gMapData_SevenIsland_SevaultCanyon:: @ 8333F44
-	.incbin "baserom.gba", 0x333F44, 0x16A4
-
-gMapData_SevenIsland_TanobyRuins:: @ 83355E8
-	.incbin "baserom.gba", 0x3355E8, 0x32DC
-
-gMapData_UnknownMap_00_04:: @ 83388C4
-	.incbin "baserom.gba", 0x3388C4, 0x19C
-
-gMapData_SaffronCity_PokemonTrainerFanClub:: @ 8338A60
-	.incbin "baserom.gba", 0x338A60, 0x1E8
-
-gMapData_SevenIsland_House_Room2:: @ 8338C48
-	.incbin "baserom.gba", 0x338C48, 0xD8
-
-gMapData_ViridianCity_House2:: @ 8338D20
-	.incbin "baserom.gba", 0x338D20, 0x570
-
-gMapData_MtEmber_RubyPath_B4F:: @ 8339290
-	.incbin "baserom.gba", 0x339290, 0x1518
-
-gMapData_ThreeIsland_BerryForest:: @ 833A7A8
-	.incbin "baserom.gba", 0x33A7A8, 0x1C8
-
-gMapData_OneIsland_PokemonCenter_1F:: @ 833A970
-	.incbin "baserom.gba", 0x33A970, 0x114
-
-gMapData_TwoIsland_JoyfulGameCorner:: @ 833AA84
-	.incbin "baserom.gba", 0x33AA84, 0x144
-
-gMapData_VermilionCity_PokemonFanClub:: @ 833ABC8
-	.incbin "baserom.gba", 0x33ABC8, 0xFC
-
-gMapData_LavenderTown_VolunteerPokemonHouse:: @ 833ACC4
-	.incbin "baserom.gba", 0x33ACC4, 0xFC
-
-gMapData_Route5_PokemonDayCare:: @ 833ADC0
-	.incbin "baserom.gba", 0x33ADC0, 0xEC
-
-gMapData_ViridianCity_House1:: @ 833AEAC
-	.incbin "baserom.gba", 0x33AEAC, 0xFC
-
-gMapData_FourIsland_PokemonDayCare:: @ 833AFA8
-	.incbin "baserom.gba", 0x33AFA8, 0x26B8
-
-gMapData_MtEmber_Exterior:: @ 833D660
-	.incbin "baserom.gba", 0x33D660, 0x368
-
-gMapData_MtEmber_Summit:: @ 833D9C8
-	.incbin "baserom.gba", 0x33D9C8, 0x240
-
-gMapData_MtEmber_SummitPath_1F:: @ 833DC08
-	.incbin "baserom.gba", 0x33DC08, 0x1164
-
-gMapData_MtEmber_SummitPath_2F:: @ 833ED6C
-	.incbin "baserom.gba", 0x33ED6C, 0x170
-
-gMapData_MtEmber_SummitPath_3F:: @ 833EEDC
-	.incbin "baserom.gba", 0x33EEDC, 0x428
-
-gMapData_SSAnne_Kitchen3:: @ 833F304
-	.incbin "baserom.gba", 0x33F304, 0x220
-
-gMapData_MtEmber_RubyPath_B1F:: @ 833F524
-	.incbin "baserom.gba", 0x33F524, 0x184
-
-gMapData_MtEmber_RubyPath_B2F:: @ 833F6A8
-	.incbin "baserom.gba", 0x33F6A8, 0x5B8
-
-gMapData_MtEmber_RubyPath_B3F:: @ 833FC60
-	.incbin "baserom.gba", 0x33FC60, 0x78
-
-gMapData_MtEmber_RubyPath_B1F_Stairs:: @ 833FCD8
-	.incbin "baserom.gba", 0x33FCD8, 0x84
-
-gMapData_MtEmber_RubyPath_B2F_Stairs:: @ 833FD5C
-	.incbin "baserom.gba", 0x33FD5C, 0x204
-
-gMapData_MtEmber_RubyPath_B5F:: @ 833FF60
-	.incbin "baserom.gba", 0x33FF60, 0x644
-
-gMapData_SSAnne_CaptainsOffice4:: @ 83405A4
-	.incbin "baserom.gba", 0x3405A4, 0x894
-
-gMapData_FourIsland_IcefallCave_Entrance:: @ 8340E38
-	.incbin "baserom.gba", 0x340E38, 0x344
-
-gMapData_FourIsland_IcefallCave_1F:: @ 834117C
-	.incbin "baserom.gba", 0x34117C, 0x3E4
-
-gMapData_SSAnne_CaptainsOffice2:: @ 8341560
-	.incbin "baserom.gba", 0x341560, 0x538
-
-gMapData_SSAnne_CaptainsOffice3:: @ 8341A98
-	.incbin "baserom.gba", 0x341A98, 0x2AC
-
-gMapData_SevenIsland_TrainerTower_Lobby:: @ 8341D44
-	.incbin "baserom.gba", 0x341D44, 0x288
-
-gMapData_SevenIsland_TrainerTower_1F:: @ 8341FCC
-	.incbin "baserom.gba", 0x341FCC, 0x288
-
-gMapData_SevenIsland_TrainerTower_2F:: @ 8342254
-	.incbin "baserom.gba", 0x342254, 0x288
-
-gMapData_SevenIsland_TrainerTower_3F:: @ 83424DC
-	.incbin "baserom.gba", 0x3424DC, 0x288
-
-gMapData_SevenIsland_TrainerTower_4F:: @ 8342764
-	.incbin "baserom.gba", 0x342764, 0x288
-
-gMapData_SevenIsland_TrainerTower_5F:: @ 83429EC
-	.incbin "baserom.gba", 0x3429EC, 0x288
-
-gMapData_SevenIsland_TrainerTower_6F:: @ 8342C74
-	.incbin "baserom.gba", 0x342C74, 0x288
-
-gMapData_SevenIsland_TrainerTower_7F:: @ 8342EFC
-	.incbin "baserom.gba", 0x342EFC, 0x288
-
-gMapData_SevenIsland_TrainerTower_8F:: @ 8343184
-	.incbin "baserom.gba", 0x343184, 0x264
-
-gMapData_SevenIsland_TrainerTower_Roof:: @ 83433E8
-	.incbin "baserom.gba", 0x3433E8, 0x6C
-
-gMapData_SevenIsland_TrainerTower_Elevator:: @ 8343454
-	.incbin "baserom.gba", 0x343454, 0xEC
-
-gMapData_CeruleanCity_House5:: @ 8343540
-	.incbin "baserom.gba", 0x343540, 0x184
-
-gMapData_SSAnne_CaptainsOffice5:: @ 83436C4
-	.incbin "baserom.gba", 0x3436C4, 0x144
-
-gMapData_SixIsland_DottedHole_B1F:: @ 8343808
-	.incbin "baserom.gba", 0x343808, 0x144
-
-gMapData_SixIsland_DottedHole_B2F:: @ 834394C
-	.incbin "baserom.gba", 0x34394C, 0x144
-
-gMapData_SixIsland_DottedHole_B3F:: @ 8343A90
-	.incbin "baserom.gba", 0x343A90, 0x144
-
-gMapData_SSAnne_CaptainsOffice9:: @ 8343BD4
-	.incbin "baserom.gba", 0x343BD4, 0x204
-
-gMapData_SixIsland_DottedHole_SapphireRoom:: @ 8343DD8
-	.incbin "baserom.gba", 0x343DD8, 0x1E0
-
-gMapData_BirthIsland_Harbor:: @ 8343FB8
-gMapData_NavelRock_Harbor:: @ 8343FB8
-gMapData_SevenIsland_Harbor:: @ 8343FB8
-gMapData_OneIsland_Harbor:: @ 8343FB8
-gMapData_TwoIsland_Harbor:: @ 8343FB8
-gMapData_FourIsland_Harbor:: @ 8343FB8
-gMapData_FiveIsland_Harbor:: @ 8343FB8
-gMapData_SixIsland_Harbor:: @ 8343FB8
-gMapData_ThreeIsland_Harbor:: @ 8343FB8
-	.incbin "baserom.gba", 0x343FB8, 0x150
-
-gMapData_OneIsland_PokemonCenter_2F:: @ 8344108
-	.incbin "baserom.gba", 0x344108, 0xF28
-
-gMapData_SSAnne_1F_Room11:: @ 8345030
-	.incbin "baserom.gba", 0x345030, 0x1C8
-
-gMapData_ThreeIsland_DunsparceTunnel:: @ 83451F8
-	.incbin "baserom.gba", 0x3451F8, 0x2E0
-
-gMapData_FiveIsland_LostCave_Entrance:: @ 83454D8
-	.incbin "baserom.gba", 0x3454D8, 0x118
-
-gMapData_FiveIsland_LostCave_Room1:: @ 83455F0
-	.incbin "baserom.gba", 0x3455F0, 0x118
-
-gMapData_FiveIsland_LostCave_Room2:: @ 8345708
-	.incbin "baserom.gba", 0x345708, 0x118
-
-gMapData_FiveIsland_LostCave_Room3:: @ 8345820
-	.incbin "baserom.gba", 0x345820, 0x118
-
-gMapData_FiveIsland_LostCave_Room4:: @ 8345938
-	.incbin "baserom.gba", 0x345938, 0x118
-
-gMapData_FiveIsland_LostCave_Room5:: @ 8345A50
-	.incbin "baserom.gba", 0x345A50, 0x118
-
-gMapData_FiveIsland_LostCave_Room6:: @ 8345B68
-	.incbin "baserom.gba", 0x345B68, 0x118
-
-gMapData_FiveIsland_LostCave_Room7:: @ 8345C80
-	.incbin "baserom.gba", 0x345C80, 0x118
-
-gMapData_FiveIsland_LostCave_Room8:: @ 8345D98
-	.incbin "baserom.gba", 0x345D98, 0x118
-
-gMapData_FiveIsland_LostCave_Room9:: @ 8345EB0
-	.incbin "baserom.gba", 0x345EB0, 0x118
-
-gMapData_FiveIsland_LostCave_Room10:: @ 8345FC8
-	.incbin "baserom.gba", 0x345FC8, 0x118
-
-gMapData_FiveIsland_LostCave_Room11:: @ 83460E0
-	.incbin "baserom.gba", 0x3460E0, 0x118
-
-gMapData_FiveIsland_LostCave_Room12:: @ 83461F8
-	.incbin "baserom.gba", 0x3461F8, 0x118
-
-gMapData_FiveIsland_LostCave_Room13:: @ 8346310
-	.incbin "baserom.gba", 0x346310, 0x118
-
-gMapData_FiveIsland_LostCave_Room14:: @ 8346428
-	.incbin "baserom.gba", 0x346428, 0x334
-
-gMapData_SevenIsland_TanobyRuins_MoneanChamber:: @ 834675C
-	.incbin "baserom.gba", 0x34675C, 0x334
-
-gMapData_SevenIsland_TanobyRuins_LiptooChamber:: @ 8346A90
-	.incbin "baserom.gba", 0x346A90, 0x334
-
-gMapData_SevenIsland_TanobyRuins_WeepthChamber:: @ 8346DC4
-	.incbin "baserom.gba", 0x346DC4, 0x334
-
-gMapData_SevenIsland_TanobyRuins_DilfordChamber:: @ 83470F8
-	.incbin "baserom.gba", 0x3470F8, 0x334
-
-gMapData_SevenIsland_TanobyRuins_ScufibChamber:: @ 834742C
-	.incbin "baserom.gba", 0x34742C, 0x624
-
-gMapData_SSAnne_1F_Room12:: @ 8347A50
-	.incbin "baserom.gba", 0x347A50, 0x204
-
-gMapData_SevenIsland_SeavaultCanyon_TanobyKey:: @ 8347C54
-	.incbin "baserom.gba", 0x347C54, 0x72C
-
-gMapData_BirthIsland_Exterior:: @ 8348380
-	.incbin "baserom.gba", 0x348380, 0x3BC
-
-gMapData_NavelRock_Exterior:: @ 834873C
-	.incbin "baserom.gba", 0x34873C, 0x398
-
-gMapData_NavelRock_1F:: @ 8348AD4
-	.incbin "baserom.gba", 0x348AD4, 0x3DC
-
-gMapData_NavelRock_Summit:: @ 8348EB0
-	.incbin "baserom.gba", 0x348EB0, 0x3EC
-
-gMapData_NavelRock_Base:: @ 834929C
-	.incbin "baserom.gba", 0x34929C, 0x88
-
-gMapData_NavelRock_SummitPath_2F:: @ 8349324
-	.incbin "baserom.gba", 0x349324, 0x88
-
-gMapData_NavelRock_SummitPath_3F:: @ 83493AC
-	.incbin "baserom.gba", 0x3493AC, 0x88
-
-gMapData_NavelRock_SummitPath_4F:: @ 8349434
-	.incbin "baserom.gba", 0x349434, 0x88
-
-gMapData_NavelRock_SummitPath_5F:: @ 83494BC
-	.incbin "baserom.gba", 0x3494BC, 0x88
-
-gMapData_NavelRock_BasePath_B1F:: @ 8349544
-	.incbin "baserom.gba", 0x349544, 0x88
-
-gMapData_NavelRock_BasePath_B2F:: @ 83495CC
-	.incbin "baserom.gba", 0x3495CC, 0x88
-
-gMapData_NavelRock_BasePath_B3F:: @ 8349654
-	.incbin "baserom.gba", 0x349654, 0x88
-
-gMapData_NavelRock_BasePath_B4F:: @ 83496DC
-	.incbin "baserom.gba", 0x3496DC, 0x88
-
-gMapData_NavelRock_BasePath_B5F:: @ 8349764
-	.incbin "baserom.gba", 0x349764, 0x88
-
-gMapData_NavelRock_BasePath_B6F:: @ 83497EC
-	.incbin "baserom.gba", 0x3497EC, 0x88
-
-gMapData_NavelRock_BasePath_B7F:: @ 8349874
-	.incbin "baserom.gba", 0x349874, 0x88
-
-gMapData_NavelRock_BasePath_B8F:: @ 83498FC
-	.incbin "baserom.gba", 0x3498FC, 0x88
-
-gMapData_NavelRock_BasePath_B9F:: @ 8349984
-	.incbin "baserom.gba", 0x349984, 0x88
-
-gMapData_NavelRock_BasePath_B10F:: @ 8349A0C
-	.incbin "baserom.gba", 0x349A0C, 0x88
-
-gMapData_NavelRock_BasePath_B11F:: @ 8349A94
-	.incbin "baserom.gba", 0x349A94, 0x334
-
-gMapData_SevenIsland_TanobyRuins_RixyChamber:: @ 8349DC8
-	.incbin "baserom.gba", 0x349DC8, 0x334
-
-gMapData_SevenIsland_TanobyRuins_ViapoisChamber:: @ 834A0FC
-	.incbin "baserom.gba", 0x34A0FC, 0x114
-
-gMapData_NavelRock_B1F:: @ 834A210
-	.incbin "baserom.gba", 0x34A210, 0x1794
-
-gMapData_NavelRock_Fork:: @ 834B9A4
-	.incbin "baserom.gba", 0x34B9A4, 0x296C
-
-gMapData_SevenIsland_House_Room1:: @ 834E310
-	.incbin "baserom.gba", 0x34E310, 0x860
-
-gMapData_OneIsland_KindleRoad_EmberSpa:: @ 834EB70
-	.incbin "baserom.gba", 0x34EB70, 0x1C
-
-gUnknown_834EB8C:: @ 834EB8C
-	.incbin "baserom.gba", 0x34EB8C, 0x5FC
-
-    .include "data/maps/groups.inc"
diff --git a/data/layouts/layouts.inc b/data/layouts/layouts.inc
new file mode 100644
index 000000000..e9418133c
--- /dev/null
+++ b/data/layouts/layouts.inc
@@ -0,0 +1,1211 @@
+gMapData_PalletTown_PlayersHouse_1F:: @ 82D5200
+    .incbin "baserom.gba", 0x2D5200, 0xFC
+
+gMapData_PalletTown_PlayersHouse_2F:: @ 82D52FC
+    .incbin "baserom.gba", 0x2D52FC, 0x128
+
+gMapData_PalletTown_GarysHouse:: @ 82D5424
+    .incbin "baserom.gba", 0x2D5424, 0xB4
+
+gMapData_82D54D8:: @ 82D54D8
+    .incbin "baserom.gba", 0x2D54D8, 0x190
+
+gMapData_PalletTown_ProfessorOaksLab:: @ 82D5668
+    .incbin "baserom.gba", 0x2D5668, 0xEC
+
+gMapData_CeruleanCity_House3:: @ 82D5754
+gMapData_CeruleanCity_House4:: @ 82D5754
+gMapData_VermilionCity_House1:: @ 82D5754
+gMapData_VermilionCity_House2:: @ 82D5754
+gMapData_VermilionCity_House3:: @ 82D5754
+gMapData_FuchsiaCity_House1:: @ 82D5754
+gMapData_FuchsiaCity_House3:: @ 82D5754
+gMapData_Route16_House:: @ 82D5754
+    .incbin "baserom.gba", 0x2D5754, 0xEC
+
+gMapData_PewterCity_House1:: @ 82D5840
+gMapData_PewterCity_House2:: @ 82D5840
+gMapData_Route2_House:: @ 82D5840
+gMapData_UnknownMap_18_01:: @ 82D5840
+gMapData_UnusedHouse_27_00:: @ 82D5840
+gMapData_UnusedHouse_29_00:: @ 82D5840
+    .incbin "baserom.gba", 0x2D5840, 0x150
+
+gMapData_ViridianCity_PokemonCenter_1F:: @ 82D5990
+gMapData_PewterCity_PokemonCenter_1F:: @ 82D5990
+gMapData_CeruleanCity_PokemonCenter_1F:: @ 82D5990
+gMapData_LavenderTown_PokemonCenter_1F:: @ 82D5990
+gMapData_VermilionCity_PokemonCenter_1F:: @ 82D5990
+gMapData_CeladonCity_PokemonCenter_1F:: @ 82D5990
+gMapData_FuchsiaCity_PokemonCenter_1F:: @ 82D5990
+gMapData_CinnabarIsland_PokemonCenter_1F:: @ 82D5990
+gMapData_SaffronCity_PokemonCenter_1F:: @ 82D5990
+gMapData_Route4_PokemonCenter_1F:: @ 82D5990
+gMapData_Route10_PokemonCenter_1F:: @ 82D5990
+gMapData_SevenIsland_PokemonCenter_1F:: @ 82D5990
+gMapData_TwoIsland_PokemonCenter_1F:: @ 82D5990
+gMapData_ThreeIsland_PokemonCenter_1F:: @ 82D5990
+gMapData_FourIsland_PokemonCenter_1F:: @ 82D5990
+gMapData_FiveIsland_PokemonCenter_1F:: @ 82D5990
+gMapData_SixIsland_PokemonCenter_1F:: @ 82D5990
+    .incbin "baserom.gba", 0x2D5990, 0x150
+
+gMapData_ViridianCity_PokemonCenter_2F:: @ 82D5AE0
+gMapData_PewterCity_PokemonCenter_2F:: @ 82D5AE0
+gMapData_CeruleanCity_PokemonCenter_2F:: @ 82D5AE0
+gMapData_LavenderTown_PokemonCenter_2F:: @ 82D5AE0
+gMapData_VermilionCity_PokemonCenter_2F:: @ 82D5AE0
+gMapData_CeladonCity_PokemonCenter_2F:: @ 82D5AE0
+gMapData_FuchsiaCity_PokemonCenter_2F:: @ 82D5AE0
+gMapData_CinnabarIsland_PokemonCenter_2F:: @ 82D5AE0
+gMapData_IndigoPlateau_PokemonCenter_2F:: @ 82D5AE0
+gMapData_SaffronCity_PokemonCenter_2F:: @ 82D5AE0
+gMapData_Route4_PokemonCenter_2F:: @ 82D5AE0
+gMapData_Route10_PokemonCenter_2F:: @ 82D5AE0
+gMapData_SevenIsland_PokemonCenter_2F:: @ 82D5AE0
+gMapData_TwoIsland_PokemonCenter_2F:: @ 82D5AE0
+gMapData_ThreeIsland_PokemonCenter_2F:: @ 82D5AE0
+gMapData_FourIsland_PokemonCenter_2F:: @ 82D5AE0
+gMapData_FiveIsland_PokemonCenter_2F:: @ 82D5AE0
+gMapData_SixIsland_PokemonCenter_2F:: @ 82D5AE0
+    .incbin "baserom.gba", 0x2D5AE0, 0xEC
+
+gMapData_ViridianCity_Mart:: @ 82D5BCC
+gMapData_PewterCity_Mart:: @ 82D5BCC
+gMapData_CeruleanCity_Mart:: @ 82D5BCC
+gMapData_LavenderTown_Mart:: @ 82D5BCC
+gMapData_VermilionCity_Mart:: @ 82D5BCC
+gMapData_FuchsiaCity_Mart:: @ 82D5BCC
+gMapData_CinnabarIsland_Mart:: @ 82D5BCC
+gMapData_SaffronCity_Mart:: @ 82D5BCC
+gMapData_SevenIsland_Mart:: @ 82D5BCC
+gMapData_ThreeIsland_Mart:: @ 82D5BCC
+gMapData_FourIsland_Mart:: @ 82D5BCC
+gMapData_SixIsland_Mart:: @ 82D5BCC
+    .incbin "baserom.gba", 0x2D5BCC, 0xEC
+
+gMapData_OneIsland_House1:: @ 82D5CB8
+gMapData_OneIsland_House2:: @ 82D5CB8
+gMapData_TwoIsland_House:: @ 82D5CB8
+gMapData_ThreeIsland_House2:: @ 82D5CB8
+gMapData_ThreeIsland_House3:: @ 82D5CB8
+gMapData_ThreeIsland_House4:: @ 82D5CB8
+gMapData_ThreeIsland_House5:: @ 82D5CB8
+gMapData_FourIsland_House1:: @ 82D5CB8
+gMapData_FourIsland_House2:: @ 82D5CB8
+gMapData_FiveIsland_House1:: @ 82D5CB8
+gMapData_FiveIsland_House2:: @ 82D5CB8
+gMapData_SixIsland_House:: @ 82D5CB8
+gMapData_TwoIsland_CapeBrink_House:: @ 82D5CB8
+gMapData_SixIsland_WaterPath_House2:: @ 82D5CB8
+gMapData_SevenIsland_SevaultCanyon_House:: @ 82D5CB8
+    .incbin "baserom.gba", 0x2D5CB8, 0x2CC
+
+gMapData_CeruleanCity_Gym:: @ 82D5F84
+    .incbin "baserom.gba", 0x2D5F84, 0xEC
+
+gMapData_Route12_FishingHouse:: @ 82D6070
+gMapData_UnusedHouse_31_05:: @ 82D6070
+gMapData_SixIsland_WaterPath_House1:: @ 82D6070
+    .incbin "baserom.gba", 0x2D6070, 0xD4
+
+gMapData_82D6144:: @ 82D6144
+    .incbin "baserom.gba", 0x2D6144, 0x22C
+
+gMapData_CeladonCity_Gym:: @ 82D6370
+    .incbin "baserom.gba", 0x2D6370, 0x120
+
+gMapData_82D6490:: @ 82D6490
+    .incbin "baserom.gba", 0x2D6490, 0xEC
+
+gMapData_FiveIsland_ResortGorgeous_House:: @ 82D657C
+    .incbin "baserom.gba", 0x2D657C, 0xD8
+
+gMapData_82D6654:: @ 82D6654
+    .incbin "baserom.gba", 0x2D6654, 0xD8
+
+gMapData_82D672C:: @ 82D672C
+    .incbin "baserom.gba", 0x2D672C, 0x2D8
+
+gMapData_FuchsiaCity_Gym:: @ 82D6A04
+    .incbin "baserom.gba", 0x2D6A04, 0xEC
+
+gMapData_LavenderTown_House1:: @ 82D6AF0
+gMapData_LavenderTown_House2:: @ 82D6AF0
+gMapData_CeladonCity_House1:: @ 82D6AF0
+gMapData_SaffronCity_House2:: @ 82D6AF0
+gMapData_SaffronCity_House3:: @ 82D6AF0
+    .incbin "baserom.gba", 0x2D6AF0, 0x144
+
+gMapData_82D6C34:: @ 82D6C34
+    .incbin "baserom.gba", 0x2D6C34, 0x1F4
+
+gMapData_VermilionCity_Gym:: @ 82D6E28
+    .incbin "baserom.gba", 0x2D6E28, 0x100
+
+gMapData_CeruleanCity_BikeShop:: @ 82D6F28
+    .incbin "baserom.gba", 0x2D6F28, 0x240
+
+gMapData_CeladonCity_GameCorner:: @ 82D7168
+    .incbin "baserom.gba", 0x2D7168, 0x1C4
+
+gMapData_PewterCity_Gym:: @ 82D732C
+    .incbin "baserom.gba", 0x2D732C, 0xEC
+
+gMapData_FourIsland_LoreleisHouse:: @ 82D7418
+    .incbin "baserom.gba", 0x2D7418, 0xEC
+
+gMapData_ThreeIsland_House1:: @ 82D7504
+    .incbin "baserom.gba", 0x2D7504, 0xEC
+
+gMapData_82D75F0:: @ 82D75F0
+    .incbin "baserom.gba", 0x2D75F0, 0x84
+
+gMapData_82D7674:: @ 82D7674
+    .incbin "baserom.gba", 0x2D7674, 0x5D0
+
+gMapData_SaffronCity_Gym:: @ 82D7C44
+    .incbin "baserom.gba", 0x2D7C44, 0x84
+
+gMapData_82D7CC8:: @ 82D7CC8
+    .incbin "baserom.gba", 0x2D7CC8, 0x600
+
+gMapData_CinnabarIsland_Gym:: @ 82D82C8
+    .incbin "baserom.gba", 0x2D82C8, 0x3E4
+
+gMapData_ViridianCity_Gym:: @ 82D86AC
+    .incbin "baserom.gba", 0x2D86AC, 0x21C
+
+gMapData_82D88C8:: @ 82D88C8
+    .incbin "baserom.gba", 0x2D88C8, 0x120
+
+gMapData_UnknownMap_00_00:: @ 82D89E8
+    .incbin "baserom.gba", 0x2D89E8, 0xFC
+
+gMapData_UnknownMap_00_01:: @ 82D8AE4
+    .incbin "baserom.gba", 0x2D8AE4, 0x1B4
+
+gMapData_UnknownMap_00_02:: @ 82D8C98
+    .incbin "baserom.gba", 0x2D8C98, 0x120
+
+gMapData_UnknownMap_00_03:: @ 82D8DB8
+    .incbin "baserom.gba", 0x2D8DB8, 0xC8
+
+gMapData_FuchsiaCity_SafariZone_Entrance:: @ 82D8E80
+    .incbin "baserom.gba", 0x2D8E80, 0xCA4
+
+gMapData_82D9B24:: @ 82D9B24
+    .incbin "baserom.gba", 0x2D9B24, 0xCA4
+
+gMapData_82DA7C8:: @ 82DA7C8
+    .incbin "baserom.gba", 0x2DA7C8, 0xCA4
+
+gMapData_82DB46C:: @ 82DB46C
+	.incbin "baserom.gba", 0x2DB46C, 0x84
+
+gMapData_82DB4F0:: @ 82DB4F0
+	.incbin "baserom.gba", 0x2DB4F0, 0x6F0
+
+gMapData_82DBBE0:: @ 82DBBE0
+	.incbin "baserom.gba", 0x2DBBE0, 0x1F8
+
+gMapData_82DBDD8:: @ 82DBDD8
+	.incbin "baserom.gba", 0x2DBDD8, 0x1E0
+
+gMapData_82DBFB8:: @ 82DBFB8
+	.incbin "baserom.gba", 0x2DBFB8, 0x534
+
+gMapData_82DC4EC:: @ 82DC4EC
+	.incbin "baserom.gba", 0x2DC4EC, 0x120
+
+gMapData_82DC60C:: @ 82DC60C
+	.incbin "baserom.gba", 0x2DC60C, 0x120
+
+gMapData_82DC72C:: @ 82DC72C
+	.incbin "baserom.gba", 0x2DC72C, 0x120
+
+gMapData_82DC84C:: @ 82DC84C
+	.incbin "baserom.gba", 0x2DC84C, 0x224
+
+gMapData_82DCA70:: @ 82DCA70
+	.incbin "baserom.gba", 0x2DCA70, 0xD4
+
+gMapData_82DCB44:: @ 82DCB44
+	.incbin "baserom.gba", 0x2DCB44, 0xFC
+
+gMapData_82DCC40:: @ 82DCC40
+	.incbin "baserom.gba", 0x2DCC40, 0x94
+
+gMapData_82DCCD4:: @ 82DCCD4
+	.incbin "baserom.gba", 0x2DCCD4, 0x94
+
+gMapData_82DCD68:: @ 82DCD68
+	.incbin "baserom.gba", 0x2DCD68, 0x94
+
+gMapData_82DCDFC:: @ 82DCDFC
+	.incbin "baserom.gba", 0x2DCDFC, 0x104
+
+gMapData_82DCF00:: @ 82DCF00
+	.incbin "baserom.gba", 0x2DCF00, 0x104
+
+gMapData_82DD004:: @ 82DD004
+	.incbin "baserom.gba", 0x2DD004, 0xD8
+
+gMapData_82DD0DC:: @ 82DD0DC
+	.incbin "baserom.gba", 0x2DD0DC, 0x3E4
+
+gMapData_PalletTown:: @ 82DD4C0
+    .incbin "baserom.gba", 0x2DD4C0, 0xF24
+
+gMapData_ViridianCity:: @ 82DE3E4
+    .incbin "baserom.gba", 0x2DE3E4, 0xF24
+
+gMapData_PewterCity:: @ 82DF308
+    .incbin "baserom.gba", 0x2DF308, 0xF24
+
+gMapData_CeruleanCity:: @ 82E022C
+    .incbin "baserom.gba", 0x2E022C, 0x3E4
+
+gMapData_LavenderTown:: @ 82E0610
+    .incbin "baserom.gba", 0x2E0610, 0xF24
+
+gMapData_VermilionCity:: @ 82E1534
+    .incbin "baserom.gba", 0x2E1534, 0x12E4
+
+gMapData_CeladonCity:: @ 82E2818
+    .incbin "baserom.gba", 0x2E2818, 0xF24
+
+gMapData_FuchsiaCity:: @ 82E373C
+    .incbin "baserom.gba", 0x2E373C, 0x3E4
+
+gMapData_CinnabarIsland:: @ 82E3B20
+    .incbin "baserom.gba", 0x2E3B20, 0x3E4
+
+gMapData_IndigoPlateau_Exterior:: @ 82E3F04
+    .incbin "baserom.gba", 0x2E3F04, 0xF24
+
+gMapData_SaffronCity:: @ 82E4E28
+    .incbin "baserom.gba", 0x2E4E28, 0x7A4
+
+gMapData_Route1:: @ 82E55CC
+gMapData_82E55CC:: @ 82E55CC
+    .incbin "baserom.gba", 0x2E55CC, 0xF24
+
+gMapData_Route2:: @ 82E64F0
+    .incbin "baserom.gba", 0x2E64F0, 0xD44
+
+gMapData_Route3:: @ 82E7234
+    .incbin "baserom.gba", 0x2E7234, 0x1104
+
+gMapData_Route4:: @ 82E8338
+    .incbin "baserom.gba", 0x2E8338, 0xF24
+
+gMapData_Route5:: @ 82E925C
+    .incbin "baserom.gba", 0x2E925C, 0x7A4
+
+gMapData_Route6:: @ 82E9A00
+    .incbin "baserom.gba", 0x2E9A00, 0x3E4
+
+gMapData_Route7:: @ 82E9DE4
+    .incbin "baserom.gba", 0x2E9DE4, 0xB64
+
+gMapData_Route8:: @ 82EA948
+    .incbin "baserom.gba", 0x2EA948, 0xB64
+
+gMapData_Route9:: @ 82EB4AC
+    .incbin "baserom.gba", 0x2EB4AC, 0xF24
+
+gMapData_Route10:: @ 82EC3D0
+    .incbin "baserom.gba", 0x2EC3D0, 0xB64
+
+gMapData_Route11:: @ 82ECF34
+    .incbin "baserom.gba", 0x2ECF34, 0x16A4
+
+gMapData_Route12:: @ 82EE5D8
+    .incbin "baserom.gba", 0x2EE5D8, 0xB64
+
+gMapData_Route13:: @ 82EF13C
+    .incbin "baserom.gba", 0x2EF13C, 0xB64
+
+gMapData_Route14:: @ 82EFCA0
+    .incbin "baserom.gba", 0x2EFCA0, 0xB64
+
+gMapData_Route15:: @ 82F0804
+    .incbin "baserom.gba", 0x2F0804, 0x7A4
+
+gMapData_Route16:: @ 82F0FA8
+    .incbin "baserom.gba", 0x2F0FA8, 0x1E24
+
+gMapData_Route17:: @ 82F2DCC
+    .incbin "baserom.gba", 0x2F2DCC, 0x984
+
+gMapData_Route18:: @ 82F3750
+    .incbin "baserom.gba", 0x2F3750, 0xB64
+
+gMapData_Route19:: @ 82F42B4
+    .incbin "baserom.gba", 0x2F42B4, 0x12E4
+
+gMapData_Route20:: @ 82F5598
+    .incbin "baserom.gba", 0x2F5598, 0x984
+
+gMapData_Route21_North:: @ 82F5F1C
+    .incbin "baserom.gba", 0x2F5F1C, 0x924
+
+gMapData_Route22:: @ 82F6840
+    .incbin "baserom.gba", 0x2F6840, 0x1E24
+
+gMapData_Route23:: @ 82F8664
+    .incbin "baserom.gba", 0x2F8664, 0x7A4
+
+gMapData_Route24:: @ 82F8E08
+    .incbin "baserom.gba", 0x2F8E08, 0xB64
+
+gMapData_Route25:: @ 82F996C
+    .incbin "baserom.gba", 0x2F996C, 0xF24
+
+gMapData_MtMoon_1F:: @ 82FA890
+    .incbin "baserom.gba", 0x2FA890, 0xF74
+
+gMapData_MtMoon_B1F:: @ 82FB804
+    .incbin "baserom.gba", 0x2FB804, 0xF24
+
+gMapData_MtMoon_B2F:: @ 82FC728
+    .incbin "baserom.gba", 0x2FC728, 0x1D44
+
+gMapData_ViridianForest:: @ 82FE46C
+    .incbin "baserom.gba", 0x2FE46C, 0x11A4
+
+gMapData_SSAnne_Exterior:: @ 82FF610
+    .incbin "baserom.gba", 0x2FF610, 0x53C
+
+gMapData_SSAnne_1F_Corridor:: @ 82FFB4C
+    .incbin "baserom.gba", 0x2FFB4C, 0x464
+
+gMapData_SSAnne_2F_Corridor:: @ 82FFFB0
+    .incbin "baserom.gba", 0x2FFFB0, 0x158
+
+gMapData_SSAnne_3F_Corridor:: @ 8300108
+    .incbin "baserom.gba", 0x300108, 0x168
+
+gMapData_SSAnne_B1F_Corridor:: @ 8300270
+    .incbin "baserom.gba", 0x300270, 0x3B4
+
+gMapData_SSAnne_Deck:: @ 8300624
+    .incbin "baserom.gba", 0x300624, 0x3544
+
+gMapData_DiglettsCave_B1F:: @ 8303B68
+    .incbin "baserom.gba", 0x303B68, 0x864
+
+gMapData_VictoryRoad_1F:: @ 83043CC
+    .incbin "baserom.gba", 0x3043CC, 0x8E8
+
+gMapData_VictoryRoad_2F:: @ 8304CB4
+    .incbin "baserom.gba", 0x304CB4, 0x7E0
+
+gMapData_VictoryRoad_3F:: @ 8305494
+    .incbin "baserom.gba", 0x305494, 0x794
+
+gMapData_RocketHideout_B1F:: @ 8305C28
+    .incbin "baserom.gba", 0x305C28, 0x5A4
+
+gMapData_RocketHideout_B2F:: @ 83061CC
+    .incbin "baserom.gba", 0x3061CC, 0x4C8
+
+gMapData_RocketHideout_B3F:: @ 8306694
+    .incbin "baserom.gba", 0x306694, 0x504
+
+gMapData_RocketHideout_B4F:: @ 8306B98
+    .incbin "baserom.gba", 0x306B98, 0x654
+
+gMapData_SilphCo_1F:: @ 83071EC
+    .incbin "baserom.gba", 0x3071EC, 0x654
+
+gMapData_SilphCo_2F:: @ 8307840
+    .incbin "baserom.gba", 0x307840, 0x654
+
+gMapData_SilphCo_3F:: @ 8307E94
+    .incbin "baserom.gba", 0x307E94, 0x654
+
+gMapData_SilphCo_4F:: @ 83084E8
+    .incbin "baserom.gba", 0x3084E8, 0x654
+
+gMapData_SilphCo_5F:: @ 8308B3C
+    .incbin "baserom.gba", 0x308B3C, 0x4C0
+
+gMapData_SilphCo_6F:: @ 8308FFC
+    .incbin "baserom.gba", 0x308FFC, 0x4C0
+
+gMapData_SilphCo_7F:: @ 83094BC
+    .incbin "baserom.gba", 0x3094BC, 0x4C0
+
+gMapData_SilphCo_8F:: @ 830997C
+    .incbin "baserom.gba", 0x30997C, 0x4C0
+
+gMapData_SilphCo_9F:: @ 8309E3C
+    .incbin "baserom.gba", 0x309E3C, 0x2AC
+
+gMapData_SilphCo_10F:: @ 830A0E8
+    .incbin "baserom.gba", 0x30A0E8, 0x2CC
+
+gMapData_SilphCo_11F:: @ 830A3B4
+    .incbin "baserom.gba", 0x30A3B4, 0xA88
+
+gMapData_PokemonMansion_1F:: @ 830AE3C
+    .incbin "baserom.gba", 0x30AE3C, 0xB6C
+
+gMapData_PokemonMansion_2F:: @ 830B9A8
+    .incbin "baserom.gba", 0x30B9A8, 0xA88
+
+gMapData_PokemonMansion_3F:: @ 830C430
+    .incbin "baserom.gba", 0x30C430, 0xA88
+
+gMapData_PokemonMansion_B1F:: @ 830CEB8
+    .incbin "baserom.gba", 0x30CEB8, 0xE80
+
+gMapData_SafariZone_Center:: @ 830DD38
+    .incbin "baserom.gba", 0x30DD38, 0xEEC
+
+gMapData_SafariZone_East:: @ 830EC24
+    .incbin "baserom.gba", 0x30EC24, 0x11F8
+
+gMapData_SafariZone_North:: @ 830FE1C
+    .incbin "baserom.gba", 0x30FE1C, 0xDA8
+
+gMapData_SafariZone_West:: @ 8310BC4
+    .incbin "baserom.gba", 0x310BC4, 0x754
+
+gMapData_CeruleanCave_1F:: @ 8311318
+    .incbin "baserom.gba", 0x311318, 0x754
+
+gMapData_CeruleanCave_2F:: @ 8311A6C
+    .incbin "baserom.gba", 0x311A6C, 0x754
+
+gMapData_CeruleanCave_B1F:: @ 83121C0
+    .incbin "baserom.gba", 0x3121C0, 0xF24
+
+gMapData_RockTunnel_1F:: @ 83130E4
+    .incbin "baserom.gba", 0x3130E4, 0xF24
+
+gMapData_RockTunnel_B1F:: @ 8314008
+    .incbin "baserom.gba", 0x314008, 0x744
+
+gMapData_SeafoamIslands_1F:: @ 831474C
+    .incbin "baserom.gba", 0x31474C, 0x6F8
+
+gMapData_SeafoamIslands_B1F:: @ 8314E44
+    .incbin "baserom.gba", 0x314E44, 0x744
+
+gMapData_SeafoamIslands_B2F:: @ 8315588
+    .incbin "baserom.gba", 0x315588, 0x744
+
+gMapData_SeafoamIslands_B3F:: @ 8315CCC
+    .incbin "baserom.gba", 0x315CCC, 0x744
+
+gMapData_SeafoamIslands_B4F:: @ 8316410
+    .incbin "baserom.gba", 0x316410, 0x3E4
+
+gMapData_PokemonTower_1F:: @ 83167F4
+    .incbin "baserom.gba", 0x3167F4, 0x3E4
+
+gMapData_PokemonTower_2F:: @ 8316BD8
+    .incbin "baserom.gba", 0x316BD8, 0x3E4
+
+gMapData_PokemonTower_3F:: @ 8316FBC
+    .incbin "baserom.gba", 0x316FBC, 0x3E4
+
+gMapData_PokemonTower_4F:: @ 83173A0
+    .incbin "baserom.gba", 0x3173A0, 0x3E4
+
+gMapData_PokemonTower_5F:: @ 8317784
+    .incbin "baserom.gba", 0x317784, 0x3E4
+
+gMapData_PokemonTower_6F:: @ 8317B68
+    .incbin "baserom.gba", 0x317B68, 0x3E4
+
+gMapData_PokemonTower_7F:: @ 8317F4C
+    .incbin "baserom.gba", 0x317F4C, 0xF74
+
+gMapData_PowerPlant:: @ 8318EC0
+    .incbin "baserom.gba", 0x318EC0, 0x170
+
+gMapData_Route25_SeaCottage:: @ 8319030
+    .incbin "baserom.gba", 0x319030, 0x1E4
+
+gMapData_SSAnne_Kitchen:: @ 8319214
+    .incbin "baserom.gba", 0x319214, 0xD8
+
+gMapData_SSAnne_CaptainsOffice:: @ 83192EC
+    .incbin "baserom.gba", 0x3192EC, 0x128
+
+gMapData_UndergroundPath_NorthEntrance:: @ 8319414
+gMapData_UndergroundPath_SouthEntrance:: @ 8319414
+gMapData_UndergroundPath_WestEntrance:: @ 8319414
+gMapData_UndergroundPath_EastEntrance:: @ 8319414
+    .incbin "baserom.gba", 0x319414, 0x484
+
+gMapData_UndergroundPath_EastWestTunnel:: @ 8319898
+    .incbin "baserom.gba", 0x319898, 0x414
+
+gMapData_UndergroundPath_NorthSouthTunnel:: @ 8319CAC
+    .incbin "baserom.gba", 0x319CAC, 0x144
+
+gMapData_Route12_NorthEntrance_1F:: @ 8319DF0
+    .incbin "baserom.gba", 0x319DF0, 0x84
+
+gMapData_SSAnne_1F_Room1:: @ 8319E74
+gMapData_SSAnne_1F_Room2:: @ 8319E74
+gMapData_SSAnne_1F_Room3:: @ 8319E74
+gMapData_SSAnne_1F_Room4:: @ 8319E74
+gMapData_SSAnne_1F_Room5:: @ 8319E74
+gMapData_SSAnne_1F_Room7:: @ 8319E74
+gMapData_SSAnne_1F_Room6:: @ 8319E74
+    .incbin "baserom.gba", 0x319E74, 0x90
+
+gMapData_SSAnne_2F_Room1:: @ 8319F04
+gMapData_SSAnne_2F_Room2:: @ 8319F04
+gMapData_SSAnne_2F_Room3:: @ 8319F04
+gMapData_SSAnne_2F_Room4:: @ 8319F04
+gMapData_SSAnne_2F_Room5:: @ 8319F04
+gMapData_SSAnne_2F_Room6:: @ 8319F04
+gMapData_SSAnne_B1F_Room1:: @ 8319F04
+gMapData_SSAnne_B1F_Room2:: @ 8319F04
+gMapData_SSAnne_B1F_Room3:: @ 8319F04
+gMapData_SSAnne_B1F_Room4:: @ 8319F04
+gMapData_SSAnne_B1F_Room5:: @ 8319F04
+    .incbin "baserom.gba", 0x319F04, 0x6C
+
+gMapData_CeladonCity_DepartmentStore_Elevator:: @ 8319F70
+    .incbin "baserom.gba", 0x319F70, 0x28C
+
+gMapData_PewterCity_Museum_1F:: @ 831A1FC
+    .incbin "baserom.gba", 0x31A1FC, 0x1A0
+
+gMapData_PewterCity_Museum_2F:: @ 831A39C
+    .incbin "baserom.gba", 0x31A39C, 0xD8
+
+gMapData_CeruleanCity_House2:: @ 831A474
+    .incbin "baserom.gba", 0x31A474, 0xEC
+
+gMapData_CeruleanCity_House1:: @ 831A560
+    .incbin "baserom.gba", 0x31A560, 0x27C
+
+gMapData_CeladonCity_Condominiums_1F:: @ 831A7DC
+    .incbin "baserom.gba", 0x31A7DC, 0x27C
+
+gMapData_CeladonCity_Condominiums_2F:: @ 831AA58
+    .incbin "baserom.gba", 0x31AA58, 0x27C
+
+gMapData_CeladonCity_Condominiums_3F:: @ 831ACD4
+    .incbin "baserom.gba", 0x31ACD4, 0x2A8
+
+gMapData_CeladonCity_Condominiums_Roof:: @ 831AF7C
+    .incbin "baserom.gba", 0x31AF7C, 0xD8
+
+gMapData_CeladonCity_Condominiums_RoofRoom:: @ 831B054
+    .incbin "baserom.gba", 0x31B054, 0xD8
+
+gMapData_CeladonCity_GameCorner_PrizeRoom:: @ 831B12C
+    .incbin "baserom.gba", 0x31B12C, 0x170
+
+gMapData_CeladonCity_Restaurant:: @ 831B29C
+    .incbin "baserom.gba", 0x31B29C, 0x19C
+
+gMapData_CeladonCity_Hotel:: @ 831B438
+    .incbin "baserom.gba", 0x31B438, 0x1C4
+
+gMapData_CeladonCity_DepartmentStore_1F:: @ 831B5FC
+    .incbin "baserom.gba", 0x31B5FC, 0x1AC
+
+gMapData_CeladonCity_DepartmentStore_2F:: @ 831B7A8
+    .incbin "baserom.gba", 0x31B7A8, 0x1AC
+
+gMapData_CeladonCity_DepartmentStore_3F:: @ 831B954
+    .incbin "baserom.gba", 0x31B954, 0x1AC
+
+gMapData_CeladonCity_DepartmentStore_4F:: @ 831BB00
+    .incbin "baserom.gba", 0x31BB00, 0x1AC
+
+gMapData_CeladonCity_DepartmentStore_5F:: @ 831BCAC
+    .incbin "baserom.gba", 0x31BCAC, 0x238
+
+gMapData_CeladonCity_DepartmentStore_Roof:: @ 831BEE4
+    .incbin "baserom.gba", 0x31BEE4, 0x144
+
+gMapData_SafariZone_Building1:: @ 831C028
+gMapData_SafariZone_Building2:: @ 831C028
+gMapData_SafariZone_Building3:: @ 831C028
+gMapData_SafariZone_Building4:: @ 831C028
+    .incbin "baserom.gba", 0x31C028, 0x144
+
+gMapData_SafariZone_SecretHouse:: @ 831C16C
+    .incbin "baserom.gba", 0x31C16C, 0x1DC
+
+gMapData_FuchsiaCity_ZooBuilding:: @ 831C348
+    .incbin "baserom.gba", 0x31C348, 0x144
+
+gMapData_FuchsiaCity_Building1:: @ 831C48C
+    .incbin "baserom.gba", 0x31C48C, 0xEC
+
+gMapData_FuchsiaCity_House2:: @ 831C578
+    .incbin "baserom.gba", 0x31C578, 0x28C
+
+gMapData_CinnabarIsland_PokemonLab_Entrance:: @ 831C804
+    .incbin "baserom.gba", 0x31C804, 0x170
+
+gMapData_CinnabarIsland_PokemonLab_Lounge:: @ 831C974
+    .incbin "baserom.gba", 0x31C974, 0x170
+
+gMapData_CinnabarIsland_PokemonLab_ResearchRoom:: @ 831CAE4
+    .incbin "baserom.gba", 0x31CAE4, 0x170
+
+gMapData_CinnabarIsland_PokemonLab_ExperimentRoom:: @ 831CC54
+    .incbin "baserom.gba", 0x31CC54, 0x1C80
+
+gMapData_SaffronCity_Duplicate:: @ 831E8D4
+    .incbin "baserom.gba", 0x31E8D4, 0xEC
+
+gMapData_Route5_SouthEntrance:: @ 831E9C0
+gMapData_Route6_NorthEntrance:: @ 831E9C0
+    .incbin "baserom.gba", 0x31E9C0, 0x110
+
+gMapData_Route7_EastEntrance:: @ 831EAD0
+gMapData_Route8_WestEntrance:: @ 831EAD0
+    .incbin "baserom.gba", 0x31EAD0, 0xC4
+
+gMapData_DiglettsCave_NorthEntrance:: @ 831EB94
+    .incbin "baserom.gba", 0x31EB94, 0xC4
+
+gMapData_DiglettsCave_SouthEntrance:: @ 831EC58
+    .incbin "baserom.gba", 0x31EC58, 0x3A8
+
+gMapData_IndigoPlateau_PokemonCenter_1F:: @ 831F000
+    .incbin "baserom.gba", 0x31F000, 0x178
+
+gMapData_PokemonLeague_LoreleisRoom:: @ 831F178
+    .incbin "baserom.gba", 0x31F178, 0x178
+
+gMapData_PokemonLeague_BrunosRoom:: @ 831F2F0
+    .incbin "baserom.gba", 0x31F2F0, 0x178
+
+gMapData_PokemonLeague_AgathasRoom:: @ 831F468
+    .incbin "baserom.gba", 0x31F468, 0x564
+
+gMapData_PokemonLeague_LancesRoom:: @ 831F9CC
+    .incbin "baserom.gba", 0x31F9CC, 0x22C
+
+gMapData_PokemonLeague_ChampionsRoom:: @ 831FBF8
+    .incbin "baserom.gba", 0x31FBF8, 0x144
+
+gMapData_PokemonLeague_HallOfFame:: @ 831FD3C
+    .incbin "baserom.gba", 0x31FD3C, 0x984
+
+gMapData_Route21_South:: @ 83206C0
+    .incbin "baserom.gba", 0x3206C0, 0x144
+
+gMapData_Route11_EastEntrance_2F:: @ 8320804
+gMapData_Route12_NorthEntrance_2F:: @ 8320804
+gMapData_Route15_WestEntrance_2F:: @ 8320804
+gMapData_Route16_NorthEntrance_2F:: @ 8320804
+gMapData_Route18_EastEntrance_2F:: @ 8320804
+    .incbin "baserom.gba", 0x320804, 0x18C
+
+gMapData_Route2_ViridianForest_SouthEntrance:: @ 8320990
+gMapData_Route2_EastBuilding:: @ 8320990
+gMapData_Route2_ViridianForest_NorthEntrance:: @ 8320990
+    .incbin "baserom.gba", 0x320990, 0x18C
+
+gMapData_Route22_NorthEntrance:: @ 8320B1C
+    .incbin "baserom.gba", 0x320B1C, 0x1F8
+
+gMapData_Route16_NorthEntrance_1F:: @ 8320D14
+    .incbin "baserom.gba", 0x320D14, 0x15C
+
+gMapData_Route11_EastEntrance_1F:: @ 8320E70
+gMapData_Route15_WestEntrance_1F:: @ 8320E70
+gMapData_Route18_EastEntrance_1F:: @ 8320E70
+    .incbin "baserom.gba", 0x320E70, 0x6C
+
+gMapData_RocketHideout_Elevator:: @ 8320EDC
+    .incbin "baserom.gba", 0x320EDC, 0x128
+
+gMapData_SaffronCity_House1_1F:: @ 8321004
+    .incbin "baserom.gba", 0x321004, 0xFC
+
+gMapData_SaffronCity_House1_2F:: @ 8321100
+    .incbin "baserom.gba", 0x321100, 0x1C4
+
+gMapData_SaffronCity_Dojo:: @ 83212C4
+    .incbin "baserom.gba", 0x3212C4, 0x6C
+
+gMapData_SilphCo_Elevator:: @ 8321330
+    .incbin "baserom.gba", 0x321330, 0x3E4
+
+gMapData_OneIsland:: @ 8321714
+    .incbin "baserom.gba", 0x321714, 0x7A4
+
+gMapData_TwoIsland:: @ 8321EB8
+    .incbin "baserom.gba", 0x321EB8, 0x7A4
+
+gMapData_ThreeIsland:: @ 832265C
+    .incbin "baserom.gba", 0x32265C, 0xF24
+
+gMapData_FourIsland:: @ 8323580
+    .incbin "baserom.gba", 0x323580, 0x3E4
+
+gMapData_FiveIsland:: @ 8323964
+    .incbin "baserom.gba", 0x323964, 0x3E4
+
+gMapData_SevenIsland:: @ 8323D48
+    .incbin "baserom.gba", 0x323D48, 0x5C4
+
+gMapData_SixIsland:: @ 832430C
+    .incbin "baserom.gba", 0x32430C, 0x1A64
+
+gMapData_OneIsland_KindleRoad:: @ 8325D70
+    .incbin "baserom.gba", 0x325D70, 0x7A4
+
+gMapData_OneIsland_TreasureBeach:: @ 8326514
+    .incbin "baserom.gba", 0x326514, 0x7A4
+
+gMapData_TwoIsland_CapeBrink:: @ 8326CB8
+    .incbin "baserom.gba", 0x326CB8, 0xF24
+
+gMapData_ThreeIsland_BondBridge:: @ 8327BDC
+    .incbin "baserom.gba", 0x327BDC, 0x7A4
+
+gMapData_ThreeIsland_Port:: @ 8328380
+    .incbin "baserom.gba", 0x328380, 0x28
+
+gMapData_UnknownMap_03_50:: @ 83283A8
+    .incbin "baserom.gba", 0x3283A8, 0x28
+
+gMapData_UnknownMap_03_51:: @ 83283D0
+    .incbin "baserom.gba", 0x3283D0, 0xD44
+
+gMapData_UnknownMap_03_52:: @ 8329114
+    .incbin "baserom.gba", 0x329114, 0xB64
+
+gMapData_UnknownMap_03_53:: @ 8329C78
+    .incbin "baserom.gba", 0x329C78, 0xB64
+
+gMapData_FiveIsland_ResortGorgeous:: @ 832A7DC
+    .incbin "baserom.gba", 0x32A7DC, 0xB64
+
+gMapData_FiveIsland_WaterLabyrinth:: @ 832B340
+    .incbin "baserom.gba", 0x32B340, 0x7A4
+
+gMapData_FiveIsland_Meadow:: @ 832BAE4
+    .incbin "baserom.gba", 0x32BAE4, 0xB64
+
+gMapData_FiveIsland_MemorialPillar:: @ 832C648
+    .incbin "baserom.gba", 0x32C648, 0xF24
+
+gMapData_SixIsland_OutcastIsland:: @ 832D56C
+    .incbin "baserom.gba", 0x32D56C, 0xB64
+
+gMapData_SixIsland_GreenPath:: @ 832E0D0
+    .incbin "baserom.gba", 0x32E0D0, 0x12E4
+
+gMapData_SixIsland_WaterPath:: @ 832F3B4
+    .incbin "baserom.gba", 0x32F3B4, 0xF24
+
+gMapData_SixIsland_RuinValley:: @ 83302D8
+    .incbin "baserom.gba", 0x3302D8, 0x25A4
+
+gMapData_SevenIsland_TrainerTower:: @ 833287C
+    .incbin "baserom.gba", 0x33287C, 0x7A4
+
+gMapData_SevenIsland_SevaultCanyon_Entrance:: @ 8333020
+    .incbin "baserom.gba", 0x333020, 0xF24
+
+gMapData_SevenIsland_SevaultCanyon:: @ 8333F44
+    .incbin "baserom.gba", 0x333F44, 0x16A4
+
+gMapData_SevenIsland_TanobyRuins:: @ 83355E8
+	.incbin "baserom.gba", 0x3355E8, 0xB64
+
+gMapData_833614C:: @ 833614C
+	.incbin "baserom.gba", 0x33614C, 0x16A4
+
+gMapData_83377F0:: @ 83377F0
+	.incbin "baserom.gba", 0x3377F0, 0xB64
+
+gMapData_8338354:: @ 8338354
+	.incbin "baserom.gba", 0x338354, 0x3E4
+
+gMapData_8338738:: @ 8338738
+	.incbin "baserom.gba", 0x338738, 0x18C
+
+gMapData_UnknownMap_00_04:: @ 83388C4
+    .incbin "baserom.gba", 0x3388C4, 0x19C
+
+gMapData_SaffronCity_PokemonTrainerFanClub:: @ 8338A60
+	.incbin "baserom.gba", 0x338A60, 0xEC
+
+gMapData_8338B4C:: @ 8338B4C
+	.incbin "baserom.gba", 0x338B4C, 0xFC
+
+gMapData_SevenIsland_House_Room2:: @ 8338C48
+    .incbin "baserom.gba", 0x338C48, 0xD8
+
+gMapData_ViridianCity_House2:: @ 8338D20
+	.incbin "baserom.gba", 0x338D20, 0x170
+
+gMapData_8338E90:: @ 8338E90
+	.incbin "baserom.gba", 0x338E90, 0x19C
+
+gMapData_833902C:: @ 833902C
+	.incbin "baserom.gba", 0x33902C, 0x264
+
+gMapData_MtEmber_RubyPath_B4F:: @ 8339290
+    .incbin "baserom.gba", 0x339290, 0x1518
+
+gMapData_ThreeIsland_BerryForest:: @ 833A7A8
+    .incbin "baserom.gba", 0x33A7A8, 0x1C8
+
+gMapData_OneIsland_PokemonCenter_1F:: @ 833A970
+    .incbin "baserom.gba", 0x33A970, 0x114
+
+gMapData_TwoIsland_JoyfulGameCorner:: @ 833AA84
+    .incbin "baserom.gba", 0x33AA84, 0x144
+
+gMapData_VermilionCity_PokemonFanClub:: @ 833ABC8
+    .incbin "baserom.gba", 0x33ABC8, 0xFC
+
+gMapData_LavenderTown_VolunteerPokemonHouse:: @ 833ACC4
+    .incbin "baserom.gba", 0x33ACC4, 0xFC
+
+gMapData_Route5_PokemonDayCare:: @ 833ADC0
+    .incbin "baserom.gba", 0x33ADC0, 0xEC
+
+gMapData_ViridianCity_House1:: @ 833AEAC
+    .incbin "baserom.gba", 0x33AEAC, 0xFC
+
+gMapData_FourIsland_PokemonDayCare:: @ 833AFA8
+	.incbin "baserom.gba", 0x33AFA8, 0x744
+
+gMapData_833B6EC:: @ 833B6EC
+	.incbin "baserom.gba", 0x33B6EC, 0x744
+
+gMapData_833BE30:: @ 833BE30
+	.incbin "baserom.gba", 0x33BE30, 0x1830
+
+gMapData_MtEmber_Exterior:: @ 833D660
+    .incbin "baserom.gba", 0x33D660, 0x368
+
+gMapData_MtEmber_Summit:: @ 833D9C8
+    .incbin "baserom.gba", 0x33D9C8, 0x240
+
+gMapData_MtEmber_SummitPath_1F:: @ 833DC08
+    .incbin "baserom.gba", 0x33DC08, 0x1164
+
+gMapData_MtEmber_SummitPath_2F:: @ 833ED6C
+    .incbin "baserom.gba", 0x33ED6C, 0x170
+
+gMapData_MtEmber_SummitPath_3F:: @ 833EEDC
+    .incbin "baserom.gba", 0x33EEDC, 0x428
+
+gMapData_SSAnne_Kitchen3:: @ 833F304
+    .incbin "baserom.gba", 0x33F304, 0x220
+
+gMapData_MtEmber_RubyPath_B1F:: @ 833F524
+    .incbin "baserom.gba", 0x33F524, 0x184
+
+gMapData_MtEmber_RubyPath_B2F:: @ 833F6A8
+    .incbin "baserom.gba", 0x33F6A8, 0x5B8
+
+gMapData_MtEmber_RubyPath_B3F:: @ 833FC60
+    .incbin "baserom.gba", 0x33FC60, 0x78
+
+gMapData_MtEmber_RubyPath_B1F_Stairs:: @ 833FCD8
+    .incbin "baserom.gba", 0x33FCD8, 0x84
+
+gMapData_MtEmber_RubyPath_B2F_Stairs:: @ 833FD5C
+    .incbin "baserom.gba", 0x33FD5C, 0x204
+
+gMapData_MtEmber_RubyPath_B5F:: @ 833FF60
+    .incbin "baserom.gba", 0x33FF60, 0x644
+
+gMapData_SSAnne_CaptainsOffice4:: @ 83405A4
+    .incbin "baserom.gba", 0x3405A4, 0x894
+
+gMapData_FourIsland_IcefallCave_Entrance:: @ 8340E38
+    .incbin "baserom.gba", 0x340E38, 0x344
+
+gMapData_FourIsland_IcefallCave_1F:: @ 834117C
+    .incbin "baserom.gba", 0x34117C, 0x3E4
+
+gMapData_SSAnne_CaptainsOffice2:: @ 8341560
+    .incbin "baserom.gba", 0x341560, 0x538
+
+gMapData_SSAnne_CaptainsOffice3:: @ 8341A98
+    .incbin "baserom.gba", 0x341A98, 0x2AC
+
+gMapData_SevenIsland_TrainerTower_Lobby:: @ 8341D44
+    .incbin "baserom.gba", 0x341D44, 0x288
+
+gMapData_SevenIsland_TrainerTower_1F:: @ 8341FCC
+    .incbin "baserom.gba", 0x341FCC, 0x288
+
+gMapData_SevenIsland_TrainerTower_2F:: @ 8342254
+    .incbin "baserom.gba", 0x342254, 0x288
+
+gMapData_SevenIsland_TrainerTower_3F:: @ 83424DC
+    .incbin "baserom.gba", 0x3424DC, 0x288
+
+gMapData_SevenIsland_TrainerTower_4F:: @ 8342764
+    .incbin "baserom.gba", 0x342764, 0x288
+
+gMapData_SevenIsland_TrainerTower_5F:: @ 83429EC
+    .incbin "baserom.gba", 0x3429EC, 0x288
+
+gMapData_SevenIsland_TrainerTower_6F:: @ 8342C74
+    .incbin "baserom.gba", 0x342C74, 0x288
+
+gMapData_SevenIsland_TrainerTower_7F:: @ 8342EFC
+    .incbin "baserom.gba", 0x342EFC, 0x288
+
+gMapData_SevenIsland_TrainerTower_8F:: @ 8343184
+    .incbin "baserom.gba", 0x343184, 0x264
+
+gMapData_SevenIsland_TrainerTower_Roof:: @ 83433E8
+    .incbin "baserom.gba", 0x3433E8, 0x6C
+
+gMapData_SevenIsland_TrainerTower_Elevator:: @ 8343454
+    .incbin "baserom.gba", 0x343454, 0xEC
+
+gMapData_CeruleanCity_House5:: @ 8343540
+    .incbin "baserom.gba", 0x343540, 0x184
+
+gMapData_SSAnne_CaptainsOffice5:: @ 83436C4
+    .incbin "baserom.gba", 0x3436C4, 0x144
+
+gMapData_SixIsland_DottedHole_B1F:: @ 8343808
+    .incbin "baserom.gba", 0x343808, 0x144
+
+gMapData_SixIsland_DottedHole_B2F:: @ 834394C
+    .incbin "baserom.gba", 0x34394C, 0x144
+
+gMapData_SixIsland_DottedHole_B3F:: @ 8343A90
+    .incbin "baserom.gba", 0x343A90, 0x144
+
+gMapData_SSAnne_CaptainsOffice9:: @ 8343BD4
+    .incbin "baserom.gba", 0x343BD4, 0x204
+
+gMapData_SixIsland_DottedHole_SapphireRoom:: @ 8343DD8
+    .incbin "baserom.gba", 0x343DD8, 0x1E0
+
+gMapData_BirthIsland_Harbor:: @ 8343FB8
+gMapData_NavelRock_Harbor:: @ 8343FB8
+gMapData_SevenIsland_Harbor:: @ 8343FB8
+gMapData_OneIsland_Harbor:: @ 8343FB8
+gMapData_TwoIsland_Harbor:: @ 8343FB8
+gMapData_FourIsland_Harbor:: @ 8343FB8
+gMapData_FiveIsland_Harbor:: @ 8343FB8
+gMapData_SixIsland_Harbor:: @ 8343FB8
+gMapData_ThreeIsland_Harbor:: @ 8343FB8
+    .incbin "baserom.gba", 0x343FB8, 0x150
+
+gMapData_OneIsland_PokemonCenter_2F:: @ 8344108
+    .incbin "baserom.gba", 0x344108, 0xF28
+
+gMapData_SSAnne_1F_Room11:: @ 8345030
+    .incbin "baserom.gba", 0x345030, 0x1C8
+
+gMapData_ThreeIsland_DunsparceTunnel:: @ 83451F8
+	.incbin "baserom.gba", 0x3451F8, 0x1C8
+
+gMapData_83453C0:: @ 83453C0
+	.incbin "baserom.gba", 0x3453C0, 0x118
+
+gMapData_FiveIsland_LostCave_Entrance:: @ 83454D8
+    .incbin "baserom.gba", 0x3454D8, 0x118
+
+gMapData_FiveIsland_LostCave_Room1:: @ 83455F0
+    .incbin "baserom.gba", 0x3455F0, 0x118
+
+gMapData_FiveIsland_LostCave_Room2:: @ 8345708
+    .incbin "baserom.gba", 0x345708, 0x118
+
+gMapData_FiveIsland_LostCave_Room3:: @ 8345820
+    .incbin "baserom.gba", 0x345820, 0x118
+
+gMapData_FiveIsland_LostCave_Room4:: @ 8345938
+    .incbin "baserom.gba", 0x345938, 0x118
+
+gMapData_FiveIsland_LostCave_Room5:: @ 8345A50
+    .incbin "baserom.gba", 0x345A50, 0x118
+
+gMapData_FiveIsland_LostCave_Room6:: @ 8345B68
+    .incbin "baserom.gba", 0x345B68, 0x118
+
+gMapData_FiveIsland_LostCave_Room7:: @ 8345C80
+    .incbin "baserom.gba", 0x345C80, 0x118
+
+gMapData_FiveIsland_LostCave_Room8:: @ 8345D98
+    .incbin "baserom.gba", 0x345D98, 0x118
+
+gMapData_FiveIsland_LostCave_Room9:: @ 8345EB0
+    .incbin "baserom.gba", 0x345EB0, 0x118
+
+gMapData_FiveIsland_LostCave_Room10:: @ 8345FC8
+    .incbin "baserom.gba", 0x345FC8, 0x118
+
+gMapData_FiveIsland_LostCave_Room11:: @ 83460E0
+    .incbin "baserom.gba", 0x3460E0, 0x118
+
+gMapData_FiveIsland_LostCave_Room12:: @ 83461F8
+    .incbin "baserom.gba", 0x3461F8, 0x118
+
+gMapData_FiveIsland_LostCave_Room13:: @ 8346310
+    .incbin "baserom.gba", 0x346310, 0x118
+
+gMapData_FiveIsland_LostCave_Room14:: @ 8346428
+    .incbin "baserom.gba", 0x346428, 0x334
+
+gMapData_SevenIsland_TanobyRuins_MoneanChamber:: @ 834675C
+    .incbin "baserom.gba", 0x34675C, 0x334
+
+gMapData_SevenIsland_TanobyRuins_LiptooChamber:: @ 8346A90
+    .incbin "baserom.gba", 0x346A90, 0x334
+
+gMapData_SevenIsland_TanobyRuins_WeepthChamber:: @ 8346DC4
+    .incbin "baserom.gba", 0x346DC4, 0x334
+
+gMapData_SevenIsland_TanobyRuins_DilfordChamber:: @ 83470F8
+    .incbin "baserom.gba", 0x3470F8, 0x334
+
+gMapData_SevenIsland_TanobyRuins_ScufibChamber:: @ 834742C
+    .incbin "baserom.gba", 0x34742C, 0x624
+
+gMapData_SSAnne_1F_Room12:: @ 8347A50
+    .incbin "baserom.gba", 0x347A50, 0x204
+
+gMapData_SevenIsland_SeavaultCanyon_TanobyKey:: @ 8347C54
+    .incbin "baserom.gba", 0x347C54, 0x72C
+
+gMapData_BirthIsland_Exterior:: @ 8348380
+    .incbin "baserom.gba", 0x348380, 0x3BC
+
+gMapData_NavelRock_Exterior:: @ 834873C
+    .incbin "baserom.gba", 0x34873C, 0x398
+
+gMapData_NavelRock_1F:: @ 8348AD4
+    .incbin "baserom.gba", 0x348AD4, 0x3DC
+
+gMapData_NavelRock_Summit:: @ 8348EB0
+    .incbin "baserom.gba", 0x348EB0, 0x3EC
+
+gMapData_NavelRock_Base:: @ 834929C
+    .incbin "baserom.gba", 0x34929C, 0x88
+
+gMapData_NavelRock_SummitPath_2F:: @ 8349324
+    .incbin "baserom.gba", 0x349324, 0x88
+
+gMapData_NavelRock_SummitPath_3F:: @ 83493AC
+    .incbin "baserom.gba", 0x3493AC, 0x88
+
+gMapData_NavelRock_SummitPath_4F:: @ 8349434
+    .incbin "baserom.gba", 0x349434, 0x88
+
+gMapData_NavelRock_SummitPath_5F:: @ 83494BC
+    .incbin "baserom.gba", 0x3494BC, 0x88
+
+gMapData_NavelRock_BasePath_B1F:: @ 8349544
+    .incbin "baserom.gba", 0x349544, 0x88
+
+gMapData_NavelRock_BasePath_B2F:: @ 83495CC
+    .incbin "baserom.gba", 0x3495CC, 0x88
+
+gMapData_NavelRock_BasePath_B3F:: @ 8349654
+    .incbin "baserom.gba", 0x349654, 0x88
+
+gMapData_NavelRock_BasePath_B4F:: @ 83496DC
+    .incbin "baserom.gba", 0x3496DC, 0x88
+
+gMapData_NavelRock_BasePath_B5F:: @ 8349764
+    .incbin "baserom.gba", 0x349764, 0x88
+
+gMapData_NavelRock_BasePath_B6F:: @ 83497EC
+    .incbin "baserom.gba", 0x3497EC, 0x88
+
+gMapData_NavelRock_BasePath_B7F:: @ 8349874
+    .incbin "baserom.gba", 0x349874, 0x88
+
+gMapData_NavelRock_BasePath_B8F:: @ 83498FC
+    .incbin "baserom.gba", 0x3498FC, 0x88
+
+gMapData_NavelRock_BasePath_B9F:: @ 8349984
+    .incbin "baserom.gba", 0x349984, 0x88
+
+gMapData_NavelRock_BasePath_B10F:: @ 8349A0C
+    .incbin "baserom.gba", 0x349A0C, 0x88
+
+gMapData_NavelRock_BasePath_B11F:: @ 8349A94
+    .incbin "baserom.gba", 0x349A94, 0x334
+
+gMapData_SevenIsland_TanobyRuins_RixyChamber:: @ 8349DC8
+    .incbin "baserom.gba", 0x349DC8, 0x334
+
+gMapData_SevenIsland_TanobyRuins_ViapoisChamber:: @ 834A0FC
+    .incbin "baserom.gba", 0x34A0FC, 0x114
+
+gMapData_NavelRock_B1F:: @ 834A210
+    .incbin "baserom.gba", 0x34A210, 0x1794
+
+gMapData_NavelRock_Fork:: @ 834B9A4
+	.incbin "baserom.gba", 0x34B9A4, 0x288
+
+gMapData_834BC2C:: @ 834BC2C
+	.incbin "baserom.gba", 0x34BC2C, 0x288
+
+gMapData_834BEB4:: @ 834BEB4
+	.incbin "baserom.gba", 0x34BEB4, 0x288
+
+gMapData_834C13C:: @ 834C13C
+	.incbin "baserom.gba", 0x34C13C, 0x288
+
+gMapData_834C3C4:: @ 834C3C4
+	.incbin "baserom.gba", 0x34C3C4, 0x288
+
+gMapData_834C64C:: @ 834C64C
+	.incbin "baserom.gba", 0x34C64C, 0x288
+
+gMapData_834C8D4:: @ 834C8D4
+	.incbin "baserom.gba", 0x34C8D4, 0x288
+
+gMapData_834CB5C:: @ 834CB5C
+	.incbin "baserom.gba", 0x34CB5C, 0x288
+
+gMapData_834CDE4:: @ 834CDE4
+	.incbin "baserom.gba", 0x34CDE4, 0x288
+
+gMapData_834D06C:: @ 834D06C
+	.incbin "baserom.gba", 0x34D06C, 0x288
+
+gMapData_834D2F4:: @ 834D2F4
+	.incbin "baserom.gba", 0x34D2F4, 0x288
+
+gMapData_834D57C:: @ 834D57C
+	.incbin "baserom.gba", 0x34D57C, 0x288
+
+gMapData_834D804:: @ 834D804
+	.incbin "baserom.gba", 0x34D804, 0x288
+
+gMapData_834DA8C:: @ 834DA8C
+	.incbin "baserom.gba", 0x34DA8C, 0x288
+
+gMapData_834DD14:: @ 834DD14
+	.incbin "baserom.gba", 0x34DD14, 0x288
+
+gMapData_834DF9C:: @ 834DF9C
+	.incbin "baserom.gba", 0x34DF9C, 0x288
+
+gMapData_834E224:: @ 834E224
+	.incbin "baserom.gba", 0x34E224, 0xEC
+
+gMapData_SevenIsland_House_Room1:: @ 834E310
+    .incbin "baserom.gba", 0x34E310, 0x860
+
+gMapData_OneIsland_KindleRoad_EmberSpa:: @ 834EB70
+    .incbin "baserom.gba", 0x34EB70, 0x1C
diff --git a/data/layouts/layouts_table.inc b/data/layouts/layouts_table.inc
new file mode 100644
index 000000000..24b5cf748
--- /dev/null
+++ b/data/layouts/layouts_table.inc
@@ -0,0 +1,385 @@
+	.align 2
+gMapLayouts:: @ 834EB8C
+	.4byte gMapData_PalletTown_PlayersHouse_1F
+	.4byte gMapData_PalletTown_PlayersHouse_2F
+	.4byte gMapData_PalletTown_GarysHouse
+	.4byte gMapData_82D54D8
+	.4byte gMapData_PalletTown_ProfessorOaksLab
+	.4byte gMapData_Route16_House
+	.4byte gMapData_UnusedHouse_29_00
+	.4byte gMapData_SixIsland_PokemonCenter_1F
+	.4byte gMapData_SixIsland_PokemonCenter_2F
+	.4byte gMapData_SixIsland_Mart
+	.4byte gMapData_SevenIsland_SevaultCanyon_House
+	.4byte gMapData_CeruleanCity_Gym
+	.4byte gMapData_SixIsland_WaterPath_House1
+	.4byte gMapData_82D6144
+	.4byte gMapData_CeladonCity_Gym
+	.4byte gMapData_82D6490
+	.4byte gMapData_FiveIsland_ResortGorgeous_House
+	.4byte gMapData_82D6654
+	.4byte gMapData_82D672C
+	.4byte gMapData_FuchsiaCity_Gym
+	.4byte gMapData_SaffronCity_House3
+	.4byte NULL
+	.4byte NULL
+	.4byte gMapData_82D6C34
+	.4byte gMapData_VermilionCity_Gym
+	.4byte gMapData_CeruleanCity_BikeShop
+	.4byte gMapData_CeladonCity_GameCorner
+	.4byte gMapData_PewterCity_Gym
+	.4byte NULL
+	.4byte gMapData_FourIsland_LoreleisHouse
+	.4byte gMapData_ThreeIsland_House1
+	.4byte gMapData_82D75F0
+	.4byte gMapData_82D7674
+	.4byte gMapData_SaffronCity_Gym
+	.4byte gMapData_82D7CC8
+	.4byte gMapData_CinnabarIsland_Gym
+	.4byte gMapData_ViridianCity_Gym
+	.4byte NULL
+	.4byte NULL
+	.4byte NULL
+	.4byte NULL
+	.4byte NULL
+	.4byte NULL
+	.4byte NULL
+	.4byte NULL
+	.4byte gMapData_82D88C8
+	.4byte gMapData_UnknownMap_00_00
+	.4byte gMapData_UnknownMap_00_01
+	.4byte gMapData_UnknownMap_00_02
+	.4byte gMapData_UnknownMap_00_03
+	.4byte gMapData_FuchsiaCity_SafariZone_Entrance
+	.4byte gMapData_82D9B24
+	.4byte gMapData_82DA7C8
+	.4byte gMapData_82DB46C
+	.4byte gMapData_82DB4F0
+	.4byte NULL
+	.4byte gMapData_82DBBE0
+	.4byte NULL
+	.4byte NULL
+	.4byte NULL
+	.4byte NULL
+	.4byte gMapData_82DBDD8
+	.4byte gMapData_82DBFB8
+	.4byte gMapData_82DC4EC
+	.4byte gMapData_82DC60C
+	.4byte gMapData_82DC72C
+	.4byte gMapData_82DC84C
+	.4byte gMapData_82DCA70
+	.4byte gMapData_82DCB44
+	.4byte gMapData_82DCC40
+	.4byte gMapData_82DCCD4
+	.4byte gMapData_82DCD68
+	.4byte gMapData_82DCDFC
+	.4byte gMapData_82DCF00
+	.4byte gMapData_82DD004
+	.4byte NULL
+	.4byte gMapData_82DD0DC
+	.4byte gMapData_PalletTown
+	.4byte gMapData_ViridianCity
+	.4byte gMapData_PewterCity
+	.4byte gMapData_CeruleanCity
+	.4byte gMapData_LavenderTown
+	.4byte gMapData_VermilionCity
+	.4byte gMapData_CeladonCity
+	.4byte gMapData_FuchsiaCity
+	.4byte gMapData_CinnabarIsland
+	.4byte gMapData_IndigoPlateau_Exterior
+	.4byte gMapData_SaffronCity
+	.4byte gMapData_82E55CC
+	.4byte gMapData_Route2
+	.4byte gMapData_Route3
+	.4byte gMapData_Route4
+	.4byte gMapData_Route5
+	.4byte gMapData_Route6
+	.4byte gMapData_Route7
+	.4byte gMapData_Route8
+	.4byte gMapData_Route9
+	.4byte gMapData_Route10
+	.4byte gMapData_Route11
+	.4byte gMapData_Route12
+	.4byte gMapData_Route13
+	.4byte gMapData_Route14
+	.4byte gMapData_Route15
+	.4byte gMapData_Route16
+	.4byte gMapData_Route17
+	.4byte gMapData_Route18
+	.4byte gMapData_Route19
+	.4byte gMapData_Route20
+	.4byte gMapData_Route21_North
+	.4byte gMapData_Route22
+	.4byte gMapData_Route23
+	.4byte gMapData_Route24
+	.4byte gMapData_Route25
+	.4byte gMapData_MtMoon_1F
+	.4byte gMapData_MtMoon_B1F
+	.4byte gMapData_MtMoon_B2F
+	.4byte gMapData_ViridianForest
+	.4byte gMapData_SSAnne_Exterior
+	.4byte gMapData_SSAnne_1F_Corridor
+	.4byte gMapData_SSAnne_2F_Corridor
+	.4byte gMapData_SSAnne_3F_Corridor
+	.4byte gMapData_SSAnne_B1F_Corridor
+	.4byte gMapData_SSAnne_Deck
+	.4byte gMapData_DiglettsCave_B1F
+	.4byte gMapData_VictoryRoad_1F
+	.4byte gMapData_VictoryRoad_2F
+	.4byte gMapData_VictoryRoad_3F
+	.4byte gMapData_RocketHideout_B1F
+	.4byte gMapData_RocketHideout_B2F
+	.4byte gMapData_RocketHideout_B3F
+	.4byte gMapData_RocketHideout_B4F
+	.4byte gMapData_SilphCo_1F
+	.4byte gMapData_SilphCo_2F
+	.4byte gMapData_SilphCo_3F
+	.4byte gMapData_SilphCo_4F
+	.4byte gMapData_SilphCo_5F
+	.4byte gMapData_SilphCo_6F
+	.4byte gMapData_SilphCo_7F
+	.4byte gMapData_SilphCo_8F
+	.4byte gMapData_SilphCo_9F
+	.4byte gMapData_SilphCo_10F
+	.4byte gMapData_SilphCo_11F
+	.4byte gMapData_PokemonMansion_1F
+	.4byte gMapData_PokemonMansion_2F
+	.4byte gMapData_PokemonMansion_3F
+	.4byte gMapData_PokemonMansion_B1F
+	.4byte gMapData_SafariZone_Center
+	.4byte gMapData_SafariZone_East
+	.4byte gMapData_SafariZone_North
+	.4byte gMapData_SafariZone_West
+	.4byte gMapData_CeruleanCave_1F
+	.4byte gMapData_CeruleanCave_2F
+	.4byte gMapData_CeruleanCave_B1F
+	.4byte gMapData_RockTunnel_1F
+	.4byte gMapData_RockTunnel_B1F
+	.4byte gMapData_SeafoamIslands_1F
+	.4byte gMapData_SeafoamIslands_B1F
+	.4byte gMapData_SeafoamIslands_B2F
+	.4byte gMapData_SeafoamIslands_B3F
+	.4byte gMapData_SeafoamIslands_B4F
+	.4byte gMapData_PokemonTower_1F
+	.4byte gMapData_PokemonTower_2F
+	.4byte gMapData_PokemonTower_3F
+	.4byte gMapData_PokemonTower_4F
+	.4byte gMapData_PokemonTower_5F
+	.4byte gMapData_PokemonTower_6F
+	.4byte gMapData_PokemonTower_7F
+	.4byte gMapData_PowerPlant
+	.4byte gMapData_Route25_SeaCottage
+	.4byte gMapData_SSAnne_Kitchen
+	.4byte gMapData_SSAnne_CaptainsOffice
+	.4byte gMapData_UndergroundPath_EastEntrance
+	.4byte gMapData_UndergroundPath_EastWestTunnel
+	.4byte gMapData_UndergroundPath_NorthSouthTunnel
+	.4byte NULL
+	.4byte gMapData_Route12_NorthEntrance_1F
+	.4byte gMapData_SSAnne_1F_Room6
+	.4byte gMapData_SSAnne_B1F_Room5
+	.4byte gMapData_CeladonCity_DepartmentStore_Elevator
+	.4byte gMapData_PewterCity_Museum_1F
+	.4byte gMapData_PewterCity_Museum_2F
+	.4byte gMapData_CeruleanCity_House2
+	.4byte gMapData_CeruleanCity_House1
+	.4byte gMapData_CeladonCity_Condominiums_1F
+	.4byte gMapData_CeladonCity_Condominiums_2F
+	.4byte gMapData_CeladonCity_Condominiums_3F
+	.4byte gMapData_CeladonCity_Condominiums_Roof
+	.4byte gMapData_CeladonCity_Condominiums_RoofRoom
+	.4byte gMapData_CeladonCity_GameCorner_PrizeRoom
+	.4byte gMapData_CeladonCity_Restaurant
+	.4byte gMapData_CeladonCity_Hotel
+	.4byte gMapData_CeladonCity_DepartmentStore_1F
+	.4byte gMapData_CeladonCity_DepartmentStore_2F
+	.4byte gMapData_CeladonCity_DepartmentStore_3F
+	.4byte gMapData_CeladonCity_DepartmentStore_4F
+	.4byte gMapData_CeladonCity_DepartmentStore_5F
+	.4byte gMapData_CeladonCity_DepartmentStore_Roof
+	.4byte gMapData_SafariZone_Building4
+	.4byte gMapData_SafariZone_SecretHouse
+	.4byte gMapData_FuchsiaCity_ZooBuilding
+	.4byte gMapData_FuchsiaCity_Building1
+	.4byte gMapData_FuchsiaCity_House2
+	.4byte gMapData_CinnabarIsland_PokemonLab_Entrance
+	.4byte gMapData_CinnabarIsland_PokemonLab_Lounge
+	.4byte gMapData_CinnabarIsland_PokemonLab_ResearchRoom
+	.4byte gMapData_CinnabarIsland_PokemonLab_ExperimentRoom
+	.4byte gMapData_SaffronCity_Duplicate
+	.4byte gMapData_Route6_NorthEntrance
+	.4byte gMapData_Route8_WestEntrance
+	.4byte gMapData_DiglettsCave_NorthEntrance
+	.4byte gMapData_DiglettsCave_SouthEntrance
+	.4byte gMapData_IndigoPlateau_PokemonCenter_1F
+	.4byte gMapData_PokemonLeague_LoreleisRoom
+	.4byte gMapData_PokemonLeague_BrunosRoom
+	.4byte gMapData_PokemonLeague_AgathasRoom
+	.4byte gMapData_PokemonLeague_LancesRoom
+	.4byte gMapData_PokemonLeague_ChampionsRoom
+	.4byte gMapData_PokemonLeague_HallOfFame
+	.4byte gMapData_Route21_South
+	.4byte gMapData_Route18_EastEntrance_2F
+	.4byte gMapData_Route2_ViridianForest_NorthEntrance
+	.4byte gMapData_Route22_NorthEntrance
+	.4byte gMapData_Route16_NorthEntrance_1F
+	.4byte gMapData_Route18_EastEntrance_1F
+	.4byte gMapData_RocketHideout_Elevator
+	.4byte gMapData_SaffronCity_House1_1F
+	.4byte gMapData_SaffronCity_House1_2F
+	.4byte gMapData_SaffronCity_Dojo
+	.4byte gMapData_SilphCo_Elevator
+	.4byte gMapData_OneIsland
+	.4byte gMapData_TwoIsland
+	.4byte gMapData_ThreeIsland
+	.4byte gMapData_FourIsland
+	.4byte gMapData_FiveIsland
+	.4byte gMapData_SevenIsland
+	.4byte gMapData_SixIsland
+	.4byte gMapData_OneIsland_KindleRoad
+	.4byte gMapData_OneIsland_TreasureBeach
+	.4byte gMapData_TwoIsland_CapeBrink
+	.4byte gMapData_ThreeIsland_BondBridge
+	.4byte gMapData_ThreeIsland_Port
+	.4byte gMapData_UnknownMap_03_50
+	.4byte gMapData_UnknownMap_03_51
+	.4byte gMapData_UnknownMap_03_52
+	.4byte gMapData_UnknownMap_03_53
+	.4byte gMapData_FiveIsland_ResortGorgeous
+	.4byte gMapData_FiveIsland_WaterLabyrinth
+	.4byte gMapData_FiveIsland_Meadow
+	.4byte gMapData_FiveIsland_MemorialPillar
+	.4byte gMapData_SixIsland_OutcastIsland
+	.4byte gMapData_SixIsland_GreenPath
+	.4byte gMapData_SixIsland_WaterPath
+	.4byte gMapData_SixIsland_RuinValley
+	.4byte gMapData_SevenIsland_TrainerTower
+	.4byte gMapData_SevenIsland_SevaultCanyon_Entrance
+	.4byte gMapData_SevenIsland_SevaultCanyon
+	.4byte gMapData_SevenIsland_TanobyRuins
+	.4byte gMapData_833614C
+	.4byte gMapData_83377F0
+	.4byte gMapData_8338354
+	.4byte gMapData_8338738
+	.4byte gMapData_UnknownMap_00_04
+	.4byte gMapData_SaffronCity_PokemonTrainerFanClub
+	.4byte gMapData_8338B4C
+	.4byte gMapData_SevenIsland_House_Room2
+	.4byte gMapData_ViridianCity_House2
+	.4byte gMapData_8338E90
+	.4byte gMapData_833902C
+	.4byte gMapData_MtEmber_RubyPath_B4F
+	.4byte gMapData_ThreeIsland_BerryForest
+	.4byte gMapData_OneIsland_PokemonCenter_1F
+	.4byte gMapData_TwoIsland_JoyfulGameCorner
+	.4byte gMapData_VermilionCity_PokemonFanClub
+	.4byte gMapData_LavenderTown_VolunteerPokemonHouse
+	.4byte gMapData_Route5_PokemonDayCare
+	.4byte gMapData_ViridianCity_House1
+	.4byte gMapData_FourIsland_PokemonDayCare
+	.4byte gMapData_833B6EC
+	.4byte gMapData_833BE30
+	.4byte gMapData_MtEmber_Exterior
+	.4byte gMapData_MtEmber_Summit
+	.4byte gMapData_MtEmber_SummitPath_1F
+	.4byte gMapData_MtEmber_SummitPath_2F
+	.4byte gMapData_MtEmber_SummitPath_3F
+	.4byte gMapData_SSAnne_Kitchen3
+	.4byte gMapData_MtEmber_RubyPath_B1F
+	.4byte gMapData_MtEmber_RubyPath_B2F
+	.4byte gMapData_MtEmber_RubyPath_B3F
+	.4byte gMapData_MtEmber_RubyPath_B1F_Stairs
+	.4byte gMapData_MtEmber_RubyPath_B2F_Stairs
+	.4byte gMapData_MtEmber_RubyPath_B5F
+	.4byte gMapData_SSAnne_CaptainsOffice4
+	.4byte gMapData_FourIsland_IcefallCave_Entrance
+	.4byte gMapData_FourIsland_IcefallCave_1F
+	.4byte gMapData_SSAnne_CaptainsOffice2
+	.4byte gMapData_SSAnne_CaptainsOffice3
+	.4byte gMapData_SevenIsland_TrainerTower_Lobby
+	.4byte gMapData_SevenIsland_TrainerTower_1F
+	.4byte gMapData_SevenIsland_TrainerTower_2F
+	.4byte gMapData_SevenIsland_TrainerTower_3F
+	.4byte gMapData_SevenIsland_TrainerTower_4F
+	.4byte gMapData_SevenIsland_TrainerTower_5F
+	.4byte gMapData_SevenIsland_TrainerTower_6F
+	.4byte gMapData_SevenIsland_TrainerTower_7F
+	.4byte gMapData_SevenIsland_TrainerTower_8F
+	.4byte gMapData_SevenIsland_TrainerTower_Roof
+	.4byte gMapData_SevenIsland_TrainerTower_Elevator
+	.4byte gMapData_CeruleanCity_House5
+	.4byte gMapData_SSAnne_CaptainsOffice5
+	.4byte gMapData_SixIsland_DottedHole_B1F
+	.4byte gMapData_SixIsland_DottedHole_B2F
+	.4byte gMapData_SixIsland_DottedHole_B3F
+	.4byte gMapData_SSAnne_CaptainsOffice9
+	.4byte gMapData_SixIsland_DottedHole_SapphireRoom
+	.4byte gMapData_ThreeIsland_Harbor
+	.4byte gMapData_OneIsland_PokemonCenter_2F
+	.4byte gMapData_SSAnne_1F_Room11
+	.4byte gMapData_ThreeIsland_DunsparceTunnel
+	.4byte gMapData_83453C0
+	.4byte gMapData_FiveIsland_LostCave_Entrance
+	.4byte gMapData_FiveIsland_LostCave_Room1
+	.4byte gMapData_FiveIsland_LostCave_Room2
+	.4byte gMapData_FiveIsland_LostCave_Room3
+	.4byte gMapData_FiveIsland_LostCave_Room4
+	.4byte gMapData_FiveIsland_LostCave_Room5
+	.4byte gMapData_FiveIsland_LostCave_Room6
+	.4byte gMapData_FiveIsland_LostCave_Room7
+	.4byte gMapData_FiveIsland_LostCave_Room8
+	.4byte gMapData_FiveIsland_LostCave_Room9
+	.4byte gMapData_FiveIsland_LostCave_Room10
+	.4byte gMapData_FiveIsland_LostCave_Room11
+	.4byte gMapData_FiveIsland_LostCave_Room12
+	.4byte gMapData_FiveIsland_LostCave_Room13
+	.4byte gMapData_FiveIsland_LostCave_Room14
+	.4byte gMapData_SevenIsland_TanobyRuins_MoneanChamber
+	.4byte gMapData_SevenIsland_TanobyRuins_LiptooChamber
+	.4byte gMapData_SevenIsland_TanobyRuins_WeepthChamber
+	.4byte gMapData_SevenIsland_TanobyRuins_DilfordChamber
+	.4byte gMapData_SevenIsland_TanobyRuins_ScufibChamber
+	.4byte gMapData_SSAnne_1F_Room12
+	.4byte gMapData_SevenIsland_SeavaultCanyon_TanobyKey
+	.4byte gMapData_BirthIsland_Exterior
+	.4byte gMapData_NavelRock_Exterior
+	.4byte gMapData_NavelRock_1F
+	.4byte gMapData_NavelRock_Summit
+	.4byte gMapData_NavelRock_Base
+	.4byte gMapData_NavelRock_SummitPath_2F
+	.4byte gMapData_NavelRock_SummitPath_3F
+	.4byte gMapData_NavelRock_SummitPath_4F
+	.4byte gMapData_NavelRock_SummitPath_5F
+	.4byte gMapData_NavelRock_BasePath_B1F
+	.4byte gMapData_NavelRock_BasePath_B2F
+	.4byte gMapData_NavelRock_BasePath_B3F
+	.4byte gMapData_NavelRock_BasePath_B4F
+	.4byte gMapData_NavelRock_BasePath_B5F
+	.4byte gMapData_NavelRock_BasePath_B6F
+	.4byte gMapData_NavelRock_BasePath_B7F
+	.4byte gMapData_NavelRock_BasePath_B8F
+	.4byte gMapData_NavelRock_BasePath_B9F
+	.4byte gMapData_NavelRock_BasePath_B10F
+	.4byte gMapData_NavelRock_BasePath_B11F
+	.4byte gMapData_SevenIsland_TanobyRuins_RixyChamber
+	.4byte gMapData_SevenIsland_TanobyRuins_ViapoisChamber
+	.4byte gMapData_NavelRock_B1F
+	.4byte gMapData_NavelRock_Fork
+	.4byte gMapData_834BC2C
+	.4byte gMapData_834BEB4
+	.4byte gMapData_834C13C
+	.4byte gMapData_834C3C4
+	.4byte gMapData_834C64C
+	.4byte gMapData_834C8D4
+	.4byte gMapData_834CB5C
+	.4byte gMapData_834CDE4
+	.4byte gMapData_834D06C
+	.4byte gMapData_834D2F4
+	.4byte gMapData_834D57C
+	.4byte gMapData_834D804
+	.4byte gMapData_834DA8C
+	.4byte gMapData_834DD14
+	.4byte gMapData_834DF9C
+	.4byte gMapData_834E224
+	.4byte gMapData_SevenIsland_House_Room1
+	.4byte gMapData_OneIsland_KindleRoad_EmberSpa
diff --git a/data/maps.s b/data/maps.s
new file mode 100644
index 000000000..4fbe8babf
--- /dev/null
+++ b/data/maps.s
@@ -0,0 +1,17 @@
+@#include "constants/layouts.h"
+@#include "constants/map_types.h"
+#include "constants/maps.h"
+@#include "constants/weather.h"
+@#include "constants/region_map_sections.h"
+#include "constants/songs.h"
+@#include "constants/weather.h"
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.include "data/layouts/layouts.inc"
+	.include "data/layouts/layouts_table.inc"
+@	.include "data/maps/headers.inc"
+	.include "data/maps/groups.inc"
+@	.include "data/maps/connections.inc"
diff --git a/ld_script.txt b/ld_script.txt
index d8f2ea0eb..05bcf9a9f 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -367,6 +367,7 @@ SECTIONS {
         src/util.o(.rodata);
         src/daycare.o(.rodata);
         data/data.o(.rodata.825EF0C);
+        data/maps.o(.rodata);
         data/connections.o(.rodata);
         src/fieldmap.o(.rodata);
         src/metatile_behavior.o(.rodata);