diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-10 20:43:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 20:43:27 -0500 |
| commit | 47b0d8a5970a75862279bde9d19a06c3d7f96eee (patch) | |
| tree | 462ebc6e6bce61be28d862cd89c8bec08ebfa61e /data/scripts/field_poison.inc | |
| parent | 77bf40d32b7bbab40db36030399586430ae57010 (diff) | |
| parent | 49f1a90534180445d293761e2bdac165b49319a2 (diff) | |
Merge branch 'master' into doc-matchcall
Diffstat (limited to 'data/scripts/field_poison.inc')
| -rw-r--r-- | data/scripts/field_poison.inc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index f33292fe6..d15da3399 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -29,15 +29,13 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8 message gText_PlayerWhitedOut waitmessage waitbuttonpress - setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_IN - special CallBattlePikeFunction - compare VAR_RESULT, 1 + pike_inchallenge + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattlePike_EventScript_Retire - setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN - special CallBattlePyramidFunction - compare VAR_RESULT, 1 + pyramid_inchallenge + compare VAR_RESULT, 1 @ On Pyramid floor goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - compare VAR_RESULT, 2 + compare VAR_RESULT, 2 @ On Pyramid peak goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 trainerhill_inchallenge compare VAR_RESULT, TRUE |