merge with battle tent update

5 files changed, 72 insertions, 3 deletions

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

\ No newline at end of file
diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc
new file mode 100644
index 000000000..0a0b448c4
--- /dev/null
+++ b/data/maps/Route108/events.inc
@@ -0,0 +1,18 @@
+Route108_EventObjects: @ 8528964
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, 45, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, 13, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 41, 5, 3, 10, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0
+	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, 9, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, 1, 1, 1, 0, 0, Route108_EventScript_290D4D, 1139
+
+Route108_MapWarps: @ 8528A0C
+	warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK
+
+Route108_MapBGEvents: @ 8528A14
+	bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0
+
+Route108_MapEvents:: @ 8528A20
+	map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents
+
diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc
index e0a0c9f42..2c4cea90d 100644
--- a/data/maps/Route108/header.inc
+++ b/data/maps/Route108/header.inc
@@ -1,5 +1,5 @@
 Route108: @ 848273C
-	.4byte Route108_MapAttributes
+	.4byte Route108_Layout
 	.4byte Route108_MapEvents
 	.4byte Route108_MapScripts
 	.4byte Route108_MapConnections
diff --git a/data/maps/Route108/map.bin b/data/maps/Route108/map.bin
deleted file mode 100644
index 138ddc020..000000000
--- a/data/maps/Route108/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ppppppppppppppppPQpp­®1®1®1®1®1®1®1®1®1®1®1®1¯pppppppppppppPQpppppppppppPQppppppppppppppXYp­›1ž1”5ž1ž1^5_5ž1”5^5_5ž1ž1bQppppppppppppXYpppppppppPQXY­®1®1¯pPQpppppppppPc^5_5ž1”5”5n5o5”5ž1n5o5”5”5jYppp­1®1®1®1®1®1®1¯pPQppuvpuvPQXYpPc^5_5bQXY­®1®1¯pPQppXkn5o5ž1ž1ž1^5_5ž1Q3R3S3T3”5·puvPc^5_5ž1”5ž1”5bQXYpp}~p}~XYpppXkn5o5jYpPc^5_5bQXYuvp½¾¾¾¾£n5o5X7YZ[\7]·p}~Xkn5o5”5ž1”5ž1jYppPQpPQpppppppp½¾¾¿ppXkn5o5jYpp}~pppppp½£ž1`abcde·pppp½£ž1ž1ž1ž1¤¿pppXYpXYppppppppppppppp½¾¾¿pppppppppppp½¾£i3j3k3¤¾¿ppppp½¾¾¾¾¿pppppppppppppppppppppppppppppppppppppppppp½¾¾¾¿pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppuvppppppppppppppPQp­®1®1¯pppppppppppppppPQpppppppppppppppppppp}~ppppppppp­®1®1¯pXY­›1”5ž1œ1¯ppppppppppppppXYpppppppppppppp­®1®1®1¯ppppPQppPQpp½£”5·pppµž1”5ž1ž1·pp­®1®1¯ppppppPQppPQuvppppp­®1®1¯p½£”5ž1·ppuvXYuvXYppp½¾¿uvp½¾¾¾¾¿pPc^5_5bQpppppXYppXY}~uvppPc^5_5bQp½¾¾¿PQ}~pp}~puvppPQp}~PQppPQuvXkn5o5jYppppPQppppppp}~PQXkn5o5jYpPQuvXYppppppp}~PQXYuvpXYPQXY}~p½¾¾¿pPQPQXYpppppppppXYp½¾¾¿PQXY}~pppPQppppppXYpp}~pppXYpppppPQpppXYXYppppppppppppppppppXYpppppppXYppppppppppppppppppppppXYppppppp
\ No newline at end of file
diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc
new file mode 100644
index 000000000..25657c5a4
--- /dev/null
+++ b/data/maps/Route108/scripts.inc
@@ -0,0 +1,53 @@
+Route108_MapScripts:: @ 81EE689
+	.byte 0
+
+Route108_EventScript_1EE68A:: @ 81EE68A
+	trainerbattle 0, TRAINER_JEROME, 0, Route108_Text_296D10, Route108_Text_296D3C
+	msgbox Route108_Text_296D6E, 6
+	end
+
+Route108_EventScript_1EE6A1:: @ 81EE6A1
+	trainerbattle 0, TRAINER_MATTHEW, 0, Route108_Text_296DAF, Route108_Text_296DEA
+	msgbox Route108_Text_296E03, 6
+	end
+
+Route108_EventScript_1EE6B8:: @ 81EE6B8
+	trainerbattle 0, TRAINER_TARA, 0, Route108_Text_296E33, Route108_Text_296E71
+	msgbox Route108_Text_296E7A, 6
+	end
+
+Route108_EventScript_1EE6CF:: @ 81EE6CF
+	trainerbattle 0, TRAINER_MISSY, 0, Route108_Text_296EC7, Route108_Text_296EFC
+	msgbox Route108_Text_296F2A, 6
+	end
+
+Route108_EventScript_1EE6E6:: @ 81EE6E6
+	trainerbattle 0, TRAINER_CAROLINA, 0, Route108_Text_297094, Route108_Text_2970D7
+	msgbox Route108_Text_2970F0, 6
+	end
+
+Route108_EventScript_1EE6FD:: @ 81EE6FD
+	trainerbattle 2, TRAINER_CORY_1, 0, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route108_EventScript_1EE748
+	msgbox Route108_Text_296FB0, 4
+	release
+	end
+
+Route108_EventScript_1EE729:: @ 81EE729
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route108_Text_296FD8, 4
+	setvar VAR_0x8004, 740
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 740
+	callstd 8
+	release
+	end
+
+Route108_EventScript_1EE748:: @ 81EE748
+	trainerbattle 5, TRAINER_CORY_1, 0, Route108_Text_297011, Route108_Text_297036
+	msgbox Route108_Text_297059, 6
+	end
+