merge union room with master

3 files changed, 79 insertions, 0 deletions

diff --git a/data/layouts/SecretBase_Tree3/border.bin b/data/layouts/SecretBase_Tree3/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/SecretBase_Tree3/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/SecretBase_Tree3/layout.inc b/data/layouts/SecretBase_Tree3/layout.inc
new file mode 100644
index 000000000..66716a404
--- /dev/null
+++ b/data/layouts/SecretBase_Tree3/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Tree3_MapBorder::
+	.incbin "data/layouts/SecretBase_Tree3/border.bin"
+
+SecretBase_Tree3_MapBlockdata::
+	.incbin "data/layouts/SecretBase_Tree3/map.bin"
+
+	.align 2
+SecretBase_Tree3_Layout::
+	.4byte 0x11
+	.4byte 0x8
+	.4byte SecretBase_Tree3_MapBorder
+	.4byte SecretBase_Tree3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
+
diff --git a/data/layouts/SecretBase_Tree3/map.bin b/data/layouts/SecretBase_Tree3/map.bin
new file mode 100644
index 000000000..b6ae04b00
--- /dev/null
+++ b/data/layouts/SecretBase_Tree3/map.bin
@@ -0,0 +1,63 @@
+
	
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
6	2
+2
+2
+2
+2
+2
+2
+2
+2
+2 6	
+2
+2
+2
+2
+2	
+2	
+2
+2
+2
+2
+2	
+2
+2
+2
+2
+2	
+2	
+2
+2
+2
+2
+2
+2
+2
+2
+2	
+2	
+2
+2
+2
+2
+2
+2
+2
+2	2
+2
+2
+2
+2
\ No newline at end of file