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/Route105/scripts.inc | |
| parent | 3716da5430a976d05afecdf82f43f14fc2584949 (diff) | |
| parent | 043071ae12aa6854119a44304a5facbd58fa3624 (diff) | |
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'data/maps/Route105/scripts.inc')
| -rw-r--r-- | data/maps/Route105/scripts.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 6ad11bc52..2b8ebe305 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -6,10 +6,10 @@ Route105_MapScripts:: @ 81EE1DB Route105_MapScript1_1EE1EB: @ 81EE1EB call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_1EE20B - compare VAR_0x4037, 9 - call_if_eq Route105_EventScript_2739AB - compare VAR_0x4037, 10 - call_if_eq Route105_EventScript_273A18 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105North + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH + call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105South end Route105_EventScript_1EE20B:: @ 81EE20B @@ -18,16 +18,16 @@ Route105_EventScript_1EE20B:: @ 81EE20B return Route105_MapScript1_1EE21E: @ 81EE21E - compare VAR_0x4039, 1 + compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route105_EventScript_273D13 - compare VAR_0x4037, 9 - call_if_eq Route105_EventScript_273D17 - compare VAR_0x4037, 10 - call_if_eq Route105_EventScript_273D17 + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH + call_if_eq UnusualWeather_StartKyogreWeather + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH + call_if_eq UnusualWeather_StartKyogreWeather end Route105_MapScript2_1EE240: @ 81EE240 - map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route105_EventScript_1EE24A:: @ 81EE24A |