atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

magic bounce overrides prankster blockage

Browse source
This commit is contained in:
ghoulslash 2021-09-16 11:53:24 -04:00
parent 2067f563cd
commit a50f03a06b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/battle_util.c
View file

@ -3408,7 +3408,8 @@ u8 AtkCanceller_UnableToUseMove(void)
&& gBattlerAttacker != gBattlerTarget
&& !(gBattleMoves[gCurrentMove].target & MOVE_TARGET_OPPONENTS_FIELD)
&& IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_DARK)
&& !(gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE))
&& !(gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE)
&& GetBattlerAbility(gBattlerTarget) != ABILITY_MAGIC_BOUNCE) // Magic bounce will bounce back prankster'd status move instead of blocking it
{
if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE) || !(gBattleMoves[gCurrentMove].target & (MOVE_TARGET_BOTH | MOVE_TARGET_FOES_AND_ALLY)))
CancelMultiTurnMoves(gBattlerAttacker); // don't cancel moves that can hit two targets bc one target might not be protected