6 files changed, 51 insertions, 4 deletions

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




\ No newline at end of file
diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc
new file mode 100644
index 000000000..c9cbf6715
--- /dev/null
+++ b/data/maps/SSTidalLowerDeck/events.inc
@@ -0,0 +1,12 @@
+SSTidalLowerDeck_EventObjects:: @ 8391844
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, 46, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_15FED7, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, 50, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_15FEEE, 0
+
+SSTidalLowerDeck_MapWarps:: @ 8391874
+	warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR
+
+SSTidalLowerDeck_MapBGEvents:: @ 839187C
+	bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_23
+
+SSTidalLowerDeck_MapEvents:: @ 8391888
+	map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents
diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc
index 5b6bec321..c52690612 100644
--- a/data/maps/SSTidalLowerDeck/header.inc
+++ b/data/maps/SSTidalLowerDeck/header.inc
@@ -1,9 +1,9 @@
 SSTidalLowerDeck:: @ 8307B70
-	.4byte SSTidalLowerDeck_MapAttributes
+	.4byte SSTidalLowerDeck_Layout
 	.4byte SSTidalLowerDeck_MapEvents
 	.4byte SSTidalLowerDeck_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_BOAT
+	.2byte MUS_M_BOAT
 	.2byte 279
 	.byte 87
 	.byte 0
diff --git a/data/maps/SSTidalLowerDeck/map.bin b/data/maps/SSTidalLowerDeck/map.bin
deleted file mode 100644
index 059ce30fe..000000000
--- a/data/maps/SSTidalLowerDeck/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-©©©©©©©©©©©©©©©±±èê±±àê±±ëìí±±±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
diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc
new file mode 100644
index 000000000..e91c20625
--- /dev/null
+++ b/data/maps/SSTidalLowerDeck/scripts.inc
@@ -0,0 +1,12 @@
+SSTidalLowerDeck_MapScripts:: @ 815FED6
+	.byte 0
+
+SSTidalLowerDeck_EventScript_15FED7:: @ 815FED7
+	trainerbattle 0, OPPONENT_PHILLIP, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A
+	msgbox SSTidalLowerDeck_Text_19942E, 6
+	end
+
+SSTidalLowerDeck_EventScript_15FEEE:: @ 815FEEE
+	trainerbattle 0, OPPONENT_LEONARD, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7
+	msgbox SSTidalLowerDeck_Text_199508, 6
+	end
diff --git a/data/maps/SSTidalLowerDeck/text.inc b/data/maps/SSTidalLowerDeck/text.inc
new file mode 100644
index 000000000..2c54d743c
--- /dev/null
+++ b/data/maps/SSTidalLowerDeck/text.inc
@@ -0,0 +1,25 @@
+SSTidalLowerDeck_Text_1993C1:: @ 81993C1
+	.string "Arrrgh! I’m fed up and dog-tired of\n"
+	.string "cleaning this huge place!\p"
+	.string "Let’s have a quick battle!$"
+
+SSTidalLowerDeck_Text_19941A:: @ 819941A
+	.string "Little bro, I lost!$"
+
+SSTidalLowerDeck_Text_19942E:: @ 819942E
+	.string "We’re the CLEANUP BROTHERS!\p"
+	.string "The old one dumps the detergent,\n"
+	.string "and the young one does the scrubbing!$"
+
+SSTidalLowerDeck_Text_199491:: @ 8199491
+	.string "This is the bottom of the ship’s hull.\n"
+	.string "There’s plenty of room.\l"
+	.string "It’ll be alright for a POKéMON battle.$"
+
+SSTidalLowerDeck_Text_1994F7:: @ 81994F7
+	.string "Big bro, I lost!$"
+
+SSTidalLowerDeck_Text_199508:: @ 8199508
+	.string "We’re the CLEANUP BROTHERS!\p"
+	.string "The old one dumps the detergent,\n"
+	.string "and the young one does the scrubbing!$"