diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-02 09:52:16 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-12-05 21:11:17 -0600 |
| commit | fdae25eab21128a7ec8074e6cb6fab27b3a263fe (patch) | |
| tree | d9afa11d5233a6efeb7b70bed2b2bac0a903dacd /data/scripts | |
| parent | 9fcfbdbef563063f96ff61a95eaf0b6556db56e2 (diff) | |
Set up Battle Pyramid macros
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/field_poison.inc | 7 | ||||
| -rw-r--r-- | data/scripts/obtain_item.inc | 3 |
2 files changed, 4 insertions, 6 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 diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index 206277cb7..77b795f60 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -128,8 +128,7 @@ EventScript_PickUpItem:: @ 8271C3A waitfanfare waitmessage bufferitemnameplural 1, VAR_0x8004, VAR_0x8005 - setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN - special CallBattlePyramidFunction + pyramid_inchallenge compare VAR_RESULT, 1 goto_if_eq EventScript_PutBattlePyramidItemInBag msgbox gText_PutItemInPocket, MSGBOX_DEFAULT |