Name most event scripts related to unusual weather

13 files changed, 62 insertions, 62 deletions

diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc
index 74416f153..1f4202ec4 100644
--- a/data/maps/Route105/scripts.inc
+++ b/data/maps/Route105/scripts.inc
@@ -7,9 +7,9 @@ Route105_MapScripts:: @ 81EE1DB
 Route105_MapScript1_1EE1EB: @ 81EE1EB
 	call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_1EE20B
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH
-	call_if_eq Route105_EventScript_2739AB
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105North
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH
-	call_if_eq Route105_EventScript_273A18
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105South
 	end
 
 Route105_EventScript_1EE20B:: @ 81EE20B
@@ -21,13 +21,13 @@ Route105_MapScript1_1EE21E: @ 81EE21E
 	compare VAR_0x4039, 1
 	call_if_eq Route105_EventScript_273D13
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH
-	call_if_eq Route105_EventScript_273D17
+	call_if_eq UnusualWeather_StartKyogreWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH
-	call_if_eq Route105_EventScript_273D17
+	call_if_eq UnusualWeather_StartKyogreWeather
 	end
 
 Route105_MapScript2_1EE240: @ 81EE240
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route105_EventScript_1EE24A:: @ 81EE24A
diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc
index 856a0f1e4..6a2f8b174 100644
--- a/data/maps/Route114/scripts.inc
+++ b/data/maps/Route114/scripts.inc
@@ -8,20 +8,20 @@ Route114_MapScript1_1F253F: @ 81F253F
 	compare VAR_0x4039, 1
 	call_if_eq Route114_EventScript_273D13
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH
-	call_if_eq Route114_EventScript_273D1B
+	call_if_eq UnusualWeather_StartGroudonWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH
-	call_if_eq Route114_EventScript_273D1B
+	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
 Route114_MapScript1_1F2561: @ 81F2561
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH
-	call_if_eq Route114_EventScript_273913
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114North
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH
-	call_if_eq Route114_EventScript_273926
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114South
 	end
 
 Route114_MapScript2_1F2578: @ 81F2578
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route114_EventScript_1F2582:: @ 81F2582
diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc
index 42cf643af..be3a98f42 100644
--- a/data/maps/Route115/scripts.inc
+++ b/data/maps/Route115/scripts.inc
@@ -6,22 +6,22 @@ Route115_MapScripts:: @ 81F2920
 
 Route115_MapScript1_1F2930: @ 81F2930
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST
-	call_if_eq Route115_EventScript_273939
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115West
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST
-	call_if_eq Route115_EventScript_27394C
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115East
 	end
 
 Route115_MapScript1_1F2947: @ 81F2947
 	compare VAR_0x4039, 1
 	call_if_eq Route115_EventScript_273D13
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST
-	call_if_eq Route115_EventScript_273D1B
+	call_if_eq UnusualWeather_StartGroudonWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST
-	call_if_eq Route115_EventScript_273D1B
+	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
 Route115_MapScript2_1F2969: @ 81F2969
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route115_EventScript_1F2973:: @ 81F2973
diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc
index afb0505c8..193b70157 100644
--- a/data/maps/Route116/scripts.inc
+++ b/data/maps/Route116/scripts.inc
@@ -9,9 +9,9 @@ Route116_MapScript1_1F2C1C: @ 81F2C1C
 	compare VAR_0x4039, 1
 	call_if_eq Route116_EventScript_273D13
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
-	call_if_eq Route116_EventScript_273D1B
+	call_if_eq UnusualWeather_StartGroudonWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH
-	call_if_eq Route116_EventScript_273D1B
+	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
 Route116_EventScript_1F2C47:: @ 81F2C47
@@ -20,13 +20,13 @@ Route116_EventScript_1F2C47:: @ 81F2C47
 
 Route116_MapScript1_1F2C4F: @ 81F2C4F
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
-	call_if_eq Route116_EventScript_27395F
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116North
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH
-	call_if_eq Route116_EventScript_273972
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116South
 	end
 
 Route116_MapScript2_1F2C66: @ 81F2C66
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route116_EventScript_1F2C70:: @ 81F2C70
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
index 88c4e1275..a2784b298 100644
--- a/data/maps/Route118/scripts.inc
+++ b/data/maps/Route118/scripts.inc
@@ -9,20 +9,20 @@ Route118_MapScript1_1F3DCC: @ 81F3DCC
 	compare VAR_0x4039, 1
 	call_if_eq Route118_EventScript_273D13
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST
-	call_if_eq Route118_EventScript_273D1B
+	call_if_eq UnusualWeather_StartGroudonWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST
-	call_if_eq Route118_EventScript_273D1B
+	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
 Route118_MapScript1_1F3DF3: @ 81F3DF3
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST
-	call_if_eq Route118_EventScript_273985
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118East
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST
-	call_if_eq Route118_EventScript_273998
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118West
 	end
 
 Route118_MapScript2_1F3E0A: @ 81F3E0A
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route118_EventScript_1F3E14:: @ 81F3E14
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
index 2eaeceb2f..fa2664d68 100644
--- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -131,43 +131,43 @@ Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA
 	end
 
 Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7
-	goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_27010A
+	goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather
 	msgbox Route119_WeatherInstitute_2F_Text_27077E, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A
+Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather:: @ 827010A
     @ This code uses VAR_0x8004 to count the number of legendaries the player has defeated
     @ already.
 	setvar VAR_0x8004, 0
-	call_if_set FLAG_DEFEATED_KYOGRE, WeatherInstitute_UnusualWeather_IncrementLegendCount
-	call_if_set FLAG_DEFEATED_GROUDON, WeatherInstitute_UnusualWeather_IncrementLegendCount
+	call_if_set FLAG_DEFEATED_KYOGRE, WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount
+	call_if_set FLAG_DEFEATED_GROUDON, WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount
 	compare VAR_0x8004, 2
-	goto_if_eq WeatherInstitute_UnusualWeather_LegendariesAlreadyDefeated
-	call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_270159
-	specialvar VAR_RESULT, sub_813B374
+	goto_if_eq WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeated
+	call_if_unset FLAG_TEMP_2, WeatherInstitute_UnusualWeather_EventScript_DoCreateUnusualWeather
+	specialvar VAR_RESULT, GetUnusualWeatherMapNameAndType
 	compare VAR_RESULT, 1
-	goto_if_eq Route119_WeatherInstitute_2F_EventScript_27014F
-	msgbox Route119_WeatherInstitute_2F_Text_2707F1, MSGBOX_DEFAULT
+	goto_if_eq WeatherInstitute_UnusualWeather_EventScript_ShowKyogreWeatherMessage
+	msgbox WeatherInstitute_UnusualWeather_GroudonWeatherText, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_2F_EventScript_27014F:: @ 827014F
-	msgbox Route119_WeatherInstitute_2F_Text_270873, MSGBOX_DEFAULT
+WeatherInstitute_UnusualWeather_EventScript_ShowKyogreWeatherMessage:: @ 827014F
+	msgbox WeatherInstitute_UnusualWeather_KyogreWeatherText, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_2F_EventScript_270159:: @ 8270159
+WeatherInstitute_UnusualWeather_EventScript_DoCreateUnusualWeather:: @ 8270159
 	special CreateUnusualWeatherEvent
 	setflag FLAG_TEMP_2
 	return
 
-WeatherInstitute_UnusualWeather_IncrementLegendCount:: @ 8270160
+WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount:: @ 8270160
 	addvar VAR_0x8004, 1
 	return
 
-WeatherInstitute_UnusualWeather_LegendariesAlreadyDefeated:: @ 8270166
-	msgbox WeatherInstitute_UnusualWeather_LegendariesAlreadyDefeatedText, MSGBOX_DEFAULT
+WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeated:: @ 8270166
+	msgbox WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeatedText, MSGBOX_DEFAULT
 	release
 	end
 
@@ -311,7 +311,7 @@ Route119_WeatherInstitute_2F_Text_27077E: @ 827077E
 	.string "years, but it's ridiculous to think that\l"
 	.string "humans can freely change the weather.$"
 
-Route119_WeatherInstitute_2F_Text_2707F1: @ 82707F1
+WeatherInstitute_UnusualWeather_GroudonWeatherText: @ 82707F1
 	.string "I track weather patterns over\n"
 	.string "the HOENN region.\p"
 	.string "Presently, a drought has been recorded\n"
@@ -319,7 +319,7 @@ Route119_WeatherInstitute_2F_Text_2707F1: @ 82707F1
 	.string "Could that mean, somewhere near\n"
 	.string "{STR_VAR_1}…$"
 
-Route119_WeatherInstitute_2F_Text_270873: @ 8270873
+WeatherInstitute_UnusualWeather_KyogreWeatherText: @ 8270873
 	.string "I track weather patterns over\n"
 	.string "the HOENN region.\p"
 	.string "Presently, heavy rainfall has been\n"
@@ -327,7 +327,7 @@ Route119_WeatherInstitute_2F_Text_270873: @ 8270873
 	.string "Could that mean, somewhere near\n"
 	.string "{STR_VAR_1}…$"
 
-WeatherInstitute_UnusualWeather_LegendariesAlreadyDefeatedText: @ 82708FC
+WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeatedText: @ 82708FC
 	.string "Abnormal weather conditions are\n"
 	.string "no longer being reported.\p"
 	.string "The occasional rainfall is a blessing,\n"
diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc
index d1046e6a4..a2e9f1d40 100644
--- a/data/maps/Route125/scripts.inc
+++ b/data/maps/Route125/scripts.inc
@@ -9,20 +9,20 @@ Route125_MapScript1_1F6758: @ 81F6758
 	compare VAR_0x4039, 1
 	call_if_eq Route125_EventScript_273D13
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST
-	call_if_eq Route125_EventScript_273D17
+	call_if_eq UnusualWeather_StartKyogreWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST
-	call_if_eq Route125_EventScript_273D17
+	call_if_eq UnusualWeather_StartKyogreWeather
 	end
 
 Route125_MapScript1_1F6783: @ 81F6783
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST
-	call_if_eq Route125_EventScript_273A85
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125West
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST
-	call_if_eq Route125_EventScript_273AF2
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125East
 	end
 
 Route125_MapScript2_1F679A: @ 81F679A
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route125_EventScript_1F67A4:: @ 81F67A4
diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc
index 9f2018e8f..27b17d340 100644
--- a/data/maps/Route127/scripts.inc
+++ b/data/maps/Route127/scripts.inc
@@ -9,20 +9,20 @@ Route127_MapScript1_1F69E9: @ 81F69E9
 	compare VAR_0x4039, 1
 	call_if_eq Route127_EventScript_273D13
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH
-	call_if_eq Route127_EventScript_273D17
+	call_if_eq UnusualWeather_StartKyogreWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH
-	call_if_eq Route127_EventScript_273D17
+	call_if_eq UnusualWeather_StartKyogreWeather
 	end
 
 Route127_MapScript1_1F6A14: @ 81F6A14
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH
-	call_if_eq Route127_EventScript_273B5F
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127North
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH
-	call_if_eq Route127_EventScript_273BCC
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127South
 	end
 
 Route127_MapScript2_1F6A2B: @ 81F6A2B
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route127_EventScript_1F6A35:: @ 81F6A35
diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc
index 5f65712d7..3fc30cf91 100644
--- a/data/maps/Route129/scripts.inc
+++ b/data/maps/Route129/scripts.inc
@@ -6,9 +6,9 @@ Route129_MapScripts:: @ 81F7284
 
 Route129_MapScript1_1F7294: @ 81F7294
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST
-	call_if_eq Route129_EventScript_273C39
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129West
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST
-	call_if_eq Route129_EventScript_273CA6
+	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129East
 	end
 
 Route129_MapScript1_1F72AB: @ 81F72AB
@@ -17,9 +17,9 @@ Route129_MapScript1_1F72AB: @ 81F72AB
 	compare VAR_0x405E, 4
 	call_if_ge Route129_EventScript_1F72D8
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST
-	call_if_eq Route129_EventScript_273D17
+	call_if_eq UnusualWeather_StartKyogreWeather
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST
-	call_if_eq Route129_EventScript_273D17
+	call_if_eq UnusualWeather_StartKyogreWeather
 	end
 
 Route129_EventScript_1F72D8:: @ 81F72D8
@@ -27,7 +27,7 @@ Route129_EventScript_1F72D8:: @ 81F72D8
 	return
 
 Route129_MapScript2_1F72E2: @ 81F72E2
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
 Route129_EventScript_1F72EC:: @ 81F72EC
diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc
index 99f0efcf0..53b80053f 100644
--- a/data/maps/Underwater3/scripts.inc
+++ b/data/maps/Underwater3/scripts.inc
@@ -3,6 +3,6 @@ Underwater3_MapScripts:: @ 81F7724
 	.byte 0
 
 Underwater3_MapScript1_1F772A: @ 81F772A
-	call Underwater3_EventScript_274223
+	call UnusualWeather_Underwater_SetupEscapeWarp
 	end
 
diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc
index ea37514eb..fe068207e 100644
--- a/data/maps/Underwater5/scripts.inc
+++ b/data/maps/Underwater5/scripts.inc
@@ -3,6 +3,6 @@ Underwater5_MapScripts:: @ 81F7731
 	.byte 0
 
 Underwater5_MapScript1_1F7737: @ 81F7737
-	call Underwater5_EventScript_274223
+	call UnusualWeather_Underwater_SetupEscapeWarp
 	end
 
diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc
index fee91dc75..d5a11c1bf 100644
--- a/data/maps/Underwater6/scripts.inc
+++ b/data/maps/Underwater6/scripts.inc
@@ -3,6 +3,6 @@ Underwater6_MapScripts:: @ 81F773D
 	.byte 0
 
 Underwater6_MapScript1_1F7743: @ 81F7743
-	call Underwater6_EventScript_274223
+	call UnusualWeather_Underwater_SetupEscapeWarp
 	end
 
diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc
index a0eba386a..c3bee154e 100644
--- a/data/maps/Underwater7/scripts.inc
+++ b/data/maps/Underwater7/scripts.inc
@@ -3,6 +3,6 @@ Underwater7_MapScripts:: @ 81F7749
 	.byte 0
 
 Underwater7_MapScript1_1F774F: @ 81F774F
-	call Underwater7_EventScript_274223
+	call UnusualWeather_Underwater_SetupEscapeWarp
 	end