summaryrefslogtreecommitdiff
path: root/data/scripts/maps/JaggedPass.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/JaggedPass.inc')
-rw-r--r--data/scripts/maps/JaggedPass.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc
index c7efee318..bf1f0233d 100644
--- a/data/scripts/maps/JaggedPass.inc
+++ b/data/scripts/maps/JaggedPass.inc
@@ -8,7 +8,7 @@ JaggedPass_MapScript1_15D271:: @ 815D271
end
JaggedPass_MapScript1_15D274:: @ 815D274
- compare 0x40bd, 1
+ compare VAR_JAGGED_PASS_ASH_WEATHER, 1
call_if 1, JaggedPass_EventScript_15D280
end
@@ -24,7 +24,7 @@ JaggedPass_EventScript_15D285:: @ 815D285
JaggedPass_EventScript_15D29C:: @ 815D29C
trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF
- specialvar RESULT, sub_8082C68
+ specialvar RESULT, ShouldTryRematchBattle
compare RESULT, 1
goto_if_eq JaggedPass_EventScript_15D2C3
msgbox JaggedPass_Text_195F04, 6
@@ -37,7 +37,7 @@ JaggedPass_EventScript_15D2C3:: @ 815D2C3
JaggedPass_EventScript_15D2DA:: @ 815D2DA
trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032
- specialvar RESULT, sub_8082C68
+ specialvar RESULT, ShouldTryRematchBattle
compare RESULT, 1
goto_if_eq JaggedPass_EventScript_15D301
msgbox JaggedPass_Text_196077, 6