fixing merge conflicts

2 files changed, 42 insertions, 48 deletions

diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc
index 21bae5dc6..b2481d6ed 100644
--- a/data/maps/Route113/events.inc
+++ b/data/maps/Route113/events.inc
@@ -4,13 +4,13 @@ Route113_EventObjects: @ 8529B2C
 	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0
 	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0
 	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 51, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, FLAG_ITEM_ROUTE_113_MAX_ETHER
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, FLAG_ITEM_ROUTE_113_SUPER_REPEL
 	object_event 8, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F2250, 0
 	object_event 9, EVENT_OBJ_GFX_NINJA_BOY, 0, 71, 2, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0
 	object_event 10, EVENT_OBJ_GFX_TWIN, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0
 	object_event 11, EVENT_OBJ_GFX_TWIN, 0, 46, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0
-	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, 1143
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, FLAG_ITEM_ROUTE_113_HYPER_POTION
 	object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route113_EventScript_1F2344, 0
 	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route113_EventScript_1F232D, 0
 	object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0
@@ -48,9 +48,9 @@ Route113_MapBGEvents: @ 8529DF4
 	bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7
 	bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21AE
 	bg_secret_base_event 49, 8, 3, SECRET_BASE_RED_CAVE1_3
-	bg_hidden_item_event 66, 3, 3, ITEM_ETHER, 3
-	bg_hidden_item_event 22, 5, 3, ITEM_TM32, 30
-	bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, 98
+	bg_hidden_item_event 66, 3, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_113_ETHER
+	bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32
+	bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET
 
 Route113_MapEvents:: @ 8529E54
 	map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents
diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc
index ce2c4b47d..550029289 100644
--- a/data/maps/Route113/scripts.inc
+++ b/data/maps/Route113/scripts.inc
@@ -25,122 +25,116 @@ Route113_EventScript_1F2189:: @ 81F2189
 	return
 
 Route113_EventScript_1F218A:: @ 81F218A
-	msgbox Route113_Text_1F235B, 2
+	msgbox Route113_Text_1F235B, MSGBOX_NPC
 	end
 
 Route113_EventScript_1F2193:: @ 81F2193
-	msgbox Route113_Text_1F23CA, 2
+	msgbox Route113_Text_1F23CA, MSGBOX_NPC
 	end
 
 Route113_EventScript_1F219C:: @ 81F219C
-	msgbox Route113_Text_1F2440, 3
+	msgbox Route113_Text_1F2440, MSGBOX_SIGN
 	end
 
 Route113_EventScript_1F21A5:: @ 81F21A5
-	msgbox Route113_Text_1F2456, 3
+	msgbox Route113_Text_1F2456, MSGBOX_SIGN
 	end
 
 Route113_EventScript_1F21AE:: @ 81F21AE
-	msgbox Route113_Text_1F24F8, 3
+	msgbox Route113_Text_1F24F8, MSGBOX_SIGN
 	end
 
 Route113_EventScript_1F21B7:: @ 81F21B7
-	msgbox Route113_Text_1F2471, 3
+	msgbox Route113_Text_1F2471, MSGBOX_SIGN
 	end
 
 Route113_EventScript_1F21C0:: @ 81F21C0
-	trainerbattle 0, TRAINER_JAYLEN, 0, Route113_Text_299D3C, Route113_Text_299D68
-	msgbox Route113_Text_299D7D, 6
+	trainerbattle_single TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68
+	msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_1F21D7:: @ 81F21D7
-	trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_299DE3, Route113_Text_299E1C
-	msgbox Route113_Text_299E38, 6
+	trainerbattle_single TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C
+	msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_1F21EE:: @ 81F21EE
-	trainerbattle 2, TRAINER_MADELINE_1, 0, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A
+	trainerbattle_single TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route113_EventScript_1F2239
-	msgbox Route113_Text_299F15, 4
+	msgbox Route113_Text_299F15, MSGBOX_DEFAULT
 	release
 	end
 
 Route113_EventScript_1F221A:: @ 81F221A
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route113_Text_299F49, 4
-	setvar VAR_0x8004, 434
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 434
-	callstd 8
+	msgbox Route113_Text_299F49, MSGBOX_DEFAULT
+	register_matchcall TRAINER_MADELINE_1
 	release
 	end
 
 Route113_EventScript_1F2239:: @ 81F2239
-	trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_299F8A, Route113_Text_299FC9
-	msgbox Route113_Text_299FD8, 6
+	trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_299F8A, Route113_Text_299FC9
+	msgbox Route113_Text_299FD8, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_1F2250:: @ 81F2250
-	trainerbattle 2, TRAINER_LAO_1, 0, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C
+	trainerbattle_single TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route113_EventScript_1F229B
-	msgbox Route113_Text_29A067, 4
+	msgbox Route113_Text_29A067, MSGBOX_DEFAULT
 	release
 	end
 
 Route113_EventScript_1F227C:: @ 81F227C
 	special sub_80B4808
 	waitmovement 0
-	msgbox Route113_Text_29A0A2, 4
-	setvar VAR_0x8004, 419
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 419
-	callstd 8
+	msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT
+	register_matchcall TRAINER_LAO_1
 	release
 	end
 
 Route113_EventScript_1F229B:: @ 81F229B
-	trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_29A0E8, Route113_Text_29A11F
-	msgbox Route113_Text_29A13A, 6
+	trainerbattle_rematch TRAINER_LAO_1, Route113_Text_29A0E8, Route113_Text_29A11F
+	msgbox Route113_Text_29A13A, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_1F22B2:: @ 81F22B2
-	trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_29A192, Route113_Text_29A1C6
-	msgbox Route113_Text_29A219, 6
+	trainerbattle_single TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6
+	msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_1F22C9:: @ 81F22C9
-	trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F
-	msgbox Route113_Text_29A2DE, 6
+	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F
+	msgbox Route113_Text_29A2DE, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_1F22E4:: @ 81F22E4
-	trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419
-	msgbox Route113_Text_29A3DA, 6
+	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419
+	msgbox Route113_Text_29A3DA, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_1F22FF:: @ 81F22FF
-	trainerbattle 0, TRAINER_SOPHIE, 0, Route113_Text_29A4BF, Route113_Text_29A508
-	msgbox Route113_Text_29A529, 6
+	trainerbattle_single TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508
+	msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_1F2316:: @ 81F2316
-	trainerbattle 0, TRAINER_COBY, 0, Route113_Text_29A453, Route113_Text_29A480
-	msgbox Route113_Text_29A489, 6
+	trainerbattle_single TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480
+	msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_1F232D:: @ 81F232D
-	trainerbattle 0, TRAINER_LAWRENCE, 0, Route113_Text_29A566, Route113_Text_29A5A0
-	msgbox Route113_Text_29A5BE, 6
+	trainerbattle_single TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0
+	msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_1F2344:: @ 81F2344
-	trainerbattle 0, TRAINER_WYATT, 0, Route113_Text_29A5E4, Route113_Text_29A628
-	msgbox Route113_Text_29A65D, 6
+	trainerbattle_single TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628
+	msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE
 	end
 
 Route113_Text_1F235B: @ 81F235B