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.inc16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc
index 1fb3b316e..e5c393221 100644
--- a/data/scripts/maps/JaggedPass.inc
+++ b/data/scripts/maps/JaggedPass.inc
@@ -6,13 +6,13 @@ JaggedPass_MapScripts:: @ 8230656
JaggedPass_MapScript1_230666: @ 8230666
setstepcallback 1
- compare_var_to_value VAR_0x40C8, 0
+ compare VAR_0x40C8, 0
call_if 1, JaggedPass_EventScript_230674
end
JaggedPass_EventScript_230674:: @ 8230674
checkitem ITEM_MAGMA_EMBLEM, 1
- compare_var_to_value VAR_RESULT, 1
+ compare VAR_RESULT, 1
goto_eq JaggedPass_EventScript_230685
return
@@ -21,7 +21,7 @@ JaggedPass_EventScript_230685:: @ 8230685
return
JaggedPass_MapScript1_23068B: @ 823068B
- compare_var_to_value VAR_0x40BD, 1
+ compare VAR_0x40BD, 1
call_if 1, JaggedPass_EventScript_230697
end
@@ -31,7 +31,7 @@ JaggedPass_EventScript_230697:: @ 8230697
return
JaggedPass_MapScript1_23069C: @ 823069C
- compare_var_to_value VAR_0x40C8, 1
+ compare VAR_0x40C8, 1
goto_if 3, JaggedPass_EventScript_2306A8
end
@@ -104,8 +104,8 @@ JaggedPass_EventScript_230785:: @ 8230785
JaggedPass_EventScript_23079C:: @ 823079C
trainerbattle 2, TRAINER_DIANA_1, 0, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8
- specialvar VAR_RESULT, sub_80B226C
- compare_var_to_value VAR_RESULT, 1
+ specialvar VAR_RESULT, ShouldTryRematchBattle
+ compare VAR_RESULT, 1
goto_eq JaggedPass_EventScript_2307E4
msgbox JaggedPass_Text_2309D8, 4
release
@@ -128,8 +128,8 @@ JaggedPass_EventScript_2307E4:: @ 82307E4
JaggedPass_EventScript_2307FB:: @ 82307FB
trainerbattle 2, TRAINER_ETHAN_1, 0, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827
- specialvar VAR_RESULT, sub_80B226C
- compare_var_to_value VAR_RESULT, 1
+ specialvar VAR_RESULT, ShouldTryRematchBattle
+ compare VAR_RESULT, 1
goto_eq JaggedPass_EventScript_230843
msgbox JaggedPass_Text_230B93, 4
release