summaryrefslogtreecommitdiff
path: root/data/maps/Route105/scripts.inc
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-12-10 20:43:27 -0500
committerGitHub <noreply@github.com>2019-12-10 20:43:27 -0500
commit47b0d8a5970a75862279bde9d19a06c3d7f96eee (patch)
tree462ebc6e6bce61be28d862cd89c8bec08ebfa61e /data/maps/Route105/scripts.inc
parent77bf40d32b7bbab40db36030399586430ae57010 (diff)
parent49f1a90534180445d293761e2bdac165b49319a2 (diff)
Merge branch 'master' into doc-matchcall
Diffstat (limited to 'data/maps/Route105/scripts.inc')
-rw-r--r--data/maps/Route105/scripts.inc22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc
index e1292803d..a42446e72 100644
--- a/data/maps/Route105/scripts.inc
+++ b/data/maps/Route105/scripts.inc
@@ -6,10 +6,10 @@ Route105_MapScripts:: @ 81EE1DB
Route105_OnLoad: @ 81EE1EB
call_if_unset FLAG_REGI_DOORS_OPENED, Route105_CloseRegiEntrance
- compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH
- call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105North
- compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH
- call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105South
+ compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_NORTH
+ call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute105North
+ compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_SOUTH
+ call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute105South
end
Route105_CloseRegiEntrance:: @ 81EE20B
@@ -18,16 +18,16 @@ Route105_CloseRegiEntrance:: @ 81EE20B
return
Route105_OnTransition: @ 81EE21E
- compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
- call_if_eq UnusualWeather_EventScript_HideMapNamePopup
- compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH
- call_if_eq UnusualWeather_StartKyogreWeather
- compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH
- call_if_eq UnusualWeather_StartKyogreWeather
+ compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
+ call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
+ compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_NORTH
+ call_if_eq AbnormalWeather_StartKyogreWeather
+ compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_SOUTH
+ call_if_eq AbnormalWeather_StartKyogreWeather
end
Route105_OnFrame: @ 81EE240
- map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+ map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
.2byte 0
Route105_EventScript_Foster:: @ 81EE24A