From 67c6e96310131cc91ed676ac20dfa69f2d918d8e Mon Sep 17 00:00:00 2001
From: Acelynn Zhang <azyx0987e@gmail.com>
Date: Mon, 4 Aug 2025 16:07:49 -0500
Subject: [PATCH] Fix override move animations not loading for enemy Pokemon

---
 src/field/pokemon.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index fe78994ce93..0523671ee5f 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -1821,8 +1821,6 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
    * @returns An array of {@linkcode PokemonMove}, as described above.
    */
   getMoveset(ignoreOverride = false): PokemonMove[] {
-    const ret = !ignoreOverride && this.summonData.moveset ? this.summonData.moveset : this.moveset;
-
     // Overrides moveset based on arrays specified in overrides.ts
     let overrideArray: MoveId | Array<MoveId> = this.isPlayer()
       ? Overrides.MOVESET_OVERRIDE
@@ -1838,7 +1836,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
       });
     }
 
-    return ret;
+    return !ignoreOverride && this.summonData.moveset ? this.summonData.moveset : this.moveset;
   }
 
   /**