From ee8a00be81ee613891e25e236b0522d8842d442c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 18 Apr 2020 20:34:09 +0200 Subject: [PATCH] some ability tweaks --- src/battle_script_commands.c | 1 + src/battle_util.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 414426712..a0f51be2e 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -4362,6 +4362,7 @@ static void Cmd_playstatchangeanimation(void) } else if (!gSideTimers[GET_BATTLER_SIDE(gActiveBattler)].mistTimer && ability != ABILITY_CLEAR_BODY + && ability != ABILITY_FULL_METAL_BODY && ability != ABILITY_WHITE_SMOKE && !(ability == ABILITY_KEEN_EYE && currStat == STAT_ACC) && !(ability == ABILITY_HYPER_CUTTER && currStat == STAT_ATK) diff --git a/src/battle_util.c b/src/battle_util.c index 88f633dee..a803a0de2 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -6051,9 +6051,10 @@ static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 move } // reflect, light screen, aurora veil - if ((gSideStatuses[defSide] & SIDE_STATUS_REFLECT && IS_MOVE_PHYSICAL(move)) - || (gSideStatuses[defSide] & SIDE_STATUS_LIGHTSCREEN && IS_MOVE_SPECIAL(move)) - || (gSideStatuses[defSide] & SIDE_STATUS_AURORA_VEIL)) + if (((gSideStatuses[defSide] & SIDE_STATUS_REFLECT && IS_MOVE_PHYSICAL(move)) + || (gSideStatuses[defSide] & SIDE_STATUS_LIGHTSCREEN && IS_MOVE_SPECIAL(move)) + || (gSideStatuses[defSide] & SIDE_STATUS_AURORA_VEIL)) + && abilityAtk != ABILITY_INFILTRATOR) { if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) MulModifier(&finalModifier, UQ_4_12(0.66)); @@ -6082,6 +6083,7 @@ static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 move switch (abilityDef) { case ABILITY_MULTISCALE: + case ABILITY_SHADOW_SHIELD: if (BATTLER_MAX_HP(battlerDef)) MulModifier(&finalModifier, UQ_4_12(0.5)); break;