Rename generic building tilesets, SAFFRON_CITY_CLASSIC

data/tilesets/graphics.inc

@@ -896,27 +896,27 @@ gTilesetPalettes_CeruleanCave:: @ 828E3A4
 	.incbin "data/tilesets/secondary/cerulean_cave/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Building2:: @ 828E5A4
-	.incbin "data/tilesets/secondary/building2/tiles.4bpp.lz"
+gTilesetTiles_GenericBuilding2:: @ 828E5A4
+	.incbin "data/tilesets/secondary/generic_building2/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Building2:: @ 828EC70
-	.incbin "data/tilesets/secondary/building2/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/building2/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/building2/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/building2/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/building2/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/building2/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/building2/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/building2/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/building2/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/building2/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/building2/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/building2/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/building2/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/building2/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/building2/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/building2/palettes/15.gbapal"
+gTilesetPalettes_GenericBuilding2:: @ 828EC70
+	.incbin "data/tilesets/secondary/generic_building2/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/15.gbapal"
 
 	.align 2
 gTilesetTiles_PowerPlant:: @ 828EE70

data/tilesets/headers.inc

@@ -220,15 +220,15 @@ gTileset_BikeShop::
 	.4byte gMetatileAttributes_BikeShop
 
 	.align 2
-gTileset_Building1::
+gTileset_GenericBuilding1::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_Building1
-	.4byte gTilesetPalettes_Building1
-	.4byte gMetatiles_Building1
+	.4byte gTilesetTiles_GenericBuilding1
+	.4byte gTilesetPalettes_GenericBuilding1
+	.4byte gMetatiles_GenericBuilding1
 	.4byte 0x0
-	.4byte gMetatileAttributes_Building1
+	.4byte gMetatileAttributes_GenericBuilding1
 
 	.align 2
 gTileset_Lab::
@@ -462,15 +462,15 @@ gTileset_DepartmentStore::
 	.4byte gMetatileAttributes_DepartmentStore
 
 	.align 2
-gTileset_Building2::
+gTileset_GenericBuilding2::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_Building2
-	.4byte gTilesetPalettes_Building2
-	.4byte gMetatiles_Building2
+	.4byte gTilesetTiles_GenericBuilding2
+	.4byte gTilesetPalettes_GenericBuilding2
+	.4byte gMetatiles_GenericBuilding2
 	.4byte 0x0
-	.4byte gMetatileAttributes_Building2
+	.4byte gMetatileAttributes_GenericBuilding2
 
 	.align 2
 gTileset_PowerPlant::

data/tilesets/metatiles.inc

@@ -207,12 +207,12 @@ gMetatileAttributes_PokemonCenter:: @ 82B4A50
 	.incbin "data/tilesets/secondary/pokemon_center/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Building1:: @ 82B4E4C
-	.incbin "data/tilesets/secondary/building1/metatiles.bin"
+gMetatiles_GenericBuilding1:: @ 82B4E4C
+	.incbin "data/tilesets/secondary/generic_building1/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Building1:: @ 82B4FCC
-	.incbin "data/tilesets/secondary/building1/metatile_attributes.bin"
+gMetatileAttributes_GenericBuilding1:: @ 82B4FCC
+	.incbin "data/tilesets/secondary/generic_building1/metatile_attributes.bin"
 
 	.align 1
 gMetatiles_Cave:: @ 82B502C
@@ -319,12 +319,12 @@ gMetatileAttributes_DepartmentStore:: @ 82BEB3C
 	.incbin "data/tilesets/secondary/department_store/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Building2:: @ 82BEF14
-	.incbin "data/tilesets/secondary/building2/metatiles.bin"
+gMetatiles_GenericBuilding2:: @ 82BEF14
+	.incbin "data/tilesets/secondary/generic_building2/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Building2:: @ 82BFA94
-	.incbin "data/tilesets/secondary/building2/metatile_attributes.bin"
+gMetatileAttributes_GenericBuilding2:: @ 82BFA94
+	.incbin "data/tilesets/secondary/generic_building2/metatile_attributes.bin"
 
 	.align 1
 gMetatiles_PowerPlant:: @ 82BFD74