From 44a68a91bac22b5982f98012846e66174ee16d96 Mon Sep 17 00:00:00 2001
From: Moka <54149968+MokaStitcher@users.noreply.github.com>
Date: Sun, 10 Nov 2024 06:35:49 +0100
Subject: [PATCH] [P1] Fix crash when newly aquired Pokemon are sent in battle
 (#4835)

---
 .../encounters/fun-and-games-encounter.ts                 | 2 +-
 src/field/pokemon.ts                                      | 8 ++++----
 src/phases/encounter-phase.ts                             | 2 +-
 src/phases/summon-phase.ts                                | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts
index 7bf48aa5926..c286fffe0de 100644
--- a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts
+++ b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts
@@ -305,7 +305,7 @@ async function showWobbuffetHealthBar(scene: BattleScene) {
   scene.field.add(wobbuffet);
 
   const playerPokemon = scene.getPlayerPokemon() as Pokemon;
-  if (playerPokemon?.visible) {
+  if (playerPokemon?.isOnField()) {
     scene.field.moveBelow(wobbuffet, playerPokemon);
   }
   // Show health bar and trigger cry
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 221cc8f818a..daa73164577 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -5113,7 +5113,7 @@ export class EnemyPokemon extends Pokemon {
 
   /**
    * Add a new pokemon to the player's party (at `slotIndex` if set).
-   * If the first slot is replaced, the new pokemon's visibility will be set to `false`.
+   * The new pokemon's visibility will be set to `false`.
    * @param pokeballType the type of pokeball the pokemon was caught with
    * @param slotIndex an optional index to place the pokemon in the party
    * @returns the pokemon that was added or null if the pokemon could not be added
@@ -5131,14 +5131,14 @@ export class EnemyPokemon extends Pokemon {
       const newPokemon = this.scene.addPlayerPokemon(this.species, this.level, this.abilityIndex, this.formIndex, this.gender, this.shiny, this.variant, this.ivs, this.nature, this);
 
       if (Utils.isBetween(slotIndex, 0, PLAYER_PARTY_MAX_SIZE - 1)) {
-        if (slotIndex === 0) {
-          newPokemon.setVisible(false); // Hide if replaced with first pokemon
-        }
         party.splice(slotIndex, 0, newPokemon);
       } else {
         party.push(newPokemon);
       }
 
+      // Hide the Pokemon since it is not on the field
+      newPokemon.setVisible(false);
+
       ret = newPokemon;
       this.scene.triggerPokemonFormChange(newPokemon, SpeciesFormChangeActiveTrigger, true);
     }
diff --git a/src/phases/encounter-phase.ts b/src/phases/encounter-phase.ts
index c4d919c0325..fc022ab9647 100644
--- a/src/phases/encounter-phase.ts
+++ b/src/phases/encounter-phase.ts
@@ -202,7 +202,7 @@ export class EncounterPhase extends BattlePhase {
             this.scene.field.add(enemyPokemon);
             battle.seenEnemyPartyMemberIds.add(enemyPokemon.id);
             const playerPokemon = this.scene.getPlayerPokemon();
-            if (playerPokemon?.visible) {
+            if (playerPokemon?.isOnField()) {
               this.scene.field.moveBelow(enemyPokemon as Pokemon, playerPokemon);
             }
             enemyPokemon.tint(0, 0.5);
diff --git a/src/phases/summon-phase.ts b/src/phases/summon-phase.ts
index 119e550293c..177e09c4527 100644
--- a/src/phases/summon-phase.ts
+++ b/src/phases/summon-phase.ts
@@ -140,7 +140,7 @@ export class SummonPhase extends PartyMemberPokemonPhase {
             this.scene.field.add(pokemon);
             if (!this.player) {
               const playerPokemon = this.scene.getPlayerPokemon() as Pokemon;
-              if (playerPokemon?.visible) {
+              if (playerPokemon?.isOnField()) {
                 this.scene.field.moveBelow(pokemon, playerPokemon);
               }
               this.scene.currentBattle.seenEnemyPartyMemberIds.add(pokemon.id);
@@ -193,7 +193,7 @@ export class SummonPhase extends PartyMemberPokemonPhase {
     this.scene.field.add(pokemon);
     if (!this.player) {
       const playerPokemon = this.scene.getPlayerPokemon() as Pokemon;
-      if (playerPokemon?.visible) {
+      if (playerPokemon?.isOnField()) {
         this.scene.field.moveBelow(pokemon, playerPokemon);
       }
       this.scene.currentBattle.seenEnemyPartyMemberIds.add(pokemon.id);