From 71299a731cbb611648b156de291f550db51a8a6c Mon Sep 17 00:00:00 2001
From: Adrian T <68144167+torranx@users.noreply.github.com>
Date: Tue, 25 Jun 2024 05:05:24 +0800
Subject: [PATCH] [Bug] Eiscue changing form regardless of previous form on
 arena reset (#2572)

* fix eiscue (again)

* hardcode eiscue check
---
 src/battle-scene.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 8fd80ba7a4e..a24fff13fdd 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1122,7 +1122,9 @@ export default class BattleScene extends SceneBase {
         playerField.forEach((_, p) => this.unshiftPhase(new ReturnPhase(this, p)));
 
         for (const pokemon of this.getParty()) {
-          if (pokemon.hasAbility(Abilities.ICE_FACE)) {
+          // Only trigger form change when Eiscue is in Noice form
+          // Hardcoded Eiscue for now in case it is fused with another pokemon
+          if (pokemon.species.speciesId === Species.EISCUE && pokemon.hasAbility(Abilities.ICE_FACE) && pokemon.formIndex === 1) {
             this.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger);
           }