From c4c47745285b2c1861942c5afc3793c5e0c49cf5 Mon Sep 17 00:00:00 2001
From: td76099 <85713900+td76099@users.noreply.github.com>
Date: Sat, 25 May 2024 07:31:04 -0400
Subject: [PATCH] Beat Up checks the user's party instead of always checking
 player's party (#1268)

---
 src/data/move.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 src/data/move.ts

diff --git a/src/data/move.ts b/src/data/move.ts
old mode 100644
new mode 100755
index 6aac106247f..8e4941f4c36
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -1320,8 +1320,9 @@ export class MultiHitAttr extends MoveAttr {
       }
       break;
     case MultiHitType.BEAT_UP:
+      const party = user.isPlayer() ? user.scene.getParty() : user.scene.getEnemyParty();
       // No status means the ally pokemon can contribute to Beat Up
-      hitTimes = user.scene.getParty().reduce((total, pokemon) => {
+      hitTimes = party.reduce((total, pokemon) => {
         return total + (pokemon.id === user.id ? 1 : pokemon?.status && pokemon.status.effect !== StatusEffect.NONE ? 0 : 1);
       }, 0);
     }
@@ -2323,7 +2324,7 @@ export class MovePowerMultiplierAttr extends VariablePowerAttr {
  * @returns The base power of the Beat Up hit.
  */
 const beatUpFunc = (user: Pokemon, allyIndex: number): number => {
-  const party = user.scene.getParty();
+  const party = user.isPlayer() ? user.scene.getParty() : user.scene.getEnemyParty();
 
   for (let i = allyIndex; i < party.length; i++) {
     const pokemon = party[i];