summaryrefslogtreecommitdiff
path: root/data/maps/MtPyre_6F
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-11-17 19:34:55 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-11-17 19:34:55 +0100
commitd0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch)
treecb5e1c81baaf882f2bb8f323b04a7b41d316be7b /data/maps/MtPyre_6F
parent3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff)
parenta98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff)
recorded battle merge conflicts fix
Diffstat (limited to 'data/maps/MtPyre_6F')
-rw-r--r--data/maps/MtPyre_6F/border.bin1
-rw-r--r--data/maps/MtPyre_6F/header.inc15
-rw-r--r--data/maps/MtPyre_6F/map.bin1
3 files changed, 17 insertions, 0 deletions
diff --git a/data/maps/MtPyre_6F/border.bin b/data/maps/MtPyre_6F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/MtPyre_6F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc
new file mode 100644
index 000000000..72d2808f0
--- /dev/null
+++ b/data/maps/MtPyre_6F/header.inc
@@ -0,0 +1,15 @@
+MtPyre_6F: @ 84840F0
+ .4byte MtPyre_6F_MapAttributes
+ .4byte MtPyre_6F_MapEvents
+ .4byte MtPyre_6F_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 142
+ .byte 65
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 8
+ .byte 0
+
diff --git a/data/maps/MtPyre_6F/map.bin b/data/maps/MtPyre_6F/map.bin
new file mode 100644
index 000000000..1f7438bfb
--- /dev/null
+++ b/data/maps/MtPyre_6F/map.bin
@@ -0,0 +1 @@
+êÃÄÅäïïïïïïïïëËÌ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&æ2æ2æ2æ2æ2æ2î6î6æ2æ2æ2îïïïïïïïïïêÞ2äï÷÷÷÷÷÷÷÷÷ëÞ2ì÷&ç2ç2&&ç2×7ç2&&ç2ç2&ç2æ2æ2îæ2æ2æ2æ2æ2îæ2æ2æ2ç2ò3æ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