diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-02 17:35:44 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-02 17:35:44 -0500 |
| commit | 9372731c3ef1ac5f7ed59a85b071bde7b87d2460 (patch) | |
| tree | 3122377a548140355ae1a3350212cc52827bc9ac /data/maps/Route114/scripts.inc | |
| parent | 3716da5430a976d05afecdf82f43f14fc2584949 (diff) | |
| parent | 043071ae12aa6854119a44304a5facbd58fa3624 (diff) | |
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'data/maps/Route114/scripts.inc')
| -rw-r--r-- | data/maps/Route114/scripts.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index d4327a2f4..b03a2f228 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -5,23 +5,23 @@ Route114_MapScripts:: @ 81F252F .byte 0 Route114_MapScript1_1F253F: @ 81F253F - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route114_EventScript_273D13 - compare VAR_0x4037, 1 - call_if_eq Route114_EventScript_273D1B - compare VAR_0x4037, 2 - call_if_eq Route114_EventScript_273D1B + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH + call_if_eq UnusualWeather_StartGroudonWeather + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH + call_if_eq UnusualWeather_StartGroudonWeather end Route114_MapScript1_1F2561: @ 81F2561 - compare VAR_0x4037, 1 - call_if_eq Route114_EventScript_273913 - compare VAR_0x4037, 2 - call_if_eq Route114_EventScript_273926 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114North + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114South end Route114_MapScript2_1F2578: @ 81F2578 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route114_EventScript_1F2582:: @ 81F2582 |