From a085d3d4167eac4be441a65aad9273a7fd59f370 Mon Sep 17 00:00:00 2001
From: seanrmon <76178227+seanrmon@users.noreply.github.com>
Date: Fri, 13 Sep 2024 18:03:11 +0100
Subject: [PATCH] =?UTF-8?q?[Bug]=20Fix=20for=20unpausing=20evolutions=20fo?=
 =?UTF-8?q?r=20secondary=20Pok=C3=A9mon=20in=20a=20fusion=20(#4007)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Bug] Cannot unpause evolutions for secondary Pokémon in fusion

* [Bug] Fusion Pokémon now inherit "Pause Evolutions" from both Pokémon

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
---
 src/field/pokemon.ts       | 3 +++
 src/ui/party-ui-handler.ts | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index c5d8e039f9a..c648ff485b7 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -3984,6 +3984,9 @@ export class PlayerPokemon extends Pokemon {
       this.fusionVariant = pokemon.variant;
       this.fusionGender = pokemon.gender;
       this.fusionLuck = pokemon.luck;
+      if ((pokemon.pauseEvolutions) || (this.pauseEvolutions)) {
+        this.pauseEvolutions = true;
+      }
 
       this.scene.validateAchv(achvs.SPLICE);
       this.scene.gameData.gameStats.pokemonFused++;
diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index 9e025dbe086..270163a3d3e 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -877,7 +877,7 @@ export default class PartyUiHandler extends MessageUiHandler {
       this.options.push(PartyOption.SUMMARY);
       this.options.push(PartyOption.RENAME);
 
-      if (pokemon.pauseEvolutions && pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId)) {
+      if (pokemon.pauseEvolutions && (pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) || (pokemon.isFusion() && pokemon.fusionSpecies && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId)))) {
         this.options.push(PartyOption.UNPAUSE_EVOLUTION);
       }