From 9d5e84dd905872a455cf52d82d7f650c5f6582c1 Mon Sep 17 00:00:00 2001
From: Christopher Schmidt <schmidtc086@outlook.com>
Date: Sun, 1 Dec 2024 17:03:39 -0500
Subject: [PATCH] Attempt to fix merge conflicts

---
 src/data/move.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data/move.ts b/src/data/move.ts
index b280178a506..d388ec89255 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -6549,7 +6549,7 @@ export class RandomMovesetMoveAttr extends CallMoveAttr {
       // includeParty will be true for Assist, false for Sleep Talk
       let allies: Pokemon[];
       if (this.includeParty) {
-        allies = user.isPlayer() ? user.scene.getParty() : user.scene.getEnemyParty();
+        allies = user.isPlayer() ? user.scene.getPlayerParty() : user.scene.getEnemyParty();
       } else {
         allies = [ user ];
       }