41 files changed, 39 insertions, 39 deletions
diff --git a/data/tilesets/graphics.inc b/data/tilesets/graphics.inc
index f9f06f42e..6fc9a48f6 100644
--- a/data/tilesets/graphics.inc
+++ b/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"
-
-	.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"
+gTilesetTiles_GenericBuilding2:: @ 828E5A4
+	.incbin "data/tilesets/secondary/generic_building2/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_GenericBuilding2:: @ 828EC70
+	.incbin "data/tilesets/secondary/generic_building2/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/15.gbapal"
 
 	.align 2
 gTilesetTiles_PowerPlant:: @ 828EE70
diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc
index d108ed3a3..cac3cf82f 100644
--- a/data/tilesets/headers.inc
+++ b/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::
diff --git a/data/tilesets/metatiles.inc b/data/tilesets/metatiles.inc
index d98bc1583..7475f8117 100644
--- a/data/tilesets/metatiles.inc
+++ b/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
diff --git a/data/tilesets/secondary/building1/metatile_attributes.bin b/data/tilesets/secondary/generic_building1/metatile_attributes.bin
index be95e451c..be95e451c 100644
--- a/data/tilesets/secondary/building1/metatile_attributes.bin
+++ b/data/tilesets/secondary/generic_building1/metatile_attributes.bin
diff --git a/data/tilesets/secondary/building1/metatiles.bin b/data/tilesets/secondary/generic_building1/metatiles.bin
index 806d040ce..806d040ce 100644
--- a/data/tilesets/secondary/building1/metatiles.bin
+++ b/data/tilesets/secondary/generic_building1/metatiles.bin
diff --git a/data/tilesets/secondary/building1/palettes/0.pal b/data/tilesets/secondary/generic_building1/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/building1/palettes/0.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/0.pal
diff --git a/data/tilesets/secondary/building1/palettes/1.pal b/data/tilesets/secondary/generic_building1/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/building1/palettes/1.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/1.pal
diff --git a/data/tilesets/secondary/building1/palettes/10.pal b/data/tilesets/secondary/generic_building1/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/building1/palettes/10.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/10.pal
diff --git a/data/tilesets/secondary/building1/palettes/11.pal b/data/tilesets/secondary/generic_building1/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/building1/palettes/11.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/11.pal
diff --git a/data/tilesets/secondary/building1/palettes/12.pal b/data/tilesets/secondary/generic_building1/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/building1/palettes/12.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/12.pal
diff --git a/data/tilesets/secondary/building1/palettes/13.pal b/data/tilesets/secondary/generic_building1/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/building1/palettes/13.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/13.pal
diff --git a/data/tilesets/secondary/building1/palettes/14.pal b/data/tilesets/secondary/generic_building1/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/building1/palettes/14.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/14.pal
diff --git a/data/tilesets/secondary/building1/palettes/15.pal b/data/tilesets/secondary/generic_building1/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/building1/palettes/15.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/15.pal
diff --git a/data/tilesets/secondary/building1/palettes/2.pal b/data/tilesets/secondary/generic_building1/palettes/2.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/building1/palettes/2.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/2.pal
diff --git a/data/tilesets/secondary/building1/palettes/3.pal b/data/tilesets/secondary/generic_building1/palettes/3.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/building1/palettes/3.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/3.pal
diff --git a/data/tilesets/secondary/building1/palettes/4.pal b/data/tilesets/secondary/generic_building1/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/building1/palettes/4.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/4.pal
diff --git a/data/tilesets/secondary/building1/palettes/5.pal b/data/tilesets/secondary/generic_building1/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/building1/palettes/5.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/5.pal
diff --git a/data/tilesets/secondary/building1/palettes/6.pal b/data/tilesets/secondary/generic_building1/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/building1/palettes/6.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/6.pal
diff --git a/data/tilesets/secondary/building1/palettes/7.pal b/data/tilesets/secondary/generic_building1/palettes/7.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/building1/palettes/7.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/7.pal
diff --git a/data/tilesets/secondary/building1/palettes/8.pal b/data/tilesets/secondary/generic_building1/palettes/8.pal
index 18480092b..18480092b 100644
--- a/data/tilesets/secondary/building1/palettes/8.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/8.pal
diff --git a/data/tilesets/secondary/building1/palettes/9.pal b/data/tilesets/secondary/generic_building1/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/building1/palettes/9.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/9.pal
diff --git a/data/tilesets/secondary/building1/tiles.png b/data/tilesets/secondary/generic_building1/tiles.png
index 191287197..191287197 100644
--- a/data/tilesets/secondary/building1/tiles.png
+++ b/data/tilesets/secondary/generic_building1/tiles.png
diff --git a/data/tilesets/secondary/building2/metatile_attributes.bin b/data/tilesets/secondary/generic_building2/metatile_attributes.bin
index 18d7517d9..18d7517d9 100644
--- a/data/tilesets/secondary/building2/metatile_attributes.bin
+++ b/data/tilesets/secondary/generic_building2/metatile_attributes.bin
diff --git a/data/tilesets/secondary/building2/metatiles.bin b/data/tilesets/secondary/generic_building2/metatiles.bin
index 0943dc7af..0943dc7af 100644
--- a/data/tilesets/secondary/building2/metatiles.bin
+++ b/data/tilesets/secondary/generic_building2/metatiles.bin
diff --git a/data/tilesets/secondary/building2/palettes/0.pal b/data/tilesets/secondary/generic_building2/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/building2/palettes/0.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/0.pal
diff --git a/data/tilesets/secondary/building2/palettes/1.pal b/data/tilesets/secondary/generic_building2/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/building2/palettes/1.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/1.pal
diff --git a/data/tilesets/secondary/building2/palettes/10.pal b/data/tilesets/secondary/generic_building2/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/building2/palettes/10.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/10.pal
diff --git a/data/tilesets/secondary/building2/palettes/11.pal b/data/tilesets/secondary/generic_building2/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/building2/palettes/11.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/11.pal
diff --git a/data/tilesets/secondary/building2/palettes/12.pal b/data/tilesets/secondary/generic_building2/palettes/12.pal
index 2903bb074..2903bb074 100644
--- a/data/tilesets/secondary/building2/palettes/12.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/12.pal
diff --git a/data/tilesets/secondary/building2/palettes/13.pal b/data/tilesets/secondary/generic_building2/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/building2/palettes/13.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/13.pal
diff --git a/data/tilesets/secondary/building2/palettes/14.pal b/data/tilesets/secondary/generic_building2/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/building2/palettes/14.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/14.pal
diff --git a/data/tilesets/secondary/building2/palettes/15.pal b/data/tilesets/secondary/generic_building2/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/building2/palettes/15.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/15.pal
diff --git a/data/tilesets/secondary/building2/palettes/2.pal b/data/tilesets/secondary/generic_building2/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/building2/palettes/2.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/2.pal
diff --git a/data/tilesets/secondary/building2/palettes/3.pal b/data/tilesets/secondary/generic_building2/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/building2/palettes/3.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/3.pal
diff --git a/data/tilesets/secondary/building2/palettes/4.pal b/data/tilesets/secondary/generic_building2/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/building2/palettes/4.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/4.pal
diff --git a/data/tilesets/secondary/building2/palettes/5.pal b/data/tilesets/secondary/generic_building2/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/building2/palettes/5.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/5.pal
diff --git a/data/tilesets/secondary/building2/palettes/6.pal b/data/tilesets/secondary/generic_building2/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/building2/palettes/6.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/6.pal
diff --git a/data/tilesets/secondary/building2/palettes/7.pal b/data/tilesets/secondary/generic_building2/palettes/7.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/building2/palettes/7.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/7.pal
diff --git a/data/tilesets/secondary/building2/palettes/8.pal b/data/tilesets/secondary/generic_building2/palettes/8.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/building2/palettes/8.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/8.pal
diff --git a/data/tilesets/secondary/building2/palettes/9.pal b/data/tilesets/secondary/generic_building2/palettes/9.pal
index 25d5d7019..25d5d7019 100644
--- a/data/tilesets/secondary/building2/palettes/9.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/9.pal
diff --git a/data/tilesets/secondary/building2/tiles.png b/data/tilesets/secondary/generic_building2/tiles.png
index ca6e21f03..ca6e21f03 100644
--- a/data/tilesets/secondary/building2/tiles.png
+++ b/data/tilesets/secondary/generic_building2/tiles.png