1 files changed, 365 insertions, 365 deletions
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