Label tilesets and remaining layouts

83 files changed, 893 insertions, 893 deletions

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/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 63fc06562..32bed0f52 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_Building1",
       "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_Building1",
       "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_Building2",
       "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_Building1",
+      "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_Building1",
       "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_Building2",
       "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_Building2",
       "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_Building2",
       "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_Building1",
       "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,8 +853,8 @@
       "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"
     },
@@ -865,8 +865,8 @@
       "height": 40,
       "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_Classic/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_Classic/map.bin"
     },
@@ -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_Building2",
       "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_Building2",
       "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_Building2",
       "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_Building2",
       "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_Building2",
       "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_Building2",
       "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_Building2",
       "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_Building2",
       "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_Building2",
       "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_Building2",
       "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_Building1",
       "border_filepath": "data/layouts/SaffronCity_House1_1F/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_House1_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_Building1",
       "border_filepath": "data/layouts/SaffronCity_House1_2F/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_House1_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_Building2",
+      "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_Building2",
       "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_Building2",
       "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/SevenIsland_TrainerTower_Lobby/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_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/SevenIsland_TrainerTower_1F/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_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/SevenIsland_TrainerTower_2F/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_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/SevenIsland_TrainerTower_3F/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_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/SevenIsland_TrainerTower_4F/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_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/SevenIsland_TrainerTower_5F/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_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/SevenIsland_TrainerTower_6F/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_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/SevenIsland_TrainerTower_7F/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_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/SevenIsland_TrainerTower_8F/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_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/SevenIsland_TrainerTower_Roof/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_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/SevenIsland_TrainerTower_Elevator/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_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_Building2",
       "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/UnusedLayout_834BC2C/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834BC2C/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/UnusedLayout_834BEB4/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834BEB4/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/UnusedLayout_834C13C/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834C13C/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/UnusedLayout_834C3C4/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834C3C4/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/UnusedLayout_834C64C/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834C64C/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/UnusedLayout_834C8D4/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834C8D4/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/UnusedLayout_834CB5C/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834CB5C/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/UnusedLayout_834CDE4/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834CDE4/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/UnusedLayout_834D06C/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834D06C/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/UnusedLayout_834D2F4/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834D2F4/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/UnusedLayout_834D57C/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834D57C/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/UnusedLayout_834D804/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834D804/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/UnusedLayout_834DA8C/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834DA8C/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/UnusedLayout_834DD14/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834DD14/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/UnusedLayout_834DF9C/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834DF9C/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/UnusedLayout_834E224/border.bin",
       "blockdata_filepath": "data/layouts/UnusedLayout_834E224/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"
     }