Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps

21 files changed, 19 insertions, 19 deletions

diff --git a/data/tilesets/graphics.inc b/data/tilesets/graphics.inc
index 2d1ddb1f9..c7e6d15b0 100644
--- a/data/tilesets/graphics.inc
+++ b/data/tilesets/graphics.inc
@@ -345,26 +345,26 @@ gTilesetPalettes_BattleFrontierOutsideEast:: @ 834F984
 
 	.align 2
 gTilesetTiles_InsideBuilding:: @ 834FB84
-	.incbin "data/tilesets/primary/inside_building/tiles.4bpp.lz"
+	.incbin "data/tilesets/primary/building/tiles.4bpp.lz"
 
 	.align 2
 gTilesetPalettes_InsideBuilding:: @ 83508BC
-	.incbin "data/tilesets/primary/inside_building/palettes/00.gbapal"
-	.incbin "data/tilesets/primary/inside_building/palettes/01.gbapal"
-	.incbin "data/tilesets/primary/inside_building/palettes/02.gbapal"
-	.incbin "data/tilesets/primary/inside_building/palettes/03.gbapal"
-	.incbin "data/tilesets/primary/inside_building/palettes/04.gbapal"
-	.incbin "data/tilesets/primary/inside_building/palettes/05.gbapal"
-	.incbin "data/tilesets/primary/inside_building/palettes/06.gbapal"
-	.incbin "data/tilesets/primary/inside_building/palettes/07.gbapal"
-	.incbin "data/tilesets/primary/inside_building/palettes/08.gbapal"
-	.incbin "data/tilesets/primary/inside_building/palettes/09.gbapal"
-	.incbin "data/tilesets/primary/inside_building/palettes/10.gbapal"
-	.incbin "data/tilesets/primary/inside_building/palettes/11.gbapal"
-	.incbin "data/tilesets/primary/inside_building/palettes/12.gbapal"
-	.incbin "data/tilesets/primary/inside_building/palettes/13.gbapal"
-	.incbin "data/tilesets/primary/inside_building/palettes/14.gbapal"
-	.incbin "data/tilesets/primary/inside_building/palettes/15.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/00.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/01.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/02.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/03.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/04.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/05.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/06.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/07.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/08.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/09.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/10.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/11.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/12.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/13.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/14.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/15.gbapal"
 
 	.align 2
 gTilesetTiles_Shop:: @ 8350ABC
diff --git a/data/tilesets/metatiles.inc b/data/tilesets/metatiles.inc
index 033470ceb..1d0875147 100644
--- a/data/tilesets/metatiles.inc
+++ b/data/tilesets/metatiles.inc
@@ -128,11 +128,11 @@ gMetatileAttributes_BattleFrontierOutsideEast:: @ 83AF782
 
 	.align 1
 gMetatiles_InsideBuilding:: @ 83AFB7E
-	.incbin "data/tilesets/primary/inside_building/metatiles.bin"
+	.incbin "data/tilesets/primary/building/metatiles.bin"
 
 	.align 1
 gMetatileAttributes_InsideBuilding:: @ 83AFBFE
-	.incbin "data/tilesets/primary/inside_building/metatile_attributes.bin"
+	.incbin "data/tilesets/primary/building/metatile_attributes.bin"
 
 	.align 1
 gMetatiles_Shop:: @ 83AFC0E
diff --git a/data/tilesets/primary/inside_building/metatile_attributes.bin b/data/tilesets/primary/building/metatile_attributes.bin
index efc3708aa..efc3708aa 100644
--- a/data/tilesets/primary/inside_building/metatile_attributes.bin
+++ b/data/tilesets/primary/building/metatile_attributes.bin
diff --git a/data/tilesets/primary/inside_building/metatiles.bin b/data/tilesets/primary/building/metatiles.bin
index 21830728c..21830728c 100644
--- a/data/tilesets/primary/inside_building/metatiles.bin
+++ b/data/tilesets/primary/building/metatiles.bin
diff --git a/data/tilesets/primary/inside_building/palettes/00.pal b/data/tilesets/primary/building/palettes/00.pal
index ca016289c..ca016289c 100644
--- a/data/tilesets/primary/inside_building/palettes/00.pal
+++ b/data/tilesets/primary/building/palettes/00.pal
diff --git a/data/tilesets/primary/inside_building/palettes/01.pal b/data/tilesets/primary/building/palettes/01.pal
index 0b01f1a0f..0b01f1a0f 100644
--- a/data/tilesets/primary/inside_building/palettes/01.pal
+++ b/data/tilesets/primary/building/palettes/01.pal
diff --git a/data/tilesets/primary/inside_building/palettes/02.pal b/data/tilesets/primary/building/palettes/02.pal
index 410d5193a..410d5193a 100644
--- a/data/tilesets/primary/inside_building/palettes/02.pal
+++ b/data/tilesets/primary/building/palettes/02.pal
diff --git a/data/tilesets/primary/inside_building/palettes/03.pal b/data/tilesets/primary/building/palettes/03.pal
index 410d5193a..410d5193a 100644
--- a/data/tilesets/primary/inside_building/palettes/03.pal
+++ b/data/tilesets/primary/building/palettes/03.pal
diff --git a/data/tilesets/primary/inside_building/palettes/04.pal b/data/tilesets/primary/building/palettes/04.pal
index 410d5193a..410d5193a 100644
--- a/data/tilesets/primary/inside_building/palettes/04.pal
+++ b/data/tilesets/primary/building/palettes/04.pal
diff --git a/data/tilesets/primary/inside_building/palettes/05.pal b/data/tilesets/primary/building/palettes/05.pal
index b5001d726..b5001d726 100644
--- a/data/tilesets/primary/inside_building/palettes/05.pal
+++ b/data/tilesets/primary/building/palettes/05.pal
diff --git a/data/tilesets/primary/inside_building/palettes/06.pal b/data/tilesets/primary/building/palettes/06.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/inside_building/palettes/06.pal
+++ b/data/tilesets/primary/building/palettes/06.pal
diff --git a/data/tilesets/primary/inside_building/palettes/07.pal b/data/tilesets/primary/building/palettes/07.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/inside_building/palettes/07.pal
+++ b/data/tilesets/primary/building/palettes/07.pal
diff --git a/data/tilesets/primary/inside_building/palettes/08.pal b/data/tilesets/primary/building/palettes/08.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/inside_building/palettes/08.pal
+++ b/data/tilesets/primary/building/palettes/08.pal
diff --git a/data/tilesets/primary/inside_building/palettes/09.pal b/data/tilesets/primary/building/palettes/09.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/inside_building/palettes/09.pal
+++ b/data/tilesets/primary/building/palettes/09.pal
diff --git a/data/tilesets/primary/inside_building/palettes/10.pal b/data/tilesets/primary/building/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/inside_building/palettes/10.pal
+++ b/data/tilesets/primary/building/palettes/10.pal
diff --git a/data/tilesets/primary/inside_building/palettes/11.pal b/data/tilesets/primary/building/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/inside_building/palettes/11.pal
+++ b/data/tilesets/primary/building/palettes/11.pal
diff --git a/data/tilesets/primary/inside_building/palettes/12.pal b/data/tilesets/primary/building/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/inside_building/palettes/12.pal
+++ b/data/tilesets/primary/building/palettes/12.pal
diff --git a/data/tilesets/primary/inside_building/palettes/13.pal b/data/tilesets/primary/building/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/inside_building/palettes/13.pal
+++ b/data/tilesets/primary/building/palettes/13.pal
diff --git a/data/tilesets/primary/inside_building/palettes/14.pal b/data/tilesets/primary/building/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/inside_building/palettes/14.pal
+++ b/data/tilesets/primary/building/palettes/14.pal
diff --git a/data/tilesets/primary/inside_building/palettes/15.pal b/data/tilesets/primary/building/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/inside_building/palettes/15.pal
+++ b/data/tilesets/primary/building/palettes/15.pal
diff --git a/data/tilesets/primary/inside_building/tiles.png b/data/tilesets/primary/building/tiles.png
index 506bb7400..506bb7400 100644
--- a/data/tilesets/primary/inside_building/tiles.png
+++ b/data/tilesets/primary/building/tiles.png