From 1a707e8735f070ebf333a968ecacf9586a7ef790 Mon Sep 17 00:00:00 2001 From: PhallenTree <168426989+PhallenTree@users.noreply.github.com> Date: Fri, 16 May 2025 14:29:48 +0100 Subject: [PATCH] Fixes Magic Guard causing Wrap to end immediately (#6876) --- src/battle_end_turn.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/battle_end_turn.c b/src/battle_end_turn.c index 319db26012..a8b294c024 100644 --- a/src/battle_end_turn.c +++ b/src/battle_end_turn.c @@ -746,8 +746,11 @@ static bool32 HandleEndTurnWrap(u32 battler) if (gBattleMons[battler].status2 & STATUS2_WRAPPED && IsBattlerAlive(battler)) { - if (--gDisableStructs[battler].wrapTurns != 0 && !IsBattlerProtectedByMagicGuard(battler, GetBattlerAbility(battler))) + if (--gDisableStructs[battler].wrapTurns != 0) { + if (IsBattlerProtectedByMagicGuard(battler, GetBattlerAbility(battler))) + return effect; + gBattleScripting.animArg1 = gBattleStruct->wrappedMove[battler]; gBattleScripting.animArg2 = gBattleStruct->wrappedMove[battler] >> 8; PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleStruct->wrappedMove[battler]);