summaryrefslogtreecommitdiff
path: root/data/scripts/field_poison.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/field_poison.inc')
-rw-r--r--data/scripts/field_poison.inc12
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