diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-26 22:34:42 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-26 22:34:42 -0500 |
| commit | 72bb0daccbdcc4db701d05c10c8b968fe7b09c2a (patch) | |
| tree | c80c40148daa9b92dd39ba6a765b61c4fbf7214d /data/maps/Route127/scripts.inc | |
| parent | 6cb4c677cdf156d9d78f5f27bf3168882c1447ec (diff) | |
| parent | 231355f84dccd11329d81d074fa36135cfad4f94 (diff) | |
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'data/maps/Route127/scripts.inc')
| -rw-r--r-- | data/maps/Route127/scripts.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 28f20bfb3..7d5eee844 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -1,11 +1,11 @@ Route127_MapScripts:: @ 81F69D9 - map_script 3, Route127_MapScript1_1F69E9 - map_script 1, Route127_MapScript1_1F6A14 - map_script 2, Route127_MapScript2_1F6A2B + map_script MAP_SCRIPT_ON_TRANSITION, Route127_MapScript1_1F69E9 + map_script MAP_SCRIPT_ON_LOAD, Route127_MapScript1_1F6A14 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_MapScript2_1F6A2B .byte 0 Route127_MapScript1_1F69E9: @ 81F69E9 - call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_0x4039, 1 call_if_eq Route127_EventScript_273D13 compare VAR_0x4037, 13 |