From 5d2a6743dc1ac441431039355ca87a970d1848ea Mon Sep 17 00:00:00 2001
From: Dean <me@deann.dev>
Date: Fri, 9 May 2025 12:34:53 -0700
Subject: [PATCH] Fix ditto sprite not loading properly

---
 src/field/pokemon.ts    | 18 +++++++++++-------
 src/system/game-data.ts |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 43669c874a9..62b65509cf7 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -909,19 +909,23 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       const originalWarn = console.warn;
       // Ignore warnings for missing frames, because there will be a lot
       console.warn = () => {};
-      const battleFrameNames = globalScene.anims.generateFrameNames(this.getBattleSpriteKey(), {
+      // NEED REVIEW: is `this.isPlayer()` always the correct check for whether to get the front of back sprite?
+      const battleSpriteKey = this.getBattleSpriteKey(this.isPlayer(), ignoreOverride);
+      const battleFrameNames = globalScene.anims.generateFrameNames(battleSpriteKey, {
         zeroPad: 4,
         suffix: ".png",
         start: 1,
         end: 400,
       });
       console.warn = originalWarn;
-      globalScene.anims.create({
-        key: this.getBattleSpriteKey(),
-        frames: battleFrameNames,
-        frameRate: 10,
-        repeat: -1,
-      });
+      if (!globalScene.anims.exists(battleSpriteKey)) {
+        globalScene.anims.create({
+          key: battleSpriteKey,
+          frames: battleFrameNames,
+          frameRate: 10,
+          repeat: -1,
+        });
+      }
     }
     // With everything loaded, now begin playing the animation.
     this.playAnim();
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index 51e488210be..0c5e0b349ed 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -1110,7 +1110,7 @@ export class GameData {
           for (const p of sessionData.party) {
             const pokemon = p.toPokemon() as PlayerPokemon;
             pokemon.setVisible(false);
-            loadPokemonAssets.push(pokemon.loadAssets());
+            loadPokemonAssets.push(pokemon.loadAssets(false));
             party.push(pokemon);
           }