From 7eaaa1f8d44a099287a3b15933234c5929d67c68 Mon Sep 17 00:00:00 2001
From: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Sun, 9 Mar 2025 15:05:05 +0100
Subject: [PATCH] remove/replace IsAlly leftovers

---
 include/battle_util.h | 1 -
 src/battle_util.c     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/battle_util.h b/include/battle_util.h
index 6b7fdef74a..21760a47a3 100644
--- a/include/battle_util.h
+++ b/include/battle_util.h
@@ -303,7 +303,6 @@ bool32 CanTargetBattler(u32 battlerAtk, u32 battlerDef, u16 move);
 void CopyMonLevelAndBaseStatsToBattleMon(u32 battler, struct Pokemon *mon);
 void CopyMonAbilityAndTypesToBattleMon(u32 battler, struct Pokemon *mon);
 void RecalcBattlerStats(u32 battler, struct Pokemon *mon, bool32 isDynamaxing);
-bool32 IsAlly(u32 battlerAtk, u32 battlerDef);
 bool32 IsGen6ExpShareEnabled(void);
 bool32 MoveHasAdditionalEffect(u32 move, u32 moveEffect);
 bool32 MoveHasAdditionalEffectWithChance(u32 move, u32 moveEffect, u32 chance);
diff --git a/src/battle_util.c b/src/battle_util.c
index 4a7a0faf0e..0406bb42e3 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -274,7 +274,7 @@ bool32 HandleMoveTargetRedirection(void)
         for (battler = 0; battler < gBattlersCount; battler++)
         {
             ability = GetBattlerAbility(battler);
-            if ((B_REDIRECT_ABILITY_ALLIES >= GEN_4 || !IsAlly(gBattlerAttacker, battler))
+            if ((B_REDIRECT_ABILITY_ALLIES >= GEN_4 || !IsBattlerAlly(gBattlerAttacker, battler))
                 && battler != gBattlerAttacker
                 && gBattleStruct->moveTarget[gBattlerAttacker] != battler
                 && ((ability == ABILITY_LIGHTNING_ROD && moveType == TYPE_ELECTRIC)