summaryrefslogtreecommitdiff
path: root/data/scripts/field_poison.inc
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-12-02 09:52:16 -0500
committerhuderlem <huderlem@gmail.com>2019-12-05 21:11:17 -0600
commitfdae25eab21128a7ec8074e6cb6fab27b3a263fe (patch)
treed9afa11d5233a6efeb7b70bed2b2bac0a903dacd /data/scripts/field_poison.inc
parent9fcfbdbef563063f96ff61a95eaf0b6556db56e2 (diff)
Set up Battle Pyramid macros
Diffstat (limited to 'data/scripts/field_poison.inc')
-rw-r--r--data/scripts/field_poison.inc7
1 files changed, 3 insertions, 4 deletions
diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc
index 80e1a1ed8..d15da3399 100644
--- a/data/scripts/field_poison.inc
+++ b/data/scripts/field_poison.inc
@@ -32,11 +32,10 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8
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