From a27822b6243a9dacd418a32a9b36da02b6c79f04 Mon Sep 17 00:00:00 2001
From: Landon Lee <93344616+turtlesboulder@users.noreply.github.com>
Date: Sun, 12 May 2024 03:01:59 -0500
Subject: [PATCH] Fix cry when pokemon is fused with its own species (#615)

If the pokemon species and form is the same as the second fusion component, then skip the logic to make a fused cry and just use the cry of the primary component.
---
 src/field/pokemon.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index fffe4b688..619cedb4a 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -1865,7 +1865,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     const scene = sceneOverride || this.scene;
     const cry = this.getSpeciesForm().cry(scene, soundConfig);
     let duration = cry.totalDuration * 1000;
-    if (this.fusionSpecies) {
+    if (this.fusionSpecies && this.getSpeciesForm() != this.getFusionSpeciesForm()) {
       let fusionCry = this.getFusionSpeciesForm().cry(scene, soundConfig, true);
       duration = Math.min(duration, fusionCry.totalDuration * 1000);
       fusionCry.destroy();
@@ -1884,7 +1884,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   faintCry(callback: Function): void {
-    if (this.fusionSpecies)
+    if (this.fusionSpecies && this.getSpeciesForm() != this.getFusionSpeciesForm())
       return this.fusionFaintCry(callback);
 
     const key = this.getSpeciesForm().getCryKey(this.formIndex);