From dad5c2f9dc300f934af789f3c3e7e8c806261fb5 Mon Sep 17 00:00:00 2001
From: innerthunder <brandonerickson98@gmail.com>
Date: Wed, 23 Oct 2024 00:02:14 -0700
Subject: [PATCH] Fix binding, etc. not being removed when switching with Baton
 Pass

---
 src/phases/switch-summon-phase.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts
index 07761b10d6e..37652b3cfa4 100644
--- a/src/phases/switch-summon-phase.ts
+++ b/src/phases/switch-summon-phase.ts
@@ -65,8 +65,9 @@ export class SwitchSummonPhase extends SummonPhase {
 
     const pokemon = this.getPokemon();
 
+    (this.player ? this.scene.getEnemyField() : this.scene.getPlayerField()).forEach(enemyPokemon => enemyPokemon.removeTagsBySourceId(pokemon.id));
+
     if (this.switchType === SwitchType.SWITCH) {
-      (this.player ? this.scene.getEnemyField() : this.scene.getPlayerField()).forEach(enemyPokemon => enemyPokemon.removeTagsBySourceId(pokemon.id));
       const substitute = pokemon.getTag(SubstituteTag);
       if (substitute) {
         this.scene.tweens.add({