diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
| commit | 8cd4908fa3820b22a8b4e3d96780d725132549c4 (patch) | |
| tree | bcc8e697ce7dd0d4ab532a61fccafbbdb6d2400e /data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
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 |