From af72fb0d32f5fa663263de20e2321f9c51c4ab7d Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Thu, 21 Jul 2022 16:36:07 -0400 Subject: [PATCH] Simplified pre-gen5 checks --- src/battle_util.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index c30d3f68ed..e13b5b3780 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -8706,20 +8706,12 @@ static u32 CalcAttackStat(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, b break; #else case ABILITY_PLUS: - if (IsBattlerAlive(BATTLE_PARTNER(battlerAtk))) - { - u32 partnerAbility = GetBattlerAbility(BATTLE_PARTNER(battlerAtk)); - if (partnerAbility == ABILITY_MINUS) - MulModifier(&modifier, UQ_4_12(1.5)); - } + if (IsBattlerAlive(BATTLE_PARTNER(battlerAtk)) && GetBattlerAbility(BATTLE_PARTNER(battlerAtk)) == ABILITY_MINUS) + MulModifier(&modifier, UQ_4_12(1.5)); break; case ABILITY_MINUS: - if (IsBattlerAlive(BATTLE_PARTNER(battlerAtk))) - { - u32 partnerAbility = GetBattlerAbility(BATTLE_PARTNER(battlerAtk)); - if (partnerAbility == ABILITY_PLUS) - MulModifier(&modifier, UQ_4_12(1.5)); - } + if (IsBattlerAlive(BATTLE_PARTNER(battlerAtk)) && GetBattlerAbility(BATTLE_PARTNER(battlerAtk)) == ABILITY_PLUS) + MulModifier(&modifier, UQ_4_12(1.5)); break; #endif case ABILITY_FLOWER_GIFT: