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/BattleFrontier_OutsideEast.inc | |
parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) |
Merge branch 'master' into link
Diffstat (limited to 'data/scripts/maps/BattleFrontier_OutsideEast.inc')
-rw-r--r-- | data/scripts/maps/BattleFrontier_OutsideEast.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/maps/BattleFrontier_OutsideEast.inc b/data/scripts/maps/BattleFrontier_OutsideEast.inc index d1dc4d8e2..bf0d3ff16 100644 --- a/data/scripts/maps/BattleFrontier_OutsideEast.inc +++ b/data/scripts/maps/BattleFrontier_OutsideEast.inc @@ -10,7 +10,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -135,11 +135,11 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_OutsideEast_EventScript_242D60 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq BattleFrontier_OutsideEast_EventScript_242D60 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq BattleFrontier_OutsideEast_EventScript_242D60 setflag FLAG_0x1C6 release |