merge with battle tent update

5 files changed, 53 insertions, 3 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..969830d37
--- /dev/null
+++ b/data/maps/SSTidalLowerDeck/events.inc
@@ -0,0 +1,13 @@
+SSTidalLowerDeck_EventObjects: @ 853A2BC
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, 46, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, 50, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0
+
+SSTidalLowerDeck_MapWarps: @ 853A2EC
+	warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR
+
+SSTidalLowerDeck_MapBGEvents: @ 853A2F4
+	bg_event 0, 2, 0, 7, 0, ITEM_LEFTOVERS, 35, 0
+
+SSTidalLowerDeck_MapEvents:: @ 853A300
+	map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents
+
diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc
index c1f883c84..3e2f5bacb 100644
--- a/data/maps/SSTidalLowerDeck/header.inc
+++ b/data/maps/SSTidalLowerDeck/header.inc
@@ -1,5 +1,5 @@
 SSTidalLowerDeck: @ 8484F28
-	.4byte SSTidalLowerDeck_MapAttributes
+	.4byte SSTidalLowerDeck_Layout
 	.4byte SSTidalLowerDeck_MapEvents
 	.4byte SSTidalLowerDeck_MapScripts
 	.4byte 0x0
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..2ad1ed580
--- /dev/null
+++ b/data/maps/SSTidalLowerDeck/scripts.inc
@@ -0,0 +1,39 @@
+SSTidalLowerDeck_MapScripts:: @ 823C818
+	.byte 0
+
+SSTidalLowerDeck_EventScript_23C819:: @ 823C819
+	trainerbattle 0, TRAINER_PHILLIP, 0, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0
+	msgbox SSTidalLowerDeck_Text_23C8B4, 6
+	end
+
+SSTidalLowerDeck_EventScript_23C830:: @ 823C830
+	trainerbattle 0, TRAINER_LEONARD, 0, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D
+	msgbox SSTidalLowerDeck_Text_23C98E, 6
+	end
+
+SSTidalLowerDeck_Text_23C847: @ 823C847
+	.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_23C8A0: @ 823C8A0
+	.string "Little bro, I lost!$"
+
+SSTidalLowerDeck_Text_23C8B4: @ 823C8B4
+	.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_23C917: @ 823C917
+	.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_23C97D: @ 823C97D
+	.string "Big bro, I lost!$"
+
+SSTidalLowerDeck_Text_23C98E: @ 823C98E
+	.string "We’re the CLEANUP BROTHERS!\p"
+	.string "The old one dumps the detergent,\n"
+	.string "and the young one does the scrubbing!$"
+