summaryrefslogtreecommitdiff
path: root/data/maps/DesertUnderpass
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/DesertUnderpass
parent3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff)
parenta98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff)
recorded battle merge conflicts fix
Diffstat (limited to 'data/maps/DesertUnderpass')
-rw-r--r--data/maps/DesertUnderpass/border.bin1
-rw-r--r--data/maps/DesertUnderpass/header.inc15
-rw-r--r--data/maps/DesertUnderpass/map.bin1
3 files changed, 17 insertions, 0 deletions
diff --git a/data/maps/DesertUnderpass/border.bin b/data/maps/DesertUnderpass/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/DesertUnderpass/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc
new file mode 100644
index 000000000..1a253a839
--- /dev/null
+++ b/data/maps/DesertUnderpass/header.inc
@@ -0,0 +1,15 @@
+DesertUnderpass: @ 8484978
+ .4byte DesertUnderpass_MapAttributes
+ .4byte DesertUnderpass_MapEvents
+ .4byte DesertUnderpass_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 389
+ .byte 209
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/DesertUnderpass/map.bin b/data/maps/DesertUnderpass/map.bin
new file mode 100644
index 000000000..2f82e9357
--- /dev/null
+++ b/data/maps/DesertUnderpass/map.bin
@@ -0,0 +1 @@
+ ##" #" !!" !!"##" #" #" ####" ####" #" #" "#"˜™™™™š ###" # #˜š #" "#" ‘©©©ͺ # #"#" #"¨ͺ ###" "¨ͺ ######"##˜š' # " " ' ‘š #˜š˜‘‘‘š#"#"' "˜‘’˜š˜‘‘‘‘‘š#"˜š˜h˜‘©‘š˜‘ͺ˜™‘‘‘‘‘‘’˜™‘ͺ¨‘š˜‘ͺ ’˜‘ͺ˜‘‘‘‘‘‘‘‘’ ####" ##" ##" #"¨©ͺ¨‘š¨ͺ¨ͺ¨ͺ #q‘‘‘‘‘‘‘‘’##"##"< # #"#" " # "#" " ##" #####" ##"##"¨ͺ ###"˜š q‘‘‘‘‘‘‘’#"#"#XYZ# ##"#"#" #" " ###" " #"#" # #" #"" ###"  #""˜‘’ ###q‘‘‘‘‘p######" ##"  #01##"##" 0#101#####"#####" ####" #### #01######q‘’ 0##101##q‘‘‘p#"" ######" #######"  ##"##" #"#" ##########" #####"#q’###### "####################" ##########" #############" #"" " #####" #" ########" ##############" #### ######" #####" ##" ##" ##"  ##" #" ###" # ####" ######"" # " ##"˜š#"'˜š˜š ## ##"##" # #"#" # "#########" ########" ##"#" #"### ##### #"##### " ##"####"#" #####" ###### # ##"### ##"#" ## ######" "### " ###"#"#"#" # #" #" #"#" ## #####" ##" # " #" ###"### ## " #"##"#"#"###" ##"##" #####" ##" #"## # # #"#" #"#" ############# \ No newline at end of file