diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /data/scripts/maps/Route105.inc | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'data/scripts/maps/Route105.inc')
| -rw-r--r-- | data/scripts/maps/Route105.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index 72b35e7b0..32c6826af 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -7,9 +7,9 @@ Route105_MapScripts:: @ 81EE1DB Route105_MapScript1_1EE1EB: @ 81EE1EB checkflag FLAG_0x0E4 call_if 0, Route105_EventScript_1EE20B - compare_var_to_value VAR_0x4037, 9 + compare VAR_0x4037, 9 call_if 1, Route105_EventScript_2739AB - compare_var_to_value VAR_0x4037, 10 + compare VAR_0x4037, 10 call_if 1, Route105_EventScript_273A18 end @@ -19,11 +19,11 @@ Route105_EventScript_1EE20B:: @ 81EE20B return Route105_MapScript1_1EE21E: @ 81EE21E - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route105_EventScript_273D13 - compare_var_to_value VAR_0x4037, 9 + compare VAR_0x4037, 9 call_if 1, Route105_EventScript_273D17 - compare_var_to_value VAR_0x4037, 10 + compare VAR_0x4037, 10 call_if 1, Route105_EventScript_273D17 end @@ -63,8 +63,8 @@ Route105_EventScript_1EE2BD:: @ 81EE2BD Route105_EventScript_1EE2D4:: @ 81EE2D4 trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route105_EventScript_1EE31F msgbox Route105_Text_2960FA, 4 release |