diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-10-16 04:22:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-16 04:22:34 -0400 |
commit | b4a9298205ee9355fadd4455a9b8f692dcd3e787 (patch) | |
tree | 156f18275a5187ae20fc5f5c3a72d61635f126ec /data/maps/Route115/scripts.inc | |
parent | 20fa13616f3ad2ec2f7d68668b9f386355a10fa7 (diff) | |
parent | 60a592a2c32d07d47c892204659a8576017584d1 (diff) |
Merge branch 'master' into document-gyms2
Diffstat (limited to 'data/maps/Route115/scripts.inc')
-rw-r--r-- | data/maps/Route115/scripts.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 7c5b63bcd..79d2caedc 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -13,7 +13,7 @@ Route115_MapScript1_1F2930: @ 81F2930 Route115_OnTransition: @ 81F2947 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route115_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST call_if_eq UnusualWeather_StartGroudonWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST |