Merge remote-tracking branch 'upstream' into tustin2121-patch-5

1 files changed, 188 insertions, 188 deletions

diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc
index 161e9be51..eee823975 100644
--- a/data/maps/Route116/scripts.inc
+++ b/data/maps/Route116/scripts.inc
@@ -1,103 +1,103 @@
 Route116_MapScripts:: @ 81F2C0C
 	map_script MAP_SCRIPT_ON_TRANSITION, Route116_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route116_MapScript1_1F2C4F
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_MapScript2_1F2C66
+	map_script MAP_SCRIPT_ON_LOAD, Route116_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_OnFrame
 	.byte 0
 
 Route116_OnTransition: @ 81F2C1C
-	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47
-	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
-	call_if_eq Route116_EventScript_273D13
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
-	call_if_eq UnusualWeather_StartGroudonWeather
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH
-	call_if_eq UnusualWeather_StartGroudonWeather
+	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_SetWandasBoyfriendPos
+	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
+	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_NORTH
+	call_if_eq AbnormalWeather_StartGroudonWeather
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_SOUTH
+	call_if_eq AbnormalWeather_StartGroudonWeather
 	end
 
-Route116_EventScript_1F2C47:: @ 81F2C47
+Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47
 	setobjectxyperm 21, 38, 10
 	return
 
-Route116_MapScript1_1F2C4F: @ 81F2C4F
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116North
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116South
+Route116_OnLoad: @ 81F2C4F
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_NORTH
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute116North
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_SOUTH
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute116South
 	end
 
-Route116_MapScript2_1F2C66: @ 81F2C66
-	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+Route116_OnFrame: @ 81F2C66
+	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route116_EventScript_1F2C70:: @ 81F2C70
+Route116_EventScript_WandasBoyfriend:: @ 81F2C70
 	lock
 	faceplayer
-	goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C8E
-	goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_1F2C98
-	msgbox Route116_Text_1F3140, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_BoyfriendGruntLeftTunnel
+	goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_BoyfriendGruntInTunnel
+	msgbox Route116_Text_WantToDigTunnel, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2C8E:: @ 81F2C8E
-	msgbox Route116_Text_1F32C1, MSGBOX_DEFAULT
+Route116_EventScript_BoyfriendGruntLeftTunnel:: @ 81F2C8E
+	msgbox Route116_Text_GoonHightailedItOutOfTunnel, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2C98:: @ 81F2C98
-	msgbox Route116_Text_1F3166, MSGBOX_DEFAULT
+Route116_EventScript_BoyfriendGruntInTunnel:: @ 81F2C98
+	msgbox Route116_Text_DiggingTunnelWhenGoonOrderedMeOut, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2CA2:: @ 81F2CA2
+Route116_EventScript_DevonEmployee:: @ 81F2CA2
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_1F2D2B
-	msgbox Route116_Text_1F3317, MSGBOX_DEFAULT
-	goto Route116_EventScript_1F2CBB
+	goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_TryGiveRepeatBallAgain
+	msgbox Route116_Text_ThankYouTokenOfAppreciation, MSGBOX_DEFAULT
+	goto Route116_EventScript_GiveRepeatBall
 	end
 
-Route116_EventScript_1F2CBB:: @ 81F2CBB
+Route116_EventScript_GiveRepeatBall:: @ 81F2CBB
 	setflag FLAG_MET_DEVON_EMPLOYEE
-	giveitem_std ITEM_REPEAT_BALL
-	compare VAR_RESULT, 0
-	goto_if_eq Route116_EventScript_1F2D39
-	msgbox Route116_Text_1F3521, MSGBOX_DEFAULT
+	giveitem ITEM_REPEAT_BALL
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route116_EventScript_NoRoomForRepeatBall
+	msgbox Route116_Text_NewBallAvailableAtMart, MSGBOX_DEFAULT
 	closemessage
-	compare VAR_FACING, 2
-	call_if_eq Route116_EventScript_1F2D15
-	compare VAR_FACING, 1
-	call_if_eq Route116_EventScript_1F2D15
-	compare VAR_FACING, 3
-	call_if_eq Route116_EventScript_1F2D15
-	compare VAR_FACING, 4
-	call_if_eq Route116_EventScript_1F2D20
+	compare VAR_FACING, DIR_NORTH
+	call_if_eq Route116_EventScript_DevonEmployeeExit
+	compare VAR_FACING, DIR_SOUTH
+	call_if_eq Route116_EventScript_DevonEmployeeExit
+	compare VAR_FACING, DIR_WEST
+	call_if_eq Route116_EventScript_DevonEmployeeExit
+	compare VAR_FACING, DIR_EAST
+	call_if_eq Route116_EventScript_DevonEmployeeExitEast
 	removeobject VAR_LAST_TALKED
 	clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
 	setflag FLAG_RECEIVED_REPEAT_BALL
 	release
 	end
 
-Route116_EventScript_1F2D15:: @ 81F2D15
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2D43
+Route116_EventScript_DevonEmployeeExit:: @ 81F2D15
+	applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExit
 	waitmovement 0
 	return
 
-Route116_EventScript_1F2D20:: @ 81F2D20
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2D4C
+Route116_EventScript_DevonEmployeeExitEast:: @ 81F2D20
+	applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExitEast
 	waitmovement 0
 	return
 
-Route116_EventScript_1F2D2B:: @ 81F2D2B
-	msgbox Route116_Text_1F35CE, MSGBOX_DEFAULT
-	goto Route116_EventScript_1F2CBB
+Route116_EventScript_TryGiveRepeatBallAgain:: @ 81F2D2B
+	msgbox Route116_Text_TokenOfAppreciation, MSGBOX_DEFAULT
+	goto Route116_EventScript_GiveRepeatBall
 	end
 
-Route116_EventScript_1F2D39:: @ 81F2D39
-	msgbox Route116_Text_1F3593, MSGBOX_DEFAULT
+Route116_EventScript_NoRoomForRepeatBall:: @ 81F2D39
+	msgbox Route116_Text_BagIsJamPacked, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_Movement_1F2D43: @ 81F2D43
+Route116_Movement_DevonEmployeeExit: @ 81F2D43
 	walk_left
 	walk_left
 	walk_left
@@ -108,7 +108,7 @@ Route116_Movement_1F2D43: @ 81F2D43
 	walk_left
 	step_end
 
-Route116_Movement_1F2D4C: @ 81F2D4C
+Route116_Movement_DevonEmployeeExitEast: @ 81F2D4C
 	walk_down
 	walk_left
 	walk_left
@@ -121,104 +121,104 @@ Route116_Movement_1F2D4C: @ 81F2D4C
 	walk_left
 	step_end
 
-Route116_EventScript_1F2D57:: @ 81F2D57
-	msgbox Route116_Text_1F379D, MSGBOX_SIGN
+Route116_EventScript_RouteSignRustboro:: @ 81F2D57
+	msgbox Route116_Text_RouteSignRustboro, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D60:: @ 81F2D60
-	msgbox Route116_Text_1F37B7, MSGBOX_SIGN
+Route116_EventScript_RusturfTunnelSign:: @ 81F2D60
+	msgbox Route116_Text_RusturfTunnelSign, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D69:: @ 81F2D69
-	msgbox Route116_Text_1F380F, MSGBOX_SIGN
+Route116_EventScript_TunnelersRestHouseSign:: @ 81F2D69
+	msgbox Route116_Text_TunnelersRestHouse, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D72:: @ 81F2D72
-	msgbox Route116_Text_1F3825, MSGBOX_SIGN
+Route116_EventScript_TrainerTipsBToStopEvolution:: @ 81F2D72
+	msgbox Route116_Text_TrainerTipsBToStopEvolution, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D7B:: @ 81F2D7B
-	msgbox Route116_Text_1F38D4, MSGBOX_SIGN
+Route116_EventScript_TrainerTipsBagHasPockets:: @ 81F2D7B
+	msgbox Route116_Text_TrainerTipsBagHasPockets, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D84:: @ 81F2D84
+Route116_EventScript_Briney:: @ 81F2D84
 	lock
 	faceplayer
-	msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
+	msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT
 	setvar VAR_ROUTE116_STATE, 2
 	release
 	end
 
-Route116_EventScript_1F2D95:: @ 81F2D95
+Route116_EventScript_BrineyTrigger:: @ 81F2D95
 	lockall
-	applymovement 11, Common_Movement_WalkInPlaceRight
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+	applymovement 11, Common_Movement_WalkInPlaceFastestRight
+	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
+	msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT
 	setvar VAR_ROUTE116_STATE, 2
 	releaseall
 	end
 
-Route116_EventScript_1F2DB6:: @ 81F2DB6
+Route116_EventScript_GlassesMan:: @ 81F2DB6
 	lock
 	faceplayer
 	checkitem ITEM_BLACK_GLASSES, 1
-	compare VAR_RESULT, 1
-	goto_if_eq Route116_EventScript_1F2DF1
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route116_EventScript_PlayerHasGlasses
 	specialvar VAR_RESULT, FoundBlackGlasses
-	compare VAR_RESULT, 1
-	goto_if_eq Route116_EventScript_1F2DE2
-	msgbox Route116_Text_1F3657, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route116_EventScript_FoundGlassesNotOnPlayer
+	msgbox Route116_Text_CanYouHelpMeFindGlasses, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2DE2:: @ 81F2DE2
-	msgbox Route116_Text_1F3718, MSGBOX_DEFAULT
+Route116_EventScript_FoundGlassesNotOnPlayer:: @ 81F2DE2
+	msgbox Route116_Text_CantFindGlassesNotHere, MSGBOX_DEFAULT
 	closemessage
-	goto Route116_EventScript_1F2E2A
+	goto Route116_EventScript_GlassesManExit
 	end
 
-Route116_EventScript_1F2DF1:: @ 81F2DF1
-	msgbox Route116_Text_1F3657, MSGBOX_DEFAULT
-	msgbox Route116_Text_1F3688, MSGBOX_DEFAULT
+Route116_EventScript_PlayerHasGlasses:: @ 81F2DF1
+	msgbox Route116_Text_CanYouHelpMeFindGlasses, MSGBOX_DEFAULT
+	msgbox Route116_Text_MayISeeThoseGlasses, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, FoundBlackGlasses
-	compare VAR_RESULT, 1
-	goto_if_eq Route116_EventScript_1F2E1B
-	msgbox Route116_Text_1F375E, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route116_EventScript_FoundGlassesOnPlayer
+	msgbox Route116_Text_NotWhatImLookingFor, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2E1B:: @ 81F2E1B
-	msgbox Route116_Text_1F36B4, MSGBOX_DEFAULT
+Route116_EventScript_FoundGlassesOnPlayer:: @ 81F2E1B
+	msgbox Route116_Text_NotWhatImLookingForMaybeTheyArentHere, MSGBOX_DEFAULT
 	closemessage
-	goto Route116_EventScript_1F2E2A
+	goto Route116_EventScript_GlassesManExit
 	end
 
-Route116_EventScript_1F2E2A:: @ 81F2E2A
+Route116_EventScript_GlassesManExit:: @ 81F2E2A
 	delay 20
-	compare VAR_FACING, 2
-	call_if_eq Route116_EventScript_1F2E5E
-	compare VAR_FACING, 1
-	call_if_eq Route116_EventScript_1F2E5E
-	compare VAR_FACING, 3
-	call_if_eq Route116_EventScript_1F2E5E
-	compare VAR_FACING, 4
-	call_if_eq Route116_EventScript_1F2E69
+	compare VAR_FACING, DIR_NORTH
+	call_if_eq Route116_EventScript_GlassesManExitNormal
+	compare VAR_FACING, DIR_SOUTH
+	call_if_eq Route116_EventScript_GlassesManExitNormal
+	compare VAR_FACING, DIR_WEST
+	call_if_eq Route116_EventScript_GlassesManExitNormal
+	compare VAR_FACING, DIR_EAST
+	call_if_eq Route116_EventScript_GlassesManExitEast
 	removeobject VAR_LAST_TALKED
 	release
 	end
 
-Route116_EventScript_1F2E5E:: @ 81F2E5E
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2E74
+Route116_EventScript_GlassesManExitNormal:: @ 81F2E5E
+	applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExit
 	waitmovement 0
 	return
 
-Route116_EventScript_1F2E69:: @ 81F2E69
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2E7E
+Route116_EventScript_GlassesManExitEast:: @ 81F2E69
+	applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExitEast
 	waitmovement 0
 	return
 
-Route116_Movement_1F2E74: @ 81F2E74
+Route116_Movement_GlassesManExit: @ 81F2E74
 	walk_left
 	walk_left
 	walk_left
@@ -230,7 +230,7 @@ Route116_Movement_1F2E74: @ 81F2E74
 	walk_left
 	step_end
 
-Route116_Movement_1F2E7E: @ 81F2E7E
+Route116_Movement_GlassesManExitEast: @ 81F2E7E
 	walk_up
 	walk_left
 	walk_left
@@ -243,133 +243,133 @@ Route116_Movement_1F2E7E: @ 81F2E7E
 	walk_left
 	step_end
 
-Route116_EventScript_1F2E89:: @ 81F2E89
-	trainerbattle_single TRAINER_JOEY, Route116_Text_29BB79, Route116_Text_29BB9A
-	msgbox Route116_Text_29BBC6, MSGBOX_AUTOCLOSE
+Route116_EventScript_Joey:: @ 81F2E89
+	trainerbattle_single TRAINER_JOEY, Route116_Text_JoeyIntro, Route116_Text_JoeyDefeat
+	msgbox Route116_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2EA0:: @ 81F2EA0
-	trainerbattle_single TRAINER_JOSE, Route116_Text_29BBFD, Route116_Text_29BC25
-	msgbox Route116_Text_29BC42, MSGBOX_AUTOCLOSE
+Route116_EventScript_Jose:: @ 81F2EA0
+	trainerbattle_single TRAINER_JOSE, Route116_Text_JoseIntro, Route116_Text_JoseDefeat
+	msgbox Route116_Text_JosePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2EB7:: @ 81F2EB7
-	trainerbattle_single TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8
+Route116_EventScript_Jerry:: @ 81F2EB7
+	trainerbattle_single TRAINER_JERRY_1, Route116_Text_JerryIntro, Route116_Text_JerryDefeat, Route116_EventScript_TryRegisterJerryAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route116_EventScript_1F2F4E
-	setvar VAR_0x8004, 273
-	specialvar VAR_RESULT, sub_813B4E0
-	compare VAR_RESULT, 0
-	goto_if_eq Route116_EventScript_1F2F22
-	msgbox Route116_Text_29BD92, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route116_EventScript_RematchJerry
+	setvar VAR_0x8004, TRAINER_JERRY_1
+	specialvar VAR_RESULT, IsTrainerRegistered
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route116_EventScript_TryRegisterJerry
+	msgbox Route116_Text_JerryPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2EF8:: @ 81F2EF8
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F03
+Route116_EventScript_TryRegisterJerryAfterBattle:: @ 81F2EF8
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerryAfterBattle
 	release
 	end
 
-Route116_EventScript_1F2F03:: @ 81F2F03
-	special sub_80B4808
+Route116_EventScript_RegisterJerryAfterBattle:: @ 81F2F03
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route116_Text_29BE71, MSGBOX_DEFAULT
+	msgbox Route116_Text_JerryRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JERRY_1
 	release
 	end
 
-Route116_EventScript_1F2F22:: @ 81F2F22
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F35
-	msgbox Route116_Text_29BD92, MSGBOX_DEFAULT
+Route116_EventScript_TryRegisterJerry:: @ 81F2F22
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerry
+	msgbox Route116_Text_JerryPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2F35:: @ 81F2F35
-	msgbox Route116_Text_29BDEF, MSGBOX_DEFAULT
+Route116_EventScript_RegisterJerry:: @ 81F2F35
+	msgbox Route116_Text_JerryRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JERRY_1
 	release
 	end
 
-Route116_EventScript_1F2F4E:: @ 81F2F4E
-	trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_29BEF3, Route116_Text_29BF4C
-	msgbox Route116_Text_29BF68, MSGBOX_AUTOCLOSE
+Route116_EventScript_RematchJerry:: @ 81F2F4E
+	trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_JerryRematchIntro, Route116_Text_JerryRematchDefeat
+	msgbox Route116_Text_JerryPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2F65:: @ 81F2F65
-	trainerbattle_single TRAINER_CLARK, Route116_Text_29BACD, Route116_Text_29BB0F
-	msgbox Route116_Text_29BB31, MSGBOX_AUTOCLOSE
+Route116_EventScript_Clark:: @ 81F2F65
+	trainerbattle_single TRAINER_CLARK, Route116_Text_ClarkIntro, Route116_Text_ClarkDefeat
+	msgbox Route116_Text_ClarkPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2F7C:: @ 81F2F7C
-	trainerbattle_single TRAINER_JANICE, Route116_Text_29BC7F, Route116_Text_29BCB3
-	msgbox Route116_Text_29BCCC, MSGBOX_AUTOCLOSE
+Route116_EventScript_Janice:: @ 81F2F7C
+	trainerbattle_single TRAINER_JANICE, Route116_Text_JaniceIntro, Route116_Text_JaniceDefeat
+	msgbox Route116_Text_JanicePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2F93:: @ 81F2F93
-	trainerbattle_single TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4
+Route116_EventScript_Karen:: @ 81F2F93
+	trainerbattle_single TRAINER_KAREN_1, Route116_Text_KarenIntro, Route116_Text_KarenDefeat, Route116_EventScript_TryRegisterKarenAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route116_EventScript_1F302A
-	setvar VAR_0x8004, 280
-	specialvar VAR_RESULT, sub_813B4E0
-	compare VAR_RESULT, 0
-	goto_if_eq Route116_EventScript_1F2FFE
-	msgbox Route116_Text_29C010, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route116_EventScript_RematchKaren
+	setvar VAR_0x8004, TRAINER_KAREN_1
+	specialvar VAR_RESULT, IsTrainerRegistered
+	compare VAR_RESULT, FALSE
+	goto_if_eq Route116_EventScript_TryRegisterKaren
+	msgbox Route116_Text_KarenPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2FD4:: @ 81F2FD4
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2FDF
+Route116_EventScript_TryRegisterKarenAfterBattle:: @ 81F2FD4
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKarenAfterBattle
 	release
 	end
 
-Route116_EventScript_1F2FDF:: @ 81F2FDF
-	special sub_80B4808
+Route116_EventScript_RegisterKarenAfterBattle:: @ 81F2FDF
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route116_Text_29C096, MSGBOX_DEFAULT
+	msgbox Route116_Text_KarenRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KAREN_1
 	release
 	end
 
-Route116_EventScript_1F2FFE:: @ 81F2FFE
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F3011
-	msgbox Route116_Text_29C010, MSGBOX_DEFAULT
+Route116_EventScript_TryRegisterKaren:: @ 81F2FFE
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKaren
+	msgbox Route116_Text_KarenPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F3011:: @ 81F3011
-	msgbox Route116_Text_29C052, MSGBOX_DEFAULT
+Route116_EventScript_RegisterKaren:: @ 81F3011
+	msgbox Route116_Text_KarenRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KAREN_1
 	release
 	end
 
-Route116_EventScript_1F302A:: @ 81F302A
-	trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_29C0DA, Route116_Text_29C11F
-	msgbox Route116_Text_29C13B, MSGBOX_AUTOCLOSE
+Route116_EventScript_RematchKaren:: @ 81F302A
+	trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_KarenRematchIntro, Route116_Text_KarenRematchDefeat
+	msgbox Route116_Text_KarenPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F3041:: @ 81F3041
-	trainerbattle_single TRAINER_SARAH, Route116_Text_29C173, Route116_Text_29C1B8
-	msgbox Route116_Text_29C1EA, MSGBOX_AUTOCLOSE
+Route116_EventScript_Sarah:: @ 81F3041
+	trainerbattle_single TRAINER_SARAH, Route116_Text_SarahIntro, Route116_Text_SarahDefeat
+	msgbox Route116_Text_SarahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F3058:: @ 81F3058
-	trainerbattle_single TRAINER_DAWSON, Route116_Text_29C266, Route116_Text_29C2C2
-	msgbox Route116_Text_29C2DD, MSGBOX_AUTOCLOSE
+Route116_EventScript_Dawson:: @ 81F3058
+	trainerbattle_single TRAINER_DAWSON, Route116_Text_DawsonIntro, Route116_Text_DawsonDefeat
+	msgbox Route116_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F306F:: @ 81F306F
-	trainerbattle_single TRAINER_DEVAN, Route116_Text_29C350, Route116_Text_29C365
-	msgbox Route116_Text_29C380, MSGBOX_AUTOCLOSE
+Route116_EventScript_Devan:: @ 81F306F
+	trainerbattle_single TRAINER_DEVAN, Route116_Text_DevanIntro, Route116_Text_DevanDefeat
+	msgbox Route116_Text_DevanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F3086:: @ 81F3086
-	trainerbattle_single TRAINER_JOHNSON, Route116_Text_29C3C1, Route116_Text_29C3F7
-	msgbox Route116_Text_29C418, MSGBOX_AUTOCLOSE
+Route116_EventScript_Johnson:: @ 81F3086
+	trainerbattle_single TRAINER_JOHNSON, Route116_Text_JohnsonIntro, Route116_Text_JohnsonDefeat
+	msgbox Route116_Text_JohnsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_Text_1F309D: @ 81F309D
+Route116_Text_ScoundrelMadeOffWithPeeko: @ 81F309D
 	.string "Ohhh, what am I to do?\p"
 	.string "We were on our walk, PEEKO and I, when\n"
 	.string "we were jumped by an odd thug…\p"
@@ -377,11 +377,11 @@ Route116_Text_1F309D: @ 81F309D
 	.string "darling PEEKO!\p"
 	.string "Wrrrooooooaaaar! PEEKO!$"
 
-Route116_Text_1F3140: @ 81F3140
+Route116_Text_WantToDigTunnel: @ 81F3140
 	.string "Nnn… Roar!\p"
 	.string "I want to dig that tunnel!$"
 
-Route116_Text_1F3166: @ 81F3166
+Route116_Text_DiggingTunnelWhenGoonOrderedMeOut: @ 81F3166
 	.string "Nnn… Roar!\n"
 	.string "What's going on?\p"
 	.string "I was digging the tunnel without any\n"
@@ -395,12 +395,12 @@ Route116_Text_1F3166: @ 81F3166
 	.string "something stupid and startle the\l"
 	.string "POKéMON into an uproar.$"
 
-Route116_Text_1F32C1: @ 81F32C1
+Route116_Text_GoonHightailedItOutOfTunnel: @ 81F32C1
 	.string "Nnn… Roar!\p"
 	.string "That goofy goon hightailed it out of\n"
 	.string "the tunnel! I can go back to digging!$"
 
-Route116_Text_1F3317: @ 81F3317
+Route116_Text_ThankYouTokenOfAppreciation: @ 81F3317
 	.string "Oh! It's you!\p"
 	.string "You're that person who not only helped\n"
 	.string "me in PETALBURG WOODS, but also got\l"
@@ -419,61 +419,61 @@ Route116_Text_1F3317: @ 81F3317
 	.string "As a token of our appreciation, this\n"
 	.string "is our gift to our wonderful TRAINER!$"
 
-Route116_Text_1F3521: @ 81F3521
+Route116_Text_NewBallAvailableAtMart: @ 81F3521
 	.string "Our new POKé BALL will be available\n"
 	.string "at the POKéMON MART in RUSTBORO.\p"
 	.string "Please do try it out!\n"
 	.string "Thank you and bye-bye!$"
 
-Route116_Text_1F3593: @ 81F3593
+Route116_Text_BagIsJamPacked: @ 81F3593
 	.string "Your BAG is jam-packed.\n"
 	.string "I can't give you this REPEAT BALL.$"
 
-Route116_Text_1F35CE: @ 81F35CE
+Route116_Text_TokenOfAppreciation: @ 81F35CE
 	.string "As a token of our appreciation for\n"
 	.string "your delivering our package, I have\l"
 	.string "a gift of a new kind of POKé BALL\l"
 	.string "for our most wonderful TRAINER!$"
 
-Route116_Text_1F3657: @ 81F3657
+Route116_Text_CanYouHelpMeFindGlasses: @ 81F3657
 	.string "I dropped my glasses…\n"
 	.string "Can you help me find them?$"
 
-Route116_Text_1F3688: @ 81F3688
+Route116_Text_MayISeeThoseGlasses: @ 81F3688
 	.string "Those glasses!\n"
 	.string "May I see them for a second?$"
 
-Route116_Text_1F36B4: @ 81F36B4
+Route116_Text_NotWhatImLookingForMaybeTheyArentHere: @ 81F36B4
 	.string "Hmm…\n"
 	.string "These are BLACKGLASSES.\l"
 	.string "They're not what I'm looking for…\p"
 	.string "Maybe my glasses aren't around\n"
 	.string "here…$"
 
-Route116_Text_1F3718: @ 81F3718
+Route116_Text_CantFindGlassesNotHere: @ 81F3718
 	.string "Hmm…\n"
 	.string "I can't find my glasses anywhere…\l"
 	.string "Maybe they're not around here…$"
 
-Route116_Text_1F375E: @ 81F375E
+Route116_Text_NotWhatImLookingFor: @ 81F375E
 	.string "Hmm…\n"
 	.string "These are BLACKGLASSES.\l"
 	.string "They're not what I'm looking for…$"
 
-Route116_Text_1F379D: @ 81F379D
+Route116_Text_RouteSignRustboro: @ 81F379D
 	.string "ROUTE 116\n"
 	.string "{LEFT_ARROW} RUSTBORO CITY$"
 
-Route116_Text_1F37B7: @ 81F37B7
+Route116_Text_RusturfTunnelSign: @ 81F37B7
 	.string "RUSTURF TUNNEL\n"
 	.string "“Linking RUSTBORO and VERDANTURF\p"
 	.string "“The tunnel project has been\n"
 	.string "canceled.”$"
 
-Route116_Text_1F380F: @ 81F380F
+Route116_Text_TunnelersRestHouse: @ 81F380F
 	.string "TUNNELER'S REST HOUSE$"
 
-Route116_Text_1F3825: @ 81F3825
+Route116_Text_TrainerTipsBToStopEvolution: @ 81F3825
 	.string "TRAINER TIPS\p"
 	.string "If you want to stop a POKéMON from\n"
 	.string "evolving, press the B Button while it\l"
@@ -481,7 +481,7 @@ Route116_Text_1F3825: @ 81F3825
 	.string "The startled POKéMON will stop.\p"
 	.string "This is called an evolution cancel.$"
 
-Route116_Text_1F38D4: @ 81F38D4
+Route116_Text_TrainerTipsBagHasPockets: @ 81F38D4
 	.string "TRAINER TIPS\p"
 	.string "Your BAG has several POCKETS.\p"
 	.string "Items you obtain are automatically\n"