ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-22 04:04:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement Unseen Fist

Browse Source 
Unseen Fist allows contact moves to bypass protect effects, but doesn't lift the effect.
This commit is contained in:
BuffelSaft 2021-11-19 16:21:33 +13:00
parent bef896c65a
commit c4f27174c3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/battle_util.c
View File

@ -7517,8 +7517,13 @@ bool32 IsBattlerProtected(u8 battlerId, u16 move)
else if (gProtectStructs[battlerId].protected) else if (gProtectStructs[battlerId].protected)
return FALSE; return FALSE;
} }
if (!(gBattleMoves[move].flags & FLAG_PROTECT_AFFECTED)) // Protective Pads doesn't stop Unseen Fist from bypassing Protect effects, so IsMoveMakingContact() isn't used here.
// This means extra logic is needed to handle Shell Side Arm.
if (GetBattlerAbility(gBattlerAttacker == ABILITY_UNSEEN_FIST)
&& (gBattleMoves[move].flags & FLAG_MAKES_CONTACT || (gBattleMoves[move].effect == EFFECT_SHELL_SIDE_ARM && gSwapDamageCategory)))
return FALSE;
else if (!(gBattleMoves[move].flags & FLAG_PROTECT_AFFECTED))
return FALSE; return FALSE;
else if (gBattleMoves[move].effect == MOVE_EFFECT_FEINT) else if (gBattleMoves[move].effect == MOVE_EFFECT_FEINT)
return FALSE; return FALSE;