summaryrefslogtreecommitdiff
path: root/data/maps/SSTidalLowerDeck
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/SSTidalLowerDeck
parent3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff)
parenta98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff)
recorded battle merge conflicts fix
Diffstat (limited to 'data/maps/SSTidalLowerDeck')
-rw-r--r--data/maps/SSTidalLowerDeck/border.bin1
-rw-r--r--data/maps/SSTidalLowerDeck/header.inc15
-rw-r--r--data/maps/SSTidalLowerDeck/map.bin1
3 files changed, 17 insertions, 0 deletions
diff --git a/data/maps/SSTidalLowerDeck/border.bin b/data/maps/SSTidalLowerDeck/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SSTidalLowerDeck/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc
new file mode 100644
index 000000000..b872e0cf8
--- /dev/null
+++ b/data/maps/SSTidalLowerDeck/header.inc
@@ -0,0 +1,15 @@
+SSTidalLowerDeck: @ 8484F28
+ .4byte SSTidalLowerDeck_MapAttributes
+ .4byte SSTidalLowerDeck_MapEvents
+ .4byte SSTidalLowerDeck_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_BOAT
+ .2byte 278
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SSTidalLowerDeck/map.bin b/data/maps/SSTidalLowerDeck/map.bin
new file mode 100644
index 000000000..059ce30fe
--- /dev/null
+++ b/data/maps/SSTidalLowerDeck/map.bin
@@ -0,0 +1 @@
+©©©©©©©©©©©©©©©±±èê±±àê±±ëìí±±±2èê22èê2ëìí2222 2ðòî2 2ðòî2 2óôõî2 2 2 22 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 22ëìíèéêî2èêî2ëìíî2 2 22óôõðñòî2ðòî2óôõî2 2 22ç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â22à2á2â2à2á2â2 2à2â2 2ã2å2 2 2èê2èéêèéêî2ðòî2óõî2 2ã6å6ðñòðñòî2ç2ç2ö2ç2ç2ö2 2óõ \ No newline at end of file