Merge commit 'da689fa7' into merge-mrwint

6 files changed, 5 insertions, 1 deletions

diff --git a/gfx/tilesets/roofs/0.2bpp b/gfx/tilesets/roofs/0.2bpp
new file mode 100644
index 000000000..51650e2e1
--- /dev/null
+++ b/gfx/tilesets/roofs/0.2bpp
diff --git a/gfx/tilesets/roofs/1.2bpp b/gfx/tilesets/roofs/1.2bpp
new file mode 100644
index 000000000..eea01d2f2
--- /dev/null
+++ b/gfx/tilesets/roofs/1.2bpp
diff --git a/gfx/tilesets/roofs/2.2bpp b/gfx/tilesets/roofs/2.2bpp
new file mode 100644
index 000000000..67db7f991
--- /dev/null
+++ b/gfx/tilesets/roofs/2.2bpp
diff --git a/gfx/tilesets/roofs/3.2bpp b/gfx/tilesets/roofs/3.2bpp
new file mode 100644
index 000000000..1d88fac5b
--- /dev/null
+++ b/gfx/tilesets/roofs/3.2bpp
diff --git a/gfx/tilesets/roofs/4.2bpp b/gfx/tilesets/roofs/4.2bpp
new file mode 100644
index 000000000..87590db99
--- /dev/null
+++ b/gfx/tilesets/roofs/4.2bpp
diff --git a/main.asm b/main.asm
index 67fbb52d5..271b6adce 100644
--- a/main.asm
+++ b/main.asm
@@ -31187,7 +31187,11 @@ MapGroupRoofs: ; 1c021i
 ; 1c03c
 
 Roofs: ; 1c03c
-INCBIN "baserom.gbc", $1c03c, $1c30c - $1c03c
+INCBIN "gfx/tilesets/roofs/0.2bpp"
+INCBIN "gfx/tilesets/roofs/1.2bpp"
+INCBIN "gfx/tilesets/roofs/2.2bpp"
+INCBIN "gfx/tilesets/roofs/3.2bpp"
+INCBIN "gfx/tilesets/roofs/4.2bpp"
 ; 1c30c
 
 INCLUDE "tilesets/data_2.asm"