diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-10 20:43:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 20:43:27 -0500 |
| commit | 47b0d8a5970a75862279bde9d19a06c3d7f96eee (patch) | |
| tree | 462ebc6e6bce61be28d862cd89c8bec08ebfa61e /data/maps/Route118/scripts.inc | |
| parent | 77bf40d32b7bbab40db36030399586430ae57010 (diff) | |
| parent | 49f1a90534180445d293761e2bdac165b49319a2 (diff) | |
Merge branch 'master' into doc-matchcall
Diffstat (limited to 'data/maps/Route118/scripts.inc')
| -rw-r--r-- | data/maps/Route118/scripts.inc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 7b2326b13..cccbe0085 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -6,23 +6,23 @@ Route118_MapScripts:: @ 81F3DBC Route118_OnTransition: @ 81F3DCC call GabbyAndTy_EventScript_UpdateLocation - compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq UnusualWeather_EventScript_HideMapNamePopup - 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 + 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_OnLoad: @ 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 + 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_OnFrame: @ 81F3E0A - 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 Route118_EventScript_GoodRodFisherman:: @ 81F3E14 |