diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-21 16:03:37 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-21 16:03:37 -0600 |
| commit | 2c0e5a41a294106d01d9393db4fc58ef76e5358d (patch) | |
| tree | bfc664cb9e4318df406d02578f0a3f138c33e0fe /data/scripts/maps/JaggedPass.inc | |
| parent | a705a863d1f59411a6f18fdd95e81de76f66fd66 (diff) | |
| parent | 66f9d4c266b3bbfe02430282f512f722f04eaa4c (diff) | |
Merge remote-tracking branch 'Shanty/script_macros'
Diffstat (limited to 'data/scripts/maps/JaggedPass.inc')
| -rw-r--r-- | data/scripts/maps/JaggedPass.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 4cc415b30..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 @@ -105,7 +105,7 @@ 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, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_2307E4 msgbox JaggedPass_Text_2309D8, 4 release @@ -129,7 +129,7 @@ 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, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_230843 msgbox JaggedPass_Text_230B93, 4 release |