diff --git a/include/battle_util.h b/include/battle_util.h index 836d31bb70..2ce91c3f25 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -48,10 +48,6 @@ enum { ABILITYEFFECT_ON_SWITCHIN, ABILITYEFFECT_ENDTURN, ABILITYEFFECT_MOVE_END_ATTACKER, - ABILITYEFFECT_WOULD_BLOCK, - ABILITYEFFECT_MOVES_BLOCK, - ABILITYEFFECT_WOULD_ABSORB, - ABILITYEFFECT_ABSORBING, ABILITYEFFECT_MOVE_END, ABILITYEFFECT_IMMUNITY, ABILITYEFFECT_SYNCHRONIZE, diff --git a/src/battle_util.c b/src/battle_util.c index 0efa13c869..6d256dc998 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -4345,38 +4345,6 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 } } break; - case ABILITYEFFECT_WOULD_BLOCK: - effect = CanAbilityBlockMove(gBattlerAttacker, battler, gBattleMons[gBattlerAttacker].ability, gLastUsedAbility, move, ABILITY_CHECK_TRIGGER); - if (effect && gLastUsedAbility != 0xFFFF) - RecordAbilityBattle(battler, gLastUsedAbility); - return effect; - case ABILITYEFFECT_MOVES_BLOCK: - effect = CanAbilityBlockMove(gBattlerAttacker, battler, gBattleMons[gBattlerAttacker].ability, gLastUsedAbility, move, ABILITY_CHECK_TRIGGER); - - // prankster check - if (effect == 0 - && IsBattleMoveStatus(move) - && GetChosenMovePriority(gBattlerAttacker, gBattleMons[gBattlerAttacker].ability) > 0 - && BlocksPrankster(move, gBattlerAttacker, gBattlerTarget, TRUE) - && !(IsBattleMoveStatus(move) && (gLastUsedAbility == ABILITY_MAGIC_BOUNCE || gProtectStructs[gBattlerTarget].bounceMove))) - { - if (!IsDoubleBattle() - || !(GetBattlerMoveTargetType(gBattlerAttacker, move) & (MOVE_TARGET_BOTH | MOVE_TARGET_FOES_AND_ALLY))) - CancelMultiTurnMoves(gBattlerAttacker, SKY_DROP_IGNORE); // Don't cancel moves that can hit two targets bc one target might not be protected - gBattleScripting.battler = gBattlerAbility = gBattlerTarget; - gBattlescriptCurrInstr = BattleScript_DarkTypePreventsPrankster; - effect = 1; - } - break; - case ABILITYEFFECT_WOULD_ABSORB: - effect = CanAbilityAbsorbMove(gBattlerAttacker, battler, gLastUsedAbility, move, moveType, ABILITY_CHECK_TRIGGER); - gBattleStruct->pledgeMove = FALSE; - if (effect && gLastUsedAbility != 0xFFFF) - RecordAbilityBattle(battler, gLastUsedAbility); - return effect; - case ABILITYEFFECT_ABSORBING: - effect = CanAbilityAbsorbMove(gBattlerAttacker, battler, gLastUsedAbility, move, moveType, ABILITY_RUN_SCRIPT); - break; case ABILITYEFFECT_MOVE_END: // Think contact abilities. switch (gLastUsedAbility) {