Attempt to fix merge conflicts

2024-12-01 17:03:39 -05:00 · 2024-12-01 17:03:39 -05:00 · 9d5e84dd90
parent 068b0189db
commit 9d5e84dd90
1 changed files with 1 additions and 1 deletions
--- 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 ];
      }