diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-26 22:07:29 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-26 22:07:29 -0500 |
| commit | 3a44b090d15d5317028827778caa4d768761dd2e (patch) | |
| tree | d0db5158c041178cdfcf9b82d3b444bb18e38737 /data/maps/Route124/scripts.inc | |
| parent | accea672f16cb74b0ec16e0e740cf9f67a651dfb (diff) | |
| parent | 231355f84dccd11329d81d074fa36135cfad4f94 (diff) | |
Merge branch 'master' into multiplayer-stuff
Diffstat (limited to 'data/maps/Route124/scripts.inc')
| -rw-r--r-- | data/maps/Route124/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 97aa6f4be..34e315792 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -1,9 +1,9 @@ Route124_MapScripts:: @ 81F656C - map_script 3, Route124_MapScript1_1F6572 + map_script MAP_SCRIPT_ON_TRANSITION, Route124_MapScript1_1F6572 .byte 0 Route124_MapScript1_1F6572: @ 81F6572 - call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end Route124_EventScript_1F657C:: @ 81F657C |