fixing merge conflicts

2 files changed, 43 insertions, 52 deletions

diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc
index c79c836ea..18179deb1 100644
--- a/data/maps/Route115/events.inc
+++ b/data/maps/Route115/events.inc
@@ -8,20 +8,20 @@ Route115_EventObjects: @ 852A1BC
 	object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0
 	object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0
 	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0
-	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016
-	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E37, 1017
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E44, 1018
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E2A, FLAG_ITEM_ROUTE_115_SUPER_POTION
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E37, FLAG_ITEM_ROUTE_115_TM_01
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E44, FLAG_ITEM_ROUTE_115_IRON
 	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 55, BerryTreeScript, 0
 	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 56, BerryTreeScript, 0
-	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_2907A6, 17
-	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E51, 1118
+	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_2907A6, FLAG_TEMP_11
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E51, FLAG_ITEM_ROUTE_115_GREAT_BALL
 	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route115_EventScript_1F2AE2, 0
 	object_event 18, EVENT_OBJ_GFX_NINJA_BOY, 0, 11, 12, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0
 	object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B27, 0
 	object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route115_EventScript_1F2B10, 0
 	object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B3E, 0
-	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, 1161
-	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, 1144
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, FLAG_ITEM_ROUTE_115_PP_UP
+	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, FLAG_ITEM_ROUTE_115_HEAL_POWDER
 
 Route115_MapWarps: @ 852A3E4
 	warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R
@@ -42,7 +42,7 @@ Route115_MapBGEvents: @ 852A3FC
 	bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3_3
 	bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3_3
 	bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1
-	bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, 97
+	bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE
 
 Route115_MapEvents:: @ 852A4A4
 	map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents
diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc
index 967f2f9ce..3dcf7adee 100644
--- a/data/maps/Route115/scripts.inc
+++ b/data/maps/Route115/scripts.inc
@@ -25,125 +25,116 @@ Route115_MapScript2_1F2969: @ 81F2969
 	.2byte 0
 
 Route115_EventScript_1F2973:: @ 81F2973
-	msgbox Route115_Text_1F2B55, 2
+	msgbox Route115_Text_1F2B55, MSGBOX_NPC
 	end
 
 Route115_EventScript_1F297C:: @ 81F297C
-	msgbox Route115_Text_1F2BC9, 3
+	msgbox Route115_Text_1F2BC9, MSGBOX_SIGN
 	end
 
 Route115_EventScript_1F2985:: @ 81F2985
-	msgbox Route115_Text_1F2BE3, 3
+	msgbox Route115_Text_1F2BE3, MSGBOX_SIGN
 	end
 
 Route115_EventScript_1F298E:: @ 81F298E
-	trainerbattle 2, TRAINER_TIMOTHY_1, 0, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA
+	trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route115_EventScript_1F29D9
-	msgbox Route115_Text_29B258, 4
+	msgbox Route115_Text_29B258, MSGBOX_DEFAULT
 	release
 	end
 
 Route115_EventScript_1F29BA:: @ 81F29BA
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route115_Text_29B2B3, 4
-	setvar VAR_0x8004, 307
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 307
-	callstd 8
+	msgbox Route115_Text_29B2B3, MSGBOX_DEFAULT
+	register_matchcall TRAINER_TIMOTHY_1
 	release
 	end
 
 Route115_EventScript_1F29D9:: @ 81F29D9
-	trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_29B32C, Route115_Text_29B372
-	msgbox Route115_Text_29B385, 6
+	trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_29B32C, Route115_Text_29B372
+	msgbox Route115_Text_29B385, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_1F29F0:: @ 81F29F0
-	trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_29B3CC, Route115_Text_29B3ED
-	msgbox Route115_Text_29B3FF, 6
+	trainerbattle_single TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED
+	msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_1F2A07:: @ 81F2A07
-	trainerbattle 2, TRAINER_NOB_1, 0, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33
+	trainerbattle_single TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route115_EventScript_1F2A52
-	msgbox Route115_Text_29B49D, 4
+	msgbox Route115_Text_29B49D, MSGBOX_DEFAULT
 	release
 	end
 
 Route115_EventScript_1F2A33:: @ 81F2A33
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route115_Text_29B50B, 4
-	setvar VAR_0x8004, 183
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 183
-	callstd 8
+	msgbox Route115_Text_29B50B, MSGBOX_DEFAULT
+	register_matchcall TRAINER_NOB_1
 	release
 	end
 
 Route115_EventScript_1F2A52:: @ 81F2A52
-	trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_29B547, Route115_Text_29B59D
-	msgbox Route115_Text_29B5B5, 6
+	trainerbattle_rematch TRAINER_NOB_1, Route115_Text_29B547, Route115_Text_29B59D
+	msgbox Route115_Text_29B5B5, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_1F2A69:: @ 81F2A69
-	trainerbattle 2, TRAINER_CYNDY_1, 0, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95
+	trainerbattle_single TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route115_EventScript_1F2AB4
-	msgbox Route115_Text_29B647, 4
+	msgbox Route115_Text_29B647, MSGBOX_DEFAULT
 	release
 	end
 
 Route115_EventScript_1F2A95:: @ 81F2A95
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route115_Text_29B6AB, 4
-	setvar VAR_0x8004, 427
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 427
-	callstd 8
+	msgbox Route115_Text_29B6AB, MSGBOX_DEFAULT
+	register_matchcall TRAINER_CYNDY_1
 	release
 	end
 
 Route115_EventScript_1F2AB4:: @ 81F2AB4
-	trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_29B6FA, Route115_Text_29B71A
-	msgbox Route115_Text_29B737, 6
+	trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_29B6FA, Route115_Text_29B71A
+	msgbox Route115_Text_29B737, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_1F2ACB:: @ 81F2ACB
-	trainerbattle 0, TRAINER_HECTOR, 0, Route115_Text_29B78F, Route115_Text_29B7C5
-	msgbox Route115_Text_29B7EA, 6
+	trainerbattle_single TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5
+	msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_1F2AE2:: @ 81F2AE2
-	trainerbattle 0, TRAINER_KYRA, 0, Route115_Text_29B826, Route115_Text_29B85D
-	msgbox Route115_Text_29B869, 6
+	trainerbattle_single TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D
+	msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_1F2AF9:: @ 81F2AF9
-	trainerbattle 0, TRAINER_JAIDEN, 0, Route115_Text_29B8C1, Route115_Text_29B8E8
-	msgbox Route115_Text_29B904, 6
+	trainerbattle_single TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8
+	msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_1F2B10:: @ 81F2B10
-	trainerbattle 0, TRAINER_ALIX, 0, Route115_Text_29B9CB, Route115_Text_29B9F6
-	msgbox Route115_Text_29BA04, 6
+	trainerbattle_single TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6
+	msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_1F2B27:: @ 81F2B27
-	trainerbattle 0, TRAINER_HELENE, 0, Route115_Text_29B92D, Route115_Text_29B958
-	msgbox Route115_Text_29B971, 6
+	trainerbattle_single TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958
+	msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_1F2B3E:: @ 81F2B3E
-	trainerbattle 0, TRAINER_MARLENE, 0, Route115_Text_29BA2C, Route115_Text_29BA67
-	msgbox Route115_Text_29BA87, 6
+	trainerbattle_single TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67
+	msgbox Route115_Text_29BA87, MSGBOX_AUTOCLOSE
 	end
 
 Route115_Text_1F2B55: @ 81F2B55