summaryrefslogtreecommitdiff
path: root/data/maps/RustboroCity_DevonCorp_2F
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/RustboroCity_DevonCorp_2F
parent3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff)
parenta98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff)
recorded battle merge conflicts fix
Diffstat (limited to 'data/maps/RustboroCity_DevonCorp_2F')
-rw-r--r--data/maps/RustboroCity_DevonCorp_2F/border.bin1
-rw-r--r--data/maps/RustboroCity_DevonCorp_2F/header.inc15
-rw-r--r--data/maps/RustboroCity_DevonCorp_2F/map.bin1
3 files changed, 17 insertions, 0 deletions
diff --git a/data/maps/RustboroCity_DevonCorp_2F/border.bin b/data/maps/RustboroCity_DevonCorp_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc
new file mode 100644
index 000000000..83a317006
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_DevonCorp_2F: @ 8483360
+ .4byte RustboroCity_DevonCorp_2F_MapAttributes
+ .4byte RustboroCity_DevonCorp_2F_MapEvents
+ .4byte RustboroCity_DevonCorp_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 93
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.bin b/data/maps/RustboroCity_DevonCorp_2F/map.bin
new file mode 100644
index 000000000..03985c572
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_2F/map.bin
@@ -0,0 +1 @@
+šŠ‹Œˆ‰ˆ‰ˆ‰ˆ‰ˆŠ‹Œ‰ˆ› ’“”‘‘‘‘•–—‘ก3333333333333333333€3€3€3€3ฃ3ค3€3€3ฃ3ค3€3€3ฃ3ค3€3€3337ฅ7ฆ7€3€3ซ7ฌ7€3€3ซ7ฌ7€3€3ซ7ฌ7€3€3€33ง3ญ7ฎ7€3€3ง37€3€3ง3€3€3€3ง3€3€3€3€33€3ง3ง3€3€3ฃ3ค3€3€3ฃ3ค3€3€3ฃ3ค3€3€3€33€3€3€3€3€3ซ7ฌ7€3€3ซ7ฌ7€3€3ซ7ฌ7€3€3€33€3€3€3€3€3ง3€3€3€3ง3€3€3€3ง3€3€3€3€3 \ No newline at end of file