fixing merge conflicts

2 files changed, 34 insertions, 43 deletions

diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc
index 30ff07ee9..4b52615fc 100644
--- a/data/maps/Route124/events.inc
+++ b/data/maps/Route124/events.inc
@@ -4,9 +4,9 @@ Route124_EventObjects: @ 852C3C4
 	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0
 	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 6, 8, 1, 5, Route124_EventScript_1F6615, 0
 	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 2, Route124_EventScript_1F662C, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, 1092
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, 1093
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, 1066
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, FLAG_ITEM_ROUTE_124_RED_SHARD
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, FLAG_ITEM_ROUTE_124_BLUE_SHARD
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, FLAG_ITEM_ROUTE_124_YELLOW_SHARD
 	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F6643, 0
 	object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0
 	object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0
diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc
index b21e55417..d9d43b531 100644
--- a/data/maps/Route124/scripts.inc
+++ b/data/maps/Route124/scripts.inc
@@ -8,108 +8,99 @@ Route124_MapScript1_1F6572: @ 81F6572
 	end
 
 Route124_EventScript_1F657C:: @ 81F657C
-	msgbox Route124_Text_1F6739, 3
+	msgbox Route124_Text_1F6739, MSGBOX_SIGN
 	end
 
 Route124_EventScript_1F6585:: @ 81F6585
-	trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_2A09B1, Route124_Text_2A0A02
-	msgbox Route124_Text_2A0A20, 6
+	trainerbattle_single TRAINER_SPENCER, Route124_Text_2A09B1, Route124_Text_2A0A02
+	msgbox Route124_Text_2A0A20, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_1F659C:: @ 81F659C
-	trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_2A0A84, Route124_Text_2A0ACC
-	msgbox Route124_Text_2A0AD9, 6
+	trainerbattle_single TRAINER_ROLAND, Route124_Text_2A0A84, Route124_Text_2A0ACC
+	msgbox Route124_Text_2A0AD9, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_1F65B3:: @ 81F65B3
-	trainerbattle 2, TRAINER_JENNY_1, 0, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF
+	trainerbattle_single TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route124_EventScript_1F65FE
-	msgbox Route124_Text_2A0B9A, 4
+	msgbox Route124_Text_2A0B9A, MSGBOX_DEFAULT
 	release
 	end
 
 Route124_EventScript_1F65DF:: @ 81F65DF
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route124_Text_2A0C14, 4
-	setvar VAR_0x8004, 449
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 449
-	callstd 8
+	msgbox Route124_Text_2A0C14, MSGBOX_DEFAULT
+	register_matchcall TRAINER_JENNY_1
 	release
 	end
 
 Route124_EventScript_1F65FE:: @ 81F65FE
-	trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_2A0C60, Route124_Text_2A0CA0
-	msgbox Route124_Text_2A0CBE, 6
+	trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_2A0C60, Route124_Text_2A0CA0
+	msgbox Route124_Text_2A0CBE, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_1F6615:: @ 81F6615
-	trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_2A0D0A, Route124_Text_2A0D3D
-	msgbox Route124_Text_2A0D66, 6
+	trainerbattle_single TRAINER_GRACE, Route124_Text_2A0D0A, Route124_Text_2A0D3D
+	msgbox Route124_Text_2A0D66, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_1F662C:: @ 81F662C
-	trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_2A0DA0, Route124_Text_2A0DFF
-	msgbox Route124_Text_2A0E1E, 6
+	trainerbattle_single TRAINER_CHAD, Route124_Text_2A0DA0, Route124_Text_2A0DFF
+	msgbox Route124_Text_2A0E1E, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_1F6643:: @ 81F6643
-	trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673
+	trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route124_EventScript_1F668C
-	msgbox Route124_Text_2A0F3A, 4
+	msgbox Route124_Text_2A0F3A, MSGBOX_DEFAULT
 	release
 	end
 
 Route124_EventScript_1F6673:: @ 81F6673
-	msgbox Route124_Text_2A109F, 4
-	setvar VAR_0x8004, 687
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 687
-	callstd 8
+	msgbox Route124_Text_2A109F, MSGBOX_DEFAULT
+	register_matchcall TRAINER_LILA_AND_ROY_1
 	release
 	end
 
 Route124_EventScript_1F668C:: @ 81F668C
-	trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255
-	msgbox Route124_Text_2A1203, 6
+	trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255
+	msgbox Route124_Text_2A1203, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_1F66A7:: @ 81F66A7
-	trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7
+	trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route124_EventScript_1F66F0
-	msgbox Route124_Text_2A103E, 4
+	msgbox Route124_Text_2A103E, MSGBOX_DEFAULT
 	release
 	end
 
 Route124_EventScript_1F66D7:: @ 81F66D7
-	msgbox Route124_Text_2A109F, 4
-	setvar VAR_0x8004, 687
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 687
-	callstd 8
+	msgbox Route124_Text_2A109F, MSGBOX_DEFAULT
+	register_matchcall TRAINER_LILA_AND_ROY_1
 	release
 	end
 
 Route124_EventScript_1F66F0:: @ 81F66F0
-	trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384
-	msgbox Route124_Text_2A130F, 6
+	trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384
+	msgbox Route124_Text_2A130F, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_1F670B:: @ 81F670B
-	trainerbattle 0, TRAINER_DECLAN, 0, Route124_Text_2A13BD, Route124_Text_2A142C
-	msgbox Route124_Text_2A144F, 6
+	trainerbattle_single TRAINER_DECLAN, Route124_Text_2A13BD, Route124_Text_2A142C
+	msgbox Route124_Text_2A144F, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_1F6722:: @ 81F6722
-	trainerbattle 0, TRAINER_ISABELLA, 0, Route124_Text_2A148E, Route124_Text_2A14BC
-	msgbox Route124_Text_2A14ED, 6
+	trainerbattle_single TRAINER_ISABELLA, Route124_Text_2A148E, Route124_Text_2A14BC
+	msgbox Route124_Text_2A14ED, MSGBOX_AUTOCLOSE
 	end
 
 Route124_Text_1F6739: @ 81F6739