Merge branch 'master' into decompile_battle_tent

3 files changed, 93 insertions, 0 deletions

diff --git a/data/layouts/SecretBase_Tree4/border.bin b/data/layouts/SecretBase_Tree4/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/SecretBase_Tree4/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/SecretBase_Tree4/layout.inc b/data/layouts/SecretBase_Tree4/layout.inc
new file mode 100644
index 000000000..20d4c3e01
--- /dev/null
+++ b/data/layouts/SecretBase_Tree4/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Tree4_MapBorder::
+	.incbin "data/layouts/SecretBase_Tree4/border.bin"
+
+SecretBase_Tree4_MapBlockdata::
+	.incbin "data/layouts/SecretBase_Tree4/map.bin"
+
+	.align 2
+SecretBase_Tree4_Layout::
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SecretBase_Tree4_MapBorder
+	.4byte SecretBase_Tree4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
+
diff --git a/data/layouts/SecretBase_Tree4/map.bin b/data/layouts/SecretBase_Tree4/map.bin
new file mode 100644
index 000000000..b3b381d9e
--- /dev/null
+++ b/data/layouts/SecretBase_Tree4/map.bin
@@ -0,0 +1,77 @@
+

	
+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
+2
+2"6	
+2
+2
+2
+2	#6"6	2
#6	
+2 6
+2
+2
+2
+2
+222	
+2
+2
+2
+2
+2
+2
+2
+2
+2	
+2
+2
+2
+2
+2
+2
+2
+2
+2	
+2
+2
+2
+22
+2
+26
\ No newline at end of file