Merge pull request #249 from GriffinRichards/doc-tilesets

Label tilesets and remaining layouts
2026-10-01 13:29:23 -05:00 · 2020-02-16 12:20:58 -05:00
parent 9addd6a6b6 2c92f89adc
commit 1d2c452a6a
1393 changed files with 3224 additions and 3224 deletions
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -283,7 +283,7 @@ gStdScriptsEnd::
 	.include "data/maps/CinnabarIsland/scripts.inc"
 	.include "data/maps/IndigoPlateau_Exterior/scripts.inc"
 	.include "data/maps/SaffronCity/scripts.inc"
-	.include "data/maps/SaffronCity_Classic/scripts.inc"
+	.include "data/maps/SaffronCity_Connection/scripts.inc"
 	.include "data/maps/OneIsland/scripts.inc"
 	.include "data/maps/TwoIsland/scripts.inc"
 	.include "data/maps/ThreeIsland/scripts.inc"
@@ -322,10 +322,10 @@ gStdScriptsEnd::
 	.include "data/maps/TwoIsland_CapeBrink/scripts.inc"
 	.include "data/maps/ThreeIsland_BondBridge/scripts.inc"
 	.include "data/maps/ThreeIsland_Port/scripts.inc"
-	.include "data/maps/UnknownMap_03_50/scripts.inc"
-	.include "data/maps/UnknownMap_03_51/scripts.inc"
-	.include "data/maps/UnknownMap_03_52/scripts.inc"
-	.include "data/maps/UnknownMap_03_53/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_6/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_7/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_8/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_9/scripts.inc"
 	.include "data/maps/FiveIsland_ResortGorgeous/scripts.inc"
 	.include "data/maps/FiveIsland_WaterLabyrinth/scripts.inc"
 	.include "data/maps/FiveIsland_Meadow/scripts.inc"
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -16387,26 +16387,26 @@ gUnionRoomChatIcons:: @ 8EA1A50
 	.incbin "graphics/interface/union_room_chat_icons.4bpp.lz"

 	.align 2
-gTilesetPalettes_8EA1B68:: @ 8EA1B68
-	.incbin "data/tilesets/primary/82D4A94/palettes/0.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/1.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/2.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/3.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/4.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/5.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/6.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/7.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/8.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/9.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/10.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/11.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/12.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/13.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/14.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/15.gbapal"
+gTilesetPalettes_General:: @ 8EA1B68
+	.incbin "data/tilesets/primary/general/palettes/0.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/1.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/2.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/3.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/4.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/5.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/6.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/7.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/8.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/9.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/10.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/11.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/12.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/13.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/14.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/15.gbapal"

-gTilesetTiles_8EA1D68:: @ 8EA1D68
-	.incbin "data/tilesets/primary/82D4A94/tiles.4bpp.lz"
+gTilesetTiles_General:: @ 8EA1D68
+	.incbin "data/tilesets/primary/general/tiles.4bpp.lz"

 gBerryFixGameboy_Pal:: @ 8EA463C
 	.incbin "graphics/berry_fix/gba_small.gbapal"
@@ -16463,50 +16463,50 @@ gBerryFixWindow_Tilemap:: @ 8EA9588
 	.incbin "graphics/berry_fix/window.bin.lz"

 	.align 2
-gTilesetPalettes_8EA97F4:: @ 8EA97F4
-	.incbin "data/tilesets/secondary/82D4C74/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/15.gbapal"
+gTilesetPalettes_GenericBuilding1:: @ 8EA97F4
+	.incbin "data/tilesets/secondary/generic_building1/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/15.gbapal"

 	.align 2
-gTilesetTiles_8EA99F4:: @ 8EA99F4
-	.incbin "data/tilesets/secondary/82D4C74/tiles.4bpp.lz"
+gTilesetTiles_GenericBuilding1:: @ 8EA99F4
+	.incbin "data/tilesets/secondary/generic_building1/tiles.4bpp.lz"

 	.align 2
-gTilesetPalettes_8EA9D88:: @ 8EA9D88
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/15.gbapal"
+gTilesetPalettes_DepartmentStore:: @ 8EA9D88
+	.incbin "data/tilesets/secondary/department_store/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/15.gbapal"


-gTilesetTiles_8EA9F88:: @ 8EA9F88
-	.incbin "data/tilesets/secondary/82D4E6C/tiles.4bpp.lz"
+gTilesetTiles_DepartmentStore:: @ 8EA9F88
+	.incbin "data/tilesets/secondary/department_store/tiles.4bpp.lz"

 gUnionRoomChatPanelBgPal_7:: @ 8EAA9F0
 	.incbin "graphics/interface/union_room_chat_panel.gbapal"
--- a/data/layouts/CeladonCity_Hotel_Duplicate/border.bin
+++ b/data/layouts/CeladonCity_Hotel_Duplicate/border.bin
--- a/data/layouts/CeladonCity_Hotel_Duplicate/map.bin
+++ b/data/layouts/CeladonCity_Hotel_Duplicate/map.bin
--- a/data/layouts/CeladonCity_Restaurant_Duplicate/border.bin
+++ b/data/layouts/CeladonCity_Restaurant_Duplicate/border.bin
--- a/data/layouts/CeladonCity_Restaurant_Duplicate/map.bin
+++ b/data/layouts/CeladonCity_Restaurant_Duplicate/map.bin
--- a/data/layouts/EverGrandeCity_HallOfFame/border.bin
+++ b/data/layouts/EverGrandeCity_HallOfFame/border.bin
--- a/data/layouts/EverGrandeCity_HallOfFame/map.bin
+++ b/data/layouts/EverGrandeCity_HallOfFame/map.bin
--- a/data/layouts/FortreeCity_DecorationShop/border.bin
+++ b/data/layouts/FortreeCity_DecorationShop/border.bin
--- a/data/layouts/FortreeCity_DecorationShop/map.bin
+++ b/data/layouts/FortreeCity_DecorationShop/map.bin
--- a/data/layouts/UnusedLayout_82D672C/border.bin
+++ b/data/layouts/UnusedLayout_82D672C/border.bin
--- a/data/layouts/UnusedLayout_82D7674/map.bin
+++ b/data/layouts/UnusedLayout_82D7674/map.bin
--- a/data/layouts/UnusedLayout_82D75F0/border.bin
+++ b/data/layouts/UnusedLayout_82D75F0/border.bin
--- a/data/layouts/UnusedLayout_82D7CC8/map.bin
+++ b/data/layouts/UnusedLayout_82D7CC8/map.bin
--- a/data/layouts/LavaridgeTown_HerbShop/border.bin
+++ b/data/layouts/LavaridgeTown_HerbShop/border.bin
--- a/data/layouts/LavaridgeTown_HerbShop/map.bin
+++ b/data/layouts/LavaridgeTown_HerbShop/map.bin
--- a/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
--- a/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
--- a/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin
--- a/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin
--- a/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin
--- a/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin
--- a/data/layouts/PacifidlogTown_House1/border.bin
+++ b/data/layouts/PacifidlogTown_House1/border.bin
--- a/data/layouts/PacifidlogTown_House1/map.bin
+++ b/data/layouts/PacifidlogTown_House1/map.bin
--- a/data/layouts/PacifidlogTown_House2/border.bin
+++ b/data/layouts/PacifidlogTown_House2/border.bin
--- a/data/layouts/PacifidlogTown_House2/map.bin
+++ b/data/layouts/PacifidlogTown_House2/map.bin
--- a/data/layouts/Prototype_SeviiIsle_22/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_22/border.bin
--- a/data/layouts/Prototype_SeviiIsle_22/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_22/map.bin
--- a/data/layouts/Prototype_SeviiIsle_23_East/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_East/border.bin
--- a/data/layouts/Prototype_SeviiIsle_23_East/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_East/map.bin
--- a/data/layouts/Prototype_SeviiIsle_23_West/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_West/border.bin
--- a/data/layouts/Prototype_SeviiIsle_23_West/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_West/map.bin
--- a/data/layouts/Prototype_SeviiIsle_24/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_24/border.bin
--- a/data/layouts/Prototype_SeviiIsle_24/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_24/map.bin
--- a/data/layouts/Prototype_SeviiIsle_6/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_6/border.bin
--- a/data/layouts/Prototype_SeviiIsle_6/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_6/map.bin
--- a/data/layouts/Prototype_SeviiIsle_7/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_7/border.bin
--- a/data/layouts/Prototype_SeviiIsle_7/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_7/map.bin
--- a/data/layouts/Prototype_SeviiIsle_8/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_8/border.bin
--- a/data/layouts/Prototype_SeviiIsle_8/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_8/map.bin
--- a/data/layouts/Prototype_SeviiIsle_9/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_9/border.bin
--- a/data/layouts/Prototype_SeviiIsle_9/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_9/map.bin
--- a/data/layouts/UnusedLayout_82DBBE0/border.bin
+++ b/data/layouts/UnusedLayout_82DBBE0/border.bin
--- a/data/layouts/UnusedLayout_82DBBE0/map.bin
+++ b/data/layouts/UnusedLayout_82DBBE0/map.bin
--- a/data/layouts/UnusedLayout_82D6490/border.bin
+++ b/data/layouts/UnusedLayout_82D6490/border.bin
--- a/data/layouts/UnusedLayout_82D6490/map.bin
+++ b/data/layouts/UnusedLayout_82D6490/map.bin
--- a/data/layouts/RS_SafariZone_Entrance/border.bin
+++ b/data/layouts/RS_SafariZone_Entrance/border.bin
--- a/data/layouts/RS_SafariZone_Entrance/map.bin
+++ b/data/layouts/RS_SafariZone_Entrance/map.bin
--- a/data/layouts/RS_SafariZone_Northeast/border.bin
+++ b/data/layouts/RS_SafariZone_Northeast/border.bin
--- a/data/layouts/RS_SafariZone_Northeast/map.bin
+++ b/data/layouts/RS_SafariZone_Northeast/map.bin
--- a/data/layouts/RS_SafariZone_RestHouse/border.bin
+++ b/data/layouts/RS_SafariZone_RestHouse/border.bin
--- a/data/layouts/RS_SafariZone_RestHouse/map.bin
+++ b/data/layouts/RS_SafariZone_RestHouse/map.bin
--- a/data/layouts/RS_SafariZone_Southeast/border.bin
+++ b/data/layouts/RS_SafariZone_Southeast/border.bin
--- a/data/layouts/RS_SafariZone_Southeast/map.bin
+++ b/data/layouts/RS_SafariZone_Southeast/map.bin
--- a/data/layouts/RS_SafariZone_Southwest/border.bin
+++ b/data/layouts/RS_SafariZone_Southwest/border.bin
--- a/data/layouts/RS_SafariZone_Southwest/map.bin
+++ b/data/layouts/RS_SafariZone_Southwest/map.bin
--- a/data/layouts/RustboroCity_CuttersHouse/border.bin
+++ b/data/layouts/RustboroCity_CuttersHouse/border.bin
--- a/data/layouts/RustboroCity_CuttersHouse/map.bin
+++ b/data/layouts/RustboroCity_CuttersHouse/map.bin
--- a/data/layouts/RustboroCity_Flat1_1F/border.bin
+++ b/data/layouts/RustboroCity_Flat1_1F/border.bin
--- a/data/layouts/RustboroCity_Flat1_1F/map.bin
+++ b/data/layouts/RustboroCity_Flat1_1F/map.bin
--- a/data/layouts/RustboroCity_Flat1_2F/border.bin
+++ b/data/layouts/RustboroCity_Flat1_2F/border.bin
--- a/data/layouts/RustboroCity_Flat1_2F/map.bin
+++ b/data/layouts/RustboroCity_Flat1_2F/map.bin
--- a/data/layouts/RustboroCity_Flat2_1F/border.bin
+++ b/data/layouts/RustboroCity_Flat2_1F/border.bin
--- a/data/layouts/RustboroCity_Flat2_1F/map.bin
+++ b/data/layouts/RustboroCity_Flat2_1F/map.bin
--- a/data/layouts/RustboroCity_Flat2_2F/border.bin
+++ b/data/layouts/RustboroCity_Flat2_2F/border.bin
--- a/data/layouts/RustboroCity_Flat2_2F/map.bin
+++ b/data/layouts/RustboroCity_Flat2_2F/map.bin
--- a/data/layouts/RustboroCity_Flat2_3F/border.bin
+++ b/data/layouts/RustboroCity_Flat2_3F/border.bin
--- a/data/layouts/RustboroCity_Flat2_3F/map.bin
+++ b/data/layouts/RustboroCity_Flat2_3F/map.bin
--- a/data/layouts/UnusedLayout_82DC84C/border.bin
+++ b/data/layouts/UnusedLayout_82DC84C/border.bin
--- a/data/layouts/UnusedLayout_82DBDD8/map.bin
+++ b/data/layouts/UnusedLayout_82DBDD8/map.bin
--- a/data/layouts/UnusedLayout_82DCCD4/border.bin
+++ b/data/layouts/UnusedLayout_82DCCD4/border.bin
--- a/data/layouts/UnusedLayout_82DBFB8/map.bin
+++ b/data/layouts/UnusedLayout_82DBFB8/map.bin
--- a/data/layouts/UnusedLayout_82DCD68/border.bin
+++ b/data/layouts/UnusedLayout_82DCD68/border.bin
--- a/data/layouts/UnusedLayout_82DC4EC/map.bin
+++ b/data/layouts/UnusedLayout_82DC4EC/map.bin
--- a/data/layouts/SaffronCity_Connection/border.bin
+++ b/data/layouts/SaffronCity_Connection/border.bin
--- a/data/layouts/SaffronCity_Connection/map.bin
+++ b/data/layouts/SaffronCity_Connection/map.bin
--- a/data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin
+++ b/data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin
--- a/data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin
+++ b/data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin
--- a/data/layouts/SootopolisCity_House1/border.bin
+++ b/data/layouts/SootopolisCity_House1/border.bin
--- a/data/layouts/SootopolisCity_House1/map.bin
+++ b/data/layouts/SootopolisCity_House1/map.bin
--- a/data/layouts/SootopolisCity_House2/border.bin
+++ b/data/layouts/SootopolisCity_House2/border.bin
--- a/data/layouts/SootopolisCity_House2/map.bin
+++ b/data/layouts/SootopolisCity_House2/map.bin
--- a/data/layouts/SootopolisCity_House3/border.bin
+++ b/data/layouts/SootopolisCity_House3/border.bin
--- a/data/layouts/SootopolisCity_House3/map.bin
+++ b/data/layouts/SootopolisCity_House3/map.bin
--- a/data/layouts/UnusedLayout_833902C/border.bin
+++ b/data/layouts/UnusedLayout_833902C/border.bin
--- a/data/layouts/UnusedLayout_82D6C34/map.bin
+++ b/data/layouts/UnusedLayout_82D6C34/map.bin
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
--- a/data/maps/Prototype_SeviiIsle_6/map.json
+++ b/data/maps/Prototype_SeviiIsle_6/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_50",
-  "name": "UnknownMap_03_50",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_50",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_6",
+  "name": "Prototype_SeviiIsle_6",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_6",
  "music": "MUS_NANASHIMA",
  "region_map_section": "MAPSEC_SEVII_ISLE_6",
  "requires_flash": false,
--- a/data/maps/Prototype_SeviiIsle_6/scripts.inc
+++ b/data/maps/Prototype_SeviiIsle_6/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_6_MapScripts:: @ 81687E0
+	.byte 0
--- a/data/maps/Prototype_SeviiIsle_7/map.json
+++ b/data/maps/Prototype_SeviiIsle_7/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_51",
-  "name": "UnknownMap_03_51",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_51",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_7",
+  "name": "Prototype_SeviiIsle_7",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_7",
  "music": "MUS_NANASHIMA",
  "region_map_section": "MAPSEC_SEVII_ISLE_7",
  "requires_flash": false,
--- a/data/maps/Prototype_SeviiIsle_7/scripts.inc
+++ b/data/maps/Prototype_SeviiIsle_7/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_7_MapScripts:: @ 81687E1
+	.byte 0
--- a/data/maps/Prototype_SeviiIsle_8/map.json
+++ b/data/maps/Prototype_SeviiIsle_8/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_52",
-  "name": "UnknownMap_03_52",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_52",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_8",
+  "name": "Prototype_SeviiIsle_8",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_8",
  "music": "MUS_NANASHIMA",
  "region_map_section": "MAPSEC_SEVII_ISLE_8",
  "requires_flash": false,
--- a/data/maps/Prototype_SeviiIsle_8/scripts.inc
+++ b/data/maps/Prototype_SeviiIsle_8/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_8_MapScripts:: @ 81687E2
+	.byte 0
--- a/data/maps/Prototype_SeviiIsle_9/map.json
+++ b/data/maps/Prototype_SeviiIsle_9/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_53",
-  "name": "UnknownMap_03_53",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_53",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_9",
+  "name": "Prototype_SeviiIsle_9",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_9",
  "music": "MUS_NANASHIMA",
  "region_map_section": "MAPSEC_SEVII_ISLE_9",
  "requires_flash": false,
--- a/data/maps/Prototype_SeviiIsle_9/scripts.inc
+++ b/data/maps/Prototype_SeviiIsle_9/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_9_MapScripts:: @ 81687E3
+	.byte 0
--- a/data/maps/Route5/map.json
+++ b/data/maps/Route5/map.json
@@ -18,7 +18,7 @@
      "direction": "up"
    },
    {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
      "offset": 0,
      "direction": "down"
    }
--- a/data/maps/Route6/map.json
+++ b/data/maps/Route6/map.json
@@ -13,7 +13,7 @@
  "battle_scene": "BATTLE_SCENE_0",
  "connections": [
    {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
      "offset": 0,
      "direction": "up"
    },
--- a/data/maps/Route7/map.json
+++ b/data/maps/Route7/map.json
@@ -18,7 +18,7 @@
      "direction": "left"
    },
    {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
      "offset": -10,
      "direction": "right"
    }
--- a/data/maps/Route8/map.json
+++ b/data/maps/Route8/map.json
@@ -13,7 +13,7 @@
  "battle_scene": "BATTLE_SCENE_0",
  "connections": [
    {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
      "offset": -10,
      "direction": "left"
    },
--- a/data/maps/SaffronCity_Classic/scripts.inc
+++ b/data/maps/SaffronCity_Classic/scripts.inc
@@ -1,2 +0,0 @@
-SaffronCity_Classic_MapScripts:: @ 8167483
-	.byte 0
--- a/Show More
+++ b/Show More