diff options
Diffstat (limited to 'data/scripts/maps/JaggedPass.inc')
| -rw-r--r-- | data/scripts/maps/JaggedPass.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 151f1ec79..d75420e88 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -4,16 +4,16 @@ JaggedPass_MapScripts:: @ 815D266 .byte 0 JaggedPass_MapScript1_15D271:: @ 815D271 - tileeffect 1 + setstepcallback 1 end JaggedPass_MapScript1_15D274:: @ 815D274 - compare 0x40bd, 1 - callif 1, JaggedPass_EventScript_15D280 + compare VAR_JAGGED_PASS_ASH_WEATHER, 1 + call_if_eq JaggedPass_EventScript_15D280 end JaggedPass_EventScript_15D280:: @ 815D280 - setweather 7 + setweather WEATHER_ASH doweather return @@ -24,9 +24,9 @@ JaggedPass_EventScript_15D285:: @ 815D285 JaggedPass_EventScript_15D29C:: @ 815D29C trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF - specialval RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 - jumpeq JaggedPass_EventScript_15D2C3 + goto_if_eq JaggedPass_EventScript_15D2C3 msgbox JaggedPass_Text_195F04, 6 end @@ -37,9 +37,9 @@ JaggedPass_EventScript_15D2C3:: @ 815D2C3 JaggedPass_EventScript_15D2DA:: @ 815D2DA trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 - specialval RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 - jumpeq JaggedPass_EventScript_15D301 + goto_if_eq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 end |