merge with battle tent update

5 files changed, 71 insertions, 2 deletions

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

\ No newline at end of file
diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc
new file mode 100644
index 000000000..f748e2ff9
--- /dev/null
+++ b/data/maps/Route107/events.inc
@@ -0,0 +1,12 @@
+Route107_EventObjects: @ 85288A8
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, 24, 1, 1, 1, 3, Route107_EventScript_1EE595, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, 52, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, 13, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 11, 1, 65, 1, 1, 1, 5, Route107_EventScript_1EE625, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, 8, 1, 1, 1, 1, Route107_EventScript_1EE63C, 0
+	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, 8, 1, 1, 1, 1, Route107_EventScript_1EE657, 0
+	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, 64, 1, 1, 1, 5, Route107_EventScript_1EE672, 0
+
+Route107_MapEvents:: @ 8528950
+	map_events Route107_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc
index d6dffda04..a27885664 100644
--- a/data/maps/Route107/header.inc
+++ b/data/maps/Route107/header.inc
@@ -1,5 +1,5 @@
 Route107: @ 8482720
-	.4byte Route107_MapAttributes
+	.4byte Route107_Layout
 	.4byte Route107_MapEvents
 	.4byte Route107_MapScripts
 	.4byte Route107_MapConnections
diff --git a/data/maps/Route107/map.bin b/data/maps/Route107/map.bin
deleted file mode 100644
index 521997b0f..000000000
--- a/data/maps/Route107/map.bin
+++ /dev/null
diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc
new file mode 100644
index 000000000..2c8364592
--- /dev/null
+++ b/data/maps/Route107/scripts.inc
@@ -0,0 +1,58 @@
+Route107_MapScripts:: @ 81EE594
+	.byte 0
+
+Route107_EventScript_1EE595:: @ 81EE595
+	trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_2966E5, Route107_Text_29672F
+	msgbox Route107_Text_29675B, 6
+	end
+
+Route107_EventScript_1EE5AC:: @ 81EE5AC
+	trainerbattle 2, TRAINER_TONY_1, 0, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route107_EventScript_1EE5F7
+	msgbox Route107_Text_2967FF, 4
+	release
+	end
+
+Route107_EventScript_1EE5D8:: @ 81EE5D8
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route107_Text_29685A, 4
+	setvar VAR_0x8004, 155
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 155
+	callstd 8
+	release
+	end
+
+Route107_EventScript_1EE5F7:: @ 81EE5F7
+	trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_296897, Route107_Text_2968D5
+	msgbox Route107_Text_296923, 6
+	end
+
+Route107_EventScript_1EE60E:: @ 81EE60E
+	trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_296974, Route107_Text_29699E
+	msgbox Route107_Text_2969AB, 6
+	end
+
+Route107_EventScript_1EE625:: @ 81EE625
+	trainerbattle 0, TRAINER_BETH, 0, Route107_Text_2969E4, Route107_Text_296A17
+	msgbox Route107_Text_296A35, 6
+	end
+
+Route107_EventScript_1EE63C:: @ 81EE63C
+	trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E
+	msgbox Route107_Text_296ADC, 6
+	end
+
+Route107_EventScript_1EE657:: @ 81EE657
+	trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34
+	msgbox Route107_Text_296BE1, 6
+	end
+
+Route107_EventScript_1EE672:: @ 81EE672
+	trainerbattle 0, TRAINER_CAMRON, 0, Route107_Text_296C6F, Route107_Text_296CAD
+	msgbox Route107_Text_296CC0, 6
+	end
+