summaryrefslogtreecommitdiff
path: root/data/maps/Route130
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-12-06 21:37:17 -0500
committerGriffinR <griffin.richards@comcast.net>2019-12-06 21:37:33 -0500
commitb93101bbebaae9be44b9b4ada81766264135cca9 (patch)
tree73373641b7f1eed21c4c5d9423cd5668ab8c4a27 /data/maps/Route130
parent1b30f0c9733da023e89b9aaa9e3d74cdd78b3e53 (diff)
parent47ea65b96e4575a335d3197483841041cb361541 (diff)
Merge master into ObjEvent rename
Diffstat (limited to 'data/maps/Route130')
-rw-r--r--data/maps/Route130/scripts.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc
index f5bd7e051..141196a2d 100644
--- a/data/maps/Route130/scripts.inc
+++ b/data/maps/Route130/scripts.inc
@@ -4,7 +4,7 @@ Route130_MapScripts:: @ 81F735F
Route130_OnTransition: @ 81F7365
compare VAR_SOOTOPOLIS_CITY_STATE, 4
- call_if_ge Route130_EventScript_CheckSetAlternatingWeather
+ call_if_ge Route130_EventScript_CheckSetAbnormalWeather
specialvar VAR_RESULT, IsMirageIslandPresent
compare VAR_RESULT, TRUE
goto_if_eq Route130_EventScript_SetMirageIslandLayout
@@ -30,8 +30,8 @@ Route130_EventScript_SetMirageIslandLayout:: @ 81F73B1
setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND
end
-Route130_EventScript_CheckSetAlternatingWeather:: @ 81F73B5
- call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+Route130_EventScript_CheckSetAbnormalWeather:: @ 81F73B5
+ call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
return
Route130_EventScript_Rodney:: @ 81F73BF