fixing merge conflicts

2 files changed, 53 insertions, 62 deletions

diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc
index f11191970..30a7292a0 100644
--- a/data/maps/Route103/events.inc
+++ b/data/maps/Route103/events.inc
@@ -1,6 +1,6 @@
 Route103_EventObjects: @ 85280DC
 	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0
-	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, FLAG_HIDE_ROUTE_103_RIVAL
 	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0
 	object_event 4, EVENT_OBJ_GFX_TWIN, 0, 65, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0
 	object_event 5, EVENT_OBJ_GFX_TWIN, 0, 64, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0
@@ -9,16 +9,16 @@ Route103_EventObjects: @ 85280DC
 	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 6, BerryTreeScript, 0
 	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 7, BerryTreeScript, 0
 	object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0
-	object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_272141, 898
+	object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_272141, FLAG_HIDE_ROUTE_103_BIRCH
 	object_event 12, EVENT_OBJ_GFX_POKEFAN_M, 0, 56, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0
-	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CE5, 1114
-	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 18
-	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 19
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CE5, FLAG_ITEM_ROUTE_103_GUARD_SPEC
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_12
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_13
 	object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route103_EventScript_1EC761, 0
 	object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 67, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0
 	object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0
 	object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0
-	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, 1137
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, FLAG_ITEM_ROUTE_103_PP_UP
 
 Route103_MapWarps: @ 85282BC
 	warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index 6674662f7..063beaca7 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -28,7 +28,7 @@ Route103_EventScript_1EC3C1:: @ 81EC3C1
 	end
 
 Route103_EventScript_1EC3DA:: @ 81EC3DA
-	msgbox Route103_Text_1EC7A6, 4
+	msgbox Route103_Text_1EC7A6, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_GIRL_SUP, 1
 	applymovement 2, Route103_Movement_27259E
@@ -37,7 +37,7 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA
 	waitmovement 0
 	applymovement 2, Route103_Movement_27259A
 	waitmovement 0
-	msgbox Route103_Text_1EC7DE, 4
+	msgbox Route103_Text_1EC7DE, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route103_EventScript_1EC48E
 	case 1, Route103_EventScript_1EC49E
@@ -45,7 +45,7 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA
 	end
 
 Route103_EventScript_1EC434:: @ 81EC434
-	msgbox Route103_Text_1EC989, 4
+	msgbox Route103_Text_1EC989, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_BOY_SUP, 1
 	applymovement 2, Route103_Movement_27259E
@@ -54,7 +54,7 @@ Route103_EventScript_1EC434:: @ 81EC434
 	waitmovement 0
 	applymovement 2, Route103_Movement_27259A
 	waitmovement 0
-	msgbox Route103_Text_1EC9CE, 4
+	msgbox Route103_Text_1EC9CE, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route103_EventScript_1EC4BE
 	case 1, Route103_EventScript_1EC4CE
@@ -62,42 +62,42 @@ Route103_EventScript_1EC434:: @ 81EC434
 	end
 
 Route103_EventScript_1EC48E:: @ 81EC48E
-	trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_1EC881
+	trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_1EC881
 	goto Route103_EventScript_1EC4EE
 	end
 
 Route103_EventScript_1EC49E:: @ 81EC49E
-	trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_1EC881
+	trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_1EC881
 	goto Route103_EventScript_1EC4EE
 	end
 
 Route103_EventScript_1EC4AE:: @ 81EC4AE
-	trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_1EC881
+	trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_1EC881
 	goto Route103_EventScript_1EC4EE
 	end
 
 Route103_EventScript_1EC4BE:: @ 81EC4BE
-	trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_1ECA59
+	trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_1ECA59
 	goto Route103_EventScript_1EC4FC
 	end
 
 Route103_EventScript_1EC4CE:: @ 81EC4CE
-	trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_1ECA59
+	trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_1ECA59
 	goto Route103_EventScript_1EC4FC
 	end
 
 Route103_EventScript_1EC4DE:: @ 81EC4DE
-	trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_1ECA59
+	trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_1ECA59
 	goto Route103_EventScript_1EC4FC
 	end
 
 Route103_EventScript_1EC4EE:: @ 81EC4EE
-	msgbox Route103_Text_1EC8AE, 4
+	msgbox Route103_Text_1EC8AE, MSGBOX_DEFAULT
 	goto Route103_EventScript_1EC50A
 	end
 
 Route103_EventScript_1EC4FC:: @ 81EC4FC
-	msgbox Route103_Text_1ECA79, 4
+	msgbox Route103_Text_1ECA79, MSGBOX_DEFAULT
 	goto Route103_EventScript_1EC50A
 	end
 
@@ -142,10 +142,10 @@ Route103_EventScript_1EC585:: @ 81EC585
 Route103_EventScript_1EC5A2:: @ 81EC5A2
 	removeobject 2
 	setvar VAR_0x4084, 4
-	clearflag FLAG_0x379
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
 	setflag FLAG_0x082
 	setvar VAR_0x40C7, 1
-	clearflag FLAG_0x3D3
+	clearflag FLAG_HIDE_OLDALE_TOWN_RIVAL
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	releaseall
@@ -191,114 +191,105 @@ Route103_Movement_1EC5D6: @ 81EC5D6
 	step_end
 
 Route103_EventScript_1EC5D9:: @ 81EC5D9
-	msgbox Route103_Text_1ECB73, 2
+	msgbox Route103_Text_1ECB73, MSGBOX_NPC
 	end
 
 Route103_EventScript_1EC5E2:: @ 81EC5E2
-	msgbox Route103_Text_1ECBB5, 2
+	msgbox Route103_Text_1ECBB5, MSGBOX_NPC
 	end
 
 Route103_EventScript_1EC5EB:: @ 81EC5EB
-	msgbox Route103_Text_1ECC1A, 3
+	msgbox Route103_Text_1ECC1A, MSGBOX_SIGN
 	end
 
 Route103_EventScript_1EC5F4:: @ 81EC5F4
-	trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_29495A, Route103_Text_29498F
-	msgbox Route103_Text_2949B4, 6
+	trainerbattle_single TRAINER_DAISY, Route103_Text_29495A, Route103_Text_29498F
+	msgbox Route103_Text_2949B4, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_1EC60B:: @ 81EC60B
-	trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A
+	trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route103_EventScript_1EC653
-	msgbox Route103_Text_294A52, 6
+	msgbox Route103_Text_294A52, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_1EC63A:: @ 81EC63A
-	msgbox Route103_Text_294B8A, 4
-	setvar VAR_0x8004, 481
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 481
-	callstd 8
+	msgbox Route103_Text_294B8A, MSGBOX_DEFAULT
+	register_matchcall TRAINER_AMY_AND_LIV_1
 	release
 	end
 
 Route103_EventScript_1EC653:: @ 81EC653
-	trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF
-	msgbox Route103_Text_294C93, 6
+	trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF
+	msgbox Route103_Text_294C93, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_1EC66E:: @ 81EC66E
-	trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D
+	trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route103_EventScript_1EC6B6
-	msgbox Route103_Text_294B40, 6
+	msgbox Route103_Text_294B40, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_1EC69D:: @ 81EC69D
-	msgbox Route103_Text_294B8A, 4
-	setvar VAR_0x8004, 481
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 481
-	callstd 8
+	msgbox Route103_Text_294B8A, MSGBOX_DEFAULT
+	register_matchcall TRAINER_AMY_AND_LIV_1
 	release
 	end
 
 Route103_EventScript_1EC6B6:: @ 81EC6B6
-	trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB
-	msgbox Route103_Text_294D89, 6
+	trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB
+	msgbox Route103_Text_294D89, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_1EC6D1:: @ 81EC6D1
-	trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_294E34, Route103_Text_294E92
-	msgbox Route103_Text_294EBB, 6
+	trainerbattle_single TRAINER_ANDREW, Route103_Text_294E34, Route103_Text_294E92
+	msgbox Route103_Text_294EBB, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_1EC6E8:: @ 81EC6E8
-	trainerbattle 2, TRAINER_MIGUEL_1, 0, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714
+	trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route103_EventScript_1EC733
-	msgbox Route103_Text_294F42, 4
+	msgbox Route103_Text_294F42, MSGBOX_DEFAULT
 	release
 	end
 
 Route103_EventScript_1EC714:: @ 81EC714
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route103_Text_294F7E, 4
-	setvar VAR_0x8004, 293
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 293
-	callstd 8
+	msgbox Route103_Text_294F7E, MSGBOX_DEFAULT
+	register_matchcall TRAINER_MIGUEL_1
 	release
 	end
 
 Route103_EventScript_1EC733:: @ 81EC733
-	trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_294FC3, Route103_Text_295006
-	msgbox Route103_Text_29501E, 6
+	trainerbattle_rematch TRAINER_MIGUEL_1, Route103_Text_294FC3, Route103_Text_295006
+	msgbox Route103_Text_29501E, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_1EC74A:: @ 81EC74A
-	trainerbattle 0, TRAINER_MARCOS, 0, Route103_Text_295206, Route103_Text_29522B
-	msgbox Route103_Text_295246, 6
+	trainerbattle_single TRAINER_MARCOS, Route103_Text_295206, Route103_Text_29522B
+	msgbox Route103_Text_295246, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_1EC761:: @ 81EC761
-	trainerbattle 0, TRAINER_RHETT, 0, Route103_Text_295199, Route103_Text_2951C6
-	msgbox Route103_Text_2951DE, 6
+	trainerbattle_single TRAINER_RHETT, Route103_Text_295199, Route103_Text_2951C6
+	msgbox Route103_Text_2951DE, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_1EC778:: @ 81EC778
-	trainerbattle 0, TRAINER_PETE, 0, Route103_Text_295063, Route103_Text_295093
-	msgbox Route103_Text_2950AA, 6
+	trainerbattle_single TRAINER_PETE, Route103_Text_295063, Route103_Text_295093
+	msgbox Route103_Text_2950AA, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_1EC78F:: @ 81EC78F
-	trainerbattle 0, TRAINER_ISABELLE, 0, Route103_Text_295116, Route103_Text_295146
-	msgbox Route103_Text_29514D, 6
+	trainerbattle_single TRAINER_ISABELLE, Route103_Text_295116, Route103_Text_295146
+	msgbox Route103_Text_29514D, MSGBOX_AUTOCLOSE
 	end
 
 Route103_Text_1EC7A6: @ 81EC7A6