fixing merge conflicts

2 files changed, 73 insertions, 79 deletions

diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc
index 717e75055..4400081f7 100644
--- a/data/maps/Route120/events.inc
+++ b/data/maps/Route120/events.inc
@@ -14,35 +14,35 @@ Route120_EventObjects: @ 852B3F8
 	object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route120_EventScript_1F5850, 0
 	object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route120_EventScript_1F5867, 0
 	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route120_EventScript_1F587E, 0
-	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F48, 1030
-	object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE76, 798
-	object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE56, 798
-	object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF16, 902
-	object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF36, 902
-	object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_2906BB, 17
-	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F55, 1031
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F48, FLAG_ITEM_ROUTE_120_NUGGET
+	object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE76, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
+	object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE56, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
+	object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF16, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
+	object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF36, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
+	object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_11
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F55, FLAG_ITEM_ROUTE_120_FULL_HEAL
 	object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route120_EventScript_1F5527, 0
 	object_event 24, EVENT_OBJ_GFX_WOMAN_5, 0, 31, 37, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0
 	object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0
 	object_event 26, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 6, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 4, Route120_EventScript_1F590E, 0
 	object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 34, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route120_EventScript_1F5925, 0
-	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F6F, 1108
-	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, 1107
-	object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, 970
-	object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, 972
-	object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 20
-	object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 18
+	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F6F, FLAG_ITEM_ROUTE_120_NEST_BALL
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, FLAG_ITEM_ROUTE_120_HYPER_POTION
+	object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, FLAG_HIDE_ROUTE_120_KECLEON_1
+	object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, FLAG_0x3CC
+	object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_14
+	object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_12
 	object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F593C, 0
 	object_event 35, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 28, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F5953, 0
-	object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 981
-	object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722DB, 982
-	object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722E8, 985
-	object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722F5, 986
-	object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_27230F, 988
-	object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_272302, 987
+	object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE
+	object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722DB, FLAG_HIDE_ROUTE_120_KECLEON_2
+	object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722E8, FLAG_HIDE_ROUTE_120_KECLEON_3
+	object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722F5, FLAG_HIDE_ROUTE_120_KECLEON_4
+	object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_27230F, FLAG_HIDE_ROUTE_120_KECLEON_6
+	object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_272302, FLAG_HIDE_ROUTE_120_KECLEON_5
 	object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route120_EventScript_1F5981, 0
 	object_event 43, EVENT_OBJ_GFX_MAN_3, 0, 14, 34, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route120_EventScript_1F596A, 0
-	object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, 1148
+	object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, FLAG_ITEM_ROUTE_120_REVIVE
 
 Route120_MapWarps: @ 852B818
 	warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB
@@ -79,10 +79,10 @@ Route120_MapBGEvents: @ 852B958
 	bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2_3
 	bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1_3
 	bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2_3
-	bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, 71
-	bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, 84
-	bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, 69
-	bg_hidden_item_event 24, 42, 3, ITEM_ZINC, 70
+	bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1
+	bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE
+	bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2
+	bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_ROUTE_120_ZINC
 	bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4
 
 Route120_MapEvents:: @ 852BA00
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
index 0bcff1a93..86bf1b10e 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -105,7 +105,7 @@ Route120_EventScript_1F5527:: @ 81F5527
 	dodailyevents
 	checkflag FLAG_0x92E
 	goto_eq Route120_EventScript_1F5625
-	msgbox Route120_Text_2A70C7, 5
+	msgbox Route120_Text_2A70C7, MSGBOX_YESNO
 	compare VAR_RESULT, 1
 	call_if 1, Route120_EventScript_1F562F
 	compare VAR_RESULT, 0
@@ -154,21 +154,21 @@ Route120_EventScript_1F5601:: @ 81F5601
 	compare VAR_RESULT, 0
 	goto_eq Route120_EventScript_272054
 	setflag FLAG_0x92E
-	msgbox Route120_Text_2A71D5, 4
+	msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT
 	release
 	end
 
 Route120_EventScript_1F5625:: @ 81F5625
-	msgbox Route120_Text_2A7217, 4
+	msgbox Route120_Text_2A7217, MSGBOX_DEFAULT
 	release
 	end
 
 Route120_EventScript_1F562F:: @ 81F562F
-	msgbox Route120_Text_2A7147, 4
+	msgbox Route120_Text_2A7147, MSGBOX_DEFAULT
 	return
 
 Route120_EventScript_1F5638:: @ 81F5638
-	msgbox Route120_Text_2A7183, 4
+	msgbox Route120_Text_2A7183, MSGBOX_DEFAULT
 	return
 
 Route120_EventScript_1F5641:: @ 81F5641
@@ -176,27 +176,27 @@ Route120_EventScript_1F5641:: @ 81F5641
 	faceplayer
 	checkflag FLAG_0x122
 	goto_eq Route120_EventScript_1F5672
-	msgbox Route120_Text_1F5998, 5
+	msgbox Route120_Text_1F5998, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_eq Route120_EventScript_1F5665
 	goto Route120_EventScript_1F568B
 	end
 
 Route120_EventScript_1F5665:: @ 81F5665
-	msgbox Route120_Text_1F5AAC, 4
+	msgbox Route120_Text_1F5AAC, MSGBOX_DEFAULT
 	setflag FLAG_0x122
 	release
 	end
 
 Route120_EventScript_1F5672:: @ 81F5672
-	msgbox Route120_Text_1F5ADE, 5
+	msgbox Route120_Text_1F5ADE, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_eq Route120_EventScript_1F5665
 	goto Route120_EventScript_1F568B
 	end
 
 Route120_EventScript_1F568B:: @ 81F568B
-	msgbox Route120_Text_1F5B0F, 4
+	msgbox Route120_Text_1F5B0F, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, 2
 	call_if 1, Route120_EventScript_1F57A3
@@ -205,7 +205,7 @@ Route120_EventScript_1F568B:: @ 81F568B
 	applymovement 31, Route120_Movement_2725A4
 	waitmovement 0
 	delay 20
-	msgbox Route120_Text_1F5B43, 4
+	msgbox Route120_Text_1F5B43, MSGBOX_DEFAULT
 	closemessage
 	applymovement 30, Route120_Movement_2725A8
 	waitmovement 0
@@ -242,10 +242,10 @@ Route120_EventScript_1F572C:: @ 81F572C
 	applymovement 31, Route120_Movement_2725AA
 	applymovement 255, Route120_Movement_2725A6
 	waitmovement 0
-	msgbox Route120_Text_1F5BAF, 4
+	msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT
 	giveitem_std ITEM_DEVON_SCOPE
 	setflag FLAG_0x11D
-	msgbox Route120_Text_1F5C7B, 4
+	msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT
 	closemessage
 	applymovement 31, Route120_Movement_2725AA
 	waitmovement 0
@@ -279,120 +279,114 @@ Route120_Movement_1F57B9: @ 81F57B9
 	step_end
 
 Route120_EventScript_1F57BC:: @ 81F57BC
-	msgbox Route120_Text_1F5D00, 2
+	msgbox Route120_Text_1F5D00, MSGBOX_NPC
 	end
 
 Route120_EventScript_1F57C5:: @ 81F57C5
-	msgbox Route120_Text_1F5DCB, 3
+	msgbox Route120_Text_1F5DCB, MSGBOX_SIGN
 	end
 
 Route120_EventScript_1F57CE:: @ 81F57CE
-	msgbox Route120_Text_1F5DE4, 3
+	msgbox Route120_Text_1F5DE4, MSGBOX_SIGN
 	end
 
 Route120_EventScript_1F57D7:: @ 81F57D7
-	trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_29E62D, Route120_Text_29E665
-	msgbox Route120_Text_29E67A, 6
+	trainerbattle_single TRAINER_COLIN, Route120_Text_29E62D, Route120_Text_29E665
+	msgbox Route120_Text_29E67A, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_1F57EE:: @ 81F57EE
-	trainerbattle 2, TRAINER_ROBERT_1, 0, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A
+	trainerbattle_single TRAINER_ROBERT_1, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route120_EventScript_1F5839
-	msgbox Route120_Text_29E726, 4
+	msgbox Route120_Text_29E726, MSGBOX_DEFAULT
 	release
 	end
 
 Route120_EventScript_1F581A:: @ 81F581A
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route120_Text_29E75D, 4
-	setvar VAR_0x8004, 406
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 406
-	callstd 8
+	msgbox Route120_Text_29E75D, MSGBOX_DEFAULT
+	register_matchcall TRAINER_ROBERT_1
 	release
 	end
 
 Route120_EventScript_1F5839:: @ 81F5839
-	trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_29E7AA, Route120_Text_29E7E1
-	msgbox Route120_Text_29E804, 6
+	trainerbattle_rematch TRAINER_ROBERT_1, Route120_Text_29E7AA, Route120_Text_29E7E1
+	msgbox Route120_Text_29E804, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_1F5850:: @ 81F5850
-	trainerbattle 0, TRAINER_LORENZO, 0, Route120_Text_29E843, Route120_Text_29E884
-	msgbox Route120_Text_29E8C5, 6
+	trainerbattle_single TRAINER_LORENZO, Route120_Text_29E843, Route120_Text_29E884
+	msgbox Route120_Text_29E8C5, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_1F5867:: @ 81F5867
-	trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_29E91C, Route120_Text_29E980
-	msgbox Route120_Text_29E996, 6
+	trainerbattle_single TRAINER_JENNA, Route120_Text_29E91C, Route120_Text_29E980
+	msgbox Route120_Text_29E996, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_1F587E:: @ 81F587E
-	trainerbattle 2, TRAINER_JEFFREY_1, 0, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA
+	trainerbattle_single TRAINER_JEFFREY_1, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route120_EventScript_1F58C9
-	msgbox Route120_Text_29EA08, 4
+	msgbox Route120_Text_29EA08, MSGBOX_DEFAULT
 	release
 	end
 
 Route120_EventScript_1F58AA:: @ 81F58AA
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route120_Text_29EA31, 4
-	setvar VAR_0x8004, 226
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 226
-	callstd 8
+	msgbox Route120_Text_29EA31, MSGBOX_DEFAULT
+	register_matchcall TRAINER_JEFFREY_1
 	release
 	end
 
 Route120_EventScript_1F58C9:: @ 81F58C9
-	trainerbattle 5, TRAINER_JEFFREY_1, 0, Route120_Text_29EA61, Route120_Text_29EA8F
-	msgbox Route120_Text_29EAA9, 6
+	trainerbattle_rematch TRAINER_JEFFREY_1, Route120_Text_29EA61, Route120_Text_29EA8F
+	msgbox Route120_Text_29EAA9, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_1F58E0:: @ 81F58E0
-	trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_29EAEF, Route120_Text_29EB53
-	msgbox Route120_Text_29EB6E, 6
+	trainerbattle_single TRAINER_JENNIFER, Route120_Text_29EAEF, Route120_Text_29EB53
+	msgbox Route120_Text_29EB6E, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_1F58F7:: @ 81F58F7
-	trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_29EBAF, Route120_Text_29EC25
-	msgbox Route120_Text_29EC41, 6
+	trainerbattle_single TRAINER_CHIP, Route120_Text_29EBAF, Route120_Text_29EC25
+	msgbox Route120_Text_29EC41, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_1F590E:: @ 81F590E
-	trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_29ECA6, Route120_Text_29ECEF
-	msgbox Route120_Text_29ED19, 6
+	trainerbattle_single TRAINER_CLARISSA, Route120_Text_29ECA6, Route120_Text_29ECEF
+	msgbox Route120_Text_29ED19, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_1F5925:: @ 81F5925
-	trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_29ED71, Route120_Text_29EDD3
-	msgbox Route120_Text_29EDF7, 6
+	trainerbattle_single TRAINER_ANGELICA, Route120_Text_29ED71, Route120_Text_29EDD3
+	msgbox Route120_Text_29EDF7, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_1F593C:: @ 81F593C
-	trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_29EE50, Route120_Text_29EE97
-	msgbox Route120_Text_29EED4, 6
+	trainerbattle_single TRAINER_KEIGO, Route120_Text_29EE50, Route120_Text_29EE97
+	msgbox Route120_Text_29EED4, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_1F5953:: @ 81F5953
-	trainerbattle 0, TRAINER_RILEY, 0, Route120_Text_29EF08, Route120_Text_29EF63
-	msgbox Route120_Text_29EF89, 6
+	trainerbattle_single TRAINER_RILEY, Route120_Text_29EF08, Route120_Text_29EF63
+	msgbox Route120_Text_29EF89, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_1F596A:: @ 81F596A
-	trainerbattle 0, TRAINER_LEONEL, 0, Route120_Text_29F04F, Route120_Text_29F080
-	msgbox Route120_Text_29F0A1, 6
+	trainerbattle_single TRAINER_LEONEL, Route120_Text_29F04F, Route120_Text_29F080
+	msgbox Route120_Text_29F0A1, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_1F5981:: @ 81F5981
-	trainerbattle 0, TRAINER_CALLIE, 0, Route120_Text_29EFB1, Route120_Text_29EFE1
-	msgbox Route120_Text_29F002, 6
+	trainerbattle_single TRAINER_CALLIE, Route120_Text_29EFB1, Route120_Text_29EFE1
+	msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE
 	end
 
 Route120_Text_1F5998: @ 81F5998