recorded battle merge conflicts fix

3 files changed, 18 insertions, 0 deletions

diff --git a/data/maps/MeteorFalls_1F_2R/border.bin b/data/maps/MeteorFalls_1F_2R/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_2R/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc
new file mode 100644
index 000000000..4f8ebbff4
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_2R/header.inc
@@ -0,0 +1,15 @@
+MeteorFalls_1F_2R: @ 8483EDC
+	.4byte MeteorFalls_1F_2R_MapAttributes
+	.4byte MeteorFalls_1F_2R_MapEvents
+	.4byte MeteorFalls_1F_2R_MapScripts
+	.4byte 0x0
+	.2byte BGM_DAN03
+	.2byte 126
+	.byte 63
+	.byte 0
+	.byte 0
+	.byte 4
+	.2byte 0
+	.byte 15
+	.byte 0
+
diff --git a/data/maps/MeteorFalls_1F_2R/map.bin b/data/maps/MeteorFalls_1F_2R/map.bin
new file mode 100644
index 000000000..67ce2b784
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_2R/map.bin
@@ -0,0 +1,2 @@
+






>>>>>>>>>>>>>>














4111111111111<













4
2
2
2
2
2
2
2
2
2
2
2
2(=>>>>









?
2
2
2
2
2
2
2
2
2
2
2
201111=>>>>>>>>?2>2>2>2>2>2ŽU2V2V2W2U2W2=>>
01111111111212111ž]^^_]_11=>>>>>11111112>2>2>2>2>2ŽU2W2U2V2V2V2W2=0111111




4112111ž]_]^^^_1111<


>>>>?*>2>2>2>2>2ŽU2V2W2U2W2U2V2V2W2=>>(<

4111121211ž]^_]_]^^_11(<

4*11112>2>2>2ŽU2W2U2V2V2W2
2U2V2V2W2=((=>
4**4111121ž]_]^^_Œ]^^_(01<4**?
2
2
2
2
2
2Œ
2U2V2V2W2
2Œ
2
2
2
2
2•01(<4**
2
2
2
2
2Œ
2
2]^^_Œ
2U2W2U2V2W2•=>((<4**
2
2
2
2
2ŽU2V2V2W2
2
2Œ
2]_]^_1((<4**
2
2
2
2Œž]^^_…‡Ž
2
2
2
2
2
2
2(((<4**†††‡
+
2
2
2
2
2
2
2•<4–
2U2W2U2V2V2W2(((<4**

>?
2
2
2
2U2V2W2•=?–
2]_]^^_(((<4**
?
2
2Ž]^_ž
2
2
2
2
2
2
2(((<4**?
2
2
2
2•–
2
2
2
2Œ
2
2
2
2
2
2
2
2
2(((<4**
2
2
2
2
2ž
2
2
2
2
2
2
2Œ
2
2
2
2
2
2(((<4**
2
2
2
2
2€‰Z[
2
2
2
2
2
2
2
2
2
23††(<4**€‰‰‰‰˜pXYš‰‰
2
2
2
2
2
2(<

(<4**pppppPQpppp’
2
2
2
2
2
2((3††
4**dQppPQXYpppp’
2
2
2
2
2
2(((<


4**lYPQXYpppppp’
2
2
2
2
2
2(((<


4**pXYppppp’626262
2
2
23††((<


4**pppppppp’
2
2
2
2
2
2(<

((<


4**pp’626262626262
2
2
2
2
2
2(<3†(<


4**pp’
2
22
2
2
2
2
2
2
2
2
2(<(<3



4**kzqqzk}Q†††††††††
(<(<




66††††††††††††††††††††††





\ No newline at end of file