merge with battle tent update

5 files changed, 72 insertions, 2 deletions

diff --git a/data/maps/Route106/border.bin b/data/maps/Route106/border.bin
deleted file mode 100644
index 281762f5b..000000000
--- a/data/maps/Route106/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-CCCC
\ No newline at end of file
diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc
new file mode 100644
index 000000000..8fdbaad5f
--- /dev/null
+++ b/data/maps/Route106/events.inc
@@ -0,0 +1,19 @@
+Route106_EventObjects: @ 85287E4
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0
+	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0
+	object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004
+
+Route106_MapWarps: @ 852885C
+	warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F
+
+Route106_MapBGEvents: @ 8528864
+	bg_event 41, 11, 3, 7, 0, ITEM_POKE_BALL, 63, 0
+	bg_event 53, 12, 0, 7, 0, ITEM_STARDUST, 46, 0
+	bg_event 68, 15, 3, 7, 0, ITEM_HEART_SCALE, 47, 0
+	bg_event 59, 13, 3, 0, 0, Route106_EventScript_1EE48A
+
+Route106_MapEvents:: @ 8528894
+	map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents
+
diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc
index 5ee6a3071..93f4bd835 100644
--- a/data/maps/Route106/header.inc
+++ b/data/maps/Route106/header.inc
@@ -1,5 +1,5 @@
 Route106: @ 8482704
-	.4byte Route106_MapAttributes
+	.4byte Route106_Layout
 	.4byte Route106_MapEvents
 	.4byte Route106_MapScripts
 	.4byte Route106_MapConnections
diff --git a/data/maps/Route106/map.bin b/data/maps/Route106/map.bin
deleted file mode 100644
index b7e7d7238..000000000
--- a/data/maps/Route106/map.bin
+++ /dev/null
diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc
new file mode 100644
index 000000000..fdfff0587
--- /dev/null
+++ b/data/maps/Route106/scripts.inc
@@ -0,0 +1,52 @@
+Route106_MapScripts:: @ 81EE489
+	.byte 0
+
+Route106_EventScript_1EE48A:: @ 81EE48A
+	msgbox Route106_Text_1EE53A, 3
+	end
+
+Route106_EventScript_1EE493:: @ 81EE493
+	trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_2965BB, Route106_Text_2965FD
+	msgbox Route106_Text_296608, 6
+	end
+
+Route106_EventScript_1EE4AA:: @ 81EE4AA
+	trainerbattle 0, TRAINER_KYLA, 0, Route106_Text_296628, Route106_Text_296674
+	msgbox Route106_Text_29669E, 6
+	end
+
+Route106_EventScript_1EE4C1:: @ 81EE4C1
+	trainerbattle 2, TRAINER_ELLIOT_1, 0, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route106_EventScript_1EE50C
+	msgbox Route106_Text_29638C, 4
+	release
+	end
+
+Route106_EventScript_1EE4ED:: @ 81EE4ED
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route106_Text_2963E3, 4
+	setvar VAR_0x8004, 339
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 339
+	callstd 8
+	release
+	end
+
+Route106_EventScript_1EE50C:: @ 81EE50C
+	trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_29642E, Route106_Text_296477
+	msgbox Route106_Text_296493, 6
+	end
+
+Route106_EventScript_1EE523:: @ 81EE523
+	trainerbattle 0, TRAINER_NED, 0, Route106_Text_2964D4, Route106_Text_296553
+	msgbox Route106_Text_296588, 6
+	end
+
+Route106_Text_1EE53A: @ 81EE53A
+	.string "TRAINER TIPS\p"
+	.string "Advice on catching POKéMON with a ROD:\n"
+	.string "Press the A Button if you get a bite.$"
+