recorded battle merge conflicts fix

3 files changed, 18 insertions, 0 deletions

diff --git a/data/maps/RusturfTunnel/border.bin b/data/maps/RusturfTunnel/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/RusturfTunnel/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc
new file mode 100644
index 000000000..95a3c66e7
--- /dev/null
+++ b/data/maps/RusturfTunnel/header.inc
@@ -0,0 +1,15 @@
+RusturfTunnel: @ 8483F30
+	.4byte RusturfTunnel_MapAttributes
+	.4byte RusturfTunnel_MapEvents
+	.4byte RusturfTunnel_MapScripts
+	.4byte 0x0
+	.2byte BGM_DAN01
+	.2byte 129
+	.byte 60
+	.byte 0
+	.byte 6
+	.byte 4
+	.2byte 0
+	.byte 15
+	.byte 0
+
diff --git a/data/maps/RusturfTunnel/map.bin b/data/maps/RusturfTunnel/map.bin
new file mode 100644
index 000000000..87ce9bc73
--- /dev/null
+++ b/data/maps/RusturfTunnel/map.bin
@@ -0,0 +1,2 @@
+3!43!!!4
2222
2
2@<A@<<<A22
2
2
2
222222
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
22
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
22																	
+
2
2
2
2
2
2
2
2
23!!4
2
2
2
2
2
2
2
2
2
234@<<A342
2
2
2
22
2
2
2
2
2@A@A2
2
2222222
22	PQR			3!4
2
2									@<A
2
2
23!!4 					"2222
2
2
2
2
234@<<A342
2
2
2
2
2
2
2
2
2			"@A 		@A
2
2
2
2
2
2
2
2
2
2
2
2
2	" 	
2
2
2
2
2
2
2
2
2222
2 					
2
2
2
2					PQR		34
2
2
2
2	 										@A
2
2
2
2 											222 		PQR		3!4								3!4@<A											@<A
\ No newline at end of file