Merge pull request #249 from GriffinRichards/doc-tilesets

Label tilesets and remaining layouts

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/Prototype_SeviiIsle_6/scripts.inc"
-	.include "data/maps/UnknownMap_03_51/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_7/scripts.inc"
-	.include "data/maps/UnknownMap_03_52/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_8/scripts.inc"
-	.include "data/maps/UnknownMap_03_53/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"

data/graphics.s

@@ -16387,26 +16387,26 @@ gUnionRoomChatIcons:: @ 8EA1A50
 	.incbin "graphics/interface/union_room_chat_icons.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_8EA1B68:: @ 8EA1B68
+gTilesetPalettes_General:: @ 8EA1B68
-	.incbin "data/tilesets/primary/82D4A94/palettes/0.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/0.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/1.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/1.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/2.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/2.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/3.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/3.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/4.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/4.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/5.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/5.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/6.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/6.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/7.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/7.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/8.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/8.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/9.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/9.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/10.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/10.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/11.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/11.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/12.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/12.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/13.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/13.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/14.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/14.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/15.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/15.gbapal"
 
-gTilesetTiles_8EA1D68:: @ 8EA1D68
+gTilesetTiles_General:: @ 8EA1D68
-	.incbin "data/tilesets/primary/82D4A94/tiles.4bpp.lz"
+	.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
+gTilesetPalettes_GenericBuilding1:: @ 8EA97F4
-	.incbin "data/tilesets/secondary/82D4C74/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/15.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_8EA99F4:: @ 8EA99F4
+gTilesetTiles_GenericBuilding1:: @ 8EA99F4
-	.incbin "data/tilesets/secondary/82D4C74/tiles.4bpp.lz"
+	.incbin "data/tilesets/secondary/generic_building1/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_8EA9D88:: @ 8EA9D88
+gTilesetPalettes_DepartmentStore:: @ 8EA9D88
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/15.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/15.gbapal"
 
 
-gTilesetTiles_8EA9F88:: @ 8EA9F88
+gTilesetTiles_DepartmentStore:: @ 8EA9F88
-	.incbin "data/tilesets/secondary/82D4E6C/tiles.4bpp.lz"
+	.incbin "data/tilesets/secondary/department_store/tiles.4bpp.lz"
 
 gUnionRoomChatPanelBgPal_7:: @ 8EAA9F0
 	.incbin "graphics/interface/union_room_chat_panel.gbapal"

data/maps/Prototype_SeviiIsle_6/map.json

@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_50",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_6",
-  "name": "UnknownMap_03_50",
+  "name": "Prototype_SeviiIsle_6",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_50",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_6",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_6",
   "requires_flash": false,

data/maps/Prototype_SeviiIsle_6/scripts.inc

@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_6_MapScripts:: @ 81687E0
+	.byte 0

data/maps/Prototype_SeviiIsle_7/map.json

@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_51",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_7",
-  "name": "UnknownMap_03_51",
+  "name": "Prototype_SeviiIsle_7",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_51",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_7",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_7",
   "requires_flash": false,

data/maps/Prototype_SeviiIsle_7/scripts.inc

@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_7_MapScripts:: @ 81687E1
+	.byte 0

data/maps/Prototype_SeviiIsle_8/map.json

@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_52",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_8",
-  "name": "UnknownMap_03_52",
+  "name": "Prototype_SeviiIsle_8",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_52",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_8",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_8",
   "requires_flash": false,

data/maps/Prototype_SeviiIsle_8/scripts.inc

@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_8_MapScripts:: @ 81687E2
+	.byte 0

data/maps/Prototype_SeviiIsle_9/map.json

@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_53",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_9",
-  "name": "UnknownMap_03_53",
+  "name": "Prototype_SeviiIsle_9",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_53",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_9",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_9",
   "requires_flash": false,

data/maps/Prototype_SeviiIsle_9/scripts.inc

@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_9_MapScripts:: @ 81687E3
+	.byte 0

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"
     }

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"
     },

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"
     }

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"
     },

data/maps/SaffronCity_Classic/scripts.inc

@@ -1,2 +0,0 @@
-SaffronCity_Classic_MapScripts:: @ 8167483
-	.byte 0