diff --git a/include/pokemon.h b/include/pokemon.h
index d412f21ea4..af27007b8b 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -797,7 +797,6 @@ u8 GiveCapturedMonToPlayer(struct Pokemon *mon);
 u8 CopyMonToPC(struct Pokemon *mon);
 u8 CalculatePlayerPartyCount(void);
 u8 CalculateEnemyPartyCount(void);
-u8 CalculateEnemyPartyCountInSide(enum BattlerId battler);
 u8 GetMonsStateToDoubles(void);
 u8 GetMonsStateToDoubles_2(void);
 enum Ability GetAbilityBySpecies(u16 species, u8 abilityNum);
diff --git a/src/battle_main.c b/src/battle_main.c
index 0c5ef22076..e8ba7098b9 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -2181,7 +2181,7 @@ static void BufferPartyVsScreenHealth_AtEnd(u8 taskId)
     u32 flags;
     s32 i;
 
-    if (gBattleTypeFlags & BATTLE_TYPE_MULTI) // grintoul TO DO
+    if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
         switch (gLinkPlayers[multiplayerId].id)
         {
diff --git a/src/pokemon.c b/src/pokemon.c
index fced6808cf..b3880e3876 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -3490,13 +3490,7 @@ u8 CalculatePartyCount(enum BattleTrainer trainer)
 
 u8 CalculatePartyCountOfSide(enum BattlerId battler)
 {
-    enum BattleTrainer battlerTrainer = GetBattlerTrainer(battler);
-    enum BattleTrainer partnerTrainer = GetBattlerTrainer(BATTLE_PARTNER(battler));
-
-    if (battlerTrainer == partnerTrainer)
-        return CalculatePartyCount(battlerTrainer);
-    else
-        return CalculatePartyCount(battlerTrainer) + CalculatePartyCount(partnerTrainer);
+    return CalculatePartyCount(GetBattlerTrainer(battler)) + CalculatePartyCount(GetAllyTrainerFromBattler(battler));
 }
 
 u8 CalculatePlayerPartyCount(void)
@@ -3508,12 +3502,8 @@ u8 CalculatePlayerPartyCount(void)
 u8 CalculateEnemyPartyCount(void)
 {
     gPartiesCount[B_TRAINER_1] = CalculatePartyCount(B_TRAINER_1);
-    return gPartiesCount[B_TRAINER_1];
-}
-
-u8 CalculateEnemyPartyCountInSide(enum BattlerId battler)
-{
-    return CalculatePartyCountOfSide(battler);
+    gPartiesCount[B_TRAINER_3] = CalculatePartyCount(B_TRAINER_3);
+    return gPartiesCount[B_TRAINER_1] + gPartiesCount[B_TRAINER_3];
 }
 
 u8 GetMonsStateToDoubles(void)