diff --git a/include/battle.h b/include/battle.h index 941c9c1d3e..a2a142c9ae 100644 --- a/include/battle.h +++ b/include/battle.h @@ -819,11 +819,6 @@ static inline bool32 IsBattleMoveStatus(u32 move) return GetMoveCategory(move) == DAMAGE_CATEGORY_STATUS; } -static inline bool32 IsBattleMoveRecoil(u32 move) -{ - return GetMoveRecoil(move) > 0 || GetMoveEffect(move) == EFFECT_RECOIL_IF_MISS; -} - /* Checks if 'battlerId' is any of the types. * Passing multiple types is more efficient than calling this multiple * times with one type because it shares the 'GetBattlerTypes' result. */ diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 192d511f68..d84a739cbf 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -972,10 +972,8 @@ static bool32 AI_IsMoveEffectInMinus(u32 battlerAtk, u32 battlerDef, u32 move, s case EFFECT_EXPLOSION: case EFFECT_FINAL_GAMBIT: return TRUE; - case EFFECT_RECOIL_IF_MISS: - if (AI_IsDamagedByRecoil(battlerAtk)) - return TRUE; case EFFECT_RECOIL: + case EFFECT_RECOIL_IF_MISS: if (AI_IsDamagedByRecoil(battlerAtk)) return TRUE; break; diff --git a/src/battle_util.c b/src/battle_util.c index bdffa67624..e7e7dbe10b 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -8396,7 +8396,7 @@ static inline u32 CalcMoveBasePowerAfterModifiers(struct DamageCalculationData * modifier = uq4_12_multiply(modifier, UQ_4_12(1.5)); break; case ABILITY_RECKLESS: - if (IsBattleMoveRecoil(move)) + if (moveEffect == EFFECT_RECOIL || moveEffect == EFFECT_RECOIL_IF_MISS) modifier = uq4_12_multiply(modifier, UQ_4_12(1.2)); break; case ABILITY_IRON_FIST: