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

19 files changed, 0 insertions, 0 deletions

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