fixing merge conflicts

1 files changed, 24 insertions, 27 deletions

diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc
index 4f7e20b94..cb6a48dce 100644
--- a/data/maps/Route112/scripts.inc
+++ b/data/maps/Route112/scripts.inc
@@ -13,7 +13,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
 	applymovement 1, Route112_Movement_2725A8
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F1F3F, 4
+	msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Route112_Movement_2725A2
 	waitmovement 0
@@ -21,7 +21,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
 	applymovement 6, Route112_Movement_2725A4
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F1F7A, 4
+	msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT
 	closemessage
 	applymovement 6, Route112_Movement_2725A2
 	waitmovement 0
@@ -29,7 +29,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
 	applymovement 1, Route112_Movement_2725A8
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F1FBA, 4
+	msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Route112_Movement_2725A2
 	waitmovement 0
@@ -37,7 +37,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
 	applymovement 6, Route112_Movement_2725A4
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F2003, 4
+	msgbox Route112_Text_1F2003, MSGBOX_DEFAULT
 	closemessage
 	applymovement 6, Route112_Movement_2725A2
 	waitmovement 0
@@ -45,69 +45,66 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
 	end
 
 Route112_EventScript_1F1E46:: @ 81F1E46
-	msgbox Route112_Text_1F20C1, 3
+	msgbox Route112_Text_1F20C1, MSGBOX_SIGN
 	end
 
 Route112_EventScript_1F1E4F:: @ 81F1E4F
-	msgbox Route112_Text_1F20ED, 3
+	msgbox Route112_Text_1F20ED, MSGBOX_SIGN
 	end
 
 Route112_EventScript_1F1E58:: @ 81F1E58
-	msgbox Route112_Text_1F2138, 3
+	msgbox Route112_Text_1F2138, MSGBOX_SIGN
 	end
 
 Route112_EventScript_1F1E61:: @ 81F1E61
-	msgbox Route112_Text_1F204E, 2
+	msgbox Route112_Text_1F204E, MSGBOX_NPC
 	end
 
 Route112_EventScript_1F1E6A:: @ 81F1E6A
-	trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_29978E, Route112_Text_2997CA
-	msgbox Route112_Text_2997DC, 6
+	trainerbattle_single TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA
+	msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE
 	end
 
 Route112_EventScript_1F1E81:: @ 81F1E81
-	trainerbattle 2, TRAINER_TRENT_1, 0, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD
+	trainerbattle_single TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route112_EventScript_1F1ECC
-	msgbox Route112_Text_299896, 4
+	msgbox Route112_Text_299896, MSGBOX_DEFAULT
 	release
 	end
 
 Route112_EventScript_1F1EAD:: @ 81F1EAD
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route112_Text_29993C, 4
-	setvar VAR_0x8004, 627
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 627
-	callstd 8
+	msgbox Route112_Text_29993C, MSGBOX_DEFAULT
+	register_matchcall TRAINER_TRENT_1
 	release
 	end
 
 Route112_EventScript_1F1ECC:: @ 81F1ECC
-	trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_2999BD, Route112_Text_2999F7
-	msgbox Route112_Text_299A0F, 6
+	trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_2999BD, Route112_Text_2999F7
+	msgbox Route112_Text_299A0F, MSGBOX_AUTOCLOSE
 	end
 
 Route112_EventScript_1F1EE3:: @ 81F1EE3
-	trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_299A89, Route112_Text_299AAC
-	msgbox Route112_Text_299AB4, 6
+	trainerbattle_single TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC
+	msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE
 	end
 
 Route112_EventScript_1F1EFA:: @ 81F1EFA
-	trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_299AE4, Route112_Text_299B36
-	msgbox Route112_Text_299B4C, 6
+	trainerbattle_single TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36
+	msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE
 	end
 
 Route112_EventScript_1F1F11:: @ 81F1F11
-	trainerbattle 0, TRAINER_BRYANT, 0, Route112_Text_299BAE, Route112_Text_299BDF
-	msgbox Route112_Text_299BFB, 6
+	trainerbattle_single TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF
+	msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE
 	end
 
 Route112_EventScript_1F1F28:: @ 81F1F28
-	trainerbattle 0, TRAINER_SHAYLA, 0, Route112_Text_299C34, Route112_Text_299C8F
-	msgbox Route112_Text_299CC6, 6
+	trainerbattle_single TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F
+	msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE
 	end
 
 Route112_Text_1F1F3F: @ 81F1F3F