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

1 files changed, 113 insertions, 113 deletions

diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
index 858f0d598..af77193ba 100644
--- a/data/maps/Route118/scripts.inc
+++ b/data/maps/Route118/scripts.inc
@@ -1,155 +1,155 @@
 Route118_MapScripts:: @ 81F3DBC
 	map_script MAP_SCRIPT_ON_TRANSITION, Route118_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route118_MapScript1_1F3DF3
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_MapScript2_1F3E0A
+	map_script MAP_SCRIPT_ON_LOAD, Route118_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_OnFrame
 	.byte 0
 
 Route118_OnTransition: @ 81F3DCC
-	call Route118_EventScript_28CCC7
-	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
-	call_if_eq Route118_EventScript_273D13
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST
-	call_if_eq UnusualWeather_StartGroudonWeather
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST
-	call_if_eq UnusualWeather_StartGroudonWeather
+	call GabbyAndTy_EventScript_UpdateLocation
+	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
+	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_EAST
+	call_if_eq AbnormalWeather_StartGroudonWeather
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_WEST
+	call_if_eq AbnormalWeather_StartGroudonWeather
 	end
 
-Route118_MapScript1_1F3DF3: @ 81F3DF3
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118East
-	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST
-	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118West
+Route118_OnLoad: @ 81F3DF3
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_EAST
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute118East
+	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_WEST
+	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute118West
 	end
 
-Route118_MapScript2_1F3E0A: @ 81F3E0A
-	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+Route118_OnFrame: @ 81F3E0A
+	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route118_EventScript_1F3E14:: @ 81F3E14
+Route118_EventScript_GoodRodFisherman:: @ 81F3E14
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_1F3E69
-	msgbox Route118_Text_1F427B, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq Route118_EventScript_1F3E3E
-	compare VAR_RESULT, 0
-	goto_if_eq Route118_EventScript_1F3E5F
+	goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_ReceivedGoodRod
+	msgbox Route118_Text_YouAgreeGoodRodIsGood, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq Route118_EventScript_ReceiveGoodRod
+	compare VAR_RESULT, NO
+	goto_if_eq Route118_EventScript_DeclineGoodRod
 	end
 
-Route118_EventScript_1F3E3E:: @ 81F3E3E
-	msgbox Route118_Text_1F42AF, MSGBOX_DEFAULT
-	giveitem_std ITEM_GOOD_ROD
+Route118_EventScript_ReceiveGoodRod:: @ 81F3E3E
+	msgbox Route118_Text_IdenticalMindsTakeThis, MSGBOX_DEFAULT
+	giveitem ITEM_GOOD_ROD
 	setflag FLAG_RECEIVED_GOOD_ROD
-	msgbox Route118_Text_1F42E7, MSGBOX_DEFAULT
+	msgbox Route118_Text_TryYourLuckFishing, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3E5F:: @ 81F3E5F
-	msgbox Route118_Text_1F4319, MSGBOX_DEFAULT
+Route118_EventScript_DeclineGoodRod:: @ 81F3E5F
+	msgbox Route118_Text_DontYouLikeToFish, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3E69:: @ 81F3E69
-	msgbox Route118_Text_1F4331, MSGBOX_DEFAULT
+Route118_EventScript_ReceivedGoodRod:: @ 81F3E69
+	msgbox Route118_Text_TryCatchingMonWithGoodRod, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3E73:: @ 81F3E73
-	msgbox Route118_Text_1F4367, MSGBOX_NPC
+Route118_EventScript_Girl:: @ 81F3E73
+	msgbox Route118_Text_CanCrossRiversWithSurf, MSGBOX_NPC
 	end
 
-Route118_EventScript_1F3E7C:: @ 81F3E7C
-	msgbox Route118_Text_1F43F4, MSGBOX_SIGN
+Route118_EventScript_RouteSignMauville:: @ 81F3E7C
+	msgbox Route118_Text_RouteSignMauville, MSGBOX_SIGN
 	end
 
-Route118_EventScript_1F3E85:: @ 81F3E85
-	msgbox Route118_Text_1F440E, MSGBOX_SIGN
+Route118_EventScript_RouteSign119:: @ 81F3E85
+	msgbox Route118_Text_RouteSign119, MSGBOX_SIGN
 	end
 
-Route118_EventScript_1F3E8E:: @ 81F3E8E
+Route118_EventScript_StevenTrigger0:: @ 81F3E8E
 	lockall
 	setvar VAR_0x8008, 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	applymovement 19, Route118_Movement_1F3F61
+	applymovement 19, Route118_Movement_StevenApproachLedge0
 	waitmovement 0
-	goto Route118_EventScript_1F3EE4
+	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_1F3EAE:: @ 81F3EAE
+Route118_EventScript_StevenTrigger1:: @ 81F3EAE
 	lockall
 	setvar VAR_0x8008, 1
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	goto Route118_EventScript_1F3EE4
+	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_1F3EC4:: @ 81F3EC4
+Route118_EventScript_StevenTrigger2:: @ 81F3EC4
 	lockall
 	setvar VAR_0x8008, 2
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	applymovement 19, Route118_Movement_1F3F63
+	applymovement 19, Route118_Movement_StevenApproachLedge2
 	waitmovement 0
-	goto Route118_EventScript_1F3EE4
+	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_1F3EE4:: @ 81F3EE4
+Route118_EventScript_StevenTrigger:: @ 81F3EE4
 	playse SE_DANSA
-	applymovement 19, Route118_Movement_1F3F65
+	applymovement 19, Route118_Movement_StevenJumpLedge
 	waitmovement 0
 	delay 30
-	msgbox Route118_Text_1F40BE, MSGBOX_DEFAULT
+	msgbox Route118_Text_StevenQuestions, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 0
-	call_if_eq Route118_EventScript_1F3F28
+	call_if_eq Route118_EventScript_StevenExit0
 	compare VAR_0x8008, 1
-	call_if_eq Route118_EventScript_1F3F3A
+	call_if_eq Route118_EventScript_StevenExit1
 	compare VAR_0x8008, 2
-	call_if_eq Route118_EventScript_1F3F4C
+	call_if_eq Route118_EventScript_StevenExit2
 	setvar VAR_ROUTE118_STATE, 1
 	removeobject 19
 	releaseall
 	end
 
-Route118_EventScript_1F3F28:: @ 81F3F28
-	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E
-	applymovement 19, Route118_Movement_1F3F69
+Route118_EventScript_StevenExit0:: @ 81F3F28
+	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
+	applymovement 19, Route118_Movement_StevenExit0
 	waitmovement 0
 	return
 
-Route118_EventScript_1F3F3A:: @ 81F3F3A
-	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E
-	applymovement 19, Route118_Movement_1F3F74
+Route118_EventScript_StevenExit1:: @ 81F3F3A
+	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
+	applymovement 19, Route118_Movement_StevenExit1
 	waitmovement 0
 	return
 
-Route118_EventScript_1F3F4C:: @ 81F3F4C
-	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E
-	applymovement 19, Route118_Movement_1F3F7E
+Route118_EventScript_StevenExit2:: @ 81F3F4C
+	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
+	applymovement 19, Route118_Movement_StevenExit2
 	waitmovement 0
 	return
 
-Route118_Movement_1F3F5E: @ 81F3F5E
+Route118_Movement_PlayerWatchStevenExit: @ 81F3F5E
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-Route118_Movement_1F3F61: @ 81F3F61
+Route118_Movement_StevenApproachLedge0: @ 81F3F61
 	walk_left
 	step_end
 
-Route118_Movement_1F3F63: @ 81F3F63
+Route118_Movement_StevenApproachLedge2: @ 81F3F63
 	walk_right
 	step_end
 
-Route118_Movement_1F3F65: @ 81F3F65
+Route118_Movement_StevenJumpLedge: @ 81F3F65
 	jump_2_down
 	delay_16
 	walk_down
 	step_end
 
-Route118_Movement_1F3F69: @ 81F3F69
+Route118_Movement_StevenExit0: @ 81F3F69
 	walk_right
 	walk_right
 	walk_right
@@ -162,7 +162,7 @@ Route118_Movement_1F3F69: @ 81F3F69
 	walk_right
 	step_end
 
-Route118_Movement_1F3F74: @ 81F3F74
+Route118_Movement_StevenExit1: @ 81F3F74
 	walk_right
 	walk_right
 	walk_right
@@ -174,7 +174,7 @@ Route118_Movement_1F3F74: @ 81F3F74
 	walk_right
 	step_end
 
-Route118_Movement_1F3F7E: @ 81F3F7E
+Route118_Movement_StevenExit2: @ 81F3F7E
 	walk_right
 	walk_right
 	walk_right
@@ -185,76 +185,76 @@ Route118_Movement_1F3F7E: @ 81F3F7E
 	walk_right
 	step_end
 
-Route118_EventScript_1F3F87:: @ 81F3F87
-	trainerbattle_single TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3
+Route118_EventScript_Rose:: @ 81F3F87
+	trainerbattle_single TRAINER_ROSE_1, Route118_Text_RoseIntro, Route118_Text_RoseDefeat, Route118_EventScript_RegisterRose
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route118_EventScript_1F3FD2
-	msgbox Route118_Text_29D2FA, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route118_EventScript_RematchRose
+	msgbox Route118_Text_RosePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3FB3:: @ 81F3FB3
-	special sub_80B4808
+Route118_EventScript_RegisterRose:: @ 81F3FB3
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route118_Text_29D343, MSGBOX_DEFAULT
+	msgbox Route118_Text_RoseRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ROSE_1
 	release
 	end
 
-Route118_EventScript_1F3FD2:: @ 81F3FD2
-	trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_29D382, Route118_Text_29D3AA
-	msgbox Route118_Text_29D3D9, MSGBOX_AUTOCLOSE
+Route118_EventScript_RematchRose:: @ 81F3FD2
+	trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_RoseRematchIntro, Route118_Text_RoseRematchDefeat
+	msgbox Route118_Text_RosePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F3FE9:: @ 81F3FE9
-	trainerbattle_single TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C
-	msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE
+Route118_EventScript_Barny:: @ 81F3FE9
+	trainerbattle_single TRAINER_BARNY, Route118_Text_BarnyIntro, Route118_Text_BarnyDefeat
+	msgbox Route118_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4000:: @ 81F4000
-	trainerbattle_single TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C
-	msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE
+Route118_EventScript_Wade:: @ 81F4000
+	trainerbattle_single TRAINER_WADE, Route118_Text_WadeIntro, Route118_Text_WadeDefeat
+	msgbox Route118_Text_WadePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4017:: @ 81F4017
-	trainerbattle_single TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043
+Route118_EventScript_Dalton:: @ 81F4017
+	trainerbattle_single TRAINER_DALTON_1, Route118_Text_DaltonIntro, Route118_Text_DaltonDefeat, Route118_EventScript_RegisterDalton
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route118_EventScript_1F4062
-	msgbox Route118_Text_29D6D8, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route118_EventScript_RematchDalton
+	msgbox Route118_Text_DaltonPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F4043:: @ 81F4043
-	special sub_80B4808
+Route118_EventScript_RegisterDalton:: @ 81F4043
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route118_Text_29D74A, MSGBOX_DEFAULT
+	msgbox Route118_Text_DaltonRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_DALTON_1
 	release
 	end
 
-Route118_EventScript_1F4062:: @ 81F4062
-	trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_29D789, Route118_Text_29D7CA
-	msgbox Route118_Text_29D7D5, MSGBOX_AUTOCLOSE
+Route118_EventScript_RematchDalton:: @ 81F4062
+	trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_DaltonRematchIntro, Route118_Text_DaltonRematchDefeat
+	msgbox Route118_Text_DaltonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4079:: @ 81F4079
-	trainerbattle_single TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B
-	msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE
+Route118_EventScript_Perry:: @ 81F4079
+	trainerbattle_single TRAINER_PERRY, Route118_Text_PerryIntro, Route118_Text_PerryDefeat
+	msgbox Route118_Text_PerryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4090:: @ 81F4090
-	trainerbattle_single TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4
-	msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE
+Route118_EventScript_Chester:: @ 81F4090
+	trainerbattle_single TRAINER_CHESTER, Route118_Text_ChesterIntro, Route118_Text_ChesterDefeat
+	msgbox Route118_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F40A7:: @ 81F40A7
-	trainerbattle_single TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C
-	msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE
+Route118_EventScript_Deandre:: @ 81F40A7
+	trainerbattle_single TRAINER_DEANDRE, Route118_Text_DeandreIntro, Route118_Text_DeandreDefeat
+	msgbox Route118_Text_DeandrePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_Text_1F40BE: @ 81F40BE
+Route118_Text_StevenQuestions: @ 81F40BE
 	.string "STEVEN: Hi, {PLAYER}{KUN}!\p"
 	.string "It's me, STEVEN!\n"
 	.string "We met in the cave near DEWFORD.\p"
@@ -272,40 +272,40 @@ Route118_Text_1F40BE: @ 81F40BE
 	.string "It would be nice if we were to meet\n"
 	.string "again somewhere.$"
 
-Route118_Text_1F427B: @ 81F427B
+Route118_Text_YouAgreeGoodRodIsGood: @ 81F427B
 	.string "Hmm!\n"
 	.string "A GOOD ROD is really good!\p"
 	.string "Wouldn't you agree?$"
 
-Route118_Text_1F42AF: @ 81F42AF
+Route118_Text_IdenticalMindsTakeThis: @ 81F42AF
 	.string "Hmm!\n"
 	.string "We're of identical minds!\p"
 	.string "Hmm!\n"
 	.string "Take this GOOD ROD!$"
 
-Route118_Text_1F42E7: @ 81F42E7
+Route118_Text_TryYourLuckFishing: @ 81F42E7
 	.string "Wherever there's water, try your luck\n"
 	.string "at fishing.$"
 
-Route118_Text_1F4319: @ 81F4319
+Route118_Text_DontYouLikeToFish: @ 81F4319
 	.string "Don't you like to fish?$"
 
-Route118_Text_1F4331: @ 81F4331
+Route118_Text_TryCatchingMonWithGoodRod: @ 81F4331
 	.string "Try catching all sorts of POKéMON\n"
 	.string "with your GOOD ROD.$"
 
-Route118_Text_1F4367: @ 81F4367
+Route118_Text_CanCrossRiversWithSurf: @ 81F4367
 	.string "Even if there isn't a boat, you can\n"
 	.string "cross rivers and the sea if you have\l"
 	.string "a POKéMON that knows SURF.\p"
 	.string "POKéMON can be counted on to do so\n"
 	.string "much!$"
 
-Route118_Text_1F43F4: @ 81F43F4
+Route118_Text_RouteSignMauville: @ 81F43F4
 	.string "ROUTE 118\n"
 	.string "{LEFT_ARROW} MAUVILLE CITY$"
 
-Route118_Text_1F440E: @ 81F440E
+Route118_Text_RouteSign119: @ 81F440E
 	.string "ROUTE 118\n"
 	.string "{UP_ARROW} ROUTE 119$"