consolidate shared layout names

5 files changed, 1158 insertions, 1274 deletions

diff --git a/.gitignore b/.gitignore
index 3e38a227e..da2cb317c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@ build/
 .idea/
 *.DS_Store
 *.pl
+*.bak
diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s
index 56a3a78e8..482b5da60 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 @ =gMapData_82E55CC
+	ldr r1, _0815BE1C @ =Route1_Layout
 	mov r8, r1
 	movs r0, 0x80
 	lsls r0, 4
@@ -2339,7 +2339,7 @@ _0815BDF0:
 	ldrh r0, [r6]
 	b _0815BE34
 	.align 2, 0
-_0815BE1C: .4byte gMapData_82E55CC
+_0815BE1C: .4byte Route1_Layout
 _0815BE20: .4byte 0x000003ff
 _0815BE24:
 	adds r0, r3, 0x1
diff --git a/data/layouts/layouts.inc b/data/layouts/layouts.inc
index e9418133c..b26aaa07b 100644
--- a/data/layouts/layouts.inc
+++ b/data/layouts/layouts.inc
@@ -1,1211 +1,1094 @@
-gMapData_PalletTown_PlayersHouse_1F:: @ 82D5200
+PalletTown_PlayersHouse_1F_Layout:: @ 82D5200
     .incbin "baserom.gba", 0x2D5200, 0xFC
 
-gMapData_PalletTown_PlayersHouse_2F:: @ 82D52FC
+PalletTown_PlayersHouse_2F_Layout:: @ 82D52FC
     .incbin "baserom.gba", 0x2D52FC, 0x128
 
-gMapData_PalletTown_GarysHouse:: @ 82D5424
+PalletTown_GarysHouse_Layout:: @ 82D5424
     .incbin "baserom.gba", 0x2D5424, 0xB4
 
-gMapData_82D54D8:: @ 82D54D8
+UnusedLayout_82D54D8_Layout:: @ 82D54D8
     .incbin "baserom.gba", 0x2D54D8, 0x190
 
-gMapData_PalletTown_ProfessorOaksLab:: @ 82D5668
+PalletTown_ProfessorOaksLab_Layout:: @ 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
+House1_Layout:: @ shared
     .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
+House2_Layout:: @ shared
     .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
+PokemonCenter_1F_Layout:: @ shared
     .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
+PokemonCenter_2F_Layout:: @ shared
     .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
+Mart_Layout:: @ shared
     .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
+House3_Layout:: @ shared
     .incbin "baserom.gba", 0x2D5CB8, 0x2CC
 
-gMapData_CeruleanCity_Gym:: @ 82D5F84
+CeruleanCity_Gym_Layout:: @ 82D5F84
     .incbin "baserom.gba", 0x2D5F84, 0xEC
 
-gMapData_Route12_FishingHouse:: @ 82D6070
-gMapData_UnusedHouse_31_05:: @ 82D6070
-gMapData_SixIsland_WaterPath_House1:: @ 82D6070
+House4_Layout:: @ shared
     .incbin "baserom.gba", 0x2D6070, 0xD4
 
-gMapData_82D6144:: @ 82D6144
+UnusedLayout_82D6144_Layout:: @ 82D6144
     .incbin "baserom.gba", 0x2D6144, 0x22C
 
-gMapData_CeladonCity_Gym:: @ 82D6370
+CeladonCity_Gym_Layout:: @ 82D6370
     .incbin "baserom.gba", 0x2D6370, 0x120
 
-gMapData_82D6490:: @ 82D6490
+UnusedLayout_82D6490_Layout:: @ 82D6490
     .incbin "baserom.gba", 0x2D6490, 0xEC
 
-gMapData_FiveIsland_ResortGorgeous_House:: @ 82D657C
+FiveIsland_ResortGorgeous_House_Layout:: @ 82D657C
     .incbin "baserom.gba", 0x2D657C, 0xD8
 
-gMapData_82D6654:: @ 82D6654
+UnusedLayout_82D6654_Layout:: @ 82D6654
     .incbin "baserom.gba", 0x2D6654, 0xD8
 
-gMapData_82D672C:: @ 82D672C
+UnusedLayout_82D672C_Layout:: @ 82D672C
     .incbin "baserom.gba", 0x2D672C, 0x2D8
 
-gMapData_FuchsiaCity_Gym:: @ 82D6A04
+FuchsiaCity_Gym_Layout:: @ 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
+House5_Layout:: @ shared
     .incbin "baserom.gba", 0x2D6AF0, 0x144
 
-gMapData_82D6C34:: @ 82D6C34
+UnusedLayout_82D6C34_Layout:: @ 82D6C34
     .incbin "baserom.gba", 0x2D6C34, 0x1F4
 
-gMapData_VermilionCity_Gym:: @ 82D6E28
+VermilionCity_Gym_Layout:: @ 82D6E28
     .incbin "baserom.gba", 0x2D6E28, 0x100
 
-gMapData_CeruleanCity_BikeShop:: @ 82D6F28
+CeruleanCity_BikeShop_Layout:: @ 82D6F28
     .incbin "baserom.gba", 0x2D6F28, 0x240
 
-gMapData_CeladonCity_GameCorner:: @ 82D7168
+CeladonCity_GameCorner_Layout:: @ 82D7168
     .incbin "baserom.gba", 0x2D7168, 0x1C4
 
-gMapData_PewterCity_Gym:: @ 82D732C
+PewterCity_Gym_Layout:: @ 82D732C
     .incbin "baserom.gba", 0x2D732C, 0xEC
 
-gMapData_FourIsland_LoreleisHouse:: @ 82D7418
+FourIsland_LoreleisHouse_Layout:: @ 82D7418
     .incbin "baserom.gba", 0x2D7418, 0xEC
 
-gMapData_ThreeIsland_House1:: @ 82D7504
+ThreeIsland_House1_Layout:: @ 82D7504
     .incbin "baserom.gba", 0x2D7504, 0xEC
 
-gMapData_82D75F0:: @ 82D75F0
+UnusedLayout_82D75F0_Layout:: @ 82D75F0
     .incbin "baserom.gba", 0x2D75F0, 0x84
 
-gMapData_82D7674:: @ 82D7674
+UnusedLayout_82D7674_Layout:: @ 82D7674
     .incbin "baserom.gba", 0x2D7674, 0x5D0
 
-gMapData_SaffronCity_Gym:: @ 82D7C44
+SaffronCity_Gym_Layout:: @ 82D7C44
     .incbin "baserom.gba", 0x2D7C44, 0x84
 
-gMapData_82D7CC8:: @ 82D7CC8
+UnusedLayout_82D7CC8_Layout:: @ 82D7CC8
     .incbin "baserom.gba", 0x2D7CC8, 0x600
 
-gMapData_CinnabarIsland_Gym:: @ 82D82C8
+CinnabarIsland_Gym_Layout:: @ 82D82C8
     .incbin "baserom.gba", 0x2D82C8, 0x3E4
 
-gMapData_ViridianCity_Gym:: @ 82D86AC
+ViridianCity_Gym_Layout:: @ 82D86AC
     .incbin "baserom.gba", 0x2D86AC, 0x21C
 
-gMapData_82D88C8:: @ 82D88C8
+UnusedLayout_82D88C8_Layout:: @ 82D88C8
     .incbin "baserom.gba", 0x2D88C8, 0x120
 
-gMapData_UnknownMap_00_00:: @ 82D89E8
+UnknownMap_00_00_Layout:: @ 82D89E8
     .incbin "baserom.gba", 0x2D89E8, 0xFC
 
-gMapData_UnknownMap_00_01:: @ 82D8AE4
+UnknownMap_00_01_Layout:: @ 82D8AE4
     .incbin "baserom.gba", 0x2D8AE4, 0x1B4
 
-gMapData_UnknownMap_00_02:: @ 82D8C98
+UnknownMap_00_02_Layout:: @ 82D8C98
     .incbin "baserom.gba", 0x2D8C98, 0x120
 
-gMapData_UnknownMap_00_03:: @ 82D8DB8
+UnknownMap_00_03_Layout:: @ 82D8DB8
     .incbin "baserom.gba", 0x2D8DB8, 0xC8
 
-gMapData_FuchsiaCity_SafariZone_Entrance:: @ 82D8E80
+FuchsiaCity_SafariZone_Entrance_Layout:: @ 82D8E80
     .incbin "baserom.gba", 0x2D8E80, 0xCA4
 
-gMapData_82D9B24:: @ 82D9B24
+UnusedLayout_82D9B24_Layout:: @ 82D9B24
     .incbin "baserom.gba", 0x2D9B24, 0xCA4
 
-gMapData_82DA7C8:: @ 82DA7C8
+UnusedLayout_82DA7C8_Layout:: @ 82DA7C8
     .incbin "baserom.gba", 0x2DA7C8, 0xCA4
 
-gMapData_82DB46C:: @ 82DB46C
+UnusedLayout_82DB46C_Layout:: @ 82DB46C
 	.incbin "baserom.gba", 0x2DB46C, 0x84
 
-gMapData_82DB4F0:: @ 82DB4F0
+UnusedLayout_82DB4F0_Layout:: @ 82DB4F0
 	.incbin "baserom.gba", 0x2DB4F0, 0x6F0
 
-gMapData_82DBBE0:: @ 82DBBE0
+UnusedLayout_82DBBE0_Layout:: @ 82DBBE0
 	.incbin "baserom.gba", 0x2DBBE0, 0x1F8
 
-gMapData_82DBDD8:: @ 82DBDD8
+UnusedLayout_82DBDD8_Layout:: @ 82DBDD8
 	.incbin "baserom.gba", 0x2DBDD8, 0x1E0
 
-gMapData_82DBFB8:: @ 82DBFB8
+UnusedLayout_82DBFB8_Layout:: @ 82DBFB8
 	.incbin "baserom.gba", 0x2DBFB8, 0x534
 
-gMapData_82DC4EC:: @ 82DC4EC
+UnusedLayout_82DC4EC_Layout:: @ 82DC4EC
 	.incbin "baserom.gba", 0x2DC4EC, 0x120
 
-gMapData_82DC60C:: @ 82DC60C
+UnusedLayout_82DC60C_Layout:: @ 82DC60C
 	.incbin "baserom.gba", 0x2DC60C, 0x120
 
-gMapData_82DC72C:: @ 82DC72C
+UnusedLayout_82DC72C_Layout:: @ 82DC72C
 	.incbin "baserom.gba", 0x2DC72C, 0x120
 
-gMapData_82DC84C:: @ 82DC84C
+UnusedLayout_82DC84C_Layout:: @ 82DC84C
 	.incbin "baserom.gba", 0x2DC84C, 0x224
 
-gMapData_82DCA70:: @ 82DCA70
+UnusedLayout_82DCA70_Layout:: @ 82DCA70
 	.incbin "baserom.gba", 0x2DCA70, 0xD4
 
-gMapData_82DCB44:: @ 82DCB44
+UnusedLayout_82DCB44_Layout:: @ 82DCB44
 	.incbin "baserom.gba", 0x2DCB44, 0xFC
 
-gMapData_82DCC40:: @ 82DCC40
+UnusedLayout_82DCC40_Layout:: @ 82DCC40
 	.incbin "baserom.gba", 0x2DCC40, 0x94
 
-gMapData_82DCCD4:: @ 82DCCD4
+UnusedLayout_82DCCD4_Layout:: @ 82DCCD4
 	.incbin "baserom.gba", 0x2DCCD4, 0x94
 
-gMapData_82DCD68:: @ 82DCD68
+UnusedLayout_82DCD68_Layout:: @ 82DCD68
 	.incbin "baserom.gba", 0x2DCD68, 0x94
 
-gMapData_82DCDFC:: @ 82DCDFC
+UnusedLayout_82DCDFC_Layout:: @ 82DCDFC
 	.incbin "baserom.gba", 0x2DCDFC, 0x104
 
-gMapData_82DCF00:: @ 82DCF00
+UnusedLayout_82DCF00_Layout:: @ 82DCF00
 	.incbin "baserom.gba", 0x2DCF00, 0x104
 
-gMapData_82DD004:: @ 82DD004
+UnusedLayout_82DD004_Layout:: @ 82DD004
 	.incbin "baserom.gba", 0x2DD004, 0xD8
 
-gMapData_82DD0DC:: @ 82DD0DC
+UnusedLayout_82DD0DC_Layout:: @ 82DD0DC
 	.incbin "baserom.gba", 0x2DD0DC, 0x3E4
 
-gMapData_PalletTown:: @ 82DD4C0
+PalletTown_Layout:: @ 82DD4C0
     .incbin "baserom.gba", 0x2DD4C0, 0xF24
 
-gMapData_ViridianCity:: @ 82DE3E4
+ViridianCity_Layout:: @ 82DE3E4
     .incbin "baserom.gba", 0x2DE3E4, 0xF24
 
-gMapData_PewterCity:: @ 82DF308
+PewterCity_Layout:: @ 82DF308
     .incbin "baserom.gba", 0x2DF308, 0xF24
 
-gMapData_CeruleanCity:: @ 82E022C
+CeruleanCity_Layout:: @ 82E022C
     .incbin "baserom.gba", 0x2E022C, 0x3E4
 
-gMapData_LavenderTown:: @ 82E0610
+LavenderTown_Layout:: @ 82E0610
     .incbin "baserom.gba", 0x2E0610, 0xF24
 
-gMapData_VermilionCity:: @ 82E1534
+VermilionCity_Layout:: @ 82E1534
     .incbin "baserom.gba", 0x2E1534, 0x12E4
 
-gMapData_CeladonCity:: @ 82E2818
+CeladonCity_Layout:: @ 82E2818
     .incbin "baserom.gba", 0x2E2818, 0xF24
 
-gMapData_FuchsiaCity:: @ 82E373C
+FuchsiaCity_Layout:: @ 82E373C
     .incbin "baserom.gba", 0x2E373C, 0x3E4
 
-gMapData_CinnabarIsland:: @ 82E3B20
+CinnabarIsland_Layout:: @ 82E3B20
     .incbin "baserom.gba", 0x2E3B20, 0x3E4
 
-gMapData_IndigoPlateau_Exterior:: @ 82E3F04
+IndigoPlateau_Exterior_Layout:: @ 82E3F04
     .incbin "baserom.gba", 0x2E3F04, 0xF24
 
-gMapData_SaffronCity:: @ 82E4E28
+SaffronCity_Layout:: @ 82E4E28
     .incbin "baserom.gba", 0x2E4E28, 0x7A4
 
-gMapData_Route1:: @ 82E55CC
-gMapData_82E55CC:: @ 82E55CC
+Route1_Layout:: @ shared
     .incbin "baserom.gba", 0x2E55CC, 0xF24
 
-gMapData_Route2:: @ 82E64F0
+Route2_Layout:: @ 82E64F0
     .incbin "baserom.gba", 0x2E64F0, 0xD44
 
-gMapData_Route3:: @ 82E7234
+Route3_Layout:: @ 82E7234
     .incbin "baserom.gba", 0x2E7234, 0x1104
 
-gMapData_Route4:: @ 82E8338
+Route4_Layout:: @ 82E8338
     .incbin "baserom.gba", 0x2E8338, 0xF24
 
-gMapData_Route5:: @ 82E925C
+Route5_Layout:: @ 82E925C
     .incbin "baserom.gba", 0x2E925C, 0x7A4
 
-gMapData_Route6:: @ 82E9A00
+Route6_Layout:: @ 82E9A00
     .incbin "baserom.gba", 0x2E9A00, 0x3E4
 
-gMapData_Route7:: @ 82E9DE4
+Route7_Layout:: @ 82E9DE4
     .incbin "baserom.gba", 0x2E9DE4, 0xB64
 
-gMapData_Route8:: @ 82EA948
+Route8_Layout:: @ 82EA948
     .incbin "baserom.gba", 0x2EA948, 0xB64
 
-gMapData_Route9:: @ 82EB4AC
+Route9_Layout:: @ 82EB4AC
     .incbin "baserom.gba", 0x2EB4AC, 0xF24
 
-gMapData_Route10:: @ 82EC3D0
+Route10_Layout:: @ 82EC3D0
     .incbin "baserom.gba", 0x2EC3D0, 0xB64
 
-gMapData_Route11:: @ 82ECF34
+Route11_Layout:: @ 82ECF34
     .incbin "baserom.gba", 0x2ECF34, 0x16A4
 
-gMapData_Route12:: @ 82EE5D8
+Route12_Layout:: @ 82EE5D8
     .incbin "baserom.gba", 0x2EE5D8, 0xB64
 
-gMapData_Route13:: @ 82EF13C
+Route13_Layout:: @ 82EF13C
     .incbin "baserom.gba", 0x2EF13C, 0xB64
 
-gMapData_Route14:: @ 82EFCA0
+Route14_Layout:: @ 82EFCA0
     .incbin "baserom.gba", 0x2EFCA0, 0xB64
 
-gMapData_Route15:: @ 82F0804
+Route15_Layout:: @ 82F0804
     .incbin "baserom.gba", 0x2F0804, 0x7A4
 
-gMapData_Route16:: @ 82F0FA8
+Route16_Layout:: @ 82F0FA8
     .incbin "baserom.gba", 0x2F0FA8, 0x1E24
 
-gMapData_Route17:: @ 82F2DCC
+Route17_Layout:: @ 82F2DCC
     .incbin "baserom.gba", 0x2F2DCC, 0x984
 
-gMapData_Route18:: @ 82F3750
+Route18_Layout:: @ 82F3750
     .incbin "baserom.gba", 0x2F3750, 0xB64
 
-gMapData_Route19:: @ 82F42B4
+Route19_Layout:: @ 82F42B4
     .incbin "baserom.gba", 0x2F42B4, 0x12E4
 
-gMapData_Route20:: @ 82F5598
+Route20_Layout:: @ 82F5598
     .incbin "baserom.gba", 0x2F5598, 0x984
 
-gMapData_Route21_North:: @ 82F5F1C
+Route21_North_Layout:: @ 82F5F1C
     .incbin "baserom.gba", 0x2F5F1C, 0x924
 
-gMapData_Route22:: @ 82F6840
+Route22_Layout:: @ 82F6840
     .incbin "baserom.gba", 0x2F6840, 0x1E24
 
-gMapData_Route23:: @ 82F8664
+Route23_Layout:: @ 82F8664
     .incbin "baserom.gba", 0x2F8664, 0x7A4
 
-gMapData_Route24:: @ 82F8E08
+Route24_Layout:: @ 82F8E08
     .incbin "baserom.gba", 0x2F8E08, 0xB64
 
-gMapData_Route25:: @ 82F996C
+Route25_Layout:: @ 82F996C
     .incbin "baserom.gba", 0x2F996C, 0xF24
 
-gMapData_MtMoon_1F:: @ 82FA890
+MtMoon_1F_Layout:: @ 82FA890
     .incbin "baserom.gba", 0x2FA890, 0xF74
 
-gMapData_MtMoon_B1F:: @ 82FB804
+MtMoon_B1F_Layout:: @ 82FB804
     .incbin "baserom.gba", 0x2FB804, 0xF24
 
-gMapData_MtMoon_B2F:: @ 82FC728
+MtMoon_B2F_Layout:: @ 82FC728
     .incbin "baserom.gba", 0x2FC728, 0x1D44
 
-gMapData_ViridianForest:: @ 82FE46C
+ViridianForest_Layout:: @ 82FE46C
     .incbin "baserom.gba", 0x2FE46C, 0x11A4
 
-gMapData_SSAnne_Exterior:: @ 82FF610
+SSAnne_Exterior_Layout:: @ 82FF610
     .incbin "baserom.gba", 0x2FF610, 0x53C
 
-gMapData_SSAnne_1F_Corridor:: @ 82FFB4C
+SSAnne_1F_Corridor_Layout:: @ 82FFB4C
     .incbin "baserom.gba", 0x2FFB4C, 0x464
 
-gMapData_SSAnne_2F_Corridor:: @ 82FFFB0
+SSAnne_2F_Corridor_Layout:: @ 82FFFB0
     .incbin "baserom.gba", 0x2FFFB0, 0x158
 
-gMapData_SSAnne_3F_Corridor:: @ 8300108
+SSAnne_3F_Corridor_Layout:: @ 8300108
     .incbin "baserom.gba", 0x300108, 0x168
 
-gMapData_SSAnne_B1F_Corridor:: @ 8300270
+SSAnne_B1F_Corridor_Layout:: @ 8300270
     .incbin "baserom.gba", 0x300270, 0x3B4
 
-gMapData_SSAnne_Deck:: @ 8300624
+SSAnne_Deck_Layout:: @ 8300624
     .incbin "baserom.gba", 0x300624, 0x3544
 
-gMapData_DiglettsCave_B1F:: @ 8303B68
+DiglettsCave_B1F_Layout:: @ 8303B68
     .incbin "baserom.gba", 0x303B68, 0x864
 
-gMapData_VictoryRoad_1F:: @ 83043CC
+VictoryRoad_1F_Layout:: @ 83043CC
     .incbin "baserom.gba", 0x3043CC, 0x8E8
 
-gMapData_VictoryRoad_2F:: @ 8304CB4
+VictoryRoad_2F_Layout:: @ 8304CB4
     .incbin "baserom.gba", 0x304CB4, 0x7E0
 
-gMapData_VictoryRoad_3F:: @ 8305494
+VictoryRoad_3F_Layout:: @ 8305494
     .incbin "baserom.gba", 0x305494, 0x794
 
-gMapData_RocketHideout_B1F:: @ 8305C28
+RocketHideout_B1F_Layout:: @ 8305C28
     .incbin "baserom.gba", 0x305C28, 0x5A4
 
-gMapData_RocketHideout_B2F:: @ 83061CC
+RocketHideout_B2F_Layout:: @ 83061CC
     .incbin "baserom.gba", 0x3061CC, 0x4C8
 
-gMapData_RocketHideout_B3F:: @ 8306694
+RocketHideout_B3F_Layout:: @ 8306694
     .incbin "baserom.gba", 0x306694, 0x504
 
-gMapData_RocketHideout_B4F:: @ 8306B98
+RocketHideout_B4F_Layout:: @ 8306B98
     .incbin "baserom.gba", 0x306B98, 0x654
 
-gMapData_SilphCo_1F:: @ 83071EC
+SilphCo_1F_Layout:: @ 83071EC
     .incbin "baserom.gba", 0x3071EC, 0x654
 
-gMapData_SilphCo_2F:: @ 8307840
+SilphCo_2F_Layout:: @ 8307840
     .incbin "baserom.gba", 0x307840, 0x654
 
-gMapData_SilphCo_3F:: @ 8307E94
+SilphCo_3F_Layout:: @ 8307E94
     .incbin "baserom.gba", 0x307E94, 0x654
 
-gMapData_SilphCo_4F:: @ 83084E8
+SilphCo_4F_Layout:: @ 83084E8
     .incbin "baserom.gba", 0x3084E8, 0x654
 
-gMapData_SilphCo_5F:: @ 8308B3C
+SilphCo_5F_Layout:: @ 8308B3C
     .incbin "baserom.gba", 0x308B3C, 0x4C0
 
-gMapData_SilphCo_6F:: @ 8308FFC
+SilphCo_6F_Layout:: @ 8308FFC
     .incbin "baserom.gba", 0x308FFC, 0x4C0
 
-gMapData_SilphCo_7F:: @ 83094BC
+SilphCo_7F_Layout:: @ 83094BC
     .incbin "baserom.gba", 0x3094BC, 0x4C0
 
-gMapData_SilphCo_8F:: @ 830997C
+SilphCo_8F_Layout:: @ 830997C
     .incbin "baserom.gba", 0x30997C, 0x4C0
 
-gMapData_SilphCo_9F:: @ 8309E3C
+SilphCo_9F_Layout:: @ 8309E3C
     .incbin "baserom.gba", 0x309E3C, 0x2AC
 
-gMapData_SilphCo_10F:: @ 830A0E8
+SilphCo_10F_Layout:: @ 830A0E8
     .incbin "baserom.gba", 0x30A0E8, 0x2CC
 
-gMapData_SilphCo_11F:: @ 830A3B4
+SilphCo_11F_Layout:: @ 830A3B4
     .incbin "baserom.gba", 0x30A3B4, 0xA88
 
-gMapData_PokemonMansion_1F:: @ 830AE3C
+PokemonMansion_1F_Layout:: @ 830AE3C
     .incbin "baserom.gba", 0x30AE3C, 0xB6C
 
-gMapData_PokemonMansion_2F:: @ 830B9A8
+PokemonMansion_2F_Layout:: @ 830B9A8
     .incbin "baserom.gba", 0x30B9A8, 0xA88
 
-gMapData_PokemonMansion_3F:: @ 830C430
+PokemonMansion_3F_Layout:: @ 830C430
     .incbin "baserom.gba", 0x30C430, 0xA88
 
-gMapData_PokemonMansion_B1F:: @ 830CEB8
+PokemonMansion_B1F_Layout:: @ 830CEB8
     .incbin "baserom.gba", 0x30CEB8, 0xE80
 
-gMapData_SafariZone_Center:: @ 830DD38
+SafariZone_Center_Layout:: @ 830DD38
     .incbin "baserom.gba", 0x30DD38, 0xEEC
 
-gMapData_SafariZone_East:: @ 830EC24
+SafariZone_East_Layout:: @ 830EC24
     .incbin "baserom.gba", 0x30EC24, 0x11F8
 
-gMapData_SafariZone_North:: @ 830FE1C
+SafariZone_North_Layout:: @ 830FE1C
     .incbin "baserom.gba", 0x30FE1C, 0xDA8
 
-gMapData_SafariZone_West:: @ 8310BC4
+SafariZone_West_Layout:: @ 8310BC4
     .incbin "baserom.gba", 0x310BC4, 0x754
 
-gMapData_CeruleanCave_1F:: @ 8311318
+CeruleanCave_1F_Layout:: @ 8311318
     .incbin "baserom.gba", 0x311318, 0x754
 
-gMapData_CeruleanCave_2F:: @ 8311A6C
+CeruleanCave_2F_Layout:: @ 8311A6C
     .incbin "baserom.gba", 0x311A6C, 0x754
 
-gMapData_CeruleanCave_B1F:: @ 83121C0
+CeruleanCave_B1F_Layout:: @ 83121C0
     .incbin "baserom.gba", 0x3121C0, 0xF24
 
-gMapData_RockTunnel_1F:: @ 83130E4
+RockTunnel_1F_Layout:: @ 83130E4
     .incbin "baserom.gba", 0x3130E4, 0xF24
 
-gMapData_RockTunnel_B1F:: @ 8314008
+RockTunnel_B1F_Layout:: @ 8314008
     .incbin "baserom.gba", 0x314008, 0x744
 
-gMapData_SeafoamIslands_1F:: @ 831474C
+SeafoamIslands_1F_Layout:: @ 831474C
     .incbin "baserom.gba", 0x31474C, 0x6F8
 
-gMapData_SeafoamIslands_B1F:: @ 8314E44
+SeafoamIslands_B1F_Layout:: @ 8314E44
     .incbin "baserom.gba", 0x314E44, 0x744
 
-gMapData_SeafoamIslands_B2F:: @ 8315588
+SeafoamIslands_B2F_Layout:: @ 8315588
     .incbin "baserom.gba", 0x315588, 0x744
 
-gMapData_SeafoamIslands_B3F:: @ 8315CCC
+SeafoamIslands_B3F_Layout:: @ 8315CCC
     .incbin "baserom.gba", 0x315CCC, 0x744
 
-gMapData_SeafoamIslands_B4F:: @ 8316410
+SeafoamIslands_B4F_Layout:: @ 8316410
     .incbin "baserom.gba", 0x316410, 0x3E4
 
-gMapData_PokemonTower_1F:: @ 83167F4
+PokemonTower_1F_Layout:: @ 83167F4
     .incbin "baserom.gba", 0x3167F4, 0x3E4
 
-gMapData_PokemonTower_2F:: @ 8316BD8
+PokemonTower_2F_Layout:: @ 8316BD8
     .incbin "baserom.gba", 0x316BD8, 0x3E4
 
-gMapData_PokemonTower_3F:: @ 8316FBC
+PokemonTower_3F_Layout:: @ 8316FBC
     .incbin "baserom.gba", 0x316FBC, 0x3E4
 
-gMapData_PokemonTower_4F:: @ 83173A0
+PokemonTower_4F_Layout:: @ 83173A0
     .incbin "baserom.gba", 0x3173A0, 0x3E4
 
-gMapData_PokemonTower_5F:: @ 8317784
+PokemonTower_5F_Layout:: @ 8317784
     .incbin "baserom.gba", 0x317784, 0x3E4
 
-gMapData_PokemonTower_6F:: @ 8317B68
+PokemonTower_6F_Layout:: @ 8317B68
     .incbin "baserom.gba", 0x317B68, 0x3E4
 
-gMapData_PokemonTower_7F:: @ 8317F4C
+PokemonTower_7F_Layout:: @ 8317F4C
     .incbin "baserom.gba", 0x317F4C, 0xF74
 
-gMapData_PowerPlant:: @ 8318EC0
+PowerPlant_Layout:: @ 8318EC0
     .incbin "baserom.gba", 0x318EC0, 0x170
 
-gMapData_Route25_SeaCottage:: @ 8319030
+Route25_SeaCottage_Layout:: @ 8319030
     .incbin "baserom.gba", 0x319030, 0x1E4
 
-gMapData_SSAnne_Kitchen:: @ 8319214
+SSAnne_Kitchen_Layout:: @ 8319214
     .incbin "baserom.gba", 0x319214, 0xD8
 
-gMapData_SSAnne_CaptainsOffice:: @ 83192EC
+SSAnne_CaptainsOffice_Layout:: @ 83192EC
     .incbin "baserom.gba", 0x3192EC, 0x128
 
-gMapData_UndergroundPath_NorthEntrance:: @ 8319414
-gMapData_UndergroundPath_SouthEntrance:: @ 8319414
-gMapData_UndergroundPath_WestEntrance:: @ 8319414
-gMapData_UndergroundPath_EastEntrance:: @ 8319414
+UndergroundPath_Entrance_Layout:: @ shared
     .incbin "baserom.gba", 0x319414, 0x484
 
-gMapData_UndergroundPath_EastWestTunnel:: @ 8319898
+UndergroundPath_EastWestTunnel_Layout:: @ 8319898
     .incbin "baserom.gba", 0x319898, 0x414
 
-gMapData_UndergroundPath_NorthSouthTunnel:: @ 8319CAC
+UndergroundPath_NorthSouthTunnel_Layout:: @ 8319CAC
     .incbin "baserom.gba", 0x319CAC, 0x144
 
-gMapData_Route12_NorthEntrance_1F:: @ 8319DF0
+Route12_NorthEntrance_1F_Layout:: @ 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
+SSAnne_Room1_Layout:: @ shared
     .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
+SSAnne_Room2_Layout:: @ shared
     .incbin "baserom.gba", 0x319F04, 0x6C
 
-gMapData_CeladonCity_DepartmentStore_Elevator:: @ 8319F70
+CeladonCity_DepartmentStore_Elevator_Layout:: @ 8319F70
     .incbin "baserom.gba", 0x319F70, 0x28C
 
-gMapData_PewterCity_Museum_1F:: @ 831A1FC
+PewterCity_Museum_1F_Layout:: @ 831A1FC
     .incbin "baserom.gba", 0x31A1FC, 0x1A0
 
-gMapData_PewterCity_Museum_2F:: @ 831A39C
+PewterCity_Museum_2F_Layout:: @ 831A39C
     .incbin "baserom.gba", 0x31A39C, 0xD8
 
-gMapData_CeruleanCity_House2:: @ 831A474
+CeruleanCity_House2_Layout:: @ 831A474
     .incbin "baserom.gba", 0x31A474, 0xEC
 
-gMapData_CeruleanCity_House1:: @ 831A560
+CeruleanCity_House1_Layout:: @ 831A560
     .incbin "baserom.gba", 0x31A560, 0x27C
 
-gMapData_CeladonCity_Condominiums_1F:: @ 831A7DC
+CeladonCity_Condominiums_1F_Layout:: @ 831A7DC
     .incbin "baserom.gba", 0x31A7DC, 0x27C
 
-gMapData_CeladonCity_Condominiums_2F:: @ 831AA58
+CeladonCity_Condominiums_2F_Layout:: @ 831AA58
     .incbin "baserom.gba", 0x31AA58, 0x27C
 
-gMapData_CeladonCity_Condominiums_3F:: @ 831ACD4
+CeladonCity_Condominiums_3F_Layout:: @ 831ACD4
     .incbin "baserom.gba", 0x31ACD4, 0x2A8
 
-gMapData_CeladonCity_Condominiums_Roof:: @ 831AF7C
+CeladonCity_Condominiums_Roof_Layout:: @ 831AF7C
     .incbin "baserom.gba", 0x31AF7C, 0xD8
 
-gMapData_CeladonCity_Condominiums_RoofRoom:: @ 831B054
+CeladonCity_Condominiums_RoofRoom_Layout:: @ 831B054
     .incbin "baserom.gba", 0x31B054, 0xD8
 
-gMapData_CeladonCity_GameCorner_PrizeRoom:: @ 831B12C
+CeladonCity_GameCorner_PrizeRoom_Layout:: @ 831B12C
     .incbin "baserom.gba", 0x31B12C, 0x170
 
-gMapData_CeladonCity_Restaurant:: @ 831B29C
+CeladonCity_Restaurant_Layout:: @ 831B29C
     .incbin "baserom.gba", 0x31B29C, 0x19C
 
-gMapData_CeladonCity_Hotel:: @ 831B438
+CeladonCity_Hotel_Layout:: @ 831B438
     .incbin "baserom.gba", 0x31B438, 0x1C4
 
-gMapData_CeladonCity_DepartmentStore_1F:: @ 831B5FC
+CeladonCity_DepartmentStore_1F_Layout:: @ 831B5FC
     .incbin "baserom.gba", 0x31B5FC, 0x1AC
 
-gMapData_CeladonCity_DepartmentStore_2F:: @ 831B7A8
+CeladonCity_DepartmentStore_2F_Layout:: @ 831B7A8
     .incbin "baserom.gba", 0x31B7A8, 0x1AC
 
-gMapData_CeladonCity_DepartmentStore_3F:: @ 831B954
+CeladonCity_DepartmentStore_3F_Layout:: @ 831B954
     .incbin "baserom.gba", 0x31B954, 0x1AC
 
-gMapData_CeladonCity_DepartmentStore_4F:: @ 831BB00
+CeladonCity_DepartmentStore_4F_Layout:: @ 831BB00
     .incbin "baserom.gba", 0x31BB00, 0x1AC
 
-gMapData_CeladonCity_DepartmentStore_5F:: @ 831BCAC
+CeladonCity_DepartmentStore_5F_Layout:: @ 831BCAC
     .incbin "baserom.gba", 0x31BCAC, 0x238
 
-gMapData_CeladonCity_DepartmentStore_Roof:: @ 831BEE4
+CeladonCity_DepartmentStore_Roof_Layout:: @ 831BEE4
     .incbin "baserom.gba", 0x31BEE4, 0x144
 
-gMapData_SafariZone_Building1:: @ 831C028
-gMapData_SafariZone_Building2:: @ 831C028
-gMapData_SafariZone_Building3:: @ 831C028
-gMapData_SafariZone_Building4:: @ 831C028
+SafariZone_Building_Layout:: @ shared
     .incbin "baserom.gba", 0x31C028, 0x144
 
-gMapData_SafariZone_SecretHouse:: @ 831C16C
+SafariZone_SecretHouse_Layout:: @ 831C16C
     .incbin "baserom.gba", 0x31C16C, 0x1DC
 
-gMapData_FuchsiaCity_ZooBuilding:: @ 831C348
+FuchsiaCity_ZooBuilding_Layout:: @ 831C348
     .incbin "baserom.gba", 0x31C348, 0x144
 
-gMapData_FuchsiaCity_Building1:: @ 831C48C
+FuchsiaCity_Building1_Layout:: @ 831C48C
     .incbin "baserom.gba", 0x31C48C, 0xEC
 
-gMapData_FuchsiaCity_House2:: @ 831C578
+FuchsiaCity_House2_Layout:: @ 831C578
     .incbin "baserom.gba", 0x31C578, 0x28C
 
-gMapData_CinnabarIsland_PokemonLab_Entrance:: @ 831C804
+CinnabarIsland_PokemonLab_Entrance_Layout:: @ 831C804
     .incbin "baserom.gba", 0x31C804, 0x170
 
-gMapData_CinnabarIsland_PokemonLab_Lounge:: @ 831C974
+CinnabarIsland_PokemonLab_Lounge_Layout:: @ 831C974
     .incbin "baserom.gba", 0x31C974, 0x170
 
-gMapData_CinnabarIsland_PokemonLab_ResearchRoom:: @ 831CAE4
+CinnabarIsland_PokemonLab_ResearchRoom_Layout:: @ 831CAE4
     .incbin "baserom.gba", 0x31CAE4, 0x170
 
-gMapData_CinnabarIsland_PokemonLab_ExperimentRoom:: @ 831CC54
+CinnabarIsland_PokemonLab_ExperimentRoom_Layout:: @ 831CC54
     .incbin "baserom.gba", 0x31CC54, 0x1C80
 
-gMapData_SaffronCity_Duplicate:: @ 831E8D4
+SaffronCity_Duplicate_Layout:: @ 831E8D4
     .incbin "baserom.gba", 0x31E8D4, 0xEC
 
-gMapData_Route5_SouthEntrance:: @ 831E9C0
-gMapData_Route6_NorthEntrance:: @ 831E9C0
+SaffronCity_NorthSouthEntrance_Layout:: @ shared
     .incbin "baserom.gba", 0x31E9C0, 0x110
 
-gMapData_Route7_EastEntrance:: @ 831EAD0
-gMapData_Route8_WestEntrance:: @ 831EAD0
+SaffronCity_EastWestEntrance_Layout:: @ shared
     .incbin "baserom.gba", 0x31EAD0, 0xC4
 
-gMapData_DiglettsCave_NorthEntrance:: @ 831EB94
+DiglettsCave_NorthEntrance_Layout:: @ 831EB94
     .incbin "baserom.gba", 0x31EB94, 0xC4
 
-gMapData_DiglettsCave_SouthEntrance:: @ 831EC58
+DiglettsCave_SouthEntrance_Layout:: @ 831EC58
     .incbin "baserom.gba", 0x31EC58, 0x3A8
 
-gMapData_IndigoPlateau_PokemonCenter_1F:: @ 831F000
+IndigoPlateau_PokemonCenter_1F_Layout:: @ 831F000
     .incbin "baserom.gba", 0x31F000, 0x178
 
-gMapData_PokemonLeague_LoreleisRoom:: @ 831F178
+PokemonLeague_LoreleisRoom_Layout:: @ 831F178
     .incbin "baserom.gba", 0x31F178, 0x178
 
-gMapData_PokemonLeague_BrunosRoom:: @ 831F2F0
+PokemonLeague_BrunosRoom_Layout:: @ 831F2F0
     .incbin "baserom.gba", 0x31F2F0, 0x178
 
-gMapData_PokemonLeague_AgathasRoom:: @ 831F468
+PokemonLeague_AgathasRoom_Layout:: @ 831F468
     .incbin "baserom.gba", 0x31F468, 0x564
 
-gMapData_PokemonLeague_LancesRoom:: @ 831F9CC
+PokemonLeague_LancesRoom_Layout:: @ 831F9CC
     .incbin "baserom.gba", 0x31F9CC, 0x22C
 
-gMapData_PokemonLeague_ChampionsRoom:: @ 831FBF8
+PokemonLeague_ChampionsRoom_Layout:: @ 831FBF8
     .incbin "baserom.gba", 0x31FBF8, 0x144
 
-gMapData_PokemonLeague_HallOfFame:: @ 831FD3C
+PokemonLeague_HallOfFame_Layout:: @ 831FD3C
     .incbin "baserom.gba", 0x31FD3C, 0x984
 
-gMapData_Route21_South:: @ 83206C0
+Route21_South_Layout:: @ 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
+Entrance_2F_Layout:: @ shared
     .incbin "baserom.gba", 0x320804, 0x18C
 
-gMapData_Route2_ViridianForest_SouthEntrance:: @ 8320990
-gMapData_Route2_EastBuilding:: @ 8320990
-gMapData_Route2_ViridianForest_NorthEntrance:: @ 8320990
+Route2_Entrance_Layout:: @ shared
     .incbin "baserom.gba", 0x320990, 0x18C
 
-gMapData_Route22_NorthEntrance:: @ 8320B1C
+Route22_NorthEntrance_Layout:: @ 8320B1C
     .incbin "baserom.gba", 0x320B1C, 0x1F8
 
-gMapData_Route16_NorthEntrance_1F:: @ 8320D14
+Route16_NorthEntrance_1F_Layout:: @ 8320D14
     .incbin "baserom.gba", 0x320D14, 0x15C
 
-gMapData_Route11_EastEntrance_1F:: @ 8320E70
-gMapData_Route15_WestEntrance_1F:: @ 8320E70
-gMapData_Route18_EastEntrance_1F:: @ 8320E70
+Entrance_1F_Layout:: @ shared
     .incbin "baserom.gba", 0x320E70, 0x6C
 
-gMapData_RocketHideout_Elevator:: @ 8320EDC
+RocketHideout_Elevator_Layout:: @ 8320EDC
     .incbin "baserom.gba", 0x320EDC, 0x128
 
-gMapData_SaffronCity_House1_1F:: @ 8321004
+SaffronCity_House1_1F_Layout:: @ 8321004
     .incbin "baserom.gba", 0x321004, 0xFC
 
-gMapData_SaffronCity_House1_2F:: @ 8321100
+SaffronCity_House1_2F_Layout:: @ 8321100
     .incbin "baserom.gba", 0x321100, 0x1C4
 
-gMapData_SaffronCity_Dojo:: @ 83212C4
+SaffronCity_Dojo_Layout:: @ 83212C4
     .incbin "baserom.gba", 0x3212C4, 0x6C
 
-gMapData_SilphCo_Elevator:: @ 8321330
+SilphCo_Elevator_Layout:: @ 8321330
     .incbin "baserom.gba", 0x321330, 0x3E4
 
-gMapData_OneIsland:: @ 8321714
+OneIsland_Layout:: @ 8321714
     .incbin "baserom.gba", 0x321714, 0x7A4
 
-gMapData_TwoIsland:: @ 8321EB8
+TwoIsland_Layout:: @ 8321EB8
     .incbin "baserom.gba", 0x321EB8, 0x7A4
 
-gMapData_ThreeIsland:: @ 832265C
+ThreeIsland_Layout:: @ 832265C
     .incbin "baserom.gba", 0x32265C, 0xF24
 
-gMapData_FourIsland:: @ 8323580
+FourIsland_Layout:: @ 8323580
     .incbin "baserom.gba", 0x323580, 0x3E4
 
-gMapData_FiveIsland:: @ 8323964
+FiveIsland_Layout:: @ 8323964
     .incbin "baserom.gba", 0x323964, 0x3E4
 
-gMapData_SevenIsland:: @ 8323D48
+SevenIsland_Layout:: @ 8323D48
     .incbin "baserom.gba", 0x323D48, 0x5C4
 
-gMapData_SixIsland:: @ 832430C
+SixIsland_Layout:: @ 832430C
     .incbin "baserom.gba", 0x32430C, 0x1A64
 
-gMapData_OneIsland_KindleRoad:: @ 8325D70
+OneIsland_KindleRoad_Layout:: @ 8325D70
     .incbin "baserom.gba", 0x325D70, 0x7A4
 
-gMapData_OneIsland_TreasureBeach:: @ 8326514
+OneIsland_TreasureBeach_Layout:: @ 8326514
     .incbin "baserom.gba", 0x326514, 0x7A4
 
-gMapData_TwoIsland_CapeBrink:: @ 8326CB8
+TwoIsland_CapeBrink_Layout:: @ 8326CB8
     .incbin "baserom.gba", 0x326CB8, 0xF24
 
-gMapData_ThreeIsland_BondBridge:: @ 8327BDC
+ThreeIsland_BondBridge_Layout:: @ 8327BDC
     .incbin "baserom.gba", 0x327BDC, 0x7A4
 
-gMapData_ThreeIsland_Port:: @ 8328380
+ThreeIsland_Port_Layout:: @ 8328380
     .incbin "baserom.gba", 0x328380, 0x28
 
-gMapData_UnknownMap_03_50:: @ 83283A8
+UnknownMap_03_50_Layout:: @ 83283A8
     .incbin "baserom.gba", 0x3283A8, 0x28
 
-gMapData_UnknownMap_03_51:: @ 83283D0
+UnknownMap_03_51_Layout:: @ 83283D0
     .incbin "baserom.gba", 0x3283D0, 0xD44
 
-gMapData_UnknownMap_03_52:: @ 8329114
+UnknownMap_03_52_Layout:: @ 8329114
     .incbin "baserom.gba", 0x329114, 0xB64
 
-gMapData_UnknownMap_03_53:: @ 8329C78
+UnknownMap_03_53_Layout:: @ 8329C78
     .incbin "baserom.gba", 0x329C78, 0xB64
 
-gMapData_FiveIsland_ResortGorgeous:: @ 832A7DC
+FiveIsland_ResortGorgeous_Layout:: @ 832A7DC
     .incbin "baserom.gba", 0x32A7DC, 0xB64
 
-gMapData_FiveIsland_WaterLabyrinth:: @ 832B340
+FiveIsland_WaterLabyrinth_Layout:: @ 832B340
     .incbin "baserom.gba", 0x32B340, 0x7A4
 
-gMapData_FiveIsland_Meadow:: @ 832BAE4
+FiveIsland_Meadow_Layout:: @ 832BAE4
     .incbin "baserom.gba", 0x32BAE4, 0xB64
 
-gMapData_FiveIsland_MemorialPillar:: @ 832C648
+FiveIsland_MemorialPillar_Layout:: @ 832C648
     .incbin "baserom.gba", 0x32C648, 0xF24
 
-gMapData_SixIsland_OutcastIsland:: @ 832D56C
+SixIsland_OutcastIsland_Layout:: @ 832D56C
     .incbin "baserom.gba", 0x32D56C, 0xB64
 
-gMapData_SixIsland_GreenPath:: @ 832E0D0
+SixIsland_GreenPath_Layout:: @ 832E0D0
     .incbin "baserom.gba", 0x32E0D0, 0x12E4
 
-gMapData_SixIsland_WaterPath:: @ 832F3B4
+SixIsland_WaterPath_Layout:: @ 832F3B4
     .incbin "baserom.gba", 0x32F3B4, 0xF24
 
-gMapData_SixIsland_RuinValley:: @ 83302D8
+SixIsland_RuinValley_Layout:: @ 83302D8
     .incbin "baserom.gba", 0x3302D8, 0x25A4
 
-gMapData_SevenIsland_TrainerTower:: @ 833287C
+SevenIsland_TrainerTower_Layout:: @ 833287C
     .incbin "baserom.gba", 0x33287C, 0x7A4
 
-gMapData_SevenIsland_SevaultCanyon_Entrance:: @ 8333020
+SevenIsland_SevaultCanyon_Entrance_Layout:: @ 8333020
     .incbin "baserom.gba", 0x333020, 0xF24
 
-gMapData_SevenIsland_SevaultCanyon:: @ 8333F44
+SevenIsland_SevaultCanyon_Layout:: @ 8333F44
     .incbin "baserom.gba", 0x333F44, 0x16A4
 
-gMapData_SevenIsland_TanobyRuins:: @ 83355E8
+SevenIsland_TanobyRuins_Layout:: @ 83355E8
 	.incbin "baserom.gba", 0x3355E8, 0xB64
 
-gMapData_833614C:: @ 833614C
+UnusedLayout_833614C_Layout:: @ 833614C
 	.incbin "baserom.gba", 0x33614C, 0x16A4
 
-gMapData_83377F0:: @ 83377F0
+UnusedLayout_83377F0_Layout:: @ 83377F0
 	.incbin "baserom.gba", 0x3377F0, 0xB64
 
-gMapData_8338354:: @ 8338354
+UnusedLayout_8338354_Layout:: @ 8338354
 	.incbin "baserom.gba", 0x338354, 0x3E4
 
-gMapData_8338738:: @ 8338738
+UnusedLayout_8338738_Layout:: @ 8338738
 	.incbin "baserom.gba", 0x338738, 0x18C
 
-gMapData_UnknownMap_00_04:: @ 83388C4
+UnknownMap_00_04_Layout:: @ 83388C4
     .incbin "baserom.gba", 0x3388C4, 0x19C
 
-gMapData_SaffronCity_PokemonTrainerFanClub:: @ 8338A60
+SaffronCity_PokemonTrainerFanClub_Layout:: @ 8338A60
 	.incbin "baserom.gba", 0x338A60, 0xEC
 
-gMapData_8338B4C:: @ 8338B4C
+UnusedLayout_8338B4C_Layout:: @ 8338B4C
 	.incbin "baserom.gba", 0x338B4C, 0xFC
 
-gMapData_SevenIsland_House_Room2:: @ 8338C48
+SevenIsland_House_Room2_Layout:: @ 8338C48
     .incbin "baserom.gba", 0x338C48, 0xD8
 
-gMapData_ViridianCity_House2:: @ 8338D20
+ViridianCity_House2_Layout:: @ 8338D20
 	.incbin "baserom.gba", 0x338D20, 0x170
 
-gMapData_8338E90:: @ 8338E90
+UnusedLayout_8338E90_Layout:: @ 8338E90
 	.incbin "baserom.gba", 0x338E90, 0x19C
 
-gMapData_833902C:: @ 833902C
+UnusedLayout_833902C_Layout:: @ 833902C
 	.incbin "baserom.gba", 0x33902C, 0x264
 
-gMapData_MtEmber_RubyPath_B4F:: @ 8339290
+MtEmber_RubyPath_B4F_Layout:: @ 8339290
     .incbin "baserom.gba", 0x339290, 0x1518
 
-gMapData_ThreeIsland_BerryForest:: @ 833A7A8
+ThreeIsland_BerryForest_Layout:: @ 833A7A8
     .incbin "baserom.gba", 0x33A7A8, 0x1C8
 
-gMapData_OneIsland_PokemonCenter_1F:: @ 833A970
+OneIsland_PokemonCenter_1F_Layout:: @ 833A970
     .incbin "baserom.gba", 0x33A970, 0x114
 
-gMapData_TwoIsland_JoyfulGameCorner:: @ 833AA84
+TwoIsland_JoyfulGameCorner_Layout:: @ 833AA84
     .incbin "baserom.gba", 0x33AA84, 0x144
 
-gMapData_VermilionCity_PokemonFanClub:: @ 833ABC8
+VermilionCity_PokemonFanClub_Layout:: @ 833ABC8
     .incbin "baserom.gba", 0x33ABC8, 0xFC
 
-gMapData_LavenderTown_VolunteerPokemonHouse:: @ 833ACC4
+LavenderTown_VolunteerPokemonHouse_Layout:: @ 833ACC4
     .incbin "baserom.gba", 0x33ACC4, 0xFC
 
-gMapData_Route5_PokemonDayCare:: @ 833ADC0
+Route5_PokemonDayCare_Layout:: @ 833ADC0
     .incbin "baserom.gba", 0x33ADC0, 0xEC
 
-gMapData_ViridianCity_House1:: @ 833AEAC
+ViridianCity_House1_Layout:: @ 833AEAC
     .incbin "baserom.gba", 0x33AEAC, 0xFC
 
-gMapData_FourIsland_PokemonDayCare:: @ 833AFA8
+FourIsland_PokemonDayCare_Layout:: @ 833AFA8
 	.incbin "baserom.gba", 0x33AFA8, 0x744
 
-gMapData_833B6EC:: @ 833B6EC
+UnusedLayout_833B6EC_Layout:: @ 833B6EC
 	.incbin "baserom.gba", 0x33B6EC, 0x744
 
-gMapData_833BE30:: @ 833BE30
+UnusedLayout_833BE30_Layout:: @ 833BE30
 	.incbin "baserom.gba", 0x33BE30, 0x1830
 
-gMapData_MtEmber_Exterior:: @ 833D660
+MtEmber_Exterior_Layout:: @ 833D660
     .incbin "baserom.gba", 0x33D660, 0x368
 
-gMapData_MtEmber_Summit:: @ 833D9C8
+MtEmber_Summit_Layout:: @ 833D9C8
     .incbin "baserom.gba", 0x33D9C8, 0x240
 
-gMapData_MtEmber_SummitPath_1F:: @ 833DC08
+MtEmber_SummitPath_1F_Layout:: @ 833DC08
     .incbin "baserom.gba", 0x33DC08, 0x1164
 
-gMapData_MtEmber_SummitPath_2F:: @ 833ED6C
+MtEmber_SummitPath_2F_Layout:: @ 833ED6C
     .incbin "baserom.gba", 0x33ED6C, 0x170
 
-gMapData_MtEmber_SummitPath_3F:: @ 833EEDC
+MtEmber_SummitPath_3F_Layout:: @ 833EEDC
     .incbin "baserom.gba", 0x33EEDC, 0x428
 
-gMapData_SSAnne_Kitchen3:: @ 833F304
+SSAnne_Kitchen3_Layout:: @ 833F304
     .incbin "baserom.gba", 0x33F304, 0x220
 
-gMapData_MtEmber_RubyPath_B1F:: @ 833F524
+MtEmber_RubyPath_B1F_Layout:: @ 833F524
     .incbin "baserom.gba", 0x33F524, 0x184
 
-gMapData_MtEmber_RubyPath_B2F:: @ 833F6A8
+MtEmber_RubyPath_B2F_Layout:: @ 833F6A8
     .incbin "baserom.gba", 0x33F6A8, 0x5B8
 
-gMapData_MtEmber_RubyPath_B3F:: @ 833FC60
+MtEmber_RubyPath_B3F_Layout:: @ 833FC60
     .incbin "baserom.gba", 0x33FC60, 0x78
 
-gMapData_MtEmber_RubyPath_B1F_Stairs:: @ 833FCD8
+MtEmber_RubyPath_B1F_Stairs_Layout:: @ 833FCD8
     .incbin "baserom.gba", 0x33FCD8, 0x84
 
-gMapData_MtEmber_RubyPath_B2F_Stairs:: @ 833FD5C
+MtEmber_RubyPath_B2F_Stairs_Layout:: @ 833FD5C
     .incbin "baserom.gba", 0x33FD5C, 0x204
 
-gMapData_MtEmber_RubyPath_B5F:: @ 833FF60
+MtEmber_RubyPath_B5F_Layout:: @ 833FF60
     .incbin "baserom.gba", 0x33FF60, 0x644
 
-gMapData_SSAnne_CaptainsOffice4:: @ 83405A4
+SSAnne_CaptainsOffice4_Layout:: @ 83405A4
     .incbin "baserom.gba", 0x3405A4, 0x894
 
-gMapData_FourIsland_IcefallCave_Entrance:: @ 8340E38
+FourIsland_IcefallCave_Entrance_Layout:: @ 8340E38
     .incbin "baserom.gba", 0x340E38, 0x344
 
-gMapData_FourIsland_IcefallCave_1F:: @ 834117C
+FourIsland_IcefallCave_1F_Layout:: @ 834117C
     .incbin "baserom.gba", 0x34117C, 0x3E4
 
-gMapData_SSAnne_CaptainsOffice2:: @ 8341560
+SSAnne_CaptainsOffice2_Layout:: @ 8341560
     .incbin "baserom.gba", 0x341560, 0x538
 
-gMapData_SSAnne_CaptainsOffice3:: @ 8341A98
+SSAnne_CaptainsOffice3_Layout:: @ 8341A98
     .incbin "baserom.gba", 0x341A98, 0x2AC
 
-gMapData_SevenIsland_TrainerTower_Lobby:: @ 8341D44
+SevenIsland_TrainerTower_Lobby_Layout:: @ 8341D44
     .incbin "baserom.gba", 0x341D44, 0x288
 
-gMapData_SevenIsland_TrainerTower_1F:: @ 8341FCC
+SevenIsland_TrainerTower_1F_Layout:: @ 8341FCC
     .incbin "baserom.gba", 0x341FCC, 0x288
 
-gMapData_SevenIsland_TrainerTower_2F:: @ 8342254
+SevenIsland_TrainerTower_2F_Layout:: @ 8342254
     .incbin "baserom.gba", 0x342254, 0x288
 
-gMapData_SevenIsland_TrainerTower_3F:: @ 83424DC
+SevenIsland_TrainerTower_3F_Layout:: @ 83424DC
     .incbin "baserom.gba", 0x3424DC, 0x288
 
-gMapData_SevenIsland_TrainerTower_4F:: @ 8342764
+SevenIsland_TrainerTower_4F_Layout:: @ 8342764
     .incbin "baserom.gba", 0x342764, 0x288
 
-gMapData_SevenIsland_TrainerTower_5F:: @ 83429EC
+SevenIsland_TrainerTower_5F_Layout:: @ 83429EC
     .incbin "baserom.gba", 0x3429EC, 0x288
 
-gMapData_SevenIsland_TrainerTower_6F:: @ 8342C74
+SevenIsland_TrainerTower_6F_Layout:: @ 8342C74
     .incbin "baserom.gba", 0x342C74, 0x288
 
-gMapData_SevenIsland_TrainerTower_7F:: @ 8342EFC
+SevenIsland_TrainerTower_7F_Layout:: @ 8342EFC
     .incbin "baserom.gba", 0x342EFC, 0x288
 
-gMapData_SevenIsland_TrainerTower_8F:: @ 8343184
+SevenIsland_TrainerTower_8F_Layout:: @ 8343184
     .incbin "baserom.gba", 0x343184, 0x264
 
-gMapData_SevenIsland_TrainerTower_Roof:: @ 83433E8
+SevenIsland_TrainerTower_Roof_Layout:: @ 83433E8
     .incbin "baserom.gba", 0x3433E8, 0x6C
 
-gMapData_SevenIsland_TrainerTower_Elevator:: @ 8343454
+SevenIsland_TrainerTower_Elevator_Layout:: @ 8343454
     .incbin "baserom.gba", 0x343454, 0xEC
 
-gMapData_CeruleanCity_House5:: @ 8343540
+CeruleanCity_House5_Layout:: @ 8343540
     .incbin "baserom.gba", 0x343540, 0x184
 
-gMapData_SSAnne_CaptainsOffice5:: @ 83436C4
+SSAnne_CaptainsOffice5_Layout:: @ 83436C4
     .incbin "baserom.gba", 0x3436C4, 0x144
 
-gMapData_SixIsland_DottedHole_B1F:: @ 8343808
+SixIsland_DottedHole_B1F_Layout:: @ 8343808
     .incbin "baserom.gba", 0x343808, 0x144
 
-gMapData_SixIsland_DottedHole_B2F:: @ 834394C
+SixIsland_DottedHole_B2F_Layout:: @ 834394C
     .incbin "baserom.gba", 0x34394C, 0x144
 
-gMapData_SixIsland_DottedHole_B3F:: @ 8343A90
+SixIsland_DottedHole_B3F_Layout:: @ 8343A90
     .incbin "baserom.gba", 0x343A90, 0x144
 
-gMapData_SSAnne_CaptainsOffice9:: @ 8343BD4
+SSAnne_CaptainsOffice9_Layout:: @ 8343BD4
     .incbin "baserom.gba", 0x343BD4, 0x204
 
-gMapData_SixIsland_DottedHole_SapphireRoom:: @ 8343DD8
+SixIsland_DottedHole_SapphireRoom_Layout:: @ 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
+Island_Harbor_Layout:: @ shared
     .incbin "baserom.gba", 0x343FB8, 0x150
 
-gMapData_OneIsland_PokemonCenter_2F:: @ 8344108
+OneIsland_PokemonCenter_2F_Layout:: @ 8344108
     .incbin "baserom.gba", 0x344108, 0xF28
 
-gMapData_SSAnne_1F_Room11:: @ 8345030
+SSAnne_1F_Room11_Layout:: @ 8345030
     .incbin "baserom.gba", 0x345030, 0x1C8
 
-gMapData_ThreeIsland_DunsparceTunnel:: @ 83451F8
+ThreeIsland_DunsparceTunnel_Layout:: @ 83451F8
 	.incbin "baserom.gba", 0x3451F8, 0x1C8
 
-gMapData_83453C0:: @ 83453C0
+UnusedLayout_83453C0_Layout:: @ 83453C0
 	.incbin "baserom.gba", 0x3453C0, 0x118
 
-gMapData_FiveIsland_LostCave_Entrance:: @ 83454D8
+FiveIsland_LostCave_Entrance_Layout:: @ 83454D8
     .incbin "baserom.gba", 0x3454D8, 0x118
 
-gMapData_FiveIsland_LostCave_Room1:: @ 83455F0
+FiveIsland_LostCave_Room1_Layout:: @ 83455F0
     .incbin "baserom.gba", 0x3455F0, 0x118
 
-gMapData_FiveIsland_LostCave_Room2:: @ 8345708
+FiveIsland_LostCave_Room2_Layout:: @ 8345708
     .incbin "baserom.gba", 0x345708, 0x118
 
-gMapData_FiveIsland_LostCave_Room3:: @ 8345820
+FiveIsland_LostCave_Room3_Layout:: @ 8345820
     .incbin "baserom.gba", 0x345820, 0x118
 
-gMapData_FiveIsland_LostCave_Room4:: @ 8345938
+FiveIsland_LostCave_Room4_Layout:: @ 8345938
     .incbin "baserom.gba", 0x345938, 0x118
 
-gMapData_FiveIsland_LostCave_Room5:: @ 8345A50
+FiveIsland_LostCave_Room5_Layout:: @ 8345A50
     .incbin "baserom.gba", 0x345A50, 0x118
 
-gMapData_FiveIsland_LostCave_Room6:: @ 8345B68
+FiveIsland_LostCave_Room6_Layout:: @ 8345B68
     .incbin "baserom.gba", 0x345B68, 0x118
 
-gMapData_FiveIsland_LostCave_Room7:: @ 8345C80
+FiveIsland_LostCave_Room7_Layout:: @ 8345C80
     .incbin "baserom.gba", 0x345C80, 0x118
 
-gMapData_FiveIsland_LostCave_Room8:: @ 8345D98
+FiveIsland_LostCave_Room8_Layout:: @ 8345D98
     .incbin "baserom.gba", 0x345D98, 0x118
 
-gMapData_FiveIsland_LostCave_Room9:: @ 8345EB0
+FiveIsland_LostCave_Room9_Layout:: @ 8345EB0
     .incbin "baserom.gba", 0x345EB0, 0x118
 
-gMapData_FiveIsland_LostCave_Room10:: @ 8345FC8
+FiveIsland_LostCave_Room10_Layout:: @ 8345FC8
     .incbin "baserom.gba", 0x345FC8, 0x118
 
-gMapData_FiveIsland_LostCave_Room11:: @ 83460E0
+FiveIsland_LostCave_Room11_Layout:: @ 83460E0
     .incbin "baserom.gba", 0x3460E0, 0x118
 
-gMapData_FiveIsland_LostCave_Room12:: @ 83461F8
+FiveIsland_LostCave_Room12_Layout:: @ 83461F8
     .incbin "baserom.gba", 0x3461F8, 0x118
 
-gMapData_FiveIsland_LostCave_Room13:: @ 8346310
+FiveIsland_LostCave_Room13_Layout:: @ 8346310
     .incbin "baserom.gba", 0x346310, 0x118
 
-gMapData_FiveIsland_LostCave_Room14:: @ 8346428
+FiveIsland_LostCave_Room14_Layout:: @ 8346428
     .incbin "baserom.gba", 0x346428, 0x334
 
-gMapData_SevenIsland_TanobyRuins_MoneanChamber:: @ 834675C
+SevenIsland_TanobyRuins_MoneanChamber_Layout:: @ 834675C
     .incbin "baserom.gba", 0x34675C, 0x334
 
-gMapData_SevenIsland_TanobyRuins_LiptooChamber:: @ 8346A90
+SevenIsland_TanobyRuins_LiptooChamber_Layout:: @ 8346A90
     .incbin "baserom.gba", 0x346A90, 0x334
 
-gMapData_SevenIsland_TanobyRuins_WeepthChamber:: @ 8346DC4
+SevenIsland_TanobyRuins_WeepthChamber_Layout:: @ 8346DC4
     .incbin "baserom.gba", 0x346DC4, 0x334
 
-gMapData_SevenIsland_TanobyRuins_DilfordChamber:: @ 83470F8
+SevenIsland_TanobyRuins_DilfordChamber_Layout:: @ 83470F8
     .incbin "baserom.gba", 0x3470F8, 0x334
 
-gMapData_SevenIsland_TanobyRuins_ScufibChamber:: @ 834742C
+SevenIsland_TanobyRuins_ScufibChamber_Layout:: @ 834742C
     .incbin "baserom.gba", 0x34742C, 0x624
 
-gMapData_SSAnne_1F_Room12:: @ 8347A50
+SSAnne_1F_Room12_Layout:: @ 8347A50
     .incbin "baserom.gba", 0x347A50, 0x204
 
-gMapData_SevenIsland_SeavaultCanyon_TanobyKey:: @ 8347C54
+SevenIsland_SeavaultCanyon_TanobyKey_Layout:: @ 8347C54
     .incbin "baserom.gba", 0x347C54, 0x72C
 
-gMapData_BirthIsland_Exterior:: @ 8348380
+BirthIsland_Exterior_Layout:: @ 8348380
     .incbin "baserom.gba", 0x348380, 0x3BC
 
-gMapData_NavelRock_Exterior:: @ 834873C
+NavelRock_Exterior_Layout:: @ 834873C
     .incbin "baserom.gba", 0x34873C, 0x398
 
-gMapData_NavelRock_1F:: @ 8348AD4
+NavelRock_1F_Layout:: @ 8348AD4
     .incbin "baserom.gba", 0x348AD4, 0x3DC
 
-gMapData_NavelRock_Summit:: @ 8348EB0
+NavelRock_Summit_Layout:: @ 8348EB0
     .incbin "baserom.gba", 0x348EB0, 0x3EC
 
-gMapData_NavelRock_Base:: @ 834929C
+NavelRock_Base_Layout:: @ 834929C
     .incbin "baserom.gba", 0x34929C, 0x88
 
-gMapData_NavelRock_SummitPath_2F:: @ 8349324
+NavelRock_SummitPath_2F_Layout:: @ 8349324
     .incbin "baserom.gba", 0x349324, 0x88
 
-gMapData_NavelRock_SummitPath_3F:: @ 83493AC
+NavelRock_SummitPath_3F_Layout:: @ 83493AC
     .incbin "baserom.gba", 0x3493AC, 0x88
 
-gMapData_NavelRock_SummitPath_4F:: @ 8349434
+NavelRock_SummitPath_4F_Layout:: @ 8349434
     .incbin "baserom.gba", 0x349434, 0x88
 
-gMapData_NavelRock_SummitPath_5F:: @ 83494BC
+NavelRock_SummitPath_5F_Layout:: @ 83494BC
     .incbin "baserom.gba", 0x3494BC, 0x88
 
-gMapData_NavelRock_BasePath_B1F:: @ 8349544
+NavelRock_BasePath_B1F_Layout:: @ 8349544
     .incbin "baserom.gba", 0x349544, 0x88
 
-gMapData_NavelRock_BasePath_B2F:: @ 83495CC
+NavelRock_BasePath_B2F_Layout:: @ 83495CC
     .incbin "baserom.gba", 0x3495CC, 0x88
 
-gMapData_NavelRock_BasePath_B3F:: @ 8349654
+NavelRock_BasePath_B3F_Layout:: @ 8349654
     .incbin "baserom.gba", 0x349654, 0x88
 
-gMapData_NavelRock_BasePath_B4F:: @ 83496DC
+NavelRock_BasePath_B4F_Layout:: @ 83496DC
     .incbin "baserom.gba", 0x3496DC, 0x88
 
-gMapData_NavelRock_BasePath_B5F:: @ 8349764
+NavelRock_BasePath_B5F_Layout:: @ 8349764
     .incbin "baserom.gba", 0x349764, 0x88
 
-gMapData_NavelRock_BasePath_B6F:: @ 83497EC
+NavelRock_BasePath_B6F_Layout:: @ 83497EC
     .incbin "baserom.gba", 0x3497EC, 0x88
 
-gMapData_NavelRock_BasePath_B7F:: @ 8349874
+NavelRock_BasePath_B7F_Layout:: @ 8349874
     .incbin "baserom.gba", 0x349874, 0x88
 
-gMapData_NavelRock_BasePath_B8F:: @ 83498FC
+NavelRock_BasePath_B8F_Layout:: @ 83498FC
     .incbin "baserom.gba", 0x3498FC, 0x88
 
-gMapData_NavelRock_BasePath_B9F:: @ 8349984
+NavelRock_BasePath_B9F_Layout:: @ 8349984
     .incbin "baserom.gba", 0x349984, 0x88
 
-gMapData_NavelRock_BasePath_B10F:: @ 8349A0C
+NavelRock_BasePath_B10F_Layout:: @ 8349A0C
     .incbin "baserom.gba", 0x349A0C, 0x88
 
-gMapData_NavelRock_BasePath_B11F:: @ 8349A94
+NavelRock_BasePath_B11F_Layout:: @ 8349A94
     .incbin "baserom.gba", 0x349A94, 0x334
 
-gMapData_SevenIsland_TanobyRuins_RixyChamber:: @ 8349DC8
+SevenIsland_TanobyRuins_RixyChamber_Layout:: @ 8349DC8
     .incbin "baserom.gba", 0x349DC8, 0x334
 
-gMapData_SevenIsland_TanobyRuins_ViapoisChamber:: @ 834A0FC
+SevenIsland_TanobyRuins_ViapoisChamber_Layout:: @ 834A0FC
     .incbin "baserom.gba", 0x34A0FC, 0x114
 
-gMapData_NavelRock_B1F:: @ 834A210
+NavelRock_B1F_Layout:: @ 834A210
     .incbin "baserom.gba", 0x34A210, 0x1794
 
-gMapData_NavelRock_Fork:: @ 834B9A4
+NavelRock_Fork_Layout:: @ 834B9A4
 	.incbin "baserom.gba", 0x34B9A4, 0x288
 
-gMapData_834BC2C:: @ 834BC2C
+UnusedLayout_834BC2C_Layout:: @ 834BC2C
 	.incbin "baserom.gba", 0x34BC2C, 0x288
 
-gMapData_834BEB4:: @ 834BEB4
+UnusedLayout_834BEB4_Layout:: @ 834BEB4
 	.incbin "baserom.gba", 0x34BEB4, 0x288
 
-gMapData_834C13C:: @ 834C13C
+UnusedLayout_834C13C_Layout:: @ 834C13C
 	.incbin "baserom.gba", 0x34C13C, 0x288
 
-gMapData_834C3C4:: @ 834C3C4
+UnusedLayout_834C3C4_Layout:: @ 834C3C4
 	.incbin "baserom.gba", 0x34C3C4, 0x288
 
-gMapData_834C64C:: @ 834C64C
+UnusedLayout_834C64C_Layout:: @ 834C64C
 	.incbin "baserom.gba", 0x34C64C, 0x288
 
-gMapData_834C8D4:: @ 834C8D4
+UnusedLayout_834C8D4_Layout:: @ 834C8D4
 	.incbin "baserom.gba", 0x34C8D4, 0x288
 
-gMapData_834CB5C:: @ 834CB5C
+UnusedLayout_834CB5C_Layout:: @ 834CB5C
 	.incbin "baserom.gba", 0x34CB5C, 0x288
 
-gMapData_834CDE4:: @ 834CDE4
+UnusedLayout_834CDE4_Layout:: @ 834CDE4
 	.incbin "baserom.gba", 0x34CDE4, 0x288
 
-gMapData_834D06C:: @ 834D06C
+UnusedLayout_834D06C_Layout:: @ 834D06C
 	.incbin "baserom.gba", 0x34D06C, 0x288
 
-gMapData_834D2F4:: @ 834D2F4
+UnusedLayout_834D2F4_Layout:: @ 834D2F4
 	.incbin "baserom.gba", 0x34D2F4, 0x288
 
-gMapData_834D57C:: @ 834D57C
+UnusedLayout_834D57C_Layout:: @ 834D57C
 	.incbin "baserom.gba", 0x34D57C, 0x288
 
-gMapData_834D804:: @ 834D804
+UnusedLayout_834D804_Layout:: @ 834D804
 	.incbin "baserom.gba", 0x34D804, 0x288
 
-gMapData_834DA8C:: @ 834DA8C
+UnusedLayout_834DA8C_Layout:: @ 834DA8C
 	.incbin "baserom.gba", 0x34DA8C, 0x288
 
-gMapData_834DD14:: @ 834DD14
+UnusedLayout_834DD14_Layout:: @ 834DD14
 	.incbin "baserom.gba", 0x34DD14, 0x288
 
-gMapData_834DF9C:: @ 834DF9C
+UnusedLayout_834DF9C_Layout:: @ 834DF9C
 	.incbin "baserom.gba", 0x34DF9C, 0x288
 
-gMapData_834E224:: @ 834E224
+UnusedLayout_834E224_Layout:: @ 834E224
 	.incbin "baserom.gba", 0x34E224, 0xEC
 
-gMapData_SevenIsland_House_Room1:: @ 834E310
+SevenIsland_House_Room1_Layout:: @ 834E310
     .incbin "baserom.gba", 0x34E310, 0x860
 
-gMapData_OneIsland_KindleRoad_EmberSpa:: @ 834EB70
+OneIsland_KindleRoad_EmberSpa_Layout:: @ 834EB70
     .incbin "baserom.gba", 0x34EB70, 0x1C
diff --git a/data/layouts/layouts_table.inc b/data/layouts/layouts_table.inc
index 24b5cf748..f622d56dd 100644
--- a/data/layouts/layouts_table.inc
+++ b/data/layouts/layouts_table.inc
@@ -1,42 +1,42 @@
 	.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 PalletTown_PlayersHouse_1F_Layout
+	.4byte PalletTown_PlayersHouse_2F_Layout
+	.4byte PalletTown_GarysHouse_Layout
+	.4byte UnusedLayout_82D54D8_Layout
+	.4byte PalletTown_ProfessorOaksLab_Layout
+	.4byte House1_Layout
+	.4byte House2_Layout
+	.4byte PokemonCenter_1F_Layout
+	.4byte PokemonCenter_2F_Layout
+	.4byte Mart_Layout
+	.4byte House3_Layout
+	.4byte CeruleanCity_Gym_Layout
+	.4byte House4_Layout
+	.4byte UnusedLayout_82D6144_Layout
+	.4byte CeladonCity_Gym_Layout
+	.4byte UnusedLayout_82D6490_Layout
+	.4byte FiveIsland_ResortGorgeous_House_Layout
+	.4byte UnusedLayout_82D6654_Layout
+	.4byte UnusedLayout_82D672C_Layout
+	.4byte FuchsiaCity_Gym_Layout
+	.4byte House5_Layout
 	.4byte NULL
 	.4byte NULL
-	.4byte gMapData_82D6C34
-	.4byte gMapData_VermilionCity_Gym
-	.4byte gMapData_CeruleanCity_BikeShop
-	.4byte gMapData_CeladonCity_GameCorner
-	.4byte gMapData_PewterCity_Gym
+	.4byte UnusedLayout_82D6C34_Layout
+	.4byte VermilionCity_Gym_Layout
+	.4byte CeruleanCity_BikeShop_Layout
+	.4byte CeladonCity_GameCorner_Layout
+	.4byte PewterCity_Gym_Layout
 	.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 FourIsland_LoreleisHouse_Layout
+	.4byte ThreeIsland_House1_Layout
+	.4byte UnusedLayout_82D75F0_Layout
+	.4byte UnusedLayout_82D7674_Layout
+	.4byte SaffronCity_Gym_Layout
+	.4byte UnusedLayout_82D7CC8_Layout
+	.4byte CinnabarIsland_Gym_Layout
+	.4byte ViridianCity_Gym_Layout
 	.4byte NULL
 	.4byte NULL
 	.4byte NULL
@@ -45,341 +45,341 @@ gMapLayouts:: @ 834EB8C
 	.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 UnusedLayout_82D88C8_Layout
+	.4byte UnknownMap_00_00_Layout
+	.4byte UnknownMap_00_01_Layout
+	.4byte UnknownMap_00_02_Layout
+	.4byte UnknownMap_00_03_Layout
+	.4byte FuchsiaCity_SafariZone_Entrance_Layout
+	.4byte UnusedLayout_82D9B24_Layout
+	.4byte UnusedLayout_82DA7C8_Layout
+	.4byte UnusedLayout_82DB46C_Layout
+	.4byte UnusedLayout_82DB4F0_Layout
 	.4byte NULL
-	.4byte gMapData_82DBBE0
+	.4byte UnusedLayout_82DBBE0_Layout
 	.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 UnusedLayout_82DBDD8_Layout
+	.4byte UnusedLayout_82DBFB8_Layout
+	.4byte UnusedLayout_82DC4EC_Layout
+	.4byte UnusedLayout_82DC60C_Layout
+	.4byte UnusedLayout_82DC72C_Layout
+	.4byte UnusedLayout_82DC84C_Layout
+	.4byte UnusedLayout_82DCA70_Layout
+	.4byte UnusedLayout_82DCB44_Layout
+	.4byte UnusedLayout_82DCC40_Layout
+	.4byte UnusedLayout_82DCCD4_Layout
+	.4byte UnusedLayout_82DCD68_Layout
+	.4byte UnusedLayout_82DCDFC_Layout
+	.4byte UnusedLayout_82DCF00_Layout
+	.4byte UnusedLayout_82DD004_Layout
 	.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 UnusedLayout_82DD0DC_Layout
+	.4byte PalletTown_Layout
+	.4byte ViridianCity_Layout
+	.4byte PewterCity_Layout
+	.4byte CeruleanCity_Layout
+	.4byte LavenderTown_Layout
+	.4byte VermilionCity_Layout
+	.4byte CeladonCity_Layout
+	.4byte FuchsiaCity_Layout
+	.4byte CinnabarIsland_Layout
+	.4byte IndigoPlateau_Exterior_Layout
+	.4byte SaffronCity_Layout
+	.4byte Route1_Layout
+	.4byte Route2_Layout
+	.4byte Route3_Layout
+	.4byte Route4_Layout
+	.4byte Route5_Layout
+	.4byte Route6_Layout
+	.4byte Route7_Layout
+	.4byte Route8_Layout
+	.4byte Route9_Layout
+	.4byte Route10_Layout
+	.4byte Route11_Layout
+	.4byte Route12_Layout
+	.4byte Route13_Layout
+	.4byte Route14_Layout
+	.4byte Route15_Layout
+	.4byte Route16_Layout
+	.4byte Route17_Layout
+	.4byte Route18_Layout
+	.4byte Route19_Layout
+	.4byte Route20_Layout
+	.4byte Route21_North_Layout
+	.4byte Route22_Layout
+	.4byte Route23_Layout
+	.4byte Route24_Layout
+	.4byte Route25_Layout
+	.4byte MtMoon_1F_Layout
+	.4byte MtMoon_B1F_Layout
+	.4byte MtMoon_B2F_Layout
+	.4byte ViridianForest_Layout
+	.4byte SSAnne_Exterior_Layout
+	.4byte SSAnne_1F_Corridor_Layout
+	.4byte SSAnne_2F_Corridor_Layout
+	.4byte SSAnne_3F_Corridor_Layout
+	.4byte SSAnne_B1F_Corridor_Layout
+	.4byte SSAnne_Deck_Layout
+	.4byte DiglettsCave_B1F_Layout
+	.4byte VictoryRoad_1F_Layout
+	.4byte VictoryRoad_2F_Layout
+	.4byte VictoryRoad_3F_Layout
+	.4byte RocketHideout_B1F_Layout
+	.4byte RocketHideout_B2F_Layout
+	.4byte RocketHideout_B3F_Layout
+	.4byte RocketHideout_B4F_Layout
+	.4byte SilphCo_1F_Layout
+	.4byte SilphCo_2F_Layout
+	.4byte SilphCo_3F_Layout
+	.4byte SilphCo_4F_Layout
+	.4byte SilphCo_5F_Layout
+	.4byte SilphCo_6F_Layout
+	.4byte SilphCo_7F_Layout
+	.4byte SilphCo_8F_Layout
+	.4byte SilphCo_9F_Layout
+	.4byte SilphCo_10F_Layout
+	.4byte SilphCo_11F_Layout
+	.4byte PokemonMansion_1F_Layout
+	.4byte PokemonMansion_2F_Layout
+	.4byte PokemonMansion_3F_Layout
+	.4byte PokemonMansion_B1F_Layout
+	.4byte SafariZone_Center_Layout
+	.4byte SafariZone_East_Layout
+	.4byte SafariZone_North_Layout
+	.4byte SafariZone_West_Layout
+	.4byte CeruleanCave_1F_Layout
+	.4byte CeruleanCave_2F_Layout
+	.4byte CeruleanCave_B1F_Layout
+	.4byte RockTunnel_1F_Layout
+	.4byte RockTunnel_B1F_Layout
+	.4byte SeafoamIslands_1F_Layout
+	.4byte SeafoamIslands_B1F_Layout
+	.4byte SeafoamIslands_B2F_Layout
+	.4byte SeafoamIslands_B3F_Layout
+	.4byte SeafoamIslands_B4F_Layout
+	.4byte PokemonTower_1F_Layout
+	.4byte PokemonTower_2F_Layout
+	.4byte PokemonTower_3F_Layout
+	.4byte PokemonTower_4F_Layout
+	.4byte PokemonTower_5F_Layout
+	.4byte PokemonTower_6F_Layout
+	.4byte PokemonTower_7F_Layout
+	.4byte PowerPlant_Layout
+	.4byte Route25_SeaCottage_Layout
+	.4byte SSAnne_Kitchen_Layout
+	.4byte SSAnne_CaptainsOffice_Layout
+	.4byte UndergroundPath_Entrance_Layout
+	.4byte UndergroundPath_EastWestTunnel_Layout
+	.4byte UndergroundPath_NorthSouthTunnel_Layout
 	.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
+	.4byte Route12_NorthEntrance_1F_Layout
+	.4byte SSAnne_Room1_Layout
+	.4byte SSAnne_Room2_Layout
+	.4byte CeladonCity_DepartmentStore_Elevator_Layout
+	.4byte PewterCity_Museum_1F_Layout
+	.4byte PewterCity_Museum_2F_Layout
+	.4byte CeruleanCity_House2_Layout
+	.4byte CeruleanCity_House1_Layout
+	.4byte CeladonCity_Condominiums_1F_Layout
+	.4byte CeladonCity_Condominiums_2F_Layout
+	.4byte CeladonCity_Condominiums_3F_Layout
+	.4byte CeladonCity_Condominiums_Roof_Layout
+	.4byte CeladonCity_Condominiums_RoofRoom_Layout
+	.4byte CeladonCity_GameCorner_PrizeRoom_Layout
+	.4byte CeladonCity_Restaurant_Layout
+	.4byte CeladonCity_Hotel_Layout
+	.4byte CeladonCity_DepartmentStore_1F_Layout
+	.4byte CeladonCity_DepartmentStore_2F_Layout
+	.4byte CeladonCity_DepartmentStore_3F_Layout
+	.4byte CeladonCity_DepartmentStore_4F_Layout
+	.4byte CeladonCity_DepartmentStore_5F_Layout
+	.4byte CeladonCity_DepartmentStore_Roof_Layout
+	.4byte SafariZone_Building_Layout
+	.4byte SafariZone_SecretHouse_Layout
+	.4byte FuchsiaCity_ZooBuilding_Layout
+	.4byte FuchsiaCity_Building1_Layout
+	.4byte FuchsiaCity_House2_Layout
+	.4byte CinnabarIsland_PokemonLab_Entrance_Layout
+	.4byte CinnabarIsland_PokemonLab_Lounge_Layout
+	.4byte CinnabarIsland_PokemonLab_ResearchRoom_Layout
+	.4byte CinnabarIsland_PokemonLab_ExperimentRoom_Layout
+	.4byte SaffronCity_Duplicate_Layout
+	.4byte SaffronCity_NorthSouthEntrance_Layout
+	.4byte SaffronCity_EastWestEntrance_Layout
+	.4byte DiglettsCave_NorthEntrance_Layout
+	.4byte DiglettsCave_SouthEntrance_Layout
+	.4byte IndigoPlateau_PokemonCenter_1F_Layout
+	.4byte PokemonLeague_LoreleisRoom_Layout
+	.4byte PokemonLeague_BrunosRoom_Layout
+	.4byte PokemonLeague_AgathasRoom_Layout
+	.4byte PokemonLeague_LancesRoom_Layout
+	.4byte PokemonLeague_ChampionsRoom_Layout
+	.4byte PokemonLeague_HallOfFame_Layout
+	.4byte Route21_South_Layout
+	.4byte Entrance_2F_Layout
+	.4byte Route2_Entrance_Layout
+	.4byte Route22_NorthEntrance_Layout
+	.4byte Route16_NorthEntrance_1F_Layout
+	.4byte Entrance_1F_Layout
+	.4byte RocketHideout_Elevator_Layout
+	.4byte SaffronCity_House1_1F_Layout
+	.4byte SaffronCity_House1_2F_Layout
+	.4byte SaffronCity_Dojo_Layout
+	.4byte SilphCo_Elevator_Layout
+	.4byte OneIsland_Layout
+	.4byte TwoIsland_Layout
+	.4byte ThreeIsland_Layout
+	.4byte FourIsland_Layout
+	.4byte FiveIsland_Layout
+	.4byte SevenIsland_Layout
+	.4byte SixIsland_Layout
+	.4byte OneIsland_KindleRoad_Layout
+	.4byte OneIsland_TreasureBeach_Layout
+	.4byte TwoIsland_CapeBrink_Layout
+	.4byte ThreeIsland_BondBridge_Layout
+	.4byte ThreeIsland_Port_Layout
+	.4byte UnknownMap_03_50_Layout
+	.4byte UnknownMap_03_51_Layout
+	.4byte UnknownMap_03_52_Layout
+	.4byte UnknownMap_03_53_Layout
+	.4byte FiveIsland_ResortGorgeous_Layout
+	.4byte FiveIsland_WaterLabyrinth_Layout
+	.4byte FiveIsland_Meadow_Layout
+	.4byte FiveIsland_MemorialPillar_Layout
+	.4byte SixIsland_OutcastIsland_Layout
+	.4byte SixIsland_GreenPath_Layout
+	.4byte SixIsland_WaterPath_Layout
+	.4byte SixIsland_RuinValley_Layout
+	.4byte SevenIsland_TrainerTower_Layout
+	.4byte SevenIsland_SevaultCanyon_Entrance_Layout
+	.4byte SevenIsland_SevaultCanyon_Layout
+	.4byte SevenIsland_TanobyRuins_Layout
+	.4byte UnusedLayout_833614C_Layout
+	.4byte UnusedLayout_83377F0_Layout
+	.4byte UnusedLayout_8338354_Layout
+	.4byte UnusedLayout_8338738_Layout
+	.4byte UnknownMap_00_04_Layout
+	.4byte SaffronCity_PokemonTrainerFanClub_Layout
+	.4byte UnusedLayout_8338B4C_Layout
+	.4byte SevenIsland_House_Room2_Layout
+	.4byte ViridianCity_House2_Layout
+	.4byte UnusedLayout_8338E90_Layout
+	.4byte UnusedLayout_833902C_Layout
+	.4byte MtEmber_RubyPath_B4F_Layout
+	.4byte ThreeIsland_BerryForest_Layout
+	.4byte OneIsland_PokemonCenter_1F_Layout
+	.4byte TwoIsland_JoyfulGameCorner_Layout
+	.4byte VermilionCity_PokemonFanClub_Layout
+	.4byte LavenderTown_VolunteerPokemonHouse_Layout
+	.4byte Route5_PokemonDayCare_Layout
+	.4byte ViridianCity_House1_Layout
+	.4byte FourIsland_PokemonDayCare_Layout
+	.4byte UnusedLayout_833B6EC_Layout
+	.4byte UnusedLayout_833BE30_Layout
+	.4byte MtEmber_Exterior_Layout
+	.4byte MtEmber_Summit_Layout
+	.4byte MtEmber_SummitPath_1F_Layout
+	.4byte MtEmber_SummitPath_2F_Layout
+	.4byte MtEmber_SummitPath_3F_Layout
+	.4byte SSAnne_Kitchen3_Layout
+	.4byte MtEmber_RubyPath_B1F_Layout
+	.4byte MtEmber_RubyPath_B2F_Layout
+	.4byte MtEmber_RubyPath_B3F_Layout
+	.4byte MtEmber_RubyPath_B1F_Stairs_Layout
+	.4byte MtEmber_RubyPath_B2F_Stairs_Layout
+	.4byte MtEmber_RubyPath_B5F_Layout
+	.4byte SSAnne_CaptainsOffice4_Layout
+	.4byte FourIsland_IcefallCave_Entrance_Layout
+	.4byte FourIsland_IcefallCave_1F_Layout
+	.4byte SSAnne_CaptainsOffice2_Layout
+	.4byte SSAnne_CaptainsOffice3_Layout
+	.4byte SevenIsland_TrainerTower_Lobby_Layout
+	.4byte SevenIsland_TrainerTower_1F_Layout
+	.4byte SevenIsland_TrainerTower_2F_Layout
+	.4byte SevenIsland_TrainerTower_3F_Layout
+	.4byte SevenIsland_TrainerTower_4F_Layout
+	.4byte SevenIsland_TrainerTower_5F_Layout
+	.4byte SevenIsland_TrainerTower_6F_Layout
+	.4byte SevenIsland_TrainerTower_7F_Layout
+	.4byte SevenIsland_TrainerTower_8F_Layout
+	.4byte SevenIsland_TrainerTower_Roof_Layout
+	.4byte SevenIsland_TrainerTower_Elevator_Layout
+	.4byte CeruleanCity_House5_Layout
+	.4byte SSAnne_CaptainsOffice5_Layout
+	.4byte SixIsland_DottedHole_B1F_Layout
+	.4byte SixIsland_DottedHole_B2F_Layout
+	.4byte SixIsland_DottedHole_B3F_Layout
+	.4byte SSAnne_CaptainsOffice9_Layout
+	.4byte SixIsland_DottedHole_SapphireRoom_Layout
+	.4byte Island_Harbor_Layout
+	.4byte OneIsland_PokemonCenter_2F_Layout
+	.4byte SSAnne_1F_Room11_Layout
+	.4byte ThreeIsland_DunsparceTunnel_Layout
+	.4byte UnusedLayout_83453C0_Layout
+	.4byte FiveIsland_LostCave_Entrance_Layout
+	.4byte FiveIsland_LostCave_Room1_Layout
+	.4byte FiveIsland_LostCave_Room2_Layout
+	.4byte FiveIsland_LostCave_Room3_Layout
+	.4byte FiveIsland_LostCave_Room4_Layout
+	.4byte FiveIsland_LostCave_Room5_Layout
+	.4byte FiveIsland_LostCave_Room6_Layout
+	.4byte FiveIsland_LostCave_Room7_Layout
+	.4byte FiveIsland_LostCave_Room8_Layout
+	.4byte FiveIsland_LostCave_Room9_Layout
+	.4byte FiveIsland_LostCave_Room10_Layout
+	.4byte FiveIsland_LostCave_Room11_Layout
+	.4byte FiveIsland_LostCave_Room12_Layout
+	.4byte FiveIsland_LostCave_Room13_Layout
+	.4byte FiveIsland_LostCave_Room14_Layout
+	.4byte SevenIsland_TanobyRuins_MoneanChamber_Layout
+	.4byte SevenIsland_TanobyRuins_LiptooChamber_Layout
+	.4byte SevenIsland_TanobyRuins_WeepthChamber_Layout
+	.4byte SevenIsland_TanobyRuins_DilfordChamber_Layout
+	.4byte SevenIsland_TanobyRuins_ScufibChamber_Layout
+	.4byte SSAnne_1F_Room12_Layout
+	.4byte SevenIsland_SeavaultCanyon_TanobyKey_Layout
+	.4byte BirthIsland_Exterior_Layout
+	.4byte NavelRock_Exterior_Layout
+	.4byte NavelRock_1F_Layout
+	.4byte NavelRock_Summit_Layout
+	.4byte NavelRock_Base_Layout
+	.4byte NavelRock_SummitPath_2F_Layout
+	.4byte NavelRock_SummitPath_3F_Layout
+	.4byte NavelRock_SummitPath_4F_Layout
+	.4byte NavelRock_SummitPath_5F_Layout
+	.4byte NavelRock_BasePath_B1F_Layout
+	.4byte NavelRock_BasePath_B2F_Layout
+	.4byte NavelRock_BasePath_B3F_Layout
+	.4byte NavelRock_BasePath_B4F_Layout
+	.4byte NavelRock_BasePath_B5F_Layout
+	.4byte NavelRock_BasePath_B6F_Layout
+	.4byte NavelRock_BasePath_B7F_Layout
+	.4byte NavelRock_BasePath_B8F_Layout
+	.4byte NavelRock_BasePath_B9F_Layout
+	.4byte NavelRock_BasePath_B10F_Layout
+	.4byte NavelRock_BasePath_B11F_Layout
+	.4byte SevenIsland_TanobyRuins_RixyChamber_Layout
+	.4byte SevenIsland_TanobyRuins_ViapoisChamber_Layout
+	.4byte NavelRock_B1F_Layout
+	.4byte NavelRock_Fork_Layout
+	.4byte UnusedLayout_834BC2C_Layout
+	.4byte UnusedLayout_834BEB4_Layout
+	.4byte UnusedLayout_834C13C_Layout
+	.4byte UnusedLayout_834C3C4_Layout
+	.4byte UnusedLayout_834C64C_Layout
+	.4byte UnusedLayout_834C8D4_Layout
+	.4byte UnusedLayout_834CB5C_Layout
+	.4byte UnusedLayout_834CDE4_Layout
+	.4byte UnusedLayout_834D06C_Layout
+	.4byte UnusedLayout_834D2F4_Layout
+	.4byte UnusedLayout_834D57C_Layout
+	.4byte UnusedLayout_834D804_Layout
+	.4byte UnusedLayout_834DA8C_Layout
+	.4byte UnusedLayout_834DD14_Layout
+	.4byte UnusedLayout_834DF9C_Layout
+	.4byte UnusedLayout_834E224_Layout
+	.4byte SevenIsland_House_Room1_Layout
+	.4byte OneIsland_KindleRoad_EmberSpa_Layout
diff --git a/data/maps/groups.inc b/data/maps/groups.inc
index d96d28329..c771d4044 100644
--- a/data/maps/groups.inc
+++ b/data/maps/groups.inc
@@ -1,5 +1,5 @@
 UnknownMap_00_00:: @ 834F188
-	.4byte gMapData_UnknownMap_00_00 @ 0x82D89E8
+	.4byte UnknownMap_00_00_Layout @ 0x82D89E8
 	.4byte gMapEvents_UnknownMap_00_00 @ 0x83AE0DC
 	.4byte gMapScripts_UnknownMap_00_00 @ 0x8160478
 	.4byte NULL
@@ -8,7 +8,7 @@ UnknownMap_00_00:: @ 834F188
 	.byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08
 
 UnknownMap_00_01:: @ 834F1A4
-	.4byte gMapData_UnknownMap_00_01 @ 0x82D8AE4
+	.4byte UnknownMap_00_01_Layout @ 0x82D8AE4
 	.4byte gMapEvents_UnknownMap_00_01 @ 0x83AE138
 	.4byte gMapScripts_UnknownMap_00_01 @ 0x8160479
 	.4byte NULL
@@ -17,7 +17,7 @@ UnknownMap_00_01:: @ 834F1A4
 	.byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 UnknownMap_00_02:: @ 834F1C0
-	.4byte gMapData_UnknownMap_00_02 @ 0x82D8C98
+	.4byte UnknownMap_00_02_Layout @ 0x82D8C98
 	.4byte gMapEvents_UnknownMap_00_02 @ 0x83AE1C4
 	.4byte gMapScripts_UnknownMap_00_02 @ 0x816047A
 	.4byte NULL
@@ -26,7 +26,7 @@ UnknownMap_00_02:: @ 834F1C0
 	.byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 UnknownMap_00_03:: @ 834F1DC
-	.4byte gMapData_UnknownMap_00_03 @ 0x82D8DB8
+	.4byte UnknownMap_00_03_Layout @ 0x82D8DB8
 	.4byte gMapEvents_UnknownMap_00_03 @ 0x83AE238
 	.4byte gMapScripts_UnknownMap_00_03 @ 0x816047B
 	.4byte NULL
@@ -35,7 +35,7 @@ UnknownMap_00_03:: @ 834F1DC
 	.byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08
 
 UnknownMap_00_04:: @ 834F1F8
-	.4byte gMapData_UnknownMap_00_04 @ 0x83388C4
+	.4byte UnknownMap_00_04_Layout @ 0x83388C4
 	.4byte gMapEvents_UnknownMap_00_04 @ 0x83AE32C
 	.4byte gMapScripts_UnknownMap_00_04 @ 0x816047C
 	.4byte NULL
@@ -44,7 +44,7 @@ UnknownMap_00_04:: @ 834F1F8
 	.byte 0xc4, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08
 
 ViridianForest:: @ 834F214
-	.4byte gMapData_ViridianForest @ 0x82FE46C
+	.4byte ViridianForest_Layout @ 0x82FE46C
 	.4byte gMapEvents_ViridianForest @ 0x83AE4D8
 	.4byte gMapScripts_ViridianForest @ 0x816051F
 	.4byte NULL
@@ -53,7 +53,7 @@ ViridianForest:: @ 834F214
 	.byte 0x7e, 0x00, 0x0b, 0x03, 0x01, 0x07, 0x00, 0x00
 
 MtMoon_1F:: @ 834F230
-	.4byte gMapData_MtMoon_1F @ 0x82FA890
+	.4byte MtMoon_1F_Layout @ 0x82FA890
 	.4byte gMapEvents_MtMoon_1F @ 0x83AE668
 	.4byte gMapScripts_MtMoon_1F @ 0x81605E4
 	.4byte NULL
@@ -62,7 +62,7 @@ MtMoon_1F:: @ 834F230
 	.byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 MtMoon_B1F:: @ 834F24C
-	.4byte gMapData_MtMoon_B1F @ 0x82FB804
+	.4byte MtMoon_B1F_Layout @ 0x82FB804
 	.4byte gMapEvents_MtMoon_B1F @ 0x83AE704
 	.4byte gMapScripts_MtMoon_B1F @ 0x8160698
 	.4byte NULL
@@ -71,7 +71,7 @@ MtMoon_B1F:: @ 834F24C
 	.byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 MtMoon_B2F:: @ 834F268
-	.4byte gMapData_MtMoon_B2F @ 0x82FC728
+	.4byte MtMoon_B2F_Layout @ 0x82FC728
 	.4byte gMapEvents_MtMoon_B2F @ 0x83AE868
 	.4byte gMapScripts_MtMoon_B2F @ 0x8160699
 	.4byte NULL
@@ -80,7 +80,7 @@ MtMoon_B2F:: @ 834F268
 	.byte 0x7f, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SSAnne_Exterior:: @ 834F284
-	.4byte gMapData_SSAnne_Exterior @ 0x82FF610
+	.4byte SSAnne_Exterior_Layout @ 0x82FF610
 	.4byte gMapEvents_SSAnne_Exterior @ 0x83AE8C8
 	.4byte gMapScripts_SSAnne_Exterior @ 0x8160840
 	.4byte NULL
@@ -89,7 +89,7 @@ SSAnne_Exterior:: @ 834F284
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_1F_Corridor:: @ 834F2A0
-	.4byte gMapData_SSAnne_1F_Corridor @ 0x82FFB4C
+	.4byte SSAnne_1F_Corridor_Layout @ 0x82FFB4C
 	.4byte gMapEvents_SSAnne_1F_Corridor @ 0x83AE974
 	.4byte gMapScripts_SSAnne_1F_Corridor @ 0x81608CB
 	.4byte NULL
@@ -98,7 +98,7 @@ SSAnne_1F_Corridor:: @ 834F2A0
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_2F_Corridor:: @ 834F2BC
-	.4byte gMapData_SSAnne_2F_Corridor @ 0x82FFFB0
+	.4byte SSAnne_2F_Corridor_Layout @ 0x82FFFB0
 	.4byte gMapEvents_SSAnne_2F_Corridor @ 0x83AEA30
 	.4byte gMapScripts_SSAnne_2F_Corridor @ 0x81608DE
 	.4byte NULL
@@ -107,7 +107,7 @@ SSAnne_2F_Corridor:: @ 834F2BC
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_3F_Corridor:: @ 834F2D8
-	.4byte gMapData_SSAnne_3F_Corridor @ 0x8300108
+	.4byte SSAnne_3F_Corridor_Layout @ 0x8300108
 	.4byte gMapEvents_SSAnne_3F_Corridor @ 0x83AEA74
 	.4byte gMapScripts_SSAnne_3F_Corridor @ 0x8160A5D
 	.4byte NULL
@@ -116,7 +116,7 @@ SSAnne_3F_Corridor:: @ 834F2D8
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_B1F_Corridor:: @ 834F2F4
-	.4byte gMapData_SSAnne_B1F_Corridor @ 0x8300270
+	.4byte SSAnne_B1F_Corridor_Layout @ 0x8300270
 	.4byte gMapEvents_SSAnne_B1F_Corridor @ 0x83AEAC4
 	.4byte gMapScripts_SSAnne_B1F_Corridor @ 0x8160A67
 	.4byte NULL
@@ -125,7 +125,7 @@ SSAnne_B1F_Corridor:: @ 834F2F4
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_Deck:: @ 834F310
-	.4byte gMapData_SSAnne_Deck @ 0x8300624
+	.4byte SSAnne_Deck_Layout @ 0x8300624
 	.4byte gMapEvents_SSAnne_Deck @ 0x83AEB60
 	.4byte gMapScripts_SSAnne_Deck @ 0x8160A68
 	.4byte NULL
@@ -134,7 +134,7 @@ SSAnne_Deck:: @ 834F310
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_Kitchen:: @ 834F32C
-	.4byte gMapData_SSAnne_Kitchen @ 0x8319214
+	.4byte SSAnne_Kitchen_Layout @ 0x8319214
 	.4byte gMapEvents_SSAnne_Kitchen @ 0x83AEC60
 	.4byte gMapScripts_SSAnne_Kitchen @ 0x8160AB2
 	.4byte NULL
@@ -143,7 +143,7 @@ SSAnne_Kitchen:: @ 834F32C
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_CaptainsOffice:: @ 834F348
-	.4byte gMapData_SSAnne_CaptainsOffice @ 0x83192EC
+	.4byte SSAnne_CaptainsOffice_Layout @ 0x83192EC
 	.4byte gMapEvents_SSAnne_CaptainsOffice @ 0x83AECB8
 	.4byte gMapScripts_SSAnne_CaptainsOffice @ 0x8160B39
 	.4byte NULL
@@ -152,7 +152,7 @@ SSAnne_CaptainsOffice:: @ 834F348
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_1F_Room1:: @ 834F364
-	.4byte gMapData_SSAnne_1F_Room1 @ 0x8319E74
+	.4byte SSAnne_Room1_Layout @ 0x8319E74
 	.4byte gMapEvents_SSAnne_1F_Room1 @ 0x83AECEC
 	.4byte gMapScripts_SSAnne_1F_Room1 @ 0x8160BDB
 	.4byte NULL
@@ -161,7 +161,7 @@ SSAnne_1F_Room1:: @ 834F364
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_1F_Room2:: @ 834F380
-	.4byte gMapData_SSAnne_1F_Room2 @ 0x8319E74
+	.4byte SSAnne_Room1_Layout @ 0x8319E74
 	.4byte gMapEvents_SSAnne_1F_Room2 @ 0x83AED68
 	.4byte gMapScripts_SSAnne_1F_Room2 @ 0x8160BE5
 	.4byte NULL
@@ -170,7 +170,7 @@ SSAnne_1F_Room2:: @ 834F380
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_1F_Room3:: @ 834F39C
-	.4byte gMapData_SSAnne_1F_Room3 @ 0x8319E74
+	.4byte SSAnne_Room1_Layout @ 0x8319E74
 	.4byte gMapEvents_SSAnne_1F_Room3 @ 0x83AEDCC
 	.4byte gMapScripts_SSAnne_1F_Room3 @ 0x8160C1D
 	.4byte NULL
@@ -179,7 +179,7 @@ SSAnne_1F_Room3:: @ 834F39C
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_1F_Room4:: @ 834F3B8
-	.4byte gMapData_SSAnne_1F_Room4 @ 0x8319E74
+	.4byte SSAnne_Room1_Layout @ 0x8319E74
 	.4byte gMapEvents_SSAnne_1F_Room4 @ 0x83AEE00
 	.4byte gMapScripts_SSAnne_1F_Room4 @ 0x8160C43
 	.4byte NULL
@@ -188,7 +188,7 @@ SSAnne_1F_Room4:: @ 834F3B8
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_1F_Room5:: @ 834F3D4
-	.4byte gMapData_SSAnne_1F_Room5 @ 0x8319E74
+	.4byte SSAnne_Room1_Layout @ 0x8319E74
 	.4byte gMapEvents_SSAnne_1F_Room5 @ 0x83AEE34
 	.4byte gMapScripts_SSAnne_1F_Room5 @ 0x8160C66
 	.4byte NULL
@@ -197,7 +197,7 @@ SSAnne_1F_Room5:: @ 834F3D4
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_1F_Room7:: @ 834F3F0
-	.4byte gMapData_SSAnne_1F_Room7 @ 0x8319E74
+	.4byte SSAnne_Room1_Layout @ 0x8319E74
 	.4byte gMapEvents_SSAnne_1F_Room7 @ 0x83AEE68
 	.4byte gMapScripts_SSAnne_1F_Room7 @ 0x8160C7E
 	.4byte NULL
@@ -206,7 +206,7 @@ SSAnne_1F_Room7:: @ 834F3F0
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_2F_Room1:: @ 834F40C
-	.4byte gMapData_SSAnne_2F_Room1 @ 0x8319F04
+	.4byte SSAnne_Room2_Layout @ 0x8319F04
 	.4byte gMapEvents_SSAnne_2F_Room1 @ 0x83AEE9C
 	.4byte gMapScripts_SSAnne_2F_Room1 @ 0x8160C96
 	.4byte NULL
@@ -215,7 +215,7 @@ SSAnne_2F_Room1:: @ 834F40C
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_2F_Room2:: @ 834F428
-	.4byte gMapData_SSAnne_2F_Room2 @ 0x8319F04
+	.4byte SSAnne_Room2_Layout @ 0x8319F04
 	.4byte gMapEvents_SSAnne_2F_Room2 @ 0x83AEF00
 	.4byte gMapScripts_SSAnne_2F_Room2 @ 0x8160CB0
 	.4byte NULL
@@ -224,7 +224,7 @@ SSAnne_2F_Room2:: @ 834F428
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_2F_Room3:: @ 834F444
-	.4byte gMapData_SSAnne_2F_Room3 @ 0x8319F04
+	.4byte SSAnne_Room2_Layout @ 0x8319F04
 	.4byte gMapEvents_SSAnne_2F_Room3 @ 0x83AEF4C
 	.4byte gMapScripts_SSAnne_2F_Room3 @ 0x8160CDF
 	.4byte NULL
@@ -233,7 +233,7 @@ SSAnne_2F_Room3:: @ 834F444
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_2F_Room4:: @ 834F460
-	.4byte gMapData_SSAnne_2F_Room4 @ 0x8319F04
+	.4byte SSAnne_Room2_Layout @ 0x8319F04
 	.4byte gMapEvents_SSAnne_2F_Room4 @ 0x83AEFB0
 	.4byte gMapScripts_SSAnne_2F_Room4 @ 0x8160CF2
 	.4byte NULL
@@ -242,7 +242,7 @@ SSAnne_2F_Room4:: @ 834F460
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_2F_Room5:: @ 834F47C
-	.4byte gMapData_SSAnne_2F_Room5 @ 0x8319F04
+	.4byte SSAnne_Room2_Layout @ 0x8319F04
 	.4byte gMapEvents_SSAnne_2F_Room5 @ 0x83AEFFC
 	.4byte gMapScripts_SSAnne_2F_Room5 @ 0x8160D21
 	.4byte NULL
@@ -251,7 +251,7 @@ SSAnne_2F_Room5:: @ 834F47C
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_2F_Room6:: @ 834F498
-	.4byte gMapData_SSAnne_2F_Room6 @ 0x8319F04
+	.4byte SSAnne_Room2_Layout @ 0x8319F04
 	.4byte gMapEvents_SSAnne_2F_Room6 @ 0x83AF048
 	.4byte gMapScripts_SSAnne_2F_Room6 @ 0x8160D34
 	.4byte NULL
@@ -260,7 +260,7 @@ SSAnne_2F_Room6:: @ 834F498
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_B1F_Room1:: @ 834F4B4
-	.4byte gMapData_SSAnne_B1F_Room1 @ 0x8319F04
+	.4byte SSAnne_Room2_Layout @ 0x8319F04
 	.4byte gMapEvents_SSAnne_B1F_Room1 @ 0x83AF094
 	.4byte gMapScripts_SSAnne_B1F_Room1 @ 0x8160D47
 	.4byte NULL
@@ -269,7 +269,7 @@ SSAnne_B1F_Room1:: @ 834F4B4
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_B1F_Room2:: @ 834F4D0
-	.4byte gMapData_SSAnne_B1F_Room2 @ 0x8319F04
+	.4byte SSAnne_Room2_Layout @ 0x8319F04
 	.4byte gMapEvents_SSAnne_B1F_Room2 @ 0x83AF0E0
 	.4byte gMapScripts_SSAnne_B1F_Room2 @ 0x8160D76
 	.4byte NULL
@@ -278,7 +278,7 @@ SSAnne_B1F_Room2:: @ 834F4D0
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_B1F_Room3:: @ 834F4EC
-	.4byte gMapData_SSAnne_B1F_Room3 @ 0x8319F04
+	.4byte SSAnne_Room2_Layout @ 0x8319F04
 	.4byte gMapEvents_SSAnne_B1F_Room3 @ 0x83AF12C
 	.4byte gMapScripts_SSAnne_B1F_Room3 @ 0x8160D8E
 	.4byte NULL
@@ -287,7 +287,7 @@ SSAnne_B1F_Room3:: @ 834F4EC
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_B1F_Room4:: @ 834F508
-	.4byte gMapData_SSAnne_B1F_Room4 @ 0x8319F04
+	.4byte SSAnne_Room2_Layout @ 0x8319F04
 	.4byte gMapEvents_SSAnne_B1F_Room4 @ 0x83AF178
 	.4byte gMapScripts_SSAnne_B1F_Room4 @ 0x8160DA6
 	.4byte NULL
@@ -296,7 +296,7 @@ SSAnne_B1F_Room4:: @ 834F508
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_B1F_Room5:: @ 834F524
-	.4byte gMapData_SSAnne_B1F_Room5 @ 0x8319F04
+	.4byte SSAnne_Room2_Layout @ 0x8319F04
 	.4byte gMapEvents_SSAnne_B1F_Room5 @ 0x83AF1DC
 	.4byte gMapScripts_SSAnne_B1F_Room5 @ 0x8160DD5
 	.4byte NULL
@@ -305,7 +305,7 @@ SSAnne_B1F_Room5:: @ 834F524
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 SSAnne_1F_Room6:: @ 834F540
-	.4byte gMapData_SSAnne_1F_Room6 @ 0x8319E74
+	.4byte SSAnne_Room1_Layout @ 0x8319E74
 	.4byte gMapEvents_SSAnne_1F_Room6 @ 0x83AF210
 	.4byte gMapScripts_SSAnne_1F_Room6 @ 0x8160DF2
 	.4byte NULL
@@ -314,7 +314,7 @@ SSAnne_1F_Room6:: @ 834F540
 	.byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 UndergroundPath_NorthEntrance:: @ 834F55C
-	.4byte gMapData_UndergroundPath_NorthEntrance @ 0x8319414
+	.4byte UndergroundPath_Entrance_Layout @ 0x8319414
 	.4byte gMapEvents_UndergroundPath_NorthEntrance @ 0x83AF25C
 	.4byte gMapScripts_UndergroundPath_NorthEntrance @ 0x8160E38
 	.4byte NULL
@@ -323,7 +323,7 @@ UndergroundPath_NorthEntrance:: @ 834F55C
 	.byte 0x81, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 UndergroundPath_NorthSouthTunnel:: @ 834F578
-	.4byte gMapData_UndergroundPath_NorthSouthTunnel @ 0x8319CAC
+	.4byte UndergroundPath_NorthSouthTunnel_Layout @ 0x8319CAC
 	.4byte gMapEvents_UndergroundPath_NorthSouthTunnel @ 0x83AF2D4
 	.4byte gMapScripts_UndergroundPath_NorthSouthTunnel @ 0x8160EB5
 	.4byte NULL
@@ -332,7 +332,7 @@ UndergroundPath_NorthSouthTunnel:: @ 834F578
 	.byte 0x81, 0x00, 0x00, 0x08, 0x01, 0x06, 0x00, 0x00
 
 UndergroundPath_SouthEntrance:: @ 834F594
-	.4byte gMapData_UndergroundPath_SouthEntrance @ 0x8319414
+	.4byte UndergroundPath_Entrance_Layout @ 0x8319414
 	.4byte gMapEvents_UndergroundPath_SouthEntrance @ 0x83AF320
 	.4byte gMapScripts_UndergroundPath_SouthEntrance @ 0x8160EBF
 	.4byte NULL
@@ -341,7 +341,7 @@ UndergroundPath_SouthEntrance:: @ 834F594
 	.byte 0x81, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 UndergroundPath_WestEntrance:: @ 834F5B0
-	.4byte gMapData_UndergroundPath_WestEntrance @ 0x8319414
+	.4byte UndergroundPath_Entrance_Layout @ 0x8319414
 	.4byte gMapEvents_UndergroundPath_WestEntrance @ 0x83AF36C
 	.4byte gMapScripts_UndergroundPath_WestEntrance @ 0x8160EC9
 	.4byte NULL
@@ -350,7 +350,7 @@ UndergroundPath_WestEntrance:: @ 834F5B0
 	.byte 0x82, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 UndergroundPath_EastWestTunnel:: @ 834F5CC
-	.4byte gMapData_UndergroundPath_EastWestTunnel @ 0x8319898
+	.4byte UndergroundPath_EastWestTunnel_Layout @ 0x8319898
 	.4byte gMapEvents_UndergroundPath_EastWestTunnel @ 0x83AF3E4
 	.4byte gMapScripts_UndergroundPath_EastWestTunnel @ 0x8160ED3
 	.4byte NULL
@@ -359,7 +359,7 @@ UndergroundPath_EastWestTunnel:: @ 834F5CC
 	.byte 0x82, 0x00, 0x00, 0x08, 0x01, 0x06, 0x00, 0x00
 
 UndergroundPath_EastEntrance:: @ 834F5E8
-	.4byte gMapData_UndergroundPath_EastEntrance @ 0x8319414
+	.4byte UndergroundPath_Entrance_Layout @ 0x8319414
 	.4byte gMapEvents_UndergroundPath_EastEntrance @ 0x83AF430
 	.4byte gMapScripts_UndergroundPath_EastEntrance @ 0x8160EDD
 	.4byte NULL
@@ -368,7 +368,7 @@ UndergroundPath_EastEntrance:: @ 834F5E8
 	.byte 0x82, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 DiglettsCave_NorthEntrance:: @ 834F604
-	.4byte gMapData_DiglettsCave_NorthEntrance @ 0x831EB94
+	.4byte DiglettsCave_NorthEntrance_Layout @ 0x831EB94
 	.4byte gMapEvents_DiglettsCave_NorthEntrance @ 0x83AF46C
 	.4byte gMapScripts_DiglettsCave_NorthEntrance @ 0x8160EE7
 	.4byte NULL
@@ -377,7 +377,7 @@ DiglettsCave_NorthEntrance:: @ 834F604
 	.byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 DiglettsCave_B1F:: @ 834F620
-	.4byte gMapData_DiglettsCave_B1F @ 0x8303B68
+	.4byte DiglettsCave_B1F_Layout @ 0x8303B68
 	.4byte gMapEvents_DiglettsCave_B1F @ 0x83AF490
 	.4byte gMapScripts_DiglettsCave_B1F @ 0x8160EF1
 	.4byte NULL
@@ -386,7 +386,7 @@ DiglettsCave_B1F:: @ 834F620
 	.byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 DiglettsCave_SouthEntrance:: @ 834F63C
-	.4byte gMapData_DiglettsCave_SouthEntrance @ 0x831EC58
+	.4byte DiglettsCave_SouthEntrance_Layout @ 0x831EC58
 	.4byte gMapEvents_DiglettsCave_SouthEntrance @ 0x83AF4CC
 	.4byte gMapScripts_DiglettsCave_SouthEntrance @ 0x8160EFB
 	.4byte NULL
@@ -395,7 +395,7 @@ DiglettsCave_SouthEntrance:: @ 834F63C
 	.byte 0x83, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 VictoryRoad_1F:: @ 834F658
-	.4byte gMapData_VictoryRoad_1F @ 0x83043CC
+	.4byte VictoryRoad_1F_Layout @ 0x83043CC
 	.4byte gMapEvents_VictoryRoad_1F @ 0x83AF5C0
 	.4byte gMapScripts_VictoryRoad_1F @ 0x8160F05
 	.4byte NULL
@@ -404,7 +404,7 @@ VictoryRoad_1F:: @ 834F658
 	.byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 VictoryRoad_2F:: @ 834F674
-	.4byte gMapData_VictoryRoad_2F @ 0x8304CB4
+	.4byte VictoryRoad_2F_Layout @ 0x8304CB4
 	.4byte gMapEvents_VictoryRoad_2F @ 0x83AF774
 	.4byte gMapScripts_VictoryRoad_2F @ 0x8160F92
 	.4byte NULL
@@ -413,7 +413,7 @@ VictoryRoad_2F:: @ 834F674
 	.byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 VictoryRoad_3F:: @ 834F690
-	.4byte gMapData_VictoryRoad_3F @ 0x8305494
+	.4byte VictoryRoad_3F_Layout @ 0x8305494
 	.4byte gMapEvents_VictoryRoad_3F @ 0x83AF8E0
 	.4byte gMapScripts_VictoryRoad_3F @ 0x81610AA
 	.4byte NULL
@@ -422,7 +422,7 @@ VictoryRoad_3F:: @ 834F690
 	.byte 0x84, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 RocketHideout_B1F:: @ 834F6AC
-	.4byte gMapData_RocketHideout_B1F @ 0x8305C28
+	.4byte RocketHideout_B1F_Layout @ 0x8305C28
 	.4byte gMapEvents_RocketHideout_B1F @ 0x83AF9D8
 	.4byte gMapScripts_RocketHideout_B1F @ 0x8161195
 	.4byte NULL
@@ -431,7 +431,7 @@ RocketHideout_B1F:: @ 834F6AC
 	.byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xff, 0x03
 
 RocketHideout_B2F:: @ 834F6C8
-	.4byte gMapData_RocketHideout_B2F @ 0x83061CC
+	.4byte RocketHideout_B2F_Layout @ 0x83061CC
 	.4byte gMapEvents_RocketHideout_B2F @ 0x83AFA8C
 	.4byte gMapScripts_RocketHideout_B2F @ 0x81612A1
 	.4byte NULL
@@ -440,7 +440,7 @@ RocketHideout_B2F:: @ 834F6C8
 	.byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfe, 0x03
 
 RocketHideout_B3F:: @ 834F6E4
-	.4byte gMapData_RocketHideout_B3F @ 0x8306694
+	.4byte RocketHideout_B3F_Layout @ 0x8306694
 	.4byte gMapEvents_RocketHideout_B3F @ 0x83AFB34
 	.4byte gMapScripts_RocketHideout_B3F @ 0x81612B9
 	.4byte NULL
@@ -449,7 +449,7 @@ RocketHideout_B3F:: @ 834F6E4
 	.byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfd, 0x03
 
 RocketHideout_B4F:: @ 834F700
-	.4byte gMapData_RocketHideout_B4F @ 0x8306B98
+	.4byte RocketHideout_B4F_Layout @ 0x8306B98
 	.4byte gMapEvents_RocketHideout_B4F @ 0x83AFC50
 	.4byte gMapScripts_RocketHideout_B4F @ 0x81612E8
 	.4byte NULL
@@ -458,7 +458,7 @@ RocketHideout_B4F:: @ 834F700
 	.byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x07, 0xfc, 0x03
 
 RocketHideout_Elevator:: @ 834F71C
-	.4byte gMapData_RocketHideout_Elevator @ 0x8320EDC
+	.4byte RocketHideout_Elevator_Layout @ 0x8320EDC
 	.4byte gMapEvents_RocketHideout_Elevator @ 0x83AFC80
 	.4byte gMapScripts_RocketHideout_Elevator @ 0x81614D8
 	.4byte NULL
@@ -467,7 +467,7 @@ RocketHideout_Elevator:: @ 834F71C
 	.byte 0x85, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x03
 
 SilphCo_1F:: @ 834F738
-	.4byte gMapData_SilphCo_1F @ 0x83071EC
+	.4byte SilphCo_1F_Layout @ 0x83071EC
 	.4byte gMapEvents_SilphCo_1F @ 0x83AFCE0
 	.4byte gMapScripts_SilphCo_1F @ 0x8161625
 	.4byte NULL
@@ -476,7 +476,7 @@ SilphCo_1F:: @ 834F738
 	.byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x01, 0x00
 
 SilphCo_2F:: @ 834F754
-	.4byte gMapData_SilphCo_2F @ 0x8307840
+	.4byte SilphCo_2F_Layout @ 0x8307840
 	.4byte gMapEvents_SilphCo_2F @ 0x83AFE1C
 	.4byte gMapScripts_SilphCo_2F @ 0x8161641
 	.4byte NULL
@@ -485,7 +485,7 @@ SilphCo_2F:: @ 834F754
 	.byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x02, 0x00
 
 SilphCo_3F:: @ 834F770
-	.4byte gMapData_SilphCo_3F @ 0x8307E94
+	.4byte SilphCo_3F_Layout @ 0x8307E94
 	.4byte gMapEvents_SilphCo_3F @ 0x83AFF58
 	.4byte gMapScripts_SilphCo_3F @ 0x81616C5
 	.4byte NULL
@@ -494,7 +494,7 @@ SilphCo_3F:: @ 834F770
 	.byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x03, 0x00
 
 SilphCo_4F:: @ 834F78C
-	.4byte gMapData_SilphCo_4F @ 0x83084E8
+	.4byte SilphCo_4F_Layout @ 0x83084E8
 	.4byte gMapEvents_SilphCo_4F @ 0x83B00DC
 	.4byte gMapScripts_SilphCo_4F @ 0x8161736
 	.4byte NULL
@@ -503,7 +503,7 @@ SilphCo_4F:: @ 834F78C
 	.byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x04, 0x00
 
 SilphCo_5F:: @ 834F7A8
-	.4byte gMapData_SilphCo_5F @ 0x8308B3C
+	.4byte SilphCo_5F_Layout @ 0x8308B3C
 	.4byte gMapEvents_SilphCo_5F @ 0x83B02D8
 	.4byte gMapScripts_SilphCo_5F @ 0x81617BE
 	.4byte NULL
@@ -512,7 +512,7 @@ SilphCo_5F:: @ 834F7A8
 	.byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x05, 0x00
 
 SilphCo_6F:: @ 834F7C4
-	.4byte gMapData_SilphCo_6F @ 0x8308FFC
+	.4byte SilphCo_6F_Layout @ 0x8308FFC
 	.4byte gMapEvents_SilphCo_6F @ 0x83B044C
 	.4byte gMapScripts_SilphCo_6F @ 0x8161881
 	.4byte NULL
@@ -521,7 +521,7 @@ SilphCo_6F:: @ 834F7C4
 	.byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x06, 0x00
 
 SilphCo_7F:: @ 834F7E0
-	.4byte gMapData_SilphCo_7F @ 0x83094BC
+	.4byte SilphCo_7F_Layout @ 0x83094BC
 	.4byte gMapEvents_SilphCo_7F @ 0x83B0660
 	.4byte gMapScripts_SilphCo_7F @ 0x8161984
 	.4byte NULL
@@ -530,7 +530,7 @@ SilphCo_7F:: @ 834F7E0
 	.byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x07, 0x00
 
 SilphCo_8F:: @ 834F7FC
-	.4byte gMapData_SilphCo_8F @ 0x830997C
+	.4byte SilphCo_8F_Layout @ 0x830997C
 	.4byte gMapEvents_SilphCo_8F @ 0x83B0784
 	.4byte gMapScripts_SilphCo_8F @ 0x8161C5F
 	.4byte NULL
@@ -539,7 +539,7 @@ SilphCo_8F:: @ 834F7FC
 	.byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x08, 0x00
 
 SilphCo_9F:: @ 834F818
-	.4byte gMapData_SilphCo_9F @ 0x8309E3C
+	.4byte SilphCo_9F_Layout @ 0x8309E3C
 	.4byte gMapEvents_SilphCo_9F @ 0x83B0904
 	.4byte gMapScripts_SilphCo_9F @ 0x8161CDE
 	.4byte NULL
@@ -548,7 +548,7 @@ SilphCo_9F:: @ 834F818
 	.byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x09, 0x00
 
 SilphCo_10F:: @ 834F834
-	.4byte gMapData_SilphCo_10F @ 0x830A0E8
+	.4byte SilphCo_10F_Layout @ 0x830A0E8
 	.4byte gMapEvents_SilphCo_10F @ 0x83B0A20
 	.4byte gMapScripts_SilphCo_10F @ 0x8161D86
 	.4byte NULL
@@ -557,7 +557,7 @@ SilphCo_10F:: @ 834F834
 	.byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x0a, 0x00
 
 SilphCo_11F:: @ 834F850
-	.4byte gMapData_SilphCo_11F @ 0x830A3B4
+	.4byte SilphCo_11F_Layout @ 0x830A3B4
 	.4byte gMapEvents_SilphCo_11F @ 0x83B0B44
 	.4byte gMapScripts_SilphCo_11F @ 0x8161DEE
 	.4byte NULL
@@ -566,7 +566,7 @@ SilphCo_11F:: @ 834F850
 	.byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x07, 0x0b, 0x00
 
 SilphCo_Elevator:: @ 834F86C
-	.4byte gMapData_SilphCo_Elevator @ 0x8321330
+	.4byte SilphCo_Elevator_Layout @ 0x8321330
 	.4byte gMapEvents_SilphCo_Elevator @ 0x83B0B6C
 	.4byte gMapScripts_SilphCo_Elevator @ 0x8161F6E
 	.4byte NULL
@@ -575,7 +575,7 @@ SilphCo_Elevator:: @ 834F86C
 	.byte 0x86, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
 
 PokemonMansion_1F:: @ 834F888
-	.4byte gMapData_PokemonMansion_1F @ 0x830AE3C
+	.4byte PokemonMansion_1F_Layout @ 0x830AE3C
 	.4byte gMapEvents_PokemonMansion_1F @ 0x83B0C60
 	.4byte gMapScripts_PokemonMansion_1F @ 0x81621F9
 	.4byte NULL
@@ -584,7 +584,7 @@ PokemonMansion_1F:: @ 834F888
 	.byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03
 
 PokemonMansion_2F:: @ 834F8A4
-	.4byte gMapData_PokemonMansion_2F @ 0x830B9A8
+	.4byte PokemonMansion_2F_Layout @ 0x830B9A8
 	.4byte gMapEvents_PokemonMansion_2F @ 0x83B0D20
 	.4byte gMapScripts_PokemonMansion_2F @ 0x8162254
 	.4byte NULL
@@ -593,7 +593,7 @@ PokemonMansion_2F:: @ 834F8A4
 	.byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03
 
 PokemonMansion_3F:: @ 834F8C0
-	.4byte gMapData_PokemonMansion_3F @ 0x830C430
+	.4byte PokemonMansion_3F_Layout @ 0x830C430
 	.4byte gMapEvents_PokemonMansion_3F @ 0x83B0DF8
 	.4byte gMapScripts_PokemonMansion_3F @ 0x81622A1
 	.4byte NULL
@@ -602,7 +602,7 @@ PokemonMansion_3F:: @ 834F8C0
 	.byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03
 
 PokemonMansion_B1F:: @ 834F8DC
-	.4byte gMapData_PokemonMansion_B1F @ 0x830CEB8
+	.4byte PokemonMansion_B1F_Layout @ 0x830CEB8
 	.4byte gMapEvents_PokemonMansion_B1F @ 0x83B0ED4
 	.4byte gMapScripts_PokemonMansion_B1F @ 0x81622FC
 	.4byte NULL
@@ -611,7 +611,7 @@ PokemonMansion_B1F:: @ 834F8DC
 	.byte 0x87, 0x00, 0x0b, 0x08, 0x00, 0x07, 0x00, 0x03
 
 SafariZone_Center:: @ 834F8F8
-	.4byte gMapData_SafariZone_Center @ 0x830DD38
+	.4byte SafariZone_Center_Layout @ 0x830DD38
 	.4byte gMapEvents_SafariZone_Center @ 0x83B0F98
 	.4byte gMapScripts_SafariZone_Center @ 0x8162357
 	.4byte NULL
@@ -620,7 +620,7 @@ SafariZone_Center:: @ 834F8F8
 	.byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00
 
 SafariZone_East:: @ 834F914
-	.4byte gMapData_SafariZone_East @ 0x830EC24
+	.4byte SafariZone_East_Layout @ 0x830EC24
 	.4byte gMapEvents_SafariZone_East @ 0x83B1068
 	.4byte gMapScripts_SafariZone_East @ 0x816237C
 	.4byte NULL
@@ -629,7 +629,7 @@ SafariZone_East:: @ 834F914
 	.byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00
 
 SafariZone_North:: @ 834F930
-	.4byte gMapData_SafariZone_North @ 0x830FE1C
+	.4byte SafariZone_North_Layout @ 0x830FE1C
 	.4byte gMapEvents_SafariZone_North @ 0x83B1168
 	.4byte gMapScripts_SafariZone_North @ 0x8162398
 	.4byte NULL
@@ -638,7 +638,7 @@ SafariZone_North:: @ 834F930
 	.byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00
 
 SafariZone_West:: @ 834F94C
-	.4byte gMapData_SafariZone_West @ 0x8310BC4
+	.4byte SafariZone_West_Layout @ 0x8310BC4
 	.4byte gMapEvents_SafariZone_West @ 0x83B1270
 	.4byte gMapScripts_SafariZone_West @ 0x81623C6
 	.4byte NULL
@@ -647,7 +647,7 @@ SafariZone_West:: @ 834F94C
 	.byte 0x88, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00
 
 SafariZone_Building1:: @ 834F968
-	.4byte gMapData_SafariZone_Building1 @ 0x831C028
+	.4byte SafariZone_Building_Layout @ 0x831C028
 	.4byte gMapEvents_SafariZone_Building1 @ 0x83B12CC
 	.4byte gMapScripts_SafariZone_Building1 @ 0x81623EB
 	.4byte NULL
@@ -656,7 +656,7 @@ SafariZone_Building1:: @ 834F968
 	.byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SafariZone_Building2:: @ 834F984
-	.4byte gMapData_SafariZone_Building2 @ 0x831C028
+	.4byte SafariZone_Building_Layout @ 0x831C028
 	.4byte gMapEvents_SafariZone_Building2 @ 0x83B1340
 	.4byte gMapScripts_SafariZone_Building2 @ 0x81623FE
 	.4byte NULL
@@ -665,7 +665,7 @@ SafariZone_Building2:: @ 834F984
 	.byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SafariZone_Building3:: @ 834F9A0
-	.4byte gMapData_SafariZone_Building3 @ 0x831C028
+	.4byte SafariZone_Building_Layout @ 0x831C028
 	.4byte gMapEvents_SafariZone_Building3 @ 0x83B13CC
 	.4byte gMapScripts_SafariZone_Building3 @ 0x816241A
 	.4byte NULL
@@ -674,7 +674,7 @@ SafariZone_Building3:: @ 834F9A0
 	.byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SafariZone_Building4:: @ 834F9BC
-	.4byte gMapData_SafariZone_Building4 @ 0x831C028
+	.4byte SafariZone_Building_Layout @ 0x831C028
 	.4byte gMapEvents_SafariZone_Building4 @ 0x83B1440
 	.4byte gMapScripts_SafariZone_Building4 @ 0x8162436
 	.4byte NULL
@@ -683,7 +683,7 @@ SafariZone_Building4:: @ 834F9BC
 	.byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SafariZone_SecretHouse:: @ 834F9D8
-	.4byte gMapData_SafariZone_SecretHouse @ 0x831C16C
+	.4byte SafariZone_SecretHouse_Layout @ 0x831C16C
 	.4byte gMapEvents_SafariZone_SecretHouse @ 0x83B1484
 	.4byte gMapScripts_SafariZone_SecretHouse @ 0x8162452
 	.4byte NULL
@@ -692,7 +692,7 @@ SafariZone_SecretHouse:: @ 834F9D8
 	.byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeruleanCave_1F:: @ 834F9F4
-	.4byte gMapData_CeruleanCave_1F @ 0x8311318
+	.4byte CeruleanCave_1F_Layout @ 0x8311318
 	.4byte gMapEvents_CeruleanCave_1F @ 0x83B15BC
 	.4byte gMapScripts_CeruleanCave_1F @ 0x81624B3
 	.4byte NULL
@@ -701,7 +701,7 @@ CeruleanCave_1F:: @ 834F9F4
 	.byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 CeruleanCave_2F:: @ 834FA10
-	.4byte gMapData_CeruleanCave_2F @ 0x8311A6C
+	.4byte CeruleanCave_2F_Layout @ 0x8311A6C
 	.4byte gMapEvents_CeruleanCave_2F @ 0x83B1738
 	.4byte gMapScripts_CeruleanCave_2F @ 0x81624BD
 	.4byte NULL
@@ -710,7 +710,7 @@ CeruleanCave_2F:: @ 834FA10
 	.byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 CeruleanCave_B1F:: @ 834FA2C
-	.4byte gMapData_CeruleanCave_B1F @ 0x83121C0
+	.4byte CeruleanCave_B1F_Layout @ 0x83121C0
 	.4byte gMapEvents_CeruleanCave_B1F @ 0x83B1874
 	.4byte gMapScripts_CeruleanCave_B1F @ 0x81624BE
 	.4byte NULL
@@ -719,7 +719,7 @@ CeruleanCave_B1F:: @ 834FA2C
 	.byte 0x8d, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 PokemonLeague_LoreleisRoom:: @ 834FA48
-	.4byte gMapData_PokemonLeague_LoreleisRoom @ 0x831F178
+	.4byte PokemonLeague_LoreleisRoom_Layout @ 0x831F178
 	.4byte gMapEvents_PokemonLeague_LoreleisRoom @ 0x83B18B0
 	.4byte gMapScripts_PokemonLeague_LoreleisRoom @ 0x816256C
 	.4byte NULL
@@ -728,7 +728,7 @@ PokemonLeague_LoreleisRoom:: @ 834FA48
 	.byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04
 
 PokemonLeague_BrunosRoom:: @ 834FA64
-	.4byte gMapData_PokemonLeague_BrunosRoom @ 0x831F2F0
+	.4byte PokemonLeague_BrunosRoom_Layout @ 0x831F2F0
 	.4byte gMapEvents_PokemonLeague_BrunosRoom @ 0x83B18EC
 	.4byte gMapScripts_PokemonLeague_BrunosRoom @ 0x8162685
 	.4byte NULL
@@ -737,7 +737,7 @@ PokemonLeague_BrunosRoom:: @ 834FA64
 	.byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x05
 
 PokemonLeague_AgathasRoom:: @ 834FA80
-	.4byte gMapData_PokemonLeague_AgathasRoom @ 0x831F468
+	.4byte PokemonLeague_AgathasRoom_Layout @ 0x831F468
 	.4byte gMapEvents_PokemonLeague_AgathasRoom @ 0x83B1928
 	.4byte gMapScripts_PokemonLeague_AgathasRoom @ 0x8162810
 	.4byte NULL
@@ -746,7 +746,7 @@ PokemonLeague_AgathasRoom:: @ 834FA80
 	.byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x06
 
 PokemonLeague_LancesRoom:: @ 834FA9C
-	.4byte gMapData_PokemonLeague_LancesRoom @ 0x831F9CC
+	.4byte PokemonLeague_LancesRoom_Layout @ 0x831F9CC
 	.4byte gMapEvents_PokemonLeague_LancesRoom @ 0x83B1964
 	.4byte gMapScripts_PokemonLeague_LancesRoom @ 0x816292D
 	.4byte NULL
@@ -755,7 +755,7 @@ PokemonLeague_LancesRoom:: @ 834FA9C
 	.byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x07
 
 PokemonLeague_ChampionsRoom:: @ 834FAB8
-	.4byte gMapData_PokemonLeague_ChampionsRoom @ 0x831FBF8
+	.4byte PokemonLeague_ChampionsRoom_Layout @ 0x831FBF8
 	.4byte gMapEvents_PokemonLeague_ChampionsRoom @ 0x83B19B8
 	.4byte gMapScripts_PokemonLeague_ChampionsRoom @ 0x8162AE2
 	.4byte NULL
@@ -764,7 +764,7 @@ PokemonLeague_ChampionsRoom:: @ 834FAB8
 	.byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 PokemonLeague_HallOfFame:: @ 834FAD4
-	.4byte gMapData_PokemonLeague_HallOfFame @ 0x831FD3C
+	.4byte PokemonLeague_HallOfFame_Layout @ 0x831FD3C
 	.4byte gMapEvents_PokemonLeague_HallOfFame @ 0x83B19EC
 	.4byte gMapScripts_PokemonLeague_HallOfFame @ 0x8162D4C
 	.4byte NULL
@@ -773,7 +773,7 @@ PokemonLeague_HallOfFame:: @ 834FAD4
 	.byte 0x89, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 RockTunnel_1F:: @ 834FAF0
-	.4byte gMapData_RockTunnel_1F @ 0x83130E4
+	.4byte RockTunnel_1F_Layout @ 0x83130E4
 	.4byte gMapEvents_RockTunnel_1F @ 0x83B1B2C
 	.4byte gMapScripts_RockTunnel_1F @ 0x8162DD6
 	.4byte NULL
@@ -782,7 +782,7 @@ RockTunnel_1F:: @ 834FAF0
 	.byte 0x8a, 0x01, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 RockTunnel_B1F:: @ 834FB0C
-	.4byte gMapData_RockTunnel_B1F @ 0x8314008
+	.4byte RockTunnel_B1F_Layout @ 0x8314008
 	.4byte gMapEvents_RockTunnel_B1F @ 0x83B1DD0
 	.4byte gMapScripts_RockTunnel_B1F @ 0x8162E8A
 	.4byte NULL
@@ -791,7 +791,7 @@ RockTunnel_B1F:: @ 834FB0C
 	.byte 0x8a, 0x01, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SeafoamIslands_1F:: @ 834FB28
-	.4byte gMapData_SeafoamIslands_1F @ 0x831474C
+	.4byte SeafoamIslands_1F_Layout @ 0x831474C
 	.4byte gMapEvents_SeafoamIslands_1F @ 0x83B1E64
 	.4byte gMapScripts_SeafoamIslands_1F @ 0x8162F43
 	.4byte NULL
@@ -800,7 +800,7 @@ SeafoamIslands_1F:: @ 834FB28
 	.byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SeafoamIslands_B1F:: @ 834FB44
-	.4byte gMapData_SeafoamIslands_B1F @ 0x8314E44
+	.4byte SeafoamIslands_B1F_Layout @ 0x8314E44
 	.4byte gMapEvents_SeafoamIslands_B1F @ 0x83B1F30
 	.4byte gMapScripts_SeafoamIslands_B1F @ 0x8162F4D
 	.4byte NULL
@@ -809,7 +809,7 @@ SeafoamIslands_B1F:: @ 834FB44
 	.byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SeafoamIslands_B2F:: @ 834FB60
-	.4byte gMapData_SeafoamIslands_B2F @ 0x8315588
+	.4byte SeafoamIslands_B2F_Layout @ 0x8315588
 	.4byte gMapEvents_SeafoamIslands_B2F @ 0x83B1FE4
 	.4byte gMapScripts_SeafoamIslands_B2F @ 0x8162F4E
 	.4byte NULL
@@ -818,7 +818,7 @@ SeafoamIslands_B2F:: @ 834FB60
 	.byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SeafoamIslands_B3F:: @ 834FB7C
-	.4byte gMapData_SeafoamIslands_B3F @ 0x8315CCC
+	.4byte SeafoamIslands_B3F_Layout @ 0x8315CCC
 	.4byte gMapEvents_SeafoamIslands_B3F @ 0x83B20DC
 	.4byte gMapScripts_SeafoamIslands_B3F @ 0x8162F4F
 	.4byte NULL
@@ -827,7 +827,7 @@ SeafoamIslands_B3F:: @ 834FB7C
 	.byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SeafoamIslands_B4F:: @ 834FB98
-	.4byte gMapData_SeafoamIslands_B4F @ 0x8316410
+	.4byte SeafoamIslands_B4F_Layout @ 0x8316410
 	.4byte gMapEvents_SeafoamIslands_B4F @ 0x83B21C4
 	.4byte gMapScripts_SeafoamIslands_B4F @ 0x816302E
 	.4byte NULL
@@ -836,7 +836,7 @@ SeafoamIslands_B4F:: @ 834FB98
 	.byte 0x8b, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 PokemonTower_1F:: @ 834FBB4
-	.4byte gMapData_PokemonTower_1F @ 0x83167F4
+	.4byte PokemonTower_1F_Layout @ 0x83167F4
 	.4byte gMapEvents_PokemonTower_1F @ 0x83B2270
 	.4byte gMapScripts_PokemonTower_1F @ 0x8163235
 	.4byte NULL
@@ -845,7 +845,7 @@ PokemonTower_1F:: @ 834FBB4
 	.byte 0x8c, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x02
 
 PokemonTower_2F:: @ 834FBD0
-	.4byte gMapData_PokemonTower_2F @ 0x8316BD8
+	.4byte PokemonTower_2F_Layout @ 0x8316BD8
 	.4byte gMapEvents_PokemonTower_2F @ 0x83B22E4
 	.4byte gMapScripts_PokemonTower_2F @ 0x8163285
 	.4byte NULL
@@ -854,7 +854,7 @@ PokemonTower_2F:: @ 834FBD0
 	.byte 0x8c, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x02
 
 PokemonTower_3F:: @ 834FBEC
-	.4byte gMapData_PokemonTower_3F @ 0x8316FBC
+	.4byte PokemonTower_3F_Layout @ 0x8316FBC
 	.4byte gMapEvents_PokemonTower_3F @ 0x83B2368
 	.4byte gMapScripts_PokemonTower_3F @ 0x81633A6
 	.4byte NULL
@@ -863,7 +863,7 @@ PokemonTower_3F:: @ 834FBEC
 	.byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02
 
 PokemonTower_4F:: @ 834FC08
-	.4byte gMapData_PokemonTower_4F @ 0x83173A0
+	.4byte PokemonTower_4F_Layout @ 0x83173A0
 	.4byte gMapEvents_PokemonTower_4F @ 0x83B241C
 	.4byte gMapScripts_PokemonTower_4F @ 0x81633EC
 	.4byte NULL
@@ -872,7 +872,7 @@ PokemonTower_4F:: @ 834FC08
 	.byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02
 
 PokemonTower_5F:: @ 834FC24
-	.4byte gMapData_PokemonTower_5F @ 0x8317784
+	.4byte PokemonTower_5F_Layout @ 0x8317784
 	.4byte gMapEvents_PokemonTower_5F @ 0x83B2604
 	.4byte gMapScripts_PokemonTower_5F @ 0x8163432
 	.4byte NULL
@@ -881,7 +881,7 @@ PokemonTower_5F:: @ 834FC24
 	.byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02
 
 PokemonTower_6F:: @ 834FC40
-	.4byte gMapData_PokemonTower_6F @ 0x8317B68
+	.4byte PokemonTower_6F_Layout @ 0x8317B68
 	.4byte gMapEvents_PokemonTower_6F @ 0x83B26C0
 	.4byte gMapScripts_PokemonTower_6F @ 0x81634B7
 	.4byte NULL
@@ -890,7 +890,7 @@ PokemonTower_6F:: @ 834FC40
 	.byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02
 
 PokemonTower_7F:: @ 834FC5C
-	.4byte gMapData_PokemonTower_7F @ 0x8317F4C
+	.4byte PokemonTower_7F_Layout @ 0x8317F4C
 	.4byte gMapEvents_PokemonTower_7F @ 0x83B2748
 	.4byte gMapScripts_PokemonTower_7F @ 0x8163559
 	.4byte NULL
@@ -899,7 +899,7 @@ PokemonTower_7F:: @ 834FC5C
 	.byte 0x8c, 0x00, 0x06, 0x08, 0x00, 0x05, 0x00, 0x02
 
 PowerPlant:: @ 834FC78
-	.4byte gMapData_PowerPlant @ 0x8318EC0
+	.4byte PowerPlant_Layout @ 0x8318EC0
 	.4byte gMapEvents_PowerPlant @ 0x83B285C
 	.4byte gMapScripts_PowerPlant @ 0x8163764
 	.4byte NULL
@@ -908,7 +908,7 @@ PowerPlant:: @ 834FC78
 	.byte 0x8e, 0x00, 0x00, 0x08, 0x00, 0x07, 0x00, 0x03
 
 MtEmber_RubyPath_B4F:: @ 834FC94
-	.4byte gMapData_MtEmber_RubyPath_B4F @ 0x8339290
+	.4byte MtEmber_RubyPath_B4F_Layout @ 0x8339290
 	.4byte gMapEvents_MtEmber_RubyPath_B4F @ 0x83B29B8
 	.4byte gMapScripts_MtEmber_RubyPath_B4F @ 0x81638EB
 	.4byte NULL
@@ -917,7 +917,7 @@ MtEmber_RubyPath_B4F:: @ 834FC94
 	.byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 MtEmber_Exterior:: @ 834FCB0
-	.4byte gMapData_MtEmber_Exterior @ 0x833D660
+	.4byte MtEmber_Exterior_Layout @ 0x833D660
 	.4byte gMapEvents_MtEmber_Exterior @ 0x83B2C24
 	.4byte gMapScripts_MtEmber_Exterior @ 0x8163946
 	.4byte NULL
@@ -926,7 +926,7 @@ MtEmber_Exterior:: @ 834FCB0
 	.byte 0xaf, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00
 
 MtEmber_SummitPath_1F:: @ 834FCCC
-	.4byte gMapData_MtEmber_SummitPath_1F @ 0x833DC08
+	.4byte MtEmber_SummitPath_1F_Layout @ 0x833DC08
 	.4byte gMapEvents_MtEmber_SummitPath_1F @ 0x83B2C48
 	.4byte gMapScripts_MtEmber_SummitPath_1F @ 0x8163AF9
 	.4byte NULL
@@ -935,7 +935,7 @@ MtEmber_SummitPath_1F:: @ 834FCCC
 	.byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 MtEmber_SummitPath_2F:: @ 834FCE8
-	.4byte gMapData_MtEmber_SummitPath_2F @ 0x833ED6C
+	.4byte MtEmber_SummitPath_2F_Layout @ 0x833ED6C
 	.4byte gMapEvents_MtEmber_SummitPath_2F @ 0x83B2D44
 	.4byte gMapScripts_MtEmber_SummitPath_2F @ 0x8163AFA
 	.4byte NULL
@@ -944,7 +944,7 @@ MtEmber_SummitPath_2F:: @ 834FCE8
 	.byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 MtEmber_SummitPath_3F:: @ 834FD04
-	.4byte gMapData_MtEmber_SummitPath_3F @ 0x833EEDC
+	.4byte MtEmber_SummitPath_3F_Layout @ 0x833EEDC
 	.4byte gMapEvents_MtEmber_SummitPath_3F @ 0x83B2D68
 	.4byte gMapScripts_MtEmber_SummitPath_3F @ 0x8163AFB
 	.4byte NULL
@@ -953,7 +953,7 @@ MtEmber_SummitPath_3F:: @ 834FD04
 	.byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 MtEmber_Summit:: @ 834FD20
-	.4byte gMapData_MtEmber_Summit @ 0x833D9C8
+	.4byte MtEmber_Summit_Layout @ 0x833D9C8
 	.4byte gMapEvents_MtEmber_Summit @ 0x83B2DFC
 	.4byte gMapScripts_MtEmber_Summit @ 0x8163AFC
 	.4byte NULL
@@ -962,7 +962,7 @@ MtEmber_Summit:: @ 834FD20
 	.byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 MtEmber_RubyPath_B5F:: @ 834FD3C
-	.4byte gMapData_MtEmber_RubyPath_B5F @ 0x833FF60
+	.4byte MtEmber_RubyPath_B5F_Layout @ 0x833FF60
 	.4byte gMapEvents_MtEmber_RubyPath_B5F @ 0x83B2E3C
 	.4byte gMapScripts_MtEmber_RubyPath_B5F @ 0x8163BAA
 	.4byte NULL
@@ -971,7 +971,7 @@ MtEmber_RubyPath_B5F:: @ 834FD3C
 	.byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SSAnne_Kitchen3:: @ 834FD58
-	.4byte gMapData_SSAnne_Kitchen3 @ 0x833F304
+	.4byte SSAnne_Kitchen3_Layout @ 0x833F304
 	.4byte gMapEvents_SSAnne_Kitchen3 @ 0x83B2EE0
 	.4byte gMapScripts_SSAnne_Kitchen3 @ 0x8163C45
 	.4byte NULL
@@ -980,7 +980,7 @@ SSAnne_Kitchen3:: @ 834FD58
 	.byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 MtEmber_RubyPath_B1F:: @ 834FD74
-	.4byte gMapData_MtEmber_RubyPath_B1F @ 0x833F524
+	.4byte MtEmber_RubyPath_B1F_Layout @ 0x833F524
 	.4byte gMapEvents_MtEmber_RubyPath_B1F @ 0x83B2F64
 	.4byte gMapScripts_MtEmber_RubyPath_B1F @ 0x8163C46
 	.4byte NULL
@@ -989,7 +989,7 @@ MtEmber_RubyPath_B1F:: @ 834FD74
 	.byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 MtEmber_RubyPath_B2F:: @ 834FD90
-	.4byte gMapData_MtEmber_RubyPath_B2F @ 0x833F6A8
+	.4byte MtEmber_RubyPath_B2F_Layout @ 0x833F6A8
 	.4byte gMapEvents_MtEmber_RubyPath_B2F @ 0x83B3030
 	.4byte gMapScripts_MtEmber_RubyPath_B2F @ 0x8163C47
 	.4byte NULL
@@ -998,7 +998,7 @@ MtEmber_RubyPath_B2F:: @ 834FD90
 	.byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 MtEmber_RubyPath_B3F:: @ 834FDAC
-	.4byte gMapData_MtEmber_RubyPath_B3F @ 0x833FC60
+	.4byte MtEmber_RubyPath_B3F_Layout @ 0x833FC60
 	.4byte gMapEvents_MtEmber_RubyPath_B3F @ 0x83B314C
 	.4byte gMapScripts_MtEmber_RubyPath_B3F @ 0x8163C48
 	.4byte NULL
@@ -1007,7 +1007,7 @@ MtEmber_RubyPath_B3F:: @ 834FDAC
 	.byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 MtEmber_RubyPath_B1F_Stairs:: @ 834FDC8
-	.4byte gMapData_MtEmber_RubyPath_B1F_Stairs @ 0x833FCD8
+	.4byte MtEmber_RubyPath_B1F_Stairs_Layout @ 0x833FCD8
 	.4byte gMapEvents_MtEmber_RubyPath_B1F_Stairs @ 0x83B3188
 	.4byte gMapScripts_MtEmber_RubyPath_B1F_Stairs @ 0x8163C6F
 	.4byte NULL
@@ -1016,7 +1016,7 @@ MtEmber_RubyPath_B1F_Stairs:: @ 834FDC8
 	.byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 MtEmber_RubyPath_B2F_Stairs:: @ 834FDE4
-	.4byte gMapData_MtEmber_RubyPath_B2F_Stairs @ 0x833FD5C
+	.4byte MtEmber_RubyPath_B2F_Stairs_Layout @ 0x833FD5C
 	.4byte gMapEvents_MtEmber_RubyPath_B2F_Stairs @ 0x83B31DC
 	.4byte gMapScripts_MtEmber_RubyPath_B2F_Stairs @ 0x8163C70
 	.4byte NULL
@@ -1025,7 +1025,7 @@ MtEmber_RubyPath_B2F_Stairs:: @ 834FDE4
 	.byte 0xaf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 ThreeIsland_BerryForest:: @ 834FE00
-	.4byte gMapData_ThreeIsland_BerryForest @ 0x833A7A8
+	.4byte ThreeIsland_BerryForest_Layout @ 0x833A7A8
 	.4byte gMapEvents_ThreeIsland_BerryForest @ 0x83B340C
 	.4byte gMapScripts_ThreeIsland_BerryForest @ 0x8163C71
 	.4byte NULL
@@ -1034,7 +1034,7 @@ ThreeIsland_BerryForest:: @ 834FE00
 	.byte 0xb0, 0x00, 0x0b, 0x03, 0x01, 0x07, 0x00, 0x00
 
 FourIsland_IcefallCave_Entrance:: @ 834FE1C
-	.4byte gMapData_FourIsland_IcefallCave_Entrance @ 0x8340E38
+	.4byte FourIsland_IcefallCave_Entrance_Layout @ 0x8340E38
 	.4byte gMapEvents_FourIsland_IcefallCave_Entrance @ 0x83B3438
 	.4byte gMapScripts_FourIsland_IcefallCave_Entrance @ 0x8163D3A
 	.4byte NULL
@@ -1043,7 +1043,7 @@ FourIsland_IcefallCave_Entrance:: @ 834FE1C
 	.byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 FourIsland_IcefallCave_1F:: @ 834FE38
-	.4byte gMapData_FourIsland_IcefallCave_1F @ 0x834117C
+	.4byte FourIsland_IcefallCave_1F_Layout @ 0x834117C
 	.4byte gMapEvents_FourIsland_IcefallCave_1F @ 0x83B34AC
 	.4byte gMapScripts_FourIsland_IcefallCave_1F @ 0x8163D44
 	.4byte NULL
@@ -1052,7 +1052,7 @@ FourIsland_IcefallCave_1F:: @ 834FE38
 	.byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SSAnne_CaptainsOffice2:: @ 834FE54
-	.4byte gMapData_SSAnne_CaptainsOffice2 @ 0x8341560
+	.4byte SSAnne_CaptainsOffice2_Layout @ 0x8341560
 	.4byte gMapEvents_SSAnne_CaptainsOffice2 @ 0x83B3508
 	.4byte gMapScripts_SSAnne_CaptainsOffice2 @ 0x8163D81
 	.4byte NULL
@@ -1061,7 +1061,7 @@ SSAnne_CaptainsOffice2:: @ 834FE54
 	.byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SSAnne_CaptainsOffice3:: @ 834FE70
-	.4byte gMapData_SSAnne_CaptainsOffice3 @ 0x8341A98
+	.4byte SSAnne_CaptainsOffice3_Layout @ 0x8341A98
 	.4byte gMapEvents_SSAnne_CaptainsOffice3 @ 0x83B35B4
 	.4byte gMapScripts_SSAnne_CaptainsOffice3 @ 0x8163D82
 	.4byte NULL
@@ -1070,7 +1070,7 @@ SSAnne_CaptainsOffice3:: @ 834FE70
 	.byte 0xb1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SSAnne_CaptainsOffice4:: @ 834FE8C
-	.4byte gMapData_SSAnne_CaptainsOffice4 @ 0x83405A4
+	.4byte SSAnne_CaptainsOffice4_Layout @ 0x83405A4
 	.4byte gMapEvents_SSAnne_CaptainsOffice4 @ 0x83B381C
 	.4byte gMapScripts_SSAnne_CaptainsOffice4 @ 0x8163F2E
 	.4byte NULL
@@ -1079,7 +1079,7 @@ SSAnne_CaptainsOffice4:: @ 834FE8C
 	.byte 0xb2, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00, 0x03
 
 SSAnne_CaptainsOffice5:: @ 834FEA8
-	.4byte gMapData_SSAnne_CaptainsOffice5 @ 0x83436C4
+	.4byte SSAnne_CaptainsOffice5_Layout @ 0x83436C4
 	.4byte gMapEvents_SSAnne_CaptainsOffice5 @ 0x83B3850
 	.4byte gMapScripts_SSAnne_CaptainsOffice5 @ 0x8164182
 	.4byte NULL
@@ -1088,7 +1088,7 @@ SSAnne_CaptainsOffice5:: @ 834FEA8
 	.byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SixIsland_DottedHole_B1F:: @ 834FEC4
-	.4byte gMapData_SixIsland_DottedHole_B1F @ 0x8343808
+	.4byte SixIsland_DottedHole_B1F_Layout @ 0x8343808
 	.4byte gMapEvents_SixIsland_DottedHole_B1F @ 0x83B3898
 	.4byte gMapScripts_SixIsland_DottedHole_B1F @ 0x81641B0
 	.4byte NULL
@@ -1097,7 +1097,7 @@ SixIsland_DottedHole_B1F:: @ 834FEC4
 	.byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SixIsland_DottedHole_B2F:: @ 834FEE0
-	.4byte gMapData_SixIsland_DottedHole_B2F @ 0x834394C
+	.4byte SixIsland_DottedHole_B2F_Layout @ 0x834394C
 	.4byte gMapEvents_SixIsland_DottedHole_B2F @ 0x83B38E0
 	.4byte gMapScripts_SixIsland_DottedHole_B2F @ 0x81641B1
 	.4byte NULL
@@ -1106,7 +1106,7 @@ SixIsland_DottedHole_B2F:: @ 834FEE0
 	.byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SixIsland_DottedHole_B3F:: @ 834FEFC
-	.4byte gMapData_SixIsland_DottedHole_B3F @ 0x8343A90
+	.4byte SixIsland_DottedHole_B3F_Layout @ 0x8343A90
 	.4byte gMapEvents_SixIsland_DottedHole_B3F @ 0x83B3928
 	.4byte gMapScripts_SixIsland_DottedHole_B3F @ 0x81641B2
 	.4byte NULL
@@ -1115,7 +1115,7 @@ SixIsland_DottedHole_B3F:: @ 834FEFC
 	.byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SSAnne_CaptainsOffice9:: @ 834FF18
-	.4byte gMapData_SSAnne_CaptainsOffice9 @ 0x8343BD4
+	.4byte SSAnne_CaptainsOffice9_Layout @ 0x8343BD4
 	.4byte gMapEvents_SSAnne_CaptainsOffice9 @ 0x83B3970
 	.4byte gMapScripts_SSAnne_CaptainsOffice9 @ 0x81641B3
 	.4byte NULL
@@ -1124,7 +1124,7 @@ SSAnne_CaptainsOffice9:: @ 834FF18
 	.byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SixIsland_DottedHole_SapphireRoom:: @ 834FF34
-	.4byte gMapData_SixIsland_DottedHole_SapphireRoom @ 0x8343DD8
+	.4byte SixIsland_DottedHole_SapphireRoom_Layout @ 0x8343DD8
 	.4byte gMapEvents_SixIsland_DottedHole_SapphireRoom @ 0x83B39D0
 	.4byte gMapScripts_SixIsland_DottedHole_SapphireRoom @ 0x81641B4
 	.4byte NULL
@@ -1133,7 +1133,7 @@ SixIsland_DottedHole_SapphireRoom:: @ 834FF34
 	.byte 0xb4, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SSAnne_1F_Room11:: @ 834FF50
-	.4byte gMapData_SSAnne_1F_Room11 @ 0x8345030
+	.4byte SSAnne_1F_Room11_Layout @ 0x8345030
 	.4byte gMapEvents_SSAnne_1F_Room11 @ 0x83B3B34
 	.4byte gMapScripts_SSAnne_1F_Room11 @ 0x8164559
 	.4byte NULL
@@ -1142,7 +1142,7 @@ SSAnne_1F_Room11:: @ 834FF50
 	.byte 0xb6, 0x00, 0x00, 0x03, 0x01, 0x07, 0x00, 0x00
 
 SSAnne_1F_Room12:: @ 834FF6C
-	.4byte gMapData_SSAnne_1F_Room12 @ 0x8347A50
+	.4byte SSAnne_1F_Room12_Layout @ 0x8347A50
 	.4byte gMapEvents_SSAnne_1F_Room12 @ 0x83B3B50
 	.4byte gMapScripts_SSAnne_1F_Room12 @ 0x81646A4
 	.4byte NULL
@@ -1151,7 +1151,7 @@ SSAnne_1F_Room12:: @ 834FF6C
 	.byte 0xb7, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 NavelRock_Exterior:: @ 834FF88
-	.4byte gMapData_NavelRock_Exterior @ 0x834873C
+	.4byte NavelRock_Exterior_Layout @ 0x834873C
 	.4byte gMapEvents_NavelRock_Exterior @ 0x83B3B74
 	.4byte gMapScripts_NavelRock_Exterior @ 0x81646AE
 	.4byte NULL
@@ -1160,7 +1160,7 @@ NavelRock_Exterior:: @ 834FF88
 	.byte 0xae, 0x00, 0x00, 0x03, 0x01, 0x06, 0x00, 0x00
 
 SevenIsland_TrainerTower_1F:: @ 834FFA4
-	.4byte gMapData_SevenIsland_TrainerTower_1F @ 0x8341FCC
+	.4byte SevenIsland_TrainerTower_1F_Layout @ 0x8341FCC
 	.4byte gMapEvents_SevenIsland_TrainerTower_1F @ 0x83B3C40
 	.4byte gMapScripts_SevenIsland_TrainerTower_1F @ 0x81646B8
 	.4byte NULL
@@ -1169,7 +1169,7 @@ SevenIsland_TrainerTower_1F:: @ 834FFA4
 	.byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00
 
 SevenIsland_TrainerTower_2F:: @ 834FFC0
-	.4byte gMapData_SevenIsland_TrainerTower_2F @ 0x8342254
+	.4byte SevenIsland_TrainerTower_2F_Layout @ 0x8342254
 	.4byte gMapEvents_SevenIsland_TrainerTower_2F @ 0x83B3D14
 	.4byte gMapScripts_SevenIsland_TrainerTower_2F @ 0x81646E6
 	.4byte NULL
@@ -1178,7 +1178,7 @@ SevenIsland_TrainerTower_2F:: @ 834FFC0
 	.byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00
 
 SevenIsland_TrainerTower_3F:: @ 834FFDC
-	.4byte gMapData_SevenIsland_TrainerTower_3F @ 0x83424DC
+	.4byte SevenIsland_TrainerTower_3F_Layout @ 0x83424DC
 	.4byte gMapEvents_SevenIsland_TrainerTower_3F @ 0x83B3DE8
 	.4byte gMapScripts_SevenIsland_TrainerTower_3F @ 0x8164714
 	.4byte NULL
@@ -1187,7 +1187,7 @@ SevenIsland_TrainerTower_3F:: @ 834FFDC
 	.byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00
 
 SevenIsland_TrainerTower_4F:: @ 834FFF8
-	.4byte gMapData_SevenIsland_TrainerTower_4F @ 0x8342764
+	.4byte SevenIsland_TrainerTower_4F_Layout @ 0x8342764
 	.4byte gMapEvents_SevenIsland_TrainerTower_4F @ 0x83B3EBC
 	.4byte gMapScripts_SevenIsland_TrainerTower_4F @ 0x8164742
 	.4byte NULL
@@ -1196,7 +1196,7 @@ SevenIsland_TrainerTower_4F:: @ 834FFF8
 	.byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00
 
 SevenIsland_TrainerTower_5F:: @ 8350014
-	.4byte gMapData_SevenIsland_TrainerTower_5F @ 0x83429EC
+	.4byte SevenIsland_TrainerTower_5F_Layout @ 0x83429EC
 	.4byte gMapEvents_SevenIsland_TrainerTower_5F @ 0x83B3F90
 	.4byte gMapScripts_SevenIsland_TrainerTower_5F @ 0x8164770
 	.4byte NULL
@@ -1205,7 +1205,7 @@ SevenIsland_TrainerTower_5F:: @ 8350014
 	.byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00
 
 SevenIsland_TrainerTower_6F:: @ 8350030
-	.4byte gMapData_SevenIsland_TrainerTower_6F @ 0x8342C74
+	.4byte SevenIsland_TrainerTower_6F_Layout @ 0x8342C74
 	.4byte gMapEvents_SevenIsland_TrainerTower_6F @ 0x83B4064
 	.4byte gMapScripts_SevenIsland_TrainerTower_6F @ 0x816479E
 	.4byte NULL
@@ -1214,7 +1214,7 @@ SevenIsland_TrainerTower_6F:: @ 8350030
 	.byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00
 
 SevenIsland_TrainerTower_7F:: @ 835004C
-	.4byte gMapData_SevenIsland_TrainerTower_7F @ 0x8342EFC
+	.4byte SevenIsland_TrainerTower_7F_Layout @ 0x8342EFC
 	.4byte gMapEvents_SevenIsland_TrainerTower_7F @ 0x83B4138
 	.4byte gMapScripts_SevenIsland_TrainerTower_7F @ 0x81647CC
 	.4byte NULL
@@ -1223,7 +1223,7 @@ SevenIsland_TrainerTower_7F:: @ 835004C
 	.byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00
 
 SevenIsland_TrainerTower_8F:: @ 8350068
-	.4byte gMapData_SevenIsland_TrainerTower_8F @ 0x8343184
+	.4byte SevenIsland_TrainerTower_8F_Layout @ 0x8343184
 	.4byte gMapEvents_SevenIsland_TrainerTower_8F @ 0x83B420C
 	.4byte gMapScripts_SevenIsland_TrainerTower_8F @ 0x81647FA
 	.4byte NULL
@@ -1232,7 +1232,7 @@ SevenIsland_TrainerTower_8F:: @ 8350068
 	.byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00
 
 SevenIsland_TrainerTower_Roof:: @ 8350084
-	.4byte gMapData_SevenIsland_TrainerTower_Roof @ 0x83433E8
+	.4byte SevenIsland_TrainerTower_Roof_Layout @ 0x83433E8
 	.4byte gMapEvents_SevenIsland_TrainerTower_Roof @ 0x83B4248
 	.4byte gMapScripts_SevenIsland_TrainerTower_Roof @ 0x8164828
 	.4byte NULL
@@ -1241,7 +1241,7 @@ SevenIsland_TrainerTower_Roof:: @ 8350084
 	.byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00
 
 SevenIsland_TrainerTower_Lobby:: @ 83500A0
-	.4byte gMapData_SevenIsland_TrainerTower_Lobby @ 0x8341D44
+	.4byte SevenIsland_TrainerTower_Lobby_Layout @ 0x8341D44
 	.4byte gMapEvents_SevenIsland_TrainerTower_Lobby @ 0x83B4308
 	.4byte gMapScripts_SevenIsland_TrainerTower_Lobby @ 0x8164839
 	.4byte NULL
@@ -1250,7 +1250,7 @@ SevenIsland_TrainerTower_Lobby:: @ 83500A0
 	.byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00
 
 SevenIsland_TrainerTower_Elevator:: @ 83500BC
-	.4byte gMapData_SevenIsland_TrainerTower_Elevator @ 0x8343454
+	.4byte SevenIsland_TrainerTower_Elevator_Layout @ 0x8343454
 	.4byte gMapEvents_SevenIsland_TrainerTower_Elevator @ 0x83B4330
 	.4byte gMapScripts_SevenIsland_TrainerTower_Elevator @ 0x8164AF8
 	.4byte NULL
@@ -1259,7 +1259,7 @@ SevenIsland_TrainerTower_Elevator:: @ 83500BC
 	.byte 0xb3, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00
 
 FiveIsland_LostCave_Entrance:: @ 83500D8
-	.4byte gMapData_FiveIsland_LostCave_Entrance @ 0x83454D8
+	.4byte FiveIsland_LostCave_Entrance_Layout @ 0x83454D8
 	.4byte gMapEvents_FiveIsland_LostCave_Entrance @ 0x83B4354
 	.4byte gMapScripts_FiveIsland_LostCave_Entrance @ 0x8164BEC
 	.4byte NULL
@@ -1268,7 +1268,7 @@ FiveIsland_LostCave_Entrance:: @ 83500D8
 	.byte 0xb5, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 FiveIsland_LostCave_Room1:: @ 83500F4
-	.4byte gMapData_FiveIsland_LostCave_Room1 @ 0x83455F0
+	.4byte FiveIsland_LostCave_Room1_Layout @ 0x83455F0
 	.4byte gMapEvents_FiveIsland_LostCave_Room1 @ 0x83B43A8
 	.4byte gMapScripts_FiveIsland_LostCave_Room1 @ 0x8164BF6
 	.4byte NULL
@@ -1277,7 +1277,7 @@ FiveIsland_LostCave_Room1:: @ 83500F4
 	.byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00
 
 FiveIsland_LostCave_Room2:: @ 8350110
-	.4byte gMapData_FiveIsland_LostCave_Room2 @ 0x8345708
+	.4byte FiveIsland_LostCave_Room2_Layout @ 0x8345708
 	.4byte gMapEvents_FiveIsland_LostCave_Room2 @ 0x83B43DC
 	.4byte gMapScripts_FiveIsland_LostCave_Room2 @ 0x8164C0E
 	.4byte NULL
@@ -1286,7 +1286,7 @@ FiveIsland_LostCave_Room2:: @ 8350110
 	.byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00
 
 FiveIsland_LostCave_Room3:: @ 835012C
-	.4byte gMapData_FiveIsland_LostCave_Room3 @ 0x8345820
+	.4byte FiveIsland_LostCave_Room3_Layout @ 0x8345820
 	.4byte gMapEvents_FiveIsland_LostCave_Room3 @ 0x83B4410
 	.4byte gMapScripts_FiveIsland_LostCave_Room3 @ 0x8164C0F
 	.4byte NULL
@@ -1295,7 +1295,7 @@ FiveIsland_LostCave_Room3:: @ 835012C
 	.byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00
 
 FiveIsland_LostCave_Room4:: @ 8350148
-	.4byte gMapData_FiveIsland_LostCave_Room4 @ 0x8345938
+	.4byte FiveIsland_LostCave_Room4_Layout @ 0x8345938
 	.4byte gMapEvents_FiveIsland_LostCave_Room4 @ 0x83B445C
 	.4byte gMapScripts_FiveIsland_LostCave_Room4 @ 0x8164C10
 	.4byte NULL
@@ -1304,7 +1304,7 @@ FiveIsland_LostCave_Room4:: @ 8350148
 	.byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00
 
 FiveIsland_LostCave_Room5:: @ 8350164
-	.4byte gMapData_FiveIsland_LostCave_Room5 @ 0x8345A50
+	.4byte FiveIsland_LostCave_Room5_Layout @ 0x8345A50
 	.4byte gMapEvents_FiveIsland_LostCave_Room5 @ 0x83B4490
 	.4byte gMapScripts_FiveIsland_LostCave_Room5 @ 0x8164C28
 	.4byte NULL
@@ -1313,7 +1313,7 @@ FiveIsland_LostCave_Room5:: @ 8350164
 	.byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00
 
 FiveIsland_LostCave_Room6:: @ 8350180
-	.4byte gMapData_FiveIsland_LostCave_Room6 @ 0x8345B68
+	.4byte FiveIsland_LostCave_Room6_Layout @ 0x8345B68
 	.4byte gMapEvents_FiveIsland_LostCave_Room6 @ 0x83B44C4
 	.4byte gMapScripts_FiveIsland_LostCave_Room6 @ 0x8164C29
 	.4byte NULL
@@ -1322,7 +1322,7 @@ FiveIsland_LostCave_Room6:: @ 8350180
 	.byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00
 
 FiveIsland_LostCave_Room7:: @ 835019C
-	.4byte gMapData_FiveIsland_LostCave_Room7 @ 0x8345C80
+	.4byte FiveIsland_LostCave_Room7_Layout @ 0x8345C80
 	.4byte gMapEvents_FiveIsland_LostCave_Room7 @ 0x83B44F8
 	.4byte gMapScripts_FiveIsland_LostCave_Room7 @ 0x8164C2A
 	.4byte NULL
@@ -1331,7 +1331,7 @@ FiveIsland_LostCave_Room7:: @ 835019C
 	.byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00
 
 FiveIsland_LostCave_Room8:: @ 83501B8
-	.4byte gMapData_FiveIsland_LostCave_Room8 @ 0x8345D98
+	.4byte FiveIsland_LostCave_Room8_Layout @ 0x8345D98
 	.4byte gMapEvents_FiveIsland_LostCave_Room8 @ 0x83B452C
 	.4byte gMapScripts_FiveIsland_LostCave_Room8 @ 0x8164C2B
 	.4byte NULL
@@ -1340,7 +1340,7 @@ FiveIsland_LostCave_Room8:: @ 83501B8
 	.byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00
 
 FiveIsland_LostCave_Room9:: @ 83501D4
-	.4byte gMapData_FiveIsland_LostCave_Room9 @ 0x8345EB0
+	.4byte FiveIsland_LostCave_Room9_Layout @ 0x8345EB0
 	.4byte gMapEvents_FiveIsland_LostCave_Room9 @ 0x83B4560
 	.4byte gMapScripts_FiveIsland_LostCave_Room9 @ 0x8164C2C
 	.4byte NULL
@@ -1349,7 +1349,7 @@ FiveIsland_LostCave_Room9:: @ 83501D4
 	.byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00
 
 FiveIsland_LostCave_Room10:: @ 83501F0
-	.4byte gMapData_FiveIsland_LostCave_Room10 @ 0x8345FC8
+	.4byte FiveIsland_LostCave_Room10_Layout @ 0x8345FC8
 	.4byte gMapEvents_FiveIsland_LostCave_Room10 @ 0x83B45AC
 	.4byte gMapScripts_FiveIsland_LostCave_Room10 @ 0x8164C2D
 	.4byte NULL
@@ -1358,7 +1358,7 @@ FiveIsland_LostCave_Room10:: @ 83501F0
 	.byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00
 
 FiveIsland_LostCave_Room11:: @ 835020C
-	.4byte gMapData_FiveIsland_LostCave_Room11 @ 0x83460E0
+	.4byte FiveIsland_LostCave_Room11_Layout @ 0x83460E0
 	.4byte gMapEvents_FiveIsland_LostCave_Room11 @ 0x83B45E0
 	.4byte gMapScripts_FiveIsland_LostCave_Room11 @ 0x8164CCB
 	.4byte NULL
@@ -1367,7 +1367,7 @@ FiveIsland_LostCave_Room11:: @ 835020C
 	.byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00
 
 FiveIsland_LostCave_Room12:: @ 8350228
-	.4byte gMapData_FiveIsland_LostCave_Room12 @ 0x83461F8
+	.4byte FiveIsland_LostCave_Room12_Layout @ 0x83461F8
 	.4byte gMapEvents_FiveIsland_LostCave_Room12 @ 0x83B4614
 	.4byte gMapScripts_FiveIsland_LostCave_Room12 @ 0x8164CCC
 	.4byte NULL
@@ -1376,7 +1376,7 @@ FiveIsland_LostCave_Room12:: @ 8350228
 	.byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00
 
 FiveIsland_LostCave_Room13:: @ 8350244
-	.4byte gMapData_FiveIsland_LostCave_Room13 @ 0x8346310
+	.4byte FiveIsland_LostCave_Room13_Layout @ 0x8346310
 	.4byte gMapEvents_FiveIsland_LostCave_Room13 @ 0x83B4648
 	.4byte gMapScripts_FiveIsland_LostCave_Room13 @ 0x8164CCD
 	.4byte NULL
@@ -1385,7 +1385,7 @@ FiveIsland_LostCave_Room13:: @ 8350244
 	.byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00
 
 FiveIsland_LostCave_Room14:: @ 8350260
-	.4byte gMapData_FiveIsland_LostCave_Room14 @ 0x8346428
+	.4byte FiveIsland_LostCave_Room14_Layout @ 0x8346428
 	.4byte gMapEvents_FiveIsland_LostCave_Room14 @ 0x83B467C
 	.4byte gMapScripts_FiveIsland_LostCave_Room14 @ 0x8164CCE
 	.4byte NULL
@@ -1394,7 +1394,7 @@ FiveIsland_LostCave_Room14:: @ 8350260
 	.byte 0xb5, 0x00, 0x06, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SevenIsland_TanobyRuins_MoneanChamber:: @ 835027C
-	.4byte gMapData_SevenIsland_TanobyRuins_MoneanChamber @ 0x834675C
+	.4byte SevenIsland_TanobyRuins_MoneanChamber_Layout @ 0x834675C
 	.4byte gMapEvents_SevenIsland_TanobyRuins_MoneanChamber @ 0x83B4698
 	.4byte gMapScripts_SevenIsland_TanobyRuins_MoneanChamber @ 0x8164CCF
 	.4byte NULL
@@ -1403,7 +1403,7 @@ SevenIsland_TanobyRuins_MoneanChamber:: @ 835027C
 	.byte 0xbc, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02
 
 SevenIsland_TanobyRuins_LiptooChamber:: @ 8350298
-	.4byte gMapData_SevenIsland_TanobyRuins_LiptooChamber @ 0x8346A90
+	.4byte SevenIsland_TanobyRuins_LiptooChamber_Layout @ 0x8346A90
 	.4byte gMapEvents_SevenIsland_TanobyRuins_LiptooChamber @ 0x83B46B4
 	.4byte gMapScripts_SevenIsland_TanobyRuins_LiptooChamber @ 0x8164CDE
 	.4byte NULL
@@ -1412,7 +1412,7 @@ SevenIsland_TanobyRuins_LiptooChamber:: @ 8350298
 	.byte 0xbd, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02
 
 SevenIsland_TanobyRuins_WeepthChamber:: @ 83502B4
-	.4byte gMapData_SevenIsland_TanobyRuins_WeepthChamber @ 0x8346DC4
+	.4byte SevenIsland_TanobyRuins_WeepthChamber_Layout @ 0x8346DC4
 	.4byte gMapEvents_SevenIsland_TanobyRuins_WeepthChamber @ 0x83B46D0
 	.4byte gMapScripts_SevenIsland_TanobyRuins_WeepthChamber @ 0x8164CEA
 	.4byte NULL
@@ -1421,7 +1421,7 @@ SevenIsland_TanobyRuins_WeepthChamber:: @ 83502B4
 	.byte 0xbe, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02
 
 SevenIsland_TanobyRuins_DilfordChamber:: @ 83502D0
-	.4byte gMapData_SevenIsland_TanobyRuins_DilfordChamber @ 0x83470F8
+	.4byte SevenIsland_TanobyRuins_DilfordChamber_Layout @ 0x83470F8
 	.4byte gMapEvents_SevenIsland_TanobyRuins_DilfordChamber @ 0x83B46EC
 	.4byte gMapScripts_SevenIsland_TanobyRuins_DilfordChamber @ 0x8164CF6
 	.4byte NULL
@@ -1430,7 +1430,7 @@ SevenIsland_TanobyRuins_DilfordChamber:: @ 83502D0
 	.byte 0xbf, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02
 
 SevenIsland_TanobyRuins_ScufibChamber:: @ 83502EC
-	.4byte gMapData_SevenIsland_TanobyRuins_ScufibChamber @ 0x834742C
+	.4byte SevenIsland_TanobyRuins_ScufibChamber_Layout @ 0x834742C
 	.4byte gMapEvents_SevenIsland_TanobyRuins_ScufibChamber @ 0x83B4708
 	.4byte gMapScripts_SevenIsland_TanobyRuins_ScufibChamber @ 0x8164D02
 	.4byte NULL
@@ -1439,7 +1439,7 @@ SevenIsland_TanobyRuins_ScufibChamber:: @ 83502EC
 	.byte 0xc0, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02
 
 SevenIsland_TanobyRuins_RixyChamber:: @ 8350308
-	.4byte gMapData_SevenIsland_TanobyRuins_RixyChamber @ 0x8349DC8
+	.4byte SevenIsland_TanobyRuins_RixyChamber_Layout @ 0x8349DC8
 	.4byte gMapEvents_SevenIsland_TanobyRuins_RixyChamber @ 0x83B4724
 	.4byte gMapScripts_SevenIsland_TanobyRuins_RixyChamber @ 0x8164D0E
 	.4byte NULL
@@ -1448,7 +1448,7 @@ SevenIsland_TanobyRuins_RixyChamber:: @ 8350308
 	.byte 0xc1, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02
 
 SevenIsland_TanobyRuins_ViapoisChamber:: @ 8350324
-	.4byte gMapData_SevenIsland_TanobyRuins_ViapoisChamber @ 0x834A0FC
+	.4byte SevenIsland_TanobyRuins_ViapoisChamber_Layout @ 0x834A0FC
 	.4byte gMapEvents_SevenIsland_TanobyRuins_ViapoisChamber @ 0x83B4740
 	.4byte gMapScripts_SevenIsland_TanobyRuins_ViapoisChamber @ 0x8164D1A
 	.4byte NULL
@@ -1457,7 +1457,7 @@ SevenIsland_TanobyRuins_ViapoisChamber:: @ 8350324
 	.byte 0xc2, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02
 
 ThreeIsland_DunsparceTunnel:: @ 8350340
-	.4byte gMapData_ThreeIsland_DunsparceTunnel @ 0x83451F8
+	.4byte ThreeIsland_DunsparceTunnel_Layout @ 0x83451F8
 	.4byte gMapEvents_ThreeIsland_DunsparceTunnel @ 0x83B4788
 	.4byte gMapScripts_ThreeIsland_DunsparceTunnel @ 0x8164D26
 	.4byte NULL
@@ -1466,7 +1466,7 @@ ThreeIsland_DunsparceTunnel:: @ 8350340
 	.byte 0xb9, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x00
 
 SevenIsland_SeavaultCanyon_TanobyKey:: @ 835035C
-	.4byte gMapData_SevenIsland_SeavaultCanyon_TanobyKey @ 0x8347C54
+	.4byte SevenIsland_SeavaultCanyon_TanobyKey_Layout @ 0x8347C54
 	.4byte gMapEvents_SevenIsland_SeavaultCanyon_TanobyKey @ 0x83B48BC
 	.4byte gMapScripts_SevenIsland_SeavaultCanyon_TanobyKey @ 0x8164DCC
 	.4byte NULL
@@ -1475,7 +1475,7 @@ SevenIsland_SeavaultCanyon_TanobyKey:: @ 835035C
 	.byte 0xba, 0x00, 0x00, 0x04, 0x01, 0x07, 0x00, 0x02
 
 NavelRock_1F:: @ 8350378
-	.4byte gMapData_NavelRock_1F @ 0x8348AD4
+	.4byte NavelRock_1F_Layout @ 0x8348AD4
 	.4byte gMapEvents_NavelRock_1F @ 0x83B48E0
 	.4byte gMapScripts_NavelRock_1F @ 0x8164F9E
 	.4byte NULL
@@ -1484,7 +1484,7 @@ NavelRock_1F:: @ 8350378
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_Summit:: @ 8350394
-	.4byte gMapData_NavelRock_Summit @ 0x8348EB0
+	.4byte NavelRock_Summit_Layout @ 0x8348EB0
 	.4byte gMapEvents_NavelRock_Summit @ 0x83B4930
 	.4byte gMapScripts_NavelRock_Summit @ 0x8164F9F
 	.4byte NULL
@@ -1493,7 +1493,7 @@ NavelRock_Summit:: @ 8350394
 	.byte 0xae, 0x00, 0x0b, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_Base:: @ 83503B0
-	.4byte gMapData_NavelRock_Base @ 0x834929C
+	.4byte NavelRock_Base_Layout @ 0x834929C
 	.4byte gMapEvents_NavelRock_Base @ 0x83B4964
 	.4byte gMapScripts_NavelRock_Base @ 0x81650E7
 	.4byte NULL
@@ -1502,7 +1502,7 @@ NavelRock_Base:: @ 83503B0
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_SummitPath_2F:: @ 83503CC
-	.4byte gMapData_NavelRock_SummitPath_2F @ 0x8349324
+	.4byte NavelRock_SummitPath_2F_Layout @ 0x8349324
 	.4byte gMapEvents_NavelRock_SummitPath_2F @ 0x83B4988
 	.4byte gMapScripts_NavelRock_SummitPath_2F @ 0x81651F2
 	.4byte NULL
@@ -1511,7 +1511,7 @@ NavelRock_SummitPath_2F:: @ 83503CC
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_SummitPath_3F:: @ 83503E8
-	.4byte gMapData_NavelRock_SummitPath_3F @ 0x83493AC
+	.4byte NavelRock_SummitPath_3F_Layout @ 0x83493AC
 	.4byte gMapEvents_NavelRock_SummitPath_3F @ 0x83B49AC
 	.4byte gMapScripts_NavelRock_SummitPath_3F @ 0x81651F3
 	.4byte NULL
@@ -1520,7 +1520,7 @@ NavelRock_SummitPath_3F:: @ 83503E8
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_SummitPath_4F:: @ 8350404
-	.4byte gMapData_NavelRock_SummitPath_4F @ 0x8349434
+	.4byte NavelRock_SummitPath_4F_Layout @ 0x8349434
 	.4byte gMapEvents_NavelRock_SummitPath_4F @ 0x83B49D0
 	.4byte gMapScripts_NavelRock_SummitPath_4F @ 0x81651F4
 	.4byte NULL
@@ -1529,7 +1529,7 @@ NavelRock_SummitPath_4F:: @ 8350404
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_SummitPath_5F:: @ 8350420
-	.4byte gMapData_NavelRock_SummitPath_5F @ 0x83494BC
+	.4byte NavelRock_SummitPath_5F_Layout @ 0x83494BC
 	.4byte gMapEvents_NavelRock_SummitPath_5F @ 0x83B49F4
 	.4byte gMapScripts_NavelRock_SummitPath_5F @ 0x81651F5
 	.4byte NULL
@@ -1538,7 +1538,7 @@ NavelRock_SummitPath_5F:: @ 8350420
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_BasePath_B1F:: @ 835043C
-	.4byte gMapData_NavelRock_BasePath_B1F @ 0x8349544
+	.4byte NavelRock_BasePath_B1F_Layout @ 0x8349544
 	.4byte gMapEvents_NavelRock_BasePath_B1F @ 0x83B4A18
 	.4byte gMapScripts_NavelRock_BasePath_B1F @ 0x81651F6
 	.4byte NULL
@@ -1547,7 +1547,7 @@ NavelRock_BasePath_B1F:: @ 835043C
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_BasePath_B2F:: @ 8350458
-	.4byte gMapData_NavelRock_BasePath_B2F @ 0x83495CC
+	.4byte NavelRock_BasePath_B2F_Layout @ 0x83495CC
 	.4byte gMapEvents_NavelRock_BasePath_B2F @ 0x83B4A3C
 	.4byte gMapScripts_NavelRock_BasePath_B2F @ 0x81651F7
 	.4byte NULL
@@ -1556,7 +1556,7 @@ NavelRock_BasePath_B2F:: @ 8350458
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_BasePath_B3F:: @ 8350474
-	.4byte gMapData_NavelRock_BasePath_B3F @ 0x8349654
+	.4byte NavelRock_BasePath_B3F_Layout @ 0x8349654
 	.4byte gMapEvents_NavelRock_BasePath_B3F @ 0x83B4A60
 	.4byte gMapScripts_NavelRock_BasePath_B3F @ 0x81651F8
 	.4byte NULL
@@ -1565,7 +1565,7 @@ NavelRock_BasePath_B3F:: @ 8350474
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_BasePath_B4F:: @ 8350490
-	.4byte gMapData_NavelRock_BasePath_B4F @ 0x83496DC
+	.4byte NavelRock_BasePath_B4F_Layout @ 0x83496DC
 	.4byte gMapEvents_NavelRock_BasePath_B4F @ 0x83B4A84
 	.4byte gMapScripts_NavelRock_BasePath_B4F @ 0x81651F9
 	.4byte NULL
@@ -1574,7 +1574,7 @@ NavelRock_BasePath_B4F:: @ 8350490
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_BasePath_B5F:: @ 83504AC
-	.4byte gMapData_NavelRock_BasePath_B5F @ 0x8349764
+	.4byte NavelRock_BasePath_B5F_Layout @ 0x8349764
 	.4byte gMapEvents_NavelRock_BasePath_B5F @ 0x83B4AA8
 	.4byte gMapScripts_NavelRock_BasePath_B5F @ 0x81651FA
 	.4byte NULL
@@ -1583,7 +1583,7 @@ NavelRock_BasePath_B5F:: @ 83504AC
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_BasePath_B6F:: @ 83504C8
-	.4byte gMapData_NavelRock_BasePath_B6F @ 0x83497EC
+	.4byte NavelRock_BasePath_B6F_Layout @ 0x83497EC
 	.4byte gMapEvents_NavelRock_BasePath_B6F @ 0x83B4ACC
 	.4byte gMapScripts_NavelRock_BasePath_B6F @ 0x81651FB
 	.4byte NULL
@@ -1592,7 +1592,7 @@ NavelRock_BasePath_B6F:: @ 83504C8
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_BasePath_B7F:: @ 83504E4
-	.4byte gMapData_NavelRock_BasePath_B7F @ 0x8349874
+	.4byte NavelRock_BasePath_B7F_Layout @ 0x8349874
 	.4byte gMapEvents_NavelRock_BasePath_B7F @ 0x83B4AF0
 	.4byte gMapScripts_NavelRock_BasePath_B7F @ 0x81651FC
 	.4byte NULL
@@ -1601,7 +1601,7 @@ NavelRock_BasePath_B7F:: @ 83504E4
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_BasePath_B8F:: @ 8350500
-	.4byte gMapData_NavelRock_BasePath_B8F @ 0x83498FC
+	.4byte NavelRock_BasePath_B8F_Layout @ 0x83498FC
 	.4byte gMapEvents_NavelRock_BasePath_B8F @ 0x83B4B14
 	.4byte gMapScripts_NavelRock_BasePath_B8F @ 0x81651FD
 	.4byte NULL
@@ -1610,7 +1610,7 @@ NavelRock_BasePath_B8F:: @ 8350500
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_BasePath_B9F:: @ 835051C
-	.4byte gMapData_NavelRock_BasePath_B9F @ 0x8349984
+	.4byte NavelRock_BasePath_B9F_Layout @ 0x8349984
 	.4byte gMapEvents_NavelRock_BasePath_B9F @ 0x83B4B38
 	.4byte gMapScripts_NavelRock_BasePath_B9F @ 0x81651FE
 	.4byte NULL
@@ -1619,7 +1619,7 @@ NavelRock_BasePath_B9F:: @ 835051C
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_BasePath_B10F:: @ 8350538
-	.4byte gMapData_NavelRock_BasePath_B10F @ 0x8349A0C
+	.4byte NavelRock_BasePath_B10F_Layout @ 0x8349A0C
 	.4byte gMapEvents_NavelRock_BasePath_B10F @ 0x83B4B5C
 	.4byte gMapScripts_NavelRock_BasePath_B10F @ 0x81651FF
 	.4byte NULL
@@ -1628,7 +1628,7 @@ NavelRock_BasePath_B10F:: @ 8350538
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_BasePath_B11F:: @ 8350554
-	.4byte gMapData_NavelRock_BasePath_B11F @ 0x8349A94
+	.4byte NavelRock_BasePath_B11F_Layout @ 0x8349A94
 	.4byte gMapEvents_NavelRock_BasePath_B11F @ 0x83B4B80
 	.4byte gMapScripts_NavelRock_BasePath_B11F @ 0x8165200
 	.4byte NULL
@@ -1637,7 +1637,7 @@ NavelRock_BasePath_B11F:: @ 8350554
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_B1F:: @ 8350570
-	.4byte gMapData_NavelRock_B1F @ 0x834A210
+	.4byte NavelRock_B1F_Layout @ 0x834A210
 	.4byte gMapEvents_NavelRock_B1F @ 0x83B4BA4
 	.4byte gMapScripts_NavelRock_B1F @ 0x8165201
 	.4byte NULL
@@ -1646,7 +1646,7 @@ NavelRock_B1F:: @ 8350570
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 NavelRock_Fork:: @ 835058C
-	.4byte gMapData_NavelRock_Fork @ 0x834B9A4
+	.4byte NavelRock_Fork_Layout @ 0x834B9A4
 	.4byte gMapEvents_NavelRock_Fork @ 0x83B4BD0
 	.4byte gMapScripts_NavelRock_Fork @ 0x8165202
 	.4byte NULL
@@ -1655,7 +1655,7 @@ NavelRock_Fork:: @ 835058C
 	.byte 0xae, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 BirthIsland_Exterior:: @ 83505A8
-	.4byte gMapData_BirthIsland_Exterior @ 0x8348380
+	.4byte BirthIsland_Exterior_Layout @ 0x8348380
 	.4byte gMapEvents_BirthIsland_Exterior @ 0x83B4C1C
 	.4byte gMapScripts_BirthIsland_Exterior @ 0x8165203
 	.4byte NULL
@@ -1664,7 +1664,7 @@ BirthIsland_Exterior:: @ 83505A8
 	.byte 0xbb, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00
 
 OneIsland_KindleRoad_EmberSpa:: @ 83505C4
-	.4byte gMapData_OneIsland_KindleRoad_EmberSpa @ 0x834EB70
+	.4byte OneIsland_KindleRoad_EmberSpa_Layout @ 0x834EB70
 	.4byte gMapEvents_OneIsland_KindleRoad_EmberSpa @ 0x83B4CD8
 	.4byte gMapScripts_OneIsland_KindleRoad_EmberSpa @ 0x816535B
 	.4byte NULL
@@ -1673,7 +1673,7 @@ OneIsland_KindleRoad_EmberSpa:: @ 83505C4
 	.byte 0xc3, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00
 
 BirthIsland_Harbor:: @ 83505E0
-	.4byte gMapData_BirthIsland_Harbor @ 0x8343FB8
+	.4byte Island_Harbor_Layout @ 0x8343FB8
 	.4byte gMapEvents_BirthIsland_Harbor @ 0x83B4D24
 	.4byte gMapScripts_BirthIsland_Harbor @ 0x81653E6
 	.4byte NULL
@@ -1682,7 +1682,7 @@ BirthIsland_Harbor:: @ 83505E0
 	.byte 0xbb, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 NavelRock_Harbor:: @ 83505FC
-	.4byte gMapData_NavelRock_Harbor @ 0x8343FB8
+	.4byte Island_Harbor_Layout @ 0x8343FB8
 	.4byte gMapEvents_NavelRock_Harbor @ 0x83B4D70
 	.4byte gMapScripts_NavelRock_Harbor @ 0x8165420
 	.4byte NULL
@@ -1691,7 +1691,7 @@ NavelRock_Harbor:: @ 83505FC
 	.byte 0xae, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 PalletTown:: @ 8350618
-	.4byte gMapData_PalletTown @ 0x82DD4C0
+	.4byte PalletTown_Layout @ 0x82DD4C0
 	.4byte gMapEvents_PalletTown @ 0x83B4E50
 	.4byte gMapScripts_PalletTown @ 0x816545A
 	.4byte gMapConnections_PalletTown @ 0x835276C
@@ -1700,7 +1700,7 @@ PalletTown:: @ 8350618
 	.byte 0x58, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 ViridianCity:: @ 8350634
-	.4byte gMapData_ViridianCity @ 0x82DE3E4
+	.4byte ViridianCity_Layout @ 0x82DE3E4
 	.4byte gMapEvents_ViridianCity @ 0x83B4FE0
 	.4byte gMapScripts_ViridianCity @ 0x81658D3
 	.4byte gMapConnections_ViridianCity @ 0x8352798
@@ -1709,7 +1709,7 @@ ViridianCity:: @ 8350634
 	.byte 0x59, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 PewterCity:: @ 8350650
-	.4byte gMapData_PewterCity @ 0x82DF308
+	.4byte PewterCity_Layout @ 0x82DF308
 	.4byte gMapEvents_PewterCity @ 0x83B518C
 	.4byte gMapScripts_PewterCity @ 0x8165B8E
 	.4byte gMapConnections_PewterCity @ 0x83527B8
@@ -1718,7 +1718,7 @@ PewterCity:: @ 8350650
 	.byte 0x5a, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 CeruleanCity:: @ 835066C
-	.4byte gMapData_CeruleanCity @ 0x82E022C
+	.4byte CeruleanCity_Layout @ 0x82E022C
 	.4byte gMapEvents_CeruleanCity @ 0x83B53E0
 	.4byte gMapScripts_CeruleanCity @ 0x8166471
 	.4byte gMapConnections_CeruleanCity @ 0x83527F0
@@ -1727,7 +1727,7 @@ CeruleanCity:: @ 835066C
 	.byte 0x5b, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 LavenderTown:: @ 8350688
-	.4byte gMapData_LavenderTown @ 0x82E0610
+	.4byte LavenderTown_Layout @ 0x82E0610
 	.4byte gMapEvents_LavenderTown @ 0x83B549C
 	.4byte gMapScripts_LavenderTown @ 0x816686B
 	.4byte gMapConnections_LavenderTown @ 0x835281C
@@ -1736,7 +1736,7 @@ LavenderTown:: @ 8350688
 	.byte 0x5c, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 VermilionCity:: @ 83506A4
-	.4byte gMapData_VermilionCity @ 0x82E1534
+	.4byte VermilionCity_Layout @ 0x82E1534
 	.4byte gMapEvents_VermilionCity @ 0x83B5648
 	.4byte gMapScripts_VermilionCity @ 0x81668DC
 	.4byte gMapConnections_VermilionCity @ 0x835283C
@@ -1745,7 +1745,7 @@ VermilionCity:: @ 83506A4
 	.byte 0x5d, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 CeladonCity:: @ 83506C0
-	.4byte gMapData_CeladonCity @ 0x82E2818
+	.4byte CeladonCity_Layout @ 0x82E2818
 	.4byte gMapEvents_CeladonCity @ 0x83B5898
 	.4byte gMapScripts_CeladonCity @ 0x8166C8F
 	.4byte gMapConnections_CeladonCity @ 0x835285C
@@ -1754,7 +1754,7 @@ CeladonCity:: @ 83506C0
 	.byte 0x5e, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 FuchsiaCity:: @ 83506DC
-	.4byte gMapData_FuchsiaCity @ 0x82E373C
+	.4byte FuchsiaCity_Layout @ 0x82E373C
 	.4byte gMapEvents_FuchsiaCity @ 0x83B5B14
 	.4byte gMapScripts_FuchsiaCity @ 0x8166D75
 	.4byte gMapConnections_FuchsiaCity @ 0x8352888
@@ -1763,7 +1763,7 @@ FuchsiaCity:: @ 83506DC
 	.byte 0x5f, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 CinnabarIsland:: @ 83506F8
-	.4byte gMapData_CinnabarIsland @ 0x82E3B20
+	.4byte CinnabarIsland_Layout @ 0x82E3B20
 	.4byte gMapEvents_CinnabarIsland @ 0x83B5BF0
 	.4byte gMapScripts_CinnabarIsland @ 0x8166ED6
 	.4byte gMapConnections_CinnabarIsland @ 0x83528A8
@@ -1772,7 +1772,7 @@ CinnabarIsland:: @ 83506F8
 	.byte 0x60, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 IndigoPlateau_Exterior:: @ 8350714
-	.4byte gMapData_IndigoPlateau_Exterior @ 0x82E3F04
+	.4byte IndigoPlateau_Exterior_Layout @ 0x82E3F04
 	.4byte gMapEvents_IndigoPlateau_Exterior @ 0x83B5C3C
 	.4byte gMapScripts_IndigoPlateau_Exterior @ 0x816723B
 	.4byte gMapConnections_IndigoPlateau_Exterior @ 0x83528BC
@@ -1781,7 +1781,7 @@ IndigoPlateau_Exterior:: @ 8350714
 	.byte 0x61, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 SaffronCity_Duplicate:: @ 8350730
-	.4byte gMapData_SaffronCity_Duplicate @ 0x831E8D4
+	.4byte SaffronCity_Duplicate_Layout @ 0x831E8D4
 	.4byte gMapEvents_SaffronCity_Duplicate @ 0x83B5E9C
 	.4byte gMapScripts_SaffronCity_Duplicate @ 0x816735F
 	.4byte NULL
@@ -1790,7 +1790,7 @@ SaffronCity_Duplicate:: @ 8350730
 	.byte 0x62, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 SaffronCity:: @ 835074C
-	.4byte gMapData_SaffronCity @ 0x82E4E28
+	.4byte SaffronCity_Layout @ 0x82E4E28
 	.4byte gMapEvents_SaffronCity @ 0x83B5EB0
 	.4byte gMapScripts_SaffronCity @ 0x8167483
 	.4byte gMapConnections_SaffronCity @ 0x835292C
@@ -1799,7 +1799,7 @@ SaffronCity:: @ 835074C
 	.byte 0x62, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 OneIsland:: @ 8350768
-	.4byte gMapData_OneIsland @ 0x8321714
+	.4byte OneIsland_Layout @ 0x8321714
 	.4byte gMapEvents_OneIsland @ 0x83B5F44
 	.4byte gMapScripts_OneIsland @ 0x8167484
 	.4byte gMapConnections_OneIsland @ 0x835294C
@@ -1808,7 +1808,7 @@ OneIsland:: @ 8350768
 	.byte 0x8f, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 TwoIsland:: @ 8350784
-	.4byte gMapData_TwoIsland @ 0x8321EB8
+	.4byte TwoIsland_Layout @ 0x8321EB8
 	.4byte gMapEvents_TwoIsland @ 0x83B6074
 	.4byte gMapScripts_TwoIsland @ 0x8167564
 	.4byte gMapConnections_TwoIsland @ 0x8352960
@@ -1817,7 +1817,7 @@ TwoIsland:: @ 8350784
 	.byte 0x90, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 ThreeIsland:: @ 83507A0
-	.4byte gMapData_ThreeIsland @ 0x832265C
+	.4byte ThreeIsland_Layout @ 0x832265C
 	.4byte gMapEvents_ThreeIsland @ 0x83B62C8
 	.4byte gMapScripts_ThreeIsland @ 0x81677AD
 	.4byte gMapConnections_ThreeIsland @ 0x8352980
@@ -1826,7 +1826,7 @@ ThreeIsland:: @ 83507A0
 	.byte 0x91, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 FourIsland:: @ 83507BC
-	.4byte gMapData_FourIsland @ 0x8323580
+	.4byte FourIsland_Layout @ 0x8323580
 	.4byte gMapEvents_FourIsland @ 0x83B646C
 	.4byte gMapScripts_FourIsland @ 0x8167CAE
 	.4byte NULL
@@ -1835,7 +1835,7 @@ FourIsland:: @ 83507BC
 	.byte 0x92, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 FiveIsland:: @ 83507D8
-	.4byte gMapData_FiveIsland @ 0x8323964
+	.4byte FiveIsland_Layout @ 0x8323964
 	.4byte gMapEvents_FiveIsland @ 0x83B64F4
 	.4byte gMapScripts_FiveIsland @ 0x8167E8E
 	.4byte gMapConnections_FiveIsland @ 0x83529A0
@@ -1844,7 +1844,7 @@ FiveIsland:: @ 83507D8
 	.byte 0x93, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 SevenIsland:: @ 83507F4
-	.4byte gMapData_SevenIsland @ 0x8323D48
+	.4byte SevenIsland_Layout @ 0x8323D48
 	.4byte gMapEvents_SevenIsland @ 0x83B657C
 	.4byte gMapScripts_SevenIsland @ 0x8167EB3
 	.4byte gMapConnections_SevenIsland @ 0x83529C0
@@ -1853,7 +1853,7 @@ SevenIsland:: @ 83507F4
 	.byte 0x94, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 SixIsland:: @ 8350810
-	.4byte gMapData_SixIsland @ 0x832430C
+	.4byte SixIsland_Layout @ 0x832430C
 	.4byte gMapEvents_SixIsland @ 0x83B65F8
 	.4byte gMapScripts_SixIsland @ 0x8167ED8
 	.4byte gMapConnections_SixIsland @ 0x83529D4
@@ -1862,7 +1862,7 @@ SixIsland:: @ 8350810
 	.byte 0x95, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
 
 Route1:: @ 835082C
-	.4byte gMapData_Route1 @ 0x82E55CC
+	.4byte Route1_Layout @ 0x82E55CC
 	.4byte gMapEvents_Route1 @ 0x83B6648
 	.4byte gMapScripts_Route1 @ 0x8167EFD
 	.4byte gMapConnections_Route1 @ 0x83529F4
@@ -1871,7 +1871,7 @@ Route1:: @ 835082C
 	.byte 0x65, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route2:: @ 8350848
-	.4byte gMapData_Route2 @ 0x82E64F0
+	.4byte Route2_Layout @ 0x82E64F0
 	.4byte gMapEvents_Route2 @ 0x83B676C
 	.4byte gMapScripts_Route2 @ 0x8167F64
 	.4byte gMapConnections_Route2 @ 0x8352A14
@@ -1880,7 +1880,7 @@ Route2:: @ 8350848
 	.byte 0x66, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route3:: @ 8350864
-	.4byte gMapData_Route3 @ 0x82E7234
+	.4byte Route3_Layout @ 0x82E7234
 	.4byte gMapEvents_Route3 @ 0x83B6870
 	.4byte gMapScripts_Route3 @ 0x8167F77
 	.4byte gMapConnections_Route3 @ 0x8352A34
@@ -1889,7 +1889,7 @@ Route3:: @ 8350864
 	.byte 0x67, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route4:: @ 8350880
-	.4byte gMapData_Route4 @ 0x82E8338
+	.4byte Route4_Layout @ 0x82E8338
 	.4byte gMapEvents_Route4 @ 0x83B6980
 	.4byte gMapScripts_Route4 @ 0x8167F8A
 	.4byte gMapConnections_Route4 @ 0x8352A54
@@ -1898,7 +1898,7 @@ Route4:: @ 8350880
 	.byte 0x68, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route5:: @ 835089C
-	.4byte gMapData_Route5 @ 0x82E925C
+	.4byte Route5_Layout @ 0x82E925C
 	.4byte gMapEvents_Route5 @ 0x83B69C0
 	.4byte gMapScripts_Route5 @ 0x8167FA7
 	.4byte gMapConnections_Route5 @ 0x8352A74
@@ -1907,7 +1907,7 @@ Route5:: @ 835089C
 	.byte 0x69, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route6:: @ 83508B8
-	.4byte gMapData_Route6 @ 0x82E9A00
+	.4byte Route6_Layout @ 0x82E9A00
 	.4byte gMapEvents_Route6 @ 0x83B6AA0
 	.4byte gMapScripts_Route6 @ 0x8167FB1
 	.4byte gMapConnections_Route6 @ 0x8352A94
@@ -1916,7 +1916,7 @@ Route6:: @ 83508B8
 	.byte 0x6a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route7:: @ 83508D4
-	.4byte gMapData_Route7 @ 0x82E9DE4
+	.4byte Route7_Layout @ 0x82E9DE4
 	.4byte gMapEvents_Route7 @ 0x83B6AF4
 	.4byte gMapScripts_Route7 @ 0x8167FBB
 	.4byte gMapConnections_Route7 @ 0x8352AB4
@@ -1925,7 +1925,7 @@ Route7:: @ 83508D4
 	.byte 0x6b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route8:: @ 83508F0
-	.4byte gMapData_Route8 @ 0x82EA948
+	.4byte Route8_Layout @ 0x82EA948
 	.4byte gMapEvents_Route8 @ 0x83B6CB0
 	.4byte gMapScripts_Route8 @ 0x8167FC5
 	.4byte gMapConnections_Route8 @ 0x8352AD4
@@ -1934,7 +1934,7 @@ Route8:: @ 83508F0
 	.byte 0x6c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route9:: @ 835090C
-	.4byte gMapData_Route9 @ 0x82EB4AC
+	.4byte Route9_Layout @ 0x82EB4AC
 	.4byte gMapEvents_Route9 @ 0x83B6E14
 	.4byte gMapScripts_Route9 @ 0x8167FCF
 	.4byte gMapConnections_Route9 @ 0x8352AF4
@@ -1943,7 +1943,7 @@ Route9:: @ 835090C
 	.byte 0x6d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route10:: @ 8350928
-	.4byte gMapData_Route10 @ 0x82EC3D0
+	.4byte Route10_Layout @ 0x82EC3D0
 	.4byte gMapEvents_Route10 @ 0x83B6FA0
 	.4byte gMapScripts_Route10 @ 0x8167FD9
 	.4byte gMapConnections_Route10 @ 0x8352B14
@@ -1952,7 +1952,7 @@ Route10:: @ 8350928
 	.byte 0x6e, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route11:: @ 8350944
-	.4byte gMapData_Route11 @ 0x82ECF34
+	.4byte Route11_Layout @ 0x82ECF34
 	.4byte gMapEvents_Route11 @ 0x83B711C
 	.4byte gMapScripts_Route11 @ 0x8167FF6
 	.4byte gMapConnections_Route11 @ 0x8352B34
@@ -1961,7 +1961,7 @@ Route11:: @ 8350944
 	.byte 0x6f, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route12:: @ 8350960
-	.4byte gMapData_Route12 @ 0x82EE5D8
+	.4byte Route12_Layout @ 0x82EE5D8
 	.4byte gMapEvents_Route12 @ 0x83B72DC
 	.4byte gMapScripts_Route12 @ 0x8168000
 	.4byte gMapConnections_Route12 @ 0x8352B60
@@ -1970,7 +1970,7 @@ Route12:: @ 8350960
 	.byte 0x70, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route13:: @ 835097C
-	.4byte gMapData_Route13 @ 0x82EF13C
+	.4byte Route13_Layout @ 0x82EF13C
 	.4byte gMapEvents_Route13 @ 0x83B7428
 	.4byte gMapScripts_Route13 @ 0x81680B5
 	.4byte gMapConnections_Route13 @ 0x8352B80
@@ -1979,7 +1979,7 @@ Route13:: @ 835097C
 	.byte 0x71, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route14:: @ 8350998
-	.4byte gMapData_Route14 @ 0x82EFCA0
+	.4byte Route14_Layout @ 0x82EFCA0
 	.4byte gMapEvents_Route14 @ 0x83B75C8
 	.4byte gMapScripts_Route14 @ 0x81680D1
 	.4byte gMapConnections_Route14 @ 0x8352BA0
@@ -1988,7 +1988,7 @@ Route14:: @ 8350998
 	.byte 0x72, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route15:: @ 83509B4
-	.4byte gMapData_Route15 @ 0x82F0804
+	.4byte Route15_Layout @ 0x82F0804
 	.4byte gMapEvents_Route15 @ 0x83B7748
 	.4byte gMapScripts_Route15 @ 0x81680DB
 	.4byte gMapConnections_Route15 @ 0x8352BC0
@@ -1997,7 +1997,7 @@ Route15:: @ 83509B4
 	.byte 0x73, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route16:: @ 83509D0
-	.4byte gMapData_Route16 @ 0x82F0FA8
+	.4byte Route16_Layout @ 0x82F0FA8
 	.4byte gMapEvents_Route16 @ 0x83B7898
 	.4byte gMapScripts_Route16 @ 0x81680E5
 	.4byte gMapConnections_Route16 @ 0x8352BE0
@@ -2006,7 +2006,7 @@ Route16:: @ 83509D0
 	.byte 0x74, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route17:: @ 83509EC
-	.4byte gMapData_Route17 @ 0x82F2DCC
+	.4byte Route17_Layout @ 0x82F2DCC
 	.4byte gMapEvents_Route17 @ 0x83B7A20
 	.4byte gMapScripts_Route17 @ 0x81681BF
 	.4byte gMapConnections_Route17 @ 0x8352C00
@@ -2015,7 +2015,7 @@ Route17:: @ 83509EC
 	.byte 0x75, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route18:: @ 8350A08
-	.4byte gMapData_Route18 @ 0x82F3750
+	.4byte Route18_Layout @ 0x82F3750
 	.4byte gMapEvents_Route18 @ 0x83B7AA4
 	.4byte gMapScripts_Route18 @ 0x81681F6
 	.4byte gMapConnections_Route18 @ 0x8352C20
@@ -2024,7 +2024,7 @@ Route18:: @ 8350A08
 	.byte 0x76, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route19:: @ 8350A24
-	.4byte gMapData_Route19 @ 0x82F42B4
+	.4byte Route19_Layout @ 0x82F42B4
 	.4byte gMapEvents_Route19 @ 0x83B7BE4
 	.4byte gMapScripts_Route19 @ 0x8168231
 	.4byte gMapConnections_Route19 @ 0x8352C40
@@ -2033,7 +2033,7 @@ Route19:: @ 8350A24
 	.byte 0x77, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route20:: @ 8350A40
-	.4byte gMapData_Route20 @ 0x82F5598
+	.4byte Route20_Layout @ 0x82F5598
 	.4byte gMapEvents_Route20 @ 0x83B7D34
 	.4byte gMapScripts_Route20 @ 0x816823B
 	.4byte gMapConnections_Route20 @ 0x8352C60
@@ -2042,7 +2042,7 @@ Route20:: @ 8350A40
 	.byte 0x78, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route21_North:: @ 8350A5C
-	.4byte gMapData_Route21_North @ 0x82F5F1C
+	.4byte Route21_North_Layout @ 0x82F5F1C
 	.4byte gMapEvents_Route21_North @ 0x83B7DE4
 	.4byte gMapScripts_Route21_North @ 0x8168289
 	.4byte gMapConnections_Route21_North @ 0x8352C80
@@ -2051,7 +2051,7 @@ Route21_North:: @ 8350A5C
 	.byte 0x79, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route21_South:: @ 8350A78
-	.4byte gMapData_Route21_South @ 0x83206C0
+	.4byte Route21_South_Layout @ 0x83206C0
 	.4byte gMapEvents_Route21_South @ 0x83B7E70
 	.4byte gMapScripts_Route21_South @ 0x816828A
 	.4byte gMapConnections_Route21_South @ 0x8352CA0
@@ -2060,7 +2060,7 @@ Route21_South:: @ 8350A78
 	.byte 0x79, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route22:: @ 8350A94
-	.4byte gMapData_Route22 @ 0x82F6840
+	.4byte Route22_Layout @ 0x82F6840
 	.4byte gMapEvents_Route22 @ 0x83B7F18
 	.4byte gMapScripts_Route22 @ 0x816828B
 	.4byte gMapConnections_Route22 @ 0x8352CC0
@@ -2069,7 +2069,7 @@ Route22:: @ 8350A94
 	.byte 0x7a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route23:: @ 8350AB0
-	.4byte gMapData_Route23 @ 0x82F8664
+	.4byte Route23_Layout @ 0x82F8664
 	.4byte gMapEvents_Route23 @ 0x83B8300
 	.4byte gMapScripts_Route23 @ 0x81684EB
 	.4byte gMapConnections_Route23 @ 0x8352CE0
@@ -2078,7 +2078,7 @@ Route23:: @ 8350AB0
 	.byte 0x7b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route24:: @ 8350ACC
-	.4byte gMapData_Route24 @ 0x82F8E08
+	.4byte Route24_Layout @ 0x82F8E08
 	.4byte gMapEvents_Route24 @ 0x83B8400
 	.4byte gMapScripts_Route24 @ 0x816861F
 	.4byte gMapConnections_Route24 @ 0x8352D00
@@ -2087,7 +2087,7 @@ Route24:: @ 8350ACC
 	.byte 0x7c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 Route25:: @ 8350AE8
-	.4byte gMapData_Route25 @ 0x82F996C
+	.4byte Route25_Layout @ 0x82F996C
 	.4byte gMapEvents_Route25 @ 0x83B8590
 	.4byte gMapScripts_Route25 @ 0x8168745
 	.4byte gMapConnections_Route25 @ 0x8352D14
@@ -2096,7 +2096,7 @@ Route25:: @ 8350AE8
 	.byte 0x7d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 OneIsland_KindleRoad:: @ 8350B04
-	.4byte gMapData_OneIsland_KindleRoad @ 0x8325D70
+	.4byte OneIsland_KindleRoad_Layout @ 0x8325D70
 	.4byte gMapEvents_OneIsland_KindleRoad @ 0x83B888C
 	.4byte gMapScripts_OneIsland_KindleRoad @ 0x8168758
 	.4byte gMapConnections_OneIsland_KindleRoad @ 0x8352D28
@@ -2105,7 +2105,7 @@ OneIsland_KindleRoad:: @ 8350B04
 	.byte 0x96, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 OneIsland_TreasureBeach:: @ 8350B20
-	.4byte gMapData_OneIsland_TreasureBeach @ 0x8326514
+	.4byte OneIsland_TreasureBeach_Layout @ 0x8326514
 	.4byte gMapEvents_OneIsland_TreasureBeach @ 0x83B8930
 	.4byte gMapScripts_OneIsland_TreasureBeach @ 0x816876B
 	.4byte gMapConnections_OneIsland_TreasureBeach @ 0x8352D3C
@@ -2114,7 +2114,7 @@ OneIsland_TreasureBeach:: @ 8350B20
 	.byte 0x97, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 TwoIsland_CapeBrink:: @ 8350B3C
-	.4byte gMapData_TwoIsland_CapeBrink @ 0x8326CB8
+	.4byte TwoIsland_CapeBrink_Layout @ 0x8326CB8
 	.4byte gMapEvents_TwoIsland_CapeBrink @ 0x83B8964
 	.4byte gMapScripts_TwoIsland_CapeBrink @ 0x8168775
 	.4byte gMapConnections_TwoIsland_CapeBrink @ 0x8352D50
@@ -2123,7 +2123,7 @@ TwoIsland_CapeBrink:: @ 8350B3C
 	.byte 0x98, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 ThreeIsland_BondBridge:: @ 8350B58
-	.4byte gMapData_ThreeIsland_BondBridge @ 0x8327BDC
+	.4byte ThreeIsland_BondBridge_Layout @ 0x8327BDC
 	.4byte gMapEvents_ThreeIsland_BondBridge @ 0x83B8A9C
 	.4byte gMapScripts_ThreeIsland_BondBridge @ 0x8168776
 	.4byte gMapConnections_ThreeIsland_BondBridge @ 0x8352D64
@@ -2132,7 +2132,7 @@ ThreeIsland_BondBridge:: @ 8350B58
 	.byte 0x99, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 ThreeIsland_Port:: @ 8350B74
-	.4byte gMapData_ThreeIsland_Port @ 0x8328380
+	.4byte ThreeIsland_Port_Layout @ 0x8328380
 	.4byte gMapEvents_ThreeIsland_Port @ 0x83B8B10
 	.4byte gMapScripts_ThreeIsland_Port @ 0x8168789
 	.4byte gMapConnections_ThreeIsland_Port @ 0x8352D78
@@ -2141,7 +2141,7 @@ ThreeIsland_Port:: @ 8350B74
 	.byte 0x9a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 UnknownMap_03_50:: @ 8350B90
-	.4byte gMapData_UnknownMap_03_50 @ 0x83283A8
+	.4byte UnknownMap_03_50_Layout @ 0x83283A8
 	.4byte gMapEvents_UnknownMap_03_50 @ 0x83B8B24
 	.4byte gMapScripts_UnknownMap_03_50 @ 0x81687E0
 	.4byte gMapConnections_UnknownMap_03_50 @ 0x8352D8C
@@ -2150,7 +2150,7 @@ UnknownMap_03_50:: @ 8350B90
 	.byte 0x9b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 UnknownMap_03_51:: @ 8350BAC
-	.4byte gMapData_UnknownMap_03_51 @ 0x83283D0
+	.4byte UnknownMap_03_51_Layout @ 0x83283D0
 	.4byte gMapEvents_UnknownMap_03_51 @ 0x83B8B38
 	.4byte gMapScripts_UnknownMap_03_51 @ 0x81687E1
 	.4byte gMapConnections_UnknownMap_03_51 @ 0x8352DA0
@@ -2159,7 +2159,7 @@ UnknownMap_03_51:: @ 8350BAC
 	.byte 0x9c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 UnknownMap_03_52:: @ 8350BC8
-	.4byte gMapData_UnknownMap_03_52 @ 0x8329114
+	.4byte UnknownMap_03_52_Layout @ 0x8329114
 	.4byte gMapEvents_UnknownMap_03_52 @ 0x83B8B4C
 	.4byte gMapScripts_UnknownMap_03_52 @ 0x81687E2
 	.4byte NULL
@@ -2168,7 +2168,7 @@ UnknownMap_03_52:: @ 8350BC8
 	.byte 0x9d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 UnknownMap_03_53:: @ 8350BE4
-	.4byte gMapData_UnknownMap_03_53 @ 0x8329C78
+	.4byte UnknownMap_03_53_Layout @ 0x8329C78
 	.4byte gMapEvents_UnknownMap_03_53 @ 0x83B8B60
 	.4byte gMapScripts_UnknownMap_03_53 @ 0x81687E3
 	.4byte NULL
@@ -2177,7 +2177,7 @@ UnknownMap_03_53:: @ 8350BE4
 	.byte 0x9e, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 FiveIsland_ResortGorgeous:: @ 8350C00
-	.4byte gMapData_FiveIsland_ResortGorgeous @ 0x832A7DC
+	.4byte FiveIsland_ResortGorgeous_Layout @ 0x832A7DC
 	.4byte gMapEvents_FiveIsland_ResortGorgeous @ 0x83B8C80
 	.4byte gMapScripts_FiveIsland_ResortGorgeous @ 0x81687E4
 	.4byte gMapConnections_FiveIsland_ResortGorgeous @ 0x8352DB4
@@ -2186,7 +2186,7 @@ FiveIsland_ResortGorgeous:: @ 8350C00
 	.byte 0x9f, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 FiveIsland_WaterLabyrinth:: @ 8350C1C
-	.4byte gMapData_FiveIsland_WaterLabyrinth @ 0x832B340
+	.4byte FiveIsland_WaterLabyrinth_Layout @ 0x832B340
 	.4byte gMapEvents_FiveIsland_WaterLabyrinth @ 0x83B8CC4
 	.4byte gMapScripts_FiveIsland_WaterLabyrinth @ 0x816884D
 	.4byte gMapConnections_FiveIsland_WaterLabyrinth @ 0x8352DD4
@@ -2195,7 +2195,7 @@ FiveIsland_WaterLabyrinth:: @ 8350C1C
 	.byte 0xa0, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 FiveIsland_Meadow:: @ 8350C38
-	.4byte gMapData_FiveIsland_Meadow @ 0x832BAE4
+	.4byte FiveIsland_Meadow_Layout @ 0x832BAE4
 	.4byte gMapEvents_FiveIsland_Meadow @ 0x83B8D94
 	.4byte gMapScripts_FiveIsland_Meadow @ 0x8168932
 	.4byte gMapConnections_FiveIsland_Meadow @ 0x8352DF4
@@ -2204,7 +2204,7 @@ FiveIsland_Meadow:: @ 8350C38
 	.byte 0xa1, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 FiveIsland_MemorialPillar:: @ 8350C54
-	.4byte gMapData_FiveIsland_MemorialPillar @ 0x832C648
+	.4byte FiveIsland_MemorialPillar_Layout @ 0x832C648
 	.4byte gMapEvents_FiveIsland_MemorialPillar @ 0x83B8E5C
 	.4byte gMapScripts_FiveIsland_MemorialPillar @ 0x81689D2
 	.4byte gMapConnections_FiveIsland_MemorialPillar @ 0x8352E08
@@ -2213,7 +2213,7 @@ FiveIsland_MemorialPillar:: @ 8350C54
 	.byte 0xa2, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 SixIsland_OutcastIsland:: @ 8350C70
-	.4byte gMapData_SixIsland_OutcastIsland @ 0x832D56C
+	.4byte SixIsland_OutcastIsland_Layout @ 0x832D56C
 	.4byte gMapEvents_SixIsland_OutcastIsland @ 0x83B8F38
 	.4byte gMapScripts_SixIsland_OutcastIsland @ 0x8168B15
 	.4byte gMapConnections_SixIsland_OutcastIsland @ 0x8352E1C
@@ -2222,7 +2222,7 @@ SixIsland_OutcastIsland:: @ 8350C70
 	.byte 0xa3, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 SixIsland_GreenPath:: @ 8350C8C
-	.4byte gMapData_SixIsland_GreenPath @ 0x832E0D0
+	.4byte SixIsland_GreenPath_Layout @ 0x832E0D0
 	.4byte gMapEvents_SixIsland_GreenPath @ 0x83B8FA8
 	.4byte gMapScripts_SixIsland_GreenPath @ 0x8168B2D
 	.4byte gMapConnections_SixIsland_GreenPath @ 0x8352E3C
@@ -2231,7 +2231,7 @@ SixIsland_GreenPath:: @ 8350C8C
 	.byte 0xa4, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 SixIsland_WaterPath:: @ 8350CA8
-	.4byte gMapData_SixIsland_WaterPath @ 0x832F3B4
+	.4byte SixIsland_WaterPath_Layout @ 0x832F3B4
 	.4byte gMapEvents_SixIsland_WaterPath @ 0x83B90E0
 	.4byte gMapScripts_SixIsland_WaterPath @ 0x8168B40
 	.4byte gMapConnections_SixIsland_WaterPath @ 0x8352E68
@@ -2240,7 +2240,7 @@ SixIsland_WaterPath:: @ 8350CA8
 	.byte 0xa5, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 SixIsland_RuinValley:: @ 8350CC4
-	.4byte gMapData_SixIsland_RuinValley @ 0x83302D8
+	.4byte SixIsland_RuinValley_Layout @ 0x83302D8
 	.4byte gMapEvents_SixIsland_RuinValley @ 0x83B92A0
 	.4byte gMapScripts_SixIsland_RuinValley @ 0x8168B53
 	.4byte gMapConnections_SixIsland_RuinValley @ 0x8352E7C
@@ -2249,7 +2249,7 @@ SixIsland_RuinValley:: @ 8350CC4
 	.byte 0xa6, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 SevenIsland_TrainerTower:: @ 8350CE0
-	.4byte gMapData_SevenIsland_TrainerTower @ 0x833287C
+	.4byte SevenIsland_TrainerTower_Layout @ 0x833287C
 	.4byte gMapEvents_SevenIsland_TrainerTower @ 0x83B9328
 	.4byte gMapScripts_SevenIsland_TrainerTower @ 0x8168BD5
 	.4byte gMapConnections_SevenIsland_TrainerTower @ 0x8352E90
@@ -2258,7 +2258,7 @@ SevenIsland_TrainerTower:: @ 8350CE0
 	.byte 0xa7, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 SevenIsland_SevaultCanyon_Entrance:: @ 8350CFC
-	.4byte gMapData_SevenIsland_SevaultCanyon_Entrance @ 0x8333020
+	.4byte SevenIsland_SevaultCanyon_Entrance_Layout @ 0x8333020
 	.4byte gMapEvents_SevenIsland_SevaultCanyon_Entrance @ 0x83B93FC
 	.4byte gMapScripts_SevenIsland_SevaultCanyon_Entrance @ 0x8168BF3
 	.4byte gMapConnections_SevenIsland_SevaultCanyon_Entrance @ 0x8352EB0
@@ -2267,7 +2267,7 @@ SevenIsland_SevaultCanyon_Entrance:: @ 8350CFC
 	.byte 0xa8, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 SevenIsland_SevaultCanyon:: @ 8350D18
-	.4byte gMapData_SevenIsland_SevaultCanyon @ 0x8333F44
+	.4byte SevenIsland_SevaultCanyon_Layout @ 0x8333F44
 	.4byte gMapEvents_SevenIsland_SevaultCanyon @ 0x83B9618
 	.4byte gMapScripts_SevenIsland_SevaultCanyon @ 0x8168BFD
 	.4byte gMapConnections_SevenIsland_SevaultCanyon @ 0x8352ED0
@@ -2276,7 +2276,7 @@ SevenIsland_SevaultCanyon:: @ 8350D18
 	.byte 0xa9, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 SevenIsland_TanobyRuins:: @ 8350D34
-	.4byte gMapData_SevenIsland_TanobyRuins @ 0x83355E8
+	.4byte SevenIsland_TanobyRuins_Layout @ 0x83355E8
 	.4byte gMapEvents_SevenIsland_TanobyRuins @ 0x83B96F4
 	.4byte gMapScripts_SevenIsland_TanobyRuins @ 0x8168C07
 	.4byte gMapConnections_SevenIsland_TanobyRuins @ 0x8352EE4
@@ -2285,7 +2285,7 @@ SevenIsland_TanobyRuins:: @ 8350D34
 	.byte 0xaa, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
 
 PalletTown_PlayersHouse_1F:: @ 8350D50
-	.4byte gMapData_PalletTown_PlayersHouse_1F @ 0x82D5200
+	.4byte PalletTown_PlayersHouse_1F_Layout @ 0x82D5200
 	.4byte gMapEvents_PalletTown_PlayersHouse_1F @ 0x83B974C
 	.4byte gMapScripts_PalletTown_PlayersHouse_1F @ 0x8168C08
 	.4byte NULL
@@ -2294,7 +2294,7 @@ PalletTown_PlayersHouse_1F:: @ 8350D50
 	.byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 PalletTown_PlayersHouse_2F:: @ 8350D6C
-	.4byte gMapData_PalletTown_PlayersHouse_2F @ 0x82D52FC
+	.4byte PalletTown_PlayersHouse_2F_Layout @ 0x82D52FC
 	.4byte gMapEvents_PalletTown_PlayersHouse_2F @ 0x83B978C
 	.4byte gMapScripts_PalletTown_PlayersHouse_2F @ 0x8168CA3
 	.4byte NULL
@@ -2303,7 +2303,7 @@ PalletTown_PlayersHouse_2F:: @ 8350D6C
 	.byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 PalletTown_GarysHouse:: @ 8350D88
-	.4byte gMapData_PalletTown_GarysHouse @ 0x82D5424
+	.4byte PalletTown_GarysHouse_Layout @ 0x82D5424
 	.4byte gMapEvents_PalletTown_GarysHouse @ 0x83B980C
 	.4byte gMapScripts_PalletTown_GarysHouse @ 0x8168D27
 	.4byte NULL
@@ -2312,7 +2312,7 @@ PalletTown_GarysHouse:: @ 8350D88
 	.byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 PalletTown_ProfessorOaksLab:: @ 8350DA4
-	.4byte gMapData_PalletTown_ProfessorOaksLab @ 0x82D5668
+	.4byte PalletTown_ProfessorOaksLab_Layout @ 0x82D5668
 	.4byte gMapEvents_PalletTown_ProfessorOaksLab @ 0x83B99B8
 	.4byte gMapScripts_PalletTown_ProfessorOaksLab @ 0x8168F7E
 	.4byte NULL
@@ -2321,7 +2321,7 @@ PalletTown_ProfessorOaksLab:: @ 8350DA4
 	.byte 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 ViridianCity_House1:: @ 8350DC0
-	.4byte gMapData_ViridianCity_House1 @ 0x833AEAC
+	.4byte ViridianCity_House1_Layout @ 0x833AEAC
 	.4byte gMapEvents_ViridianCity_House1 @ 0x83B9A38
 	.4byte gMapScripts_ViridianCity_House1 @ 0x8169E9A
 	.4byte NULL
@@ -2330,7 +2330,7 @@ ViridianCity_House1:: @ 8350DC0
 	.byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 ViridianCity_Gym:: @ 8350DDC
-	.4byte gMapData_ViridianCity_Gym @ 0x82D86AC
+	.4byte ViridianCity_Gym_Layout @ 0x82D86AC
 	.4byte gMapEvents_ViridianCity_Gym @ 0x83B9B78
 	.4byte gMapScripts_ViridianCity_Gym @ 0x8169EC9
 	.4byte NULL
@@ -2339,7 +2339,7 @@ ViridianCity_Gym:: @ 8350DDC
 	.byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01
 
 ViridianCity_House2:: @ 8350DF8
-	.4byte gMapData_ViridianCity_House2 @ 0x8338D20
+	.4byte ViridianCity_House2_Layout @ 0x8338D20
 	.4byte gMapEvents_ViridianCity_House2 @ 0x83B9C10
 	.4byte gMapScripts_ViridianCity_House2 @ 0x816A07C
 	.4byte NULL
@@ -2348,7 +2348,7 @@ ViridianCity_House2:: @ 8350DF8
 	.byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 ViridianCity_Mart:: @ 8350E14
-	.4byte gMapData_ViridianCity_Mart @ 0x82D5BCC
+	.4byte Mart_Layout @ 0x82D5BCC
 	.4byte gMapEvents_ViridianCity_Mart @ 0x83B9C84
 	.4byte gMapScripts_ViridianCity_Mart @ 0x816A1D3
 	.4byte NULL
@@ -2357,7 +2357,7 @@ ViridianCity_Mart:: @ 8350E14
 	.byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 ViridianCity_PokemonCenter_1F:: @ 8350E30
-	.4byte gMapData_ViridianCity_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_ViridianCity_PokemonCenter_1F @ 0x83B9D18
 	.4byte gMapScripts_ViridianCity_PokemonCenter_1F @ 0x816A2C0
 	.4byte NULL
@@ -2366,7 +2366,7 @@ ViridianCity_PokemonCenter_1F:: @ 8350E30
 	.byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 ViridianCity_PokemonCenter_2F:: @ 8350E4C
-	.4byte gMapData_ViridianCity_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_ViridianCity_PokemonCenter_2F @ 0x83B9DA4
 	.4byte gMapScripts_ViridianCity_PokemonCenter_2F @ 0x816A2F3
 	.4byte NULL
@@ -2375,7 +2375,7 @@ ViridianCity_PokemonCenter_2F:: @ 8350E4C
 	.byte 0x59, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 PewterCity_Museum_1F:: @ 8350E68
-	.4byte gMapData_PewterCity_Museum_1F @ 0x831A1FC
+	.4byte PewterCity_Museum_1F_Layout @ 0x831A1FC
 	.4byte gMapEvents_PewterCity_Museum_1F @ 0x83B9ED8
 	.4byte gMapScripts_PewterCity_Museum_1F @ 0x816A31A
 	.4byte NULL
@@ -2384,7 +2384,7 @@ PewterCity_Museum_1F:: @ 8350E68
 	.byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 PewterCity_Museum_2F:: @ 8350E84
-	.4byte gMapData_PewterCity_Museum_2F @ 0x831A39C
+	.4byte PewterCity_Museum_2F_Layout @ 0x831A39C
 	.4byte gMapEvents_PewterCity_Museum_2F @ 0x83B9FCC
 	.4byte gMapScripts_PewterCity_Museum_2F @ 0x816A552
 	.4byte NULL
@@ -2393,7 +2393,7 @@ PewterCity_Museum_2F:: @ 8350E84
 	.byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 PewterCity_Gym:: @ 8350EA0
-	.4byte gMapData_PewterCity_Gym @ 0x82D732C
+	.4byte PewterCity_Gym_Layout @ 0x82D732C
 	.4byte gMapEvents_PewterCity_Gym @ 0x83BA058
 	.4byte gMapScripts_PewterCity_Gym @ 0x816A592
 	.4byte NULL
@@ -2402,7 +2402,7 @@ PewterCity_Gym:: @ 8350EA0
 	.byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01
 
 PewterCity_Mart:: @ 8350EBC
-	.4byte gMapData_PewterCity_Mart @ 0x82D5BCC
+	.4byte Mart_Layout @ 0x82D5BCC
 	.4byte gMapEvents_PewterCity_Mart @ 0x83BA0CC
 	.4byte gMapScripts_PewterCity_Mart @ 0x816A6CD
 	.4byte NULL
@@ -2411,7 +2411,7 @@ PewterCity_Mart:: @ 8350EBC
 	.byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 PewterCity_House1:: @ 8350ED8
-	.4byte gMapData_PewterCity_House1 @ 0x82D5840
+	.4byte House2_Layout @ 0x82D5840
 	.4byte gMapEvents_PewterCity_House1 @ 0x83BA140
 	.4byte gMapScripts_PewterCity_House1 @ 0x816A71C
 	.4byte NULL
@@ -2420,7 +2420,7 @@ PewterCity_House1:: @ 8350ED8
 	.byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 PewterCity_PokemonCenter_1F:: @ 8350EF4
-	.4byte gMapData_PewterCity_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_PewterCity_PokemonCenter_1F @ 0x83BA21C
 	.4byte gMapScripts_PewterCity_PokemonCenter_1F @ 0x816A760
 	.4byte NULL
@@ -2429,7 +2429,7 @@ PewterCity_PokemonCenter_1F:: @ 8350EF4
 	.byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 PewterCity_PokemonCenter_2F:: @ 8350F10
-	.4byte gMapData_PewterCity_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_PewterCity_PokemonCenter_2F @ 0x83BA2A8
 	.4byte gMapScripts_PewterCity_PokemonCenter_2F @ 0x816A7B5
 	.4byte NULL
@@ -2438,7 +2438,7 @@ PewterCity_PokemonCenter_2F:: @ 8350F10
 	.byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 PewterCity_House2:: @ 8350F2C
-	.4byte gMapData_PewterCity_House2 @ 0x82D5840
+	.4byte House2_Layout @ 0x82D5840
 	.4byte gMapEvents_PewterCity_House2 @ 0x83BA304
 	.4byte gMapScripts_PewterCity_House2 @ 0x816A7DC
 	.4byte NULL
@@ -2447,7 +2447,7 @@ PewterCity_House2:: @ 8350F2C
 	.byte 0x5a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeruleanCity_House1:: @ 8350F48
-	.4byte gMapData_CeruleanCity_House1 @ 0x831A560
+	.4byte CeruleanCity_House1_Layout @ 0x831A560
 	.4byte gMapEvents_CeruleanCity_House1 @ 0x83BA350
 	.4byte gMapScripts_CeruleanCity_House1 @ 0x816A7EF
 	.4byte NULL
@@ -2456,7 +2456,7 @@ CeruleanCity_House1:: @ 8350F48
 	.byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeruleanCity_House2:: @ 8350F64
-	.4byte gMapData_CeruleanCity_House2 @ 0x831A474
+	.4byte CeruleanCity_House2_Layout @ 0x831A474
 	.4byte gMapEvents_CeruleanCity_House2 @ 0x83BA3C0
 	.4byte gMapScripts_CeruleanCity_House2 @ 0x816A975
 	.4byte NULL
@@ -2465,7 +2465,7 @@ CeruleanCity_House2:: @ 8350F64
 	.byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeruleanCity_House3:: @ 8350F80
-	.4byte gMapData_CeruleanCity_House3 @ 0x82D5754
+	.4byte House1_Layout @ 0x82D5754
 	.4byte gMapEvents_CeruleanCity_House3 @ 0x83BA41C
 	.4byte gMapScripts_CeruleanCity_House3 @ 0x816A9A7
 	.4byte NULL
@@ -2474,7 +2474,7 @@ CeruleanCity_House3:: @ 8350F80
 	.byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeruleanCity_PokemonCenter_1F:: @ 8350F9C
-	.4byte gMapData_CeruleanCity_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_CeruleanCity_PokemonCenter_1F @ 0x83BA4F8
 	.4byte gMapScripts_CeruleanCity_PokemonCenter_1F @ 0x816AA2D
 	.4byte NULL
@@ -2483,7 +2483,7 @@ CeruleanCity_PokemonCenter_1F:: @ 8350F9C
 	.byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeruleanCity_PokemonCenter_2F:: @ 8350FB8
-	.4byte gMapData_CeruleanCity_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_CeruleanCity_PokemonCenter_2F @ 0x83BA584
 	.4byte gMapScripts_CeruleanCity_PokemonCenter_2F @ 0x816AA79
 	.4byte NULL
@@ -2492,7 +2492,7 @@ CeruleanCity_PokemonCenter_2F:: @ 8350FB8
 	.byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeruleanCity_Gym:: @ 8350FD4
-	.4byte gMapData_CeruleanCity_Gym @ 0x82D5F84
+	.4byte CeruleanCity_Gym_Layout @ 0x82D5F84
 	.4byte gMapEvents_CeruleanCity_Gym @ 0x83BA628
 	.4byte gMapScripts_CeruleanCity_Gym @ 0x816AAA0
 	.4byte NULL
@@ -2501,7 +2501,7 @@ CeruleanCity_Gym:: @ 8350FD4
 	.byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01
 
 CeruleanCity_BikeShop:: @ 8350FF0
-	.4byte gMapData_CeruleanCity_BikeShop @ 0x82D6F28
+	.4byte CeruleanCity_BikeShop_Layout @ 0x82D6F28
 	.4byte gMapEvents_CeruleanCity_BikeShop @ 0x83BA6FC
 	.4byte gMapScripts_CeruleanCity_BikeShop @ 0x816ABBC
 	.4byte NULL
@@ -2510,7 +2510,7 @@ CeruleanCity_BikeShop:: @ 8350FF0
 	.byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeruleanCity_Mart:: @ 835100C
-	.4byte gMapData_CeruleanCity_Mart @ 0x82D5BCC
+	.4byte Mart_Layout @ 0x82D5BCC
 	.4byte gMapEvents_CeruleanCity_Mart @ 0x83BA770
 	.4byte gMapScripts_CeruleanCity_Mart @ 0x816AC9D
 	.4byte NULL
@@ -2519,7 +2519,7 @@ CeruleanCity_Mart:: @ 835100C
 	.byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeruleanCity_House4:: @ 8351028
-	.4byte gMapData_CeruleanCity_House4 @ 0x82D5754
+	.4byte House1_Layout @ 0x82D5754
 	.4byte gMapEvents_CeruleanCity_House4 @ 0x83BA7A4
 	.4byte gMapScripts_CeruleanCity_House4 @ 0x816ACEE
 	.4byte NULL
@@ -2528,7 +2528,7 @@ CeruleanCity_House4:: @ 8351028
 	.byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeruleanCity_House5:: @ 8351044
-	.4byte gMapData_CeruleanCity_House5 @ 0x8343540
+	.4byte CeruleanCity_House5_Layout @ 0x8343540
 	.4byte gMapEvents_CeruleanCity_House5 @ 0x83BA7E4
 	.4byte gMapScripts_CeruleanCity_House5 @ 0x816AE4F
 	.4byte NULL
@@ -2537,7 +2537,7 @@ CeruleanCity_House5:: @ 8351044
 	.byte 0x5b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 LavenderTown_PokemonCenter_1F:: @ 8351060
-	.4byte gMapData_LavenderTown_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_LavenderTown_PokemonCenter_1F @ 0x83BA890
 	.4byte gMapScripts_LavenderTown_PokemonCenter_1F @ 0x816B0EF
 	.4byte NULL
@@ -2546,7 +2546,7 @@ LavenderTown_PokemonCenter_1F:: @ 8351060
 	.byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 LavenderTown_PokemonCenter_2F:: @ 835107C
-	.4byte gMapData_LavenderTown_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_LavenderTown_PokemonCenter_2F @ 0x83BA91C
 	.4byte gMapScripts_LavenderTown_PokemonCenter_2F @ 0x816B122
 	.4byte NULL
@@ -2555,7 +2555,7 @@ LavenderTown_PokemonCenter_2F:: @ 835107C
 	.byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 LavenderTown_VolunteerPokemonHouse:: @ 8351098
-	.4byte gMapData_LavenderTown_VolunteerPokemonHouse @ 0x833ACC4
+	.4byte LavenderTown_VolunteerPokemonHouse_Layout @ 0x833ACC4
 	.4byte gMapEvents_LavenderTown_VolunteerPokemonHouse @ 0x83BA9FC
 	.4byte gMapScripts_LavenderTown_VolunteerPokemonHouse @ 0x816B149
 	.4byte NULL
@@ -2564,7 +2564,7 @@ LavenderTown_VolunteerPokemonHouse:: @ 8351098
 	.byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 LavenderTown_House1:: @ 83510B4
-	.4byte gMapData_LavenderTown_House1 @ 0x82D6AF0
+	.4byte House5_Layout @ 0x82D6AF0
 	.4byte gMapEvents_LavenderTown_House1 @ 0x83BAA58
 	.4byte gMapScripts_LavenderTown_House1 @ 0x816B232
 	.4byte NULL
@@ -2573,7 +2573,7 @@ LavenderTown_House1:: @ 83510B4
 	.byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 LavenderTown_House2:: @ 83510D0
-	.4byte gMapData_LavenderTown_House2 @ 0x82D6AF0
+	.4byte House5_Layout @ 0x82D6AF0
 	.4byte gMapEvents_LavenderTown_House2 @ 0x83BAA9C
 	.4byte gMapScripts_LavenderTown_House2 @ 0x816B265
 	.4byte NULL
@@ -2582,7 +2582,7 @@ LavenderTown_House2:: @ 83510D0
 	.byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 LavenderTown_Mart:: @ 83510EC
-	.4byte gMapData_LavenderTown_Mart @ 0x82D5BCC
+	.4byte Mart_Layout @ 0x82D5BCC
 	.4byte gMapEvents_LavenderTown_Mart @ 0x83BAB28
 	.4byte gMapScripts_LavenderTown_Mart @ 0x816B34F
 	.4byte NULL
@@ -2591,7 +2591,7 @@ LavenderTown_Mart:: @ 83510EC
 	.byte 0x5c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 VermilionCity_House1:: @ 8351108
-	.4byte gMapData_VermilionCity_House1 @ 0x82D5754
+	.4byte House1_Layout @ 0x82D5754
 	.4byte gMapEvents_VermilionCity_House1 @ 0x83BAB6C
 	.4byte gMapScripts_VermilionCity_House1 @ 0x816B3A6
 	.4byte NULL
@@ -2600,7 +2600,7 @@ VermilionCity_House1:: @ 8351108
 	.byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 VermilionCity_PokemonCenter_1F:: @ 8351124
-	.4byte gMapData_VermilionCity_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_VermilionCity_PokemonCenter_1F @ 0x83BAC48
 	.4byte gMapScripts_VermilionCity_PokemonCenter_1F @ 0x816B424
 	.4byte NULL
@@ -2609,7 +2609,7 @@ VermilionCity_PokemonCenter_1F:: @ 8351124
 	.byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 VermilionCity_PokemonCenter_2F:: @ 8351140
-	.4byte gMapData_VermilionCity_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_VermilionCity_PokemonCenter_2F @ 0x83BACD4
 	.4byte gMapScripts_VermilionCity_PokemonCenter_2F @ 0x816B457
 	.4byte NULL
@@ -2618,7 +2618,7 @@ VermilionCity_PokemonCenter_2F:: @ 8351140
 	.byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 VermilionCity_PokemonFanClub:: @ 835115C
-	.4byte gMapData_VermilionCity_PokemonFanClub @ 0x833ABC8
+	.4byte VermilionCity_PokemonFanClub_Layout @ 0x833ABC8
 	.4byte gMapEvents_VermilionCity_PokemonFanClub @ 0x83BADA8
 	.4byte gMapScripts_VermilionCity_PokemonFanClub @ 0x816B47E
 	.4byte NULL
@@ -2627,7 +2627,7 @@ VermilionCity_PokemonFanClub:: @ 835115C
 	.byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 VermilionCity_House2:: @ 8351178
-	.4byte gMapData_VermilionCity_House2 @ 0x82D5754
+	.4byte House1_Layout @ 0x82D5754
 	.4byte gMapEvents_VermilionCity_House2 @ 0x83BADEC
 	.4byte gMapScripts_VermilionCity_House2 @ 0x816B5D6
 	.4byte NULL
@@ -2636,7 +2636,7 @@ VermilionCity_House2:: @ 8351178
 	.byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 VermilionCity_Mart:: @ 8351194
-	.4byte gMapData_VermilionCity_Mart @ 0x82D5BCC
+	.4byte Mart_Layout @ 0x82D5BCC
 	.4byte gMapEvents_VermilionCity_Mart @ 0x83BAE60
 	.4byte gMapScripts_VermilionCity_Mart @ 0x816B653
 	.4byte NULL
@@ -2645,7 +2645,7 @@ VermilionCity_Mart:: @ 8351194
 	.byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 VermilionCity_Gym:: @ 83511B0
-	.4byte gMapData_VermilionCity_Gym @ 0x82D6E28
+	.4byte VermilionCity_Gym_Layout @ 0x82D6E28
 	.4byte gMapEvents_VermilionCity_Gym @ 0x83BAFD0
 	.4byte gMapScripts_VermilionCity_Gym @ 0x816B69E
 	.4byte NULL
@@ -2654,7 +2654,7 @@ VermilionCity_Gym:: @ 83511B0
 	.byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01
 
 VermilionCity_House3:: @ 83511CC
-	.4byte gMapData_VermilionCity_House3 @ 0x82D5754
+	.4byte House1_Layout @ 0x82D5754
 	.4byte gMapEvents_VermilionCity_House3 @ 0x83BB068
 	.4byte gMapScripts_VermilionCity_House3 @ 0x816BAA9
 	.4byte NULL
@@ -2663,7 +2663,7 @@ VermilionCity_House3:: @ 83511CC
 	.byte 0x5d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeladonCity_DepartmentStore_1F:: @ 83511E8
-	.4byte gMapData_CeladonCity_DepartmentStore_1F @ 0x831B5FC
+	.4byte CeladonCity_DepartmentStore_1F_Layout @ 0x831B5FC
 	.4byte gMapEvents_CeladonCity_DepartmentStore_1F @ 0x83BB0EC
 	.4byte gMapScripts_CeladonCity_DepartmentStore_1F @ 0x816BAD8
 	.4byte NULL
@@ -2672,7 +2672,7 @@ CeladonCity_DepartmentStore_1F:: @ 83511E8
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x01, 0x00
 
 CeladonCity_DepartmentStore_2F:: @ 8351204
-	.4byte gMapData_CeladonCity_DepartmentStore_2F @ 0x831B7A8
+	.4byte CeladonCity_DepartmentStore_2F_Layout @ 0x831B7A8
 	.4byte gMapEvents_CeladonCity_DepartmentStore_2F @ 0x83BB184
 	.4byte gMapScripts_CeladonCity_DepartmentStore_2F @ 0x816BAF4
 	.4byte NULL
@@ -2681,7 +2681,7 @@ CeladonCity_DepartmentStore_2F:: @ 8351204
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x02, 0x00
 
 CeladonCity_DepartmentStore_3F:: @ 8351220
-	.4byte gMapData_CeladonCity_DepartmentStore_3F @ 0x831B954
+	.4byte CeladonCity_DepartmentStore_3F_Layout @ 0x831B954
 	.4byte gMapEvents_CeladonCity_DepartmentStore_3F @ 0x83BB2AC
 	.4byte gMapScripts_CeladonCity_DepartmentStore_3F @ 0x816BB84
 	.4byte NULL
@@ -2690,7 +2690,7 @@ CeladonCity_DepartmentStore_3F:: @ 8351220
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x03, 0x00
 
 CeladonCity_DepartmentStore_4F:: @ 835123C
-	.4byte gMapData_CeladonCity_DepartmentStore_4F @ 0x831BB00
+	.4byte CeladonCity_DepartmentStore_4F_Layout @ 0x831BB00
 	.4byte gMapEvents_CeladonCity_DepartmentStore_4F @ 0x83BB32C
 	.4byte gMapScripts_CeladonCity_DepartmentStore_4F @ 0x816BBEE
 	.4byte NULL
@@ -2699,7 +2699,7 @@ CeladonCity_DepartmentStore_4F:: @ 835123C
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x04, 0x00
 
 CeladonCity_DepartmentStore_5F:: @ 8351258
-	.4byte gMapData_CeladonCity_DepartmentStore_5F @ 0x831BCAC
+	.4byte CeladonCity_DepartmentStore_5F_Layout @ 0x831BCAC
 	.4byte gMapEvents_CeladonCity_DepartmentStore_5F @ 0x83BB3C4
 	.4byte gMapScripts_CeladonCity_DepartmentStore_5F @ 0x816BC40
 	.4byte NULL
@@ -2708,7 +2708,7 @@ CeladonCity_DepartmentStore_5F:: @ 8351258
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x05, 0x00
 
 CeladonCity_DepartmentStore_Roof:: @ 8351274
-	.4byte gMapData_CeladonCity_DepartmentStore_Roof @ 0x831BEE4
+	.4byte CeladonCity_DepartmentStore_Roof_Layout @ 0x831BEE4
 	.4byte gMapEvents_CeladonCity_DepartmentStore_Roof @ 0x83BB440
 	.4byte gMapScripts_CeladonCity_DepartmentStore_Roof @ 0x816BCCC
 	.4byte NULL
@@ -2717,7 +2717,7 @@ CeladonCity_DepartmentStore_Roof:: @ 8351274
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x04, 0x7f, 0x00
 
 CeladonCity_DepartmentStore_Elevator:: @ 8351290
-	.4byte gMapData_CeladonCity_DepartmentStore_Elevator @ 0x8319F70
+	.4byte CeladonCity_DepartmentStore_Elevator_Layout @ 0x8319F70
 	.4byte gMapEvents_CeladonCity_DepartmentStore_Elevator @ 0x83BB47C
 	.4byte gMapScripts_CeladonCity_DepartmentStore_Elevator @ 0x816C152
 	.4byte NULL
@@ -2726,7 +2726,7 @@ CeladonCity_DepartmentStore_Elevator:: @ 8351290
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeladonCity_Condominiums_1F:: @ 83512AC
-	.4byte gMapData_CeladonCity_Condominiums_1F @ 0x831A7DC
+	.4byte CeladonCity_Condominiums_1F_Layout @ 0x831A7DC
 	.4byte gMapEvents_CeladonCity_Condominiums_1F @ 0x83BB538
 	.4byte gMapScripts_CeladonCity_Condominiums_1F @ 0x816C320
 	.4byte NULL
@@ -2735,7 +2735,7 @@ CeladonCity_Condominiums_1F:: @ 83512AC
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeladonCity_Condominiums_2F:: @ 83512C8
-	.4byte gMapData_CeladonCity_Condominiums_2F @ 0x831AA58
+	.4byte CeladonCity_Condominiums_2F_Layout @ 0x831AA58
 	.4byte gMapEvents_CeladonCity_Condominiums_2F @ 0x83BB5B4
 	.4byte gMapScripts_CeladonCity_Condominiums_2F @ 0x816C3D0
 	.4byte NULL
@@ -2744,7 +2744,7 @@ CeladonCity_Condominiums_2F:: @ 83512C8
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeladonCity_Condominiums_3F:: @ 83512E4
-	.4byte gMapData_CeladonCity_Condominiums_3F @ 0x831ACD4
+	.4byte CeladonCity_Condominiums_3F_Layout @ 0x831ACD4
 	.4byte gMapEvents_CeladonCity_Condominiums_3F @ 0x83BB6A8
 	.4byte gMapScripts_CeladonCity_Condominiums_3F @ 0x816C3DA
 	.4byte NULL
@@ -2753,7 +2753,7 @@ CeladonCity_Condominiums_3F:: @ 83512E4
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeladonCity_Condominiums_Roof:: @ 8351300
-	.4byte gMapData_CeladonCity_Condominiums_Roof @ 0x831AF7C
+	.4byte CeladonCity_Condominiums_Roof_Layout @ 0x831AF7C
 	.4byte gMapEvents_CeladonCity_Condominiums_Roof @ 0x83BB6EC
 	.4byte gMapScripts_CeladonCity_Condominiums_Roof @ 0x816C459
 	.4byte NULL
@@ -2762,7 +2762,7 @@ CeladonCity_Condominiums_Roof:: @ 8351300
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeladonCity_Condominiums_RoofRoom:: @ 835131C
-	.4byte gMapData_CeladonCity_Condominiums_RoofRoom @ 0x831B054
+	.4byte CeladonCity_Condominiums_RoofRoom_Layout @ 0x831B054
 	.4byte gMapEvents_CeladonCity_Condominiums_RoofRoom @ 0x83BB76C
 	.4byte gMapScripts_CeladonCity_Condominiums_RoofRoom @ 0x816C463
 	.4byte NULL
@@ -2771,7 +2771,7 @@ CeladonCity_Condominiums_RoofRoom:: @ 835131C
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeladonCity_PokemonCenter_1F:: @ 8351338
-	.4byte gMapData_CeladonCity_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_CeladonCity_PokemonCenter_1F @ 0x83BB800
 	.4byte gMapScripts_CeladonCity_PokemonCenter_1F @ 0x816C5EC
 	.4byte NULL
@@ -2780,7 +2780,7 @@ CeladonCity_PokemonCenter_1F:: @ 8351338
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeladonCity_PokemonCenter_2F:: @ 8351354
-	.4byte gMapData_CeladonCity_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_CeladonCity_PokemonCenter_2F @ 0x83BB88C
 	.4byte gMapScripts_CeladonCity_PokemonCenter_2F @ 0x816C61F
 	.4byte NULL
@@ -2789,7 +2789,7 @@ CeladonCity_PokemonCenter_2F:: @ 8351354
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeladonCity_GameCorner:: @ 8351370
-	.4byte gMapData_CeladonCity_GameCorner @ 0x82D7168
+	.4byte CeladonCity_GameCorner_Layout @ 0x82D7168
 	.4byte gMapEvents_CeladonCity_GameCorner @ 0x83BBB78
 	.4byte gMapScripts_CeladonCity_GameCorner @ 0x816C646
 	.4byte NULL
@@ -2798,7 +2798,7 @@ CeladonCity_GameCorner:: @ 8351370
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeladonCity_GameCorner_PrizeRoom:: @ 835138C
-	.4byte gMapData_CeladonCity_GameCorner_PrizeRoom @ 0x831B12C
+	.4byte CeladonCity_GameCorner_PrizeRoom_Layout @ 0x831B12C
 	.4byte gMapEvents_CeladonCity_GameCorner_PrizeRoom @ 0x83BBC1C
 	.4byte gMapScripts_CeladonCity_GameCorner_PrizeRoom @ 0x816CB75
 	.4byte NULL
@@ -2807,7 +2807,7 @@ CeladonCity_GameCorner_PrizeRoom:: @ 835138C
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeladonCity_Gym:: @ 83513A8
-	.4byte gMapData_CeladonCity_Gym @ 0x82D6370
+	.4byte CeladonCity_Gym_Layout @ 0x82D6370
 	.4byte gMapEvents_CeladonCity_Gym @ 0x83BBD68
 	.4byte gMapScripts_CeladonCity_Gym @ 0x816D060
 	.4byte NULL
@@ -2816,7 +2816,7 @@ CeladonCity_Gym:: @ 83513A8
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01
 
 CeladonCity_Restaurant:: @ 83513C4
-	.4byte gMapData_CeladonCity_Restaurant @ 0x831B29C
+	.4byte CeladonCity_Restaurant_Layout @ 0x831B29C
 	.4byte gMapEvents_CeladonCity_Restaurant @ 0x83BBE0C
 	.4byte gMapScripts_CeladonCity_Restaurant @ 0x816D1EA
 	.4byte NULL
@@ -2825,7 +2825,7 @@ CeladonCity_Restaurant:: @ 83513C4
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeladonCity_House1:: @ 83513E0
-	.4byte gMapData_CeladonCity_House1 @ 0x82D6AF0
+	.4byte House5_Layout @ 0x82D6AF0
 	.4byte gMapEvents_CeladonCity_House1 @ 0x83BBE80
 	.4byte gMapScripts_CeladonCity_House1 @ 0x816D267
 	.4byte NULL
@@ -2834,7 +2834,7 @@ CeladonCity_House1:: @ 83513E0
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CeladonCity_Hotel:: @ 83513FC
-	.4byte gMapData_CeladonCity_Hotel @ 0x831B438
+	.4byte CeladonCity_Hotel_Layout @ 0x831B438
 	.4byte gMapEvents_CeladonCity_Hotel @ 0x83BBF0C
 	.4byte gMapScripts_CeladonCity_Hotel @ 0x816D283
 	.4byte NULL
@@ -2843,7 +2843,7 @@ CeladonCity_Hotel:: @ 83513FC
 	.byte 0x5e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FuchsiaCity_SafariZone_Entrance:: @ 8351418
-	.4byte gMapData_FuchsiaCity_SafariZone_Entrance @ 0x82D8E80
+	.4byte FuchsiaCity_SafariZone_Entrance_Layout @ 0x82D8E80
 	.4byte gMapEvents_FuchsiaCity_SafariZone_Entrance @ 0x83BBFA0
 	.4byte gMapScripts_FuchsiaCity_SafariZone_Entrance @ 0x816D2A8
 	.4byte NULL
@@ -2852,7 +2852,7 @@ FuchsiaCity_SafariZone_Entrance:: @ 8351418
 	.byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FuchsiaCity_Mart:: @ 8351434
-	.4byte gMapData_FuchsiaCity_Mart @ 0x82D5BCC
+	.4byte Mart_Layout @ 0x82D5BCC
 	.4byte gMapEvents_FuchsiaCity_Mart @ 0x83BC014
 	.4byte gMapScripts_FuchsiaCity_Mart @ 0x816D4E0
 	.4byte NULL
@@ -2861,7 +2861,7 @@ FuchsiaCity_Mart:: @ 8351434
 	.byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FuchsiaCity_ZooBuilding:: @ 8351450
-	.4byte gMapData_FuchsiaCity_ZooBuilding @ 0x831C348
+	.4byte FuchsiaCity_ZooBuilding_Layout @ 0x831C348
 	.4byte gMapEvents_FuchsiaCity_ZooBuilding @ 0x83BC0A0
 	.4byte gMapScripts_FuchsiaCity_ZooBuilding @ 0x816D528
 	.4byte NULL
@@ -2870,7 +2870,7 @@ FuchsiaCity_ZooBuilding:: @ 8351450
 	.byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FuchsiaCity_Gym:: @ 835146C
-	.4byte gMapData_FuchsiaCity_Gym @ 0x82D6A04
+	.4byte FuchsiaCity_Gym_Layout @ 0x82D6A04
 	.4byte gMapEvents_FuchsiaCity_Gym @ 0x83BC1A4
 	.4byte gMapScripts_FuchsiaCity_Gym @ 0x816D54D
 	.4byte NULL
@@ -2879,7 +2879,7 @@ FuchsiaCity_Gym:: @ 835146C
 	.byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01
 
 FuchsiaCity_House1:: @ 8351488
-	.4byte gMapData_FuchsiaCity_House1 @ 0x82D5754
+	.4byte House1_Layout @ 0x82D5754
 	.4byte gMapEvents_FuchsiaCity_House1 @ 0x83BC218
 	.4byte gMapScripts_FuchsiaCity_House1 @ 0x816D6C5
 	.4byte NULL
@@ -2888,7 +2888,7 @@ FuchsiaCity_House1:: @ 8351488
 	.byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FuchsiaCity_PokemonCenter_1F:: @ 83514A4
-	.4byte gMapData_FuchsiaCity_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_FuchsiaCity_PokemonCenter_1F @ 0x83BC2AC
 	.4byte gMapScripts_FuchsiaCity_PokemonCenter_1F @ 0x816D6F1
 	.4byte NULL
@@ -2897,7 +2897,7 @@ FuchsiaCity_PokemonCenter_1F:: @ 83514A4
 	.byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FuchsiaCity_PokemonCenter_2F:: @ 83514C0
-	.4byte gMapData_FuchsiaCity_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_FuchsiaCity_PokemonCenter_2F @ 0x83BC338
 	.4byte gMapScripts_FuchsiaCity_PokemonCenter_2F @ 0x816D724
 	.4byte NULL
@@ -2906,7 +2906,7 @@ FuchsiaCity_PokemonCenter_2F:: @ 83514C0
 	.byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FuchsiaCity_Building1:: @ 83514DC
-	.4byte gMapData_FuchsiaCity_Building1 @ 0x831C48C
+	.4byte FuchsiaCity_Building1_Layout @ 0x831C48C
 	.4byte gMapEvents_FuchsiaCity_Building1 @ 0x83BC3F4
 	.4byte gMapScripts_FuchsiaCity_Building1 @ 0x816D74B
 	.4byte NULL
@@ -2915,7 +2915,7 @@ FuchsiaCity_Building1:: @ 83514DC
 	.byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FuchsiaCity_House2:: @ 83514F8
-	.4byte gMapData_FuchsiaCity_House2 @ 0x831C578
+	.4byte FuchsiaCity_House2_Layout @ 0x831C578
 	.4byte gMapEvents_FuchsiaCity_House2 @ 0x83BC440
 	.4byte gMapScripts_FuchsiaCity_House2 @ 0x816D816
 	.4byte NULL
@@ -2924,7 +2924,7 @@ FuchsiaCity_House2:: @ 83514F8
 	.byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FuchsiaCity_House3:: @ 8351514
-	.4byte gMapData_FuchsiaCity_House3 @ 0x82D5754
+	.4byte House1_Layout @ 0x82D5754
 	.4byte gMapEvents_FuchsiaCity_House3 @ 0x83BC474
 	.4byte gMapScripts_FuchsiaCity_House3 @ 0x816D894
 	.4byte NULL
@@ -2933,7 +2933,7 @@ FuchsiaCity_House3:: @ 8351514
 	.byte 0x5f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CinnabarIsland_Gym:: @ 8351530
-	.4byte gMapData_CinnabarIsland_Gym @ 0x82D82C8
+	.4byte CinnabarIsland_Gym_Layout @ 0x82D82C8
 	.4byte gMapEvents_CinnabarIsland_Gym @ 0x83BC62C
 	.4byte gMapScripts_CinnabarIsland_Gym @ 0x816D94B
 	.4byte NULL
@@ -2942,7 +2942,7 @@ CinnabarIsland_Gym:: @ 8351530
 	.byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01
 
 CinnabarIsland_PokemonLab_Entrance:: @ 835154C
-	.4byte gMapData_CinnabarIsland_PokemonLab_Entrance @ 0x831C804
+	.4byte CinnabarIsland_PokemonLab_Entrance_Layout @ 0x831C804
 	.4byte gMapEvents_CinnabarIsland_PokemonLab_Entrance @ 0x83BC6B8
 	.4byte gMapScripts_CinnabarIsland_PokemonLab_Entrance @ 0x816E273
 	.4byte NULL
@@ -2951,7 +2951,7 @@ CinnabarIsland_PokemonLab_Entrance:: @ 835154C
 	.byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CinnabarIsland_PokemonLab_Lounge:: @ 8351568
-	.4byte gMapData_CinnabarIsland_PokemonLab_Lounge @ 0x831C974
+	.4byte CinnabarIsland_PokemonLab_Lounge_Layout @ 0x831C974
 	.4byte gMapEvents_CinnabarIsland_PokemonLab_Lounge @ 0x83BC71C
 	.4byte gMapScripts_CinnabarIsland_PokemonLab_Lounge @ 0x816E2B8
 	.4byte NULL
@@ -2960,7 +2960,7 @@ CinnabarIsland_PokemonLab_Lounge:: @ 8351568
 	.byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CinnabarIsland_PokemonLab_ResearchRoom:: @ 8351584
-	.4byte gMapData_CinnabarIsland_PokemonLab_ResearchRoom @ 0x831CAE4
+	.4byte CinnabarIsland_PokemonLab_ResearchRoom_Layout @ 0x831CAE4
 	.4byte gMapEvents_CinnabarIsland_PokemonLab_ResearchRoom @ 0x83BC780
 	.4byte gMapScripts_CinnabarIsland_PokemonLab_ResearchRoom @ 0x816E3DE
 	.4byte NULL
@@ -2969,7 +2969,7 @@ CinnabarIsland_PokemonLab_ResearchRoom:: @ 8351584
 	.byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CinnabarIsland_PokemonLab_ExperimentRoom:: @ 83515A0
-	.4byte gMapData_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x831CC54
+	.4byte CinnabarIsland_PokemonLab_ExperimentRoom_Layout @ 0x831CC54
 	.4byte gMapEvents_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x83BC7CC
 	.4byte gMapScripts_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x816E400
 	.4byte NULL
@@ -2978,7 +2978,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom:: @ 83515A0
 	.byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CinnabarIsland_PokemonCenter_1F:: @ 83515BC
-	.4byte gMapData_CinnabarIsland_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_CinnabarIsland_PokemonCenter_1F @ 0x83BC8A8
 	.4byte gMapScripts_CinnabarIsland_PokemonCenter_1F @ 0x816E8D7
 	.4byte NULL
@@ -2987,7 +2987,7 @@ CinnabarIsland_PokemonCenter_1F:: @ 83515BC
 	.byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CinnabarIsland_PokemonCenter_2F:: @ 83515D8
-	.4byte gMapData_CinnabarIsland_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_CinnabarIsland_PokemonCenter_2F @ 0x83BC934
 	.4byte gMapScripts_CinnabarIsland_PokemonCenter_2F @ 0x816E9E8
 	.4byte NULL
@@ -2996,7 +2996,7 @@ CinnabarIsland_PokemonCenter_2F:: @ 83515D8
 	.byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 CinnabarIsland_Mart:: @ 83515F4
-	.4byte gMapData_CinnabarIsland_Mart @ 0x82D5BCC
+	.4byte Mart_Layout @ 0x82D5BCC
 	.4byte gMapEvents_CinnabarIsland_Mart @ 0x83BC9A8
 	.4byte gMapScripts_CinnabarIsland_Mart @ 0x816EA0F
 	.4byte NULL
@@ -3005,7 +3005,7 @@ CinnabarIsland_Mart:: @ 83515F4
 	.byte 0x60, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 IndigoPlateau_PokemonCenter_1F:: @ 8351610
-	.4byte gMapData_IndigoPlateau_PokemonCenter_1F @ 0x831F000
+	.4byte IndigoPlateau_PokemonCenter_1F_Layout @ 0x831F000
 	.4byte gMapEvents_IndigoPlateau_PokemonCenter_1F @ 0x83BCA94
 	.4byte gMapScripts_IndigoPlateau_PokemonCenter_1F @ 0x816EA5A
 	.4byte NULL
@@ -3014,7 +3014,7 @@ IndigoPlateau_PokemonCenter_1F:: @ 8351610
 	.byte 0x61, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01
 
 IndigoPlateau_PokemonCenter_2F:: @ 835162C
-	.4byte gMapData_IndigoPlateau_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_IndigoPlateau_PokemonCenter_2F @ 0x83BCB20
 	.4byte gMapScripts_IndigoPlateau_PokemonCenter_2F @ 0x816EB0F
 	.4byte NULL
@@ -3023,7 +3023,7 @@ IndigoPlateau_PokemonCenter_2F:: @ 835162C
 	.byte 0x61, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01
 
 SaffronCity_House1_1F:: @ 8351648
-	.4byte gMapData_SaffronCity_House1_1F @ 0x8321004
+	.4byte SaffronCity_House1_1F_Layout @ 0x8321004
 	.4byte gMapEvents_SaffronCity_House1_1F @ 0x83BCB9C
 	.4byte gMapScripts_SaffronCity_House1_1F @ 0x816EB36
 	.4byte NULL
@@ -3032,7 +3032,7 @@ SaffronCity_House1_1F:: @ 8351648
 	.byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SaffronCity_House1_2F:: @ 8351664
-	.4byte gMapData_SaffronCity_House1_2F @ 0x8321100
+	.4byte SaffronCity_House1_2F_Layout @ 0x8321100
 	.4byte gMapEvents_SaffronCity_House1_2F @ 0x83BCC3C
 	.4byte gMapScripts_SaffronCity_House1_2F @ 0x816EB5C
 	.4byte NULL
@@ -3041,7 +3041,7 @@ SaffronCity_House1_2F:: @ 8351664
 	.byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SaffronCity_Dojo:: @ 8351680
-	.4byte gMapData_SaffronCity_Dojo @ 0x83212C4
+	.4byte SaffronCity_Dojo_Layout @ 0x83212C4
 	.4byte gMapEvents_SaffronCity_Dojo @ 0x83BCD60
 	.4byte gMapScripts_SaffronCity_Dojo @ 0x816EBDB
 	.4byte NULL
@@ -3050,7 +3050,7 @@ SaffronCity_Dojo:: @ 8351680
 	.byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SaffronCity_Gym:: @ 835169C
-	.4byte gMapData_SaffronCity_Gym @ 0x82D7C44
+	.4byte SaffronCity_Gym_Layout @ 0x82D7C44
 	.4byte gMapEvents_SaffronCity_Gym @ 0x83BCF6C
 	.4byte gMapScripts_SaffronCity_Gym @ 0x816EDD7
 	.4byte NULL
@@ -3059,7 +3059,7 @@ SaffronCity_Gym:: @ 835169C
 	.byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x01, 0x00, 0x01
 
 SaffronCity_House2:: @ 83516B8
-	.4byte gMapData_SaffronCity_House2 @ 0x82D6AF0
+	.4byte House5_Layout @ 0x82D6AF0
 	.4byte gMapEvents_SaffronCity_House2 @ 0x83BD004
 	.4byte gMapScripts_SaffronCity_House2 @ 0x816EF73
 	.4byte NULL
@@ -3068,7 +3068,7 @@ SaffronCity_House2:: @ 83516B8
 	.byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SaffronCity_Mart:: @ 83516D4
-	.4byte gMapData_SaffronCity_Mart @ 0x82D5BCC
+	.4byte Mart_Layout @ 0x82D5BCC
 	.4byte gMapEvents_SaffronCity_Mart @ 0x83BD078
 	.4byte gMapScripts_SaffronCity_Mart @ 0x816EFA2
 	.4byte NULL
@@ -3077,7 +3077,7 @@ SaffronCity_Mart:: @ 83516D4
 	.byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SaffronCity_PokemonCenter_1F:: @ 83516F0
-	.4byte gMapData_SaffronCity_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_SaffronCity_PokemonCenter_1F @ 0x83BD13C
 	.4byte gMapScripts_SaffronCity_PokemonCenter_1F @ 0x816EFEC
 	.4byte NULL
@@ -3086,7 +3086,7 @@ SaffronCity_PokemonCenter_1F:: @ 83516F0
 	.byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SaffronCity_PokemonCenter_2F:: @ 835170C
-	.4byte gMapData_SaffronCity_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_SaffronCity_PokemonCenter_2F @ 0x83BD1C8
 	.4byte gMapScripts_SaffronCity_PokemonCenter_2F @ 0x816F037
 	.4byte NULL
@@ -3095,7 +3095,7 @@ SaffronCity_PokemonCenter_2F:: @ 835170C
 	.byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SaffronCity_House3:: @ 8351728
-	.4byte gMapData_SaffronCity_House3 @ 0x82D6AF0
+	.4byte House5_Layout @ 0x82D6AF0
 	.4byte gMapEvents_SaffronCity_House3 @ 0x83BD20C
 	.4byte gMapScripts_SaffronCity_House3 @ 0x816F05E
 	.4byte NULL
@@ -3104,7 +3104,7 @@ SaffronCity_House3:: @ 8351728
 	.byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SaffronCity_PokemonTrainerFanClub:: @ 8351744
-	.4byte gMapData_SaffronCity_PokemonTrainerFanClub @ 0x8338A60
+	.4byte SaffronCity_PokemonTrainerFanClub_Layout @ 0x8338A60
 	.4byte gMapEvents_SaffronCity_PokemonTrainerFanClub @ 0x83BD318
 	.4byte gMapScripts_SaffronCity_PokemonTrainerFanClub @ 0x816F0BF
 	.4byte NULL
@@ -3113,7 +3113,7 @@ SaffronCity_PokemonTrainerFanClub:: @ 8351744
 	.byte 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route2_ViridianForest_SouthEntrance:: @ 8351760
-	.4byte gMapData_Route2_ViridianForest_SouthEntrance @ 0x8320990
+	.4byte Route2_Entrance_Layout @ 0x8320990
 	.4byte gMapEvents_Route2_ViridianForest_SouthEntrance @ 0x83BD37C
 	.4byte gMapScripts_Route2_ViridianForest_SouthEntrance @ 0x816F5E5
 	.4byte NULL
@@ -3122,7 +3122,7 @@ Route2_ViridianForest_SouthEntrance:: @ 8351760
 	.byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00
 
 Route2_House:: @ 835177C
-	.4byte gMapData_Route2_House @ 0x82D5840
+	.4byte House2_Layout @ 0x82D5840
 	.4byte gMapEvents_Route2_House @ 0x83BD3D8
 	.4byte gMapScripts_Route2_House @ 0x816F5F8
 	.4byte NULL
@@ -3131,7 +3131,7 @@ Route2_House:: @ 835177C
 	.byte 0x66, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route2_EastBuilding:: @ 8351798
-	.4byte gMapData_Route2_EastBuilding @ 0x8320990
+	.4byte Route2_Entrance_Layout @ 0x8320990
 	.4byte gMapEvents_Route2_EastBuilding @ 0x83BD43C
 	.4byte gMapScripts_Route2_EastBuilding @ 0x816F67E
 	.4byte NULL
@@ -3140,7 +3140,7 @@ Route2_EastBuilding:: @ 8351798
 	.byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00
 
 Route2_ViridianForest_NorthEntrance:: @ 83517B4
-	.4byte gMapData_Route2_ViridianForest_NorthEntrance @ 0x8320990
+	.4byte Route2_Entrance_Layout @ 0x8320990
 	.4byte gMapEvents_Route2_ViridianForest_NorthEntrance @ 0x83BD4B8
 	.4byte gMapScripts_Route2_ViridianForest_NorthEntrance @ 0x816F71D
 	.4byte NULL
@@ -3149,7 +3149,7 @@ Route2_ViridianForest_NorthEntrance:: @ 83517B4
 	.byte 0x66, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00
 
 Route4_PokemonCenter_1F:: @ 83517D0
-	.4byte gMapData_Route4_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_Route4_PokemonCenter_1F @ 0x83BD57C
 	.4byte gMapScripts_Route4_PokemonCenter_1F @ 0x816F739
 	.4byte NULL
@@ -3158,7 +3158,7 @@ Route4_PokemonCenter_1F:: @ 83517D0
 	.byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route4_PokemonCenter_2F:: @ 83517EC
-	.4byte gMapData_Route4_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_Route4_PokemonCenter_2F @ 0x83BD608
 	.4byte gMapScripts_Route4_PokemonCenter_2F @ 0x816F8D8
 	.4byte NULL
@@ -3167,7 +3167,7 @@ Route4_PokemonCenter_2F:: @ 83517EC
 	.byte 0x68, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route5_PokemonDayCare:: @ 8351808
-	.4byte gMapData_Route5_PokemonDayCare @ 0x833ADC0
+	.4byte Route5_PokemonDayCare_Layout @ 0x833ADC0
 	.4byte gMapEvents_Route5_PokemonDayCare @ 0x83BD64C
 	.4byte gMapScripts_Route5_PokemonDayCare @ 0x816F8FF
 	.4byte NULL
@@ -3176,7 +3176,7 @@ Route5_PokemonDayCare:: @ 8351808
 	.byte 0x69, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route5_SouthEntrance:: @ 8351824
-	.4byte gMapData_Route5_SouthEntrance @ 0x831E9C0
+	.4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0
 	.4byte gMapEvents_Route5_SouthEntrance @ 0x83BD6C8
 	.4byte gMapScripts_Route5_SouthEntrance @ 0x816F900
 	.4byte NULL
@@ -3185,7 +3185,7 @@ Route5_SouthEntrance:: @ 8351824
 	.byte 0x69, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00
 
 Route6_NorthEntrance:: @ 8351840
-	.4byte gMapData_Route6_NorthEntrance @ 0x831E9C0
+	.4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0
 	.4byte gMapEvents_Route6_NorthEntrance @ 0x83BD744
 	.4byte gMapScripts_Route6_NorthEntrance @ 0x816F9C6
 	.4byte NULL
@@ -3194,7 +3194,7 @@ Route6_NorthEntrance:: @ 8351840
 	.byte 0x6a, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00
 
 UnknownMap_18_01:: @ 835185C
-	.4byte gMapData_UnknownMap_18_01 @ 0x82D5840
+	.4byte House2_Layout @ 0x82D5840
 	.4byte gMapEvents_UnknownMap_18_01 @ 0x83BD758
 	.4byte gMapScripts_UnknownMap_18_01 @ 0x816FA8C
 	.4byte NULL
@@ -3203,7 +3203,7 @@ UnknownMap_18_01:: @ 835185C
 	.byte 0x6a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route7_EastEntrance:: @ 8351878
-	.4byte gMapData_Route7_EastEntrance @ 0x831EAD0
+	.4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0
 	.4byte gMapEvents_Route7_EastEntrance @ 0x83BD7D4
 	.4byte gMapScripts_Route7_EastEntrance @ 0x816FA8D
 	.4byte NULL
@@ -3212,7 +3212,7 @@ Route7_EastEntrance:: @ 8351878
 	.byte 0x6b, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00
 
 Route8_WestEntrance:: @ 8351894
-	.4byte gMapData_Route8_WestEntrance @ 0x831EAD0
+	.4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0
 	.4byte gMapEvents_Route8_WestEntrance @ 0x83BD850
 	.4byte gMapScripts_Route8_WestEntrance @ 0x816FB53
 	.4byte NULL
@@ -3221,7 +3221,7 @@ Route8_WestEntrance:: @ 8351894
 	.byte 0x6c, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00
 
 Route10_PokemonCenter_1F:: @ 83518B0
-	.4byte gMapData_Route10_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_Route10_PokemonCenter_1F @ 0x83BD8FC
 	.4byte gMapScripts_Route10_PokemonCenter_1F @ 0x816FC2F
 	.4byte NULL
@@ -3230,7 +3230,7 @@ Route10_PokemonCenter_1F:: @ 83518B0
 	.byte 0x6e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route10_PokemonCenter_2F:: @ 83518CC
-	.4byte gMapData_Route10_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_Route10_PokemonCenter_2F @ 0x83BD988
 	.4byte gMapScripts_Route10_PokemonCenter_2F @ 0x816FCFA
 	.4byte NULL
@@ -3239,7 +3239,7 @@ Route10_PokemonCenter_2F:: @ 83518CC
 	.byte 0x6e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route11_EastEntrance_1F:: @ 83518E8
-	.4byte gMapData_Route11_EastEntrance_1F @ 0x8320E70
+	.4byte Entrance_1F_Layout @ 0x8320E70
 	.4byte gMapEvents_Route11_EastEntrance_1F @ 0x83BD9F4
 	.4byte gMapScripts_Route11_EastEntrance_1F @ 0x816FD21
 	.4byte NULL
@@ -3248,7 +3248,7 @@ Route11_EastEntrance_1F:: @ 83518E8
 	.byte 0x6f, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00
 
 Route11_EastEntrance_2F:: @ 8351904
-	.4byte gMapData_Route11_EastEntrance_2F @ 0x8320804
+	.4byte Entrance_2F_Layout @ 0x8320804
 	.4byte gMapEvents_Route11_EastEntrance_2F @ 0x83BDA58
 	.4byte gMapScripts_Route11_EastEntrance_2F @ 0x816FD34
 	.4byte NULL
@@ -3257,7 +3257,7 @@ Route11_EastEntrance_2F:: @ 8351904
 	.byte 0x6f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route12_NorthEntrance_1F:: @ 8351920
-	.4byte gMapData_Route12_NorthEntrance_1F @ 0x8319DF0
+	.4byte Route12_NorthEntrance_1F_Layout @ 0x8319DF0
 	.4byte gMapEvents_Route12_NorthEntrance_1F @ 0x83BDAAC
 	.4byte gMapScripts_Route12_NorthEntrance_1F @ 0x816FE6D
 	.4byte NULL
@@ -3266,7 +3266,7 @@ Route12_NorthEntrance_1F:: @ 8351920
 	.byte 0x70, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00
 
 Route12_NorthEntrance_2F:: @ 835193C
-	.4byte gMapData_Route12_NorthEntrance_2F @ 0x8320804
+	.4byte Entrance_2F_Layout @ 0x8320804
 	.4byte gMapEvents_Route12_NorthEntrance_2F @ 0x83BDAF8
 	.4byte gMapScripts_Route12_NorthEntrance_2F @ 0x816FE77
 	.4byte NULL
@@ -3275,7 +3275,7 @@ Route12_NorthEntrance_2F:: @ 835193C
 	.byte 0x70, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route12_FishingHouse:: @ 8351958
-	.4byte gMapData_Route12_FishingHouse @ 0x82D6070
+	.4byte House4_Layout @ 0x82D6070
 	.4byte gMapEvents_Route12_FishingHouse @ 0x83BDB48
 	.4byte gMapScripts_Route12_FishingHouse @ 0x816FF0B
 	.4byte NULL
@@ -3284,7 +3284,7 @@ Route12_FishingHouse:: @ 8351958
 	.byte 0x70, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route15_WestEntrance_1F:: @ 8351974
-	.4byte gMapData_Route15_WestEntrance_1F @ 0x8320E70
+	.4byte Entrance_1F_Layout @ 0x8320E70
 	.4byte gMapEvents_Route15_WestEntrance_1F @ 0x83BDB9C
 	.4byte gMapScripts_Route15_WestEntrance_1F @ 0x8170088
 	.4byte NULL
@@ -3293,7 +3293,7 @@ Route15_WestEntrance_1F:: @ 8351974
 	.byte 0x73, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00
 
 Route15_WestEntrance_2F:: @ 8351990
-	.4byte gMapData_Route15_WestEntrance_2F @ 0x8320804
+	.4byte Entrance_2F_Layout @ 0x8320804
 	.4byte gMapEvents_Route15_WestEntrance_2F @ 0x83BDBE8
 	.4byte gMapScripts_Route15_WestEntrance_2F @ 0x8170092
 	.4byte NULL
@@ -3302,7 +3302,7 @@ Route15_WestEntrance_2F:: @ 8351990
 	.byte 0x73, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route16_House:: @ 83519AC
-	.4byte gMapData_Route16_House @ 0x82D5754
+	.4byte House1_Layout @ 0x82D5754
 	.4byte gMapEvents_Route16_House @ 0x83BDC44
 	.4byte gMapScripts_Route16_House @ 0x817014E
 	.4byte NULL
@@ -3311,7 +3311,7 @@ Route16_House:: @ 83519AC
 	.byte 0x74, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route16_NorthEntrance_1F:: @ 83519C8
-	.4byte gMapData_Route16_NorthEntrance_1F @ 0x8320D14
+	.4byte Route16_NorthEntrance_1F_Layout @ 0x8320D14
 	.4byte gMapEvents_Route16_NorthEntrance_1F @ 0x83BDD60
 	.4byte gMapScripts_Route16_NorthEntrance_1F @ 0x81701C2
 	.4byte NULL
@@ -3320,7 +3320,7 @@ Route16_NorthEntrance_1F:: @ 83519C8
 	.byte 0x74, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00
 
 Route16_NorthEntrance_2F:: @ 83519E4
-	.4byte gMapData_Route16_NorthEntrance_2F @ 0x8320804
+	.4byte Entrance_2F_Layout @ 0x8320804
 	.4byte gMapEvents_Route16_NorthEntrance_2F @ 0x83BDDDC
 	.4byte gMapScripts_Route16_NorthEntrance_2F @ 0x81702BE
 	.4byte NULL
@@ -3329,7 +3329,7 @@ Route16_NorthEntrance_2F:: @ 83519E4
 	.byte 0x74, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route18_EastEntrance_1F:: @ 8351A00
-	.4byte gMapData_Route18_EastEntrance_1F @ 0x8320E70
+	.4byte Entrance_1F_Layout @ 0x8320E70
 	.4byte gMapEvents_Route18_EastEntrance_1F @ 0x83BDED0
 	.4byte gMapScripts_Route18_EastEntrance_1F @ 0x8170378
 	.4byte NULL
@@ -3338,7 +3338,7 @@ Route18_EastEntrance_1F:: @ 8351A00
 	.byte 0x76, 0x00, 0x00, 0x08, 0x01, 0x02, 0x00, 0x00
 
 Route18_EastEntrance_2F:: @ 8351A1C
-	.4byte gMapData_Route18_EastEntrance_2F @ 0x8320804
+	.4byte Entrance_2F_Layout @ 0x8320804
 	.4byte gMapEvents_Route18_EastEntrance_2F @ 0x83BDF1C
 	.4byte gMapScripts_Route18_EastEntrance_2F @ 0x817046B
 	.4byte NULL
@@ -3347,7 +3347,7 @@ Route18_EastEntrance_2F:: @ 8351A1C
 	.byte 0x76, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 UnusedHouse_27_00:: @ 8351A38
-	.4byte gMapData_UnusedHouse_27_00 @ 0x82D5840
+	.4byte House2_Layout @ 0x82D5840
 	.4byte gMapEvents_UnusedHouse_27_00 @ 0x83BDF30
 	.4byte gMapScripts_UnusedHouse_27_00 @ 0x81704FA
 	.4byte NULL
@@ -3356,7 +3356,7 @@ UnusedHouse_27_00:: @ 8351A38
 	.byte 0x77, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route22_NorthEntrance:: @ 8351A54
-	.4byte gMapData_Route22_NorthEntrance @ 0x8320B1C
+	.4byte Route22_NorthEntrance_Layout @ 0x8320B1C
 	.4byte gMapEvents_Route22_NorthEntrance @ 0x83BDF8C
 	.4byte gMapScripts_Route22_NorthEntrance @ 0x81704FB
 	.4byte NULL
@@ -3365,7 +3365,7 @@ Route22_NorthEntrance:: @ 8351A54
 	.byte 0x7a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 UnusedHouse_29_00:: @ 8351A70
-	.4byte gMapData_UnusedHouse_29_00 @ 0x82D5840
+	.4byte House2_Layout @ 0x82D5840
 	.4byte gMapEvents_UnusedHouse_29_00 @ 0x83BDFA0
 	.4byte gMapScripts_UnusedHouse_29_00 @ 0x8170522
 	.4byte NULL
@@ -3374,7 +3374,7 @@ UnusedHouse_29_00:: @ 8351A70
 	.byte 0x7b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 Route25_SeaCottage:: @ 8351A8C
-	.4byte gMapData_Route25_SeaCottage @ 0x8319030
+	.4byte Route25_SeaCottage_Layout @ 0x8319030
 	.4byte gMapEvents_Route25_SeaCottage @ 0x83BE008
 	.4byte gMapScripts_Route25_SeaCottage @ 0x8170523
 	.4byte NULL
@@ -3383,7 +3383,7 @@ Route25_SeaCottage:: @ 8351A8C
 	.byte 0x7d, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SevenIsland_House_Room1:: @ 8351AA8
-	.4byte gMapData_SevenIsland_House_Room1 @ 0x834E310
+	.4byte SevenIsland_House_Room1_Layout @ 0x834E310
 	.4byte gMapEvents_SevenIsland_House_Room1 @ 0x83BE050
 	.4byte gMapScripts_SevenIsland_House_Room1 @ 0x817088A
 	.4byte NULL
@@ -3392,7 +3392,7 @@ SevenIsland_House_Room1:: @ 8351AA8
 	.byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01
 
 SevenIsland_House_Room2:: @ 8351AC4
-	.4byte gMapData_SevenIsland_House_Room2 @ 0x8338C48
+	.4byte SevenIsland_House_Room2_Layout @ 0x8338C48
 	.4byte gMapEvents_SevenIsland_House_Room2 @ 0x83BE084
 	.4byte gMapScripts_SevenIsland_House_Room2 @ 0x8170A7E
 	.4byte NULL
@@ -3401,7 +3401,7 @@ SevenIsland_House_Room2:: @ 8351AC4
 	.byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01
 
 SevenIsland_Mart:: @ 8351AE0
-	.4byte gMapData_SevenIsland_Mart @ 0x82D5BCC
+	.4byte Mart_Layout @ 0x82D5BCC
 	.4byte gMapEvents_SevenIsland_Mart @ 0x83BE100
 	.4byte gMapScripts_SevenIsland_Mart @ 0x8170B30
 	.4byte NULL
@@ -3410,7 +3410,7 @@ SevenIsland_Mart:: @ 8351AE0
 	.byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SevenIsland_PokemonCenter_1F:: @ 8351AFC
-	.4byte gMapData_SevenIsland_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_SevenIsland_PokemonCenter_1F @ 0x83BE1B4
 	.4byte gMapScripts_SevenIsland_PokemonCenter_1F @ 0x8170B89
 	.4byte NULL
@@ -3419,7 +3419,7 @@ SevenIsland_PokemonCenter_1F:: @ 8351AFC
 	.byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SevenIsland_PokemonCenter_2F:: @ 8351B18
-	.4byte gMapData_SevenIsland_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_SevenIsland_PokemonCenter_2F @ 0x83BE240
 	.4byte gMapScripts_SevenIsland_PokemonCenter_2F @ 0x8170BBC
 	.4byte NULL
@@ -3428,7 +3428,7 @@ SevenIsland_PokemonCenter_2F:: @ 8351B18
 	.byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 UnusedHouse_31_05:: @ 8351B34
-	.4byte gMapData_UnusedHouse_31_05 @ 0x82D6070
+	.4byte House4_Layout @ 0x82D6070
 	.4byte gMapEvents_UnusedHouse_31_05 @ 0x83BE254
 	.4byte gMapScripts_UnusedHouse_31_05 @ 0x8170BE3
 	.4byte NULL
@@ -3437,7 +3437,7 @@ UnusedHouse_31_05:: @ 8351B34
 	.byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SevenIsland_Harbor:: @ 8351B50
-	.4byte gMapData_SevenIsland_Harbor @ 0x8343FB8
+	.4byte Island_Harbor_Layout @ 0x8343FB8
 	.4byte gMapEvents_SevenIsland_Harbor @ 0x83BE2A0
 	.4byte gMapScripts_SevenIsland_Harbor @ 0x8170BE4
 	.4byte NULL
@@ -3446,7 +3446,7 @@ SevenIsland_Harbor:: @ 8351B50
 	.byte 0x94, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 OneIsland_PokemonCenter_1F:: @ 8351B6C
-	.4byte gMapData_OneIsland_PokemonCenter_1F @ 0x833A970
+	.4byte OneIsland_PokemonCenter_1F_Layout @ 0x833A970
 	.4byte gMapEvents_OneIsland_PokemonCenter_1F @ 0x83BE400
 	.4byte gMapScripts_OneIsland_PokemonCenter_1F @ 0x8170BF8
 	.4byte NULL
@@ -3455,7 +3455,7 @@ OneIsland_PokemonCenter_1F:: @ 8351B6C
 	.byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 OneIsland_PokemonCenter_2F:: @ 8351B88
-	.4byte gMapData_OneIsland_PokemonCenter_2F @ 0x8344108
+	.4byte OneIsland_PokemonCenter_2F_Layout @ 0x8344108
 	.4byte gMapEvents_OneIsland_PokemonCenter_2F @ 0x83BE48C
 	.4byte gMapScripts_OneIsland_PokemonCenter_2F @ 0x8171334
 	.4byte NULL
@@ -3464,7 +3464,7 @@ OneIsland_PokemonCenter_2F:: @ 8351B88
 	.byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 OneIsland_House1:: @ 8351BA4
-	.4byte gMapData_OneIsland_House1 @ 0x82D5CB8
+	.4byte House3_Layout @ 0x82D5CB8
 	.4byte gMapEvents_OneIsland_House1 @ 0x83BE4D8
 	.4byte gMapScripts_OneIsland_House1 @ 0x817135B
 	.4byte NULL
@@ -3473,7 +3473,7 @@ OneIsland_House1:: @ 8351BA4
 	.byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 OneIsland_House2:: @ 8351BC0
-	.4byte gMapData_OneIsland_House2 @ 0x82D5CB8
+	.4byte House3_Layout @ 0x82D5CB8
 	.4byte gMapEvents_OneIsland_House2 @ 0x83BE50C
 	.4byte gMapScripts_OneIsland_House2 @ 0x817136E
 	.4byte NULL
@@ -3482,7 +3482,7 @@ OneIsland_House2:: @ 8351BC0
 	.byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 OneIsland_Harbor:: @ 8351BDC
-	.4byte gMapData_OneIsland_Harbor @ 0x8343FB8
+	.4byte Island_Harbor_Layout @ 0x8343FB8
 	.4byte gMapEvents_OneIsland_Harbor @ 0x83BE558
 	.4byte gMapScripts_OneIsland_Harbor @ 0x8171378
 	.4byte NULL
@@ -3491,7 +3491,7 @@ OneIsland_Harbor:: @ 8351BDC
 	.byte 0x8f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 TwoIsland_JoyfulGameCorner:: @ 8351BF8
-	.4byte gMapData_TwoIsland_JoyfulGameCorner @ 0x833AA84
+	.4byte TwoIsland_JoyfulGameCorner_Layout @ 0x833AA84
 	.4byte gMapEvents_TwoIsland_JoyfulGameCorner @ 0x83BE5EC
 	.4byte gMapScripts_TwoIsland_JoyfulGameCorner @ 0x81713D0
 	.4byte NULL
@@ -3500,7 +3500,7 @@ TwoIsland_JoyfulGameCorner:: @ 8351BF8
 	.byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 TwoIsland_House:: @ 8351C14
-	.4byte gMapData_TwoIsland_House @ 0x82D5CB8
+	.4byte House3_Layout @ 0x82D5CB8
 	.4byte gMapEvents_TwoIsland_House @ 0x83BE620
 	.4byte gMapScripts_TwoIsland_House @ 0x8171618
 	.4byte NULL
@@ -3509,7 +3509,7 @@ TwoIsland_House:: @ 8351C14
 	.byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 TwoIsland_PokemonCenter_1F:: @ 8351C30
-	.4byte gMapData_TwoIsland_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_TwoIsland_PokemonCenter_1F @ 0x83BE68C
 	.4byte gMapScripts_TwoIsland_PokemonCenter_1F @ 0x81717B4
 	.4byte NULL
@@ -3518,7 +3518,7 @@ TwoIsland_PokemonCenter_1F:: @ 8351C30
 	.byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 TwoIsland_PokemonCenter_2F:: @ 8351C4C
-	.4byte gMapData_TwoIsland_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_TwoIsland_PokemonCenter_2F @ 0x83BE718
 	.4byte gMapScripts_TwoIsland_PokemonCenter_2F @ 0x81717DE
 	.4byte NULL
@@ -3527,7 +3527,7 @@ TwoIsland_PokemonCenter_2F:: @ 8351C4C
 	.byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 TwoIsland_Harbor:: @ 8351C68
-	.4byte gMapData_TwoIsland_Harbor @ 0x8343FB8
+	.4byte Island_Harbor_Layout @ 0x8343FB8
 	.4byte gMapEvents_TwoIsland_Harbor @ 0x83BE764
 	.4byte gMapScripts_TwoIsland_Harbor @ 0x8171805
 	.4byte NULL
@@ -3536,7 +3536,7 @@ TwoIsland_Harbor:: @ 8351C68
 	.byte 0x90, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 ThreeIsland_House1:: @ 8351C84
-	.4byte gMapData_ThreeIsland_House1 @ 0x82D7504
+	.4byte ThreeIsland_House1_Layout @ 0x82D7504
 	.4byte gMapEvents_ThreeIsland_House1 @ 0x83BE7A4
 	.4byte gMapScripts_ThreeIsland_House1 @ 0x8171819
 	.4byte NULL
@@ -3545,7 +3545,7 @@ ThreeIsland_House1:: @ 8351C84
 	.byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 ThreeIsland_PokemonCenter_1F:: @ 8351CA0
-	.4byte gMapData_ThreeIsland_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_ThreeIsland_PokemonCenter_1F @ 0x83BE828
 	.4byte gMapScripts_ThreeIsland_PokemonCenter_1F @ 0x8171832
 	.4byte NULL
@@ -3554,7 +3554,7 @@ ThreeIsland_PokemonCenter_1F:: @ 8351CA0
 	.byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 ThreeIsland_PokemonCenter_2F:: @ 8351CBC
-	.4byte gMapData_ThreeIsland_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_ThreeIsland_PokemonCenter_2F @ 0x83BE8B4
 	.4byte gMapScripts_ThreeIsland_PokemonCenter_2F @ 0x8171865
 	.4byte NULL
@@ -3563,7 +3563,7 @@ ThreeIsland_PokemonCenter_2F:: @ 8351CBC
 	.byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 ThreeIsland_Mart:: @ 8351CD8
-	.4byte gMapData_ThreeIsland_Mart @ 0x82D5BCC
+	.4byte Mart_Layout @ 0x82D5BCC
 	.4byte gMapEvents_ThreeIsland_Mart @ 0x83BE930
 	.4byte gMapScripts_ThreeIsland_Mart @ 0x817188C
 	.4byte NULL
@@ -3572,7 +3572,7 @@ ThreeIsland_Mart:: @ 8351CD8
 	.byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 ThreeIsland_House2:: @ 8351CF4
-	.4byte gMapData_ThreeIsland_House2 @ 0x82D5CB8
+	.4byte House3_Layout @ 0x82D5CB8
 	.4byte gMapEvents_ThreeIsland_House2 @ 0x83BE97C
 	.4byte gMapScripts_ThreeIsland_House2 @ 0x81718DF
 	.4byte NULL
@@ -3581,7 +3581,7 @@ ThreeIsland_House2:: @ 8351CF4
 	.byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 ThreeIsland_House3:: @ 8351D10
-	.4byte gMapData_ThreeIsland_House3 @ 0x82D5CB8
+	.4byte House3_Layout @ 0x82D5CB8
 	.4byte gMapEvents_ThreeIsland_House3 @ 0x83BE9B0
 	.4byte gMapScripts_ThreeIsland_House3 @ 0x8171902
 	.4byte NULL
@@ -3590,7 +3590,7 @@ ThreeIsland_House3:: @ 8351D10
 	.byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 ThreeIsland_House4:: @ 8351D2C
-	.4byte gMapData_ThreeIsland_House4 @ 0x82D5CB8
+	.4byte House3_Layout @ 0x82D5CB8
 	.4byte gMapEvents_ThreeIsland_House4 @ 0x83BE9FC
 	.4byte gMapScripts_ThreeIsland_House4 @ 0x817190C
 	.4byte NULL
@@ -3599,7 +3599,7 @@ ThreeIsland_House4:: @ 8351D2C
 	.byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 ThreeIsland_House5:: @ 8351D48
-	.4byte gMapData_ThreeIsland_House5 @ 0x82D5CB8
+	.4byte House3_Layout @ 0x82D5CB8
 	.4byte gMapEvents_ThreeIsland_House5 @ 0x83BEA30
 	.4byte gMapScripts_ThreeIsland_House5 @ 0x817191F
 	.4byte NULL
@@ -3608,7 +3608,7 @@ ThreeIsland_House5:: @ 8351D48
 	.byte 0x91, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FourIsland_PokemonDayCare:: @ 8351D64
-	.4byte gMapData_FourIsland_PokemonDayCare @ 0x833AFA8
+	.4byte FourIsland_PokemonDayCare_Layout @ 0x833AFA8
 	.4byte gMapEvents_FourIsland_PokemonDayCare @ 0x83BEA64
 	.4byte gMapScripts_FourIsland_PokemonDayCare @ 0x817193F
 	.4byte NULL
@@ -3617,7 +3617,7 @@ FourIsland_PokemonDayCare:: @ 8351D64
 	.byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FourIsland_PokemonCenter_1F:: @ 8351D80
-	.4byte gMapData_FourIsland_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_FourIsland_PokemonCenter_1F @ 0x83BEB00
 	.4byte gMapScripts_FourIsland_PokemonCenter_1F @ 0x8171BEA
 	.4byte NULL
@@ -3626,7 +3626,7 @@ FourIsland_PokemonCenter_1F:: @ 8351D80
 	.byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FourIsland_PokemonCenter_2F:: @ 8351D9C
-	.4byte gMapData_FourIsland_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_FourIsland_PokemonCenter_2F @ 0x83BEB8C
 	.4byte gMapScripts_FourIsland_PokemonCenter_2F @ 0x8171C1D
 	.4byte NULL
@@ -3635,7 +3635,7 @@ FourIsland_PokemonCenter_2F:: @ 8351D9C
 	.byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FourIsland_House1:: @ 8351DB8
-	.4byte gMapData_FourIsland_House1 @ 0x82D5CB8
+	.4byte House3_Layout @ 0x82D5CB8
 	.4byte gMapEvents_FourIsland_House1 @ 0x83BEBD8
 	.4byte gMapScripts_FourIsland_House1 @ 0x8171C44
 	.4byte NULL
@@ -3644,7 +3644,7 @@ FourIsland_House1:: @ 8351DB8
 	.byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FourIsland_LoreleisHouse:: @ 8351DD4
-	.4byte gMapData_FourIsland_LoreleisHouse @ 0x82D7418
+	.4byte FourIsland_LoreleisHouse_Layout @ 0x82D7418
 	.4byte gMapEvents_FourIsland_LoreleisHouse @ 0x83BED5C
 	.4byte gMapScripts_FourIsland_LoreleisHouse @ 0x8171C4E
 	.4byte NULL
@@ -3653,7 +3653,7 @@ FourIsland_LoreleisHouse:: @ 8351DD4
 	.byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FourIsland_Harbor:: @ 8351DF0
-	.4byte gMapData_FourIsland_Harbor @ 0x8343FB8
+	.4byte Island_Harbor_Layout @ 0x8343FB8
 	.4byte gMapEvents_FourIsland_Harbor @ 0x83BEDA8
 	.4byte gMapScripts_FourIsland_Harbor @ 0x8171C98
 	.4byte NULL
@@ -3662,7 +3662,7 @@ FourIsland_Harbor:: @ 8351DF0
 	.byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FourIsland_House2:: @ 8351E0C
-	.4byte gMapData_FourIsland_House2 @ 0x82D5CB8
+	.4byte House3_Layout @ 0x82D5CB8
 	.4byte gMapEvents_FourIsland_House2 @ 0x83BEDDC
 	.4byte gMapScripts_FourIsland_House2 @ 0x8171CAC
 	.4byte NULL
@@ -3671,7 +3671,7 @@ FourIsland_House2:: @ 8351E0C
 	.byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FourIsland_Mart:: @ 8351E28
-	.4byte gMapData_FourIsland_Mart @ 0x82D5BCC
+	.4byte Mart_Layout @ 0x82D5BCC
 	.4byte gMapEvents_FourIsland_Mart @ 0x83BEE40
 	.4byte gMapScripts_FourIsland_Mart @ 0x8171CAD
 	.4byte NULL
@@ -3680,7 +3680,7 @@ FourIsland_Mart:: @ 8351E28
 	.byte 0x92, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FiveIsland_PokemonCenter_1F:: @ 8351E44
-	.4byte gMapData_FiveIsland_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_FiveIsland_PokemonCenter_1F @ 0x83BEEDC
 	.4byte gMapScripts_FiveIsland_PokemonCenter_1F @ 0x8171CF1
 	.4byte NULL
@@ -3689,7 +3689,7 @@ FiveIsland_PokemonCenter_1F:: @ 8351E44
 	.byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FiveIsland_PokemonCenter_2F:: @ 8351E60
-	.4byte gMapData_FiveIsland_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_FiveIsland_PokemonCenter_2F @ 0x83BEF68
 	.4byte gMapScripts_FiveIsland_PokemonCenter_2F @ 0x8171D1B
 	.4byte NULL
@@ -3698,7 +3698,7 @@ FiveIsland_PokemonCenter_2F:: @ 8351E60
 	.byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FiveIsland_Harbor:: @ 8351E7C
-	.4byte gMapData_FiveIsland_Harbor @ 0x8343FB8
+	.4byte Island_Harbor_Layout @ 0x8343FB8
 	.4byte gMapEvents_FiveIsland_Harbor @ 0x83BEFB4
 	.4byte gMapScripts_FiveIsland_Harbor @ 0x8171D42
 	.4byte NULL
@@ -3707,7 +3707,7 @@ FiveIsland_Harbor:: @ 8351E7C
 	.byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FiveIsland_House1:: @ 8351E98
-	.4byte gMapData_FiveIsland_House1 @ 0x82D5CB8
+	.4byte House3_Layout @ 0x82D5CB8
 	.4byte gMapEvents_FiveIsland_House1 @ 0x83BEFE8
 	.4byte gMapScripts_FiveIsland_House1 @ 0x8171D56
 	.4byte NULL
@@ -3716,7 +3716,7 @@ FiveIsland_House1:: @ 8351E98
 	.byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FiveIsland_House2:: @ 8351EB4
-	.4byte gMapData_FiveIsland_House2 @ 0x82D5CB8
+	.4byte House3_Layout @ 0x82D5CB8
 	.4byte gMapEvents_FiveIsland_House2 @ 0x83BF01C
 	.4byte gMapScripts_FiveIsland_House2 @ 0x8171D60
 	.4byte NULL
@@ -3725,7 +3725,7 @@ FiveIsland_House2:: @ 8351EB4
 	.byte 0x93, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SixIsland_PokemonCenter_1F:: @ 8351ED0
-	.4byte gMapData_SixIsland_PokemonCenter_1F @ 0x82D5990
+	.4byte PokemonCenter_1F_Layout @ 0x82D5990
 	.4byte gMapEvents_SixIsland_PokemonCenter_1F @ 0x83BF0A0
 	.4byte gMapScripts_SixIsland_PokemonCenter_1F @ 0x8171D6A
 	.4byte NULL
@@ -3734,7 +3734,7 @@ SixIsland_PokemonCenter_1F:: @ 8351ED0
 	.byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SixIsland_PokemonCenter_2F:: @ 8351EEC
-	.4byte gMapData_SixIsland_PokemonCenter_2F @ 0x82D5AE0
+	.4byte PokemonCenter_2F_Layout @ 0x82D5AE0
 	.4byte gMapEvents_SixIsland_PokemonCenter_2F @ 0x83BF12C
 	.4byte gMapScripts_SixIsland_PokemonCenter_2F @ 0x8171E20
 	.4byte NULL
@@ -3743,7 +3743,7 @@ SixIsland_PokemonCenter_2F:: @ 8351EEC
 	.byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SixIsland_Harbor:: @ 8351F08
-	.4byte gMapData_SixIsland_Harbor @ 0x8343FB8
+	.4byte Island_Harbor_Layout @ 0x8343FB8
 	.4byte gMapEvents_SixIsland_Harbor @ 0x83BF178
 	.4byte gMapScripts_SixIsland_Harbor @ 0x8171E47
 	.4byte NULL
@@ -3752,7 +3752,7 @@ SixIsland_Harbor:: @ 8351F08
 	.byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SixIsland_House:: @ 8351F24
-	.4byte gMapData_SixIsland_House @ 0x82D5CB8
+	.4byte House3_Layout @ 0x82D5CB8
 	.4byte gMapEvents_SixIsland_House @ 0x83BF1AC
 	.4byte gMapScripts_SixIsland_House @ 0x8171E5B
 	.4byte NULL
@@ -3761,7 +3761,7 @@ SixIsland_House:: @ 8351F24
 	.byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SixIsland_Mart:: @ 8351F40
-	.4byte gMapData_SixIsland_Mart @ 0x82D5BCC
+	.4byte Mart_Layout @ 0x82D5BCC
 	.4byte gMapEvents_SixIsland_Mart @ 0x83BF210
 	.4byte gMapScripts_SixIsland_Mart @ 0x8171E65
 	.4byte NULL
@@ -3770,7 +3770,7 @@ SixIsland_Mart:: @ 8351F40
 	.byte 0x95, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 ThreeIsland_Harbor:: @ 8351F5C
-	.4byte gMapData_ThreeIsland_Harbor @ 0x8343FB8
+	.4byte Island_Harbor_Layout @ 0x8343FB8
 	.4byte gMapEvents_ThreeIsland_Harbor @ 0x83BF25C
 	.4byte gMapScripts_ThreeIsland_Harbor @ 0x8171EA9
 	.4byte NULL
@@ -3779,7 +3779,7 @@ ThreeIsland_Harbor:: @ 8351F5C
 	.byte 0x9a, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 FiveIsland_ResortGorgeous_House:: @ 8351F78
-	.4byte gMapData_FiveIsland_ResortGorgeous_House @ 0x82D657C
+	.4byte FiveIsland_ResortGorgeous_House_Layout @ 0x82D657C
 	.4byte gMapEvents_FiveIsland_ResortGorgeous_House @ 0x83BF2C0
 	.4byte gMapScripts_FiveIsland_ResortGorgeous_House @ 0x8171EBD
 	.4byte NULL
@@ -3788,7 +3788,7 @@ FiveIsland_ResortGorgeous_House:: @ 8351F78
 	.byte 0x9f, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 TwoIsland_CapeBrink_House:: @ 8351F94
-	.4byte gMapData_TwoIsland_CapeBrink_House @ 0x82D5CB8
+	.4byte House3_Layout @ 0x82D5CB8
 	.4byte gMapEvents_TwoIsland_CapeBrink_House @ 0x83BF2F4
 	.4byte gMapScripts_TwoIsland_CapeBrink_House @ 0x817206B
 	.4byte NULL
@@ -3797,7 +3797,7 @@ TwoIsland_CapeBrink_House:: @ 8351F94
 	.byte 0x98, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SixIsland_WaterPath_House1:: @ 8351FB0
-	.4byte gMapData_SixIsland_WaterPath_House1 @ 0x82D6070
+	.4byte House4_Layout @ 0x82D6070
 	.4byte gMapEvents_SixIsland_WaterPath_House1 @ 0x83BF334
 	.4byte gMapScripts_SixIsland_WaterPath_House1 @ 0x817206C
 	.4byte NULL
@@ -3806,7 +3806,7 @@ SixIsland_WaterPath_House1:: @ 8351FB0
 	.byte 0xa5, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SixIsland_WaterPath_House2:: @ 8351FCC
-	.4byte gMapData_SixIsland_WaterPath_House2 @ 0x82D5CB8
+	.4byte House3_Layout @ 0x82D5CB8
 	.4byte gMapEvents_SixIsland_WaterPath_House2 @ 0x83BF368
 	.4byte gMapScripts_SixIsland_WaterPath_House2 @ 0x8172178
 	.4byte NULL
@@ -3815,7 +3815,7 @@ SixIsland_WaterPath_House2:: @ 8351FCC
 	.byte 0xa5, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
 
 SevenIsland_SevaultCanyon_House:: @ 8351FE8
-	.4byte gMapData_SevenIsland_SevaultCanyon_House @ 0x82D5CB8
+	.4byte House3_Layout @ 0x82D5CB8
 	.4byte gMapEvents_SevenIsland_SevaultCanyon_House @ 0x83BF3CC
 	.4byte gMapScripts_SevenIsland_SevaultCanyon_House @ 0x8172182
 	.4byte NULL