From 50d4e6e180213cd49e48bd04279d0bfaf9099e17 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Thu, 17 Apr 2025 12:38:56 -0500
Subject: [PATCH] Make onField default to true

---
 src/data/moves/move.ts     | 4 ++--
 src/data/terrain.ts        | 2 +-
 src/field/pokemon.ts       | 7 ++++++-
 src/phases/move-phase.ts   | 2 +-
 src/ui/fight-ui-handler.ts | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts
index 513ab3f6a74..26654fee18f 100644
--- a/src/data/moves/move.ts
+++ b/src/data/moves/move.ts
@@ -8183,7 +8183,7 @@ export type MoveTargetSet = {
 
 export function getMoveTargets(user: Pokemon, move: Moves, replaceTarget?: MoveTarget): MoveTargetSet {
   const variableTarget = new NumberHolder(0);
-  user.getOpponents().forEach(p => applyMoveAttrs(VariableTargetAttr, user, p, allMoves[move], variableTarget));
+  user.getOpponents(false).forEach(p => applyMoveAttrs(VariableTargetAttr, user, p, allMoves[move], variableTarget));
 
   let moveTarget: MoveTarget | undefined;
   if (allMoves[move].hasAttr(VariableTargetAttr)) {
@@ -8195,7 +8195,7 @@ export function getMoveTargets(user: Pokemon, move: Moves, replaceTarget?: MoveT
   } else if (move === undefined) {
     moveTarget = MoveTarget.NEAR_ENEMY;
   }
-  const opponents = user.getOpponents();
+  const opponents = user.getOpponents(false);
 
   let set: Pokemon[] = [];
   let multiple = false;
diff --git a/src/data/terrain.ts b/src/data/terrain.ts
index 894fb8a7955..5b6063cee68 100644
--- a/src/data/terrain.ts
+++ b/src/data/terrain.ts
@@ -59,7 +59,7 @@ export class Terrain {
           // Cancels move if the move has positive priority and targets a Pokemon grounded on the Psychic Terrain
           return (
             move.getPriority(user) > 0 &&
-            user.getOpponents().some(o => targets.includes(o.getBattlerIndex()) && o.isGrounded())
+            user.getOpponents(true).some(o => targets.includes(o.getBattlerIndex()) && o.isGrounded())
           );
         }
     }
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index cea513b4a3e..f2e5fd4c2b6 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -3852,7 +3852,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     return null;
   }
 
-  getOpponents(onField = false): Pokemon[] {
+  /**
+   * Returns the pokemon that oppose this one and are active
+   * 
+   * @param onField - whether to also check if the pokemon is currently on the field (defaults to true)
+   */
+  getOpponents(onField = true): Pokemon[] {
     return (
       (this.isPlayer()
         ? globalScene.getEnemyField()
diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts
index f42a2aefa34..7d2848a5d70 100644
--- a/src/phases/move-phase.ts
+++ b/src/phases/move-phase.ts
@@ -654,7 +654,7 @@ export class MovePhase extends BattlePhase {
       }),
       500,
     );
-    applyMoveAttrs(PreMoveMessageAttr, this.pokemon, this.pokemon.getOpponents()[0], this.move.getMove());
+    applyMoveAttrs(PreMoveMessageAttr, this.pokemon, this.pokemon.getOpponents(false)[0], this.move.getMove());
   }
 
   public showFailedText(failedText: string = i18next.t("battle:attackFailed")): void {
diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts
index 195e9f788fe..e0a73d62934 100644
--- a/src/ui/fight-ui-handler.ts
+++ b/src/ui/fight-ui-handler.ts
@@ -346,7 +346,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
       return undefined;
     }
 
-    const opponents = pokemon.getOpponents(true);
+    const opponents = pokemon.getOpponents();
     if (opponents.length <= 0) {
       return undefined;
     }