From ebc86bb247d33d0457ecd88998d662b91af1547e Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Tue, 19 Oct 2021 09:38:27 -0400 Subject: [PATCH 1/2] update baton pass status3 bits --- src/battle_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/battle_main.c b/src/battle_main.c index ec0ee5300..faac3806c 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -2960,9 +2960,11 @@ void SwitchInClearSetData(void) } } if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS) - { + { gBattleMons[gActiveBattler].status2 &= (STATUS2_CONFUSION | STATUS2_FOCUS_ENERGY | STATUS2_SUBSTITUTE | STATUS2_ESCAPE_PREVENTION | STATUS2_CURSED); - gStatuses3[gActiveBattler] &= (STATUS3_LEECHSEED_BATTLER | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED); + gStatuses3[gActiveBattler] &= (STATUS3_LEECHSEED_BATTLER | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED + | STATUS3_GASTRO_ACID | STATUS3_EMBARGO | STATUS3_TELEKINESIS | STATUS3_MAGNET_RISE | STATUS3_HEAL_BLOCK + | STATUS3_AQUA_RING | STATUS3_POWER_TRICK); for (i = 0; i < gBattlersCount; i++) { From fa8fa322591c54b9319d1a30ebb897456336ad44 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Tue, 19 Oct 2021 11:52:50 -0400 Subject: [PATCH 2/2] Update src/battle_main.c Co-authored-by: LOuroboros --- src/battle_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_main.c b/src/battle_main.c index faac3806c..271db092f 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -2960,7 +2960,7 @@ void SwitchInClearSetData(void) } } if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS) - { + { gBattleMons[gActiveBattler].status2 &= (STATUS2_CONFUSION | STATUS2_FOCUS_ENERGY | STATUS2_SUBSTITUTE | STATUS2_ESCAPE_PREVENTION | STATUS2_CURSED); gStatuses3[gActiveBattler] &= (STATUS3_LEECHSEED_BATTLER | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED | STATUS3_GASTRO_ACID | STATUS3_EMBARGO | STATUS3_TELEKINESIS | STATUS3_MAGNET_RISE | STATUS3_HEAL_BLOCK