Merge branch 'fldeff' of https://github.com/garakmon/pokeemerald into fldeff

1 files changed, 21 insertions, 24 deletions

diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc
index 3cb6d9ae6..617e84350 100644
--- a/data/maps/Route105/scripts.inc
+++ b/data/maps/Route105/scripts.inc
@@ -32,58 +32,55 @@ Route105_MapScript2_1EE240: @ 81EE240
 	.2byte 0
 
 Route105_EventScript_1EE24A:: @ 81EE24A
-	trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_295D0F, Route105_Text_295D62
-	msgbox Route105_Text_295DAB, 6
+	trainerbattle_single TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62
+	msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE
 	end
 
 Route105_EventScript_1EE261:: @ 81EE261
-	trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_295DF5, Route105_Text_295E66
-	msgbox Route105_Text_295E72, 6
+	trainerbattle_single TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66
+	msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE
 	end
 
 Route105_EventScript_1EE278:: @ 81EE278
-	trainerbattle 0, TRAINER_DOMINIK, 0, Route105_Text_295EB7, Route105_Text_295EEA
-	msgbox Route105_Text_295F08, 6
+	trainerbattle_single TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA
+	msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE
 	end
 
 Route105_EventScript_1EE28F:: @ 81EE28F
-	trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_295F5C, Route105_Text_295FA0
-	msgbox Route105_Text_295FAE, 6
+	trainerbattle_single TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0
+	msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE
 	end
 
 Route105_EventScript_1EE2A6:: @ 81EE2A6
-	trainerbattle 0, TRAINER_IMANI, 0, Route105_Text_296025, Route105_Text_296059
-	msgbox Route105_Text_296076, 6
+	trainerbattle_single TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059
+	msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE
 	end
 
 Route105_EventScript_1EE2BD:: @ 81EE2BD
-	trainerbattle 0, TRAINER_JOSUE, 0, Route105_Text_29626F, Route105_Text_2962CB
-	msgbox Route105_Text_2962EC, 6
+	trainerbattle_single TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB
+	msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE
 	end
 
 Route105_EventScript_1EE2D4:: @ 81EE2D4
-	trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300
+	trainerbattle_single TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route105_EventScript_1EE31F
-	msgbox Route105_Text_2960FA, 4
+	msgbox Route105_Text_2960FA, MSGBOX_DEFAULT
 	release
 	end
 
 Route105_EventScript_1EE300:: @ 81EE300
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route105_Text_296159, 4
-	setvar VAR_0x8004, 737
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 737
-	callstd 8
+	msgbox Route105_Text_296159, MSGBOX_DEFAULT
+	register_matchcall TRAINER_ANDRES_1
 	release
 	end
 
 Route105_EventScript_1EE31F:: @ 81EE31F
-	trainerbattle 5, TRAINER_ANDRES_1, 0, Route105_Text_29619E, Route105_Text_2961DD
-	msgbox Route105_Text_2961FE, 6
+	trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_29619E, Route105_Text_2961DD
+	msgbox Route105_Text_2961FE, MSGBOX_AUTOCLOSE
 	end
 
 Route104_Text_1EE336: @ 81EE336
@@ -93,11 +90,11 @@ Route104_Text_1EE336: @ 81EE336
 	.string "… … … … … …\n"
 	.string "Where are you now?\l"
 	.string "It sounds windy wherever you are.\p"
-	.string "I just heard from DEVON’s MR. STONE\n"
+	.string "I just heard from DEVON's MR. STONE\n"
 	.string "about your POKéNAV, so I decided\l"
 	.string "to give you a call.\p"
-	.string "It sounds like you’re doing fine,\n"
-	.string "so that’s fine with me.\p"
+	.string "It sounds like you're doing fine,\n"
+	.string "so that's fine with me.\p"
 	.string "You take care now.\p"
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"