From 0712f86462fde33333f84024988fd11521724046 Mon Sep 17 00:00:00 2001
From: Dean <69436131+emdeann@users.noreply.github.com>
Date: Fri, 9 May 2025 01:34:28 -0700
Subject: [PATCH] [Bug][Hotfix] Fix crashes when loading save with a
 transformed pokemon (#5806)

* Fix speciesForm being saved incorrectly

* Fix transformed icon

* Fix moveset loading errors
---
 src/battle-scene.ts        | 8 ++++----
 src/field/pokemon.ts       | 2 +-
 src/system/pokemon-data.ts | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 39bd1dd64cf..9f70b33b296 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1045,7 +1045,7 @@ export default class BattleScene extends SceneBase {
     y: number,
     originX = 0.5,
     originY = 0.5,
-    ignoreOverride = false,
+    ignoreOverride = true,
     useIllusion = false,
   ): Phaser.GameObjects.Container {
     const container = this.add.container(x, y);
@@ -1053,9 +1053,9 @@ export default class BattleScene extends SceneBase {
 
     const icon = this.add.sprite(0, 0, pokemon.getIconAtlasKey(ignoreOverride, useIllusion));
     icon.setName(`sprite-${pokemon.name}-icon`);
-    icon.setFrame(pokemon.getIconId(true, useIllusion));
+    icon.setFrame(pokemon.getIconId(ignoreOverride, useIllusion));
     // Temporary fix to show pokemon's default icon if variant icon doesn't exist
-    if (icon.frame.name !== pokemon.getIconId(true, useIllusion)) {
+    if (icon.frame.name !== pokemon.getIconId(ignoreOverride, useIllusion)) {
       console.log(`${pokemon.name}'s variant icon does not exist. Replacing with default.`);
       const temp = pokemon.shiny;
       pokemon.shiny = false;
@@ -1071,7 +1071,7 @@ export default class BattleScene extends SceneBase {
       const fusionIcon = this.add.sprite(0, 0, pokemon.getFusionIconAtlasKey(ignoreOverride, useIllusion));
       fusionIcon.setName("sprite-fusion-icon");
       fusionIcon.setOrigin(0.5, 0);
-      fusionIcon.setFrame(pokemon.getFusionIconId(true, useIllusion));
+      fusionIcon.setFrame(pokemon.getFusionIconId(ignoreOverride, useIllusion));
 
       const originalWidth = icon.width;
       const originalHeight = icon.height;
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 6a05bea4c6d..43669c874a9 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -7862,7 +7862,7 @@ export class PokemonSummonData {
       }
 
       if (key === "moveset") {
-        this.moveset = value.map((m: any) => PokemonMove.loadMove(m));
+        this.moveset = value?.map((m: any) => PokemonMove.loadMove(m));
         continue;
       }
 
diff --git a/src/system/pokemon-data.ts b/src/system/pokemon-data.ts
index 8d4fd7c05df..00169678ed0 100644
--- a/src/system/pokemon-data.ts
+++ b/src/system/pokemon-data.ts
@@ -188,7 +188,7 @@ export default class PokemonData {
     // when loading from saved session, recover summonData.speciesFrom and form index species object
     // used to stay transformed on reload session
     if (this.summonData.speciesForm) {
-      this.summonData.speciesForm = getPokemonSpeciesForm(
+      ret.summonData.speciesForm = getPokemonSpeciesForm(
         this.summonData.speciesForm.speciesId,
         this.summonDataSpeciesFormIndex,
       );