Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes Magic Guard causing Wrap to end immediately (#6876)

Browse Source
This commit is contained in:
PhallenTree 2025-05-16 14:29:48 +01:00 committed by GitHub
parent 49584e134b
commit 1a707e8735
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_end_turn.c
View File

@ -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]);