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_BattlePikeThreePathRoom.inc | |
parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) |
Merge branch 'master' into link
Diffstat (limited to 'data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc')
-rw-r--r-- | data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc index c1dcce822..74da4c01c 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc @@ -168,7 +168,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78 setvar VAR_0x8004, 17 special sub_81A703C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 setvar VAR_0x4005, 255 end @@ -191,7 +191,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB setvar VAR_0x8004, 19 special sub_81A703C - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 lock faceplayer |