From 7f5fdcca6c3b75bcfb008b84bfe29f990b6f1c2b Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Wed, 9 Oct 2024 04:52:25 -0700
Subject: [PATCH] Enemy item override will now apply to all enemies

---
 src/battle-scene.ts      | 4 ++--
 src/modifier/modifier.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index cc6934f20d1..b1db14a7ed2 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -2689,8 +2689,8 @@ export default class BattleScene extends SceneBase {
   /**
     * Removes all modifiers from enemy of PokemonHeldItemModifier type
     */
-  clearEnemyHeldItemModifiers(): void {
-    const modifiersToRemove = this.enemyModifiers.filter(m => m instanceof PokemonHeldItemModifier);
+  clearEnemyHeldItemModifiers(pokemon?: Pokemon): void {
+    const modifiersToRemove = this.enemyModifiers.filter(m => m instanceof PokemonHeldItemModifier && (!pokemon || m.getPokemon(this) === pokemon));
     for (const m of modifiersToRemove) {
       this.enemyModifiers.splice(this.enemyModifiers.indexOf(m), 1);
     }
diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts
index b658d3b5277..ab299138e4a 100644
--- a/src/modifier/modifier.ts
+++ b/src/modifier/modifier.ts
@@ -3634,7 +3634,7 @@ export function overrideHeldItems(scene: BattleScene, pokemon: Pokemon, isPlayer
   }
 
   if (!isPlayer) {
-    scene.clearEnemyHeldItemModifiers();
+    scene.clearEnemyHeldItemModifiers(pokemon);
   }
 
   heldItemsOverride.forEach(item => {