1393 files changed, 3229 insertions, 3229 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index cc5aa4fc9..6b9b97472 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -281,7 +281,7 @@ gStdScriptsEnd::
 	.include "data/maps/CinnabarIsland/scripts.inc"
 	.include "data/maps/IndigoPlateau_Exterior/scripts.inc"
 	.include "data/maps/SaffronCity/scripts.inc"
-	.include "data/maps/SaffronCity_Classic/scripts.inc"
+	.include "data/maps/SaffronCity_Connection/scripts.inc"
 	.include "data/maps/OneIsland/scripts.inc"
 	.include "data/maps/TwoIsland/scripts.inc"
 	.include "data/maps/ThreeIsland/scripts.inc"
@@ -320,10 +320,10 @@ gStdScriptsEnd::
 	.include "data/maps/TwoIsland_CapeBrink/scripts.inc"
 	.include "data/maps/ThreeIsland_BondBridge/scripts.inc"
 	.include "data/maps/ThreeIsland_Port/scripts.inc"
-	.include "data/maps/UnknownMap_03_50/scripts.inc"
-	.include "data/maps/UnknownMap_03_51/scripts.inc"
-	.include "data/maps/UnknownMap_03_52/scripts.inc"
-	.include "data/maps/UnknownMap_03_53/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_6/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_7/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_8/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_9/scripts.inc"
 	.include "data/maps/FiveIsland_ResortGorgeous/scripts.inc"
 	.include "data/maps/FiveIsland_WaterLabyrinth/scripts.inc"
 	.include "data/maps/FiveIsland_Meadow/scripts.inc"
diff --git a/data/graphics.s b/data/graphics.s
index 247a5d230..3ae4f8e8a 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -16387,26 +16387,26 @@ gUnionRoomChatIcons:: @ 8EA1A50
 	.incbin "graphics/interface/union_room_chat_icons.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_8EA1B68:: @ 8EA1B68
-	.incbin "data/tilesets/primary/82D4A94/palettes/0.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/1.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/2.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/3.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/4.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/5.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/6.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/7.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/8.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/9.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/10.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/11.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/12.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/13.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/14.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/15.gbapal"
-
-gTilesetTiles_8EA1D68:: @ 8EA1D68
-	.incbin "data/tilesets/primary/82D4A94/tiles.4bpp.lz"
+gTilesetPalettes_General:: @ 8EA1B68
+	.incbin "data/tilesets/primary/general/palettes/0.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/1.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/2.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/3.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/4.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/5.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/6.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/7.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/8.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/9.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/10.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/11.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/12.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/13.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/14.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/15.gbapal"
+
+gTilesetTiles_General:: @ 8EA1D68
+	.incbin "data/tilesets/primary/general/tiles.4bpp.lz"
 
 gBerryFixGameboy_Pal:: @ 8EA463C
 	.incbin "graphics/berry_fix/gba_small.gbapal"
@@ -16463,50 +16463,50 @@ gBerryFixWindow_Tilemap:: @ 8EA9588
 	.incbin "graphics/berry_fix/window.bin.lz"
 
 	.align 2
-gTilesetPalettes_8EA97F4:: @ 8EA97F4
-	.incbin "data/tilesets/secondary/82D4C74/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8EA99F4:: @ 8EA99F4
-	.incbin "data/tilesets/secondary/82D4C74/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8EA9D88:: @ 8EA9D88
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/15.gbapal"
-
-
-gTilesetTiles_8EA9F88:: @ 8EA9F88
-	.incbin "data/tilesets/secondary/82D4E6C/tiles.4bpp.lz"
+gTilesetPalettes_GenericBuilding1:: @ 8EA97F4
+	.incbin "data/tilesets/secondary/generic_building1/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_GenericBuilding1:: @ 8EA99F4
+	.incbin "data/tilesets/secondary/generic_building1/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_DepartmentStore:: @ 8EA9D88
+	.incbin "data/tilesets/secondary/department_store/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/15.gbapal"
+
+
+gTilesetTiles_DepartmentStore:: @ 8EA9F88
+	.incbin "data/tilesets/secondary/department_store/tiles.4bpp.lz"
 
 gUnionRoomChatPanelBgPal_7:: @ 8EAA9F0
 	.incbin "graphics/interface/union_room_chat_panel.gbapal"
diff --git a/data/layouts/UnusedLayout_82D6C34/border.bin b/data/layouts/CeladonCity_Hotel_Duplicate/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_82D6C34/border.bin
+++ b/data/layouts/CeladonCity_Hotel_Duplicate/border.bin
diff --git a/data/layouts/UnusedLayout_833902C/map.bin b/data/layouts/CeladonCity_Hotel_Duplicate/map.bin
index 4573c1444..4573c1444 100644
--- a/data/layouts/UnusedLayout_833902C/map.bin
+++ b/data/layouts/CeladonCity_Hotel_Duplicate/map.bin
diff --git a/data/layouts/UnusedLayout_8338B4C/border.bin b/data/layouts/CeladonCity_Restaurant_Duplicate/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_8338B4C/border.bin
+++ b/data/layouts/CeladonCity_Restaurant_Duplicate/border.bin
diff --git a/data/layouts/UnusedLayout_8338E90/map.bin b/data/layouts/CeladonCity_Restaurant_Duplicate/map.bin
index a5391187c..a5391187c 100644
--- a/data/layouts/UnusedLayout_8338E90/map.bin
+++ b/data/layouts/CeladonCity_Restaurant_Duplicate/map.bin
diff --git a/data/layouts/UnusedLayout_82D6144/border.bin b/data/layouts/EverGrandeCity_HallOfFame/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82D6144/border.bin
+++ b/data/layouts/EverGrandeCity_HallOfFame/border.bin
diff --git a/data/layouts/UnusedLayout_82DCA70/map.bin b/data/layouts/EverGrandeCity_HallOfFame/map.bin
index 1df9e4804..1df9e4804 100644
--- a/data/layouts/UnusedLayout_82DCA70/map.bin
+++ b/data/layouts/EverGrandeCity_HallOfFame/map.bin
diff --git a/data/layouts/UnusedLayout_82D6654/border.bin b/data/layouts/FortreeCity_DecorationShop/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82D6654/border.bin
+++ b/data/layouts/FortreeCity_DecorationShop/border.bin
diff --git a/data/layouts/UnusedLayout_82DB4F0/map.bin b/data/layouts/FortreeCity_DecorationShop/map.bin
index 6ca8b4e61..6ca8b4e61 100644
--- a/data/layouts/UnusedLayout_82DB4F0/map.bin
+++ b/data/layouts/FortreeCity_DecorationShop/map.bin
diff --git a/data/layouts/UnusedLayout_82D672C/border.bin b/data/layouts/FortreeCity_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82D672C/border.bin
+++ b/data/layouts/FortreeCity_House1/border.bin
diff --git a/data/layouts/UnusedLayout_82D7674/map.bin b/data/layouts/FortreeCity_House1/map.bin
index 5a3ac8cb6..5a3ac8cb6 100644
--- a/data/layouts/UnusedLayout_82D7674/map.bin
+++ b/data/layouts/FortreeCity_House1/map.bin
diff --git a/data/layouts/UnusedLayout_82D75F0/border.bin b/data/layouts/FortreeCity_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82D75F0/border.bin
+++ b/data/layouts/FortreeCity_House2/border.bin
diff --git a/data/layouts/UnusedLayout_82D7CC8/map.bin b/data/layouts/FortreeCity_House2/map.bin
index 3fbcd6043..3fbcd6043 100644
--- a/data/layouts/UnusedLayout_82D7CC8/map.bin
+++ b/data/layouts/FortreeCity_House2/map.bin
diff --git a/data/layouts/UnusedLayout_82D88C8/border.bin b/data/layouts/LavaridgeTown_HerbShop/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82D88C8/border.bin
+++ b/data/layouts/LavaridgeTown_HerbShop/border.bin
diff --git a/data/layouts/UnusedLayout_82D6144/map.bin b/data/layouts/LavaridgeTown_HerbShop/map.bin
index cc0294a80..cc0294a80 100644
--- a/data/layouts/UnusedLayout_82D6144/map.bin
+++ b/data/layouts/LavaridgeTown_HerbShop/map.bin
diff --git a/data/layouts/UnusedLayout_82D54D8/border.bin b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
index c1b82435c..c1b82435c 100644
--- a/data/layouts/UnusedLayout_82D54D8/border.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
diff --git a/data/layouts/UnusedLayout_82D54D8/map.bin b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
index b51210332..b51210332 100644
--- a/data/layouts/UnusedLayout_82D54D8/map.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
diff --git a/data/layouts/UnusedLayout_82DCA70/border.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82DCA70/border.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin
diff --git a/data/layouts/UnusedLayout_82DCB44/map.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin
index bad63f412..bad63f412 100644
--- a/data/layouts/UnusedLayout_82DCB44/map.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin
diff --git a/data/layouts/UnusedLayout_82DCB44/border.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82DCB44/border.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin
diff --git a/data/layouts/UnusedLayout_82DCC40/map.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin
index 399d05705..399d05705 100644
--- a/data/layouts/UnusedLayout_82DCC40/map.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin
diff --git a/data/layouts/UnusedLayout_82D7674/border.bin b/data/layouts/PacifidlogTown_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82D7674/border.bin
+++ b/data/layouts/PacifidlogTown_House1/border.bin
diff --git a/data/layouts/UnusedLayout_82D6654/map.bin b/data/layouts/PacifidlogTown_House1/map.bin
index 7865fdc7c..7865fdc7c 100644
--- a/data/layouts/UnusedLayout_82D6654/map.bin
+++ b/data/layouts/PacifidlogTown_House1/map.bin
diff --git a/data/layouts/UnusedLayout_82D7CC8/border.bin b/data/layouts/PacifidlogTown_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82D7CC8/border.bin
+++ b/data/layouts/PacifidlogTown_House2/border.bin
diff --git a/data/layouts/UnusedLayout_82D672C/map.bin b/data/layouts/PacifidlogTown_House2/map.bin
index 617346322..617346322 100644
--- a/data/layouts/UnusedLayout_82D672C/map.bin
+++ b/data/layouts/PacifidlogTown_House2/map.bin
diff --git a/data/layouts/UnknownMap_03_50/border.bin b/data/layouts/Prototype_SeviiIsle_22/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnknownMap_03_50/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_22/border.bin
diff --git a/data/layouts/UnusedLayout_833614C/map.bin b/data/layouts/Prototype_SeviiIsle_22/map.bin
index a4b5b8b85..a4b5b8b85 100644
--- a/data/layouts/UnusedLayout_833614C/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_22/map.bin
diff --git a/data/layouts/UnknownMap_03_51/border.bin b/data/layouts/Prototype_SeviiIsle_23_East/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnknownMap_03_51/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_East/border.bin
diff --git a/data/layouts/UnusedLayout_83377F0/map.bin b/data/layouts/Prototype_SeviiIsle_23_East/map.bin
index 5bc807eea..5bc807eea 100644
--- a/data/layouts/UnusedLayout_83377F0/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_East/map.bin
diff --git a/data/layouts/UnknownMap_03_52/border.bin b/data/layouts/Prototype_SeviiIsle_23_West/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnknownMap_03_52/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_West/border.bin
diff --git a/data/layouts/UnusedLayout_8338354/map.bin b/data/layouts/Prototype_SeviiIsle_23_West/map.bin
index 667f4a779..667f4a779 100644
--- a/data/layouts/UnusedLayout_8338354/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_West/map.bin
diff --git a/data/layouts/UnknownMap_03_53/border.bin b/data/layouts/Prototype_SeviiIsle_24/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnknownMap_03_53/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_24/border.bin
diff --git a/data/layouts/UnusedLayout_8338738/map.bin b/data/layouts/Prototype_SeviiIsle_24/map.bin
index ce93426c5..ce93426c5 100644
--- a/data/layouts/UnusedLayout_8338738/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_24/map.bin
diff --git a/data/layouts/UnusedLayout_833614C/border.bin b/data/layouts/Prototype_SeviiIsle_6/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnusedLayout_833614C/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_6/border.bin
diff --git a/data/layouts/UnknownMap_03_50/map.bin b/data/layouts/Prototype_SeviiIsle_6/map.bin
index cbd97e361..cbd97e361 100644
--- a/data/layouts/UnknownMap_03_50/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_6/map.bin
diff --git a/data/layouts/UnusedLayout_83377F0/border.bin b/data/layouts/Prototype_SeviiIsle_7/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnusedLayout_83377F0/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_7/border.bin
diff --git a/data/layouts/UnknownMap_03_51/map.bin b/data/layouts/Prototype_SeviiIsle_7/map.bin
index e6859e745..e6859e745 100644
--- a/data/layouts/UnknownMap_03_51/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_7/map.bin
diff --git a/data/layouts/UnusedLayout_8338354/border.bin b/data/layouts/Prototype_SeviiIsle_8/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnusedLayout_8338354/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_8/border.bin
diff --git a/data/layouts/UnknownMap_03_52/map.bin b/data/layouts/Prototype_SeviiIsle_8/map.bin
index 7f730c596..7f730c596 100644
--- a/data/layouts/UnknownMap_03_52/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_8/map.bin
diff --git a/data/layouts/UnusedLayout_8338738/border.bin b/data/layouts/Prototype_SeviiIsle_9/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnusedLayout_8338738/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_9/border.bin
diff --git a/data/layouts/UnknownMap_03_53/map.bin b/data/layouts/Prototype_SeviiIsle_9/map.bin
index 616f50967..616f50967 100644
--- a/data/layouts/UnknownMap_03_53/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_9/map.bin
diff --git a/data/layouts/UnusedLayout_82DBBE0/border.bin b/data/layouts/RS_BattleTower/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/layouts/UnusedLayout_82DBBE0/border.bin
+++ b/data/layouts/RS_BattleTower/border.bin
diff --git a/data/layouts/UnusedLayout_82DBBE0/map.bin b/data/layouts/RS_BattleTower/map.bin
index 6e9f6adb6..6e9f6adb6 100644
--- a/data/layouts/UnusedLayout_82DBBE0/map.bin
+++ b/data/layouts/RS_BattleTower/map.bin
diff --git a/data/layouts/UnusedLayout_82D6490/border.bin b/data/layouts/RS_PokemonCenter_1F/border.bin
index efef023e6..efef023e6 100644
--- a/data/layouts/UnusedLayout_82D6490/border.bin
+++ b/data/layouts/RS_PokemonCenter_1F/border.bin
diff --git a/data/layouts/UnusedLayout_82D6490/map.bin b/data/layouts/RS_PokemonCenter_1F/map.bin
index f84061f08..f84061f08 100644
--- a/data/layouts/UnusedLayout_82D6490/map.bin
+++ b/data/layouts/RS_PokemonCenter_1F/map.bin
diff --git a/data/layouts/UnusedLayout_82DCC40/border.bin b/data/layouts/RS_SafariZone_Entrance/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82DCC40/border.bin
+++ b/data/layouts/RS_SafariZone_Entrance/border.bin
diff --git a/data/layouts/UnusedLayout_82D88C8/map.bin b/data/layouts/RS_SafariZone_Entrance/map.bin
index 35c1badac..35c1badac 100644
--- a/data/layouts/UnusedLayout_82D88C8/map.bin
+++ b/data/layouts/RS_SafariZone_Entrance/map.bin
diff --git a/data/layouts/UnusedLayout_82D9B24/border.bin b/data/layouts/RS_SafariZone_Northeast/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/layouts/UnusedLayout_82D9B24/border.bin
+++ b/data/layouts/RS_SafariZone_Northeast/border.bin
diff --git a/data/layouts/UnusedLayout_82D9B24/map.bin b/data/layouts/RS_SafariZone_Northeast/map.bin
index d5e7fd825..d5e7fd825 100644
--- a/data/layouts/UnusedLayout_82D9B24/map.bin
+++ b/data/layouts/RS_SafariZone_Northeast/map.bin
diff --git a/data/layouts/UnusedLayout_82DD0DC/border.bin b/data/layouts/RS_SafariZone_RestHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82DD0DC/border.bin
+++ b/data/layouts/RS_SafariZone_RestHouse/border.bin
diff --git a/data/layouts/UnusedLayout_82DD0DC/map.bin b/data/layouts/RS_SafariZone_RestHouse/map.bin
index c57c99c7b..c57c99c7b 100644
--- a/data/layouts/UnusedLayout_82DD0DC/map.bin
+++ b/data/layouts/RS_SafariZone_RestHouse/map.bin
diff --git a/data/layouts/UnusedLayout_82DA7C8/border.bin b/data/layouts/RS_SafariZone_Southeast/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/layouts/UnusedLayout_82DA7C8/border.bin
+++ b/data/layouts/RS_SafariZone_Southeast/border.bin
diff --git a/data/layouts/UnusedLayout_82DB46C/map.bin b/data/layouts/RS_SafariZone_Southeast/map.bin
index 540798144..540798144 100644
--- a/data/layouts/UnusedLayout_82DB46C/map.bin
+++ b/data/layouts/RS_SafariZone_Southeast/map.bin
diff --git a/data/layouts/UnusedLayout_82DB46C/border.bin b/data/layouts/RS_SafariZone_Southwest/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/layouts/UnusedLayout_82DB46C/border.bin
+++ b/data/layouts/RS_SafariZone_Southwest/border.bin
diff --git a/data/layouts/UnusedLayout_82DA7C8/map.bin b/data/layouts/RS_SafariZone_Southwest/map.bin
index 0074b6e55..0074b6e55 100644
--- a/data/layouts/UnusedLayout_82DA7C8/map.bin
+++ b/data/layouts/RS_SafariZone_Southwest/map.bin
diff --git a/data/layouts/UnusedLayout_82DB4F0/border.bin b/data/layouts/RustboroCity_CuttersHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DB4F0/border.bin
+++ b/data/layouts/RustboroCity_CuttersHouse/border.bin
diff --git a/data/layouts/UnusedLayout_82D75F0/map.bin b/data/layouts/RustboroCity_CuttersHouse/map.bin
index 5515d00cf..5515d00cf 100644
--- a/data/layouts/UnusedLayout_82D75F0/map.bin
+++ b/data/layouts/RustboroCity_CuttersHouse/map.bin
diff --git a/data/layouts/UnusedLayout_82DBDD8/border.bin b/data/layouts/RustboroCity_Flat1_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DBDD8/border.bin
+++ b/data/layouts/RustboroCity_Flat1_1F/border.bin
diff --git a/data/layouts/UnusedLayout_82DCF00/map.bin b/data/layouts/RustboroCity_Flat1_1F/map.bin
index 017298e71..017298e71 100644
--- a/data/layouts/UnusedLayout_82DCF00/map.bin
+++ b/data/layouts/RustboroCity_Flat1_1F/map.bin
diff --git a/data/layouts/UnusedLayout_82DBFB8/border.bin b/data/layouts/RustboroCity_Flat1_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DBFB8/border.bin
+++ b/data/layouts/RustboroCity_Flat1_2F/border.bin
diff --git a/data/layouts/UnusedLayout_82DD004/map.bin b/data/layouts/RustboroCity_Flat1_2F/map.bin
index 17a611343..17a611343 100644
--- a/data/layouts/UnusedLayout_82DD004/map.bin
+++ b/data/layouts/RustboroCity_Flat1_2F/map.bin
diff --git a/data/layouts/UnusedLayout_82DC4EC/border.bin b/data/layouts/RustboroCity_Flat2_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DC4EC/border.bin
+++ b/data/layouts/RustboroCity_Flat2_1F/border.bin
diff --git a/data/layouts/UnusedLayout_82DC60C/map.bin b/data/layouts/RustboroCity_Flat2_1F/map.bin
index 0f6829f9c..0f6829f9c 100644
--- a/data/layouts/UnusedLayout_82DC60C/map.bin
+++ b/data/layouts/RustboroCity_Flat2_1F/map.bin
diff --git a/data/layouts/UnusedLayout_82DC60C/border.bin b/data/layouts/RustboroCity_Flat2_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DC60C/border.bin
+++ b/data/layouts/RustboroCity_Flat2_2F/border.bin
diff --git a/data/layouts/UnusedLayout_82DC72C/map.bin b/data/layouts/RustboroCity_Flat2_2F/map.bin
index 9f3750fb4..9f3750fb4 100644
--- a/data/layouts/UnusedLayout_82DC72C/map.bin
+++ b/data/layouts/RustboroCity_Flat2_2F/map.bin
diff --git a/data/layouts/UnusedLayout_82DC72C/border.bin b/data/layouts/RustboroCity_Flat2_3F/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DC72C/border.bin
+++ b/data/layouts/RustboroCity_Flat2_3F/border.bin
diff --git a/data/layouts/UnusedLayout_82DC84C/map.bin b/data/layouts/RustboroCity_Flat2_3F/map.bin
index 2112fe799..2112fe799 100644
--- a/data/layouts/UnusedLayout_82DC84C/map.bin
+++ b/data/layouts/RustboroCity_Flat2_3F/map.bin
diff --git a/data/layouts/UnusedLayout_82DC84C/border.bin b/data/layouts/SSTidal_Corridor/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DC84C/border.bin
+++ b/data/layouts/SSTidal_Corridor/border.bin
diff --git a/data/layouts/UnusedLayout_82DBDD8/map.bin b/data/layouts/SSTidal_Corridor/map.bin
index f8cf1725d..f8cf1725d 100644
--- a/data/layouts/UnusedLayout_82DBDD8/map.bin
+++ b/data/layouts/SSTidal_Corridor/map.bin
diff --git a/data/layouts/UnusedLayout_82DCCD4/border.bin b/data/layouts/SSTidal_LowerDeck/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DCCD4/border.bin
+++ b/data/layouts/SSTidal_LowerDeck/border.bin
diff --git a/data/layouts/UnusedLayout_82DBFB8/map.bin b/data/layouts/SSTidal_LowerDeck/map.bin
index 059ce30fe..059ce30fe 100644
--- a/data/layouts/UnusedLayout_82DBFB8/map.bin
+++ b/data/layouts/SSTidal_LowerDeck/map.bin
diff --git a/data/layouts/UnusedLayout_82DCD68/border.bin b/data/layouts/SSTidal_Rooms/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DCD68/border.bin
+++ b/data/layouts/SSTidal_Rooms/border.bin
diff --git a/data/layouts/UnusedLayout_82DC4EC/map.bin b/data/layouts/SSTidal_Rooms/map.bin
index 6103ad0c2..6103ad0c2 100644
--- a/data/layouts/UnusedLayout_82DC4EC/map.bin
+++ b/data/layouts/SSTidal_Rooms/map.bin
diff --git a/data/layouts/SaffronCity_Classic/border.bin b/data/layouts/SaffronCity_Connection/border.bin
index a701312cf..a701312cf 100644
--- a/data/layouts/SaffronCity_Classic/border.bin
+++ b/data/layouts/SaffronCity_Connection/border.bin
diff --git a/data/layouts/SaffronCity_Classic/map.bin b/data/layouts/SaffronCity_Connection/map.bin
index dd7aea1cf..dd7aea1cf 100644
--- a/data/layouts/SaffronCity_Classic/map.bin
+++ b/data/layouts/SaffronCity_Connection/map.bin
diff --git a/data/layouts/UnusedLayout_8338E90/border.bin b/data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_8338E90/border.bin
+++ b/data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin
diff --git a/data/layouts/UnusedLayout_8338B4C/map.bin b/data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin
index b9381326f..b9381326f 100644
--- a/data/layouts/UnusedLayout_8338B4C/map.bin
+++ b/data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin
diff --git a/data/layouts/UnusedLayout_82DCDFC/border.bin b/data/layouts/SootopolisCity_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DCDFC/border.bin
+++ b/data/layouts/SootopolisCity_House1/border.bin
diff --git a/data/layouts/UnusedLayout_82DCCD4/map.bin b/data/layouts/SootopolisCity_House1/map.bin
index 43f11b194..43f11b194 100644
--- a/data/layouts/UnusedLayout_82DCCD4/map.bin
+++ b/data/layouts/SootopolisCity_House1/map.bin
diff --git a/data/layouts/UnusedLayout_82DCF00/border.bin b/data/layouts/SootopolisCity_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DCF00/border.bin
+++ b/data/layouts/SootopolisCity_House2/border.bin
diff --git a/data/layouts/UnusedLayout_82DCD68/map.bin b/data/layouts/SootopolisCity_House2/map.bin
index 632e1e36a..632e1e36a 100644
--- a/data/layouts/UnusedLayout_82DCD68/map.bin
+++ b/data/layouts/SootopolisCity_House2/map.bin
diff --git a/data/layouts/UnusedLayout_82DD004/border.bin b/data/layouts/SootopolisCity_House3/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DD004/border.bin
+++ b/data/layouts/SootopolisCity_House3/border.bin
diff --git a/data/layouts/UnusedLayout_82DCDFC/map.bin b/data/layouts/SootopolisCity_House3/map.bin
index 8bbd6c517..8bbd6c517 100644
--- a/data/layouts/UnusedLayout_82DCDFC/map.bin
+++ b/data/layouts/SootopolisCity_House3/map.bin
diff --git a/data/layouts/UnusedLayout_833902C/border.bin b/data/layouts/Unused1/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_833902C/border.bin
+++ b/data/layouts/Unused1/border.bin
diff --git a/data/layouts/UnusedLayout_82D6C34/map.bin b/data/layouts/Unused1/map.bin
index 35968a7fd..35968a7fd 100644
--- a/data/layouts/UnusedLayout_82D6C34/map.bin
+++ b/data/layouts/Unused1/map.bin
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 3c920c825..d585542af 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -8,8 +8,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
       "border_filepath": "data/layouts/PalletTown_PlayersHouse_1F/border.bin",
       "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_1F/map.bin"
     },
@@ -20,8 +20,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
       "border_filepath": "data/layouts/PalletTown_PlayersHouse_2F/border.bin",
       "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_2F/map.bin"
     },
@@ -32,22 +32,22 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/PalletTown_GarysHouse/border.bin",
       "blockdata_filepath": "data/layouts/PalletTown_GarysHouse/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D54D8",
-      "name": "UnusedLayout_82D54D8_Layout",
+      "id": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F",
+      "name": "LittlerootTown_MaysHouse_2F_Layout",
       "width": 9,
       "height": 8,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
-      "border_filepath": "data/layouts/UnusedLayout_82D54D8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D54D8/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
+      "border_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/border.bin",
+      "blockdata_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/map.bin"
     },
     {
       "id": "LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB",
@@ -56,8 +56,8 @@
       "height": 14,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/PalletTown_ProfessorOaksLab/border.bin",
       "blockdata_filepath": "data/layouts/PalletTown_ProfessorOaksLab/map.bin"
     },
@@ -68,8 +68,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
       "border_filepath": "data/layouts/House1/border.bin",
       "blockdata_filepath": "data/layouts/House1/map.bin"
     },
@@ -80,8 +80,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/House2/border.bin",
       "blockdata_filepath": "data/layouts/House2/map.bin"
     },
@@ -92,8 +92,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/PokemonCenter_1F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonCenter_1F/map.bin"
     },
@@ -104,8 +104,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/PokemonCenter_2F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonCenter_2F/map.bin"
     },
@@ -116,8 +116,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BCC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Mart",
       "border_filepath": "data/layouts/Mart/border.bin",
       "blockdata_filepath": "data/layouts/Mart/map.bin"
     },
@@ -128,8 +128,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/House3/border.bin",
       "blockdata_filepath": "data/layouts/House3/map.bin"
     },
@@ -140,8 +140,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D1C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CeruleanGym",
       "border_filepath": "data/layouts/CeruleanCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity_Gym/map.bin"
     },
@@ -152,22 +152,22 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/House4/border.bin",
       "blockdata_filepath": "data/layouts/House4/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D6144",
-      "name": "UnusedLayout_82D6144_Layout",
+      "id": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP",
+      "name": "LavaridgeTown_HerbShop_Layout",
       "width": 11,
       "height": 8,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BCC",
-      "border_filepath": "data/layouts/UnusedLayout_82D6144/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D6144/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Mart",
+      "border_filepath": "data/layouts/LavaridgeTown_HerbShop/border.bin",
+      "blockdata_filepath": "data/layouts/LavaridgeTown_HerbShop/map.bin"
     },
     {
       "id": "LAYOUT_CELADON_CITY_GYM",
@@ -176,22 +176,22 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D4C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CeladonGym",
       "border_filepath": "data/layouts/CeladonCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Gym/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D6490",
-      "name": "UnusedLayout_82D6490_Layout",
+      "id": "LAYOUT_RS_POKEMON_CENTER_1F",
+      "name": "RS_PokemonCenter_1F_Layout",
       "width": 14,
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
-      "border_filepath": "data/layouts/UnusedLayout_82D6490/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D6490/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
+      "border_filepath": "data/layouts/RS_PokemonCenter_1F/border.bin",
+      "blockdata_filepath": "data/layouts/RS_PokemonCenter_1F/map.bin"
     },
     {
       "id": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE",
@@ -200,34 +200,34 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Museum",
       "border_filepath": "data/layouts/FiveIsland_ResortGorgeous_House/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_ResortGorgeous_House/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D6654",
-      "name": "UnusedLayout_82D6654_Layout",
+      "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1",
+      "name": "PacifidlogTown_House1_Layout",
       "width": 10,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82D6654/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D6654/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/PacifidlogTown_House1/border.bin",
+      "blockdata_filepath": "data/layouts/PacifidlogTown_House1/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D672C",
-      "name": "UnusedLayout_82D672C_Layout",
+      "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2",
+      "name": "PacifidlogTown_House2_Layout",
       "width": 10,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82D672C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D672C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/PacifidlogTown_House2/border.bin",
+      "blockdata_filepath": "data/layouts/PacifidlogTown_House2/map.bin"
     },
     {
       "id": "LAYOUT_FUCHSIA_CITY_GYM",
@@ -236,8 +236,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CA4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FuchsiaGym",
       "border_filepath": "data/layouts/FuchsiaCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity_Gym/map.bin"
     },
@@ -248,24 +248,24 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
       "border_filepath": "data/layouts/House5/border.bin",
       "blockdata_filepath": "data/layouts/House5/map.bin"
     },
     {},
     {},
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D6C34",
-      "name": "UnusedLayout_82D6C34_Layout",
+      "id": "LAYOUT_UNUSED1",
+      "name": "Unused1_Layout",
       "width": 12,
       "height": 12,
       "border_width": 2,
       "border_height": 2,
       "primary_tileset": "NULL",
-      "secondary_tileset": "gTileset_82D4C14",
-      "border_filepath": "data/layouts/UnusedLayout_82D6C34/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D6C34/map.bin"
+      "secondary_tileset": "gTileset_Dummy1",
+      "border_filepath": "data/layouts/Unused1/border.bin",
+      "blockdata_filepath": "data/layouts/Unused1/map.bin"
     },
     {
       "id": "LAYOUT_VERMILION_CITY_GYM",
@@ -274,8 +274,8 @@
       "height": 21,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D34",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_VermilionGym",
       "border_filepath": "data/layouts/VermilionCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/VermilionCity_Gym/map.bin"
     },
@@ -286,8 +286,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C5C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BikeShop",
       "border_filepath": "data/layouts/CeruleanCity_BikeShop/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity_BikeShop/map.bin"
     },
@@ -298,8 +298,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CEC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GameCorner",
       "border_filepath": "data/layouts/CeladonCity_GameCorner/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_GameCorner/map.bin"
     },
@@ -310,8 +310,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D04",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PewterGym",
       "border_filepath": "data/layouts/PewterCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/PewterCity_Gym/map.bin"
     },
@@ -323,8 +323,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F14",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SafariZoneBuilding",
       "border_filepath": "data/layouts/FourIsland_LoreleisHouse/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_LoreleisHouse/map.bin"
     },
@@ -335,34 +335,34 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/ThreeIsland_House1/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland_House1/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D75F0",
-      "name": "UnusedLayout_82D75F0_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE",
+      "name": "RustboroCity_CuttersHouse_Layout",
       "width": 11,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82D75F0/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D75F0/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_CuttersHouse/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_CuttersHouse/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D7674",
-      "name": "UnusedLayout_82D7674_Layout",
+      "id": "LAYOUT_FORTREE_CITY_HOUSE1",
+      "name": "FortreeCity_House1_Layout",
       "width": 8,
       "height": 6,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82D7674/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D7674/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/FortreeCity_House1/border.bin",
+      "blockdata_filepath": "data/layouts/FortreeCity_House1/map.bin"
     },
     {
       "id": "LAYOUT_SAFFRON_CITY_GYM",
@@ -371,22 +371,22 @@
       "height": 25,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D64",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SaffronGym",
       "border_filepath": "data/layouts/SaffronCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_Gym/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D7CC8",
-      "name": "UnusedLayout_82D7CC8_Layout",
+      "id": "LAYOUT_FORTREE_CITY_HOUSE2",
+      "name": "FortreeCity_House2_Layout",
       "width": 8,
       "height": 6,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82D7CC8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D7CC8/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/FortreeCity_House2/border.bin",
+      "blockdata_filepath": "data/layouts/FortreeCity_House2/map.bin"
     },
     {
       "id": "LAYOUT_CINNABAR_ISLAND_GYM",
@@ -395,8 +395,8 @@
       "height": 25,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D7C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CinnabarGym",
       "border_filepath": "data/layouts/CinnabarIsland_Gym/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland_Gym/map.bin"
     },
@@ -407,8 +407,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CBC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_ViridianGym",
       "border_filepath": "data/layouts/ViridianCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/ViridianCity_Gym/map.bin"
     },
@@ -421,16 +421,16 @@
     {},
     {},
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D88C8",
-      "name": "UnusedLayout_82D88C8_Layout",
+      "id": "LAYOUT_RS_SAFARI_ZONE_ENTRANCE",
+      "name": "RS_SafariZone_Entrance_Layout",
       "width": 18,
       "height": 14,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BCC",
-      "border_filepath": "data/layouts/UnusedLayout_82D88C8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D88C8/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Mart",
+      "border_filepath": "data/layouts/RS_SafariZone_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/RS_SafariZone_Entrance/map.bin"
     },
     {
       "id": "LAYOUT_BATTLE_COLOSSEUM_2P",
@@ -439,8 +439,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
       "border_filepath": "data/layouts/BattleColosseum_2P/border.bin",
       "blockdata_filepath": "data/layouts/BattleColosseum_2P/map.bin"
     },
@@ -451,8 +451,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
       "border_filepath": "data/layouts/TradeCenter/border.bin",
       "blockdata_filepath": "data/layouts/TradeCenter/map.bin"
     },
@@ -463,8 +463,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
       "border_filepath": "data/layouts/RecordCenter/border.bin",
       "blockdata_filepath": "data/layouts/RecordCenter/map.bin"
     },
@@ -475,8 +475,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
       "border_filepath": "data/layouts/BattleColosseum_4P/border.bin",
       "blockdata_filepath": "data/layouts/BattleColosseum_4P/map.bin"
     },
@@ -487,256 +487,256 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F14",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SafariZoneBuilding",
       "border_filepath": "data/layouts/FuchsiaCity_SafariZone_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity_SafariZone_Entrance/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D9B24",
-      "name": "UnusedLayout_82D9B24_Layout",
+      "id": "LAYOUT_RS_SAFARI_ZONE_NORTHEAST",
+      "name": "RS_SafariZone_Northeast_Layout",
       "width": 40,
       "height": 40,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
-      "border_filepath": "data/layouts/UnusedLayout_82D9B24/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D9B24/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
+      "border_filepath": "data/layouts/RS_SafariZone_Northeast/border.bin",
+      "blockdata_filepath": "data/layouts/RS_SafariZone_Northeast/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DA7C8",
-      "name": "UnusedLayout_82DA7C8_Layout",
+      "id": "LAYOUT_RS_SAFARI_ZONE_SOUTHWEST",
+      "name": "RS_SafariZone_Southwest_Layout",
       "width": 40,
       "height": 40,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
-      "border_filepath": "data/layouts/UnusedLayout_82DA7C8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DA7C8/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
+      "border_filepath": "data/layouts/RS_SafariZone_Southwest/border.bin",
+      "blockdata_filepath": "data/layouts/RS_SafariZone_Southwest/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DB46C",
-      "name": "UnusedLayout_82DB46C_Layout",
+      "id": "LAYOUT_RS_SAFARI_ZONE_SOUTHEAST",
+      "name": "RS_SafariZone_Southeast_Layout",
       "width": 40,
       "height": 40,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
-      "border_filepath": "data/layouts/UnusedLayout_82DB46C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DB46C/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
+      "border_filepath": "data/layouts/RS_SafariZone_Southeast/border.bin",
+      "blockdata_filepath": "data/layouts/RS_SafariZone_Southeast/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DB4F0",
-      "name": "UnusedLayout_82DB4F0_Layout",
+      "id": "LAYOUT_FORTREE_CITY_DECORATION_SHOP",
+      "name": "FortreeCity_DecorationShop_Layout",
       "width": 8,
       "height": 6,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DB4F0/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DB4F0/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/FortreeCity_DecorationShop/border.bin",
+      "blockdata_filepath": "data/layouts/FortreeCity_DecorationShop/map.bin"
     },
     {},
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DBBE0",
-      "name": "UnusedLayout_82DBBE0_Layout",
+      "id": "LAYOUT_RS_BATTLE_TOWER",
+      "name": "RS_BattleTower_Layout",
       "width": 29,
       "height": 30,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4ADC",
-      "border_filepath": "data/layouts/UnusedLayout_82DBBE0/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DBBE0/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PewterCity",
+      "border_filepath": "data/layouts/RS_BattleTower/border.bin",
+      "blockdata_filepath": "data/layouts/RS_BattleTower/map.bin"
     },
     {},
     {},
     {},
     {},
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DBDD8",
-      "name": "UnusedLayout_82DBDD8_Layout",
+      "id": "LAYOUT_SS_TIDAL_CORRIDOR",
+      "name": "SSTidal_Corridor_Layout",
       "width": 18,
       "height": 13,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
-      "border_filepath": "data/layouts/UnusedLayout_82DBDD8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DBDD8/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
+      "border_filepath": "data/layouts/SSTidal_Corridor/border.bin",
+      "blockdata_filepath": "data/layouts/SSTidal_Corridor/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DBFB8",
-      "name": "UnusedLayout_82DBFB8_Layout",
+      "id": "LAYOUT_SS_TIDAL_LOWER_DECK",
+      "name": "SSTidal_LowerDeck_Layout",
       "width": 17,
       "height": 13,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
-      "border_filepath": "data/layouts/UnusedLayout_82DBFB8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DBFB8/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
+      "border_filepath": "data/layouts/SSTidal_LowerDeck/border.bin",
+      "blockdata_filepath": "data/layouts/SSTidal_LowerDeck/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DC4EC",
-      "name": "UnusedLayout_82DC4EC_Layout",
+      "id": "LAYOUT_SS_TIDAL_ROOMS",
+      "name": "SSTidal_Rooms_Layout",
       "width": 36,
       "height": 18,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
-      "border_filepath": "data/layouts/UnusedLayout_82DC4EC/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DC4EC/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
+      "border_filepath": "data/layouts/SSTidal_Rooms/border.bin",
+      "blockdata_filepath": "data/layouts/SSTidal_Rooms/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DC60C",
-      "name": "UnusedLayout_82DC60C_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT2_1F",
+      "name": "RustboroCity_Flat2_1F_Layout",
       "width": 14,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DC60C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DC60C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat2_1F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat2_1F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DC72C",
-      "name": "UnusedLayout_82DC72C_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT2_2F",
+      "name": "RustboroCity_Flat2_2F_Layout",
       "width": 14,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DC72C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DC72C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat2_2F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat2_2F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DC84C",
-      "name": "UnusedLayout_82DC84C_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT2_3F",
+      "name": "RustboroCity_Flat2_3F_Layout",
       "width": 14,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DC84C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DC84C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat2_3F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat2_3F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCA70",
-      "name": "UnusedLayout_82DCA70_Layout",
+      "id": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME",
+      "name": "EverGrandeCity_HallOfFame_Layout",
       "width": 15,
       "height": 17,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C44",
-      "border_filepath": "data/layouts/UnusedLayout_82DCA70/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCA70/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
+      "border_filepath": "data/layouts/EverGrandeCity_HallOfFame/border.bin",
+      "blockdata_filepath": "data/layouts/EverGrandeCity_HallOfFame/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCB44",
-      "name": "UnusedLayout_82DCB44_Layout",
+      "id": "LAYOUT_MOSSDEEP_CITY_EREADER_TRAINER_HOUSE_1F",
+      "name": "MossdeepCity_EReaderTrainerHouse_1F_Layout",
       "width": 11,
       "height": 8,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCB44/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCB44/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin",
+      "blockdata_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCC40",
-      "name": "UnusedLayout_82DCC40_Layout",
+      "id": "LAYOUT_MOSSDEEP_CITY_EREADER_TRAINER_HOUSE_2F",
+      "name": "MossdeepCity_EReaderTrainerHouse_2F_Layout",
       "width": 12,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCC40/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCC40/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin",
+      "blockdata_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCCD4",
-      "name": "UnusedLayout_82DCCD4_Layout",
+      "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1",
+      "name": "SootopolisCity_House1_Layout",
       "width": 8,
       "height": 7,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCCD4/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCCD4/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/SootopolisCity_House1/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_House1/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCD68",
-      "name": "UnusedLayout_82DCD68_Layout",
+      "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2",
+      "name": "SootopolisCity_House2_Layout",
       "width": 8,
       "height": 7,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCD68/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCD68/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/SootopolisCity_House2/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_House2/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCDFC",
-      "name": "UnusedLayout_82DCDFC_Layout",
+      "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3",
+      "name": "SootopolisCity_House3_Layout",
       "width": 8,
       "height": 7,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCDFC/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCDFC/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/SootopolisCity_House3/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_House3/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCF00",
-      "name": "UnusedLayout_82DCF00_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT1_1F",
+      "name": "RustboroCity_Flat1_1F_Layout",
       "width": 14,
       "height": 8,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCF00/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCF00/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat1_1F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat1_1F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DD004",
-      "name": "UnusedLayout_82DD004_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT1_2F",
+      "name": "RustboroCity_Flat1_2F_Layout",
       "width": 14,
       "height": 8,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DD004/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DD004/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat1_2F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat1_2F/map.bin"
     },
     {},
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DD0DC",
-      "name": "UnusedLayout_82DD0DC_Layout",
+      "id": "LAYOUT_RS_SAFARI_ZONE_REST_HOUSE",
+      "name": "RS_SafariZone_RestHouse_Layout",
       "width": 10,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DD0DC/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DD0DC/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RS_SafariZone_RestHouse/border.bin",
+      "blockdata_filepath": "data/layouts/RS_SafariZone_RestHouse/map.bin"
     },
     {
       "id": "LAYOUT_PALLET_TOWN",
@@ -745,8 +745,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
       "border_filepath": "data/layouts/PalletTown/border.bin",
       "blockdata_filepath": "data/layouts/PalletTown/map.bin"
     },
@@ -757,8 +757,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AC4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_ViridianCity",
       "border_filepath": "data/layouts/ViridianCity/border.bin",
       "blockdata_filepath": "data/layouts/ViridianCity/map.bin"
     },
@@ -769,8 +769,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4ADC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PewterCity",
       "border_filepath": "data/layouts/PewterCity/border.bin",
       "blockdata_filepath": "data/layouts/PewterCity/map.bin"
     },
@@ -781,8 +781,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/CeruleanCity/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity/map.bin"
     },
@@ -793,8 +793,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/LavenderTown/border.bin",
       "blockdata_filepath": "data/layouts/LavenderTown/map.bin"
     },
@@ -805,8 +805,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_VermilionCity",
       "border_filepath": "data/layouts/VermilionCity/border.bin",
       "blockdata_filepath": "data/layouts/VermilionCity/map.bin"
     },
@@ -817,8 +817,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
       "border_filepath": "data/layouts/CeladonCity/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity/map.bin"
     },
@@ -829,8 +829,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/FuchsiaCity/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity/map.bin"
     },
@@ -841,8 +841,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
       "border_filepath": "data/layouts/CinnabarIsland/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland/map.bin"
     },
@@ -853,22 +853,22 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B84",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_IndigoPlateau",
       "border_filepath": "data/layouts/IndigoPlateau_Exterior/border.bin",
       "blockdata_filepath": "data/layouts/IndigoPlateau_Exterior/map.bin"
     },
     {
-      "id": "LAYOUT_SAFFRON_CITY_CLASSIC",
-      "name": "SaffronCity_Classic_Layout",
+      "id": "LAYOUT_SAFFRON_CITY_CONNECTION",
+      "name": "SaffronCity_Connection_Layout",
       "width": 48,
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B9C",
-      "border_filepath": "data/layouts/SaffronCity_Classic/border.bin",
-      "blockdata_filepath": "data/layouts/SaffronCity_Classic/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SaffronCity",
+      "border_filepath": "data/layouts/SaffronCity_Connection/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity_Connection/map.bin"
     },
     {
       "id": "LAYOUT_ROUTE1",
@@ -877,8 +877,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
       "border_filepath": "data/layouts/Route1/border.bin",
       "blockdata_filepath": "data/layouts/Route1/map.bin"
     },
@@ -889,8 +889,8 @@
       "height": 80,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AC4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_ViridianCity",
       "border_filepath": "data/layouts/Route2/border.bin",
       "blockdata_filepath": "data/layouts/Route2/map.bin"
     },
@@ -901,8 +901,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4ADC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PewterCity",
       "border_filepath": "data/layouts/Route3/border.bin",
       "blockdata_filepath": "data/layouts/Route3/map.bin"
     },
@@ -913,8 +913,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/Route4/border.bin",
       "blockdata_filepath": "data/layouts/Route4/map.bin"
     },
@@ -925,8 +925,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/Route5/border.bin",
       "blockdata_filepath": "data/layouts/Route5/map.bin"
     },
@@ -937,8 +937,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_VermilionCity",
       "border_filepath": "data/layouts/Route6/border.bin",
       "blockdata_filepath": "data/layouts/Route6/map.bin"
     },
@@ -949,8 +949,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
       "border_filepath": "data/layouts/Route7/border.bin",
       "blockdata_filepath": "data/layouts/Route7/map.bin"
     },
@@ -961,8 +961,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route8/border.bin",
       "blockdata_filepath": "data/layouts/Route8/map.bin"
     },
@@ -973,8 +973,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/Route9/border.bin",
       "blockdata_filepath": "data/layouts/Route9/map.bin"
     },
@@ -985,8 +985,8 @@
       "height": 80,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route10/border.bin",
       "blockdata_filepath": "data/layouts/Route10/map.bin"
     },
@@ -997,8 +997,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_VermilionCity",
       "border_filepath": "data/layouts/Route11/border.bin",
       "blockdata_filepath": "data/layouts/Route11/map.bin"
     },
@@ -1009,8 +1009,8 @@
       "height": 120,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route12/border.bin",
       "blockdata_filepath": "data/layouts/Route12/map.bin"
     },
@@ -1021,8 +1021,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route13/border.bin",
       "blockdata_filepath": "data/layouts/Route13/map.bin"
     },
@@ -1033,8 +1033,8 @@
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route14/border.bin",
       "blockdata_filepath": "data/layouts/Route14/map.bin"
     },
@@ -1045,8 +1045,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/Route15/border.bin",
       "blockdata_filepath": "data/layouts/Route15/map.bin"
     },
@@ -1057,8 +1057,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
       "border_filepath": "data/layouts/Route16/border.bin",
       "blockdata_filepath": "data/layouts/Route16/map.bin"
     },
@@ -1069,8 +1069,8 @@
       "height": 160,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
       "border_filepath": "data/layouts/Route17/border.bin",
       "blockdata_filepath": "data/layouts/Route17/map.bin"
     },
@@ -1081,8 +1081,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
       "border_filepath": "data/layouts/Route18/border.bin",
       "blockdata_filepath": "data/layouts/Route18/map.bin"
     },
@@ -1093,8 +1093,8 @@
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/Route19/border.bin",
       "blockdata_filepath": "data/layouts/Route19/map.bin"
     },
@@ -1105,8 +1105,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
       "border_filepath": "data/layouts/Route20/border.bin",
       "blockdata_filepath": "data/layouts/Route20/map.bin"
     },
@@ -1117,8 +1117,8 @@
       "height": 50,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
       "border_filepath": "data/layouts/Route21_North/border.bin",
       "blockdata_filepath": "data/layouts/Route21_North/map.bin"
     },
@@ -1129,8 +1129,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AC4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_ViridianCity",
       "border_filepath": "data/layouts/Route22/border.bin",
       "blockdata_filepath": "data/layouts/Route22/map.bin"
     },
@@ -1141,8 +1141,8 @@
       "height": 160,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B84",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_IndigoPlateau",
       "border_filepath": "data/layouts/Route23/border.bin",
       "blockdata_filepath": "data/layouts/Route23/map.bin"
     },
@@ -1153,8 +1153,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/Route24/border.bin",
       "blockdata_filepath": "data/layouts/Route24/map.bin"
     },
@@ -1165,8 +1165,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/Route25/border.bin",
       "blockdata_filepath": "data/layouts/Route25/map.bin"
     },
@@ -1177,8 +1177,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/MtMoon_1F/border.bin",
       "blockdata_filepath": "data/layouts/MtMoon_1F/map.bin"
     },
@@ -1189,8 +1189,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/MtMoon_B1F/border.bin",
       "blockdata_filepath": "data/layouts/MtMoon_B1F/map.bin"
     },
@@ -1201,8 +1201,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/MtMoon_B2F/border.bin",
       "blockdata_filepath": "data/layouts/MtMoon_B2F/map.bin"
     },
@@ -1213,8 +1213,8 @@
       "height": 69,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4DC4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_ViridianForest",
       "border_filepath": "data/layouts/ViridianForest/border.bin",
       "blockdata_filepath": "data/layouts/ViridianForest/map.bin"
     },
@@ -1225,8 +1225,8 @@
       "height": 32,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_VermilionCity",
       "border_filepath": "data/layouts/SSAnne_Exterior/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_Exterior/map.bin"
     },
@@ -1237,8 +1237,8 @@
       "height": 21,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_1F_Corridor/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_1F_Corridor/map.bin"
     },
@@ -1249,8 +1249,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_2F_Corridor/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_2F_Corridor/map.bin"
     },
@@ -1261,8 +1261,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_3F_Corridor/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_3F_Corridor/map.bin"
     },
@@ -1273,8 +1273,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_B1F_Corridor/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_B1F_Corridor/map.bin"
     },
@@ -1285,8 +1285,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_Deck/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_Deck/map.bin"
     },
@@ -1297,8 +1297,8 @@
       "height": 80,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_DiglettsCave",
       "border_filepath": "data/layouts/DiglettsCave_B1F/border.bin",
       "blockdata_filepath": "data/layouts/DiglettsCave_B1F/map.bin"
     },
@@ -1309,8 +1309,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/VictoryRoad_1F/border.bin",
       "blockdata_filepath": "data/layouts/VictoryRoad_1F/map.bin"
     },
@@ -1321,8 +1321,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/VictoryRoad_2F/border.bin",
       "blockdata_filepath": "data/layouts/VictoryRoad_2F/map.bin"
     },
@@ -1333,8 +1333,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/VictoryRoad_3F/border.bin",
       "blockdata_filepath": "data/layouts/VictoryRoad_3F/map.bin"
     },
@@ -1345,8 +1345,8 @@
       "height": 34,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/RocketHideout_B1F/border.bin",
       "blockdata_filepath": "data/layouts/RocketHideout_B1F/map.bin"
     },
@@ -1357,8 +1357,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/RocketHideout_B2F/border.bin",
       "blockdata_filepath": "data/layouts/RocketHideout_B2F/map.bin"
     },
@@ -1369,8 +1369,8 @@
       "height": 27,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/RocketHideout_B3F/border.bin",
       "blockdata_filepath": "data/layouts/RocketHideout_B3F/map.bin"
     },
@@ -1381,8 +1381,8 @@
       "height": 26,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/RocketHideout_B4F/border.bin",
       "blockdata_filepath": "data/layouts/RocketHideout_B4F/map.bin"
     },
@@ -1393,8 +1393,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_1F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_1F/map.bin"
     },
@@ -1405,8 +1405,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_2F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_2F/map.bin"
     },
@@ -1417,8 +1417,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_3F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_3F/map.bin"
     },
@@ -1429,8 +1429,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_4F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_4F/map.bin"
     },
@@ -1441,8 +1441,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_5F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_5F/map.bin"
     },
@@ -1453,8 +1453,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_6F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_6F/map.bin"
     },
@@ -1465,8 +1465,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_7F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_7F/map.bin"
     },
@@ -1477,8 +1477,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_8F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_8F/map.bin"
     },
@@ -1489,8 +1489,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_9F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_9F/map.bin"
     },
@@ -1501,8 +1501,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_10F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_10F/map.bin"
     },
@@ -1513,8 +1513,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_11F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_11F/map.bin"
     },
@@ -1525,8 +1525,8 @@
       "height": 35,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonMansion",
       "border_filepath": "data/layouts/PokemonMansion_1F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonMansion_1F/map.bin"
     },
@@ -1537,8 +1537,8 @@
       "height": 38,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonMansion",
       "border_filepath": "data/layouts/PokemonMansion_2F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonMansion_2F/map.bin"
     },
@@ -1549,8 +1549,8 @@
       "height": 35,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonMansion",
       "border_filepath": "data/layouts/PokemonMansion_3F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonMansion_3F/map.bin"
     },
@@ -1561,8 +1561,8 @@
       "height": 35,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonMansion",
       "border_filepath": "data/layouts/PokemonMansion_B1F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonMansion_B1F/map.bin"
     },
@@ -1573,8 +1573,8 @@
       "height": 36,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/SafariZone_Center/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_Center/map.bin"
     },
@@ -1585,8 +1585,8 @@
       "height": 35,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/SafariZone_East/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_East/map.bin"
     },
@@ -1597,8 +1597,8 @@
       "height": 40,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/SafariZone_North/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_North/map.bin"
     },
@@ -1609,8 +1609,8 @@
       "height": 36,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/SafariZone_West/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_West/map.bin"
     },
@@ -1621,8 +1621,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCave",
       "border_filepath": "data/layouts/CeruleanCave_1F/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCave_1F/map.bin"
     },
@@ -1633,8 +1633,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCave",
       "border_filepath": "data/layouts/CeruleanCave_2F/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCave_2F/map.bin"
     },
@@ -1645,8 +1645,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCave",
       "border_filepath": "data/layouts/CeruleanCave_B1F/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCave_B1F/map.bin"
     },
@@ -1657,8 +1657,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4DF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_RockTunnel",
       "border_filepath": "data/layouts/RockTunnel_1F/border.bin",
       "blockdata_filepath": "data/layouts/RockTunnel_1F/map.bin"
     },
@@ -1669,8 +1669,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4DF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_RockTunnel",
       "border_filepath": "data/layouts/RockTunnel_B1F/border.bin",
       "blockdata_filepath": "data/layouts/RockTunnel_B1F/map.bin"
     },
@@ -1681,8 +1681,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_1F/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_1F/map.bin"
     },
@@ -1693,8 +1693,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B1F/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B1F/map.bin"
     },
@@ -1705,8 +1705,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B2F/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B2F/map.bin"
     },
@@ -1717,8 +1717,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B3F/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B3F/map.bin"
     },
@@ -1729,8 +1729,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B4F/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B4F/map.bin"
     },
@@ -1741,8 +1741,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_1F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_1F/map.bin"
     },
@@ -1753,8 +1753,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_2F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_2F/map.bin"
     },
@@ -1765,8 +1765,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_3F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_3F/map.bin"
     },
@@ -1777,8 +1777,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_4F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_4F/map.bin"
     },
@@ -1789,8 +1789,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_5F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_5F/map.bin"
     },
@@ -1801,8 +1801,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_6F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_6F/map.bin"
     },
@@ -1813,8 +1813,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_7F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_7F/map.bin"
     },
@@ -1825,8 +1825,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E9C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PowerPlant",
       "border_filepath": "data/layouts/PowerPlant/border.bin",
       "blockdata_filepath": "data/layouts/PowerPlant/map.bin"
     },
@@ -1837,8 +1837,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EB4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SeaCottage",
       "border_filepath": "data/layouts/Route25_SeaCottage/border.bin",
       "blockdata_filepath": "data/layouts/Route25_SeaCottage/map.bin"
     },
@@ -1849,8 +1849,8 @@
       "height": 14,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_Kitchen/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_Kitchen/map.bin"
     },
@@ -1861,8 +1861,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_CaptainsOffice/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_CaptainsOffice/map.bin"
     },
@@ -1873,8 +1873,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/UndergroundPath_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/UndergroundPath_Entrance/map.bin"
     },
@@ -1885,8 +1885,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_UndergroundPath",
       "border_filepath": "data/layouts/UndergroundPath_EastWestTunnel/border.bin",
       "blockdata_filepath": "data/layouts/UndergroundPath_EastWestTunnel/map.bin"
     },
@@ -1897,8 +1897,8 @@
       "height": 63,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_UndergroundPath",
       "border_filepath": "data/layouts/UndergroundPath_NorthSouthTunnel/border.bin",
       "blockdata_filepath": "data/layouts/UndergroundPath_NorthSouthTunnel/map.bin"
     },
@@ -1910,8 +1910,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Route12_NorthEntrance_1F/border.bin",
       "blockdata_filepath": "data/layouts/Route12_NorthEntrance_1F/map.bin"
     },
@@ -1922,8 +1922,8 @@
       "height": 8,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_Room1/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_Room1/map.bin"
     },
@@ -1934,8 +1934,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_Room2/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_Room2/map.bin"
     },
@@ -1946,8 +1946,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_Elevator/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_Elevator/map.bin"
     },
@@ -1958,8 +1958,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Museum",
       "border_filepath": "data/layouts/PewterCity_Museum_1F/border.bin",
       "blockdata_filepath": "data/layouts/PewterCity_Museum_1F/map.bin"
     },
@@ -1970,8 +1970,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Museum",
       "border_filepath": "data/layouts/PewterCity_Museum_2F/border.bin",
       "blockdata_filepath": "data/layouts/PewterCity_Museum_2F/map.bin"
     },
@@ -1982,8 +1982,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4FA4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BurgledHouse",
       "border_filepath": "data/layouts/CeruleanCity_House2/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity_House2/map.bin"
     },
@@ -1994,8 +1994,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/CeruleanCity_House1/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity_House1/map.bin"
     },
@@ -2006,8 +2006,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Condominiums",
       "border_filepath": "data/layouts/CeladonCity_Condominiums_1F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_1F/map.bin"
     },
@@ -2018,8 +2018,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Condominiums",
       "border_filepath": "data/layouts/CeladonCity_Condominiums_2F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_2F/map.bin"
     },
@@ -2030,8 +2030,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Condominiums",
       "border_filepath": "data/layouts/CeladonCity_Condominiums_3F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_3F/map.bin"
     },
@@ -2042,8 +2042,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Condominiums",
       "border_filepath": "data/layouts/CeladonCity_Condominiums_Roof/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_Roof/map.bin"
     },
@@ -2054,8 +2054,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F5C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_School",
       "border_filepath": "data/layouts/CeladonCity_Condominiums_RoofRoom/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_RoofRoom/map.bin"
     },
@@ -2066,8 +2066,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CEC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GameCorner",
       "border_filepath": "data/layouts/CeladonCity_GameCorner_PrizeRoom/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_GameCorner_PrizeRoom/map.bin"
     },
@@ -2078,8 +2078,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_RestaurantHotel",
       "border_filepath": "data/layouts/CeladonCity_Restaurant/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Restaurant/map.bin"
     },
@@ -2090,8 +2090,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_RestaurantHotel",
       "border_filepath": "data/layouts/CeladonCity_Hotel/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Hotel/map.bin"
     },
@@ -2102,8 +2102,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_1F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_1F/map.bin"
     },
@@ -2114,8 +2114,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_2F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_2F/map.bin"
     },
@@ -2126,8 +2126,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_3F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_3F/map.bin"
     },
@@ -2138,8 +2138,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_4F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_4F/map.bin"
     },
@@ -2150,8 +2150,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_5F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_5F/map.bin"
     },
@@ -2162,8 +2162,8 @@
       "height": 14,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_Roof/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_Roof/map.bin"
     },
@@ -2174,8 +2174,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F14",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SafariZoneBuilding",
       "border_filepath": "data/layouts/SafariZone_RestHouse/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_RestHouse/map.bin"
     },
@@ -2186,8 +2186,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F14",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SafariZoneBuilding",
       "border_filepath": "data/layouts/SafariZone_SecretHouse/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_SecretHouse/map.bin"
     },
@@ -2198,8 +2198,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F14",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SafariZoneBuilding",
       "border_filepath": "data/layouts/FuchsiaCity_SafariZone_Office/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity_SafariZone_Office/map.bin"
     },
@@ -2210,8 +2210,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Museum",
       "border_filepath": "data/layouts/FuchsiaCity_WardensHouse/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity_WardensHouse/map.bin"
     },
@@ -2222,8 +2222,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Museum",
       "border_filepath": "data/layouts/FuchsiaCity_House2/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity_House2/map.bin"
     },
@@ -2234,8 +2234,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_Entrance/map.bin"
     },
@@ -2246,8 +2246,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_Lounge/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_Lounge/map.bin"
     },
@@ -2258,8 +2258,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/map.bin"
     },
@@ -2270,8 +2270,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/map.bin"
     },
@@ -2282,8 +2282,8 @@
       "height": 55,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B9C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SaffronCity",
       "border_filepath": "data/layouts/SaffronCity/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity/map.bin"
     },
@@ -2294,8 +2294,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/map.bin"
     },
@@ -2306,8 +2306,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/SaffronCity_EastWestEntrance/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_EastWestEntrance/map.bin"
     },
@@ -2318,8 +2318,8 @@
       "height": 8,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_DiglettsCave",
       "border_filepath": "data/layouts/DiglettsCave_NorthEntrance/border.bin",
       "blockdata_filepath": "data/layouts/DiglettsCave_NorthEntrance/map.bin"
     },
@@ -2330,8 +2330,8 @@
       "height": 8,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_DiglettsCave",
       "border_filepath": "data/layouts/DiglettsCave_SouthEntrance/border.bin",
       "blockdata_filepath": "data/layouts/DiglettsCave_SouthEntrance/map.bin"
     },
@@ -2342,8 +2342,8 @@
       "height": 18,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/IndigoPlateau_PokemonCenter_1F/border.bin",
       "blockdata_filepath": "data/layouts/IndigoPlateau_PokemonCenter_1F/map.bin"
     },
@@ -2354,8 +2354,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50C4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonLeague",
       "border_filepath": "data/layouts/PokemonLeague_LoreleisRoom/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_LoreleisRoom/map.bin"
     },
@@ -2366,8 +2366,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50C4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonLeague",
       "border_filepath": "data/layouts/PokemonLeague_BrunosRoom/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_BrunosRoom/map.bin"
     },
@@ -2378,8 +2378,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50C4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonLeague",
       "border_filepath": "data/layouts/PokemonLeague_AgathasRoom/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_AgathasRoom/map.bin"
     },
@@ -2390,8 +2390,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50C4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonLeague",
       "border_filepath": "data/layouts/PokemonLeague_LancesRoom/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_LancesRoom/map.bin"
     },
@@ -2402,8 +2402,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50C4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonLeague",
       "border_filepath": "data/layouts/PokemonLeague_ChampionsRoom/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_ChampionsRoom/map.bin"
     },
@@ -2414,8 +2414,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50DC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HallOfFame",
       "border_filepath": "data/layouts/PokemonLeague_HallOfFame/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_HallOfFame/map.bin"
     },
@@ -2426,8 +2426,8 @@
       "height": 50,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
       "border_filepath": "data/layouts/Route21_South/border.bin",
       "blockdata_filepath": "data/layouts/Route21_South/map.bin"
     },
@@ -2438,8 +2438,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Entrance_2F/border.bin",
       "blockdata_filepath": "data/layouts/Entrance_2F/map.bin"
     },
@@ -2450,8 +2450,8 @@
       "height": 12,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Route2_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/Route2_Entrance/map.bin"
     },
@@ -2462,8 +2462,8 @@
       "height": 12,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Route22_NorthEntrance/border.bin",
       "blockdata_filepath": "data/layouts/Route22_NorthEntrance/map.bin"
     },
@@ -2474,8 +2474,8 @@
       "height": 18,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Route16_NorthEntrance_1F/border.bin",
       "blockdata_filepath": "data/layouts/Route16_NorthEntrance_1F/map.bin"
     },
@@ -2486,8 +2486,8 @@
       "height": 12,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Entrance_1F/border.bin",
       "blockdata_filepath": "data/layouts/Entrance_1F/map.bin"
     },
@@ -2498,8 +2498,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/RocketHideout_Elevator/border.bin",
       "blockdata_filepath": "data/layouts/RocketHideout_Elevator/map.bin"
     },
@@ -2510,8 +2510,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
       "border_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/map.bin"
     },
@@ -2522,8 +2522,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
       "border_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/map.bin"
     },
@@ -2534,8 +2534,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D04",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PewterGym",
       "border_filepath": "data/layouts/SaffronCity_Dojo/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_Dojo/map.bin"
     },
@@ -2546,8 +2546,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_Elevator/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_Elevator/map.bin"
     },
@@ -2558,8 +2558,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/OneIsland/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland/map.bin"
     },
@@ -2570,8 +2570,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/TwoIsland/border.bin",
       "blockdata_filepath": "data/layouts/TwoIsland/map.bin"
     },
@@ -2582,8 +2582,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/ThreeIsland/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland/map.bin"
     },
@@ -2594,8 +2594,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FourIsland/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland/map.bin"
     },
@@ -2606,8 +2606,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FiveIsland/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland/map.bin"
     },
@@ -2618,8 +2618,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SevenIsland/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland/map.bin"
     },
@@ -2630,8 +2630,8 @@
       "height": 30,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SixIsland/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland/map.bin"
     },
@@ -2642,8 +2642,8 @@
       "height": 140,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/OneIsland_KindleRoad/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland_KindleRoad/map.bin"
     },
@@ -2654,8 +2654,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/OneIsland_TreasureBeach/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland_TreasureBeach/map.bin"
     },
@@ -2666,8 +2666,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/TwoIsland_CapeBrink/border.bin",
       "blockdata_filepath": "data/layouts/TwoIsland_CapeBrink/map.bin"
     },
@@ -2678,8 +2678,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/ThreeIsland_BondBridge/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland_BondBridge/map.bin"
     },
@@ -2690,58 +2690,58 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/ThreeIsland_Port/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland_Port/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_03_50",
-      "name": "UnknownMap_03_50_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_6",
+      "name": "Prototype_SeviiIsle_6_Layout",
       "width": 1,
       "height": 1,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
-      "border_filepath": "data/layouts/UnknownMap_03_50/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_03_50/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_6/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_6/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_03_51",
-      "name": "UnknownMap_03_51_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_7",
+      "name": "Prototype_SeviiIsle_7_Layout",
       "width": 1,
       "height": 1,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
-      "border_filepath": "data/layouts/UnknownMap_03_51/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_03_51/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_7/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_7/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_03_52",
-      "name": "UnknownMap_03_52_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_8",
+      "name": "Prototype_SeviiIsle_8_Layout",
       "width": 84,
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
-      "border_filepath": "data/layouts/UnknownMap_03_52/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_03_52/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_8/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_8/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_03_53",
-      "name": "UnknownMap_03_53_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_9",
+      "name": "Prototype_SeviiIsle_9_Layout",
       "width": 24,
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
-      "border_filepath": "data/layouts/UnknownMap_03_53/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_03_53/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_9/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_9/map.bin"
     },
     {
       "id": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS",
@@ -2750,8 +2750,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FiveIsland_ResortGorgeous/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_ResortGorgeous/map.bin"
     },
@@ -2762,8 +2762,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FiveIsland_WaterLabyrinth/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_WaterLabyrinth/map.bin"
     },
@@ -2774,8 +2774,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FiveIsland_Meadow/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_Meadow/map.bin"
     },
@@ -2786,8 +2786,8 @@
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FiveIsland_MemorialPillar/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_MemorialPillar/map.bin"
     },
@@ -2798,8 +2798,8 @@
       "height": 80,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SixIsland_OutcastIsland/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_OutcastIsland/map.bin"
     },
@@ -2810,8 +2810,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SixIsland_GreenPath/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_GreenPath/map.bin"
     },
@@ -2822,8 +2822,8 @@
       "height": 100,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SixIsland_WaterPath/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_WaterPath/map.bin"
     },
@@ -2834,8 +2834,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SixIsland_RuinValley/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_RuinValley/map.bin"
     },
@@ -2846,8 +2846,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SevenIsland_TrainerTower/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower/map.bin"
     },
@@ -2858,8 +2858,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SevenIsland_SevaultCanyon_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon_Entrance/map.bin"
     },
@@ -2870,8 +2870,8 @@
       "height": 80,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SevenIsland_SevaultCanyon/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon/map.bin"
     },
@@ -2882,58 +2882,58 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_833614C",
-      "name": "UnusedLayout_833614C_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_22",
+      "name": "Prototype_SeviiIsle_22_Layout",
       "width": 24,
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
-      "border_filepath": "data/layouts/UnusedLayout_833614C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_833614C/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_22/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_22/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_83377F0",
-      "name": "UnusedLayout_83377F0_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_23_EAST",
+      "name": "Prototype_SeviiIsle_23_East_Layout",
       "width": 144,
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
-      "border_filepath": "data/layouts/UnusedLayout_83377F0/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_83377F0/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_23_East/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_23_East/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_8338354",
-      "name": "UnusedLayout_8338354_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_23_WEST",
+      "name": "Prototype_SeviiIsle_23_West_Layout",
       "width": 24,
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
-      "border_filepath": "data/layouts/UnusedLayout_8338354/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_8338354/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_23_West/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_23_West/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_8338738",
-      "name": "UnusedLayout_8338738_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_24",
+      "name": "Prototype_SeviiIsle_24_Layout",
       "width": 24,
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
-      "border_filepath": "data/layouts/UnusedLayout_8338738/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_8338738/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_24/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_24/map.bin"
     },
     {
       "id": "LAYOUT_UNION_ROOM",
@@ -2942,8 +2942,8 @@
       "height": 12,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50DC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HallOfFame",
       "border_filepath": "data/layouts/UnionRoom/border.bin",
       "blockdata_filepath": "data/layouts/UnionRoom/map.bin"
     },
@@ -2954,22 +2954,22 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FanClubDaycare",
       "border_filepath": "data/layouts/SaffronCity_PokemonTrainerFanClub/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_PokemonTrainerFanClub/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_8338B4C",
-      "name": "UnusedLayout_8338B4C_Layout",
+      "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN",
+      "name": "SevenIsland_House_Room1_DoorOpen_Layout",
       "width": 11,
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
-      "border_filepath": "data/layouts/UnusedLayout_8338B4C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_8338B4C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
+      "border_filepath": "data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin"
     },
     {
       "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2",
@@ -2978,8 +2978,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/SevenIsland_House_Room2/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_House_Room2/map.bin"
     },
@@ -2990,34 +2990,34 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F5C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_School",
       "border_filepath": "data/layouts/ViridianCity_House2/border.bin",
       "blockdata_filepath": "data/layouts/ViridianCity_House2/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_8338E90",
-      "name": "UnusedLayout_8338E90_Layout",
+      "id": "LAYOUT_CELADON_CITY_RESTAURANT_DUPLICATE",
+      "name": "CeladonCity_Restaurant_Duplicate_Layout",
       "width": 15,
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F44",
-      "border_filepath": "data/layouts/UnusedLayout_8338E90/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_8338E90/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_RestaurantHotel",
+      "border_filepath": "data/layouts/CeladonCity_Restaurant_Duplicate/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_Restaurant_Duplicate/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_833902C",
-      "name": "UnusedLayout_833902C_Layout",
+      "id": "LAYOUT_CELADON_CITY_HOTEL_DUPLICATE",
+      "name": "CeladonCity_Hotel_Duplicate_Layout",
       "width": 17,
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F44",
-      "border_filepath": "data/layouts/UnusedLayout_833902C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_833902C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_RestaurantHotel",
+      "border_filepath": "data/layouts/CeladonCity_Hotel_Duplicate/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_Hotel_Duplicate/map.bin"
     },
     {
       "id": "LAYOUT_MT_EMBER_RUBY_PATH_B4F",
@@ -3026,8 +3026,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B4F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B4F/map.bin"
     },
@@ -3038,8 +3038,8 @@
       "height": 47,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5004",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_BerryForest",
       "border_filepath": "data/layouts/ThreeIsland_BerryForest/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland_BerryForest/map.bin"
     },
@@ -3050,8 +3050,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/OneIsland_PokemonCenter_1F/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland_PokemonCenter_1F/map.bin"
     },
@@ -3062,8 +3062,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CEC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GameCorner",
       "border_filepath": "data/layouts/TwoIsland_JoyfulGameCorner/border.bin",
       "blockdata_filepath": "data/layouts/TwoIsland_JoyfulGameCorner/map.bin"
     },
@@ -3074,8 +3074,8 @@
       "height": 12,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FanClubDaycare",
       "border_filepath": "data/layouts/VermilionCity_PokemonFanClub/border.bin",
       "blockdata_filepath": "data/layouts/VermilionCity_PokemonFanClub/map.bin"
     },
@@ -3086,8 +3086,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FanClubDaycare",
       "border_filepath": "data/layouts/LavenderTown_VolunteerPokemonHouse/border.bin",
       "blockdata_filepath": "data/layouts/LavenderTown_VolunteerPokemonHouse/map.bin"
     },
@@ -3098,8 +3098,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FanClubDaycare",
       "border_filepath": "data/layouts/Route5_PokemonDayCare/border.bin",
       "blockdata_filepath": "data/layouts/Route5_PokemonDayCare/map.bin"
     },
@@ -3110,8 +3110,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/ViridianCity_House1/border.bin",
       "blockdata_filepath": "data/layouts/ViridianCity_House1/map.bin"
     },
@@ -3122,8 +3122,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FanClubDaycare",
       "border_filepath": "data/layouts/FourIsland_PokemonDayCare/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_PokemonDayCare/map.bin"
     },
@@ -3134,8 +3134,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B3F_CurrentStopped/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B3F_CurrentStopped/map.bin"
     },
@@ -3146,8 +3146,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B4F_CurrentStopped/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B4F_CurrentStopped/map.bin"
     },
@@ -3158,8 +3158,8 @@
       "height": 54,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/MtEmber_Exterior/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_Exterior/map.bin"
     },
@@ -3170,8 +3170,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/MtEmber_Summit/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_Summit/map.bin"
     },
@@ -3182,8 +3182,8 @@
       "height": 18,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_SummitPath_1F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_SummitPath_1F/map.bin"
     },
@@ -3194,8 +3194,8 @@
       "height": 46,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_SummitPath_2F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_SummitPath_2F/map.bin"
     },
@@ -3206,8 +3206,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_SummitPath_3F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_SummitPath_3F/map.bin"
     },
@@ -3218,8 +3218,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_1F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_1F/map.bin"
     },
@@ -3230,8 +3230,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B1F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B1F/map.bin"
     },
@@ -3242,8 +3242,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B2F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B2F/map.bin"
     },
@@ -3254,8 +3254,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B3F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B3F/map.bin"
     },
@@ -3266,8 +3266,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B1F_Stairs/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B1F_Stairs/map.bin"
     },
@@ -3278,8 +3278,8 @@
       "height": 6,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B2F_Stairs/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B2F_Stairs/map.bin"
     },
@@ -3290,8 +3290,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B5F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B5F/map.bin"
     },
@@ -3302,8 +3302,8 @@
       "height": 27,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/FiveIsland_RocketWarehouse/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_RocketWarehouse/map.bin"
     },
@@ -3314,8 +3314,8 @@
       "height": 36,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/FourIsland_IcefallCave_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_Entrance/map.bin"
     },
@@ -3326,8 +3326,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/FourIsland_IcefallCave_1F/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_1F/map.bin"
     },
@@ -3338,8 +3338,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/FourIsland_IcefallCave_B1F/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_B1F/map.bin"
     },
@@ -3350,8 +3350,8 @@
       "height": 26,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/FourIsland_IcefallCave_Back/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_Back/map.bin"
     },
@@ -3362,8 +3362,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_Lobby/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_Lobby/map.bin"
     },
@@ -3374,8 +3374,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_1F/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_1F/map.bin"
     },
@@ -3386,8 +3386,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_2F/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_2F/map.bin"
     },
@@ -3398,8 +3398,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_3F/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_3F/map.bin"
     },
@@ -3410,8 +3410,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_4F/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_4F/map.bin"
     },
@@ -3422,8 +3422,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_5F/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_5F/map.bin"
     },
@@ -3434,8 +3434,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_6F/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_6F/map.bin"
     },
@@ -3446,8 +3446,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_7F/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_7F/map.bin"
     },
@@ -3458,8 +3458,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_8F/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_8F/map.bin"
     },
@@ -3470,8 +3470,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_Roof/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_Roof/map.bin"
     },
@@ -3482,8 +3482,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/TrainerTower_Elevator/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_Elevator/map.bin"
     },
@@ -3494,8 +3494,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/CeruleanCity_House5/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity_House5/map.bin"
     },
@@ -3506,8 +3506,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_1F/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_1F/map.bin"
     },
@@ -3518,8 +3518,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_B1F/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B1F/map.bin"
     },
@@ -3530,8 +3530,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_B2F/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B2F/map.bin"
     },
@@ -3542,8 +3542,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_B3F/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B3F/map.bin"
     },
@@ -3554,8 +3554,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_B4F/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B4F/map.bin"
     },
@@ -3566,8 +3566,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_SapphireRoom/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_SapphireRoom/map.bin"
     },
@@ -3578,8 +3578,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D50AC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_IslandHarbor",
       "border_filepath": "data/layouts/Island_Harbor/border.bin",
       "blockdata_filepath": "data/layouts/Island_Harbor/map.bin"
     },
@@ -3590,8 +3590,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/OneIsland_PokemonCenter_2F/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland_PokemonCenter_2F/map.bin"
     },
@@ -3602,8 +3602,8 @@
       "height": 32,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4DC4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_ViridianForest",
       "border_filepath": "data/layouts/SixIsland_PatternBush/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_PatternBush/map.bin"
     },
@@ -3614,8 +3614,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/map.bin"
     },
@@ -3626,8 +3626,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/UnusedLayout_83453C0/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_83453C0/map.bin"
     },
@@ -3638,8 +3638,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Entrance/map.bin"
     },
@@ -3650,8 +3650,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room1/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room1/map.bin"
     },
@@ -3662,8 +3662,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room2/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room2/map.bin"
     },
@@ -3674,8 +3674,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room3/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room3/map.bin"
     },
@@ -3686,8 +3686,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room4/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room4/map.bin"
     },
@@ -3698,8 +3698,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room5/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room5/map.bin"
     },
@@ -3710,8 +3710,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room6/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room6/map.bin"
     },
@@ -3722,8 +3722,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room7/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room7/map.bin"
     },
@@ -3734,8 +3734,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room8/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room8/map.bin"
     },
@@ -3746,8 +3746,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room9/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room9/map.bin"
     },
@@ -3758,8 +3758,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room10/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room10/map.bin"
     },
@@ -3770,8 +3770,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room11/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room11/map.bin"
     },
@@ -3782,8 +3782,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room12/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room12/map.bin"
     },
@@ -3794,8 +3794,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room13/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room13/map.bin"
     },
@@ -3806,8 +3806,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room14/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room14/map.bin"
     },
@@ -3818,8 +3818,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_MoneanChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_MoneanChamber/map.bin"
     },
@@ -3830,8 +3830,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_LiptooChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_LiptooChamber/map.bin"
     },
@@ -3842,8 +3842,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_WeepthChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_WeepthChamber/map.bin"
     },
@@ -3854,8 +3854,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_DilfordChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_DilfordChamber/map.bin"
     },
@@ -3866,8 +3866,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_ScufibChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_ScufibChamber/map.bin"
     },
@@ -3878,8 +3878,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4DF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_RockTunnel",
       "border_filepath": "data/layouts/SixIsland_AlteringCave/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_AlteringCave/map.bin"
     },
@@ -3890,8 +3890,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_DiglettsCave",
       "border_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/map.bin"
     },
@@ -3902,8 +3902,8 @@
       "height": 30,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/BirthIsland_Exterior/border.bin",
       "blockdata_filepath": "data/layouts/BirthIsland_Exterior/map.bin"
     },
@@ -3914,8 +3914,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/NavelRock_Exterior/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_Exterior/map.bin"
     },
@@ -3926,8 +3926,8 @@
       "height": 26,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_1F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_1F/map.bin"
     },
@@ -3938,8 +3938,8 @@
       "height": 25,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_Summit/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_Summit/map.bin"
     },
@@ -3950,8 +3950,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_Base/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_Base/map.bin"
     },
@@ -3962,8 +3962,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_SummitPath_2F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_SummitPath_2F/map.bin"
     },
@@ -3974,8 +3974,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_SummitPath_3F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_SummitPath_3F/map.bin"
     },
@@ -3986,8 +3986,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_SummitPath_4F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_SummitPath_4F/map.bin"
     },
@@ -3998,8 +3998,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_SummitPath_5F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_SummitPath_5F/map.bin"
     },
@@ -4010,8 +4010,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B1F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B1F/map.bin"
     },
@@ -4022,8 +4022,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B2F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B2F/map.bin"
     },
@@ -4034,8 +4034,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B3F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B3F/map.bin"
     },
@@ -4046,8 +4046,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B4F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B4F/map.bin"
     },
@@ -4058,8 +4058,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B5F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B5F/map.bin"
     },
@@ -4070,8 +4070,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B6F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B6F/map.bin"
     },
@@ -4082,8 +4082,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B7F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B7F/map.bin"
     },
@@ -4094,8 +4094,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B8F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B8F/map.bin"
     },
@@ -4106,8 +4106,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B9F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B9F/map.bin"
     },
@@ -4118,8 +4118,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B10F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B10F/map.bin"
     },
@@ -4130,8 +4130,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B11F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B11F/map.bin"
     },
@@ -4142,8 +4142,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_RixyChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_RixyChamber/map.bin"
     },
@@ -4154,8 +4154,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/map.bin"
     },
@@ -4166,8 +4166,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_B1F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_B1F/map.bin"
     },
@@ -4178,8 +4178,8 @@
       "height": 100,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_Fork/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_Fork/map.bin"
     },
@@ -4190,8 +4190,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_1F_Doubles/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_1F_Doubles/map.bin"
     },
@@ -4202,8 +4202,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_2F_Doubles/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_2F_Doubles/map.bin"
     },
@@ -4214,8 +4214,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_3F_Doubles/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_3F_Doubles/map.bin"
     },
@@ -4226,8 +4226,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_4F_Doubles/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_4F_Doubles/map.bin"
     },
@@ -4238,8 +4238,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_5F_Doubles/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_5F_Doubles/map.bin"
     },
@@ -4250,8 +4250,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_6F_Doubles/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_6F_Doubles/map.bin"
     },
@@ -4262,8 +4262,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_7F_Doubles/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_7F_Doubles/map.bin"
     },
@@ -4274,8 +4274,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_8F_Doubles/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_8F_Doubles/map.bin"
     },
@@ -4286,8 +4286,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_1F_Knockout/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_1F_Knockout/map.bin"
     },
@@ -4298,8 +4298,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_2F_Knockout/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_2F_Knockout/map.bin"
     },
@@ -4310,8 +4310,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_3F_Knockout/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_3F_Knockout/map.bin"
     },
@@ -4322,8 +4322,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_4F_Knockout/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_4F_Knockout/map.bin"
     },
@@ -4334,8 +4334,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_5F_Knockout/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_5F_Knockout/map.bin"
     },
@@ -4346,8 +4346,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_6F_Knockout/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_6F_Knockout/map.bin"
     },
@@ -4358,8 +4358,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_7F_Knockout/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_7F_Knockout/map.bin"
     },
@@ -4370,8 +4370,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
       "border_filepath": "data/layouts/TrainerTower_8F_Knockout/border.bin",
       "blockdata_filepath": "data/layouts/TrainerTower_8F_Knockout/map.bin"
     },
@@ -4382,8 +4382,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SevenIsland_House_Room1/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_House_Room1/map.bin"
     },
@@ -4394,8 +4394,8 @@
       "height": 39,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/OneIsland_KindleRoad_EmberSpa/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland_KindleRoad_EmberSpa/map.bin"
     }
diff --git a/data/maps/UnknownMap_03_50/map.json b/data/maps/Prototype_SeviiIsle_6/map.json
index 25d12e137..3cc89f9f0 100644
--- a/data/maps/UnknownMap_03_50/map.json
+++ b/data/maps/Prototype_SeviiIsle_6/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_50",
-  "name": "UnknownMap_03_50",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_50",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_6",
+  "name": "Prototype_SeviiIsle_6",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_6",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_6",
   "requires_flash": false,
diff --git a/data/maps/Prototype_SeviiIsle_6/scripts.inc b/data/maps/Prototype_SeviiIsle_6/scripts.inc
new file mode 100644
index 000000000..459729f14
--- /dev/null
+++ b/data/maps/Prototype_SeviiIsle_6/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_6_MapScripts:: @ 81687E0
+	.byte 0
diff --git a/data/maps/UnknownMap_03_51/map.json b/data/maps/Prototype_SeviiIsle_7/map.json
index 25c135de4..67a37d7e7 100644
--- a/data/maps/UnknownMap_03_51/map.json
+++ b/data/maps/Prototype_SeviiIsle_7/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_51",
-  "name": "UnknownMap_03_51",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_51",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_7",
+  "name": "Prototype_SeviiIsle_7",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_7",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_7",
   "requires_flash": false,
diff --git a/data/maps/Prototype_SeviiIsle_7/scripts.inc b/data/maps/Prototype_SeviiIsle_7/scripts.inc
new file mode 100644
index 000000000..b7eaa6bd5
--- /dev/null
+++ b/data/maps/Prototype_SeviiIsle_7/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_7_MapScripts:: @ 81687E1
+	.byte 0
diff --git a/data/maps/UnknownMap_03_52/map.json b/data/maps/Prototype_SeviiIsle_8/map.json
index e38359999..0ed21e3f2 100644
--- a/data/maps/UnknownMap_03_52/map.json
+++ b/data/maps/Prototype_SeviiIsle_8/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_52",
-  "name": "UnknownMap_03_52",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_52",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_8",
+  "name": "Prototype_SeviiIsle_8",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_8",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_8",
   "requires_flash": false,
diff --git a/data/maps/Prototype_SeviiIsle_8/scripts.inc b/data/maps/Prototype_SeviiIsle_8/scripts.inc
new file mode 100644
index 000000000..411a66513
--- /dev/null
+++ b/data/maps/Prototype_SeviiIsle_8/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_8_MapScripts:: @ 81687E2
+	.byte 0
diff --git a/data/maps/UnknownMap_03_53/map.json b/data/maps/Prototype_SeviiIsle_9/map.json
index e3001e6be..1fa4c73c4 100644
--- a/data/maps/UnknownMap_03_53/map.json
+++ b/data/maps/Prototype_SeviiIsle_9/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_53",
-  "name": "UnknownMap_03_53",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_53",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_9",
+  "name": "Prototype_SeviiIsle_9",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_9",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_9",
   "requires_flash": false,
diff --git a/data/maps/Prototype_SeviiIsle_9/scripts.inc b/data/maps/Prototype_SeviiIsle_9/scripts.inc
new file mode 100644
index 000000000..00b06c7f0
--- /dev/null
+++ b/data/maps/Prototype_SeviiIsle_9/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_9_MapScripts:: @ 81687E3
+	.byte 0
diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json
index 8b047231e..28b739341 100644
--- a/data/maps/Route5/map.json
+++ b/data/maps/Route5/map.json
@@ -18,7 +18,7 @@
       "direction": "up"
     },
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": 0,
       "direction": "down"
     }
diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json
index f67590481..a6016c5fa 100644
--- a/data/maps/Route6/map.json
+++ b/data/maps/Route6/map.json
@@ -13,7 +13,7 @@
   "battle_scene": "BATTLE_SCENE_0",
   "connections": [
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": 0,
       "direction": "up"
     },
diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json
index e30bc8149..2c5a9717c 100644
--- a/data/maps/Route7/map.json
+++ b/data/maps/Route7/map.json
@@ -18,7 +18,7 @@
       "direction": "left"
     },
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": -10,
       "direction": "right"
     }
diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json
index 7ed8e635d..f16933a2e 100644
--- a/data/maps/Route8/map.json
+++ b/data/maps/Route8/map.json
@@ -13,7 +13,7 @@
   "battle_scene": "BATTLE_SCENE_0",
   "connections": [
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": -10,
       "direction": "left"
     },
diff --git a/data/maps/SaffronCity_Classic/scripts.inc b/data/maps/SaffronCity_Classic/scripts.inc
deleted file mode 100644
index 26470756d..000000000
--- a/data/maps/SaffronCity_Classic/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SaffronCity_Classic_MapScripts:: @ 8167483
-	.byte 0
diff --git a/data/maps/SaffronCity_Classic/map.json b/data/maps/SaffronCity_Connection/map.json
index 0a5614975..718007c43 100644
--- a/data/maps/SaffronCity_Classic/map.json
+++ b/data/maps/SaffronCity_Connection/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SAFFRON_CITY_CLASSIC",
-  "name": "SaffronCity_Classic",
-  "layout": "LAYOUT_SAFFRON_CITY_CLASSIC",
+  "id": "MAP_SAFFRON_CITY_CONNECTION",
+  "name": "SaffronCity_Connection",
+  "layout": "LAYOUT_SAFFRON_CITY_CONNECTION",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
diff --git a/data/maps/SaffronCity_Connection/scripts.inc b/data/maps/SaffronCity_Connection/scripts.inc
new file mode 100644
index 000000000..94f49eb2d
--- /dev/null
+++ b/data/maps/SaffronCity_Connection/scripts.inc
@@ -0,0 +1,2 @@
+SaffronCity_Connection_MapScripts:: @ 8167483
+	.byte 0
diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc
index 60183ed13..8875211f8 100644
--- a/data/maps/SevenIsland_House_Room1/scripts.inc
+++ b/data/maps/SevenIsland_House_Room1/scripts.inc
@@ -15,7 +15,7 @@ EventScript_1708AF:: @ 81708AF
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 4, 2
 	setobjectmovementtype 1, 8
-	setmaplayoutindex LAYOUT_UNUSED_LAYOUT_8338B4C
+	setmaplayoutindex LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN
 	return
 
 EventScript_1708C3:: @ 81708C3
diff --git a/data/maps/UnknownMap_03_50/scripts.inc b/data/maps/UnknownMap_03_50/scripts.inc
deleted file mode 100644
index 4e136faae..000000000
--- a/data/maps/UnknownMap_03_50/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-UnknownMap_03_50_MapScripts:: @ 81687E0
-	.byte 0
diff --git a/data/maps/UnknownMap_03_51/scripts.inc b/data/maps/UnknownMap_03_51/scripts.inc
deleted file mode 100644
index 7398062d8..000000000
--- a/data/maps/UnknownMap_03_51/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-UnknownMap_03_51_MapScripts:: @ 81687E1
-	.byte 0
diff --git a/data/maps/UnknownMap_03_52/scripts.inc b/data/maps/UnknownMap_03_52/scripts.inc
deleted file mode 100644
index 2e48ca113..000000000
--- a/data/maps/UnknownMap_03_52/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-UnknownMap_03_52_MapScripts:: @ 81687E2
-	.byte 0
diff --git a/data/maps/UnknownMap_03_53/scripts.inc b/data/maps/UnknownMap_03_53/scripts.inc
deleted file mode 100644
index 2dec9650e..000000000
--- a/data/maps/UnknownMap_03_53/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-UnknownMap_03_53_MapScripts:: @ 81687E3
-	.byte 0
diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc
index 5ad0d9a2f..cb458b682 100644
--- a/data/maps/ViridianCity_Mart/scripts.inc
+++ b/data/maps/ViridianCity_Mart/scripts.inc
@@ -8,8 +8,8 @@ ViridianCity_Mart_OnLoad:: @ 816A1DE
 	end
 
 ViridianCity_Mart_EventScript_HideQuestionnaire:: @ 816A1E8
-	setmetatile 1, 3, METATILE_Shop_CounterMid_Top, 1
-	setmetatile 1, 4, METATILE_Shop_CounterMid_Bottom, 1
+	setmetatile 1, 3, METATILE_Mart_CounterMid_Top, 1
+	setmetatile 1, 4, METATILE_Mart_CounterMid_Bottom, 1
 	end
 
 ViridianCity_Mart_OnFrame:: @ 816A1FB
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 5417adaa1..a7a468351 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -250,7 +250,7 @@
     "CinnabarIsland",
     "IndigoPlateau_Exterior",
     "SaffronCity",
-    "SaffronCity_Classic",
+    "SaffronCity_Connection",
     "OneIsland",
     "TwoIsland",
     "ThreeIsland",
@@ -289,10 +289,10 @@
     "TwoIsland_CapeBrink",
     "ThreeIsland_BondBridge",
     "ThreeIsland_Port",
-    "UnknownMap_03_50",
-    "UnknownMap_03_51",
-    "UnknownMap_03_52",
-    "UnknownMap_03_53",
+    "Prototype_SeviiIsle_6",
+    "Prototype_SeviiIsle_7",
+    "Prototype_SeviiIsle_8",
+    "Prototype_SeviiIsle_9",
     "FiveIsland_ResortGorgeous",
     "FiveIsland_WaterLabyrinth",
     "FiveIsland_Meadow",
@@ -567,7 +567,7 @@
     "CinnabarIsland",
     "IndigoPlateau_Exterior",
     "SaffronCity",
-    "SaffronCity_Classic",
+    "SaffronCity_Connection",
     "OneIsland",
     "TwoIsland",
     "ThreeIsland",
@@ -605,8 +605,8 @@
     "TwoIsland_CapeBrink",
     "ThreeIsland_BondBridge",
     "ThreeIsland_Port",
-    "UnknownMap_03_50",
-    "UnknownMap_03_51",
+    "Prototype_SeviiIsle_6",
+    "Prototype_SeviiIsle_7",
     "FiveIsland_ResortGorgeous",
     "FiveIsland_WaterLabyrinth",
     "FiveIsland_Meadow",
diff --git a/data/tilesets/graphics.inc b/data/tilesets/graphics.inc
index a23f73322..6fc9a48f6 100644
--- a/data/tilesets/graphics.inc
+++ b/data/tilesets/graphics.inc
@@ -1,1471 +1,1471 @@
 	.align 2
-gTilesetTiles_826D37C:: @ 826D37C
-	.incbin "data/tilesets/secondary/82D4AAC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_826D7C0:: @ 826D7C0
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_826D9C0:: @ 826D9C0
-	.incbin "data/tilesets/secondary/82D4AC4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_826DFC0:: @ 826DFC0
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_826E1C0:: @ 826E1C0
-	.incbin "data/tilesets/secondary/82D4ADC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_826EAB8:: @ 826EAB8
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_826ECB8:: @ 826ECB8
-	.incbin "data/tilesets/secondary/82D4AF4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_826F4B8:: @ 826F4B8
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_826F6B8:: @ 826F6B8
-	.incbin "data/tilesets/secondary/82D4B0C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8270438:: @ 8270438
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8270638:: @ 8270638
-	.incbin "data/tilesets/secondary/82D4B24/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8270DA0:: @ 8270DA0
-	.incbin "data/tilesets/secondary/82D4B24/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8270FA0:: @ 8270FA0
-	.incbin "data/tilesets/secondary/82D4B3C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8271C74:: @ 8271C74
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8271E74:: @ 8271E74
-	.incbin "data/tilesets/secondary/82D4B54/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8272A5C:: @ 8272A5C
-	.incbin "data/tilesets/secondary/82D4B54/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8272C5C:: @ 8272C5C
-	.incbin "data/tilesets/secondary/82D4B6C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8273358:: @ 8273358
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8273558:: @ 8273558
-	.incbin "data/tilesets/secondary/82D4B84/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82742D0:: @ 82742D0
-	.incbin "data/tilesets/secondary/82D4B84/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82744D0:: @ 82744D0
-	.incbin "data/tilesets/secondary/82D4B9C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8275094:: @ 8275094
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8275294:: @ 8275294
-	.incbin "data/tilesets/primary/82D4BB4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8277694:: @ 8277694
-	.incbin "data/tilesets/primary/82D4BB4/palettes/0.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/1.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/2.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/3.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/4.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/5.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/6.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/7.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/8.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/9.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/10.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/11.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/12.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/13.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/14.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8277894:: @ 8277894
-	.incbin "data/tilesets/secondary/82D4BCC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8277A5C:: @ 8277A5C
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8277C5C:: @ 8277C5C
-	.incbin "data/tilesets/secondary/82D4BE4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8278CC4:: @ 8278CC4
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8278EC4:: @ 8278EC4
-	.incbin "data/tilesets/secondary/82D4BFC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_827A1A8:: @ 827A1A8
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_827A3A8:: @ 827A3A8
-	.incbin "data/tilesets/secondary/82D4C14/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_827A3B8:: @ 827A3B8
-	.incbin "data/tilesets/secondary/82D4C14/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_827A5B8:: @ 827A5B8
-	.incbin "data/tilesets/secondary/82D4C2C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_827AE14:: @ 827AE14
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_827B014:: @ 827B014
-	.incbin "data/tilesets/secondary/82D4C44/tiles.4bpp"
-
-	.align 2
-gTilesetPalettes_827FF14:: @ 827FF14
-	.incbin "data/tilesets/secondary/82D4C44/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8280114:: @ 8280114
-	.incbin "data/tilesets/secondary/82D4C5C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82804EC:: @ 82804EC
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82806EC:: @ 82806EC
-	.incbin "data/tilesets/secondary/82D4C8C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8280D00:: @ 8280D00
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8280F00:: @ 8280F00
-	.incbin "data/tilesets/secondary/82D4CD4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82823A4:: @ 82823A4
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82825A4:: @ 82825A4
-	.incbin "data/tilesets/secondary/82D4CEC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8282FBC:: @ 8282FBC
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82831BC:: @ 82831BC
-	.incbin "data/tilesets/secondary/82D4D04/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82839B0:: @ 82839B0
-	.incbin "data/tilesets/secondary/82D4D04/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8283BB0:: @ 8283BB0
-	.incbin "data/tilesets/secondary/82D4D1C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8283FF8:: @ 8283FF8
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82841F8:: @ 82841F8
-	.incbin "data/tilesets/secondary/82D4D34/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82849B8:: @ 82849B8
-	.incbin "data/tilesets/secondary/82D4D34/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8284BB8:: @ 8284BB8
-	.incbin "data/tilesets/secondary/82D4D4C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8285150:: @ 8285150
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8285350:: @ 8285350
-	.incbin "data/tilesets/secondary/82D4CA4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82857A4:: @ 82857A4
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82859A4:: @ 82859A4
-	.incbin "data/tilesets/secondary/82D4D64/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8285D90:: @ 8285D90
-	.incbin "data/tilesets/secondary/82D4D64/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8285F90:: @ 8285F90
-	.incbin "data/tilesets/secondary/82D4D7C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82865D4:: @ 82865D4
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82867D4:: @ 82867D4
-	.incbin "data/tilesets/secondary/82D4CBC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8286BC8:: @ 8286BC8
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8286DC8:: @ 8286DC8
-	.incbin "data/tilesets/secondary/82D4D94/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8287B80:: @ 8287B80
-	.incbin "data/tilesets/secondary/82D4D94/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8287D80:: @ 8287D80
-	.incbin "data/tilesets/secondary/82D4DAC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8287D94:: @ 8287D94
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8287F94:: @ 8287F94
-	.incbin "data/tilesets/secondary/82D4DC4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8288444:: @ 8288444
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8288644:: @ 8288644
-	.incbin "data/tilesets/secondary/82D4DDC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8288C60:: @ 8288C60
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8288E60:: @ 8288E60
-	.incbin "data/tilesets/secondary/82D4DF4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8289FC8:: @ 8289FC8
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828A1C8:: @ 828A1C8
-	.incbin "data/tilesets/secondary/82D4E0C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828B250:: @ 828B250
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828B450:: @ 828B450
-	.incbin "data/tilesets/secondary/82D4E24/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828CAA0:: @ 828CAA0
-	.incbin "data/tilesets/secondary/82D4E24/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828CCA0:: @ 828CCA0
-	.incbin "data/tilesets/secondary/82D4E3C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828D2BC:: @ 828D2BC
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828D4BC:: @ 828D4BC
-	.incbin "data/tilesets/secondary/82D4E54/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828E3A4:: @ 828E3A4
-	.incbin "data/tilesets/secondary/82D4E54/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828E5A4:: @ 828E5A4
-	.incbin "data/tilesets/secondary/82D4E84/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828EC70:: @ 828EC70
-	.incbin "data/tilesets/secondary/82D4E84/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828EE70:: @ 828EE70
-	.incbin "data/tilesets/secondary/82D4E9C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828F378:: @ 828F378
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828F578:: @ 828F578
-	.incbin "data/tilesets/secondary/82D4EB4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828F9D8:: @ 828F9D8
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828FBD8:: @ 828FBD8
-	.incbin "data/tilesets/secondary/82D4F8C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8290DD0:: @ 8290DD0
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8290FD0:: @ 8290FD0
-	.incbin "data/tilesets/secondary/82D4EE4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8291274:: @ 8291274
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8291474:: @ 8291474
-	.incbin "data/tilesets/secondary/82D4EFC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8291AFC:: @ 8291AFC
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8291CFC:: @ 8291CFC
-	.incbin "data/tilesets/secondary/82D4F14/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82920F0:: @ 82920F0
-	.incbin "data/tilesets/secondary/82D4F14/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82922F0:: @ 82922F0
-	.incbin "data/tilesets/secondary/82D4F2C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8292FF0:: @ 8292FF0
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82931F0:: @ 82931F0
-	.incbin "data/tilesets/secondary/82D4F44/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8293660:: @ 8293660
-	.incbin "data/tilesets/secondary/82D4F44/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8293860:: @ 8293860
-	.incbin "data/tilesets/secondary/82D4F5C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8293B0C:: @ 8293B0C
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8293D0C:: @ 8293D0C
-	.incbin "data/tilesets/secondary/82D4F74/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8294144:: @ 8294144
-	.incbin "data/tilesets/secondary/82D4F74/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8294344:: @ 8294344
-	.incbin "data/tilesets/secondary/82D4FA4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8294D08:: @ 8294D08
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8294F08:: @ 8294F08
-	.incbin "data/tilesets/secondary/82D4FBC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8294F18:: @ 8294F18
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8295118:: @ 8295118
-	.incbin "data/tilesets/secondary/82D4FD4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829512C:: @ 829512C
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829532C:: @ 829532C
-	.incbin "data/tilesets/secondary/82D4FEC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82967D4:: @ 82967D4
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82969D4:: @ 82969D4
-	.incbin "data/tilesets/secondary/82D5004/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8296E90:: @ 8296E90
-	.incbin "data/tilesets/secondary/82D5004/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8297090:: @ 8297090
-	.incbin "data/tilesets/secondary/82D501C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82983BC:: @ 82983BC
-	.incbin "data/tilesets/secondary/82D501C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82985BC:: @ 82985BC
-	.incbin "data/tilesets/secondary/82D5034/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8298970:: @ 8298970
-	.incbin "data/tilesets/secondary/82D5034/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8298B70:: @ 8298B70
-	.incbin "data/tilesets/secondary/82D504C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8299AA4:: @ 8299AA4
-	.incbin "data/tilesets/secondary/82D504C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8299CA4:: @ 8299CA4
-	.incbin "data/tilesets/secondary/82D5064/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829AB04:: @ 829AB04
-	.incbin "data/tilesets/secondary/82D5064/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829AD04:: @ 829AD04
-	.incbin "data/tilesets/secondary/82D507C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829BD64:: @ 829BD64
-	.incbin "data/tilesets/secondary/82D507C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829BF64:: @ 829BF64
-	.incbin "data/tilesets/secondary/82D5094/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829CEE4:: @ 829CEE4
-	.incbin "data/tilesets/secondary/82D5094/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829D0E4:: @ 829D0E4
-	.incbin "data/tilesets/secondary/82D50AC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829D894:: @ 829D894
-	.incbin "data/tilesets/secondary/82D50AC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829DA94:: @ 829DA94
-	.incbin "data/tilesets/secondary/82D50C4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829EA50:: @ 829EA50
-	.incbin "data/tilesets/secondary/82D50C4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829EC50:: @ 829EC50
-	.incbin "data/tilesets/secondary/82D50DC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829F4C8:: @ 829F4C8
-	.incbin "data/tilesets/secondary/82D50DC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/15.gbapal"
+gTilesetTiles_PalletTown:: @ 826D37C
+	.incbin "data/tilesets/secondary/pallet_town/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PalletTown:: @ 826D7C0
+	.incbin "data/tilesets/secondary/pallet_town/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_ViridianCity:: @ 826D9C0
+	.incbin "data/tilesets/secondary/viridian_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_ViridianCity:: @ 826DFC0
+	.incbin "data/tilesets/secondary/viridian_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PewterCity:: @ 826E1C0
+	.incbin "data/tilesets/secondary/pewter_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PewterCity:: @ 826EAB8
+	.incbin "data/tilesets/secondary/pewter_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CeruleanCity:: @ 826ECB8
+	.incbin "data/tilesets/secondary/cerulean_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CeruleanCity:: @ 826F4B8
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_LavenderTown:: @ 826F6B8
+	.incbin "data/tilesets/secondary/lavender_town/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_LavenderTown:: @ 8270438
+	.incbin "data/tilesets/secondary/lavender_town/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_VermilionCity:: @ 8270638
+	.incbin "data/tilesets/secondary/vermilion_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_VermilionCity:: @ 8270DA0
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CeladonCity:: @ 8270FA0
+	.incbin "data/tilesets/secondary/celadon_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CeladonCity:: @ 8271C74
+	.incbin "data/tilesets/secondary/celadon_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_FuchsiaCity:: @ 8271E74
+	.incbin "data/tilesets/secondary/fuchsia_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_FuchsiaCity:: @ 8272A5C
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CinnabarIsland:: @ 8272C5C
+	.incbin "data/tilesets/secondary/cinnabar_island/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CinnabarIsland:: @ 8273358
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_IndigoPlateau:: @ 8273558
+	.incbin "data/tilesets/secondary/indigo_plateau/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_IndigoPlateau:: @ 82742D0
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SaffronCity:: @ 82744D0
+	.incbin "data/tilesets/secondary/saffron_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SaffronCity:: @ 8275094
+	.incbin "data/tilesets/secondary/saffron_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Building:: @ Building
+	.incbin "data/tilesets/primary/building/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Building:: @ Building
+	.incbin "data/tilesets/primary/building/palettes/0.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/1.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/2.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/3.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/4.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/5.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/6.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/7.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/8.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/9.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/10.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/11.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/12.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/13.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/14.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Mart:: @ 8277894
+	.incbin "data/tilesets/secondary/mart/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Mart:: @ 8277A5C
+	.incbin "data/tilesets/secondary/mart/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PokemonCenter:: @ 8277C5C
+	.incbin "data/tilesets/secondary/pokemon_center/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PokemonCenter:: @ 8278CC4
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Cave:: @ 8278EC4
+	.incbin "data/tilesets/secondary/cave/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Cave:: @ 827A1A8
+	.incbin "data/tilesets/secondary/cave/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Dummy1:: @ 827A3A8
+	.incbin "data/tilesets/secondary/dummy1/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Dummy1:: @ 827A3B8
+	.incbin "data/tilesets/secondary/dummy1/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Museum:: @ 827A5B8
+	.incbin "data/tilesets/secondary/museum/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Museum:: @ 827AE14
+	.incbin "data/tilesets/secondary/museum/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CableClub:: @ 827B014
+	.incbin "data/tilesets/secondary/cable_club/tiles.4bpp"
+
+	.align 2
+gTilesetPalettes_CableClub:: @ 827FF14
+	.incbin "data/tilesets/secondary/cable_club/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_BikeShop:: @ 8280114
+	.incbin "data/tilesets/secondary/bike_shop/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_BikeShop:: @ 82804EC
+	.incbin "data/tilesets/secondary/bike_shop/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Lab:: @ 82806EC
+	.incbin "data/tilesets/secondary/lab/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Lab:: @ 8280D00
+	.incbin "data/tilesets/secondary/lab/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_HoennBuilding:: @ 8280F00
+	.incbin "data/tilesets/secondary/hoenn_building/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_HoennBuilding:: @ 82823A4
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_GameCorner:: @ 82825A4
+	.incbin "data/tilesets/secondary/game_corner/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_GameCorner:: @ 8282FBC
+	.incbin "data/tilesets/secondary/game_corner/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PewterGym:: @ 82831BC
+	.incbin "data/tilesets/secondary/pewter_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PewterGym:: @ 82839B0
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CeruleanGym:: @ 8283BB0
+	.incbin "data/tilesets/secondary/cerulean_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CeruleanGym:: @ 8283FF8
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_VermilionGym:: @ 82841F8
+	.incbin "data/tilesets/secondary/vermilion_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_VermilionGym:: @ 82849B8
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CeladonGym:: @ 8284BB8
+	.incbin "data/tilesets/secondary/celadon_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CeladonGym:: @ 8285150
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_FuchsiaGym:: @ 8285350
+	.incbin "data/tilesets/secondary/fuchsia_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_FuchsiaGym:: @ 82857A4
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SaffronGym:: @ 82859A4
+	.incbin "data/tilesets/secondary/saffron_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SaffronGym:: @ 8285D90
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CinnabarGym:: @ 8285F90
+	.incbin "data/tilesets/secondary/cinnabar_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CinnabarGym:: @ 82865D4
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_ViridianGym:: @ 82867D4
+	.incbin "data/tilesets/secondary/viridian_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_ViridianGym:: @ 8286BC8
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SSAnne:: @ 8286DC8
+	.incbin "data/tilesets/secondary/ss_anne/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SSAnne:: @ 8287B80
+	.incbin "data/tilesets/secondary/ss_anne/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Dummy2:: @ 8287D80
+	.incbin "data/tilesets/secondary/dummy2/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Dummy2:: @ 8287D94
+	.incbin "data/tilesets/secondary/dummy2/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_ViridianForest:: @ 8287F94
+	.incbin "data/tilesets/secondary/viridian_forest/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_ViridianForest:: @ 8288444
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_UnusedGatehouse1:: @ 8288644
+	.incbin "data/tilesets/secondary/unused_gatehouse1/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_UnusedGatehouse1:: @ 8288C60
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_RockTunnel:: @ 8288E60
+	.incbin "data/tilesets/secondary/rock_tunnel/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_RockTunnel:: @ 8289FC8
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_DiglettsCave:: @ 828A1C8
+	.incbin "data/tilesets/secondary/digletts_cave/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_DiglettsCave:: @ 828B250
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SeafoamIslands:: @ 828B450
+	.incbin "data/tilesets/secondary/seafoam_islands/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SeafoamIslands:: @ 828CAA0
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_UnusedGatehouse2:: @ 828CCA0
+	.incbin "data/tilesets/secondary/unused_gatehouse2/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_UnusedGatehouse2:: @ 828D2BC
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CeruleanCave:: @ 828D4BC
+	.incbin "data/tilesets/secondary/cerulean_cave/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CeruleanCave:: @ 828E3A4
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_GenericBuilding2:: @ 828E5A4
+	.incbin "data/tilesets/secondary/generic_building2/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_GenericBuilding2:: @ 828EC70
+	.incbin "data/tilesets/secondary/generic_building2/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PowerPlant:: @ 828EE70
+	.incbin "data/tilesets/secondary/power_plant/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PowerPlant:: @ 828F378
+	.incbin "data/tilesets/secondary/power_plant/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SeaCottage:: @ 828F578
+	.incbin "data/tilesets/secondary/sea_cottage/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SeaCottage:: @ 828F9D8
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SilphCo:: @ 828FBD8
+	.incbin "data/tilesets/secondary/condominiums/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SilphCo:: @ 8290DD0
+	.incbin "data/tilesets/secondary/condominiums/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_UndergroundPath:: @ 8290FD0
+	.incbin "data/tilesets/secondary/underground_path/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_UndergroundPath:: @ 8291274
+	.incbin "data/tilesets/secondary/underground_path/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PokemonTower:: @ 8291474
+	.incbin "data/tilesets/secondary/pokemon_tower/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PokemonTower:: @ 8291AFC
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SafariZoneBuilding:: @ 8291CFC
+	.incbin "data/tilesets/secondary/safari_zone_building/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SafariZoneBuilding:: @ 82920F0
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PokemonMansion:: @ 82922F0
+	.incbin "data/tilesets/secondary/pokemon_mansion/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PokemonMansion:: @ 8292FF0
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_RestaurantHotel:: @ 82931F0
+	.incbin "data/tilesets/secondary/restaurant_hotel/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_RestaurantHotel:: @ 8293660
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_School:: @ 8293860
+	.incbin "data/tilesets/secondary/school/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_School:: @ 8293B0C
+	.incbin "data/tilesets/secondary/school/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_FanClubDaycare:: @ 8293D0C
+	.incbin "data/tilesets/secondary/fan_club_daycare/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_FanClubDaycare:: @ 8294144
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_BurgledHouse:: @ 8294344
+	.incbin "data/tilesets/secondary/burgled_house/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_BurgledHouse:: @ 8294D08
+	.incbin "data/tilesets/secondary/burgled_house/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Dummy3:: @ 8294F08
+	.incbin "data/tilesets/secondary/dummy3/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Dummy3:: @ 8294F18
+	.incbin "data/tilesets/secondary/dummy3/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Dummy4:: @ 8295118
+	.incbin "data/tilesets/secondary/dummy4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Dummy4:: @ 829512C
+	.incbin "data/tilesets/secondary/dummy4/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_MtEmber:: @ 829532C
+	.incbin "data/tilesets/secondary/mt_ember/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_MtEmber:: @ 82967D4
+	.incbin "data/tilesets/secondary/mt_ember/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_BerryForest:: @ 82969D4
+	.incbin "data/tilesets/secondary/berry_forest/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_BerryForest:: @ 8296E90
+	.incbin "data/tilesets/secondary/berry_forest/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_NavelRock:: @ 8297090
+	.incbin "data/tilesets/secondary/navel_rock/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_NavelRock:: @ 82983BC
+	.incbin "data/tilesets/secondary/navel_rock/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_TanobyRuins:: @ 82985BC
+	.incbin "data/tilesets/secondary/tanoby_ruins/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_TanobyRuins:: @ 8298970
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SeviiIslands123:: @ 8298B70
+	.incbin "data/tilesets/secondary/sevii_islands_123/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SeviiIslands123:: @ 8299AA4
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SeviiIslands45:: @ 8299CA4
+	.incbin "data/tilesets/secondary/sevii_islands_45/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SeviiIslands45:: @ 829AB04
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SeviiIslands67:: @ 829AD04
+	.incbin "data/tilesets/secondary/sevii_islands_67/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SeviiIslands67:: @ 829BD64
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_TrainerTower:: @ 829BF64
+	.incbin "data/tilesets/secondary/trainer_tower/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_TrainerTower:: @ 829CEE4
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_IslandHarbor:: @ 829D0E4
+	.incbin "data/tilesets/secondary/island_harbor/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_IslandHarbor:: @ 829D894
+	.incbin "data/tilesets/secondary/island_harbor/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PokemonLeague:: @ 829DA94
+	.incbin "data/tilesets/secondary/pokemon_league/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PokemonLeague:: @ 829EA50
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_HallOfFame:: @ 829EC50
+	.incbin "data/tilesets/secondary/hall_of_fame/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_HallOfFame:: @ 829F4C8
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/15.gbapal"
diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc
index d40b3a5e6..cac3cf82f 100644
--- a/data/tilesets/headers.inc
+++ b/data/tilesets/headers.inc
@@ -1,749 +1,749 @@
 
 	.align 2
-gTileset_82D4A94::
+gTileset_General::
 	.byte TRUE @ is compressed
 	.byte FALSE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8EA1D68
-	.4byte gTilesetPalettes_8EA1B68
-	.4byte gMetatiles_829F6C8
-	.4byte sub_8070154
-	.4byte gMetatileAttributes_82A1EC8
+	.4byte gTilesetTiles_General
+	.4byte gTilesetPalettes_General
+	.4byte gMetatiles_General
+	.4byte InitTilesetAnim_General
+	.4byte gMetatileAttributes_General
 
 	.align 2
-gTileset_82D4AAC::
+gTileset_PalletTown::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_826D37C
-	.4byte gTilesetPalettes_826D7C0
-	.4byte gMetatiles_82A28C8
+	.4byte gTilesetTiles_PalletTown
+	.4byte gTilesetPalettes_PalletTown
+	.4byte gMetatiles_PalletTown
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A2E58
+	.4byte gMetatileAttributes_PalletTown
 
 	.align 2
-gTileset_82D4AC4::
+gTileset_ViridianCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_826D9C0
-	.4byte gTilesetPalettes_826DFC0
-	.4byte gMetatiles_82A2FBC
+	.4byte gTilesetTiles_ViridianCity
+	.4byte gTilesetPalettes_ViridianCity
+	.4byte gMetatiles_ViridianCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A35AC
+	.4byte gMetatileAttributes_ViridianCity
 
 	.align 2
-gTileset_82D4ADC::
+gTileset_PewterCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_826E1C0
-	.4byte gTilesetPalettes_826EAB8
-	.4byte gMetatiles_82A3728
+	.4byte gTilesetTiles_PewterCity
+	.4byte gTilesetPalettes_PewterCity
+	.4byte gMetatiles_PewterCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A3C18
+	.4byte gMetatileAttributes_PewterCity
 
 	.align 2
-gTileset_82D4AF4::
+gTileset_CeruleanCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_826ECB8
-	.4byte gTilesetPalettes_826F4B8
-	.4byte gMetatiles_82A3D54
+	.4byte gTilesetTiles_CeruleanCity
+	.4byte gTilesetPalettes_CeruleanCity
+	.4byte gMetatiles_CeruleanCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A45B4
+	.4byte gMetatileAttributes_CeruleanCity
 
 	.align 2
-gTileset_82D4B0C::
+gTileset_LavenderTown::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_826F6B8
-	.4byte gTilesetPalettes_8270438
-	.4byte gMetatiles_82A47CC
+	.4byte gTilesetTiles_LavenderTown
+	.4byte gTilesetPalettes_LavenderTown
+	.4byte gMetatiles_LavenderTown
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A556C
+	.4byte gMetatileAttributes_LavenderTown
 
 	.align 2
-gTileset_82D4B24::
+gTileset_VermilionCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8270638
-	.4byte gTilesetPalettes_8270DA0
-	.4byte gMetatiles_82A58D4
+	.4byte gTilesetTiles_VermilionCity
+	.4byte gTilesetPalettes_VermilionCity
+	.4byte gMetatiles_VermilionCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A6354
+	.4byte gMetatileAttributes_VermilionCity
 
 	.align 2
-gTileset_82D4B3C::
+gTileset_CeladonCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8270FA0
-	.4byte gTilesetPalettes_8271C74
-	.4byte gMetatiles_82A65F4
-	.4byte sub_80701D8
-	.4byte gMetatileAttributes_82A74F4
+	.4byte gTilesetTiles_CeladonCity
+	.4byte gTilesetPalettes_CeladonCity
+	.4byte gMetatiles_CeladonCity
+	.4byte InitTilesetAnim_CeladonCity
+	.4byte gMetatileAttributes_CeladonCity
 
 	.align 2
-gTileset_82D4B54::
+gTileset_FuchsiaCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8271E74
-	.4byte gTilesetPalettes_8272A5C
-	.4byte gMetatiles_82A78B4
+	.4byte gTilesetTiles_FuchsiaCity
+	.4byte gTilesetPalettes_FuchsiaCity
+	.4byte gMetatiles_FuchsiaCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A84B4
+	.4byte gMetatileAttributes_FuchsiaCity
 
 	.align 2
-gTileset_82D4B6C::
+gTileset_CinnabarIsland::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8272C5C
-	.4byte gTilesetPalettes_8273358
-	.4byte gMetatiles_82A87B4
+	.4byte gTilesetTiles_CinnabarIsland
+	.4byte gTilesetPalettes_CinnabarIsland
+	.4byte gMetatiles_CinnabarIsland
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A8BB4
+	.4byte gMetatileAttributes_CinnabarIsland
 
 	.align 2
-gTileset_82D4B84::
+gTileset_IndigoPlateau::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8273558
-	.4byte gTilesetPalettes_82742D0
-	.4byte gMetatiles_82A8CB4
+	.4byte gTilesetTiles_IndigoPlateau
+	.4byte gTilesetPalettes_IndigoPlateau
+	.4byte gMetatiles_IndigoPlateau
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A97B4
+	.4byte gMetatileAttributes_IndigoPlateau
 
 	.align 2
-gTileset_82D4B9C::
+gTileset_SaffronCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82744D0
-	.4byte gTilesetPalettes_8275094
-	.4byte gMetatiles_82A9A74
+	.4byte gTilesetTiles_SaffronCity
+	.4byte gTilesetPalettes_SaffronCity
+	.4byte gMetatiles_SaffronCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AA6F4
+	.4byte gMetatileAttributes_SaffronCity
 
 	.align 2
-gTileset_82D4BB4::
+gTileset_Building::
 	.byte TRUE @ is compressed
 	.byte FALSE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8275294
-	.4byte gTilesetPalettes_8277694
-	.4byte gMetatiles_82AD7B4
+	.4byte gTilesetTiles_Building
+	.4byte gTilesetPalettes_Building
+	.4byte gMetatiles_Building
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AFFB4
+	.4byte gMetatileAttributes_Building
 
 	.align 2
-gTileset_82D4BCC::
+gTileset_Mart::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8277894
-	.4byte gTilesetPalettes_8277A5C
-	.4byte gMetatiles_82B3524
+	.4byte gTilesetTiles_Mart
+	.4byte gTilesetPalettes_Mart
+	.4byte gMetatiles_Mart
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B3954
+	.4byte gMetatileAttributes_Mart
 
 	.align 2
-gTileset_82D4BE4::
+gTileset_PokemonCenter::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8277C5C
-	.4byte gTilesetPalettes_8278CC4
-	.4byte gMetatiles_82B3A60
+	.4byte gTilesetTiles_PokemonCenter
+	.4byte gTilesetPalettes_PokemonCenter
+	.4byte gMetatiles_PokemonCenter
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B4A50
+	.4byte gMetatileAttributes_PokemonCenter
 
 	.align 2
-gTileset_82D4BFC::
+gTileset_Cave::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8278EC4
-	.4byte gTilesetPalettes_827A1A8
-	.4byte gMetatiles_82B502C
+	.4byte gTilesetTiles_Cave
+	.4byte gTilesetPalettes_Cave
+	.4byte gMetatiles_Cave
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B5A3C
+	.4byte gMetatileAttributes_Cave
 
 	.align 2
-gTileset_82D4C14::
+gTileset_Dummy1::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_827A3A8
-	.4byte gTilesetPalettes_827A3B8
-	.4byte gMetatiles_82B09B4
+	.4byte gTilesetTiles_Dummy1
+	.4byte gTilesetPalettes_Dummy1
+	.4byte gMetatiles_Dummy1
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B09D4
+	.4byte gMetatileAttributes_Dummy1
 
 	.align 2
-gTileset_82D4C2C::
+gTileset_Museum::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_827A5B8
-	.4byte gTilesetPalettes_827AE14
-	.4byte gMetatiles_82C5738
+	.4byte gTilesetTiles_Museum
+	.4byte gTilesetPalettes_Museum
+	.4byte gMetatiles_Museum
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C5FA8
+	.4byte gMetatileAttributes_Museum
 
 	.align 2
-gTileset_82D4C44::
+gTileset_CableClub::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_827B014
-	.4byte gTilesetPalettes_827FF14
-	.4byte gMetatiles_82C61C4
+	.4byte gTilesetTiles_CableClub
+	.4byte gTilesetPalettes_CableClub
+	.4byte gMetatiles_CableClub
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C71C4
+	.4byte gMetatileAttributes_CableClub
 
 	.align 2
-gTileset_82D4C5C::
+gTileset_BikeShop::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8280114
-	.4byte gTilesetPalettes_82804EC
-	.4byte gMetatiles_82B31DC
+	.4byte gTilesetTiles_BikeShop
+	.4byte gTilesetPalettes_BikeShop
+	.4byte gMetatiles_BikeShop
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B347C
+	.4byte gMetatileAttributes_BikeShop
 
 	.align 2
-gTileset_82D4C74::
+gTileset_GenericBuilding1::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8EA99F4
-	.4byte gTilesetPalettes_8EA97F4
-	.4byte gMetatiles_82B4E4C
+	.4byte gTilesetTiles_GenericBuilding1
+	.4byte gTilesetPalettes_GenericBuilding1
+	.4byte gMetatiles_GenericBuilding1
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B4FCC
+	.4byte gMetatileAttributes_GenericBuilding1
 
 	.align 2
-gTileset_82D4C8C::
+gTileset_Lab::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82806EC
-	.4byte gTilesetPalettes_8280D00
-	.4byte gMetatiles_82B68A0
+	.4byte gTilesetTiles_Lab
+	.4byte gTilesetPalettes_Lab
+	.4byte gMetatiles_Lab
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B7390
+	.4byte gMetatileAttributes_Lab
 
 	.align 2
-gTileset_82D4CA4::
+gTileset_FuchsiaGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8285350
-	.4byte gTilesetPalettes_82857A4
-	.4byte gMetatiles_82AC364
+	.4byte gTilesetTiles_FuchsiaGym
+	.4byte gTilesetPalettes_FuchsiaGym
+	.4byte gMetatiles_FuchsiaGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AC584
+	.4byte gMetatileAttributes_FuchsiaGym
 
 	.align 2
-gTileset_82D4CBC::
+gTileset_ViridianGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82867D4
-	.4byte gTilesetPalettes_8286BC8
-	.4byte gMetatiles_82AD124
+	.4byte gTilesetTiles_ViridianGym
+	.4byte gTilesetPalettes_ViridianGym
+	.4byte gMetatiles_ViridianGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AD664
+	.4byte gMetatileAttributes_ViridianGym
 
 	.align 2
-gTileset_82D4CD4::
+gTileset_HoennBuilding::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8280F00
-	.4byte gTilesetPalettes_82823A4
-	.4byte gMetatiles_82B09DC
+	.4byte gTilesetTiles_HoennBuilding
+	.4byte gTilesetPalettes_HoennBuilding
+	.4byte gMetatiles_HoennBuilding
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B29DC
+	.4byte gMetatileAttributes_HoennBuilding
 
 	.align 2
-gTileset_82D4CEC::
+gTileset_GameCorner::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82825A4
-	.4byte gTilesetPalettes_8282FBC
-	.4byte gMetatiles_82B5CC0
+	.4byte gTilesetTiles_GameCorner
+	.4byte gTilesetPalettes_GameCorner
+	.4byte gMetatiles_GameCorner
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B6640
+	.4byte gMetatileAttributes_GameCorner
 
 	.align 2
-gTileset_82D4D04::
+gTileset_PewterGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82831BC
-	.4byte gTilesetPalettes_82839B0
-	.4byte gMetatiles_82AAA14
+	.4byte gTilesetTiles_PewterGym
+	.4byte gTilesetPalettes_PewterGym
+	.4byte gMetatiles_PewterGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AB064
+	.4byte gMetatileAttributes_PewterGym
 
 	.align 2
-gTileset_82D4D1C::
+gTileset_CeruleanGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8283BB0
-	.4byte gTilesetPalettes_8283FF8
-	.4byte gMetatiles_82AB1F8
+	.4byte gTilesetTiles_CeruleanGym
+	.4byte gTilesetPalettes_CeruleanGym
+	.4byte gMetatiles_CeruleanGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AB738
+	.4byte gMetatileAttributes_CeruleanGym
 
 	.align 2
-gTileset_82D4D34::
+gTileset_VermilionGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82841F8
-	.4byte gTilesetPalettes_82849B8
-	.4byte gMetatiles_82AB888
-	.4byte sub_807031C
-	.4byte gMetatileAttributes_82ABD38
+	.4byte gTilesetTiles_VermilionGym
+	.4byte gTilesetPalettes_VermilionGym
+	.4byte gMetatiles_VermilionGym
+	.4byte InitTilesetAnim_VermilionGym
+	.4byte gMetatileAttributes_VermilionGym
 
 	.align 2
-gTileset_82D4D4C::
+gTileset_CeladonGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8284BB8
-	.4byte gTilesetPalettes_8285150
-	.4byte gMetatiles_82ABE64
-	.4byte sub_8070380
-	.4byte gMetatileAttributes_82AC264
+	.4byte gTilesetTiles_CeladonGym
+	.4byte gTilesetPalettes_CeladonGym
+	.4byte gMetatiles_CeladonGym
+	.4byte InitTilesetAnim_CeladonGym
+	.4byte gMetatileAttributes_CeladonGym
 
 	.align 2
-gTileset_82D4D64::
+gTileset_SaffronGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82859A4
-	.4byte gTilesetPalettes_8285D90
-	.4byte gMetatiles_82AC60C
+	.4byte gTilesetTiles_SaffronGym
+	.4byte gTilesetPalettes_SaffronGym
+	.4byte gMetatiles_SaffronGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AC8EC
+	.4byte gMetatileAttributes_SaffronGym
 
 	.align 2
-gTileset_82D4D7C::
+gTileset_CinnabarGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8285F90
-	.4byte gTilesetPalettes_82865D4
-	.4byte gMetatiles_82AC9A4
+	.4byte gTilesetTiles_CinnabarGym
+	.4byte gTilesetPalettes_CinnabarGym
+	.4byte gMetatiles_CinnabarGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82ACFA4
+	.4byte gMetatileAttributes_CinnabarGym
 
 	.align 2
-gTileset_82D4D94::
+gTileset_SSAnne::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8286DC8
-	.4byte gTilesetPalettes_8287B80
-	.4byte gMetatiles_82B764C
+	.4byte gTilesetTiles_SSAnne
+	.4byte gTilesetPalettes_SSAnne
+	.4byte gMetatiles_SSAnne
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B8B4C
+	.4byte gMetatileAttributes_SSAnne
 
 	.align 2
-gTileset_82D4DAC::
+gTileset_Dummy2::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8287D80
-	.4byte gTilesetPalettes_8287D94
-	.4byte gMetatiles_82B908C
+	.4byte gTilesetTiles_Dummy2
+	.4byte gTilesetPalettes_Dummy2
+	.4byte gMetatiles_Dummy2
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B90AC
+	.4byte gMetatileAttributes_Dummy2
 
 	.align 2
-gTileset_82D4DC4::
+gTileset_ViridianForest::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8287F94
-	.4byte gTilesetPalettes_8288444
-	.4byte gMetatiles_82B90B4
+	.4byte gTilesetTiles_ViridianForest
+	.4byte gTilesetPalettes_ViridianForest
+	.4byte gMetatiles_ViridianForest
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B9364
+	.4byte gMetatileAttributes_ViridianForest
 
 	.align 2
-gTileset_82D4DDC::
+gTileset_UnusedGatehouse1::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8288644
-	.4byte gTilesetPalettes_8288C60
-	.4byte gMetatiles_82B9410
+	.4byte gTilesetTiles_UnusedGatehouse1
+	.4byte gTilesetPalettes_UnusedGatehouse1
+	.4byte gMetatiles_UnusedGatehouse1
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B9B30
+	.4byte gMetatileAttributes_UnusedGatehouse1
 
 	.align 2
-gTileset_82D4DF4::
+gTileset_RockTunnel::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8288E60
-	.4byte gTilesetPalettes_8289FC8
-	.4byte gMetatiles_82B9CF8
+	.4byte gTilesetTiles_RockTunnel
+	.4byte gTilesetPalettes_RockTunnel
+	.4byte gMetatiles_RockTunnel
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BA678
+	.4byte gMetatileAttributes_RockTunnel
 
 	.align 2
-gTileset_82D4E0C::
+gTileset_DiglettsCave::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828A1C8
-	.4byte gTilesetPalettes_828B250
-	.4byte gMetatiles_82BA8D8
+	.4byte gTilesetTiles_DiglettsCave
+	.4byte gTilesetPalettes_DiglettsCave
+	.4byte gMetatiles_DiglettsCave
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BB2A8
+	.4byte gMetatileAttributes_DiglettsCave
 
 	.align 2
-gTileset_82D4E24::
+gTileset_SeafoamIslands::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828B450
-	.4byte gTilesetPalettes_828CAA0
-	.4byte gMetatiles_82BB51C
+	.4byte gTilesetTiles_SeafoamIslands
+	.4byte gTilesetPalettes_SeafoamIslands
+	.4byte gMetatiles_SeafoamIslands
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BC49C
+	.4byte gMetatileAttributes_SeafoamIslands
 
 	.align 2
-gTileset_82D4E3C::
+gTileset_UnusedGatehouse2::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828CCA0
-	.4byte gTilesetPalettes_828D2BC
-	.4byte gMetatiles_82BC87C
+	.4byte gTilesetTiles_UnusedGatehouse2
+	.4byte gTilesetPalettes_UnusedGatehouse2
+	.4byte gMetatiles_UnusedGatehouse2
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BCF9C
+	.4byte gMetatileAttributes_UnusedGatehouse2
 
 	.align 2
-gTileset_82D4E54::
+gTileset_CeruleanCave::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828D4BC
-	.4byte gTilesetPalettes_828E3A4
-	.4byte gMetatiles_82BD164
+	.4byte gTilesetTiles_CeruleanCave
+	.4byte gTilesetPalettes_CeruleanCave
+	.4byte gMetatiles_CeruleanCave
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BD9C4
+	.4byte gMetatileAttributes_CeruleanCave
 
 	.align 2
-gTileset_82D4E6C::
+gTileset_DepartmentStore::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8EA9F88
-	.4byte gTilesetPalettes_8EA9D88
-	.4byte gMetatiles_82BDBDC
+	.4byte gTilesetTiles_DepartmentStore
+	.4byte gTilesetPalettes_DepartmentStore
+	.4byte gMetatiles_DepartmentStore
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BEB3C
+	.4byte gMetatileAttributes_DepartmentStore
 
 	.align 2
-gTileset_82D4E84::
+gTileset_GenericBuilding2::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828E5A4
-	.4byte gTilesetPalettes_828EC70
-	.4byte gMetatiles_82BEF14
+	.4byte gTilesetTiles_GenericBuilding2
+	.4byte gTilesetPalettes_GenericBuilding2
+	.4byte gMetatiles_GenericBuilding2
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BFA94
+	.4byte gMetatileAttributes_GenericBuilding2
 
 	.align 2
-gTileset_82D4E9C::
+gTileset_PowerPlant::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828EE70
-	.4byte gTilesetPalettes_828F378
-	.4byte gMetatiles_82BFD74
+	.4byte gTilesetTiles_PowerPlant
+	.4byte gTilesetPalettes_PowerPlant
+	.4byte gMetatiles_PowerPlant
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C0704
+	.4byte gMetatileAttributes_PowerPlant
 
 	.align 2
-gTileset_82D4EB4::
+gTileset_SeaCottage::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828F578
-	.4byte gTilesetPalettes_828F9D8
-	.4byte gMetatiles_82C0968
+	.4byte gTilesetTiles_SeaCottage
+	.4byte gTilesetPalettes_SeaCottage
+	.4byte gMetatiles_SeaCottage
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C0D18
+	.4byte gMetatileAttributes_SeaCottage
 
 	.align 2
-gTileset_82D4ECC::
+gTileset_SilphCo::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828FBD8
-	.4byte gTilesetPalettes_8290DD0
-	.4byte gMetatiles_82C0E04
-	.4byte sub_8070250
-	.4byte gMetatileAttributes_82C25A4
+	.4byte gTilesetTiles_SilphCo
+	.4byte gTilesetPalettes_SilphCo
+	.4byte gMetatiles_SilphCo
+	.4byte InitTilesetAnim_SilphCo
+	.4byte gMetatileAttributes_SilphCo
 
 	.align 2
-gTileset_82D4EE4::
+gTileset_UndergroundPath::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8290FD0
-	.4byte gTilesetPalettes_8291274
-	.4byte gMetatiles_82C2B8C
+	.4byte gTilesetTiles_UndergroundPath
+	.4byte gTilesetPalettes_UndergroundPath
+	.4byte gMetatiles_UndergroundPath
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C300C
+	.4byte gMetatileAttributes_UndergroundPath
 
 	.align 2
-gTileset_82D4EFC::
+gTileset_PokemonTower::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8291474
-	.4byte gTilesetPalettes_8291AFC
-	.4byte gMetatiles_82C312C
+	.4byte gTilesetTiles_PokemonTower
+	.4byte gTilesetPalettes_PokemonTower
+	.4byte gMetatiles_PokemonTower
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C377C
+	.4byte gMetatileAttributes_PokemonTower
 
 	.align 2
-gTileset_82D4F14::
+gTileset_SafariZoneBuilding::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8291CFC
-	.4byte gTilesetPalettes_82920F0
-	.4byte gMetatiles_82C3910
+	.4byte gTilesetTiles_SafariZoneBuilding
+	.4byte gTilesetPalettes_SafariZoneBuilding
+	.4byte gMetatiles_SafariZoneBuilding
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C4110
+	.4byte gMetatileAttributes_SafariZoneBuilding
 
 	.align 2
-gTileset_82D4F2C::
+gTileset_PokemonMansion::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82922F0
-	.4byte gTilesetPalettes_8292FF0
-	.4byte gMetatiles_82C4310
+	.4byte gTilesetTiles_PokemonMansion
+	.4byte gTilesetPalettes_PokemonMansion
+	.4byte gMetatiles_PokemonMansion
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C5330
+	.4byte gMetatileAttributes_PokemonMansion
 
 	.align 2
-gTileset_82D4F44::
+gTileset_RestaurantHotel::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82931F0
-	.4byte gTilesetPalettes_8293660
-	.4byte gMetatiles_82C75C4
+	.4byte gTilesetTiles_RestaurantHotel
+	.4byte gTilesetPalettes_RestaurantHotel
+	.4byte gMetatiles_RestaurantHotel
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C7C44
+	.4byte gMetatileAttributes_RestaurantHotel
 
 	.align 2
-gTileset_82D4F5C::
+gTileset_School::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8293860
-	.4byte gTilesetPalettes_8293B0C
-	.4byte gMetatiles_82C7DE4
+	.4byte gTilesetTiles_School
+	.4byte gTilesetPalettes_School
+	.4byte gMetatiles_School
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C80C4
+	.4byte gMetatileAttributes_School
 
 	.align 2
-gTileset_82D4F74::
+gTileset_FanClubDaycare::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8293D0C
-	.4byte gTilesetPalettes_8294144
-	.4byte gMetatiles_82C817C
+	.4byte gTilesetTiles_FanClubDaycare
+	.4byte gTilesetPalettes_FanClubDaycare
+	.4byte gMetatiles_FanClubDaycare
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C8C1C
+	.4byte gMetatileAttributes_FanClubDaycare
 
 	.align 2
-gTileset_82D4F8C::
+gTileset_Condominiums::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828FBD8
-	.4byte gTilesetPalettes_8290DD0
-	.4byte gMetatiles_82C8EC4
+	.4byte gTilesetTiles_SilphCo
+	.4byte gTilesetPalettes_SilphCo
+	.4byte gMetatiles_Condominiums
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C9C34
+	.4byte gMetatileAttributes_Condominiums
 
 	.align 2
-gTileset_82D4FA4::
+gTileset_BurgledHouse::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8294344
-	.4byte gTilesetPalettes_8294D08
-	.4byte gMetatiles_82C9F90
+	.4byte gTilesetTiles_BurgledHouse
+	.4byte gTilesetPalettes_BurgledHouse
+	.4byte gMetatiles_BurgledHouse
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CA320
+	.4byte gMetatileAttributes_BurgledHouse
 
 	.align 2
-gTileset_82D4FBC::
+gTileset_Dummy3::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8294F08
-	.4byte gTilesetPalettes_8294F18
-	.4byte gMetatiles_82CA404
+	.4byte gTilesetTiles_Dummy3
+	.4byte gTilesetPalettes_Dummy3
+	.4byte gMetatiles_Dummy3
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CA424
+	.4byte gMetatileAttributes_Dummy3
 
 	.align 2
-gTileset_82D4FD4::
+gTileset_Dummy4::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8295118
-	.4byte gTilesetPalettes_829512C
-	.4byte gMetatiles_82CA42C
+	.4byte gTilesetTiles_Dummy4
+	.4byte gTilesetPalettes_Dummy4
+	.4byte gMetatiles_Dummy4
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CA44C
+	.4byte gMetatileAttributes_Dummy4
 
 	.align 2
-gTileset_82D4FEC::
+gTileset_MtEmber::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829532C
-	.4byte gTilesetPalettes_82967D4
-	.4byte gMetatiles_82CA454
-	.4byte sub_80702B4
-	.4byte gMetatileAttributes_82CB274
+	.4byte gTilesetTiles_MtEmber
+	.4byte gTilesetPalettes_MtEmber
+	.4byte gMetatiles_MtEmber
+	.4byte InitTilesetAnim_MtEmber
+	.4byte gMetatileAttributes_MtEmber
 
 	.align 2
-gTileset_82D5004::
+gTileset_BerryForest::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82969D4
-	.4byte gTilesetPalettes_8296E90
-	.4byte gMetatiles_82CB5FC
+	.4byte gTilesetTiles_BerryForest
+	.4byte gTilesetPalettes_BerryForest
+	.4byte gMetatiles_BerryForest
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CB89C
+	.4byte gMetatileAttributes_BerryForest
 
 	.align 2
-gTileset_82D501C::
+gTileset_NavelRock::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8297090
-	.4byte gTilesetPalettes_82983BC
-	.4byte gMetatiles_82CB944
+	.4byte gTilesetTiles_NavelRock
+	.4byte gTilesetPalettes_NavelRock
+	.4byte gMetatiles_NavelRock
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CC704
+	.4byte gMetatileAttributes_NavelRock
 
 	.align 2
-gTileset_82D5034::
+gTileset_TanobyRuins::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82985BC
-	.4byte gTilesetPalettes_8298970
-	.4byte gMetatiles_82CCA74
+	.4byte gTilesetTiles_TanobyRuins
+	.4byte gTilesetPalettes_TanobyRuins
+	.4byte gMetatiles_TanobyRuins
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CD054
+	.4byte gMetatileAttributes_TanobyRuins
 
 	.align 2
-gTileset_82D504C::
+gTileset_SeviiIslands123::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8298B70
-	.4byte gTilesetPalettes_8299AA4
-	.4byte gMetatiles_82CD1CC
+	.4byte gTilesetTiles_SeviiIslands123
+	.4byte gTilesetPalettes_SeviiIslands123
+	.4byte gMetatiles_SeviiIslands123
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CE39C
+	.4byte gMetatileAttributes_SeviiIslands123
 
 	.align 2
-gTileset_82D5064::
+gTileset_SeviiIslands45::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8299CA4
-	.4byte gTilesetPalettes_829AB04
-	.4byte gMetatiles_82CE810
+	.4byte gTilesetTiles_SeviiIslands45
+	.4byte gTilesetPalettes_SeviiIslands45
+	.4byte gMetatiles_SeviiIslands45
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CF190
+	.4byte gMetatileAttributes_SeviiIslands45
 
 	.align 2
-gTileset_82D507C::
+gTileset_SeviiIslands67::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829AD04
-	.4byte gTilesetPalettes_829BD64
-	.4byte gMetatiles_82CF3F0
+	.4byte gTilesetTiles_SeviiIslands67
+	.4byte gTilesetPalettes_SeviiIslands67
+	.4byte gMetatiles_SeviiIslands67
 	.4byte 0x0
-	.4byte gMetatileAttributes_82D02F0
+	.4byte gMetatileAttributes_SeviiIslands67
 
 	.align 2
-gTileset_82D5094::
+gTileset_TrainerTower::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829BF64
-	.4byte gTilesetPalettes_829CEE4
-	.4byte gMetatiles_82D06B0
+	.4byte gTilesetTiles_TrainerTower
+	.4byte gTilesetPalettes_TrainerTower
+	.4byte gMetatiles_TrainerTower
 	.4byte 0x0
-	.4byte gMetatileAttributes_82D18B0
+	.4byte gMetatileAttributes_TrainerTower
 
 	.align 2
-gTileset_82D50AC::
+gTileset_IslandHarbor::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829D0E4
-	.4byte gTilesetPalettes_829D894
-	.4byte gMetatiles_82D1D30
+	.4byte gTilesetTiles_IslandHarbor
+	.4byte gTilesetPalettes_IslandHarbor
+	.4byte gMetatiles_IslandHarbor
 	.4byte 0x0
-	.4byte gMetatileAttributes_82D2220
+	.4byte gMetatileAttributes_IslandHarbor
 
 	.align 2
-gTileset_82D50C4::
+gTileset_PokemonLeague::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829DA94
-	.4byte gTilesetPalettes_829EA50
-	.4byte gMetatiles_82D235C
+	.4byte gTilesetTiles_PokemonLeague
+	.4byte gTilesetPalettes_PokemonLeague
+	.4byte gMetatiles_PokemonLeague
 	.4byte 0x0
-	.4byte gMetatileAttributes_82D3B5C
+	.4byte gMetatileAttributes_PokemonLeague
 
 	.align 2
-gTileset_82D50DC::
+gTileset_HallOfFame::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829EC50
-	.4byte gTilesetPalettes_829F4C8
-	.4byte gMetatiles_82D415C
+	.4byte gTilesetTiles_HallOfFame
+	.4byte gTilesetPalettes_HallOfFame
+	.4byte gMetatiles_HallOfFame
 	.4byte 0x0
-	.4byte gMetatileAttributes_82D48BC
+	.4byte gMetatileAttributes_HallOfFame
 
diff --git a/data/tilesets/metatiles.inc b/data/tilesets/metatiles.inc
index 50c849648..7475f8117 100644
--- a/data/tilesets/metatiles.inc
+++ b/data/tilesets/metatiles.inc
@@ -1,543 +1,543 @@
 	.align 1
-gMetatiles_829F6C8:: @ 829F6C8
-	.incbin "data/tilesets/primary/82D4A94/metatiles.bin"
+gMetatiles_General:: @ 829F6C8
+	.incbin "data/tilesets/primary/general/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A1EC8:: @ 82A1EC8
-	.incbin "data/tilesets/primary/82D4A94/metatile_attributes.bin"
+gMetatileAttributes_General:: @ 82A1EC8
+	.incbin "data/tilesets/primary/general/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A28C8:: @ 82A28C8
-	.incbin "data/tilesets/secondary/82D4AAC/metatiles.bin"
+gMetatiles_PalletTown:: @ 82A28C8
+	.incbin "data/tilesets/secondary/pallet_town/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A2E58:: @ 82A2E58
-	.incbin "data/tilesets/secondary/82D4AAC/metatile_attributes.bin"
+gMetatileAttributes_PalletTown:: @ 82A2E58
+	.incbin "data/tilesets/secondary/pallet_town/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A2FBC:: @ 82A2FBC
-	.incbin "data/tilesets/secondary/82D4AC4/metatiles.bin"
+gMetatiles_ViridianCity:: @ 82A2FBC
+	.incbin "data/tilesets/secondary/viridian_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A35AC:: @ 82A35AC
-	.incbin "data/tilesets/secondary/82D4AC4/metatile_attributes.bin"
+gMetatileAttributes_ViridianCity:: @ 82A35AC
+	.incbin "data/tilesets/secondary/viridian_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A3728:: @ 82A3728
-	.incbin "data/tilesets/secondary/82D4ADC/metatiles.bin"
+gMetatiles_PewterCity:: @ 82A3728
+	.incbin "data/tilesets/secondary/pewter_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A3C18:: @ 82A3C18
-	.incbin "data/tilesets/secondary/82D4ADC/metatile_attributes.bin"
+gMetatileAttributes_PewterCity:: @ 82A3C18
+	.incbin "data/tilesets/secondary/pewter_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A3D54:: @ 82A3D54
-	.incbin "data/tilesets/secondary/82D4AF4/metatiles.bin"
+gMetatiles_CeruleanCity:: @ 82A3D54
+	.incbin "data/tilesets/secondary/cerulean_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A45B4:: @ 82A45B4
-	.incbin "data/tilesets/secondary/82D4AF4/metatile_attributes.bin"
+gMetatileAttributes_CeruleanCity:: @ 82A45B4
+	.incbin "data/tilesets/secondary/cerulean_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A47CC:: @ 82A47CC
-	.incbin "data/tilesets/secondary/82D4B0C/metatiles.bin"
+gMetatiles_LavenderTown:: @ 82A47CC
+	.incbin "data/tilesets/secondary/lavender_town/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A556C:: @ 82A556C
-	.incbin "data/tilesets/secondary/82D4B0C/metatile_attributes.bin"
+gMetatileAttributes_LavenderTown:: @ 82A556C
+	.incbin "data/tilesets/secondary/lavender_town/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A58D4:: @ 82A58D4
-	.incbin "data/tilesets/secondary/82D4B24/metatiles.bin"
+gMetatiles_VermilionCity:: @ 82A58D4
+	.incbin "data/tilesets/secondary/vermilion_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A6354:: @ 82A6354
-	.incbin "data/tilesets/secondary/82D4B24/metatile_attributes.bin"
+gMetatileAttributes_VermilionCity:: @ 82A6354
+	.incbin "data/tilesets/secondary/vermilion_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A65F4:: @ 82A65F4
-	.incbin "data/tilesets/secondary/82D4B3C/metatiles.bin"
+gMetatiles_CeladonCity:: @ 82A65F4
+	.incbin "data/tilesets/secondary/celadon_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A74F4:: @ 82A74F4
-	.incbin "data/tilesets/secondary/82D4B3C/metatile_attributes.bin"
+gMetatileAttributes_CeladonCity:: @ 82A74F4
+	.incbin "data/tilesets/secondary/celadon_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A78B4:: @ 82A78B4
-	.incbin "data/tilesets/secondary/82D4B54/metatiles.bin"
+gMetatiles_FuchsiaCity:: @ 82A78B4
+	.incbin "data/tilesets/secondary/fuchsia_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A84B4:: @ 82A84B4
-	.incbin "data/tilesets/secondary/82D4B54/metatile_attributes.bin"
+gMetatileAttributes_FuchsiaCity:: @ 82A84B4
+	.incbin "data/tilesets/secondary/fuchsia_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A87B4:: @ 82A87B4
-	.incbin "data/tilesets/secondary/82D4B6C/metatiles.bin"
+gMetatiles_CinnabarIsland:: @ 82A87B4
+	.incbin "data/tilesets/secondary/cinnabar_island/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A8BB4:: @ 82A8BB4
-	.incbin "data/tilesets/secondary/82D4B6C/metatile_attributes.bin"
+gMetatileAttributes_CinnabarIsland:: @ 82A8BB4
+	.incbin "data/tilesets/secondary/cinnabar_island/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A8CB4:: @ 82A8CB4
-	.incbin "data/tilesets/secondary/82D4B84/metatiles.bin"
+gMetatiles_IndigoPlateau:: @ 82A8CB4
+	.incbin "data/tilesets/secondary/indigo_plateau/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A97B4:: @ 82A97B4
-	.incbin "data/tilesets/secondary/82D4B84/metatile_attributes.bin"
+gMetatileAttributes_IndigoPlateau:: @ 82A97B4
+	.incbin "data/tilesets/secondary/indigo_plateau/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A9A74:: @ 82A9A74
-	.incbin "data/tilesets/secondary/82D4B9C/metatiles.bin"
+gMetatiles_SaffronCity:: @ 82A9A74
+	.incbin "data/tilesets/secondary/saffron_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AA6F4:: @ 82AA6F4
-	.incbin "data/tilesets/secondary/82D4B9C/metatile_attributes.bin"
+gMetatileAttributes_SaffronCity:: @ 82AA6F4
+	.incbin "data/tilesets/secondary/saffron_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AAA14:: @ 82AAA14
-	.incbin "data/tilesets/secondary/82D4D04/metatiles.bin"
+gMetatiles_PewterGym:: @ 82AAA14
+	.incbin "data/tilesets/secondary/pewter_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AB064:: @ 82AB064
-	.incbin "data/tilesets/secondary/82D4D04/metatile_attributes.bin"
+gMetatileAttributes_PewterGym:: @ 82AB064
+	.incbin "data/tilesets/secondary/pewter_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AB1F8:: @ 82AB1F8
-	.incbin "data/tilesets/secondary/82D4D1C/metatiles.bin"
+gMetatiles_CeruleanGym:: @ 82AB1F8
+	.incbin "data/tilesets/secondary/cerulean_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AB738:: @ 82AB738
-	.incbin "data/tilesets/secondary/82D4D1C/metatile_attributes.bin"
+gMetatileAttributes_CeruleanGym:: @ 82AB738
+	.incbin "data/tilesets/secondary/cerulean_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AB888:: @ 82AB888
-	.incbin "data/tilesets/secondary/82D4D34/metatiles.bin"
+gMetatiles_VermilionGym:: @ 82AB888
+	.incbin "data/tilesets/secondary/vermilion_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82ABD38:: @ 82ABD38
-	.incbin "data/tilesets/secondary/82D4D34/metatile_attributes.bin"
+gMetatileAttributes_VermilionGym:: @ 82ABD38
+	.incbin "data/tilesets/secondary/vermilion_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82ABE64:: @ 82ABE64
-	.incbin "data/tilesets/secondary/82D4D4C/metatiles.bin"
+gMetatiles_CeladonGym:: @ 82ABE64
+	.incbin "data/tilesets/secondary/celadon_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AC264:: @ 82AC264
-	.incbin "data/tilesets/secondary/82D4D4C/metatile_attributes.bin"
+gMetatileAttributes_CeladonGym:: @ 82AC264
+	.incbin "data/tilesets/secondary/celadon_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AC364:: @ 82AC364
-	.incbin "data/tilesets/secondary/82D4CA4/metatiles.bin"
+gMetatiles_FuchsiaGym:: @ 82AC364
+	.incbin "data/tilesets/secondary/fuchsia_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AC584:: @ 82AC584
-	.incbin "data/tilesets/secondary/82D4CA4/metatile_attributes.bin"
+gMetatileAttributes_FuchsiaGym:: @ 82AC584
+	.incbin "data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AC60C:: @ 82AC60C
-	.incbin "data/tilesets/secondary/82D4D64/metatiles.bin"
+gMetatiles_SaffronGym:: @ 82AC60C
+	.incbin "data/tilesets/secondary/saffron_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AC8EC:: @ 82AC8EC
-	.incbin "data/tilesets/secondary/82D4D64/metatile_attributes.bin"
+gMetatileAttributes_SaffronGym:: @ 82AC8EC
+	.incbin "data/tilesets/secondary/saffron_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AC9A4:: @ 82AC9A4
-	.incbin "data/tilesets/secondary/82D4D7C/metatiles.bin"
+gMetatiles_CinnabarGym:: @ 82AC9A4
+	.incbin "data/tilesets/secondary/cinnabar_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82ACFA4:: @ 82ACFA4
-	.incbin "data/tilesets/secondary/82D4D7C/metatile_attributes.bin"
+gMetatileAttributes_CinnabarGym:: @ 82ACFA4
+	.incbin "data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AD124:: @ 82AD124
-	.incbin "data/tilesets/secondary/82D4CBC/metatiles.bin"
+gMetatiles_ViridianGym:: @ 82AD124
+	.incbin "data/tilesets/secondary/viridian_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AD664:: @ 82AD664
-	.incbin "data/tilesets/secondary/82D4CBC/metatile_attributes.bin"
+gMetatileAttributes_ViridianGym:: @ 82AD664
+	.incbin "data/tilesets/secondary/viridian_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AD7B4:: @ 82AD7B4
-	.incbin "data/tilesets/primary/82D4BB4/metatiles.bin"
+gMetatiles_Building:: @ Building
+	.incbin "data/tilesets/primary/building/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AFFB4:: @ 82AFFB4
-	.incbin "data/tilesets/primary/82D4BB4/metatile_attributes.bin"
+gMetatileAttributes_Building:: @ Building
+	.incbin "data/tilesets/primary/building/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B09B4:: @ 82B09B4
-	.incbin "data/tilesets/secondary/82D4C14/metatiles.bin"
+gMetatiles_Dummy1:: @ 82B09B4
+	.incbin "data/tilesets/secondary/dummy1/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B09D4:: @ 82B09D4
-	.incbin "data/tilesets/secondary/82D4C14/metatile_attributes.bin"
+gMetatileAttributes_Dummy1:: @ 82B09D4
+	.incbin "data/tilesets/secondary/dummy1/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B09DC:: @ 82B09DC
-	.incbin "data/tilesets/secondary/82D4CD4/metatiles.bin"
+gMetatiles_HoennBuilding:: @ 82B09DC
+	.incbin "data/tilesets/secondary/hoenn_building/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B29DC:: @ 82B29DC
-	.incbin "data/tilesets/secondary/82D4CD4/metatile_attributes.bin"
+gMetatileAttributes_HoennBuilding:: @ 82B29DC
+	.incbin "data/tilesets/secondary/hoenn_building/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B31DC:: @ 82B31DC
-	.incbin "data/tilesets/secondary/82D4C5C/metatiles.bin"
+gMetatiles_BikeShop:: @ 82B31DC
+	.incbin "data/tilesets/secondary/bike_shop/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B347C:: @ 82B347C
-	.incbin "data/tilesets/secondary/82D4C5C/metatile_attributes.bin"
+gMetatileAttributes_BikeShop:: @ 82B347C
+	.incbin "data/tilesets/secondary/bike_shop/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B3524:: @ 82B3524
-	.incbin "data/tilesets/secondary/82D4BCC/metatiles.bin"
+gMetatiles_Mart:: @ 82B3524
+	.incbin "data/tilesets/secondary/mart/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B3954:: @ 82B3954
-	.incbin "data/tilesets/secondary/82D4BCC/metatile_attributes.bin"
+gMetatileAttributes_Mart:: @ 82B3954
+	.incbin "data/tilesets/secondary/mart/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B3A60:: @ 82B3A60
-	.incbin "data/tilesets/secondary/82D4BE4/metatiles.bin"
+gMetatiles_PokemonCenter:: @ 82B3A60
+	.incbin "data/tilesets/secondary/pokemon_center/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B4A50:: @ 82B4A50
-	.incbin "data/tilesets/secondary/82D4BE4/metatile_attributes.bin"
+gMetatileAttributes_PokemonCenter:: @ 82B4A50
+	.incbin "data/tilesets/secondary/pokemon_center/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B4E4C:: @ 82B4E4C
-	.incbin "data/tilesets/secondary/82D4C74/metatiles.bin"
+gMetatiles_GenericBuilding1:: @ 82B4E4C
+	.incbin "data/tilesets/secondary/generic_building1/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B4FCC:: @ 82B4FCC
-	.incbin "data/tilesets/secondary/82D4C74/metatile_attributes.bin"
+gMetatileAttributes_GenericBuilding1:: @ 82B4FCC
+	.incbin "data/tilesets/secondary/generic_building1/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B502C:: @ 82B502C
-	.incbin "data/tilesets/secondary/82D4BFC/metatiles.bin"
+gMetatiles_Cave:: @ 82B502C
+	.incbin "data/tilesets/secondary/cave/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B5A3C:: @ 82B5A3C
-	.incbin "data/tilesets/secondary/82D4BFC/metatile_attributes.bin"
+gMetatileAttributes_Cave:: @ 82B5A3C
+	.incbin "data/tilesets/secondary/cave/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B5CC0:: @ 82B5CC0
-	.incbin "data/tilesets/secondary/82D4CEC/metatiles.bin"
+gMetatiles_GameCorner:: @ 82B5CC0
+	.incbin "data/tilesets/secondary/game_corner/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B6640:: @ 82B6640
-	.incbin "data/tilesets/secondary/82D4CEC/metatile_attributes.bin"
+gMetatileAttributes_GameCorner:: @ 82B6640
+	.incbin "data/tilesets/secondary/game_corner/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B68A0:: @ 82B68A0
-	.incbin "data/tilesets/secondary/82D4C8C/metatiles.bin"
+gMetatiles_Lab:: @ 82B68A0
+	.incbin "data/tilesets/secondary/lab/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B7390:: @ 82B7390
-	.incbin "data/tilesets/secondary/82D4C8C/metatile_attributes.bin"
+gMetatileAttributes_Lab:: @ 82B7390
+	.incbin "data/tilesets/secondary/lab/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B764C:: @ 82B764C
-	.incbin "data/tilesets/secondary/82D4D94/metatiles.bin"
+gMetatiles_SSAnne:: @ 82B764C
+	.incbin "data/tilesets/secondary/ss_anne/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B8B4C:: @ 82B8B4C
-	.incbin "data/tilesets/secondary/82D4D94/metatile_attributes.bin"
+gMetatileAttributes_SSAnne:: @ 82B8B4C
+	.incbin "data/tilesets/secondary/ss_anne/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B908C:: @ 82B908C
-	.incbin "data/tilesets/secondary/82D4DAC/metatiles.bin"
+gMetatiles_Dummy2:: @ 82B908C
+	.incbin "data/tilesets/secondary/dummy2/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B90AC:: @ 82B90AC
-	.incbin "data/tilesets/secondary/82D4DAC/metatile_attributes.bin"
+gMetatileAttributes_Dummy2:: @ 82B90AC
+	.incbin "data/tilesets/secondary/dummy2/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B90B4:: @ 82B90B4
-	.incbin "data/tilesets/secondary/82D4DC4/metatiles.bin"
+gMetatiles_ViridianForest:: @ 82B90B4
+	.incbin "data/tilesets/secondary/viridian_forest/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B9364:: @ 82B9364
-	.incbin "data/tilesets/secondary/82D4DC4/metatile_attributes.bin"
+gMetatileAttributes_ViridianForest:: @ 82B9364
+	.incbin "data/tilesets/secondary/viridian_forest/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B9410:: @ 82B9410
-	.incbin "data/tilesets/secondary/82D4DDC/metatiles.bin"
+gMetatiles_UnusedGatehouse1:: @ 82B9410
+	.incbin "data/tilesets/secondary/unused_gatehouse1/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B9B30:: @ 82B9B30
-	.incbin "data/tilesets/secondary/82D4DDC/metatile_attributes.bin"
+gMetatileAttributes_UnusedGatehouse1:: @ 82B9B30
+	.incbin "data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B9CF8:: @ 82B9CF8
-	.incbin "data/tilesets/secondary/82D4DF4/metatiles.bin"
+gMetatiles_RockTunnel:: @ 82B9CF8
+	.incbin "data/tilesets/secondary/rock_tunnel/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BA678:: @ 82BA678
-	.incbin "data/tilesets/secondary/82D4DF4/metatile_attributes.bin"
+gMetatileAttributes_RockTunnel:: @ 82BA678
+	.incbin "data/tilesets/secondary/rock_tunnel/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BA8D8:: @ 82BA8D8
-	.incbin "data/tilesets/secondary/82D4E0C/metatiles.bin"
+gMetatiles_DiglettsCave:: @ 82BA8D8
+	.incbin "data/tilesets/secondary/digletts_cave/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BB2A8:: @ 82BB2A8
-	.incbin "data/tilesets/secondary/82D4E0C/metatile_attributes.bin"
+gMetatileAttributes_DiglettsCave:: @ 82BB2A8
+	.incbin "data/tilesets/secondary/digletts_cave/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BB51C:: @ 82BB51C
-	.incbin "data/tilesets/secondary/82D4E24/metatiles.bin"
+gMetatiles_SeafoamIslands:: @ 82BB51C
+	.incbin "data/tilesets/secondary/seafoam_islands/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BC49C:: @ 82BC49C
-	.incbin "data/tilesets/secondary/82D4E24/metatile_attributes.bin"
+gMetatileAttributes_SeafoamIslands:: @ 82BC49C
+	.incbin "data/tilesets/secondary/seafoam_islands/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BC87C:: @ 82BC87C
-	.incbin "data/tilesets/secondary/82D4E3C/metatiles.bin"
+gMetatiles_UnusedGatehouse2:: @ 82BC87C
+	.incbin "data/tilesets/secondary/unused_gatehouse2/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BCF9C:: @ 82BCF9C
-	.incbin "data/tilesets/secondary/82D4E3C/metatile_attributes.bin"
+gMetatileAttributes_UnusedGatehouse2:: @ 82BCF9C
+	.incbin "data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BD164:: @ 82BD164
-	.incbin "data/tilesets/secondary/82D4E54/metatiles.bin"
+gMetatiles_CeruleanCave:: @ 82BD164
+	.incbin "data/tilesets/secondary/cerulean_cave/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BD9C4:: @ 82BD9C4
-	.incbin "data/tilesets/secondary/82D4E54/metatile_attributes.bin"
+gMetatileAttributes_CeruleanCave:: @ 82BD9C4
+	.incbin "data/tilesets/secondary/cerulean_cave/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BDBDC:: @ 82BDBDC
-	.incbin "data/tilesets/secondary/82D4E6C/metatiles.bin"
+gMetatiles_DepartmentStore:: @ 82BDBDC
+	.incbin "data/tilesets/secondary/department_store/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BEB3C:: @ 82BEB3C
-	.incbin "data/tilesets/secondary/82D4E6C/metatile_attributes.bin"
+gMetatileAttributes_DepartmentStore:: @ 82BEB3C
+	.incbin "data/tilesets/secondary/department_store/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BEF14:: @ 82BEF14
-	.incbin "data/tilesets/secondary/82D4E84/metatiles.bin"
+gMetatiles_GenericBuilding2:: @ 82BEF14
+	.incbin "data/tilesets/secondary/generic_building2/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BFA94:: @ 82BFA94
-	.incbin "data/tilesets/secondary/82D4E84/metatile_attributes.bin"
+gMetatileAttributes_GenericBuilding2:: @ 82BFA94
+	.incbin "data/tilesets/secondary/generic_building2/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BFD74:: @ 82BFD74
-	.incbin "data/tilesets/secondary/82D4E9C/metatiles.bin"
+gMetatiles_PowerPlant:: @ 82BFD74
+	.incbin "data/tilesets/secondary/power_plant/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C0704:: @ 82C0704
-	.incbin "data/tilesets/secondary/82D4E9C/metatile_attributes.bin"
+gMetatileAttributes_PowerPlant:: @ 82C0704
+	.incbin "data/tilesets/secondary/power_plant/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C0968:: @ 82C0968
-	.incbin "data/tilesets/secondary/82D4EB4/metatiles.bin"
+gMetatiles_SeaCottage:: @ 82C0968
+	.incbin "data/tilesets/secondary/sea_cottage/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C0D18:: @ 82C0D18
-	.incbin "data/tilesets/secondary/82D4EB4/metatile_attributes.bin"
+gMetatileAttributes_SeaCottage:: @ 82C0D18
+	.incbin "data/tilesets/secondary/sea_cottage/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C0E04:: @ 82C0E04
-	.incbin "data/tilesets/secondary/82D4ECC/metatiles.bin"
+gMetatiles_SilphCo:: @ 82C0E04
+	.incbin "data/tilesets/secondary/silph_co/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C25A4:: @ 82C25A4
-	.incbin "data/tilesets/secondary/82D4ECC/metatile_attributes.bin"
+gMetatileAttributes_SilphCo:: @ 82C25A4
+	.incbin "data/tilesets/secondary/silph_co/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C2B8C:: @ 82C2B8C
-	.incbin "data/tilesets/secondary/82D4EE4/metatiles.bin"
+gMetatiles_UndergroundPath:: @ 82C2B8C
+	.incbin "data/tilesets/secondary/underground_path/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C300C:: @ 82C300C
-	.incbin "data/tilesets/secondary/82D4EE4/metatile_attributes.bin"
+gMetatileAttributes_UndergroundPath:: @ 82C300C
+	.incbin "data/tilesets/secondary/underground_path/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C312C:: @ 82C312C
-	.incbin "data/tilesets/secondary/82D4EFC/metatiles.bin"
+gMetatiles_PokemonTower:: @ 82C312C
+	.incbin "data/tilesets/secondary/pokemon_tower/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C377C:: @ 82C377C
-	.incbin "data/tilesets/secondary/82D4EFC/metatile_attributes.bin"
+gMetatileAttributes_PokemonTower:: @ 82C377C
+	.incbin "data/tilesets/secondary/pokemon_tower/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C3910:: @ 82C3910
-	.incbin "data/tilesets/secondary/82D4F14/metatiles.bin"
+gMetatiles_SafariZoneBuilding:: @ 82C3910
+	.incbin "data/tilesets/secondary/safari_zone_building/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C4110:: @ 82C4110
-	.incbin "data/tilesets/secondary/82D4F14/metatile_attributes.bin"
+gMetatileAttributes_SafariZoneBuilding:: @ 82C4110
+	.incbin "data/tilesets/secondary/safari_zone_building/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C4310:: @ 82C4310
-	.incbin "data/tilesets/secondary/82D4F2C/metatiles.bin"
+gMetatiles_PokemonMansion:: @ 82C4310
+	.incbin "data/tilesets/secondary/pokemon_mansion/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C5330:: @ 82C5330
-	.incbin "data/tilesets/secondary/82D4F2C/metatile_attributes.bin"
+gMetatileAttributes_PokemonMansion:: @ 82C5330
+	.incbin "data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C5738:: @ 82C5738
-	.incbin "data/tilesets/secondary/82D4C2C/metatiles.bin"
+gMetatiles_Museum:: @ 82C5738
+	.incbin "data/tilesets/secondary/museum/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C5FA8:: @ 82C5FA8
-	.incbin "data/tilesets/secondary/82D4C2C/metatile_attributes.bin"
+gMetatileAttributes_Museum:: @ 82C5FA8
+	.incbin "data/tilesets/secondary/museum/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C61C4:: @ 82C61C4
-	.incbin "data/tilesets/secondary/82D4C44/metatiles.bin"
+gMetatiles_CableClub:: @ 82C61C4
+	.incbin "data/tilesets/secondary/cable_club/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C71C4:: @ 82C71C4
-	.incbin "data/tilesets/secondary/82D4C44/metatile_attributes.bin"
+gMetatileAttributes_CableClub:: @ 82C71C4
+	.incbin "data/tilesets/secondary/cable_club/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C75C4:: @ 82C75C4
-	.incbin "data/tilesets/secondary/82D4F44/metatiles.bin"
+gMetatiles_RestaurantHotel:: @ 82C75C4
+	.incbin "data/tilesets/secondary/restaurant_hotel/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C7C44:: @ 82C7C44
-	.incbin "data/tilesets/secondary/82D4F44/metatile_attributes.bin"
+gMetatileAttributes_RestaurantHotel:: @ 82C7C44
+	.incbin "data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C7DE4:: @ 82C7DE4
-	.incbin "data/tilesets/secondary/82D4F5C/metatiles.bin"
+gMetatiles_School:: @ 82C7DE4
+	.incbin "data/tilesets/secondary/school/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C80C4:: @ 82C80C4
-	.incbin "data/tilesets/secondary/82D4F5C/metatile_attributes.bin"
+gMetatileAttributes_School:: @ 82C80C4
+	.incbin "data/tilesets/secondary/school/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C817C:: @ 82C817C
-	.incbin "data/tilesets/secondary/82D4F74/metatiles.bin"
+gMetatiles_FanClubDaycare:: @ 82C817C
+	.incbin "data/tilesets/secondary/fan_club_daycare/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C8C1C:: @ 82C8C1C
-	.incbin "data/tilesets/secondary/82D4F74/metatile_attributes.bin"
+gMetatileAttributes_FanClubDaycare:: @ 82C8C1C
+	.incbin "data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C8EC4:: @ 82C8EC4
-	.incbin "data/tilesets/secondary/82D4F8C/metatiles.bin"
+gMetatiles_Condominiums:: @ 82C8EC4
+	.incbin "data/tilesets/secondary/condominiums/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C9C34:: @ 82C9C34
-	.incbin "data/tilesets/secondary/82D4F8C/metatile_attributes.bin"
+gMetatileAttributes_Condominiums:: @ 82C9C34
+	.incbin "data/tilesets/secondary/condominiums/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C9F90:: @ 82C9F90
-	.incbin "data/tilesets/secondary/82D4FA4/metatiles.bin"
+gMetatiles_BurgledHouse:: @ 82C9F90
+	.incbin "data/tilesets/secondary/burgled_house/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CA320:: @ 82CA320
-	.incbin "data/tilesets/secondary/82D4FA4/metatile_attributes.bin"
+gMetatileAttributes_BurgledHouse:: @ 82CA320
+	.incbin "data/tilesets/secondary/burgled_house/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CA404:: @ 82CA404
-	.incbin "data/tilesets/secondary/82D4FBC/metatiles.bin"
+gMetatiles_Dummy3:: @ 82CA404
+	.incbin "data/tilesets/secondary/dummy3/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CA424:: @ 82CA424
-	.incbin "data/tilesets/secondary/82D4FBC/metatile_attributes.bin"
+gMetatileAttributes_Dummy3:: @ 82CA424
+	.incbin "data/tilesets/secondary/dummy3/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CA42C:: @ 82CA42C
-	.incbin "data/tilesets/secondary/82D4FD4/metatiles.bin"
+gMetatiles_Dummy4:: @ 82CA42C
+	.incbin "data/tilesets/secondary/dummy4/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CA44C:: @ 82CA44C
-	.incbin "data/tilesets/secondary/82D4FD4/metatile_attributes.bin"
+gMetatileAttributes_Dummy4:: @ 82CA44C
+	.incbin "data/tilesets/secondary/dummy4/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CA454:: @ 82CA454
-	.incbin "data/tilesets/secondary/82D4FEC/metatiles.bin"
+gMetatiles_MtEmber:: @ 82CA454
+	.incbin "data/tilesets/secondary/mt_ember/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CB274:: @ 82CB274
-	.incbin "data/tilesets/secondary/82D4FEC/metatile_attributes.bin"
+gMetatileAttributes_MtEmber:: @ 82CB274
+	.incbin "data/tilesets/secondary/mt_ember/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CB5FC:: @ 82CB5FC
-	.incbin "data/tilesets/secondary/82D5004/metatiles.bin"
+gMetatiles_BerryForest:: @ 82CB5FC
+	.incbin "data/tilesets/secondary/berry_forest/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CB89C:: @ 82CB89C
-	.incbin "data/tilesets/secondary/82D5004/metatile_attributes.bin"
+gMetatileAttributes_BerryForest:: @ 82CB89C
+	.incbin "data/tilesets/secondary/berry_forest/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CB944:: @ 82CB944
-	.incbin "data/tilesets/secondary/82D501C/metatiles.bin"
+gMetatiles_NavelRock:: @ 82CB944
+	.incbin "data/tilesets/secondary/navel_rock/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CC704:: @ 82CC704
-	.incbin "data/tilesets/secondary/82D501C/metatile_attributes.bin"
+gMetatileAttributes_NavelRock:: @ 82CC704
+	.incbin "data/tilesets/secondary/navel_rock/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CCA74:: @ 82CCA74
-	.incbin "data/tilesets/secondary/82D5034/metatiles.bin"
+gMetatiles_TanobyRuins:: @ 82CCA74
+	.incbin "data/tilesets/secondary/tanoby_ruins/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CD054:: @ 82CD054
-	.incbin "data/tilesets/secondary/82D5034/metatile_attributes.bin"
+gMetatileAttributes_TanobyRuins:: @ 82CD054
+	.incbin "data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CD1CC:: @ 82CD1CC
-	.incbin "data/tilesets/secondary/82D504C/metatiles.bin"
+gMetatiles_SeviiIslands123:: @ 82CD1CC
+	.incbin "data/tilesets/secondary/sevii_islands_123/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CE39C:: @ 82CE39C
-	.incbin "data/tilesets/secondary/82D504C/metatile_attributes.bin"
+gMetatileAttributes_SeviiIslands123:: @ 82CE39C
+	.incbin "data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CE810:: @ 82CE810
-	.incbin "data/tilesets/secondary/82D5064/metatiles.bin"
+gMetatiles_SeviiIslands45:: @ 82CE810
+	.incbin "data/tilesets/secondary/sevii_islands_45/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CF190:: @ 82CF190
-	.incbin "data/tilesets/secondary/82D5064/metatile_attributes.bin"
+gMetatileAttributes_SeviiIslands45:: @ 82CF190
+	.incbin "data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CF3F0:: @ 82CF3F0
-	.incbin "data/tilesets/secondary/82D507C/metatiles.bin"
+gMetatiles_SeviiIslands67:: @ 82CF3F0
+	.incbin "data/tilesets/secondary/sevii_islands_67/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82D02F0:: @ 82D02F0
-	.incbin "data/tilesets/secondary/82D507C/metatile_attributes.bin"
+gMetatileAttributes_SeviiIslands67:: @ 82D02F0
+	.incbin "data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82D06B0:: @ 82D06B0
-	.incbin "data/tilesets/secondary/82D5094/metatiles.bin"
+gMetatiles_TrainerTower:: @ 82D06B0
+	.incbin "data/tilesets/secondary/trainer_tower/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82D18B0:: @ 82D18B0
-	.incbin "data/tilesets/secondary/82D5094/metatile_attributes.bin"
+gMetatileAttributes_TrainerTower:: @ 82D18B0
+	.incbin "data/tilesets/secondary/trainer_tower/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82D1D30:: @ 82D1D30
-	.incbin "data/tilesets/secondary/82D50AC/metatiles.bin"
+gMetatiles_IslandHarbor:: @ 82D1D30
+	.incbin "data/tilesets/secondary/island_harbor/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82D2220:: @ 82D2220
-	.incbin "data/tilesets/secondary/82D50AC/metatile_attributes.bin"
+gMetatileAttributes_IslandHarbor:: @ 82D2220
+	.incbin "data/tilesets/secondary/island_harbor/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82D235C:: @ 82D235C
-	.incbin "data/tilesets/secondary/82D50C4/metatiles.bin"
+gMetatiles_PokemonLeague:: @ 82D235C
+	.incbin "data/tilesets/secondary/pokemon_league/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82D3B5C:: @ 82D3B5C
-	.incbin "data/tilesets/secondary/82D50C4/metatile_attributes.bin"
+gMetatileAttributes_PokemonLeague:: @ 82D3B5C
+	.incbin "data/tilesets/secondary/pokemon_league/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82D415C:: @ 82D415C
-	.incbin "data/tilesets/secondary/82D50DC/metatiles.bin"
+gMetatiles_HallOfFame:: @ 82D415C
+	.incbin "data/tilesets/secondary/hall_of_fame/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82D48BC:: @ 82D48BC
-	.incbin "data/tilesets/secondary/82D50DC/metatile_attributes.bin"
+gMetatileAttributes_HallOfFame:: @ 82D48BC
+	.incbin "data/tilesets/secondary/hall_of_fame/metatile_attributes.bin"
diff --git a/data/tilesets/primary/82D4BB4/metatile_attributes.bin b/data/tilesets/primary/building/metatile_attributes.bin
index 3dbc31883..3dbc31883 100644
--- a/data/tilesets/primary/82D4BB4/metatile_attributes.bin
+++ b/data/tilesets/primary/building/metatile_attributes.bin
diff --git a/data/tilesets/primary/82D4BB4/metatiles.bin b/data/tilesets/primary/building/metatiles.bin
index 024797c8e..024797c8e 100644
--- a/data/tilesets/primary/82D4BB4/metatiles.bin
+++ b/data/tilesets/primary/building/metatiles.bin
diff --git a/data/tilesets/primary/82D4BB4/palettes/0.pal b/data/tilesets/primary/building/palettes/0.pal
index 3b6416376..3b6416376 100644
--- a/data/tilesets/primary/82D4BB4/palettes/0.pal
+++ b/data/tilesets/primary/building/palettes/0.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/1.pal b/data/tilesets/primary/building/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/primary/82D4BB4/palettes/1.pal
+++ b/data/tilesets/primary/building/palettes/1.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/10.pal b/data/tilesets/primary/building/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4A94/palettes/10.pal
+++ b/data/tilesets/primary/building/palettes/10.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/11.pal b/data/tilesets/primary/building/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4A94/palettes/11.pal
+++ b/data/tilesets/primary/building/palettes/11.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/12.pal b/data/tilesets/primary/building/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4BB4/palettes/12.pal
+++ b/data/tilesets/primary/building/palettes/12.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/13.pal b/data/tilesets/primary/building/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4A94/palettes/13.pal
+++ b/data/tilesets/primary/building/palettes/13.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/14.pal b/data/tilesets/primary/building/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4A94/palettes/14.pal
+++ b/data/tilesets/primary/building/palettes/14.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/15.pal b/data/tilesets/primary/building/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/primary/82D4BB4/palettes/15.pal
+++ b/data/tilesets/primary/building/palettes/15.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/2.pal b/data/tilesets/primary/building/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/primary/82D4BB4/palettes/2.pal
+++ b/data/tilesets/primary/building/palettes/2.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/3.pal b/data/tilesets/primary/building/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/primary/82D4BB4/palettes/3.pal
+++ b/data/tilesets/primary/building/palettes/3.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/4.pal b/data/tilesets/primary/building/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/primary/82D4BB4/palettes/4.pal
+++ b/data/tilesets/primary/building/palettes/4.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/5.pal b/data/tilesets/primary/building/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/primary/82D4BB4/palettes/5.pal
+++ b/data/tilesets/primary/building/palettes/5.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/6.pal b/data/tilesets/primary/building/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/primary/82D4BB4/palettes/6.pal
+++ b/data/tilesets/primary/building/palettes/6.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/7.pal b/data/tilesets/primary/building/palettes/7.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/primary/82D4BB4/palettes/7.pal
+++ b/data/tilesets/primary/building/palettes/7.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/8.pal b/data/tilesets/primary/building/palettes/8.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/primary/82D4BB4/palettes/8.pal
+++ b/data/tilesets/primary/building/palettes/8.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/9.pal b/data/tilesets/primary/building/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4A94/palettes/9.pal
+++ b/data/tilesets/primary/building/palettes/9.pal
diff --git a/data/tilesets/primary/82D4BB4/tiles.png b/data/tilesets/primary/building/tiles.png
index 8d864f27e..8d864f27e 100644
--- a/data/tilesets/primary/82D4BB4/tiles.png
+++ b/data/tilesets/primary/building/tiles.png
diff --git a/data/tilesets/primary/82D4A94/metatile_attributes.bin b/data/tilesets/primary/general/metatile_attributes.bin
index 45f6f352e..45f6f352e 100644
--- a/data/tilesets/primary/82D4A94/metatile_attributes.bin
+++ b/data/tilesets/primary/general/metatile_attributes.bin
diff --git a/data/tilesets/primary/82D4A94/metatiles.bin b/data/tilesets/primary/general/metatiles.bin
index 7a228eeae..7a228eeae 100644
--- a/data/tilesets/primary/82D4A94/metatiles.bin
+++ b/data/tilesets/primary/general/metatiles.bin
diff --git a/data/tilesets/primary/82D4A94/palettes/0.pal b/data/tilesets/primary/general/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/primary/82D4A94/palettes/0.pal
+++ b/data/tilesets/primary/general/palettes/0.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/1.pal b/data/tilesets/primary/general/palettes/1.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/primary/82D4A94/palettes/1.pal
+++ b/data/tilesets/primary/general/palettes/1.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/10.pal b/data/tilesets/primary/general/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4BB4/palettes/10.pal
+++ b/data/tilesets/primary/general/palettes/10.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/11.pal b/data/tilesets/primary/general/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4BB4/palettes/11.pal
+++ b/data/tilesets/primary/general/palettes/11.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/12.pal b/data/tilesets/primary/general/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4A94/palettes/12.pal
+++ b/data/tilesets/primary/general/palettes/12.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/13.pal b/data/tilesets/primary/general/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4BB4/palettes/13.pal
+++ b/data/tilesets/primary/general/palettes/13.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/14.pal b/data/tilesets/primary/general/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4BB4/palettes/14.pal
+++ b/data/tilesets/primary/general/palettes/14.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/15.pal b/data/tilesets/primary/general/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4A94/palettes/15.pal
+++ b/data/tilesets/primary/general/palettes/15.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/2.pal b/data/tilesets/primary/general/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/primary/82D4A94/palettes/2.pal
+++ b/data/tilesets/primary/general/palettes/2.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/3.pal b/data/tilesets/primary/general/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/primary/82D4A94/palettes/3.pal
+++ b/data/tilesets/primary/general/palettes/3.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/4.pal b/data/tilesets/primary/general/palettes/4.pal
index 9b094a6aa..9b094a6aa 100644
--- a/data/tilesets/primary/82D4A94/palettes/4.pal
+++ b/data/tilesets/primary/general/palettes/4.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/5.pal b/data/tilesets/primary/general/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/primary/82D4A94/palettes/5.pal
+++ b/data/tilesets/primary/general/palettes/5.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/6.pal b/data/tilesets/primary/general/palettes/6.pal
index cdf41b298..cdf41b298 100644
--- a/data/tilesets/primary/82D4A94/palettes/6.pal
+++ b/data/tilesets/primary/general/palettes/6.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/7.pal b/data/tilesets/primary/general/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4A94/palettes/7.pal
+++ b/data/tilesets/primary/general/palettes/7.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/8.pal b/data/tilesets/primary/general/palettes/8.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4A94/palettes/8.pal
+++ b/data/tilesets/primary/general/palettes/8.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/9.pal b/data/tilesets/primary/general/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4BB4/palettes/9.pal
+++ b/data/tilesets/primary/general/palettes/9.pal
diff --git a/data/tilesets/primary/82D4A94/tiles.png b/data/tilesets/primary/general/tiles.png
index 84ba7b2f9..84ba7b2f9 100644
--- a/data/tilesets/primary/82D4A94/tiles.png
+++ b/data/tilesets/primary/general/tiles.png
diff --git a/data/tilesets/secondary/82D5004/metatile_attributes.bin b/data/tilesets/secondary/berry_forest/metatile_attributes.bin
index 6d6c6d544..6d6c6d544 100644
--- a/data/tilesets/secondary/82D5004/metatile_attributes.bin
+++ b/data/tilesets/secondary/berry_forest/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5004/metatiles.bin b/data/tilesets/secondary/berry_forest/metatiles.bin
index fb47747c4..fb47747c4 100644
--- a/data/tilesets/secondary/82D5004/metatiles.bin
+++ b/data/tilesets/secondary/berry_forest/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B3C/palettes/0.pal b/data/tilesets/secondary/berry_forest/palettes/0.pal
index 7af5bb7d2..7af5bb7d2 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/0.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/1.pal b/data/tilesets/secondary/berry_forest/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/1.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/10.pal b/data/tilesets/secondary/berry_forest/palettes/10.pal
index 746437492..746437492 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/10.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/11.pal b/data/tilesets/secondary/berry_forest/palettes/11.pal
index 6fe747b2d..6fe747b2d 100644
--- a/data/tilesets/secondary/82D5004/palettes/11.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/12.pal b/data/tilesets/secondary/berry_forest/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/12.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/13.pal b/data/tilesets/secondary/berry_forest/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/13.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/14.pal b/data/tilesets/secondary/berry_forest/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/14.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/15.pal b/data/tilesets/secondary/berry_forest/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/15.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/2.pal b/data/tilesets/secondary/berry_forest/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/2.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/3.pal b/data/tilesets/secondary/berry_forest/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/3.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/4.pal b/data/tilesets/secondary/berry_forest/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/4.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/5.pal b/data/tilesets/secondary/berry_forest/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/5.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/6.pal b/data/tilesets/secondary/berry_forest/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/6.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/7.pal b/data/tilesets/secondary/berry_forest/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4B84/palettes/7.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/8.pal b/data/tilesets/secondary/berry_forest/palettes/8.pal
index 650a35cc8..650a35cc8 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/8.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/9.pal b/data/tilesets/secondary/berry_forest/palettes/9.pal
index df2d04037..df2d04037 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/9.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5004/tiles.png b/data/tilesets/secondary/berry_forest/tiles.png
index dacbc0120..dacbc0120 100644
--- a/data/tilesets/secondary/82D5004/tiles.png
+++ b/data/tilesets/secondary/berry_forest/tiles.png
diff --git a/data/tilesets/secondary/82D4C5C/metatile_attributes.bin b/data/tilesets/secondary/bike_shop/metatile_attributes.bin
index d1a4900c5..d1a4900c5 100644
--- a/data/tilesets/secondary/82D4C5C/metatile_attributes.bin
+++ b/data/tilesets/secondary/bike_shop/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C5C/metatiles.bin b/data/tilesets/secondary/bike_shop/metatiles.bin
index f1c0ab02d..f1c0ab02d 100644
--- a/data/tilesets/secondary/82D4C5C/metatiles.bin
+++ b/data/tilesets/secondary/bike_shop/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C5C/palettes/0.pal b/data/tilesets/secondary/bike_shop/palettes/0.pal
index 4b44e19f4..4b44e19f4 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/0.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/1.pal b/data/tilesets/secondary/bike_shop/palettes/1.pal
index a39ca6aa8..a39ca6aa8 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/1.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/10.pal b/data/tilesets/secondary/bike_shop/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/10.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/11.pal b/data/tilesets/secondary/bike_shop/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/11.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/12.pal b/data/tilesets/secondary/bike_shop/palettes/12.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/12.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/13.pal b/data/tilesets/secondary/bike_shop/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/13.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/14.pal b/data/tilesets/secondary/bike_shop/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/14.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/15.pal b/data/tilesets/secondary/bike_shop/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/15.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/2.pal b/data/tilesets/secondary/bike_shop/palettes/2.pal
index 5a4f127be..5a4f127be 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/2.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/3.pal b/data/tilesets/secondary/bike_shop/palettes/3.pal
index c84fa4a58..c84fa4a58 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/3.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/4.pal b/data/tilesets/secondary/bike_shop/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/4.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/5.pal b/data/tilesets/secondary/bike_shop/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/5.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/6.pal b/data/tilesets/secondary/bike_shop/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/6.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/7.pal b/data/tilesets/secondary/bike_shop/palettes/7.pal
index a71b8fee2..a71b8fee2 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/7.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/8.pal b/data/tilesets/secondary/bike_shop/palettes/8.pal
index 0a666a9c9..0a666a9c9 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/8.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/9.pal b/data/tilesets/secondary/bike_shop/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/9.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C5C/tiles.png b/data/tilesets/secondary/bike_shop/tiles.png
index 90124ff4a..90124ff4a 100644
--- a/data/tilesets/secondary/82D4C5C/tiles.png
+++ b/data/tilesets/secondary/bike_shop/tiles.png
diff --git a/data/tilesets/secondary/82D4FA4/metatile_attributes.bin b/data/tilesets/secondary/burgled_house/metatile_attributes.bin
index db0f7817e..db0f7817e 100644
--- a/data/tilesets/secondary/82D4FA4/metatile_attributes.bin
+++ b/data/tilesets/secondary/burgled_house/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FA4/metatiles.bin b/data/tilesets/secondary/burgled_house/metatiles.bin
index dfe78c910..dfe78c910 100644
--- a/data/tilesets/secondary/82D4FA4/metatiles.bin
+++ b/data/tilesets/secondary/burgled_house/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EE4/palettes/0.pal b/data/tilesets/secondary/burgled_house/palettes/0.pal
index 6d876039d..6d876039d 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/0.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/1.pal b/data/tilesets/secondary/burgled_house/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4D04/palettes/1.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/10.pal b/data/tilesets/secondary/burgled_house/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/10.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/11.pal b/data/tilesets/secondary/burgled_house/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/11.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/12.pal b/data/tilesets/secondary/burgled_house/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/12.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/13.pal b/data/tilesets/secondary/burgled_house/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/13.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/14.pal b/data/tilesets/secondary/burgled_house/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/14.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/15.pal b/data/tilesets/secondary/burgled_house/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/15.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/2.pal b/data/tilesets/secondary/burgled_house/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4D04/palettes/2.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/3.pal b/data/tilesets/secondary/burgled_house/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4D04/palettes/3.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/4.pal b/data/tilesets/secondary/burgled_house/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4D04/palettes/4.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/5.pal b/data/tilesets/secondary/burgled_house/palettes/5.pal
index 0eef3df8e..0eef3df8e 100644
--- a/data/tilesets/secondary/82D4D04/palettes/5.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/6.pal b/data/tilesets/secondary/burgled_house/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4D04/palettes/6.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/7.pal b/data/tilesets/secondary/burgled_house/palettes/7.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D4C74/palettes/7.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/8.pal b/data/tilesets/secondary/burgled_house/palettes/8.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/8.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/9.pal b/data/tilesets/secondary/burgled_house/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/9.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FA4/tiles.png b/data/tilesets/secondary/burgled_house/tiles.png
index 9fcf94314..9fcf94314 100644
--- a/data/tilesets/secondary/82D4FA4/tiles.png
+++ b/data/tilesets/secondary/burgled_house/tiles.png
diff --git a/data/tilesets/secondary/82D4C44/metatile_attributes.bin b/data/tilesets/secondary/cable_club/metatile_attributes.bin
index 53505839d..53505839d 100644
--- a/data/tilesets/secondary/82D4C44/metatile_attributes.bin
+++ b/data/tilesets/secondary/cable_club/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C44/metatiles.bin b/data/tilesets/secondary/cable_club/metatiles.bin
index 0e2f2a6c3..0e2f2a6c3 100644
--- a/data/tilesets/secondary/82D4C44/metatiles.bin
+++ b/data/tilesets/secondary/cable_club/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C14/palettes/0.pal b/data/tilesets/secondary/cable_club/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/0.pal
+++ b/data/tilesets/secondary/cable_club/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/1.pal b/data/tilesets/secondary/cable_club/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/1.pal
+++ b/data/tilesets/secondary/cable_club/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/10.pal b/data/tilesets/secondary/cable_club/palettes/10.pal
index ab8f75e5a..ab8f75e5a 100644
--- a/data/tilesets/secondary/82D4C44/palettes/10.pal
+++ b/data/tilesets/secondary/cable_club/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/11.pal b/data/tilesets/secondary/cable_club/palettes/11.pal
index 468d7212c..468d7212c 100644
--- a/data/tilesets/secondary/82D4C44/palettes/11.pal
+++ b/data/tilesets/secondary/cable_club/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/12.pal b/data/tilesets/secondary/cable_club/palettes/12.pal
index 05794ac82..05794ac82 100644
--- a/data/tilesets/secondary/82D4C44/palettes/12.pal
+++ b/data/tilesets/secondary/cable_club/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/13.pal b/data/tilesets/secondary/cable_club/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/13.pal
+++ b/data/tilesets/secondary/cable_club/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/14.pal b/data/tilesets/secondary/cable_club/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/14.pal
+++ b/data/tilesets/secondary/cable_club/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/15.pal b/data/tilesets/secondary/cable_club/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/15.pal
+++ b/data/tilesets/secondary/cable_club/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/2.pal b/data/tilesets/secondary/cable_club/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/2.pal
+++ b/data/tilesets/secondary/cable_club/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/3.pal b/data/tilesets/secondary/cable_club/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/3.pal
+++ b/data/tilesets/secondary/cable_club/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/4.pal b/data/tilesets/secondary/cable_club/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/4.pal
+++ b/data/tilesets/secondary/cable_club/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/5.pal b/data/tilesets/secondary/cable_club/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/5.pal
+++ b/data/tilesets/secondary/cable_club/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/6.pal b/data/tilesets/secondary/cable_club/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/6.pal
+++ b/data/tilesets/secondary/cable_club/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/7.pal b/data/tilesets/secondary/cable_club/palettes/7.pal
index 00ca6903f..00ca6903f 100644
--- a/data/tilesets/secondary/82D4C44/palettes/7.pal
+++ b/data/tilesets/secondary/cable_club/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/8.pal b/data/tilesets/secondary/cable_club/palettes/8.pal
index 43d6db90d..43d6db90d 100644
--- a/data/tilesets/secondary/82D4C44/palettes/8.pal
+++ b/data/tilesets/secondary/cable_club/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/9.pal b/data/tilesets/secondary/cable_club/palettes/9.pal
index 87857607f..87857607f 100644
--- a/data/tilesets/secondary/82D4C44/palettes/9.pal
+++ b/data/tilesets/secondary/cable_club/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C44/tiles.png b/data/tilesets/secondary/cable_club/tiles.png
index f71f29432..f71f29432 100644
--- a/data/tilesets/secondary/82D4C44/tiles.png
+++ b/data/tilesets/secondary/cable_club/tiles.png
diff --git a/data/tilesets/secondary/82D4BFC/metatile_attributes.bin b/data/tilesets/secondary/cave/metatile_attributes.bin
index 510f0fdf1..510f0fdf1 100644
--- a/data/tilesets/secondary/82D4BFC/metatile_attributes.bin
+++ b/data/tilesets/secondary/cave/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4BFC/metatiles.bin b/data/tilesets/secondary/cave/metatiles.bin
index 9f35adc11..9f35adc11 100644
--- a/data/tilesets/secondary/82D4BFC/metatiles.bin
+++ b/data/tilesets/secondary/cave/metatiles.bin
diff --git a/data/tilesets/secondary/82D4AC4/palettes/0.pal b/data/tilesets/secondary/cave/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/0.pal
+++ b/data/tilesets/secondary/cave/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/1.pal b/data/tilesets/secondary/cave/palettes/1.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/secondary/82D4B24/palettes/1.pal
+++ b/data/tilesets/secondary/cave/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/10.pal b/data/tilesets/secondary/cave/palettes/10.pal
index 937405d15..937405d15 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/10.pal
+++ b/data/tilesets/secondary/cave/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/11.pal b/data/tilesets/secondary/cave/palettes/11.pal
index bb4f4867c..bb4f4867c 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/11.pal
+++ b/data/tilesets/secondary/cave/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/12.pal b/data/tilesets/secondary/cave/palettes/12.pal
index 583384664..583384664 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/12.pal
+++ b/data/tilesets/secondary/cave/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/13.pal b/data/tilesets/secondary/cave/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/13.pal
+++ b/data/tilesets/secondary/cave/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/14.pal b/data/tilesets/secondary/cave/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/14.pal
+++ b/data/tilesets/secondary/cave/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/15.pal b/data/tilesets/secondary/cave/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/15.pal
+++ b/data/tilesets/secondary/cave/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/2.pal b/data/tilesets/secondary/cave/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/2.pal
+++ b/data/tilesets/secondary/cave/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/3.pal b/data/tilesets/secondary/cave/palettes/3.pal
index ef7460f41..ef7460f41 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/3.pal
+++ b/data/tilesets/secondary/cave/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/4.pal b/data/tilesets/secondary/cave/palettes/4.pal
index e83c6b367..e83c6b367 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/4.pal
+++ b/data/tilesets/secondary/cave/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/5.pal b/data/tilesets/secondary/cave/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/5.pal
+++ b/data/tilesets/secondary/cave/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/6.pal b/data/tilesets/secondary/cave/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D4B24/palettes/6.pal
+++ b/data/tilesets/secondary/cave/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/7.pal b/data/tilesets/secondary/cave/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/7.pal
+++ b/data/tilesets/secondary/cave/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/8.pal b/data/tilesets/secondary/cave/palettes/8.pal
index 1c8d33fac..1c8d33fac 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/8.pal
+++ b/data/tilesets/secondary/cave/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/9.pal b/data/tilesets/secondary/cave/palettes/9.pal
index 3795f6c6a..3795f6c6a 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/9.pal
+++ b/data/tilesets/secondary/cave/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4BFC/tiles.png b/data/tilesets/secondary/cave/tiles.png
index 8e0f64a78..8e0f64a78 100644
--- a/data/tilesets/secondary/82D4BFC/tiles.png
+++ b/data/tilesets/secondary/cave/tiles.png
diff --git a/data/tilesets/secondary/82D4B3C/metatile_attributes.bin b/data/tilesets/secondary/celadon_city/metatile_attributes.bin
index 5dd139155..5dd139155 100644
--- a/data/tilesets/secondary/82D4B3C/metatile_attributes.bin
+++ b/data/tilesets/secondary/celadon_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B3C/metatiles.bin b/data/tilesets/secondary/celadon_city/metatiles.bin
index 3bfb9d239..3bfb9d239 100644
--- a/data/tilesets/secondary/82D4B3C/metatiles.bin
+++ b/data/tilesets/secondary/celadon_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DC4/palettes/0.pal b/data/tilesets/secondary/celadon_city/palettes/0.pal
index 7af5bb7d2..7af5bb7d2 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/0.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/1.pal b/data/tilesets/secondary/celadon_city/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B54/palettes/1.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/10.pal b/data/tilesets/secondary/celadon_city/palettes/10.pal
index 361b133e6..361b133e6 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/10.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/11.pal b/data/tilesets/secondary/celadon_city/palettes/11.pal
index 00caf8dfc..00caf8dfc 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/11.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/12.pal b/data/tilesets/secondary/celadon_city/palettes/12.pal
index 4257575ae..4257575ae 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/12.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/13.pal b/data/tilesets/secondary/celadon_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B24/palettes/13.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/14.pal b/data/tilesets/secondary/celadon_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B24/palettes/14.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/15.pal b/data/tilesets/secondary/celadon_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B54/palettes/15.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/2.pal b/data/tilesets/secondary/celadon_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/2.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/3.pal b/data/tilesets/secondary/celadon_city/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/3.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/4.pal b/data/tilesets/secondary/celadon_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/4.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/5.pal b/data/tilesets/secondary/celadon_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/5.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/6.pal b/data/tilesets/secondary/celadon_city/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/6.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/7.pal b/data/tilesets/secondary/celadon_city/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/7.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/8.pal b/data/tilesets/secondary/celadon_city/palettes/8.pal
index 86930c1d1..86930c1d1 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/8.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/9.pal b/data/tilesets/secondary/celadon_city/palettes/9.pal
index 5dc82505a..5dc82505a 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/9.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B3C/tiles.png b/data/tilesets/secondary/celadon_city/tiles.png
index db18cb938..db18cb938 100644
--- a/data/tilesets/secondary/82D4B3C/tiles.png
+++ b/data/tilesets/secondary/celadon_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D4C/metatile_attributes.bin b/data/tilesets/secondary/celadon_gym/metatile_attributes.bin
index def1ee695..def1ee695 100644
--- a/data/tilesets/secondary/82D4D4C/metatile_attributes.bin
+++ b/data/tilesets/secondary/celadon_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D4C/metatiles.bin b/data/tilesets/secondary/celadon_gym/metatiles.bin
index f3f58a44d..f3f58a44d 100644
--- a/data/tilesets/secondary/82D4D4C/metatiles.bin
+++ b/data/tilesets/secondary/celadon_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4BCC/palettes/0.pal b/data/tilesets/secondary/celadon_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/0.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/1.pal b/data/tilesets/secondary/celadon_gym/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/1.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/10.pal b/data/tilesets/secondary/celadon_gym/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/10.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/11.pal b/data/tilesets/secondary/celadon_gym/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/11.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/12.pal b/data/tilesets/secondary/celadon_gym/palettes/12.pal
index 041512724..041512724 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/12.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/13.pal b/data/tilesets/secondary/celadon_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/13.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/14.pal b/data/tilesets/secondary/celadon_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/14.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/15.pal b/data/tilesets/secondary/celadon_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/15.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/2.pal b/data/tilesets/secondary/celadon_gym/palettes/2.pal
index 330e35b02..330e35b02 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/2.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/3.pal b/data/tilesets/secondary/celadon_gym/palettes/3.pal
index eac8236f1..eac8236f1 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/3.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/4.pal b/data/tilesets/secondary/celadon_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/4.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/5.pal b/data/tilesets/secondary/celadon_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/5.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/6.pal b/data/tilesets/secondary/celadon_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/6.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/7.pal b/data/tilesets/secondary/celadon_gym/palettes/7.pal
index 9d84ecaba..9d84ecaba 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/7.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/8.pal b/data/tilesets/secondary/celadon_gym/palettes/8.pal
index 085c49344..085c49344 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/8.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/9.pal b/data/tilesets/secondary/celadon_gym/palettes/9.pal
index 9020b628f..9020b628f 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/9.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D4C/tiles.png b/data/tilesets/secondary/celadon_gym/tiles.png
index ef08ccc83..ef08ccc83 100644
--- a/data/tilesets/secondary/82D4D4C/tiles.png
+++ b/data/tilesets/secondary/celadon_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4E54/metatile_attributes.bin b/data/tilesets/secondary/cerulean_cave/metatile_attributes.bin
index 45b5bef90..45b5bef90 100644
--- a/data/tilesets/secondary/82D4E54/metatile_attributes.bin
+++ b/data/tilesets/secondary/cerulean_cave/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E54/metatiles.bin b/data/tilesets/secondary/cerulean_cave/metatiles.bin
index 249addbc7..249addbc7 100644
--- a/data/tilesets/secondary/82D4E54/metatiles.bin
+++ b/data/tilesets/secondary/cerulean_cave/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E0C/palettes/0.pal b/data/tilesets/secondary/cerulean_cave/palettes/0.pal
index a3fab1c2f..a3fab1c2f 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/0.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/1.pal b/data/tilesets/secondary/cerulean_cave/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/1.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/10.pal b/data/tilesets/secondary/cerulean_cave/palettes/10.pal
index eb9198b0a..eb9198b0a 100644
--- a/data/tilesets/secondary/82D4E54/palettes/10.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/11.pal b/data/tilesets/secondary/cerulean_cave/palettes/11.pal
index 9afe8750d..9afe8750d 100644
--- a/data/tilesets/secondary/82D4E54/palettes/11.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/12.pal b/data/tilesets/secondary/cerulean_cave/palettes/12.pal
index aced117f7..aced117f7 100644
--- a/data/tilesets/secondary/82D4E54/palettes/12.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/13.pal b/data/tilesets/secondary/cerulean_cave/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B54/palettes/13.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/14.pal b/data/tilesets/secondary/cerulean_cave/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B54/palettes/14.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/15.pal b/data/tilesets/secondary/cerulean_cave/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B84/palettes/15.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/2.pal b/data/tilesets/secondary/cerulean_cave/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B54/palettes/2.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/3.pal b/data/tilesets/secondary/cerulean_cave/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/3.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/4.pal b/data/tilesets/secondary/cerulean_cave/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B54/palettes/4.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/5.pal b/data/tilesets/secondary/cerulean_cave/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4B24/palettes/5.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/6.pal b/data/tilesets/secondary/cerulean_cave/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/6.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/7.pal b/data/tilesets/secondary/cerulean_cave/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/7.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/8.pal b/data/tilesets/secondary/cerulean_cave/palettes/8.pal
index db2216a05..db2216a05 100644
--- a/data/tilesets/secondary/82D4E54/palettes/8.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/9.pal b/data/tilesets/secondary/cerulean_cave/palettes/9.pal
index c1a5d4f29..c1a5d4f29 100644
--- a/data/tilesets/secondary/82D4E54/palettes/9.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E54/tiles.png b/data/tilesets/secondary/cerulean_cave/tiles.png
index d53a0cf17..d53a0cf17 100644
--- a/data/tilesets/secondary/82D4E54/tiles.png
+++ b/data/tilesets/secondary/cerulean_cave/tiles.png
diff --git a/data/tilesets/secondary/82D4AF4/metatile_attributes.bin b/data/tilesets/secondary/cerulean_city/metatile_attributes.bin
index 7de4de077..7de4de077 100644
--- a/data/tilesets/secondary/82D4AF4/metatile_attributes.bin
+++ b/data/tilesets/secondary/cerulean_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4AF4/metatiles.bin b/data/tilesets/secondary/cerulean_city/metatiles.bin
index b810e7996..b810e7996 100644
--- a/data/tilesets/secondary/82D4AF4/metatiles.bin
+++ b/data/tilesets/secondary/cerulean_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4AF4/palettes/0.pal b/data/tilesets/secondary/cerulean_city/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/0.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/1.pal b/data/tilesets/secondary/cerulean_city/palettes/1.pal
index 31a636983..31a636983 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/1.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/10.pal b/data/tilesets/secondary/cerulean_city/palettes/10.pal
index 536972f8f..536972f8f 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/10.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/11.pal b/data/tilesets/secondary/cerulean_city/palettes/11.pal
index 986335b74..986335b74 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/11.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/12.pal b/data/tilesets/secondary/cerulean_city/palettes/12.pal
index c44bc32b5..c44bc32b5 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/12.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/13.pal b/data/tilesets/secondary/cerulean_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/13.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/14.pal b/data/tilesets/secondary/cerulean_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/14.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/15.pal b/data/tilesets/secondary/cerulean_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/15.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/2.pal b/data/tilesets/secondary/cerulean_city/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/2.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/3.pal b/data/tilesets/secondary/cerulean_city/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/3.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/4.pal b/data/tilesets/secondary/cerulean_city/palettes/4.pal
index 91fdcabdf..91fdcabdf 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/4.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/5.pal b/data/tilesets/secondary/cerulean_city/palettes/5.pal
index 0edb843f5..0edb843f5 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/5.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/6.pal b/data/tilesets/secondary/cerulean_city/palettes/6.pal
index f8ebbc6dc..f8ebbc6dc 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/6.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/7.pal b/data/tilesets/secondary/cerulean_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/7.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/8.pal b/data/tilesets/secondary/cerulean_city/palettes/8.pal
index ae3dd3f0d..ae3dd3f0d 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/8.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/9.pal b/data/tilesets/secondary/cerulean_city/palettes/9.pal
index 3ed18e08f..3ed18e08f 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/9.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4AF4/tiles.png b/data/tilesets/secondary/cerulean_city/tiles.png
index 737d3dd7f..737d3dd7f 100644
--- a/data/tilesets/secondary/82D4AF4/tiles.png
+++ b/data/tilesets/secondary/cerulean_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D1C/metatile_attributes.bin b/data/tilesets/secondary/cerulean_gym/metatile_attributes.bin
index 84b5e2049..84b5e2049 100644
--- a/data/tilesets/secondary/82D4D1C/metatile_attributes.bin
+++ b/data/tilesets/secondary/cerulean_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D1C/metatiles.bin b/data/tilesets/secondary/cerulean_gym/metatiles.bin
index c026eb65a..c026eb65a 100644
--- a/data/tilesets/secondary/82D4D1C/metatiles.bin
+++ b/data/tilesets/secondary/cerulean_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D1C/palettes/0.pal b/data/tilesets/secondary/cerulean_gym/palettes/0.pal
index 4b44e19f4..4b44e19f4 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/0.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/1.pal b/data/tilesets/secondary/cerulean_gym/palettes/1.pal
index a39ca6aa8..a39ca6aa8 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/1.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/10.pal b/data/tilesets/secondary/cerulean_gym/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/10.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/11.pal b/data/tilesets/secondary/cerulean_gym/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/11.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/12.pal b/data/tilesets/secondary/cerulean_gym/palettes/12.pal
index 419c00911..419c00911 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/12.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/13.pal b/data/tilesets/secondary/cerulean_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B84/palettes/13.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/14.pal b/data/tilesets/secondary/cerulean_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B84/palettes/14.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/15.pal b/data/tilesets/secondary/cerulean_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/15.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/2.pal b/data/tilesets/secondary/cerulean_gym/palettes/2.pal
index 5a4f127be..5a4f127be 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/2.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/3.pal b/data/tilesets/secondary/cerulean_gym/palettes/3.pal
index c84fa4a58..c84fa4a58 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/3.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/4.pal b/data/tilesets/secondary/cerulean_gym/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/4.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/5.pal b/data/tilesets/secondary/cerulean_gym/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/5.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/6.pal b/data/tilesets/secondary/cerulean_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/6.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/7.pal b/data/tilesets/secondary/cerulean_gym/palettes/7.pal
index aac016a72..aac016a72 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/7.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/8.pal b/data/tilesets/secondary/cerulean_gym/palettes/8.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/8.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/9.pal b/data/tilesets/secondary/cerulean_gym/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/9.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D1C/tiles.png b/data/tilesets/secondary/cerulean_gym/tiles.png
index 44b7c0c34..44b7c0c34 100644
--- a/data/tilesets/secondary/82D4D1C/tiles.png
+++ b/data/tilesets/secondary/cerulean_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4D7C/metatile_attributes.bin b/data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin
index 1d68a40a4..1d68a40a4 100644
--- a/data/tilesets/secondary/82D4D7C/metatile_attributes.bin
+++ b/data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D7C/metatiles.bin b/data/tilesets/secondary/cinnabar_gym/metatiles.bin
index 7a5532619..7a5532619 100644
--- a/data/tilesets/secondary/82D4D7C/metatiles.bin
+++ b/data/tilesets/secondary/cinnabar_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4BE4/palettes/0.pal b/data/tilesets/secondary/cinnabar_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/0.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/1.pal b/data/tilesets/secondary/cinnabar_gym/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4C74/palettes/1.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/10.pal b/data/tilesets/secondary/cinnabar_gym/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/10.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/11.pal b/data/tilesets/secondary/cinnabar_gym/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/11.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/12.pal b/data/tilesets/secondary/cinnabar_gym/palettes/12.pal
index 3f9aa94d6..3f9aa94d6 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/12.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/13.pal b/data/tilesets/secondary/cinnabar_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/13.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/14.pal b/data/tilesets/secondary/cinnabar_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/14.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/15.pal b/data/tilesets/secondary/cinnabar_gym/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/15.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/2.pal b/data/tilesets/secondary/cinnabar_gym/palettes/2.pal
index 330e35b02..330e35b02 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/2.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/3.pal b/data/tilesets/secondary/cinnabar_gym/palettes/3.pal
index eac8236f1..eac8236f1 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/3.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/4.pal b/data/tilesets/secondary/cinnabar_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/4.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/5.pal b/data/tilesets/secondary/cinnabar_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/5.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/6.pal b/data/tilesets/secondary/cinnabar_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/6.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/7.pal b/data/tilesets/secondary/cinnabar_gym/palettes/7.pal
index 5b659ef1b..5b659ef1b 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/7.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/8.pal b/data/tilesets/secondary/cinnabar_gym/palettes/8.pal
index f5a4ee678..f5a4ee678 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/8.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/9.pal b/data/tilesets/secondary/cinnabar_gym/palettes/9.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/9.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D7C/tiles.png b/data/tilesets/secondary/cinnabar_gym/tiles.png
index 213799158..213799158 100644
--- a/data/tilesets/secondary/82D4D7C/tiles.png
+++ b/data/tilesets/secondary/cinnabar_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4B6C/metatile_attributes.bin b/data/tilesets/secondary/cinnabar_island/metatile_attributes.bin
index d2c655c41..d2c655c41 100644
--- a/data/tilesets/secondary/82D4B6C/metatile_attributes.bin
+++ b/data/tilesets/secondary/cinnabar_island/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B6C/metatiles.bin b/data/tilesets/secondary/cinnabar_island/metatiles.bin
index 0abe4b18d..0abe4b18d 100644
--- a/data/tilesets/secondary/82D4B6C/metatiles.bin
+++ b/data/tilesets/secondary/cinnabar_island/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B6C/palettes/0.pal b/data/tilesets/secondary/cinnabar_island/palettes/0.pal
index 9dcb673aa..9dcb673aa 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/0.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/1.pal b/data/tilesets/secondary/cinnabar_island/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/1.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/10.pal b/data/tilesets/secondary/cinnabar_island/palettes/10.pal
index 608bbc2cf..608bbc2cf 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/10.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/11.pal b/data/tilesets/secondary/cinnabar_island/palettes/11.pal
index 608bbc2cf..608bbc2cf 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/11.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/12.pal b/data/tilesets/secondary/cinnabar_island/palettes/12.pal
index 608bbc2cf..608bbc2cf 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/12.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/13.pal b/data/tilesets/secondary/cinnabar_island/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/13.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/14.pal b/data/tilesets/secondary/cinnabar_island/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/14.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/15.pal b/data/tilesets/secondary/cinnabar_island/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/15.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/2.pal b/data/tilesets/secondary/cinnabar_island/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/2.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/3.pal b/data/tilesets/secondary/cinnabar_island/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4B24/palettes/3.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/4.pal b/data/tilesets/secondary/cinnabar_island/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/4.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/5.pal b/data/tilesets/secondary/cinnabar_island/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B54/palettes/5.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/6.pal b/data/tilesets/secondary/cinnabar_island/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B54/palettes/6.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/7.pal b/data/tilesets/secondary/cinnabar_island/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/7.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/8.pal b/data/tilesets/secondary/cinnabar_island/palettes/8.pal
index f734cd166..f734cd166 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/8.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/9.pal b/data/tilesets/secondary/cinnabar_island/palettes/9.pal
index ca26d1b08..ca26d1b08 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/9.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B6C/tiles.png b/data/tilesets/secondary/cinnabar_island/tiles.png
index ddb9ad0cb..ddb9ad0cb 100644
--- a/data/tilesets/secondary/82D4B6C/tiles.png
+++ b/data/tilesets/secondary/cinnabar_island/tiles.png
diff --git a/data/tilesets/secondary/82D4F8C/metatile_attributes.bin b/data/tilesets/secondary/condominiums/metatile_attributes.bin
index aa43d15ee..aa43d15ee 100644
--- a/data/tilesets/secondary/82D4F8C/metatile_attributes.bin
+++ b/data/tilesets/secondary/condominiums/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F8C/metatiles.bin b/data/tilesets/secondary/condominiums/metatiles.bin
index 117c036fa..117c036fa 100644
--- a/data/tilesets/secondary/82D4F8C/metatiles.bin
+++ b/data/tilesets/secondary/condominiums/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F8C/palettes/0.pal b/data/tilesets/secondary/condominiums/palettes/0.pal
index 5867e5ba6..5867e5ba6 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/0.pal
+++ b/data/tilesets/secondary/condominiums/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/1.pal b/data/tilesets/secondary/condominiums/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/1.pal
+++ b/data/tilesets/secondary/condominiums/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/10.pal b/data/tilesets/secondary/condominiums/palettes/10.pal
index 3c091df8b..3c091df8b 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/10.pal
+++ b/data/tilesets/secondary/condominiums/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/11.pal b/data/tilesets/secondary/condominiums/palettes/11.pal
index 79494336b..79494336b 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/11.pal
+++ b/data/tilesets/secondary/condominiums/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/12.pal b/data/tilesets/secondary/condominiums/palettes/12.pal
index b9b1e6061..b9b1e6061 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/12.pal
+++ b/data/tilesets/secondary/condominiums/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/13.pal b/data/tilesets/secondary/condominiums/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/13.pal
+++ b/data/tilesets/secondary/condominiums/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/14.pal b/data/tilesets/secondary/condominiums/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/14.pal
+++ b/data/tilesets/secondary/condominiums/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/15.pal b/data/tilesets/secondary/condominiums/palettes/15.pal
index 093fbdd6c..093fbdd6c 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/15.pal
+++ b/data/tilesets/secondary/condominiums/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/2.pal b/data/tilesets/secondary/condominiums/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/2.pal
+++ b/data/tilesets/secondary/condominiums/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/3.pal b/data/tilesets/secondary/condominiums/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/3.pal
+++ b/data/tilesets/secondary/condominiums/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/4.pal b/data/tilesets/secondary/condominiums/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/4.pal
+++ b/data/tilesets/secondary/condominiums/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/5.pal b/data/tilesets/secondary/condominiums/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/5.pal
+++ b/data/tilesets/secondary/condominiums/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/6.pal b/data/tilesets/secondary/condominiums/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/6.pal
+++ b/data/tilesets/secondary/condominiums/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/7.pal b/data/tilesets/secondary/condominiums/palettes/7.pal
index 35987db53..35987db53 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/7.pal
+++ b/data/tilesets/secondary/condominiums/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/8.pal b/data/tilesets/secondary/condominiums/palettes/8.pal
index 7f33e006f..7f33e006f 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/8.pal
+++ b/data/tilesets/secondary/condominiums/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/9.pal b/data/tilesets/secondary/condominiums/palettes/9.pal
index 75022050d..75022050d 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/9.pal
+++ b/data/tilesets/secondary/condominiums/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F8C/tiles.png b/data/tilesets/secondary/condominiums/tiles.png
index 324b42c9f..324b42c9f 100644
--- a/data/tilesets/secondary/82D4F8C/tiles.png
+++ b/data/tilesets/secondary/condominiums/tiles.png
diff --git a/data/tilesets/secondary/82D4E6C/metatile_attributes.bin b/data/tilesets/secondary/department_store/metatile_attributes.bin
index 5eca0b5c7..5eca0b5c7 100644
--- a/data/tilesets/secondary/82D4E6C/metatile_attributes.bin
+++ b/data/tilesets/secondary/department_store/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E6C/metatiles.bin b/data/tilesets/secondary/department_store/metatiles.bin
index 053045190..053045190 100644
--- a/data/tilesets/secondary/82D4E6C/metatiles.bin
+++ b/data/tilesets/secondary/department_store/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C2C/palettes/0.pal b/data/tilesets/secondary/department_store/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/0.pal
+++ b/data/tilesets/secondary/department_store/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/1.pal b/data/tilesets/secondary/department_store/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/1.pal
+++ b/data/tilesets/secondary/department_store/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/10.pal b/data/tilesets/secondary/department_store/palettes/10.pal
index c6e769ccc..c6e769ccc 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/10.pal
+++ b/data/tilesets/secondary/department_store/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/11.pal b/data/tilesets/secondary/department_store/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/11.pal
+++ b/data/tilesets/secondary/department_store/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/12.pal b/data/tilesets/secondary/department_store/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/12.pal
+++ b/data/tilesets/secondary/department_store/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/13.pal b/data/tilesets/secondary/department_store/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/13.pal
+++ b/data/tilesets/secondary/department_store/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/14.pal b/data/tilesets/secondary/department_store/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/14.pal
+++ b/data/tilesets/secondary/department_store/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/15.pal b/data/tilesets/secondary/department_store/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/15.pal
+++ b/data/tilesets/secondary/department_store/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/2.pal b/data/tilesets/secondary/department_store/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/2.pal
+++ b/data/tilesets/secondary/department_store/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/3.pal b/data/tilesets/secondary/department_store/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/3.pal
+++ b/data/tilesets/secondary/department_store/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/4.pal b/data/tilesets/secondary/department_store/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/4.pal
+++ b/data/tilesets/secondary/department_store/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/5.pal b/data/tilesets/secondary/department_store/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/5.pal
+++ b/data/tilesets/secondary/department_store/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/6.pal b/data/tilesets/secondary/department_store/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/6.pal
+++ b/data/tilesets/secondary/department_store/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/7.pal b/data/tilesets/secondary/department_store/palettes/7.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/7.pal
+++ b/data/tilesets/secondary/department_store/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/8.pal b/data/tilesets/secondary/department_store/palettes/8.pal
index 18480092b..18480092b 100644
--- a/data/tilesets/secondary/82D4C74/palettes/8.pal
+++ b/data/tilesets/secondary/department_store/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/9.pal b/data/tilesets/secondary/department_store/palettes/9.pal
index dd18b9d07..dd18b9d07 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/9.pal
+++ b/data/tilesets/secondary/department_store/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E6C/tiles.png b/data/tilesets/secondary/department_store/tiles.png
index 421932118..421932118 100644
--- a/data/tilesets/secondary/82D4E6C/tiles.png
+++ b/data/tilesets/secondary/department_store/tiles.png
diff --git a/data/tilesets/secondary/82D4E0C/metatile_attributes.bin b/data/tilesets/secondary/digletts_cave/metatile_attributes.bin
index 2b24a5266..2b24a5266 100644
--- a/data/tilesets/secondary/82D4E0C/metatile_attributes.bin
+++ b/data/tilesets/secondary/digletts_cave/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E0C/metatiles.bin b/data/tilesets/secondary/digletts_cave/metatiles.bin
index 37ef8fe34..37ef8fe34 100644
--- a/data/tilesets/secondary/82D4E0C/metatiles.bin
+++ b/data/tilesets/secondary/digletts_cave/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E54/palettes/0.pal b/data/tilesets/secondary/digletts_cave/palettes/0.pal
index a3fab1c2f..a3fab1c2f 100644
--- a/data/tilesets/secondary/82D4E54/palettes/0.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/1.pal b/data/tilesets/secondary/digletts_cave/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/1.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/10.pal b/data/tilesets/secondary/digletts_cave/palettes/10.pal
index 5ccabc5a0..5ccabc5a0 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/10.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/11.pal b/data/tilesets/secondary/digletts_cave/palettes/11.pal
index fa0038726..fa0038726 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/11.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/12.pal b/data/tilesets/secondary/digletts_cave/palettes/12.pal
index c19d59bd0..c19d59bd0 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/12.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/13.pal b/data/tilesets/secondary/digletts_cave/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/13.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/14.pal b/data/tilesets/secondary/digletts_cave/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/14.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/15.pal b/data/tilesets/secondary/digletts_cave/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/15.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/2.pal b/data/tilesets/secondary/digletts_cave/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/2.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/3.pal b/data/tilesets/secondary/digletts_cave/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/3.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/4.pal b/data/tilesets/secondary/digletts_cave/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/4.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/5.pal b/data/tilesets/secondary/digletts_cave/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/5.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/6.pal b/data/tilesets/secondary/digletts_cave/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/6.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/7.pal b/data/tilesets/secondary/digletts_cave/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/7.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/8.pal b/data/tilesets/secondary/digletts_cave/palettes/8.pal
index 74cbc54c6..74cbc54c6 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/8.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/9.pal b/data/tilesets/secondary/digletts_cave/palettes/9.pal
index def7acffc..def7acffc 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/9.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E0C/tiles.png b/data/tilesets/secondary/digletts_cave/tiles.png
index 77b767b79..77b767b79 100644
--- a/data/tilesets/secondary/82D4E0C/tiles.png
+++ b/data/tilesets/secondary/digletts_cave/tiles.png
diff --git a/data/tilesets/secondary/82D4C14/metatile_attributes.bin b/data/tilesets/secondary/dummy1/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4C14/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy1/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C14/metatiles.bin b/data/tilesets/secondary/dummy1/metatiles.bin
index 274da22a6..274da22a6 100644
--- a/data/tilesets/secondary/82D4C14/metatiles.bin
+++ b/data/tilesets/secondary/dummy1/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C44/palettes/0.pal b/data/tilesets/secondary/dummy1/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/0.pal
+++ b/data/tilesets/secondary/dummy1/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/1.pal b/data/tilesets/secondary/dummy1/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/1.pal
+++ b/data/tilesets/secondary/dummy1/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/10.pal b/data/tilesets/secondary/dummy1/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/10.pal
+++ b/data/tilesets/secondary/dummy1/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/11.pal b/data/tilesets/secondary/dummy1/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/11.pal
+++ b/data/tilesets/secondary/dummy1/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/12.pal b/data/tilesets/secondary/dummy1/palettes/12.pal
index 97d3f20bd..97d3f20bd 100644
--- a/data/tilesets/secondary/82D4C14/palettes/12.pal
+++ b/data/tilesets/secondary/dummy1/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/13.pal b/data/tilesets/secondary/dummy1/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/13.pal
+++ b/data/tilesets/secondary/dummy1/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/14.pal b/data/tilesets/secondary/dummy1/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/14.pal
+++ b/data/tilesets/secondary/dummy1/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/15.pal b/data/tilesets/secondary/dummy1/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/15.pal
+++ b/data/tilesets/secondary/dummy1/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/2.pal b/data/tilesets/secondary/dummy1/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/2.pal
+++ b/data/tilesets/secondary/dummy1/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/3.pal b/data/tilesets/secondary/dummy1/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/3.pal
+++ b/data/tilesets/secondary/dummy1/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/4.pal b/data/tilesets/secondary/dummy1/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/4.pal
+++ b/data/tilesets/secondary/dummy1/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/5.pal b/data/tilesets/secondary/dummy1/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/5.pal
+++ b/data/tilesets/secondary/dummy1/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/6.pal b/data/tilesets/secondary/dummy1/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/6.pal
+++ b/data/tilesets/secondary/dummy1/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/7.pal b/data/tilesets/secondary/dummy1/palettes/7.pal
index 4172436d0..4172436d0 100644
--- a/data/tilesets/secondary/82D4C14/palettes/7.pal
+++ b/data/tilesets/secondary/dummy1/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/8.pal b/data/tilesets/secondary/dummy1/palettes/8.pal
index 7fd087b3b..7fd087b3b 100644
--- a/data/tilesets/secondary/82D4C14/palettes/8.pal
+++ b/data/tilesets/secondary/dummy1/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/9.pal b/data/tilesets/secondary/dummy1/palettes/9.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/9.pal
+++ b/data/tilesets/secondary/dummy1/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C14/tiles.png b/data/tilesets/secondary/dummy1/tiles.png
index d4b21f3e4..d4b21f3e4 100644
--- a/data/tilesets/secondary/82D4C14/tiles.png
+++ b/data/tilesets/secondary/dummy1/tiles.png
diff --git a/data/tilesets/secondary/82D4DAC/metatile_attributes.bin b/data/tilesets/secondary/dummy2/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4DAC/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy2/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DAC/metatiles.bin b/data/tilesets/secondary/dummy2/metatiles.bin
index c15edf653..c15edf653 100644
--- a/data/tilesets/secondary/82D4DAC/metatiles.bin
+++ b/data/tilesets/secondary/dummy2/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DAC/palettes/0.pal b/data/tilesets/secondary/dummy2/palettes/0.pal
index 0fd74602e..0fd74602e 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/0.pal
+++ b/data/tilesets/secondary/dummy2/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/1.pal b/data/tilesets/secondary/dummy2/palettes/1.pal
index 3c6e40c2e..3c6e40c2e 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/1.pal
+++ b/data/tilesets/secondary/dummy2/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/10.pal b/data/tilesets/secondary/dummy2/palettes/10.pal
index cd86ca4ae..cd86ca4ae 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/10.pal
+++ b/data/tilesets/secondary/dummy2/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/11.pal b/data/tilesets/secondary/dummy2/palettes/11.pal
index ec8e2f42d..ec8e2f42d 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/11.pal
+++ b/data/tilesets/secondary/dummy2/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/12.pal b/data/tilesets/secondary/dummy2/palettes/12.pal
index 5caa038ad..5caa038ad 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/12.pal
+++ b/data/tilesets/secondary/dummy2/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/13.pal b/data/tilesets/secondary/dummy2/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/13.pal
+++ b/data/tilesets/secondary/dummy2/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/14.pal b/data/tilesets/secondary/dummy2/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/14.pal
+++ b/data/tilesets/secondary/dummy2/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/15.pal b/data/tilesets/secondary/dummy2/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/15.pal
+++ b/data/tilesets/secondary/dummy2/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/2.pal b/data/tilesets/secondary/dummy2/palettes/2.pal
index 4c41030f6..4c41030f6 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/2.pal
+++ b/data/tilesets/secondary/dummy2/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/3.pal b/data/tilesets/secondary/dummy2/palettes/3.pal
index 5665ddc22..5665ddc22 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/3.pal
+++ b/data/tilesets/secondary/dummy2/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/4.pal b/data/tilesets/secondary/dummy2/palettes/4.pal
index d8051b7ba..d8051b7ba 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/4.pal
+++ b/data/tilesets/secondary/dummy2/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/5.pal b/data/tilesets/secondary/dummy2/palettes/5.pal
index 4e684594c..4e684594c 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/5.pal
+++ b/data/tilesets/secondary/dummy2/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/6.pal b/data/tilesets/secondary/dummy2/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/6.pal
+++ b/data/tilesets/secondary/dummy2/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/7.pal b/data/tilesets/secondary/dummy2/palettes/7.pal
index 2064b3bd2..2064b3bd2 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/7.pal
+++ b/data/tilesets/secondary/dummy2/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/8.pal b/data/tilesets/secondary/dummy2/palettes/8.pal
index 42a3483c0..42a3483c0 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/8.pal
+++ b/data/tilesets/secondary/dummy2/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/9.pal b/data/tilesets/secondary/dummy2/palettes/9.pal
index b06dfbda7..b06dfbda7 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/9.pal
+++ b/data/tilesets/secondary/dummy2/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DAC/tiles.png b/data/tilesets/secondary/dummy2/tiles.png
index c00ba0d61..c00ba0d61 100644
--- a/data/tilesets/secondary/82D4DAC/tiles.png
+++ b/data/tilesets/secondary/dummy2/tiles.png
diff --git a/data/tilesets/secondary/82D4FBC/metatile_attributes.bin b/data/tilesets/secondary/dummy3/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4FBC/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy3/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FBC/metatiles.bin b/data/tilesets/secondary/dummy3/metatiles.bin
index 274da22a6..274da22a6 100644
--- a/data/tilesets/secondary/82D4FBC/metatiles.bin
+++ b/data/tilesets/secondary/dummy3/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B0C/palettes/0.pal b/data/tilesets/secondary/dummy3/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/0.pal
+++ b/data/tilesets/secondary/dummy3/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/1.pal b/data/tilesets/secondary/dummy3/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/1.pal
+++ b/data/tilesets/secondary/dummy3/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/10.pal b/data/tilesets/secondary/dummy3/palettes/10.pal
index 937405d15..937405d15 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/10.pal
+++ b/data/tilesets/secondary/dummy3/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/11.pal b/data/tilesets/secondary/dummy3/palettes/11.pal
index bb4f4867c..bb4f4867c 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/11.pal
+++ b/data/tilesets/secondary/dummy3/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/12.pal b/data/tilesets/secondary/dummy3/palettes/12.pal
index 583384664..583384664 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/12.pal
+++ b/data/tilesets/secondary/dummy3/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/13.pal b/data/tilesets/secondary/dummy3/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/13.pal
+++ b/data/tilesets/secondary/dummy3/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/14.pal b/data/tilesets/secondary/dummy3/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/14.pal
+++ b/data/tilesets/secondary/dummy3/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/15.pal b/data/tilesets/secondary/dummy3/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/15.pal
+++ b/data/tilesets/secondary/dummy3/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/2.pal b/data/tilesets/secondary/dummy3/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/2.pal
+++ b/data/tilesets/secondary/dummy3/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/3.pal b/data/tilesets/secondary/dummy3/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/3.pal
+++ b/data/tilesets/secondary/dummy3/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/4.pal b/data/tilesets/secondary/dummy3/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/4.pal
+++ b/data/tilesets/secondary/dummy3/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/5.pal b/data/tilesets/secondary/dummy3/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/5.pal
+++ b/data/tilesets/secondary/dummy3/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/6.pal b/data/tilesets/secondary/dummy3/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E24/palettes/6.pal
+++ b/data/tilesets/secondary/dummy3/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/7.pal b/data/tilesets/secondary/dummy3/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/7.pal
+++ b/data/tilesets/secondary/dummy3/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/8.pal b/data/tilesets/secondary/dummy3/palettes/8.pal
index 6774e407f..6774e407f 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/8.pal
+++ b/data/tilesets/secondary/dummy3/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/9.pal b/data/tilesets/secondary/dummy3/palettes/9.pal
index 3795f6c6a..3795f6c6a 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/9.pal
+++ b/data/tilesets/secondary/dummy3/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FBC/tiles.png b/data/tilesets/secondary/dummy3/tiles.png
index b2d960c60..b2d960c60 100644
--- a/data/tilesets/secondary/82D4FBC/tiles.png
+++ b/data/tilesets/secondary/dummy3/tiles.png
diff --git a/data/tilesets/secondary/82D4FD4/metatile_attributes.bin b/data/tilesets/secondary/dummy4/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4FD4/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FD4/metatiles.bin b/data/tilesets/secondary/dummy4/metatiles.bin
index 8f740f6af..8f740f6af 100644
--- a/data/tilesets/secondary/82D4FD4/metatiles.bin
+++ b/data/tilesets/secondary/dummy4/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B24/palettes/0.pal b/data/tilesets/secondary/dummy4/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4B24/palettes/0.pal
+++ b/data/tilesets/secondary/dummy4/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/1.pal b/data/tilesets/secondary/dummy4/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4E24/palettes/1.pal
+++ b/data/tilesets/secondary/dummy4/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/10.pal b/data/tilesets/secondary/dummy4/palettes/10.pal
index 937405d15..937405d15 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/10.pal
+++ b/data/tilesets/secondary/dummy4/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/11.pal b/data/tilesets/secondary/dummy4/palettes/11.pal
index bb4f4867c..bb4f4867c 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/11.pal
+++ b/data/tilesets/secondary/dummy4/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/12.pal b/data/tilesets/secondary/dummy4/palettes/12.pal
index 583384664..583384664 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/12.pal
+++ b/data/tilesets/secondary/dummy4/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/13.pal b/data/tilesets/secondary/dummy4/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/13.pal
+++ b/data/tilesets/secondary/dummy4/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/14.pal b/data/tilesets/secondary/dummy4/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/14.pal
+++ b/data/tilesets/secondary/dummy4/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/15.pal b/data/tilesets/secondary/dummy4/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D04/palettes/15.pal
+++ b/data/tilesets/secondary/dummy4/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/2.pal b/data/tilesets/secondary/dummy4/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/2.pal
+++ b/data/tilesets/secondary/dummy4/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/3.pal b/data/tilesets/secondary/dummy4/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/3.pal
+++ b/data/tilesets/secondary/dummy4/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/4.pal b/data/tilesets/secondary/dummy4/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/4.pal
+++ b/data/tilesets/secondary/dummy4/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/5.pal b/data/tilesets/secondary/dummy4/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/5.pal
+++ b/data/tilesets/secondary/dummy4/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/6.pal b/data/tilesets/secondary/dummy4/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E54/palettes/6.pal
+++ b/data/tilesets/secondary/dummy4/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/7.pal b/data/tilesets/secondary/dummy4/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E24/palettes/7.pal
+++ b/data/tilesets/secondary/dummy4/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/8.pal b/data/tilesets/secondary/dummy4/palettes/8.pal
index 6774e407f..6774e407f 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/8.pal
+++ b/data/tilesets/secondary/dummy4/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/9.pal b/data/tilesets/secondary/dummy4/palettes/9.pal
index 3795f6c6a..3795f6c6a 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/9.pal
+++ b/data/tilesets/secondary/dummy4/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FD4/tiles.png b/data/tilesets/secondary/dummy4/tiles.png
index 201df80fb..201df80fb 100644
--- a/data/tilesets/secondary/82D4FD4/tiles.png
+++ b/data/tilesets/secondary/dummy4/tiles.png
diff --git a/data/tilesets/secondary/82D4F74/metatile_attributes.bin b/data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin
index 8255cca20..8255cca20 100644
--- a/data/tilesets/secondary/82D4F74/metatile_attributes.bin
+++ b/data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F74/metatiles.bin b/data/tilesets/secondary/fan_club_daycare/metatiles.bin
index 63ddd975b..63ddd975b 100644
--- a/data/tilesets/secondary/82D4F74/metatiles.bin
+++ b/data/tilesets/secondary/fan_club_daycare/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CD4/palettes/0.pal b/data/tilesets/secondary/fan_club_daycare/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/0.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/1.pal b/data/tilesets/secondary/fan_club_daycare/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/1.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/10.pal b/data/tilesets/secondary/fan_club_daycare/palettes/10.pal
index afe462f8e..afe462f8e 100644
--- a/data/tilesets/secondary/82D4F74/palettes/10.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/11.pal b/data/tilesets/secondary/fan_club_daycare/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/11.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/12.pal b/data/tilesets/secondary/fan_club_daycare/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/12.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/13.pal b/data/tilesets/secondary/fan_club_daycare/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/13.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/14.pal b/data/tilesets/secondary/fan_club_daycare/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/14.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/15.pal b/data/tilesets/secondary/fan_club_daycare/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/15.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/2.pal b/data/tilesets/secondary/fan_club_daycare/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/2.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/3.pal b/data/tilesets/secondary/fan_club_daycare/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/3.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/4.pal b/data/tilesets/secondary/fan_club_daycare/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/4.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/5.pal b/data/tilesets/secondary/fan_club_daycare/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/5.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/6.pal b/data/tilesets/secondary/fan_club_daycare/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/6.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/7.pal b/data/tilesets/secondary/fan_club_daycare/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/7.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/8.pal b/data/tilesets/secondary/fan_club_daycare/palettes/8.pal
index 4b7de8012..4b7de8012 100644
--- a/data/tilesets/secondary/82D4F74/palettes/8.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/9.pal b/data/tilesets/secondary/fan_club_daycare/palettes/9.pal
index 8fe0861de..8fe0861de 100644
--- a/data/tilesets/secondary/82D4F74/palettes/9.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F74/tiles.png b/data/tilesets/secondary/fan_club_daycare/tiles.png
index b8a2a1a4f..b8a2a1a4f 100644
--- a/data/tilesets/secondary/82D4F74/tiles.png
+++ b/data/tilesets/secondary/fan_club_daycare/tiles.png
diff --git a/data/tilesets/secondary/82D4B54/metatile_attributes.bin b/data/tilesets/secondary/fuchsia_city/metatile_attributes.bin
index 3e370a747..3e370a747 100644
--- a/data/tilesets/secondary/82D4B54/metatile_attributes.bin
+++ b/data/tilesets/secondary/fuchsia_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B54/metatiles.bin b/data/tilesets/secondary/fuchsia_city/metatiles.bin
index 0e0e722da..0e0e722da 100644
--- a/data/tilesets/secondary/82D4B54/metatiles.bin
+++ b/data/tilesets/secondary/fuchsia_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B54/palettes/0.pal b/data/tilesets/secondary/fuchsia_city/palettes/0.pal
index 5fb8bdb01..5fb8bdb01 100644
--- a/data/tilesets/secondary/82D4B54/palettes/0.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/1.pal b/data/tilesets/secondary/fuchsia_city/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/1.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/10.pal b/data/tilesets/secondary/fuchsia_city/palettes/10.pal
index d82bb0391..d82bb0391 100644
--- a/data/tilesets/secondary/82D4B54/palettes/10.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/11.pal b/data/tilesets/secondary/fuchsia_city/palettes/11.pal
index cc0cf52cf..cc0cf52cf 100644
--- a/data/tilesets/secondary/82D4B54/palettes/11.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/12.pal b/data/tilesets/secondary/fuchsia_city/palettes/12.pal
index ebcfeb596..ebcfeb596 100644
--- a/data/tilesets/secondary/82D4B54/palettes/12.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/13.pal b/data/tilesets/secondary/fuchsia_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/13.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/14.pal b/data/tilesets/secondary/fuchsia_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/14.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/15.pal b/data/tilesets/secondary/fuchsia_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/15.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/2.pal b/data/tilesets/secondary/fuchsia_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/2.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/3.pal b/data/tilesets/secondary/fuchsia_city/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D4B54/palettes/3.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/4.pal b/data/tilesets/secondary/fuchsia_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/4.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/5.pal b/data/tilesets/secondary/fuchsia_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/5.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/6.pal b/data/tilesets/secondary/fuchsia_city/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/6.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/7.pal b/data/tilesets/secondary/fuchsia_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/7.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/8.pal b/data/tilesets/secondary/fuchsia_city/palettes/8.pal
index 8a0a9a1e0..8a0a9a1e0 100644
--- a/data/tilesets/secondary/82D4B54/palettes/8.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/9.pal b/data/tilesets/secondary/fuchsia_city/palettes/9.pal
index d39bbb454..d39bbb454 100644
--- a/data/tilesets/secondary/82D4B54/palettes/9.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B54/tiles.png b/data/tilesets/secondary/fuchsia_city/tiles.png
index a9e9e13e8..a9e9e13e8 100644
--- a/data/tilesets/secondary/82D4B54/tiles.png
+++ b/data/tilesets/secondary/fuchsia_city/tiles.png
diff --git a/data/tilesets/secondary/82D4CA4/metatile_attributes.bin b/data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin
index 1b7a02c1f..1b7a02c1f 100644
--- a/data/tilesets/secondary/82D4CA4/metatile_attributes.bin
+++ b/data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CA4/metatiles.bin b/data/tilesets/secondary/fuchsia_gym/metatiles.bin
index 25e3b6297..25e3b6297 100644
--- a/data/tilesets/secondary/82D4CA4/metatiles.bin
+++ b/data/tilesets/secondary/fuchsia_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C74/palettes/0.pal b/data/tilesets/secondary/fuchsia_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4C74/palettes/0.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/1.pal b/data/tilesets/secondary/fuchsia_gym/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/1.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/10.pal b/data/tilesets/secondary/fuchsia_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/10.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/11.pal b/data/tilesets/secondary/fuchsia_gym/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/11.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/12.pal b/data/tilesets/secondary/fuchsia_gym/palettes/12.pal
index ebfedc7d5..ebfedc7d5 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/12.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/13.pal b/data/tilesets/secondary/fuchsia_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/13.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/14.pal b/data/tilesets/secondary/fuchsia_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/14.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/15.pal b/data/tilesets/secondary/fuchsia_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/15.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/2.pal b/data/tilesets/secondary/fuchsia_gym/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/2.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/3.pal b/data/tilesets/secondary/fuchsia_gym/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/3.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/4.pal b/data/tilesets/secondary/fuchsia_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C74/palettes/4.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/5.pal b/data/tilesets/secondary/fuchsia_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C74/palettes/5.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/6.pal b/data/tilesets/secondary/fuchsia_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/6.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/7.pal b/data/tilesets/secondary/fuchsia_gym/palettes/7.pal
index 9020b628f..9020b628f 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/7.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/8.pal b/data/tilesets/secondary/fuchsia_gym/palettes/8.pal
index 1873ad439..1873ad439 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/8.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/9.pal b/data/tilesets/secondary/fuchsia_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/9.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CA4/tiles.png b/data/tilesets/secondary/fuchsia_gym/tiles.png
index cf2fa4ff7..cf2fa4ff7 100644
--- a/data/tilesets/secondary/82D4CA4/tiles.png
+++ b/data/tilesets/secondary/fuchsia_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4CEC/metatile_attributes.bin b/data/tilesets/secondary/game_corner/metatile_attributes.bin
index a2bcd959e..a2bcd959e 100644
--- a/data/tilesets/secondary/82D4CEC/metatile_attributes.bin
+++ b/data/tilesets/secondary/game_corner/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CEC/metatiles.bin b/data/tilesets/secondary/game_corner/metatiles.bin
index 1529f8582..1529f8582 100644
--- a/data/tilesets/secondary/82D4CEC/metatiles.bin
+++ b/data/tilesets/secondary/game_corner/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CA4/palettes/0.pal b/data/tilesets/secondary/game_corner/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/0.pal
+++ b/data/tilesets/secondary/game_corner/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/1.pal b/data/tilesets/secondary/game_corner/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/1.pal
+++ b/data/tilesets/secondary/game_corner/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/10.pal b/data/tilesets/secondary/game_corner/palettes/10.pal
index 6d76050a9..6d76050a9 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/10.pal
+++ b/data/tilesets/secondary/game_corner/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/11.pal b/data/tilesets/secondary/game_corner/palettes/11.pal
index 9359b8858..9359b8858 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/11.pal
+++ b/data/tilesets/secondary/game_corner/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/12.pal b/data/tilesets/secondary/game_corner/palettes/12.pal
index 61b3764be..61b3764be 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/12.pal
+++ b/data/tilesets/secondary/game_corner/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/13.pal b/data/tilesets/secondary/game_corner/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/13.pal
+++ b/data/tilesets/secondary/game_corner/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/14.pal b/data/tilesets/secondary/game_corner/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/14.pal
+++ b/data/tilesets/secondary/game_corner/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/15.pal b/data/tilesets/secondary/game_corner/palettes/15.pal
index 3bb14e445..3bb14e445 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/15.pal
+++ b/data/tilesets/secondary/game_corner/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/2.pal b/data/tilesets/secondary/game_corner/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/2.pal
+++ b/data/tilesets/secondary/game_corner/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/3.pal b/data/tilesets/secondary/game_corner/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/3.pal
+++ b/data/tilesets/secondary/game_corner/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/4.pal b/data/tilesets/secondary/game_corner/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/4.pal
+++ b/data/tilesets/secondary/game_corner/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/5.pal b/data/tilesets/secondary/game_corner/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/5.pal
+++ b/data/tilesets/secondary/game_corner/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/6.pal b/data/tilesets/secondary/game_corner/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/6.pal
+++ b/data/tilesets/secondary/game_corner/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/7.pal b/data/tilesets/secondary/game_corner/palettes/7.pal
index b3612e537..b3612e537 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/7.pal
+++ b/data/tilesets/secondary/game_corner/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/8.pal b/data/tilesets/secondary/game_corner/palettes/8.pal
index e58f94305..e58f94305 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/8.pal
+++ b/data/tilesets/secondary/game_corner/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/9.pal b/data/tilesets/secondary/game_corner/palettes/9.pal
index 75f1d81b5..75f1d81b5 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/9.pal
+++ b/data/tilesets/secondary/game_corner/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CEC/tiles.png b/data/tilesets/secondary/game_corner/tiles.png
index b5b249d0a..b5b249d0a 100644
--- a/data/tilesets/secondary/82D4CEC/tiles.png
+++ b/data/tilesets/secondary/game_corner/tiles.png
diff --git a/data/tilesets/secondary/82D4C74/metatile_attributes.bin b/data/tilesets/secondary/generic_building1/metatile_attributes.bin
index be95e451c..be95e451c 100644
--- a/data/tilesets/secondary/82D4C74/metatile_attributes.bin
+++ b/data/tilesets/secondary/generic_building1/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C74/metatiles.bin b/data/tilesets/secondary/generic_building1/metatiles.bin
index 806d040ce..806d040ce 100644
--- a/data/tilesets/secondary/82D4C74/metatiles.bin
+++ b/data/tilesets/secondary/generic_building1/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CBC/palettes/0.pal b/data/tilesets/secondary/generic_building1/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/0.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/1.pal b/data/tilesets/secondary/generic_building1/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/1.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/10.pal b/data/tilesets/secondary/generic_building1/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/10.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/11.pal b/data/tilesets/secondary/generic_building1/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/11.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/12.pal b/data/tilesets/secondary/generic_building1/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/12.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/13.pal b/data/tilesets/secondary/generic_building1/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/13.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/14.pal b/data/tilesets/secondary/generic_building1/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/14.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/15.pal b/data/tilesets/secondary/generic_building1/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/15.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/2.pal b/data/tilesets/secondary/generic_building1/palettes/2.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/82D4C74/palettes/2.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/3.pal b/data/tilesets/secondary/generic_building1/palettes/3.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/82D4C74/palettes/3.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/4.pal b/data/tilesets/secondary/generic_building1/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/4.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/5.pal b/data/tilesets/secondary/generic_building1/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/5.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/6.pal b/data/tilesets/secondary/generic_building1/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/6.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/7.pal b/data/tilesets/secondary/generic_building1/palettes/7.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/7.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/8.pal b/data/tilesets/secondary/generic_building1/palettes/8.pal
index 18480092b..18480092b 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/8.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/9.pal b/data/tilesets/secondary/generic_building1/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/9.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C74/tiles.png b/data/tilesets/secondary/generic_building1/tiles.png
index 191287197..191287197 100644
--- a/data/tilesets/secondary/82D4C74/tiles.png
+++ b/data/tilesets/secondary/generic_building1/tiles.png
diff --git a/data/tilesets/secondary/82D4E84/metatile_attributes.bin b/data/tilesets/secondary/generic_building2/metatile_attributes.bin
index 18d7517d9..18d7517d9 100644
--- a/data/tilesets/secondary/82D4E84/metatile_attributes.bin
+++ b/data/tilesets/secondary/generic_building2/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E84/metatiles.bin b/data/tilesets/secondary/generic_building2/metatiles.bin
index 0943dc7af..0943dc7af 100644
--- a/data/tilesets/secondary/82D4E84/metatiles.bin
+++ b/data/tilesets/secondary/generic_building2/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CEC/palettes/0.pal b/data/tilesets/secondary/generic_building2/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/0.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/1.pal b/data/tilesets/secondary/generic_building2/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/1.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/10.pal b/data/tilesets/secondary/generic_building2/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/10.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/11.pal b/data/tilesets/secondary/generic_building2/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/11.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/12.pal b/data/tilesets/secondary/generic_building2/palettes/12.pal
index 2903bb074..2903bb074 100644
--- a/data/tilesets/secondary/82D4E84/palettes/12.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/13.pal b/data/tilesets/secondary/generic_building2/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D04/palettes/13.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/14.pal b/data/tilesets/secondary/generic_building2/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D04/palettes/14.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/15.pal b/data/tilesets/secondary/generic_building2/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/15.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/2.pal b/data/tilesets/secondary/generic_building2/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/2.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/3.pal b/data/tilesets/secondary/generic_building2/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4D34/palettes/3.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/4.pal b/data/tilesets/secondary/generic_building2/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/4.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/5.pal b/data/tilesets/secondary/generic_building2/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/5.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/6.pal b/data/tilesets/secondary/generic_building2/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/6.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/7.pal b/data/tilesets/secondary/generic_building2/palettes/7.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/7.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/8.pal b/data/tilesets/secondary/generic_building2/palettes/8.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/8.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/9.pal b/data/tilesets/secondary/generic_building2/palettes/9.pal
index 25d5d7019..25d5d7019 100644
--- a/data/tilesets/secondary/82D4E84/palettes/9.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E84/tiles.png b/data/tilesets/secondary/generic_building2/tiles.png
index ca6e21f03..ca6e21f03 100644
--- a/data/tilesets/secondary/82D4E84/tiles.png
+++ b/data/tilesets/secondary/generic_building2/tiles.png
diff --git a/data/tilesets/secondary/82D50DC/metatile_attributes.bin b/data/tilesets/secondary/hall_of_fame/metatile_attributes.bin
index 2fa59412a..2fa59412a 100644
--- a/data/tilesets/secondary/82D50DC/metatile_attributes.bin
+++ b/data/tilesets/secondary/hall_of_fame/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D50DC/metatiles.bin b/data/tilesets/secondary/hall_of_fame/metatiles.bin
index 6f4e8a22e..6f4e8a22e 100644
--- a/data/tilesets/secondary/82D50DC/metatiles.bin
+++ b/data/tilesets/secondary/hall_of_fame/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D04/palettes/0.pal b/data/tilesets/secondary/hall_of_fame/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D4D04/palettes/0.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/1.pal b/data/tilesets/secondary/hall_of_fame/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4F14/palettes/1.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/1.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/10.pal b/data/tilesets/secondary/hall_of_fame/palettes/10.pal
index 6ea570459..6ea570459 100644
--- a/data/tilesets/secondary/82D50DC/palettes/10.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/10.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/11.pal b/data/tilesets/secondary/hall_of_fame/palettes/11.pal
index 008f150c7..008f150c7 100644
--- a/data/tilesets/secondary/82D50DC/palettes/11.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/11.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/12.pal b/data/tilesets/secondary/hall_of_fame/palettes/12.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D50DC/palettes/12.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/13.pal b/data/tilesets/secondary/hall_of_fame/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/13.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/14.pal b/data/tilesets/secondary/hall_of_fame/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/14.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/15.pal b/data/tilesets/secondary/hall_of_fame/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/15.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/2.pal b/data/tilesets/secondary/hall_of_fame/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/2.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/3.pal b/data/tilesets/secondary/hall_of_fame/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/3.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/4.pal b/data/tilesets/secondary/hall_of_fame/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/4.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/5.pal b/data/tilesets/secondary/hall_of_fame/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D5034/palettes/5.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/6.pal b/data/tilesets/secondary/hall_of_fame/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/6.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/6.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/7.pal b/data/tilesets/secondary/hall_of_fame/palettes/7.pal
index f0c97cf87..f0c97cf87 100644
--- a/data/tilesets/secondary/82D50DC/palettes/7.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/7.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/8.pal b/data/tilesets/secondary/hall_of_fame/palettes/8.pal
index 33b52bbbd..33b52bbbd 100644
--- a/data/tilesets/secondary/82D50DC/palettes/8.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/8.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/9.pal b/data/tilesets/secondary/hall_of_fame/palettes/9.pal
index 3a2cf3b7a..3a2cf3b7a 100644
--- a/data/tilesets/secondary/82D50DC/palettes/9.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/9.pal
diff --git a/data/tilesets/secondary/82D50DC/tiles.png b/data/tilesets/secondary/hall_of_fame/tiles.png
index f5ab3a9cb..f5ab3a9cb 100644
--- a/data/tilesets/secondary/82D50DC/tiles.png
+++ b/data/tilesets/secondary/hall_of_fame/tiles.png
diff --git a/data/tilesets/secondary/82D4CD4/metatile_attributes.bin b/data/tilesets/secondary/hoenn_building/metatile_attributes.bin
index 6c4ffed21..6c4ffed21 100644
--- a/data/tilesets/secondary/82D4CD4/metatile_attributes.bin
+++ b/data/tilesets/secondary/hoenn_building/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CD4/metatiles.bin b/data/tilesets/secondary/hoenn_building/metatiles.bin
index af8effb11..af8effb11 100644
--- a/data/tilesets/secondary/82D4CD4/metatiles.bin
+++ b/data/tilesets/secondary/hoenn_building/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F2C/palettes/0.pal b/data/tilesets/secondary/hoenn_building/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/0.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/1.pal b/data/tilesets/secondary/hoenn_building/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/1.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/10.pal b/data/tilesets/secondary/hoenn_building/palettes/10.pal
index 432f42149..432f42149 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/10.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/11.pal b/data/tilesets/secondary/hoenn_building/palettes/11.pal
index 8c2460403..8c2460403 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/11.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/12.pal b/data/tilesets/secondary/hoenn_building/palettes/12.pal
index 920ad12c9..920ad12c9 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/12.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/13.pal b/data/tilesets/secondary/hoenn_building/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/13.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/14.pal b/data/tilesets/secondary/hoenn_building/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/14.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/15.pal b/data/tilesets/secondary/hoenn_building/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/15.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/2.pal b/data/tilesets/secondary/hoenn_building/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/2.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/3.pal b/data/tilesets/secondary/hoenn_building/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/3.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/4.pal b/data/tilesets/secondary/hoenn_building/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/4.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/5.pal b/data/tilesets/secondary/hoenn_building/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/5.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/6.pal b/data/tilesets/secondary/hoenn_building/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/6.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/7.pal b/data/tilesets/secondary/hoenn_building/palettes/7.pal
index 533778712..533778712 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/7.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/8.pal b/data/tilesets/secondary/hoenn_building/palettes/8.pal
index 0b01f1a0f..0b01f1a0f 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/8.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/9.pal b/data/tilesets/secondary/hoenn_building/palettes/9.pal
index 371e5a211..371e5a211 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/9.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CD4/tiles.png b/data/tilesets/secondary/hoenn_building/tiles.png
index ef8a943fa..ef8a943fa 100644
--- a/data/tilesets/secondary/82D4CD4/tiles.png
+++ b/data/tilesets/secondary/hoenn_building/tiles.png
diff --git a/data/tilesets/secondary/82D4B84/metatile_attributes.bin b/data/tilesets/secondary/indigo_plateau/metatile_attributes.bin
index f840f6486..f840f6486 100644
--- a/data/tilesets/secondary/82D4B84/metatile_attributes.bin
+++ b/data/tilesets/secondary/indigo_plateau/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B84/metatiles.bin b/data/tilesets/secondary/indigo_plateau/metatiles.bin
index bbb7ffbee..bbb7ffbee 100644
--- a/data/tilesets/secondary/82D4B84/metatiles.bin
+++ b/data/tilesets/secondary/indigo_plateau/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B84/palettes/0.pal b/data/tilesets/secondary/indigo_plateau/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4B84/palettes/0.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/1.pal b/data/tilesets/secondary/indigo_plateau/palettes/1.pal
index cf1123812..cf1123812 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/1.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/10.pal b/data/tilesets/secondary/indigo_plateau/palettes/10.pal
index 70ed40322..70ed40322 100644
--- a/data/tilesets/secondary/82D4B84/palettes/10.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/11.pal b/data/tilesets/secondary/indigo_plateau/palettes/11.pal
index 7b47acf60..7b47acf60 100644
--- a/data/tilesets/secondary/82D4B84/palettes/11.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/12.pal b/data/tilesets/secondary/indigo_plateau/palettes/12.pal
index f5ff3dddf..f5ff3dddf 100644
--- a/data/tilesets/secondary/82D4B84/palettes/12.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/13.pal b/data/tilesets/secondary/indigo_plateau/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/13.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/14.pal b/data/tilesets/secondary/indigo_plateau/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/14.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/15.pal b/data/tilesets/secondary/indigo_plateau/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/15.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/2.pal b/data/tilesets/secondary/indigo_plateau/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/2.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/3.pal b/data/tilesets/secondary/indigo_plateau/palettes/3.pal
index 5a5e60211..5a5e60211 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/3.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/4.pal b/data/tilesets/secondary/indigo_plateau/palettes/4.pal
index 229f9132c..229f9132c 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/4.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/5.pal b/data/tilesets/secondary/indigo_plateau/palettes/5.pal
index 215dd1272..215dd1272 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/5.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/6.pal b/data/tilesets/secondary/indigo_plateau/palettes/6.pal
index 7e7862a19..7e7862a19 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/6.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/7.pal b/data/tilesets/secondary/indigo_plateau/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/7.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/8.pal b/data/tilesets/secondary/indigo_plateau/palettes/8.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4B84/palettes/8.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/9.pal b/data/tilesets/secondary/indigo_plateau/palettes/9.pal
index 3ff6139ac..3ff6139ac 100644
--- a/data/tilesets/secondary/82D4B84/palettes/9.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B84/tiles.png b/data/tilesets/secondary/indigo_plateau/tiles.png
index 4a938b4c5..4a938b4c5 100644
--- a/data/tilesets/secondary/82D4B84/tiles.png
+++ b/data/tilesets/secondary/indigo_plateau/tiles.png
diff --git a/data/tilesets/secondary/82D50AC/metatile_attributes.bin b/data/tilesets/secondary/island_harbor/metatile_attributes.bin
index 9dd5f613d..9dd5f613d 100644
--- a/data/tilesets/secondary/82D50AC/metatile_attributes.bin
+++ b/data/tilesets/secondary/island_harbor/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D50AC/metatiles.bin b/data/tilesets/secondary/island_harbor/metatiles.bin
index d5916a2cf..d5916a2cf 100644
--- a/data/tilesets/secondary/82D50AC/metatiles.bin
+++ b/data/tilesets/secondary/island_harbor/metatiles.bin
diff --git a/data/tilesets/secondary/82D4BFC/palettes/0.pal b/data/tilesets/secondary/island_harbor/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/0.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/0.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/1.pal b/data/tilesets/secondary/island_harbor/palettes/1.pal
index 22eb1667c..22eb1667c 100644
--- a/data/tilesets/secondary/82D50AC/palettes/1.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/1.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/10.pal b/data/tilesets/secondary/island_harbor/palettes/10.pal
index 3c091df8b..3c091df8b 100644
--- a/data/tilesets/secondary/82D50AC/palettes/10.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/10.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/11.pal b/data/tilesets/secondary/island_harbor/palettes/11.pal
index c42eeb7e1..c42eeb7e1 100644
--- a/data/tilesets/secondary/82D50AC/palettes/11.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/12.pal b/data/tilesets/secondary/island_harbor/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D5004/palettes/12.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/12.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/13.pal b/data/tilesets/secondary/island_harbor/palettes/13.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D50AC/palettes/13.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/14.pal b/data/tilesets/secondary/island_harbor/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D64/palettes/14.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/15.pal b/data/tilesets/secondary/island_harbor/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/15.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/2.pal b/data/tilesets/secondary/island_harbor/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/2.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/3.pal b/data/tilesets/secondary/island_harbor/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4E24/palettes/3.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/4.pal b/data/tilesets/secondary/island_harbor/palettes/4.pal
index 5871a448c..5871a448c 100644
--- a/data/tilesets/secondary/82D4B24/palettes/4.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/5.pal b/data/tilesets/secondary/island_harbor/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4E24/palettes/5.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/6.pal b/data/tilesets/secondary/island_harbor/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/6.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/7.pal b/data/tilesets/secondary/island_harbor/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D5004/palettes/7.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/7.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/8.pal b/data/tilesets/secondary/island_harbor/palettes/8.pal
index 5c1251024..5c1251024 100644
--- a/data/tilesets/secondary/82D50AC/palettes/8.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/8.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/9.pal b/data/tilesets/secondary/island_harbor/palettes/9.pal
index c25501332..c25501332 100644
--- a/data/tilesets/secondary/82D50AC/palettes/9.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/9.pal
diff --git a/data/tilesets/secondary/82D50AC/tiles.png b/data/tilesets/secondary/island_harbor/tiles.png
index 166ae2e18..166ae2e18 100644
--- a/data/tilesets/secondary/82D50AC/tiles.png
+++ b/data/tilesets/secondary/island_harbor/tiles.png
diff --git a/data/tilesets/secondary/82D4C8C/metatile_attributes.bin b/data/tilesets/secondary/lab/metatile_attributes.bin
index 0d685881c..0d685881c 100644
--- a/data/tilesets/secondary/82D4C8C/metatile_attributes.bin
+++ b/data/tilesets/secondary/lab/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C8C/metatiles.bin b/data/tilesets/secondary/lab/metatiles.bin
index a7833446f..a7833446f 100644
--- a/data/tilesets/secondary/82D4C8C/metatiles.bin
+++ b/data/tilesets/secondary/lab/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C8C/palettes/0.pal b/data/tilesets/secondary/lab/palettes/0.pal
index 9fc16da3b..9fc16da3b 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/0.pal
+++ b/data/tilesets/secondary/lab/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/1.pal b/data/tilesets/secondary/lab/palettes/1.pal
index 76403e6d6..76403e6d6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/1.pal
+++ b/data/tilesets/secondary/lab/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/10.pal b/data/tilesets/secondary/lab/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/10.pal
+++ b/data/tilesets/secondary/lab/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/11.pal b/data/tilesets/secondary/lab/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/11.pal
+++ b/data/tilesets/secondary/lab/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/12.pal b/data/tilesets/secondary/lab/palettes/12.pal
index 3c32c9fd4..3c32c9fd4 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/12.pal
+++ b/data/tilesets/secondary/lab/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/13.pal b/data/tilesets/secondary/lab/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D64/palettes/13.pal
+++ b/data/tilesets/secondary/lab/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/14.pal b/data/tilesets/secondary/lab/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/14.pal
+++ b/data/tilesets/secondary/lab/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/15.pal b/data/tilesets/secondary/lab/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/15.pal
+++ b/data/tilesets/secondary/lab/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/2.pal b/data/tilesets/secondary/lab/palettes/2.pal
index b1ecd71dc..b1ecd71dc 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/2.pal
+++ b/data/tilesets/secondary/lab/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/3.pal b/data/tilesets/secondary/lab/palettes/3.pal
index 43d9b60e3..43d9b60e3 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/3.pal
+++ b/data/tilesets/secondary/lab/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/4.pal b/data/tilesets/secondary/lab/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/4.pal
+++ b/data/tilesets/secondary/lab/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/5.pal b/data/tilesets/secondary/lab/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/5.pal
+++ b/data/tilesets/secondary/lab/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/6.pal b/data/tilesets/secondary/lab/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/6.pal
+++ b/data/tilesets/secondary/lab/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/7.pal b/data/tilesets/secondary/lab/palettes/7.pal
index 3d7f8bd89..3d7f8bd89 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/7.pal
+++ b/data/tilesets/secondary/lab/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/8.pal b/data/tilesets/secondary/lab/palettes/8.pal
index 7fce49d06..7fce49d06 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/8.pal
+++ b/data/tilesets/secondary/lab/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/9.pal b/data/tilesets/secondary/lab/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/9.pal
+++ b/data/tilesets/secondary/lab/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C8C/tiles.png b/data/tilesets/secondary/lab/tiles.png
index 6caeac8a8..6caeac8a8 100644
--- a/data/tilesets/secondary/82D4C8C/tiles.png
+++ b/data/tilesets/secondary/lab/tiles.png
diff --git a/data/tilesets/secondary/82D4B0C/metatile_attributes.bin b/data/tilesets/secondary/lavender_town/metatile_attributes.bin
index d103d7155..d103d7155 100644
--- a/data/tilesets/secondary/82D4B0C/metatile_attributes.bin
+++ b/data/tilesets/secondary/lavender_town/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B0C/metatiles.bin b/data/tilesets/secondary/lavender_town/metatiles.bin
index f69885645..f69885645 100644
--- a/data/tilesets/secondary/82D4B0C/metatiles.bin
+++ b/data/tilesets/secondary/lavender_town/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DF4/palettes/0.pal b/data/tilesets/secondary/lavender_town/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/0.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/1.pal b/data/tilesets/secondary/lavender_town/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4E54/palettes/1.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/10.pal b/data/tilesets/secondary/lavender_town/palettes/10.pal
index b97e9df4b..b97e9df4b 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/10.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/11.pal b/data/tilesets/secondary/lavender_town/palettes/11.pal
index f71181976..f71181976 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/11.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/12.pal b/data/tilesets/secondary/lavender_town/palettes/12.pal
index 0cdcab8c2..0cdcab8c2 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/12.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/13.pal b/data/tilesets/secondary/lavender_town/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/13.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/14.pal b/data/tilesets/secondary/lavender_town/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/14.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/15.pal b/data/tilesets/secondary/lavender_town/palettes/15.pal
index 3973e491a..3973e491a 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/15.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/2.pal b/data/tilesets/secondary/lavender_town/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4E24/palettes/2.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/3.pal b/data/tilesets/secondary/lavender_town/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4E54/palettes/3.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/4.pal b/data/tilesets/secondary/lavender_town/palettes/4.pal
index 07dcd957c..07dcd957c 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/4.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/5.pal b/data/tilesets/secondary/lavender_town/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4E54/palettes/5.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/6.pal b/data/tilesets/secondary/lavender_town/palettes/6.pal
index 0dba59a72..0dba59a72 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/6.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/7.pal b/data/tilesets/secondary/lavender_town/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/7.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/8.pal b/data/tilesets/secondary/lavender_town/palettes/8.pal
index 376749664..376749664 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/8.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/9.pal b/data/tilesets/secondary/lavender_town/palettes/9.pal
index 82b469a66..82b469a66 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/9.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B0C/tiles.png b/data/tilesets/secondary/lavender_town/tiles.png
index 66bd81f8b..66bd81f8b 100644
--- a/data/tilesets/secondary/82D4B0C/tiles.png
+++ b/data/tilesets/secondary/lavender_town/tiles.png
diff --git a/data/tilesets/secondary/82D4BCC/metatile_attributes.bin b/data/tilesets/secondary/mart/metatile_attributes.bin
index 31fdb5cc0..31fdb5cc0 100644
--- a/data/tilesets/secondary/82D4BCC/metatile_attributes.bin
+++ b/data/tilesets/secondary/mart/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4BCC/metatiles.bin b/data/tilesets/secondary/mart/metatiles.bin
index 1c00836c1..1c00836c1 100644
--- a/data/tilesets/secondary/82D4BCC/metatiles.bin
+++ b/data/tilesets/secondary/mart/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D34/palettes/0.pal b/data/tilesets/secondary/mart/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D34/palettes/0.pal
+++ b/data/tilesets/secondary/mart/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/1.pal b/data/tilesets/secondary/mart/palettes/1.pal
index 3a16a45c7..3a16a45c7 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/1.pal
+++ b/data/tilesets/secondary/mart/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/10.pal b/data/tilesets/secondary/mart/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D34/palettes/10.pal
+++ b/data/tilesets/secondary/mart/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/11.pal b/data/tilesets/secondary/mart/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/11.pal
+++ b/data/tilesets/secondary/mart/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/12.pal b/data/tilesets/secondary/mart/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/12.pal
+++ b/data/tilesets/secondary/mart/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/13.pal b/data/tilesets/secondary/mart/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/13.pal
+++ b/data/tilesets/secondary/mart/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/14.pal b/data/tilesets/secondary/mart/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/14.pal
+++ b/data/tilesets/secondary/mart/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/15.pal b/data/tilesets/secondary/mart/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/15.pal
+++ b/data/tilesets/secondary/mart/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/2.pal b/data/tilesets/secondary/mart/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4D34/palettes/2.pal
+++ b/data/tilesets/secondary/mart/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/3.pal b/data/tilesets/secondary/mart/palettes/3.pal
index e1b56cd57..e1b56cd57 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/3.pal
+++ b/data/tilesets/secondary/mart/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/4.pal b/data/tilesets/secondary/mart/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D34/palettes/4.pal
+++ b/data/tilesets/secondary/mart/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/5.pal b/data/tilesets/secondary/mart/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D34/palettes/5.pal
+++ b/data/tilesets/secondary/mart/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/6.pal b/data/tilesets/secondary/mart/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/6.pal
+++ b/data/tilesets/secondary/mart/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/7.pal b/data/tilesets/secondary/mart/palettes/7.pal
index 0a07057ec..0a07057ec 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/7.pal
+++ b/data/tilesets/secondary/mart/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/8.pal b/data/tilesets/secondary/mart/palettes/8.pal
index 06fcc911b..06fcc911b 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/8.pal
+++ b/data/tilesets/secondary/mart/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/9.pal b/data/tilesets/secondary/mart/palettes/9.pal
index ea018609b..ea018609b 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/9.pal
+++ b/data/tilesets/secondary/mart/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4BCC/tiles.png b/data/tilesets/secondary/mart/tiles.png
index 2bfeb4080..2bfeb4080 100644
--- a/data/tilesets/secondary/82D4BCC/tiles.png
+++ b/data/tilesets/secondary/mart/tiles.png
diff --git a/data/tilesets/secondary/82D4FEC/metatile_attributes.bin b/data/tilesets/secondary/mt_ember/metatile_attributes.bin
index 45432b773..45432b773 100644
--- a/data/tilesets/secondary/82D4FEC/metatile_attributes.bin
+++ b/data/tilesets/secondary/mt_ember/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FEC/metatiles.bin b/data/tilesets/secondary/mt_ember/metatiles.bin
index b80796821..b80796821 100644
--- a/data/tilesets/secondary/82D4FEC/metatiles.bin
+++ b/data/tilesets/secondary/mt_ember/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FEC/palettes/0.pal b/data/tilesets/secondary/mt_ember/palettes/0.pal
index 30ff4070a..30ff4070a 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/0.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/1.pal b/data/tilesets/secondary/mt_ember/palettes/1.pal
index e15d979f1..e15d979f1 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/1.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/10.pal b/data/tilesets/secondary/mt_ember/palettes/10.pal
index fc340ed15..fc340ed15 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/10.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/11.pal b/data/tilesets/secondary/mt_ember/palettes/11.pal
index e07ce6909..e07ce6909 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/11.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/12.pal b/data/tilesets/secondary/mt_ember/palettes/12.pal
index cc53a5940..cc53a5940 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/12.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/13.pal b/data/tilesets/secondary/mt_ember/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/13.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/14.pal b/data/tilesets/secondary/mt_ember/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/14.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/15.pal b/data/tilesets/secondary/mt_ember/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E24/palettes/15.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/2.pal b/data/tilesets/secondary/mt_ember/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4B24/palettes/2.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/3.pal b/data/tilesets/secondary/mt_ember/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/3.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/4.pal b/data/tilesets/secondary/mt_ember/palettes/4.pal
index 91fdcabdf..91fdcabdf 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/4.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/5.pal b/data/tilesets/secondary/mt_ember/palettes/5.pal
index 0edb843f5..0edb843f5 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/5.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/6.pal b/data/tilesets/secondary/mt_ember/palettes/6.pal
index 32afdccbb..32afdccbb 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/6.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/7.pal b/data/tilesets/secondary/mt_ember/palettes/7.pal
index fa9d5d633..fa9d5d633 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/7.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/8.pal b/data/tilesets/secondary/mt_ember/palettes/8.pal
index f4a797b87..f4a797b87 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/8.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/9.pal b/data/tilesets/secondary/mt_ember/palettes/9.pal
index 0a2109195..0a2109195 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/9.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FEC/tiles.png b/data/tilesets/secondary/mt_ember/tiles.png
index 04d2b7b67..04d2b7b67 100644
--- a/data/tilesets/secondary/82D4FEC/tiles.png
+++ b/data/tilesets/secondary/mt_ember/tiles.png
diff --git a/data/tilesets/secondary/82D4C2C/metatile_attributes.bin b/data/tilesets/secondary/museum/metatile_attributes.bin
index 097e93ce1..097e93ce1 100644
--- a/data/tilesets/secondary/82D4C2C/metatile_attributes.bin
+++ b/data/tilesets/secondary/museum/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C2C/metatiles.bin b/data/tilesets/secondary/museum/metatiles.bin
index 993b73cbd..993b73cbd 100644
--- a/data/tilesets/secondary/82D4C2C/metatiles.bin
+++ b/data/tilesets/secondary/museum/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D4C/palettes/0.pal b/data/tilesets/secondary/museum/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/0.pal
+++ b/data/tilesets/secondary/museum/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/1.pal b/data/tilesets/secondary/museum/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/1.pal
+++ b/data/tilesets/secondary/museum/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/10.pal b/data/tilesets/secondary/museum/palettes/10.pal
index fc8da5d40..fc8da5d40 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/10.pal
+++ b/data/tilesets/secondary/museum/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/11.pal b/data/tilesets/secondary/museum/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/11.pal
+++ b/data/tilesets/secondary/museum/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/12.pal b/data/tilesets/secondary/museum/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/12.pal
+++ b/data/tilesets/secondary/museum/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/13.pal b/data/tilesets/secondary/museum/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/13.pal
+++ b/data/tilesets/secondary/museum/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/14.pal b/data/tilesets/secondary/museum/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/14.pal
+++ b/data/tilesets/secondary/museum/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/15.pal b/data/tilesets/secondary/museum/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/15.pal
+++ b/data/tilesets/secondary/museum/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/2.pal b/data/tilesets/secondary/museum/palettes/2.pal
index 330e35b02..330e35b02 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/2.pal
+++ b/data/tilesets/secondary/museum/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/3.pal b/data/tilesets/secondary/museum/palettes/3.pal
index 1520bed0b..1520bed0b 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/3.pal
+++ b/data/tilesets/secondary/museum/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/4.pal b/data/tilesets/secondary/museum/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/4.pal
+++ b/data/tilesets/secondary/museum/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/5.pal b/data/tilesets/secondary/museum/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/5.pal
+++ b/data/tilesets/secondary/museum/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/6.pal b/data/tilesets/secondary/museum/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/6.pal
+++ b/data/tilesets/secondary/museum/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/7.pal b/data/tilesets/secondary/museum/palettes/7.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/7.pal
+++ b/data/tilesets/secondary/museum/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/8.pal b/data/tilesets/secondary/museum/palettes/8.pal
index 223737ab6..223737ab6 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/8.pal
+++ b/data/tilesets/secondary/museum/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/9.pal b/data/tilesets/secondary/museum/palettes/9.pal
index 6de173f90..6de173f90 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/9.pal
+++ b/data/tilesets/secondary/museum/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C2C/tiles.png b/data/tilesets/secondary/museum/tiles.png
index 9be5ebca9..9be5ebca9 100644
--- a/data/tilesets/secondary/82D4C2C/tiles.png
+++ b/data/tilesets/secondary/museum/tiles.png
diff --git a/data/tilesets/secondary/82D501C/metatile_attributes.bin b/data/tilesets/secondary/navel_rock/metatile_attributes.bin
index 6e3d955e2..6e3d955e2 100644
--- a/data/tilesets/secondary/82D501C/metatile_attributes.bin
+++ b/data/tilesets/secondary/navel_rock/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D501C/metatiles.bin b/data/tilesets/secondary/navel_rock/metatiles.bin
index 7fdc5c55d..7fdc5c55d 100644
--- a/data/tilesets/secondary/82D501C/metatiles.bin
+++ b/data/tilesets/secondary/navel_rock/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E24/palettes/0.pal b/data/tilesets/secondary/navel_rock/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4E24/palettes/0.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/1.pal b/data/tilesets/secondary/navel_rock/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/1.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/1.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/10.pal b/data/tilesets/secondary/navel_rock/palettes/10.pal
index 334da8f23..334da8f23 100644
--- a/data/tilesets/secondary/82D501C/palettes/10.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/10.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/11.pal b/data/tilesets/secondary/navel_rock/palettes/11.pal
index 0c3d2870e..0c3d2870e 100644
--- a/data/tilesets/secondary/82D501C/palettes/11.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/11.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/12.pal b/data/tilesets/secondary/navel_rock/palettes/12.pal
index a68c94c2c..a68c94c2c 100644
--- a/data/tilesets/secondary/82D501C/palettes/12.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/13.pal b/data/tilesets/secondary/navel_rock/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/13.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/14.pal b/data/tilesets/secondary/navel_rock/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/14.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/15.pal b/data/tilesets/secondary/navel_rock/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E54/palettes/15.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/2.pal b/data/tilesets/secondary/navel_rock/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4E54/palettes/2.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/3.pal b/data/tilesets/secondary/navel_rock/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/3.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/4.pal b/data/tilesets/secondary/navel_rock/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4E24/palettes/4.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/5.pal b/data/tilesets/secondary/navel_rock/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/5.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/6.pal b/data/tilesets/secondary/navel_rock/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4F14/palettes/6.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/6.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/7.pal b/data/tilesets/secondary/navel_rock/palettes/7.pal
index 364379ad9..364379ad9 100644
--- a/data/tilesets/secondary/82D501C/palettes/7.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/7.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/8.pal b/data/tilesets/secondary/navel_rock/palettes/8.pal
index 102aaaf2c..102aaaf2c 100644
--- a/data/tilesets/secondary/82D501C/palettes/8.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/8.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/9.pal b/data/tilesets/secondary/navel_rock/palettes/9.pal
index 91329f82e..91329f82e 100644
--- a/data/tilesets/secondary/82D501C/palettes/9.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/9.pal
diff --git a/data/tilesets/secondary/82D501C/tiles.png b/data/tilesets/secondary/navel_rock/tiles.png
index cbce25763..cbce25763 100644
--- a/data/tilesets/secondary/82D501C/tiles.png
+++ b/data/tilesets/secondary/navel_rock/tiles.png
diff --git a/data/tilesets/secondary/82D4AAC/metatile_attributes.bin b/data/tilesets/secondary/pallet_town/metatile_attributes.bin
index 2ba2894bc..2ba2894bc 100644
--- a/data/tilesets/secondary/82D4AAC/metatile_attributes.bin
+++ b/data/tilesets/secondary/pallet_town/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4AAC/metatiles.bin b/data/tilesets/secondary/pallet_town/metatiles.bin
index 41db27015..41db27015 100644
--- a/data/tilesets/secondary/82D4AAC/metatiles.bin
+++ b/data/tilesets/secondary/pallet_town/metatiles.bin
diff --git a/data/tilesets/secondary/82D4AAC/palettes/0.pal b/data/tilesets/secondary/pallet_town/palettes/0.pal
index 42246e9ea..42246e9ea 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/0.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/1.pal b/data/tilesets/secondary/pallet_town/palettes/1.pal
index 28db536cb..28db536cb 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/1.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/10.pal b/data/tilesets/secondary/pallet_town/palettes/10.pal
index 1958eff11..1958eff11 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/10.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/11.pal b/data/tilesets/secondary/pallet_town/palettes/11.pal
index 896c79281..896c79281 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/11.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/12.pal b/data/tilesets/secondary/pallet_town/palettes/12.pal
index 2bfc45b6d..2bfc45b6d 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/12.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/13.pal b/data/tilesets/secondary/pallet_town/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/13.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/14.pal b/data/tilesets/secondary/pallet_town/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/14.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/15.pal b/data/tilesets/secondary/pallet_town/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/15.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/2.pal b/data/tilesets/secondary/pallet_town/palettes/2.pal
index 937cec4da..937cec4da 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/2.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/3.pal b/data/tilesets/secondary/pallet_town/palettes/3.pal
index 6d1dfb5af..6d1dfb5af 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/3.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/4.pal b/data/tilesets/secondary/pallet_town/palettes/4.pal
index cde020d4e..cde020d4e 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/4.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/5.pal b/data/tilesets/secondary/pallet_town/palettes/5.pal
index bdcc7b8ed..bdcc7b8ed 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/5.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/6.pal b/data/tilesets/secondary/pallet_town/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D64/palettes/6.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/7.pal b/data/tilesets/secondary/pallet_town/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E54/palettes/7.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/8.pal b/data/tilesets/secondary/pallet_town/palettes/8.pal
index dcecb9c40..dcecb9c40 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/8.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/9.pal b/data/tilesets/secondary/pallet_town/palettes/9.pal
index 90bb77517..90bb77517 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/9.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4AAC/tiles.png b/data/tilesets/secondary/pallet_town/tiles.png
index 771eed906..771eed906 100644
--- a/data/tilesets/secondary/82D4AAC/tiles.png
+++ b/data/tilesets/secondary/pallet_town/tiles.png
diff --git a/data/tilesets/secondary/82D4ADC/metatile_attributes.bin b/data/tilesets/secondary/pewter_city/metatile_attributes.bin
index 4e19ca185..4e19ca185 100644
--- a/data/tilesets/secondary/82D4ADC/metatile_attributes.bin
+++ b/data/tilesets/secondary/pewter_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4ADC/metatiles.bin b/data/tilesets/secondary/pewter_city/metatiles.bin
index a23224773..a23224773 100644
--- a/data/tilesets/secondary/82D4ADC/metatiles.bin
+++ b/data/tilesets/secondary/pewter_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4ADC/palettes/0.pal b/data/tilesets/secondary/pewter_city/palettes/0.pal
index 620015e77..620015e77 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/0.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/1.pal b/data/tilesets/secondary/pewter_city/palettes/1.pal
index 60de8c7ad..60de8c7ad 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/1.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/10.pal b/data/tilesets/secondary/pewter_city/palettes/10.pal
index 76fda8006..76fda8006 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/10.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/11.pal b/data/tilesets/secondary/pewter_city/palettes/11.pal
index 3f8fdc519..3f8fdc519 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/11.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/12.pal b/data/tilesets/secondary/pewter_city/palettes/12.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/12.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/13.pal b/data/tilesets/secondary/pewter_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/13.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/14.pal b/data/tilesets/secondary/pewter_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E24/palettes/14.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/15.pal b/data/tilesets/secondary/pewter_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/15.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/2.pal b/data/tilesets/secondary/pewter_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/2.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/3.pal b/data/tilesets/secondary/pewter_city/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/3.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/4.pal b/data/tilesets/secondary/pewter_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4E54/palettes/4.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/5.pal b/data/tilesets/secondary/pewter_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/5.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/6.pal b/data/tilesets/secondary/pewter_city/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/6.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/7.pal b/data/tilesets/secondary/pewter_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B54/palettes/7.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/8.pal b/data/tilesets/secondary/pewter_city/palettes/8.pal
index d404706ab..d404706ab 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/8.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/9.pal b/data/tilesets/secondary/pewter_city/palettes/9.pal
index cacf892a6..cacf892a6 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/9.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4ADC/tiles.png b/data/tilesets/secondary/pewter_city/tiles.png
index d3148ba5a..d3148ba5a 100644
--- a/data/tilesets/secondary/82D4ADC/tiles.png
+++ b/data/tilesets/secondary/pewter_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D04/metatile_attributes.bin b/data/tilesets/secondary/pewter_gym/metatile_attributes.bin
index ead3610f0..ead3610f0 100644
--- a/data/tilesets/secondary/82D4D04/metatile_attributes.bin
+++ b/data/tilesets/secondary/pewter_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D04/metatiles.bin b/data/tilesets/secondary/pewter_gym/metatiles.bin
index 7034bb6d6..7034bb6d6 100644
--- a/data/tilesets/secondary/82D4D04/metatiles.bin
+++ b/data/tilesets/secondary/pewter_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EFC/palettes/0.pal b/data/tilesets/secondary/pewter_gym/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/0.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/1.pal b/data/tilesets/secondary/pewter_gym/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/1.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/10.pal b/data/tilesets/secondary/pewter_gym/palettes/10.pal
index 131aaa71c..131aaa71c 100644
--- a/data/tilesets/secondary/82D4D04/palettes/10.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/11.pal b/data/tilesets/secondary/pewter_gym/palettes/11.pal
index 131aaa71c..131aaa71c 100644
--- a/data/tilesets/secondary/82D4D04/palettes/11.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/12.pal b/data/tilesets/secondary/pewter_gym/palettes/12.pal
index c8dfac7d2..c8dfac7d2 100644
--- a/data/tilesets/secondary/82D4D04/palettes/12.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/13.pal b/data/tilesets/secondary/pewter_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E24/palettes/13.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/14.pal b/data/tilesets/secondary/pewter_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/14.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/15.pal b/data/tilesets/secondary/pewter_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/15.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/2.pal b/data/tilesets/secondary/pewter_gym/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/2.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/3.pal b/data/tilesets/secondary/pewter_gym/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/3.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/4.pal b/data/tilesets/secondary/pewter_gym/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/4.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/5.pal b/data/tilesets/secondary/pewter_gym/palettes/5.pal
index 0eef3df8e..0eef3df8e 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/5.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/6.pal b/data/tilesets/secondary/pewter_gym/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/6.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/7.pal b/data/tilesets/secondary/pewter_gym/palettes/7.pal
index 34c0ddd17..34c0ddd17 100644
--- a/data/tilesets/secondary/82D4D04/palettes/7.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/8.pal b/data/tilesets/secondary/pewter_gym/palettes/8.pal
index 77e03a48c..77e03a48c 100644
--- a/data/tilesets/secondary/82D4D04/palettes/8.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/9.pal b/data/tilesets/secondary/pewter_gym/palettes/9.pal
index ef91ae987..ef91ae987 100644
--- a/data/tilesets/secondary/82D4D04/palettes/9.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D04/tiles.png b/data/tilesets/secondary/pewter_gym/tiles.png
index 6e97a68a1..6e97a68a1 100644
--- a/data/tilesets/secondary/82D4D04/tiles.png
+++ b/data/tilesets/secondary/pewter_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4BE4/metatile_attributes.bin b/data/tilesets/secondary/pokemon_center/metatile_attributes.bin
index f9bd3d289..f9bd3d289 100644
--- a/data/tilesets/secondary/82D4BE4/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_center/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4BE4/metatiles.bin b/data/tilesets/secondary/pokemon_center/metatiles.bin
index 2ec8817bc..2ec8817bc 100644
--- a/data/tilesets/secondary/82D4BE4/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_center/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D64/palettes/0.pal b/data/tilesets/secondary/pokemon_center/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D64/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/1.pal b/data/tilesets/secondary/pokemon_center/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4D34/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/10.pal b/data/tilesets/secondary/pokemon_center/palettes/10.pal
index 62e3e6d6b..62e3e6d6b 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/11.pal b/data/tilesets/secondary/pokemon_center/palettes/11.pal
index 7ba7bccca..7ba7bccca 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/12.pal b/data/tilesets/secondary/pokemon_center/palettes/12.pal
index 0f1f36738..0f1f36738 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/13.pal b/data/tilesets/secondary/pokemon_center/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/14.pal b/data/tilesets/secondary/pokemon_center/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E54/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/15.pal b/data/tilesets/secondary/pokemon_center/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/2.pal b/data/tilesets/secondary/pokemon_center/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/3.pal b/data/tilesets/secondary/pokemon_center/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/4.pal b/data/tilesets/secondary/pokemon_center/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D64/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/5.pal b/data/tilesets/secondary/pokemon_center/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D64/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/6.pal b/data/tilesets/secondary/pokemon_center/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/7.pal b/data/tilesets/secondary/pokemon_center/palettes/7.pal
index 27ca86ca3..27ca86ca3 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/8.pal b/data/tilesets/secondary/pokemon_center/palettes/8.pal
index 6b6a0f25f..6b6a0f25f 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/9.pal b/data/tilesets/secondary/pokemon_center/palettes/9.pal
index 4b279ecf9..4b279ecf9 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4BE4/tiles.png b/data/tilesets/secondary/pokemon_center/tiles.png
index 92d0112f3..92d0112f3 100644
--- a/data/tilesets/secondary/82D4BE4/tiles.png
+++ b/data/tilesets/secondary/pokemon_center/tiles.png
diff --git a/data/tilesets/secondary/82D50C4/metatile_attributes.bin b/data/tilesets/secondary/pokemon_league/metatile_attributes.bin
index bcc2fedb4..bcc2fedb4 100644
--- a/data/tilesets/secondary/82D50C4/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_league/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D50C4/metatiles.bin b/data/tilesets/secondary/pokemon_league/metatiles.bin
index 7cdfa846a..7cdfa846a 100644
--- a/data/tilesets/secondary/82D50C4/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_league/metatiles.bin
diff --git a/data/tilesets/secondary/82D5094/palettes/0.pal b/data/tilesets/secondary/pokemon_league/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D5094/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/0.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/1.pal b/data/tilesets/secondary/pokemon_league/palettes/1.pal
index fc945ef6c..fc945ef6c 100644
--- a/data/tilesets/secondary/82D50C4/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/1.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/10.pal b/data/tilesets/secondary/pokemon_league/palettes/10.pal
index 18908d2ef..18908d2ef 100644
--- a/data/tilesets/secondary/82D50C4/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/10.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/11.pal b/data/tilesets/secondary/pokemon_league/palettes/11.pal
index edc05893b..edc05893b 100644
--- a/data/tilesets/secondary/82D50C4/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/11.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/12.pal b/data/tilesets/secondary/pokemon_league/palettes/12.pal
index 36807053a..36807053a 100644
--- a/data/tilesets/secondary/82D50C4/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/13.pal b/data/tilesets/secondary/pokemon_league/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E54/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/14.pal b/data/tilesets/secondary/pokemon_league/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/14.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/15.pal b/data/tilesets/secondary/pokemon_league/palettes/15.pal
index 0b5e86def..0b5e86def 100644
--- a/data/tilesets/secondary/82D50C4/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/2.pal b/data/tilesets/secondary/pokemon_league/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D5034/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/3.pal b/data/tilesets/secondary/pokemon_league/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D5034/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/4.pal b/data/tilesets/secondary/pokemon_league/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D5034/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/4.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/5.pal b/data/tilesets/secondary/pokemon_league/palettes/5.pal
index 34ef2f2d2..34ef2f2d2 100644
--- a/data/tilesets/secondary/82D50C4/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/6.pal b/data/tilesets/secondary/pokemon_league/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D5034/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/6.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/7.pal b/data/tilesets/secondary/pokemon_league/palettes/7.pal
index 6528f9f75..6528f9f75 100644
--- a/data/tilesets/secondary/82D50C4/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/7.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/8.pal b/data/tilesets/secondary/pokemon_league/palettes/8.pal
index 6b56cd49e..6b56cd49e 100644
--- a/data/tilesets/secondary/82D50C4/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/8.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/9.pal b/data/tilesets/secondary/pokemon_league/palettes/9.pal
index 5c2ed43a0..5c2ed43a0 100644
--- a/data/tilesets/secondary/82D50C4/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/9.pal
diff --git a/data/tilesets/secondary/82D50C4/tiles.png b/data/tilesets/secondary/pokemon_league/tiles.png
index 0f65e1ff3..0f65e1ff3 100644
--- a/data/tilesets/secondary/82D50C4/tiles.png
+++ b/data/tilesets/secondary/pokemon_league/tiles.png
diff --git a/data/tilesets/secondary/82D4F2C/metatile_attributes.bin b/data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin
index 91b8105d3..91b8105d3 100644
--- a/data/tilesets/secondary/82D4F2C/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F2C/metatiles.bin b/data/tilesets/secondary/pokemon_mansion/metatiles.bin
index 5caba25a7..5caba25a7 100644
--- a/data/tilesets/secondary/82D4F2C/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_mansion/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F74/palettes/0.pal b/data/tilesets/secondary/pokemon_mansion/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/1.pal b/data/tilesets/secondary/pokemon_mansion/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/10.pal b/data/tilesets/secondary/pokemon_mansion/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/11.pal b/data/tilesets/secondary/pokemon_mansion/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/12.pal b/data/tilesets/secondary/pokemon_mansion/palettes/12.pal
index 9c9a571ef..9c9a571ef 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/13.pal b/data/tilesets/secondary/pokemon_mansion/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/14.pal b/data/tilesets/secondary/pokemon_mansion/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/15.pal b/data/tilesets/secondary/pokemon_mansion/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/2.pal b/data/tilesets/secondary/pokemon_mansion/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/3.pal b/data/tilesets/secondary/pokemon_mansion/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/4.pal b/data/tilesets/secondary/pokemon_mansion/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/5.pal b/data/tilesets/secondary/pokemon_mansion/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/6.pal b/data/tilesets/secondary/pokemon_mansion/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/7.pal b/data/tilesets/secondary/pokemon_mansion/palettes/7.pal
index 4d22869cd..4d22869cd 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/8.pal b/data/tilesets/secondary/pokemon_mansion/palettes/8.pal
index 2a9d791a4..2a9d791a4 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/9.pal b/data/tilesets/secondary/pokemon_mansion/palettes/9.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F2C/tiles.png b/data/tilesets/secondary/pokemon_mansion/tiles.png
index 3e69db5c3..3e69db5c3 100644
--- a/data/tilesets/secondary/82D4F2C/tiles.png
+++ b/data/tilesets/secondary/pokemon_mansion/tiles.png
diff --git a/data/tilesets/secondary/82D4EFC/metatile_attributes.bin b/data/tilesets/secondary/pokemon_tower/metatile_attributes.bin
index 8c16318f0..8c16318f0 100644
--- a/data/tilesets/secondary/82D4EFC/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_tower/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4EFC/metatiles.bin b/data/tilesets/secondary/pokemon_tower/metatiles.bin
index d4216989e..d4216989e 100644
--- a/data/tilesets/secondary/82D4EFC/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_tower/metatiles.bin
diff --git a/data/tilesets/secondary/82D50C4/palettes/0.pal b/data/tilesets/secondary/pokemon_tower/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D50C4/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/1.pal b/data/tilesets/secondary/pokemon_tower/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/10.pal b/data/tilesets/secondary/pokemon_tower/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/11.pal b/data/tilesets/secondary/pokemon_tower/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/12.pal b/data/tilesets/secondary/pokemon_tower/palettes/12.pal
index fa56f966e..fa56f966e 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/13.pal b/data/tilesets/secondary/pokemon_tower/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/14.pal b/data/tilesets/secondary/pokemon_tower/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/15.pal b/data/tilesets/secondary/pokemon_tower/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4D64/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/2.pal b/data/tilesets/secondary/pokemon_tower/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/3.pal b/data/tilesets/secondary/pokemon_tower/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/4.pal b/data/tilesets/secondary/pokemon_tower/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/5.pal b/data/tilesets/secondary/pokemon_tower/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/6.pal b/data/tilesets/secondary/pokemon_tower/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/7.pal b/data/tilesets/secondary/pokemon_tower/palettes/7.pal
index 241a2678c..241a2678c 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/8.pal b/data/tilesets/secondary/pokemon_tower/palettes/8.pal
index ebd9e912c..ebd9e912c 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/9.pal b/data/tilesets/secondary/pokemon_tower/palettes/9.pal
index 51daf6701..51daf6701 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4EFC/tiles.png b/data/tilesets/secondary/pokemon_tower/tiles.png
index b8f8c6a4d..b8f8c6a4d 100644
--- a/data/tilesets/secondary/82D4EFC/tiles.png
+++ b/data/tilesets/secondary/pokemon_tower/tiles.png
diff --git a/data/tilesets/secondary/82D4E9C/metatile_attributes.bin b/data/tilesets/secondary/power_plant/metatile_attributes.bin
index 1105056c9..1105056c9 100644
--- a/data/tilesets/secondary/82D4E9C/metatile_attributes.bin
+++ b/data/tilesets/secondary/power_plant/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E9C/metatiles.bin b/data/tilesets/secondary/power_plant/metatiles.bin
index 7d1e15676..7d1e15676 100644
--- a/data/tilesets/secondary/82D4E9C/metatiles.bin
+++ b/data/tilesets/secondary/power_plant/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D7C/palettes/0.pal b/data/tilesets/secondary/power_plant/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/0.pal
+++ b/data/tilesets/secondary/power_plant/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/1.pal b/data/tilesets/secondary/power_plant/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/1.pal
+++ b/data/tilesets/secondary/power_plant/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/10.pal b/data/tilesets/secondary/power_plant/palettes/10.pal
index 2a1743eaa..2a1743eaa 100644
--- a/data/tilesets/secondary/82D4D94/palettes/10.pal
+++ b/data/tilesets/secondary/power_plant/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/11.pal b/data/tilesets/secondary/power_plant/palettes/11.pal
index 307e0ea7e..307e0ea7e 100644
--- a/data/tilesets/secondary/82D4D94/palettes/11.pal
+++ b/data/tilesets/secondary/power_plant/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/12.pal b/data/tilesets/secondary/power_plant/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/12.pal
+++ b/data/tilesets/secondary/power_plant/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/13.pal b/data/tilesets/secondary/power_plant/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/13.pal
+++ b/data/tilesets/secondary/power_plant/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/14.pal b/data/tilesets/secondary/power_plant/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/14.pal
+++ b/data/tilesets/secondary/power_plant/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/15.pal b/data/tilesets/secondary/power_plant/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/15.pal
+++ b/data/tilesets/secondary/power_plant/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/2.pal b/data/tilesets/secondary/power_plant/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/2.pal
+++ b/data/tilesets/secondary/power_plant/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/3.pal b/data/tilesets/secondary/power_plant/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/3.pal
+++ b/data/tilesets/secondary/power_plant/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/4.pal b/data/tilesets/secondary/power_plant/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/4.pal
+++ b/data/tilesets/secondary/power_plant/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/5.pal b/data/tilesets/secondary/power_plant/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/5.pal
+++ b/data/tilesets/secondary/power_plant/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/6.pal b/data/tilesets/secondary/power_plant/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/6.pal
+++ b/data/tilesets/secondary/power_plant/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/7.pal b/data/tilesets/secondary/power_plant/palettes/7.pal
index b69e6cfa4..b69e6cfa4 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/7.pal
+++ b/data/tilesets/secondary/power_plant/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/8.pal b/data/tilesets/secondary/power_plant/palettes/8.pal
index 3cada9fa1..3cada9fa1 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/8.pal
+++ b/data/tilesets/secondary/power_plant/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/9.pal b/data/tilesets/secondary/power_plant/palettes/9.pal
index 2a1743eaa..2a1743eaa 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/9.pal
+++ b/data/tilesets/secondary/power_plant/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E9C/tiles.png b/data/tilesets/secondary/power_plant/tiles.png
index d252dbcd3..d252dbcd3 100644
--- a/data/tilesets/secondary/82D4E9C/tiles.png
+++ b/data/tilesets/secondary/power_plant/tiles.png
diff --git a/data/tilesets/secondary/82D4F44/metatile_attributes.bin b/data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin
index a2ac291b5..a2ac291b5 100644
--- a/data/tilesets/secondary/82D4F44/metatile_attributes.bin
+++ b/data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F44/metatiles.bin b/data/tilesets/secondary/restaurant_hotel/metatiles.bin
index 5cddd954c..5cddd954c 100644
--- a/data/tilesets/secondary/82D4F44/metatiles.bin
+++ b/data/tilesets/secondary/restaurant_hotel/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DDC/palettes/0.pal b/data/tilesets/secondary/restaurant_hotel/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/0.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/1.pal b/data/tilesets/secondary/restaurant_hotel/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4F44/palettes/1.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/10.pal b/data/tilesets/secondary/restaurant_hotel/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F44/palettes/10.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/11.pal b/data/tilesets/secondary/restaurant_hotel/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F44/palettes/11.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/12.pal b/data/tilesets/secondary/restaurant_hotel/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/12.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/13.pal b/data/tilesets/secondary/restaurant_hotel/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/13.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/14.pal b/data/tilesets/secondary/restaurant_hotel/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/14.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/15.pal b/data/tilesets/secondary/restaurant_hotel/palettes/15.pal
index 71b5ee827..71b5ee827 100644
--- a/data/tilesets/secondary/82D4F44/palettes/15.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/2.pal b/data/tilesets/secondary/restaurant_hotel/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4F44/palettes/2.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/3.pal b/data/tilesets/secondary/restaurant_hotel/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4F44/palettes/3.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/4.pal b/data/tilesets/secondary/restaurant_hotel/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/4.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/5.pal b/data/tilesets/secondary/restaurant_hotel/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/5.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/6.pal b/data/tilesets/secondary/restaurant_hotel/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F44/palettes/6.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/7.pal b/data/tilesets/secondary/restaurant_hotel/palettes/7.pal
index 5e3bac102..5e3bac102 100644
--- a/data/tilesets/secondary/82D4F44/palettes/7.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/8.pal b/data/tilesets/secondary/restaurant_hotel/palettes/8.pal
index 2257c0006..2257c0006 100644
--- a/data/tilesets/secondary/82D4F44/palettes/8.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/9.pal b/data/tilesets/secondary/restaurant_hotel/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F44/palettes/9.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F44/tiles.png b/data/tilesets/secondary/restaurant_hotel/tiles.png
index 5c8a38b9e..5c8a38b9e 100644
--- a/data/tilesets/secondary/82D4F44/tiles.png
+++ b/data/tilesets/secondary/restaurant_hotel/tiles.png
diff --git a/data/tilesets/secondary/82D4DF4/metatile_attributes.bin b/data/tilesets/secondary/rock_tunnel/metatile_attributes.bin
index 96ef6a853..96ef6a853 100644
--- a/data/tilesets/secondary/82D4DF4/metatile_attributes.bin
+++ b/data/tilesets/secondary/rock_tunnel/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DF4/metatiles.bin b/data/tilesets/secondary/rock_tunnel/metatiles.bin
index 0ee478c87..0ee478c87 100644
--- a/data/tilesets/secondary/82D4DF4/metatiles.bin
+++ b/data/tilesets/secondary/rock_tunnel/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FBC/palettes/0.pal b/data/tilesets/secondary/rock_tunnel/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/0.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/1.pal b/data/tilesets/secondary/rock_tunnel/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/1.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/10.pal b/data/tilesets/secondary/rock_tunnel/palettes/10.pal
index 4235579fc..4235579fc 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/10.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/11.pal b/data/tilesets/secondary/rock_tunnel/palettes/11.pal
index 277172976..277172976 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/11.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/12.pal b/data/tilesets/secondary/rock_tunnel/palettes/12.pal
index 2fa21e9fb..2fa21e9fb 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/12.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/13.pal b/data/tilesets/secondary/rock_tunnel/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/13.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/14.pal b/data/tilesets/secondary/rock_tunnel/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/14.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/15.pal b/data/tilesets/secondary/rock_tunnel/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/15.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/2.pal b/data/tilesets/secondary/rock_tunnel/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/2.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/3.pal b/data/tilesets/secondary/rock_tunnel/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/3.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/4.pal b/data/tilesets/secondary/rock_tunnel/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4F14/palettes/4.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/5.pal b/data/tilesets/secondary/rock_tunnel/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/5.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/6.pal b/data/tilesets/secondary/rock_tunnel/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/6.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/7.pal b/data/tilesets/secondary/rock_tunnel/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4F14/palettes/7.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/8.pal b/data/tilesets/secondary/rock_tunnel/palettes/8.pal
index 34a637b1a..34a637b1a 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/8.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/9.pal b/data/tilesets/secondary/rock_tunnel/palettes/9.pal
index f10a94f7c..f10a94f7c 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/9.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DF4/tiles.png b/data/tilesets/secondary/rock_tunnel/tiles.png
index cb4078fa9..cb4078fa9 100644
--- a/data/tilesets/secondary/82D4DF4/tiles.png
+++ b/data/tilesets/secondary/rock_tunnel/tiles.png
diff --git a/data/tilesets/secondary/82D4F14/metatile_attributes.bin b/data/tilesets/secondary/safari_zone_building/metatile_attributes.bin
index 9656d8ed7..9656d8ed7 100644
--- a/data/tilesets/secondary/82D4F14/metatile_attributes.bin
+++ b/data/tilesets/secondary/safari_zone_building/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F14/metatiles.bin b/data/tilesets/secondary/safari_zone_building/metatiles.bin
index 3337a5393..3337a5393 100644
--- a/data/tilesets/secondary/82D4F14/metatiles.bin
+++ b/data/tilesets/secondary/safari_zone_building/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F14/palettes/0.pal b/data/tilesets/secondary/safari_zone_building/palettes/0.pal
index 620015e77..620015e77 100644
--- a/data/tilesets/secondary/82D4F14/palettes/0.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/1.pal b/data/tilesets/secondary/safari_zone_building/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/1.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/10.pal b/data/tilesets/secondary/safari_zone_building/palettes/10.pal
index 1f08b0f6f..1f08b0f6f 100644
--- a/data/tilesets/secondary/82D4F14/palettes/10.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/11.pal b/data/tilesets/secondary/safari_zone_building/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/11.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/12.pal b/data/tilesets/secondary/safari_zone_building/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/12.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/13.pal b/data/tilesets/secondary/safari_zone_building/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/13.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/14.pal b/data/tilesets/secondary/safari_zone_building/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/14.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/15.pal b/data/tilesets/secondary/safari_zone_building/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/15.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/2.pal b/data/tilesets/secondary/safari_zone_building/palettes/2.pal
index ddec077d0..ddec077d0 100644
--- a/data/tilesets/secondary/82D4F14/palettes/2.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/3.pal b/data/tilesets/secondary/safari_zone_building/palettes/3.pal
index 6d1dfb5af..6d1dfb5af 100644
--- a/data/tilesets/secondary/82D4F14/palettes/3.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/4.pal b/data/tilesets/secondary/safari_zone_building/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/4.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/5.pal b/data/tilesets/secondary/safari_zone_building/palettes/5.pal
index 9de0ef422..9de0ef422 100644
--- a/data/tilesets/secondary/82D4F14/palettes/5.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/6.pal b/data/tilesets/secondary/safari_zone_building/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/6.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/7.pal b/data/tilesets/secondary/safari_zone_building/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/7.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/8.pal b/data/tilesets/secondary/safari_zone_building/palettes/8.pal
index eed6dbc35..eed6dbc35 100644
--- a/data/tilesets/secondary/82D4F14/palettes/8.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/9.pal b/data/tilesets/secondary/safari_zone_building/palettes/9.pal
index e9b93cfd2..e9b93cfd2 100644
--- a/data/tilesets/secondary/82D4F14/palettes/9.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F14/tiles.png b/data/tilesets/secondary/safari_zone_building/tiles.png
index 6c8d53e34..6c8d53e34 100644
--- a/data/tilesets/secondary/82D4F14/tiles.png
+++ b/data/tilesets/secondary/safari_zone_building/tiles.png
diff --git a/data/tilesets/secondary/82D4B9C/metatile_attributes.bin b/data/tilesets/secondary/saffron_city/metatile_attributes.bin
index c6f6551c0..c6f6551c0 100644
--- a/data/tilesets/secondary/82D4B9C/metatile_attributes.bin
+++ b/data/tilesets/secondary/saffron_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B9C/metatiles.bin b/data/tilesets/secondary/saffron_city/metatiles.bin
index dd43794df..dd43794df 100644
--- a/data/tilesets/secondary/82D4B9C/metatiles.bin
+++ b/data/tilesets/secondary/saffron_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B9C/palettes/0.pal b/data/tilesets/secondary/saffron_city/palettes/0.pal
index 9dcb673aa..9dcb673aa 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/0.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/1.pal b/data/tilesets/secondary/saffron_city/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/1.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/10.pal b/data/tilesets/secondary/saffron_city/palettes/10.pal
index ce671fee4..ce671fee4 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/10.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/11.pal b/data/tilesets/secondary/saffron_city/palettes/11.pal
index d1ae629c8..d1ae629c8 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/11.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/12.pal b/data/tilesets/secondary/saffron_city/palettes/12.pal
index b66bd774a..b66bd774a 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/12.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/13.pal b/data/tilesets/secondary/saffron_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/13.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/14.pal b/data/tilesets/secondary/saffron_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/14.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/15.pal b/data/tilesets/secondary/saffron_city/palettes/15.pal
index 3ffc684ac..3ffc684ac 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/15.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/2.pal b/data/tilesets/secondary/saffron_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D5004/palettes/2.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/3.pal b/data/tilesets/secondary/saffron_city/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/3.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/4.pal b/data/tilesets/secondary/saffron_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/4.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/5.pal b/data/tilesets/secondary/saffron_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/5.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/6.pal b/data/tilesets/secondary/saffron_city/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/6.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/7.pal b/data/tilesets/secondary/saffron_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/7.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/8.pal b/data/tilesets/secondary/saffron_city/palettes/8.pal
index b1e168855..b1e168855 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/8.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/9.pal b/data/tilesets/secondary/saffron_city/palettes/9.pal
index 7a88fdbbf..7a88fdbbf 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/9.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B9C/tiles.png b/data/tilesets/secondary/saffron_city/tiles.png
index ea835f8dd..ea835f8dd 100644
--- a/data/tilesets/secondary/82D4B9C/tiles.png
+++ b/data/tilesets/secondary/saffron_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D64/metatile_attributes.bin b/data/tilesets/secondary/saffron_gym/metatile_attributes.bin
index ee895c35a..ee895c35a 100644
--- a/data/tilesets/secondary/82D4D64/metatile_attributes.bin
+++ b/data/tilesets/secondary/saffron_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D64/metatiles.bin b/data/tilesets/secondary/saffron_gym/metatiles.bin
index e0fdb79fb..e0fdb79fb 100644
--- a/data/tilesets/secondary/82D4D64/metatiles.bin
+++ b/data/tilesets/secondary/saffron_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E3C/palettes/0.pal b/data/tilesets/secondary/saffron_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/0.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/1.pal b/data/tilesets/secondary/saffron_gym/palettes/1.pal
index 3a16a45c7..3a16a45c7 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/1.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/10.pal b/data/tilesets/secondary/saffron_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/10.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/11.pal b/data/tilesets/secondary/saffron_gym/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E84/palettes/11.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/12.pal b/data/tilesets/secondary/saffron_gym/palettes/12.pal
index 702c67ecb..702c67ecb 100644
--- a/data/tilesets/secondary/82D4D64/palettes/12.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/13.pal b/data/tilesets/secondary/saffron_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/13.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/14.pal b/data/tilesets/secondary/saffron_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F44/palettes/14.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/15.pal b/data/tilesets/secondary/saffron_gym/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/15.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/2.pal b/data/tilesets/secondary/saffron_gym/palettes/2.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/2.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/3.pal b/data/tilesets/secondary/saffron_gym/palettes/3.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/3.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/4.pal b/data/tilesets/secondary/saffron_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/4.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/5.pal b/data/tilesets/secondary/saffron_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/5.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/6.pal b/data/tilesets/secondary/saffron_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/6.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/7.pal b/data/tilesets/secondary/saffron_gym/palettes/7.pal
index c66eaedff..c66eaedff 100644
--- a/data/tilesets/secondary/82D4D64/palettes/7.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/8.pal b/data/tilesets/secondary/saffron_gym/palettes/8.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D34/palettes/8.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/9.pal b/data/tilesets/secondary/saffron_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D34/palettes/9.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D64/tiles.png b/data/tilesets/secondary/saffron_gym/tiles.png
index 87641a309..87641a309 100644
--- a/data/tilesets/secondary/82D4D64/tiles.png
+++ b/data/tilesets/secondary/saffron_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4F5C/metatile_attributes.bin b/data/tilesets/secondary/school/metatile_attributes.bin
index cdcb96c53..cdcb96c53 100644
--- a/data/tilesets/secondary/82D4F5C/metatile_attributes.bin
+++ b/data/tilesets/secondary/school/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F5C/metatiles.bin b/data/tilesets/secondary/school/metatiles.bin
index 35009a690..35009a690 100644
--- a/data/tilesets/secondary/82D4F5C/metatiles.bin
+++ b/data/tilesets/secondary/school/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E6C/palettes/0.pal b/data/tilesets/secondary/school/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/0.pal
+++ b/data/tilesets/secondary/school/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/1.pal b/data/tilesets/secondary/school/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/1.pal
+++ b/data/tilesets/secondary/school/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/10.pal b/data/tilesets/secondary/school/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/10.pal
+++ b/data/tilesets/secondary/school/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/11.pal b/data/tilesets/secondary/school/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/11.pal
+++ b/data/tilesets/secondary/school/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/12.pal b/data/tilesets/secondary/school/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/12.pal
+++ b/data/tilesets/secondary/school/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/13.pal b/data/tilesets/secondary/school/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F44/palettes/13.pal
+++ b/data/tilesets/secondary/school/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/14.pal b/data/tilesets/secondary/school/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/14.pal
+++ b/data/tilesets/secondary/school/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/15.pal b/data/tilesets/secondary/school/palettes/15.pal
index 71b5ee827..71b5ee827 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/15.pal
+++ b/data/tilesets/secondary/school/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/2.pal b/data/tilesets/secondary/school/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/2.pal
+++ b/data/tilesets/secondary/school/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/3.pal b/data/tilesets/secondary/school/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/3.pal
+++ b/data/tilesets/secondary/school/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/4.pal b/data/tilesets/secondary/school/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E84/palettes/4.pal
+++ b/data/tilesets/secondary/school/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/5.pal b/data/tilesets/secondary/school/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E84/palettes/5.pal
+++ b/data/tilesets/secondary/school/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/6.pal b/data/tilesets/secondary/school/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/6.pal
+++ b/data/tilesets/secondary/school/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/7.pal b/data/tilesets/secondary/school/palettes/7.pal
index 6c1a5b096..6c1a5b096 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/7.pal
+++ b/data/tilesets/secondary/school/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/8.pal b/data/tilesets/secondary/school/palettes/8.pal
index 1557a55f0..1557a55f0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/8.pal
+++ b/data/tilesets/secondary/school/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/9.pal b/data/tilesets/secondary/school/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/9.pal
+++ b/data/tilesets/secondary/school/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F5C/tiles.png b/data/tilesets/secondary/school/tiles.png
index 935afccd2..935afccd2 100644
--- a/data/tilesets/secondary/82D4F5C/tiles.png
+++ b/data/tilesets/secondary/school/tiles.png
diff --git a/data/tilesets/secondary/82D4EB4/metatile_attributes.bin b/data/tilesets/secondary/sea_cottage/metatile_attributes.bin
index 05caeb58b..05caeb58b 100644
--- a/data/tilesets/secondary/82D4EB4/metatile_attributes.bin
+++ b/data/tilesets/secondary/sea_cottage/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4EB4/metatiles.bin b/data/tilesets/secondary/sea_cottage/metatiles.bin
index 6ac3cbf98..6ac3cbf98 100644
--- a/data/tilesets/secondary/82D4EB4/metatiles.bin
+++ b/data/tilesets/secondary/sea_cottage/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EB4/palettes/0.pal b/data/tilesets/secondary/sea_cottage/palettes/0.pal
index ed708dd79..ed708dd79 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/0.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/1.pal b/data/tilesets/secondary/sea_cottage/palettes/1.pal
index 4d2b48991..4d2b48991 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/1.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/10.pal b/data/tilesets/secondary/sea_cottage/palettes/10.pal
index e8624e82f..e8624e82f 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/10.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/11.pal b/data/tilesets/secondary/sea_cottage/palettes/11.pal
index 9cec1272b..9cec1272b 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/11.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/12.pal b/data/tilesets/secondary/sea_cottage/palettes/12.pal
index 600d8f469..600d8f469 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/12.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/13.pal b/data/tilesets/secondary/sea_cottage/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/13.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/14.pal b/data/tilesets/secondary/sea_cottage/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/14.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/15.pal b/data/tilesets/secondary/sea_cottage/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/15.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/2.pal b/data/tilesets/secondary/sea_cottage/palettes/2.pal
index 878c13c95..878c13c95 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/2.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/3.pal b/data/tilesets/secondary/sea_cottage/palettes/3.pal
index bed4c20c3..bed4c20c3 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/3.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/4.pal b/data/tilesets/secondary/sea_cottage/palettes/4.pal
index b77ba3e87..b77ba3e87 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/4.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/5.pal b/data/tilesets/secondary/sea_cottage/palettes/5.pal
index 74a2a9ed0..74a2a9ed0 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/5.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/6.pal b/data/tilesets/secondary/sea_cottage/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/6.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/7.pal b/data/tilesets/secondary/sea_cottage/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/7.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/8.pal b/data/tilesets/secondary/sea_cottage/palettes/8.pal
index 370a3d2db..370a3d2db 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/8.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/9.pal b/data/tilesets/secondary/sea_cottage/palettes/9.pal
index 1193cc807..1193cc807 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/9.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4EB4/tiles.png b/data/tilesets/secondary/sea_cottage/tiles.png
index 42d557bcf..42d557bcf 100644
--- a/data/tilesets/secondary/82D4EB4/tiles.png
+++ b/data/tilesets/secondary/sea_cottage/tiles.png
diff --git a/data/tilesets/secondary/82D4E24/metatile_attributes.bin b/data/tilesets/secondary/seafoam_islands/metatile_attributes.bin
index 87564066c..87564066c 100644
--- a/data/tilesets/secondary/82D4E24/metatile_attributes.bin
+++ b/data/tilesets/secondary/seafoam_islands/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E24/metatiles.bin b/data/tilesets/secondary/seafoam_islands/metatiles.bin
index 8f8bd569b..8f8bd569b 100644
--- a/data/tilesets/secondary/82D4E24/metatiles.bin
+++ b/data/tilesets/secondary/seafoam_islands/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FD4/palettes/0.pal b/data/tilesets/secondary/seafoam_islands/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/0.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/0.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/1.pal b/data/tilesets/secondary/seafoam_islands/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D501C/palettes/1.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/10.pal b/data/tilesets/secondary/seafoam_islands/palettes/10.pal
index 7116e91ff..7116e91ff 100644
--- a/data/tilesets/secondary/82D4E24/palettes/10.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/11.pal b/data/tilesets/secondary/seafoam_islands/palettes/11.pal
index b237ef1c8..b237ef1c8 100644
--- a/data/tilesets/secondary/82D4E24/palettes/11.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/12.pal b/data/tilesets/secondary/seafoam_islands/palettes/12.pal
index ed56edee1..ed56edee1 100644
--- a/data/tilesets/secondary/82D4E24/palettes/12.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/13.pal b/data/tilesets/secondary/seafoam_islands/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/13.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/14.pal b/data/tilesets/secondary/seafoam_islands/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/14.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/15.pal b/data/tilesets/secondary/seafoam_islands/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/15.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/15.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/2.pal b/data/tilesets/secondary/seafoam_islands/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D501C/palettes/2.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/2.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/3.pal b/data/tilesets/secondary/seafoam_islands/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D501C/palettes/3.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/4.pal b/data/tilesets/secondary/seafoam_islands/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D5004/palettes/4.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/4.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/5.pal b/data/tilesets/secondary/seafoam_islands/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D501C/palettes/5.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/5.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/6.pal b/data/tilesets/secondary/seafoam_islands/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D501C/palettes/6.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/7.pal b/data/tilesets/secondary/seafoam_islands/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/7.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/8.pal b/data/tilesets/secondary/seafoam_islands/palettes/8.pal
index d96f3f0fc..d96f3f0fc 100644
--- a/data/tilesets/secondary/82D4E24/palettes/8.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/9.pal b/data/tilesets/secondary/seafoam_islands/palettes/9.pal
index 1a1dc881b..1a1dc881b 100644
--- a/data/tilesets/secondary/82D4E24/palettes/9.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E24/tiles.png b/data/tilesets/secondary/seafoam_islands/tiles.png
index e085d8e33..e085d8e33 100644
--- a/data/tilesets/secondary/82D4E24/tiles.png
+++ b/data/tilesets/secondary/seafoam_islands/tiles.png
diff --git a/data/tilesets/secondary/82D504C/metatile_attributes.bin b/data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin
index 62eb1b917..62eb1b917 100644
--- a/data/tilesets/secondary/82D504C/metatile_attributes.bin
+++ b/data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D504C/metatiles.bin b/data/tilesets/secondary/sevii_islands_123/metatiles.bin
index 52d2f020d..52d2f020d 100644
--- a/data/tilesets/secondary/82D504C/metatiles.bin
+++ b/data/tilesets/secondary/sevii_islands_123/metatiles.bin
diff --git a/data/tilesets/secondary/82D501C/palettes/0.pal b/data/tilesets/secondary/sevii_islands_123/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D501C/palettes/0.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/0.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/1.pal b/data/tilesets/secondary/sevii_islands_123/palettes/1.pal
index e15d979f1..e15d979f1 100644
--- a/data/tilesets/secondary/82D504C/palettes/1.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/1.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/10.pal b/data/tilesets/secondary/sevii_islands_123/palettes/10.pal
index 265fb0625..265fb0625 100644
--- a/data/tilesets/secondary/82D504C/palettes/10.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/10.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/11.pal b/data/tilesets/secondary/sevii_islands_123/palettes/11.pal
index 9e1e423c6..9e1e423c6 100644
--- a/data/tilesets/secondary/82D504C/palettes/11.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/11.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/12.pal b/data/tilesets/secondary/sevii_islands_123/palettes/12.pal
index 375e3914b..375e3914b 100644
--- a/data/tilesets/secondary/82D504C/palettes/12.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/13.pal b/data/tilesets/secondary/sevii_islands_123/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/13.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/14.pal b/data/tilesets/secondary/sevii_islands_123/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/14.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/15.pal b/data/tilesets/secondary/sevii_islands_123/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/15.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/2.pal b/data/tilesets/secondary/sevii_islands_123/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4B84/palettes/2.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/2.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/3.pal b/data/tilesets/secondary/sevii_islands_123/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D504C/palettes/3.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/3.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/4.pal b/data/tilesets/secondary/sevii_islands_123/palettes/4.pal
index fca4a2623..fca4a2623 100644
--- a/data/tilesets/secondary/82D504C/palettes/4.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/5.pal b/data/tilesets/secondary/sevii_islands_123/palettes/5.pal
index 09555ded5..09555ded5 100644
--- a/data/tilesets/secondary/82D4D94/palettes/5.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/5.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/6.pal b/data/tilesets/secondary/sevii_islands_123/palettes/6.pal
index f8ebbc6dc..f8ebbc6dc 100644
--- a/data/tilesets/secondary/82D504C/palettes/6.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/6.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/7.pal b/data/tilesets/secondary/sevii_islands_123/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D504C/palettes/7.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/7.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/8.pal b/data/tilesets/secondary/sevii_islands_123/palettes/8.pal
index 4d9ab6348..4d9ab6348 100644
--- a/data/tilesets/secondary/82D504C/palettes/8.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/8.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/9.pal b/data/tilesets/secondary/sevii_islands_123/palettes/9.pal
index b66fdcdbf..b66fdcdbf 100644
--- a/data/tilesets/secondary/82D504C/palettes/9.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/9.pal
diff --git a/data/tilesets/secondary/82D504C/tiles.png b/data/tilesets/secondary/sevii_islands_123/tiles.png
index ad8f73a2c..ad8f73a2c 100644
--- a/data/tilesets/secondary/82D504C/tiles.png
+++ b/data/tilesets/secondary/sevii_islands_123/tiles.png
diff --git a/data/tilesets/secondary/82D5064/metatile_attributes.bin b/data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin
index d67c4690c..d67c4690c 100644
--- a/data/tilesets/secondary/82D5064/metatile_attributes.bin
+++ b/data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5064/metatiles.bin b/data/tilesets/secondary/sevii_islands_45/metatiles.bin
index 7613f3702..7613f3702 100644
--- a/data/tilesets/secondary/82D5064/metatiles.bin
+++ b/data/tilesets/secondary/sevii_islands_45/metatiles.bin
diff --git a/data/tilesets/secondary/82D504C/palettes/0.pal b/data/tilesets/secondary/sevii_islands_45/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D504C/palettes/0.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/1.pal b/data/tilesets/secondary/sevii_islands_45/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D5064/palettes/1.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/10.pal b/data/tilesets/secondary/sevii_islands_45/palettes/10.pal
index 86502dd48..86502dd48 100644
--- a/data/tilesets/secondary/82D5064/palettes/10.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/11.pal b/data/tilesets/secondary/sevii_islands_45/palettes/11.pal
index b05410cba..b05410cba 100644
--- a/data/tilesets/secondary/82D5064/palettes/11.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/12.pal b/data/tilesets/secondary/sevii_islands_45/palettes/12.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D5064/palettes/12.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/13.pal b/data/tilesets/secondary/sevii_islands_45/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/13.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/14.pal b/data/tilesets/secondary/sevii_islands_45/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/14.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/15.pal b/data/tilesets/secondary/sevii_islands_45/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/15.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/2.pal b/data/tilesets/secondary/sevii_islands_45/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/2.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/3.pal b/data/tilesets/secondary/sevii_islands_45/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D5064/palettes/3.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/4.pal b/data/tilesets/secondary/sevii_islands_45/palettes/4.pal
index fca4a2623..fca4a2623 100644
--- a/data/tilesets/secondary/82D5064/palettes/4.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/4.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/5.pal b/data/tilesets/secondary/sevii_islands_45/palettes/5.pal
index 09555ded5..09555ded5 100644
--- a/data/tilesets/secondary/82D504C/palettes/5.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/6.pal b/data/tilesets/secondary/sevii_islands_45/palettes/6.pal
index f8ebbc6dc..f8ebbc6dc 100644
--- a/data/tilesets/secondary/82D5064/palettes/6.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/7.pal b/data/tilesets/secondary/sevii_islands_45/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D5064/palettes/7.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/8.pal b/data/tilesets/secondary/sevii_islands_45/palettes/8.pal
index 4d9ab6348..4d9ab6348 100644
--- a/data/tilesets/secondary/82D5064/palettes/8.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/9.pal b/data/tilesets/secondary/sevii_islands_45/palettes/9.pal
index 5ac617b25..5ac617b25 100644
--- a/data/tilesets/secondary/82D5064/palettes/9.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5064/tiles.png b/data/tilesets/secondary/sevii_islands_45/tiles.png
index 744b38638..744b38638 100644
--- a/data/tilesets/secondary/82D5064/tiles.png
+++ b/data/tilesets/secondary/sevii_islands_45/tiles.png
diff --git a/data/tilesets/secondary/82D507C/metatile_attributes.bin b/data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin
index edf192276..edf192276 100644
--- a/data/tilesets/secondary/82D507C/metatile_attributes.bin
+++ b/data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D507C/metatiles.bin b/data/tilesets/secondary/sevii_islands_67/metatiles.bin
index 13f97073b..13f97073b 100644
--- a/data/tilesets/secondary/82D507C/metatiles.bin
+++ b/data/tilesets/secondary/sevii_islands_67/metatiles.bin
diff --git a/data/tilesets/secondary/82D5064/palettes/0.pal b/data/tilesets/secondary/sevii_islands_67/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D5064/palettes/0.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/1.pal b/data/tilesets/secondary/sevii_islands_67/palettes/1.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/1.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/1.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/10.pal b/data/tilesets/secondary/sevii_islands_67/palettes/10.pal
index d26d003af..d26d003af 100644
--- a/data/tilesets/secondary/82D507C/palettes/10.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/10.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/11.pal b/data/tilesets/secondary/sevii_islands_67/palettes/11.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D507C/palettes/11.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/11.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/12.pal b/data/tilesets/secondary/sevii_islands_67/palettes/12.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D507C/palettes/12.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/13.pal b/data/tilesets/secondary/sevii_islands_67/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/13.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/14.pal b/data/tilesets/secondary/sevii_islands_67/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/14.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/15.pal b/data/tilesets/secondary/sevii_islands_67/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/15.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/15.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/2.pal b/data/tilesets/secondary/sevii_islands_67/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D507C/palettes/2.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/2.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/3.pal b/data/tilesets/secondary/sevii_islands_67/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D507C/palettes/3.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/3.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/4.pal b/data/tilesets/secondary/sevii_islands_67/palettes/4.pal
index 5871a448c..5871a448c 100644
--- a/data/tilesets/secondary/82D507C/palettes/4.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/4.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/5.pal b/data/tilesets/secondary/sevii_islands_67/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D507C/palettes/5.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/5.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/6.pal b/data/tilesets/secondary/sevii_islands_67/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D507C/palettes/6.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/6.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/7.pal b/data/tilesets/secondary/sevii_islands_67/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/7.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/7.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/8.pal b/data/tilesets/secondary/sevii_islands_67/palettes/8.pal
index 4d9ab6348..4d9ab6348 100644
--- a/data/tilesets/secondary/82D507C/palettes/8.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/8.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/9.pal b/data/tilesets/secondary/sevii_islands_67/palettes/9.pal
index edc5961bb..edc5961bb 100644
--- a/data/tilesets/secondary/82D507C/palettes/9.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/9.pal
diff --git a/data/tilesets/secondary/82D507C/tiles.png b/data/tilesets/secondary/sevii_islands_67/tiles.png
index d40c92649..d40c92649 100644
--- a/data/tilesets/secondary/82D507C/tiles.png
+++ b/data/tilesets/secondary/sevii_islands_67/tiles.png
diff --git a/data/tilesets/secondary/82D4ECC/metatile_attributes.bin b/data/tilesets/secondary/silph_co/metatile_attributes.bin
index a118a0181..a118a0181 100644
--- a/data/tilesets/secondary/82D4ECC/metatile_attributes.bin
+++ b/data/tilesets/secondary/silph_co/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4ECC/metatiles.bin b/data/tilesets/secondary/silph_co/metatiles.bin
index c86070668..c86070668 100644
--- a/data/tilesets/secondary/82D4ECC/metatiles.bin
+++ b/data/tilesets/secondary/silph_co/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D94/metatile_attributes.bin b/data/tilesets/secondary/ss_anne/metatile_attributes.bin
index 949846f90..949846f90 100644
--- a/data/tilesets/secondary/82D4D94/metatile_attributes.bin
+++ b/data/tilesets/secondary/ss_anne/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D94/metatiles.bin b/data/tilesets/secondary/ss_anne/metatiles.bin
index a976297b3..a976297b3 100644
--- a/data/tilesets/secondary/82D4D94/metatiles.bin
+++ b/data/tilesets/secondary/ss_anne/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D94/palettes/0.pal b/data/tilesets/secondary/ss_anne/palettes/0.pal
index 28232d99e..28232d99e 100644
--- a/data/tilesets/secondary/82D4D94/palettes/0.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/1.pal b/data/tilesets/secondary/ss_anne/palettes/1.pal
index b43532470..b43532470 100644
--- a/data/tilesets/secondary/82D4D94/palettes/1.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/10.pal b/data/tilesets/secondary/ss_anne/palettes/10.pal
index 2a1743eaa..2a1743eaa 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/10.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/11.pal b/data/tilesets/secondary/ss_anne/palettes/11.pal
index 307e0ea7e..307e0ea7e 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/11.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/12.pal b/data/tilesets/secondary/ss_anne/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F44/palettes/12.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/13.pal b/data/tilesets/secondary/ss_anne/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/13.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/14.pal b/data/tilesets/secondary/ss_anne/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/14.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/15.pal b/data/tilesets/secondary/ss_anne/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5004/palettes/15.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/2.pal b/data/tilesets/secondary/ss_anne/palettes/2.pal
index e267ae90e..e267ae90e 100644
--- a/data/tilesets/secondary/82D4D94/palettes/2.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/3.pal b/data/tilesets/secondary/ss_anne/palettes/3.pal
index 503f22878..503f22878 100644
--- a/data/tilesets/secondary/82D4D94/palettes/3.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/4.pal b/data/tilesets/secondary/ss_anne/palettes/4.pal
index cdf1b6190..cdf1b6190 100644
--- a/data/tilesets/secondary/82D4D94/palettes/4.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/5.pal b/data/tilesets/secondary/ss_anne/palettes/5.pal
index 09555ded5..09555ded5 100644
--- a/data/tilesets/secondary/82D5064/palettes/5.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/6.pal b/data/tilesets/secondary/ss_anne/palettes/6.pal
index 0dba59a72..0dba59a72 100644
--- a/data/tilesets/secondary/82D4D94/palettes/6.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/7.pal b/data/tilesets/secondary/ss_anne/palettes/7.pal
index e9848a1c0..e9848a1c0 100644
--- a/data/tilesets/secondary/82D4D94/palettes/7.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/8.pal b/data/tilesets/secondary/ss_anne/palettes/8.pal
index b5c80c8f4..b5c80c8f4 100644
--- a/data/tilesets/secondary/82D4D94/palettes/8.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/9.pal b/data/tilesets/secondary/ss_anne/palettes/9.pal
index b66b2399a..b66b2399a 100644
--- a/data/tilesets/secondary/82D4D94/palettes/9.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D94/tiles.png b/data/tilesets/secondary/ss_anne/tiles.png
index 280f3e227..280f3e227 100644
--- a/data/tilesets/secondary/82D4D94/tiles.png
+++ b/data/tilesets/secondary/ss_anne/tiles.png
diff --git a/data/tilesets/secondary/82D5034/metatile_attributes.bin b/data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin
index 5fe7d59fc..5fe7d59fc 100644
--- a/data/tilesets/secondary/82D5034/metatile_attributes.bin
+++ b/data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5034/metatiles.bin b/data/tilesets/secondary/tanoby_ruins/metatiles.bin
index 2b3a9543e..2b3a9543e 100644
--- a/data/tilesets/secondary/82D5034/metatiles.bin
+++ b/data/tilesets/secondary/tanoby_ruins/metatiles.bin
diff --git a/data/tilesets/secondary/82D5034/palettes/0.pal b/data/tilesets/secondary/tanoby_ruins/palettes/0.pal
index 83b30fc17..83b30fc17 100644
--- a/data/tilesets/secondary/82D5034/palettes/0.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/1.pal b/data/tilesets/secondary/tanoby_ruins/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D5034/palettes/1.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/10.pal b/data/tilesets/secondary/tanoby_ruins/palettes/10.pal
index fb565545b..fb565545b 100644
--- a/data/tilesets/secondary/82D5034/palettes/10.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/11.pal b/data/tilesets/secondary/tanoby_ruins/palettes/11.pal
index e637019c6..e637019c6 100644
--- a/data/tilesets/secondary/82D5034/palettes/11.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/12.pal b/data/tilesets/secondary/tanoby_ruins/palettes/12.pal
index 775369fed..775369fed 100644
--- a/data/tilesets/secondary/82D5034/palettes/12.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/13.pal b/data/tilesets/secondary/tanoby_ruins/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/13.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/14.pal b/data/tilesets/secondary/tanoby_ruins/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5004/palettes/14.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/14.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/15.pal b/data/tilesets/secondary/tanoby_ruins/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D501C/palettes/15.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/2.pal b/data/tilesets/secondary/tanoby_ruins/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D5094/palettes/2.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/3.pal b/data/tilesets/secondary/tanoby_ruins/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D5094/palettes/3.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/4.pal b/data/tilesets/secondary/tanoby_ruins/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D5094/palettes/4.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/5.pal b/data/tilesets/secondary/tanoby_ruins/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D5094/palettes/5.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/6.pal b/data/tilesets/secondary/tanoby_ruins/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D5094/palettes/6.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/7.pal b/data/tilesets/secondary/tanoby_ruins/palettes/7.pal
index dfa779635..dfa779635 100644
--- a/data/tilesets/secondary/82D5034/palettes/7.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/8.pal b/data/tilesets/secondary/tanoby_ruins/palettes/8.pal
index fd7d8a9d7..fd7d8a9d7 100644
--- a/data/tilesets/secondary/82D5034/palettes/8.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/9.pal b/data/tilesets/secondary/tanoby_ruins/palettes/9.pal
index 0d43d6ef9..0d43d6ef9 100644
--- a/data/tilesets/secondary/82D5034/palettes/9.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5034/tiles.png b/data/tilesets/secondary/tanoby_ruins/tiles.png
index c61f91c47..c61f91c47 100644
--- a/data/tilesets/secondary/82D5034/tiles.png
+++ b/data/tilesets/secondary/tanoby_ruins/tiles.png
diff --git a/data/tilesets/secondary/82D5094/metatile_attributes.bin b/data/tilesets/secondary/trainer_tower/metatile_attributes.bin
index 96b25bb0f..96b25bb0f 100644
--- a/data/tilesets/secondary/82D5094/metatile_attributes.bin
+++ b/data/tilesets/secondary/trainer_tower/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5094/metatiles.bin b/data/tilesets/secondary/trainer_tower/metatiles.bin
index f045f57e8..f045f57e8 100644
--- a/data/tilesets/secondary/82D5094/metatiles.bin
+++ b/data/tilesets/secondary/trainer_tower/metatiles.bin
diff --git a/data/tilesets/secondary/82D50DC/palettes/0.pal b/data/tilesets/secondary/trainer_tower/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D50DC/palettes/0.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/1.pal b/data/tilesets/secondary/trainer_tower/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D5094/palettes/1.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/10.pal b/data/tilesets/secondary/trainer_tower/palettes/10.pal
index ab3a7d14f..ab3a7d14f 100644
--- a/data/tilesets/secondary/82D5094/palettes/10.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/11.pal b/data/tilesets/secondary/trainer_tower/palettes/11.pal
index bb88b4d57..bb88b4d57 100644
--- a/data/tilesets/secondary/82D5094/palettes/11.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/12.pal b/data/tilesets/secondary/trainer_tower/palettes/12.pal
index b0d005f21..b0d005f21 100644
--- a/data/tilesets/secondary/82D5094/palettes/12.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/13.pal b/data/tilesets/secondary/trainer_tower/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5004/palettes/13.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/13.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/14.pal b/data/tilesets/secondary/trainer_tower/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D501C/palettes/14.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/15.pal b/data/tilesets/secondary/trainer_tower/palettes/15.pal
index 6a17f18dc..6a17f18dc 100644
--- a/data/tilesets/secondary/82D5094/palettes/15.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/15.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/2.pal b/data/tilesets/secondary/trainer_tower/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D50C4/palettes/2.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/2.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/3.pal b/data/tilesets/secondary/trainer_tower/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D50C4/palettes/3.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/3.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/4.pal b/data/tilesets/secondary/trainer_tower/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D50C4/palettes/4.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/4.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/5.pal b/data/tilesets/secondary/trainer_tower/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D50DC/palettes/5.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/5.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/6.pal b/data/tilesets/secondary/trainer_tower/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D50C4/palettes/6.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/7.pal b/data/tilesets/secondary/trainer_tower/palettes/7.pal
index edc5961bb..edc5961bb 100644
--- a/data/tilesets/secondary/82D5094/palettes/7.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/8.pal b/data/tilesets/secondary/trainer_tower/palettes/8.pal
index 317213c42..317213c42 100644
--- a/data/tilesets/secondary/82D5094/palettes/8.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/9.pal b/data/tilesets/secondary/trainer_tower/palettes/9.pal
index 19dc9a47e..19dc9a47e 100644
--- a/data/tilesets/secondary/82D5094/palettes/9.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5094/tiles.png b/data/tilesets/secondary/trainer_tower/tiles.png
index f74f7c9f7..f74f7c9f7 100644
--- a/data/tilesets/secondary/82D5094/tiles.png
+++ b/data/tilesets/secondary/trainer_tower/tiles.png
diff --git a/data/tilesets/secondary/82D4EE4/metatile_attributes.bin b/data/tilesets/secondary/underground_path/metatile_attributes.bin
index 29caa862d..29caa862d 100644
--- a/data/tilesets/secondary/82D4EE4/metatile_attributes.bin
+++ b/data/tilesets/secondary/underground_path/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4EE4/metatiles.bin b/data/tilesets/secondary/underground_path/metatiles.bin
index 2010e1eca..2010e1eca 100644
--- a/data/tilesets/secondary/82D4EE4/metatiles.bin
+++ b/data/tilesets/secondary/underground_path/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FA4/palettes/0.pal b/data/tilesets/secondary/underground_path/palettes/0.pal
index 6d876039d..6d876039d 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/0.pal
+++ b/data/tilesets/secondary/underground_path/palettes/0.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/1.pal b/data/tilesets/secondary/underground_path/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D50DC/palettes/1.pal
+++ b/data/tilesets/secondary/underground_path/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/10.pal b/data/tilesets/secondary/underground_path/palettes/10.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/10.pal
+++ b/data/tilesets/secondary/underground_path/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/11.pal b/data/tilesets/secondary/underground_path/palettes/11.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/11.pal
+++ b/data/tilesets/secondary/underground_path/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/12.pal b/data/tilesets/secondary/underground_path/palettes/12.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/12.pal
+++ b/data/tilesets/secondary/underground_path/palettes/12.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/13.pal b/data/tilesets/secondary/underground_path/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D501C/palettes/13.pal
+++ b/data/tilesets/secondary/underground_path/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/14.pal b/data/tilesets/secondary/underground_path/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5034/palettes/14.pal
+++ b/data/tilesets/secondary/underground_path/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/15.pal b/data/tilesets/secondary/underground_path/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5034/palettes/15.pal
+++ b/data/tilesets/secondary/underground_path/palettes/15.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/2.pal b/data/tilesets/secondary/underground_path/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D50DC/palettes/2.pal
+++ b/data/tilesets/secondary/underground_path/palettes/2.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/3.pal b/data/tilesets/secondary/underground_path/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D50DC/palettes/3.pal
+++ b/data/tilesets/secondary/underground_path/palettes/3.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/4.pal b/data/tilesets/secondary/underground_path/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D50DC/palettes/4.pal
+++ b/data/tilesets/secondary/underground_path/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/5.pal b/data/tilesets/secondary/underground_path/palettes/5.pal
index 0eef3df8e..0eef3df8e 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/5.pal
+++ b/data/tilesets/secondary/underground_path/palettes/5.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/6.pal b/data/tilesets/secondary/underground_path/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D50DC/palettes/6.pal
+++ b/data/tilesets/secondary/underground_path/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/7.pal b/data/tilesets/secondary/underground_path/palettes/7.pal
index 23e995640..23e995640 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/7.pal
+++ b/data/tilesets/secondary/underground_path/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/8.pal b/data/tilesets/secondary/underground_path/palettes/8.pal
index 3ce3570a1..3ce3570a1 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/8.pal
+++ b/data/tilesets/secondary/underground_path/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/9.pal b/data/tilesets/secondary/underground_path/palettes/9.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/9.pal
+++ b/data/tilesets/secondary/underground_path/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4EE4/tiles.png b/data/tilesets/secondary/underground_path/tiles.png
index b8865022d..b8865022d 100644
--- a/data/tilesets/secondary/82D4EE4/tiles.png
+++ b/data/tilesets/secondary/underground_path/tiles.png
diff --git a/data/tilesets/secondary/82D4DDC/metatile_attributes.bin b/data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin
index 3549eaa93..3549eaa93 100644
--- a/data/tilesets/secondary/82D4DDC/metatile_attributes.bin
+++ b/data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DDC/metatiles.bin b/data/tilesets/secondary/unused_gatehouse1/metatiles.bin
index ea1398be3..ea1398be3 100644
--- a/data/tilesets/secondary/82D4DDC/metatiles.bin
+++ b/data/tilesets/secondary/unused_gatehouse1/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E84/palettes/0.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E84/palettes/0.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/1.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/1.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/10.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/10.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/11.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/11.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/12.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/12.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/13.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5034/palettes/13.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/13.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/14.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D504C/palettes/14.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/14.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/15.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D504C/palettes/15.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/2.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/2.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/3.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/3.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/4.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/4.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/5.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/5.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/6.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal
index 2903bb074..2903bb074 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/6.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/7.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/7.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/8.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/8.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/9.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/9.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DDC/tiles.png b/data/tilesets/secondary/unused_gatehouse1/tiles.png
index 6d376f447..6d376f447 100644
--- a/data/tilesets/secondary/82D4DDC/tiles.png
+++ b/data/tilesets/secondary/unused_gatehouse1/tiles.png
diff --git a/data/tilesets/secondary/82D4E3C/metatile_attributes.bin b/data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin
index 3549eaa93..3549eaa93 100644
--- a/data/tilesets/secondary/82D4E3C/metatile_attributes.bin
+++ b/data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E3C/metatiles.bin b/data/tilesets/secondary/unused_gatehouse2/metatiles.bin
index ea1398be3..ea1398be3 100644
--- a/data/tilesets/secondary/82D4E3C/metatiles.bin
+++ b/data/tilesets/secondary/unused_gatehouse2/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E9C/palettes/0.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/0.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/1.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/1.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/10.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E84/palettes/10.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/11.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4F14/palettes/11.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/12.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/12.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/12.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/13.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D504C/palettes/13.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/14.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5064/palettes/14.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/15.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5064/palettes/15.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/2.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/2.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/3.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/3.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/4.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/4.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/5.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/5.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/6.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal
index 2903bb074..2903bb074 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/6.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/7.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/82D4E84/palettes/7.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/8.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/82D4E84/palettes/8.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/9.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/9.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E3C/tiles.png b/data/tilesets/secondary/unused_gatehouse2/tiles.png
index 6d376f447..6d376f447 100644
--- a/data/tilesets/secondary/82D4E3C/tiles.png
+++ b/data/tilesets/secondary/unused_gatehouse2/tiles.png
diff --git a/data/tilesets/secondary/82D4B24/metatile_attributes.bin b/data/tilesets/secondary/vermilion_city/metatile_attributes.bin
index 1136f644a..1136f644a 100644
--- a/data/tilesets/secondary/82D4B24/metatile_attributes.bin
+++ b/data/tilesets/secondary/vermilion_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B24/metatiles.bin b/data/tilesets/secondary/vermilion_city/metatiles.bin
index c7978128e..c7978128e 100644
--- a/data/tilesets/secondary/82D4B24/metatiles.bin
+++ b/data/tilesets/secondary/vermilion_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D507C/palettes/0.pal b/data/tilesets/secondary/vermilion_city/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D507C/palettes/0.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/1.pal b/data/tilesets/secondary/vermilion_city/palettes/1.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/secondary/82D507C/palettes/1.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/10.pal b/data/tilesets/secondary/vermilion_city/palettes/10.pal
index 892aae6ed..892aae6ed 100644
--- a/data/tilesets/secondary/82D4B24/palettes/10.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/11.pal b/data/tilesets/secondary/vermilion_city/palettes/11.pal
index b2a405273..b2a405273 100644
--- a/data/tilesets/secondary/82D4B24/palettes/11.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/12.pal b/data/tilesets/secondary/vermilion_city/palettes/12.pal
index f124929b4..f124929b4 100644
--- a/data/tilesets/secondary/82D4B24/palettes/12.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/13.pal b/data/tilesets/secondary/vermilion_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5064/palettes/13.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/14.pal b/data/tilesets/secondary/vermilion_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/14.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/15.pal b/data/tilesets/secondary/vermilion_city/palettes/15.pal
index ac0d32eb0..ac0d32eb0 100644
--- a/data/tilesets/secondary/82D4B24/palettes/15.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/2.pal b/data/tilesets/secondary/vermilion_city/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D504C/palettes/2.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/3.pal b/data/tilesets/secondary/vermilion_city/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D50AC/palettes/3.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/4.pal b/data/tilesets/secondary/vermilion_city/palettes/4.pal
index 5871a448c..5871a448c 100644
--- a/data/tilesets/secondary/82D50AC/palettes/4.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/5.pal b/data/tilesets/secondary/vermilion_city/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D50AC/palettes/5.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/6.pal b/data/tilesets/secondary/vermilion_city/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D50AC/palettes/6.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/7.pal b/data/tilesets/secondary/vermilion_city/palettes/7.pal
index 17b1a0ed2..17b1a0ed2 100644
--- a/data/tilesets/secondary/82D4B24/palettes/7.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/8.pal b/data/tilesets/secondary/vermilion_city/palettes/8.pal
index 7179b91bd..7179b91bd 100644
--- a/data/tilesets/secondary/82D4B24/palettes/8.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/9.pal b/data/tilesets/secondary/vermilion_city/palettes/9.pal
index 746dac7da..746dac7da 100644
--- a/data/tilesets/secondary/82D4B24/palettes/9.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B24/tiles.png b/data/tilesets/secondary/vermilion_city/tiles.png
index 8cfa9b4dd..8cfa9b4dd 100644
--- a/data/tilesets/secondary/82D4B24/tiles.png
+++ b/data/tilesets/secondary/vermilion_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D34/metatile_attributes.bin b/data/tilesets/secondary/vermilion_gym/metatile_attributes.bin
index a5e733de0..a5e733de0 100644
--- a/data/tilesets/secondary/82D4D34/metatile_attributes.bin
+++ b/data/tilesets/secondary/vermilion_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D34/metatiles.bin b/data/tilesets/secondary/vermilion_gym/metatiles.bin
index 25a46724b..25a46724b 100644
--- a/data/tilesets/secondary/82D4D34/metatiles.bin
+++ b/data/tilesets/secondary/vermilion_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F44/palettes/0.pal b/data/tilesets/secondary/vermilion_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4F44/palettes/0.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/1.pal b/data/tilesets/secondary/vermilion_gym/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4E84/palettes/1.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/10.pal b/data/tilesets/secondary/vermilion_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/10.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/11.pal b/data/tilesets/secondary/vermilion_gym/palettes/11.pal
index 9fa42f21f..9fa42f21f 100644
--- a/data/tilesets/secondary/82D4D34/palettes/11.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/12.pal b/data/tilesets/secondary/vermilion_gym/palettes/12.pal
index 5e2756cc9..5e2756cc9 100644
--- a/data/tilesets/secondary/82D4D34/palettes/12.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/13.pal b/data/tilesets/secondary/vermilion_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/13.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/14.pal b/data/tilesets/secondary/vermilion_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5094/palettes/14.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/15.pal b/data/tilesets/secondary/vermilion_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/15.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/2.pal b/data/tilesets/secondary/vermilion_gym/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4E84/palettes/2.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/3.pal b/data/tilesets/secondary/vermilion_gym/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4E84/palettes/3.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/4.pal b/data/tilesets/secondary/vermilion_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F44/palettes/4.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/5.pal b/data/tilesets/secondary/vermilion_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F44/palettes/5.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/6.pal b/data/tilesets/secondary/vermilion_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/6.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/7.pal b/data/tilesets/secondary/vermilion_gym/palettes/7.pal
index efd64bcc5..efd64bcc5 100644
--- a/data/tilesets/secondary/82D4D34/palettes/7.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/8.pal b/data/tilesets/secondary/vermilion_gym/palettes/8.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/8.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/9.pal b/data/tilesets/secondary/vermilion_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/9.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D34/tiles.png b/data/tilesets/secondary/vermilion_gym/tiles.png
index 1baac0893..1baac0893 100644
--- a/data/tilesets/secondary/82D4D34/tiles.png
+++ b/data/tilesets/secondary/vermilion_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4AC4/metatile_attributes.bin b/data/tilesets/secondary/viridian_city/metatile_attributes.bin
index ee2d7d5b3..ee2d7d5b3 100644
--- a/data/tilesets/secondary/82D4AC4/metatile_attributes.bin
+++ b/data/tilesets/secondary/viridian_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4AC4/metatiles.bin b/data/tilesets/secondary/viridian_city/metatiles.bin
index 297673a4b..297673a4b 100644
--- a/data/tilesets/secondary/82D4AC4/metatiles.bin
+++ b/data/tilesets/secondary/viridian_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D50AC/palettes/0.pal b/data/tilesets/secondary/viridian_city/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D50AC/palettes/0.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/1.pal b/data/tilesets/secondary/viridian_city/palettes/1.pal
index cf1123812..cf1123812 100644
--- a/data/tilesets/secondary/82D4B84/palettes/1.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/10.pal b/data/tilesets/secondary/viridian_city/palettes/10.pal
index 4baf904ae..4baf904ae 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/10.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/11.pal b/data/tilesets/secondary/viridian_city/palettes/11.pal
index 2e92b3cc3..2e92b3cc3 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/11.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/12.pal b/data/tilesets/secondary/viridian_city/palettes/12.pal
index 70ed40322..70ed40322 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/12.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/13.pal b/data/tilesets/secondary/viridian_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5094/palettes/13.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/14.pal b/data/tilesets/secondary/viridian_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50AC/palettes/14.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/15.pal b/data/tilesets/secondary/viridian_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50AC/palettes/15.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/2.pal b/data/tilesets/secondary/viridian_city/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D5064/palettes/2.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/3.pal b/data/tilesets/secondary/viridian_city/palettes/3.pal
index 5a5e60211..5a5e60211 100644
--- a/data/tilesets/secondary/82D4B84/palettes/3.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/4.pal b/data/tilesets/secondary/viridian_city/palettes/4.pal
index 229f9132c..229f9132c 100644
--- a/data/tilesets/secondary/82D4B84/palettes/4.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/5.pal b/data/tilesets/secondary/viridian_city/palettes/5.pal
index 215dd1272..215dd1272 100644
--- a/data/tilesets/secondary/82D4B84/palettes/5.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/6.pal b/data/tilesets/secondary/viridian_city/palettes/6.pal
index 7e7862a19..7e7862a19 100644
--- a/data/tilesets/secondary/82D4B84/palettes/6.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/7.pal b/data/tilesets/secondary/viridian_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/7.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/8.pal b/data/tilesets/secondary/viridian_city/palettes/8.pal
index 219129eba..219129eba 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/8.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/9.pal b/data/tilesets/secondary/viridian_city/palettes/9.pal
index 0aa2b58dc..0aa2b58dc 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/9.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4AC4/tiles.png b/data/tilesets/secondary/viridian_city/tiles.png
index 39b80d8f9..39b80d8f9 100644
--- a/data/tilesets/secondary/82D4AC4/tiles.png
+++ b/data/tilesets/secondary/viridian_city/tiles.png
diff --git a/data/tilesets/secondary/82D4DC4/metatile_attributes.bin b/data/tilesets/secondary/viridian_forest/metatile_attributes.bin
index 990d6861c..990d6861c 100644
--- a/data/tilesets/secondary/82D4DC4/metatile_attributes.bin
+++ b/data/tilesets/secondary/viridian_forest/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DC4/metatiles.bin b/data/tilesets/secondary/viridian_forest/metatiles.bin
index cd0bd5f53..cd0bd5f53 100644
--- a/data/tilesets/secondary/82D4DC4/metatiles.bin
+++ b/data/tilesets/secondary/viridian_forest/metatiles.bin
diff --git a/data/tilesets/secondary/82D5004/palettes/0.pal b/data/tilesets/secondary/viridian_forest/palettes/0.pal
index 7af5bb7d2..7af5bb7d2 100644
--- a/data/tilesets/secondary/82D5004/palettes/0.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/1.pal b/data/tilesets/secondary/viridian_forest/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D5004/palettes/1.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/10.pal b/data/tilesets/secondary/viridian_forest/palettes/10.pal
index 746437492..746437492 100644
--- a/data/tilesets/secondary/82D5004/palettes/10.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/11.pal b/data/tilesets/secondary/viridian_forest/palettes/11.pal
index 410d5193a..410d5193a 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/11.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/11.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/12.pal b/data/tilesets/secondary/viridian_forest/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D50AC/palettes/12.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/12.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/13.pal b/data/tilesets/secondary/viridian_forest/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50C4/palettes/13.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/13.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/14.pal b/data/tilesets/secondary/viridian_forest/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50C4/palettes/14.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/14.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/15.pal b/data/tilesets/secondary/viridian_forest/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50DC/palettes/15.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/15.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/2.pal b/data/tilesets/secondary/viridian_forest/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D50AC/palettes/2.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/3.pal b/data/tilesets/secondary/viridian_forest/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D5004/palettes/3.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/3.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/4.pal b/data/tilesets/secondary/viridian_forest/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D501C/palettes/4.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/5.pal b/data/tilesets/secondary/viridian_forest/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D5004/palettes/5.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/6.pal b/data/tilesets/secondary/viridian_forest/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D5004/palettes/6.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/6.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/7.pal b/data/tilesets/secondary/viridian_forest/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D50AC/palettes/7.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/8.pal b/data/tilesets/secondary/viridian_forest/palettes/8.pal
index 650a35cc8..650a35cc8 100644
--- a/data/tilesets/secondary/82D5004/palettes/8.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/9.pal b/data/tilesets/secondary/viridian_forest/palettes/9.pal
index df2d04037..df2d04037 100644
--- a/data/tilesets/secondary/82D5004/palettes/9.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DC4/tiles.png b/data/tilesets/secondary/viridian_forest/tiles.png
index 451eb8d5a..451eb8d5a 100644
--- a/data/tilesets/secondary/82D4DC4/tiles.png
+++ b/data/tilesets/secondary/viridian_forest/tiles.png
diff --git a/data/tilesets/secondary/82D4CBC/metatile_attributes.bin b/data/tilesets/secondary/viridian_gym/metatile_attributes.bin
index a84364708..a84364708 100644
--- a/data/tilesets/secondary/82D4CBC/metatile_attributes.bin
+++ b/data/tilesets/secondary/viridian_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CBC/metatiles.bin b/data/tilesets/secondary/viridian_gym/metatiles.bin
index 2980877c1..2980877c1 100644
--- a/data/tilesets/secondary/82D4CBC/metatiles.bin
+++ b/data/tilesets/secondary/viridian_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F5C/palettes/0.pal b/data/tilesets/secondary/viridian_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/0.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/1.pal b/data/tilesets/secondary/viridian_gym/palettes/1.pal
index 3a16a45c7..3a16a45c7 100644
--- a/data/tilesets/secondary/82D4D64/palettes/1.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/10.pal b/data/tilesets/secondary/viridian_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/10.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/11.pal b/data/tilesets/secondary/viridian_gym/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/11.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/12.pal b/data/tilesets/secondary/viridian_gym/palettes/12.pal
index d2c6cb089..d2c6cb089 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/12.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/13.pal b/data/tilesets/secondary/viridian_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50DC/palettes/13.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/14.pal b/data/tilesets/secondary/viridian_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50DC/palettes/14.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/15.pal b/data/tilesets/secondary/viridian_gym/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/15.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/2.pal b/data/tilesets/secondary/viridian_gym/palettes/2.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/82D4D64/palettes/2.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/3.pal b/data/tilesets/secondary/viridian_gym/palettes/3.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/82D4D64/palettes/3.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/4.pal b/data/tilesets/secondary/viridian_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/4.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/5.pal b/data/tilesets/secondary/viridian_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/5.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/6.pal b/data/tilesets/secondary/viridian_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/6.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/7.pal b/data/tilesets/secondary/viridian_gym/palettes/7.pal
index f55e52fe2..f55e52fe2 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/7.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/8.pal b/data/tilesets/secondary/viridian_gym/palettes/8.pal
index 3a7dbc274..3a7dbc274 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/8.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/9.pal b/data/tilesets/secondary/viridian_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/9.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CBC/tiles.png b/data/tilesets/secondary/viridian_gym/tiles.png
index b53b94b96..b53b94b96 100644
--- a/data/tilesets/secondary/82D4CBC/tiles.png
+++ b/data/tilesets/secondary/viridian_gym/tiles.png
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index 5f9ae3107..17f88445a 100644
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -4,7 +4,7 @@
 #define LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F 1
 #define LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F 2
 #define LAYOUT_PALLET_TOWN_GARYS_HOUSE 3
-#define LAYOUT_UNUSED_LAYOUT_82D54D8 4
+#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F 4
 #define LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB 5
 #define LAYOUT_HOUSE1 6
 #define LAYOUT_HOUSE2 7
@@ -14,53 +14,53 @@
 #define LAYOUT_HOUSE3 11
 #define LAYOUT_CERULEAN_CITY_GYM 12
 #define LAYOUT_HOUSE4 13
-#define LAYOUT_UNUSED_LAYOUT_82D6144 14
+#define LAYOUT_LAVARIDGE_TOWN_HERB_SHOP 14
 #define LAYOUT_CELADON_CITY_GYM 15
-#define LAYOUT_UNUSED_LAYOUT_82D6490 16
+#define LAYOUT_RS_POKEMON_CENTER_1F 16
 #define LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE 17
-#define LAYOUT_UNUSED_LAYOUT_82D6654 18
-#define LAYOUT_UNUSED_LAYOUT_82D672C 19
+#define LAYOUT_PACIFIDLOG_TOWN_HOUSE1 18
+#define LAYOUT_PACIFIDLOG_TOWN_HOUSE2 19
 #define LAYOUT_FUCHSIA_CITY_GYM 20
 #define LAYOUT_HOUSE5 21
-#define LAYOUT_UNUSED_LAYOUT_82D6C34 24
+#define LAYOUT_UNUSED1 24
 #define LAYOUT_VERMILION_CITY_GYM 25
 #define LAYOUT_CERULEAN_CITY_BIKE_SHOP 26
 #define LAYOUT_CELADON_CITY_GAME_CORNER 27
 #define LAYOUT_PEWTER_CITY_GYM 28
 #define LAYOUT_FOUR_ISLAND_LORELEIS_HOUSE 30
 #define LAYOUT_THREE_ISLAND_HOUSE1 31
-#define LAYOUT_UNUSED_LAYOUT_82D75F0 32
-#define LAYOUT_UNUSED_LAYOUT_82D7674 33
+#define LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE 32
+#define LAYOUT_FORTREE_CITY_HOUSE1 33
 #define LAYOUT_SAFFRON_CITY_GYM 34
-#define LAYOUT_UNUSED_LAYOUT_82D7CC8 35
+#define LAYOUT_FORTREE_CITY_HOUSE2 35
 #define LAYOUT_CINNABAR_ISLAND_GYM 36
 #define LAYOUT_VIRIDIAN_CITY_GYM 37
-#define LAYOUT_UNUSED_LAYOUT_82D88C8 46
+#define LAYOUT_RS_SAFARI_ZONE_ENTRANCE 46
 #define LAYOUT_BATTLE_COLOSSEUM_2P 47
 #define LAYOUT_TRADE_CENTER 48
 #define LAYOUT_RECORD_CENTER 49
 #define LAYOUT_BATTLE_COLOSSEUM_4P 50
 #define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 51
-#define LAYOUT_UNUSED_LAYOUT_82D9B24 52
-#define LAYOUT_UNUSED_LAYOUT_82DA7C8 53
-#define LAYOUT_UNUSED_LAYOUT_82DB46C 54
-#define LAYOUT_UNUSED_LAYOUT_82DB4F0 55
-#define LAYOUT_UNUSED_LAYOUT_82DBBE0 57
-#define LAYOUT_UNUSED_LAYOUT_82DBDD8 62
-#define LAYOUT_UNUSED_LAYOUT_82DBFB8 63
-#define LAYOUT_UNUSED_LAYOUT_82DC4EC 64
-#define LAYOUT_UNUSED_LAYOUT_82DC60C 65
-#define LAYOUT_UNUSED_LAYOUT_82DC72C 66
-#define LAYOUT_UNUSED_LAYOUT_82DC84C 67
-#define LAYOUT_UNUSED_LAYOUT_82DCA70 68
-#define LAYOUT_UNUSED_LAYOUT_82DCB44 69
-#define LAYOUT_UNUSED_LAYOUT_82DCC40 70
-#define LAYOUT_UNUSED_LAYOUT_82DCCD4 71
-#define LAYOUT_UNUSED_LAYOUT_82DCD68 72
-#define LAYOUT_UNUSED_LAYOUT_82DCDFC 73
-#define LAYOUT_UNUSED_LAYOUT_82DCF00 74
-#define LAYOUT_UNUSED_LAYOUT_82DD004 75
-#define LAYOUT_UNUSED_LAYOUT_82DD0DC 77
+#define LAYOUT_RS_SAFARI_ZONE_NORTHEAST 52
+#define LAYOUT_RS_SAFARI_ZONE_SOUTHWEST 53
+#define LAYOUT_RS_SAFARI_ZONE_SOUTHEAST 54
+#define LAYOUT_FORTREE_CITY_DECORATION_SHOP 55
+#define LAYOUT_RS_BATTLE_TOWER 57
+#define LAYOUT_SS_TIDAL_CORRIDOR 62
+#define LAYOUT_SS_TIDAL_LOWER_DECK 63
+#define LAYOUT_SS_TIDAL_ROOMS 64
+#define LAYOUT_RUSTBORO_CITY_FLAT2_1F 65
+#define LAYOUT_RUSTBORO_CITY_FLAT2_2F 66
+#define LAYOUT_RUSTBORO_CITY_FLAT2_3F 67
+#define LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME 68
+#define LAYOUT_MOSSDEEP_CITY_EREADER_TRAINER_HOUSE_1F 69
+#define LAYOUT_MOSSDEEP_CITY_EREADER_TRAINER_HOUSE_2F 70
+#define LAYOUT_SOOTOPOLIS_CITY_HOUSE1 71
+#define LAYOUT_SOOTOPOLIS_CITY_HOUSE2 72
+#define LAYOUT_SOOTOPOLIS_CITY_HOUSE3 73
+#define LAYOUT_RUSTBORO_CITY_FLAT1_1F 74
+#define LAYOUT_RUSTBORO_CITY_FLAT1_2F 75
+#define LAYOUT_RS_SAFARI_ZONE_REST_HOUSE 77
 #define LAYOUT_PALLET_TOWN 78
 #define LAYOUT_VIRIDIAN_CITY 79
 #define LAYOUT_PEWTER_CITY 80
@@ -71,7 +71,7 @@
 #define LAYOUT_FUCHSIA_CITY 85
 #define LAYOUT_CINNABAR_ISLAND 86
 #define LAYOUT_INDIGO_PLATEAU_EXTERIOR 87
-#define LAYOUT_SAFFRON_CITY_CLASSIC 88
+#define LAYOUT_SAFFRON_CITY_CONNECTION 88
 #define LAYOUT_ROUTE1 89
 #define LAYOUT_ROUTE2 90
 #define LAYOUT_ROUTE3 91
@@ -224,10 +224,10 @@
 #define LAYOUT_TWO_ISLAND_CAPE_BRINK 239
 #define LAYOUT_THREE_ISLAND_BOND_BRIDGE 240
 #define LAYOUT_THREE_ISLAND_PORT 241
-#define LAYOUT_UNKNOWN_MAP_03_50 242
-#define LAYOUT_UNKNOWN_MAP_03_51 243
-#define LAYOUT_UNKNOWN_MAP_03_52 244
-#define LAYOUT_UNKNOWN_MAP_03_53 245
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_6 242
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_7 243
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_8 244
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_9 245
 #define LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS 246
 #define LAYOUT_FIVE_ISLAND_WATER_LABYRINTH 247
 #define LAYOUT_FIVE_ISLAND_MEADOW 248
@@ -240,17 +240,17 @@
 #define LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE 255
 #define LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON 256
 #define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS 257
-#define LAYOUT_UNUSED_LAYOUT_833614C 258
-#define LAYOUT_UNUSED_LAYOUT_83377F0 259
-#define LAYOUT_UNUSED_LAYOUT_8338354 260
-#define LAYOUT_UNUSED_LAYOUT_8338738 261
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_22 258
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_23_EAST 259
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_23_WEST 260
+#define LAYOUT_PROTOTYPE_SEVII_ISLE_24 261
 #define LAYOUT_UNION_ROOM 262
 #define LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB 263
-#define LAYOUT_UNUSED_LAYOUT_8338B4C 264
+#define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN 264
 #define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2 265
 #define LAYOUT_VIRIDIAN_CITY_HOUSE2 266
-#define LAYOUT_UNUSED_LAYOUT_8338E90 267
-#define LAYOUT_UNUSED_LAYOUT_833902C 268
+#define LAYOUT_CELADON_CITY_RESTAURANT_DUPLICATE 267
+#define LAYOUT_CELADON_CITY_HOTEL_DUPLICATE 268
 #define LAYOUT_MT_EMBER_RUBY_PATH_B4F 269
 #define LAYOUT_THREE_ISLAND_BERRY_FOREST 270
 #define LAYOUT_ONE_ISLAND_POKEMON_CENTER_1F 271
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index fe7178dcf..27e74b337 100644
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -207,7 +207,7 @@
 #define MAP_CINNABAR_ISLAND                      (8 | (3 << 8))
 #define MAP_INDIGO_PLATEAU_EXTERIOR              (9 | (3 << 8))
 #define MAP_SAFFRON_CITY                         (10 | (3 << 8))
-#define MAP_SAFFRON_CITY_CLASSIC                 (11 | (3 << 8))
+#define MAP_SAFFRON_CITY_CONNECTION              (11 | (3 << 8))
 #define MAP_ONE_ISLAND                           (12 | (3 << 8))
 #define MAP_TWO_ISLAND                           (13 | (3 << 8))
 #define MAP_THREE_ISLAND                         (14 | (3 << 8))
@@ -246,10 +246,10 @@
 #define MAP_TWO_ISLAND_CAPE_BRINK                (47 | (3 << 8))
 #define MAP_THREE_ISLAND_BOND_BRIDGE             (48 | (3 << 8))
 #define MAP_THREE_ISLAND_PORT                    (49 | (3 << 8))
-#define MAP_UNKNOWN_MAP_03_50                    (50 | (3 << 8))
-#define MAP_UNKNOWN_MAP_03_51                    (51 | (3 << 8))
-#define MAP_UNKNOWN_MAP_03_52                    (52 | (3 << 8))
-#define MAP_UNKNOWN_MAP_03_53                    (53 | (3 << 8))
+#define MAP_PROTOTYPE_SEVII_ISLE_6               (50 | (3 << 8))
+#define MAP_PROTOTYPE_SEVII_ISLE_7               (51 | (3 << 8))
+#define MAP_PROTOTYPE_SEVII_ISLE_8               (52 | (3 << 8))
+#define MAP_PROTOTYPE_SEVII_ISLE_9               (53 | (3 << 8))
 #define MAP_FIVE_ISLAND_RESORT_GORGEOUS          (54 | (3 << 8))
 #define MAP_FIVE_ISLAND_WATER_LABYRINTH          (55 | (3 << 8))
 #define MAP_FIVE_ISLAND_MEADOW                   (56 | (3 << 8))
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index 0ef192b73..1b3af7b96 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -1,14 +1,14 @@
 #ifndef GUARD_METATILE_LABELS_H
 #define GUARD_METATILE_LABELS_H
 
-// General
+// gTileset_General
 #define METATILE_General_CalmWater  0x12B
 
-// PokeMart
-#define METATILE_Shop_CounterMid_Top     0x2BF
-#define METATILE_Shop_CounterMid_Bottom  0x2C0     
+// gTileset_Mart
+#define METATILE_Mart_CounterMid_Top     0x2BF
+#define METATILE_Mart_CounterMid_Bottom  0x2C0     
 
-// Vermilion Gym
+// gTileset_VermilionGym
 #define METATILE_VermilionGym_Floor                             0x281
 #define METATILE_VermilionGym_Beam_MidTop                       0x285
 #define METATILE_VermilionGym_Beam_MidBottom                    0x28D
@@ -39,7 +39,7 @@
 #define METATILE_VermilionGym_Beam_Node_BottomRight_Edge_HalfOn 0x2C6
 #define METATILE_VermilionGym_Beam_Node_BottomRight_HalfOn      0x2C7
 
-// Celadon Game Corner
+// gTileset_GameCorner
 #define METATILE_GameCorner_Floor_ShadeFull          0x292
 #define METATILE_GameCorner_Floor_StairsTop          0x29D
 #define METATILE_GameCorner_StairsTop                0x29E
@@ -48,7 +48,7 @@
 #define METATILE_GameCorner_PurpleWall_StairsTop     0x2A6
 #define METATILE_GameCorner_PurpleWall_stairsBottom  0x2A7
 
-// Pokemon Mansion
+// gTileset_PokemonMansion
 #define METATILE_PokemonMansion_Floor                                    0x284
 #define METATILE_PokemonMansion_Floor_ShadeFull                          0x285
 #define METATILE_PokemonMansion_BasementFloor                            0x286
@@ -81,7 +81,7 @@
 #define METATILE_PokemonMansion_Statue_RedEyes_Shade                     0x34E
 #define METATILE_PokemonMansion_Statue_RedEyes_Basement                  0x34F
 
-// Rocket Hideout, Rocket Warehouse, Silph Co, elevators
+// gTileset_SilphCo  TODO: Bring below metatile labels in line with new tileset name
 #define METATILE_Hideout_Arrow_Up               0x2A0
 #define METATILE_Hideout_Arrow_Left             0x2A1
 #define METATILE_Hideout_Arrow_Down             0x2A8
@@ -93,7 +93,7 @@
 #define METATILE_Hideout_Floor                  0x281
 #define METATILE_Hideout_Floor_ShadeFull        0x282
 
-// Cinnabar Gym
+// gTileset_CinnabarGym
 #define METATILE_CinnabarGym_Floor                  0x281
 #define METATILE_CinnabarGym_Floor_ShadeDiagonal    0x282
 #define METATILE_CinnabarGym_Floor_ShadeFull        0x289
@@ -103,10 +103,10 @@
 #define METATILE_CinnabarGym_Floor_WallLeftEdge     0x2CF
 #define METATILE_CinnabarGym_Wall_RetractedBarrier  0x2D1
 
-// gTileset_82D504C. Below metatile probably needs generic name
+// gTileset_MtEmber
 #define METATILE_MtEmber_CaveEntrance  0x346
 
-// Trainer Tower
+// gTileset_TrainerTower
 #define METATILE_TrainerTower_Floor_ShadeBottomLeft  0x287
 #define METATILE_TrainerTower_CounterBarrier         0x2B4
 
diff --git a/src/region_map.c b/src/region_map.c
index b2f08e39a..4335b7d96 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1269,10 +1269,10 @@ static const u8 sMapsecToSpawn[][3] = {
     [MAPSEC_CAPE_BRINK         - MAPSECS_KANTO] = {MAP_GROUP(TWO_ISLAND_CAPE_BRINK), MAP_NUM(TWO_ISLAND_CAPE_BRINK), 0},
     [MAPSEC_BOND_BRIDGE        - MAPSECS_KANTO] = {MAP_GROUP(THREE_ISLAND_BOND_BRIDGE), MAP_NUM(THREE_ISLAND_BOND_BRIDGE), 0},
     [MAPSEC_THREE_ISLE_PORT    - MAPSECS_KANTO] = {MAP_GROUP(THREE_ISLAND_PORT), MAP_NUM(THREE_ISLAND_PORT), 0},
-    [MAPSEC_SEVII_ISLE_6       - MAPSECS_KANTO] = {MAP_GROUP(UNKNOWN_MAP_03_50), MAP_NUM(UNKNOWN_MAP_03_50), 0},
-    [MAPSEC_SEVII_ISLE_7       - MAPSECS_KANTO] = {MAP_GROUP(UNKNOWN_MAP_03_51), MAP_NUM(UNKNOWN_MAP_03_51), 0},
-    [MAPSEC_SEVII_ISLE_8       - MAPSECS_KANTO] = {MAP_GROUP(UNKNOWN_MAP_03_52), MAP_NUM(UNKNOWN_MAP_03_52), 0},
-    [MAPSEC_SEVII_ISLE_9       - MAPSECS_KANTO] = {MAP_GROUP(UNKNOWN_MAP_03_53), MAP_NUM(UNKNOWN_MAP_03_53), 0},
+    [MAPSEC_SEVII_ISLE_6       - MAPSECS_KANTO] = {MAP_GROUP(PROTOTYPE_SEVII_ISLE_6), MAP_NUM(PROTOTYPE_SEVII_ISLE_6), 0},
+    [MAPSEC_SEVII_ISLE_7       - MAPSECS_KANTO] = {MAP_GROUP(PROTOTYPE_SEVII_ISLE_7), MAP_NUM(PROTOTYPE_SEVII_ISLE_7), 0},
+    [MAPSEC_SEVII_ISLE_8       - MAPSECS_KANTO] = {MAP_GROUP(PROTOTYPE_SEVII_ISLE_8), MAP_NUM(PROTOTYPE_SEVII_ISLE_8), 0},
+    [MAPSEC_SEVII_ISLE_9       - MAPSECS_KANTO] = {MAP_GROUP(PROTOTYPE_SEVII_ISLE_9), MAP_NUM(PROTOTYPE_SEVII_ISLE_9), 0},
     [MAPSEC_RESORT_GORGEOUS    - MAPSECS_KANTO] = {MAP_GROUP(FIVE_ISLAND_RESORT_GORGEOUS), MAP_NUM(FIVE_ISLAND_RESORT_GORGEOUS), 0},
     [MAPSEC_WATER_LABYRINTH    - MAPSECS_KANTO] = {MAP_GROUP(FIVE_ISLAND_WATER_LABYRINTH), MAP_NUM(FIVE_ISLAND_WATER_LABYRINTH), 0},
     [MAPSEC_FIVE_ISLE_MEADOW   - MAPSECS_KANTO] = {MAP_GROUP(FIVE_ISLAND_MEADOW), MAP_NUM(FIVE_ISLAND_MEADOW), 0},
diff --git a/src/tileset_anims.c b/src/tileset_anims.c
index 44e86448f..dd0fe453d 100644
--- a/src/tileset_anims.c
+++ b/src/tileset_anims.c
@@ -232,7 +232,7 @@ static void sub_8070120(u16 timer)
         sub_80700A4(timer >> 4);
 }
 
-void sub_8070154(void)
+void InitTilesetAnim_General(void)
 {
     sPrimaryTilesetAnimCounter = 0;
     sPrimaryTilesetAnimCounterMax = 640;
@@ -250,7 +250,7 @@ static void sub_80701AC(u16 timer)
         sub_807017C(timer / 12);
 }
 
-void sub_80701D8(void)
+void InitTilesetAnim_CeladonCity(void)
 {
     sSecondaryTilesetAnimCounter = 0;
     sSecondaryTilesetAnimCounterMax = 120;
@@ -268,7 +268,7 @@ static void sub_8070224(u16 timer)
         sub_80701FC(timer / 10);
 }
 
-void sub_8070250(void)
+void InitTilesetAnim_SilphCo(void)
 {
     sSecondaryTilesetAnimCounter = 0;
     sSecondaryTilesetAnimCounterMax = 160;
@@ -286,7 +286,7 @@ static void sub_807029C(u16 timer)
         sub_8070274(timer >> 4);
 }
 
-void sub_80702B4(void)
+void InitTilesetAnim_MtEmber(void)
 {
     sSecondaryTilesetAnimCounter = 0;
     sSecondaryTilesetAnimCounterMax = 256;
@@ -306,7 +306,7 @@ static void sub_8070304(u16 timer)
         sub_80702DC(timer >> 1);
 }
 
-void sub_807031C(void)
+void InitTilesetAnim_VermilionGym(void)
 {
     sSecondaryTilesetAnimCounter = 0;
     sSecondaryTilesetAnimCounterMax = 240;
@@ -326,7 +326,7 @@ static void sub_8070368(u16 timer)
         sub_8070340(timer >> 4);
 }
 
-void sub_8070380(void)
+void InitTilesetAnim_CeladonGym(void)
 {
     sSecondaryTilesetAnimCounter = 0;
     sSecondaryTilesetAnimCounterMax = 256;
diff --git a/tileset_rules.mk b/tileset_rules.mk
index 7e994e24f..f20a6dca3 100644
--- a/tileset_rules.mk
+++ b/tileset_rules.mk
@@ -1,202 +1,202 @@
 TILESETGFXDIR := data/tilesets
 
-$(TILESETGFXDIR)/primary/82D4BB4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/primary/building/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 640
 
-$(TILESETGFXDIR)/primary/82D4A94/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/primary/general/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 640
 
-$(TILESETGFXDIR)/secondary/82D4AAC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/pallet_town/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 76
 
-$(TILESETGFXDIR)/secondary/82D4B0C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/lavender_town/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 256
 
-$(TILESETGFXDIR)/secondary/82D4B6C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/cinnabar_island/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 128
 
-$(TILESETGFXDIR)/secondary/82D4BE4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 376
 
-$(TILESETGFXDIR)/secondary/82D4C44/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/cable_club/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 632
 
-$(TILESETGFXDIR)/secondary/82D4CA4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/fuchsia_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 92
 
-$(TILESETGFXDIR)/secondary/82D4D04/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/pewter_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 207
 
-$(TILESETGFXDIR)/secondary/82D4D64/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/saffron_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 82
 
-$(TILESETGFXDIR)/secondary/82D4DC4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/viridian_forest/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 101
 
-$(TILESETGFXDIR)/secondary/82D4E24/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/seafoam_islands/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 318
 
-$(TILESETGFXDIR)/secondary/82D4E84/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/generic_building2/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 152
 
-$(TILESETGFXDIR)/secondary/82D4EE4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/underground_path/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 50
 
-$(TILESETGFXDIR)/secondary/82D4F44/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/restaurant_hotel/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 76
 
-$(TILESETGFXDIR)/secondary/82D4FA4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/burgled_house/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 172
 
-$(TILESETGFXDIR)/secondary/82D5004/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/berry_forest/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 101
 
-$(TILESETGFXDIR)/secondary/82D5064/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/sevii_islands_45/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 374
 
-$(TILESETGFXDIR)/secondary/82D50C4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/pokemon_league/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 340
 
-$(TILESETGFXDIR)/secondary/82D4AC4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/viridian_city/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 112
 
-$(TILESETGFXDIR)/secondary/82D4B24/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/vermilion_city/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 140
 
-$(TILESETGFXDIR)/secondary/82D4B84/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/indigo_plateau/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 247
 
-$(TILESETGFXDIR)/secondary/82D4BFC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/cave/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 256
 
-$(TILESETGFXDIR)/secondary/82D4C5C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/bike_shop/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 60
 
-$(TILESETGFXDIR)/secondary/82D4CBC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/viridian_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 90
 
-$(TILESETGFXDIR)/secondary/82D4D1C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/cerulean_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 119
 
-$(TILESETGFXDIR)/secondary/82D4D7C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/cinnabar_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 146
 
-$(TILESETGFXDIR)/secondary/82D4DDC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/unused_gatehouse1/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 144
 
-$(TILESETGFXDIR)/secondary/82D4E3C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/unused_gatehouse2/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 144
 
-$(TILESETGFXDIR)/secondary/82D4E9C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/power_plant/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 80
 
-$(TILESETGFXDIR)/secondary/82D4EFC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/pokemon_tower/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 128
 
-$(TILESETGFXDIR)/secondary/82D4F5C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/school/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 50
 
-$(TILESETGFXDIR)/secondary/82D4FBC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/dummy3/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 2
 
-$(TILESETGFXDIR)/secondary/82D501C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 282
 
-$(TILESETGFXDIR)/secondary/82D507C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/sevii_islands_67/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 374
 
-$(TILESETGFXDIR)/secondary/82D50DC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/hall_of_fame/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 208
 
-$(TILESETGFXDIR)/secondary/82D4ADC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/pewter_city/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 280
 
-$(TILESETGFXDIR)/secondary/82D4B3C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/celadon_city/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 244
 
-$(TILESETGFXDIR)/secondary/82D4B9C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/saffron_city/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 262
 
-$(TILESETGFXDIR)/secondary/82D4C14/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/dummy1/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 2
 
-$(TILESETGFXDIR)/secondary/82D4C74/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/generic_building1/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 63
 
-$(TILESETGFXDIR)/secondary/82D4CD4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/hoenn_building/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 383
 
-$(TILESETGFXDIR)/secondary/82D4D34/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/vermilion_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 247
 
-$(TILESETGFXDIR)/secondary/82D4D94/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/ss_anne/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 245
 
-$(TILESETGFXDIR)/secondary/82D4DF4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/rock_tunnel/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 256
 
-$(TILESETGFXDIR)/secondary/82D4E54/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/cerulean_cave/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 246
 
-$(TILESETGFXDIR)/secondary/82D4EB4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/sea_cottage/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 68
 
-$(TILESETGFXDIR)/secondary/82D4F14/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/safari_zone_building/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 90
 
-$(TILESETGFXDIR)/secondary/82D4F74/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/fan_club_daycare/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 85
 
-$(TILESETGFXDIR)/secondary/82D4FD4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/dummy4/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 2
 
-$(TILESETGFXDIR)/secondary/82D5034/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/tanoby_ruins/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 74
 
-$(TILESETGFXDIR)/secondary/82D5094/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/trainer_tower/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 343
 
-$(TILESETGFXDIR)/secondary/82D4AF4/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/cerulean_city/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 158
 
-$(TILESETGFXDIR)/secondary/82D4B54/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/fuchsia_city/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 191
 
-$(TILESETGFXDIR)/secondary/82D4BCC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/mart/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 36
 
-$(TILESETGFXDIR)/secondary/82D4C2C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/museum/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 137
 
-$(TILESETGFXDIR)/secondary/82D4C8C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/lab/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 102
 
-$(TILESETGFXDIR)/secondary/82D4CEC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/game_corner/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 171
 
-$(TILESETGFXDIR)/secondary/82D4D4C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/celadon_gym/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 103
 
-$(TILESETGFXDIR)/secondary/82D4DAC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/dummy2/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 2
 
-$(TILESETGFXDIR)/secondary/82D4E0C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/digletts_cave/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 248
 
-$(TILESETGFXDIR)/secondary/82D4E6C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/department_store/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 201
 
-$(TILESETGFXDIR)/secondary/82D4F2C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/pokemon_mansion/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 350
 
-$(TILESETGFXDIR)/secondary/82D4F8C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/condominiums/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 384
 
-$(TILESETGFXDIR)/secondary/82D4FEC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/mt_ember/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 288
 
-$(TILESETGFXDIR)/secondary/82D504C/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/sevii_islands_123/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 374
 
-$(TILESETGFXDIR)/secondary/82D50AC/tiles.4bpp: %.4bpp: %.png
+$(TILESETGFXDIR)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 165