From 3f6629c9ba2f5a82b287e86383989fc551435eb8 Mon Sep 17 00:00:00 2001
From: frutescens <info@laptop>
Date: Sun, 3 Nov 2024 15:14:11 -0800
Subject: [PATCH] Added changes

---
 src/battle-scene.ts  | 16 +++++-----------
 src/field/pokemon.ts |  1 -
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index b8bdec15a9a..e8f5bf0743c 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -2981,19 +2981,13 @@ export default class BattleScene extends SceneBase {
    */
   getActiveKeys(): string[] {
     const keys: string[] = [];
-    const playerParty = this.getParty();
-    playerParty.forEach(p => {
+    const activePokemon: (PlayerPokemon | EnemyPokemon)[] = this.getParty();
+    activePokemon.concat(this.getEnemyParty());
+    activePokemon.forEach((p) => {
       keys.push(p.getSpriteKey(true));
-      keys.push(p.getBattleSpriteKey(true, true));
-      keys.push(p.species.getCryKey(p.formIndex));
-      if (p.fusionSpecies) {
-        keys.push(p.fusionSpecies.getCryKey(p.fusionFormIndex));
+      if (p instanceof PlayerPokemon) {
+        keys.push(p.getBattleSpriteKey(true, true));
       }
-    });
-    // enemyParty has to be operated on separately from playerParty because playerPokemon =/= enemyPokemon
-    const enemyParty = this.getEnemyParty();
-    enemyParty.forEach(p => {
-      keys.push(p.getSpriteKey(true));
       keys.push(p.species.getCryKey(p.formIndex));
       if (p.fusionSpecies) {
         keys.push(p.fusionSpecies.getCryKey(p.fusionFormIndex));
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 580d1c46227..3ab792e42a1 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -3228,7 +3228,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       delay: Utils.fixedInt(delay),
       repeat: -1,
       callback: () => {
-        ++i;
         frameThreshold = sprite.anims.msPerFrame / rate;
         frameProgress += delay;
         while (frameProgress > frameThreshold) {