From faa387a67ef4751cf3870100223c7c71cad105c6 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Mon, 9 Jun 2025 14:46:31 +0200
Subject: [PATCH] Refactored Baton logic

---
 src/phases/switch-summon-phase.ts | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts
index 103af3db275..5cb25388641 100644
--- a/src/phases/switch-summon-phase.ts
+++ b/src/phases/switch-summon-phase.ts
@@ -13,12 +13,12 @@ import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
 import { TrainerSlot } from "#enums/trainer-slot";
 import type Pokemon from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
-import { SwitchEffectTransferModifier } from "#app/modifier/modifier";
 import { Command } from "#app/ui/command-ui-handler";
 import i18next from "i18next";
 import { SummonPhase } from "./summon-phase";
 import { SubstituteTag } from "#app/data/battler-tags";
 import { SwitchType } from "#enums/switch-type";
+import { HeldItemId } from "#enums/held-item-id";
 
 export class SwitchSummonPhase extends SummonPhase {
   public readonly phaseName: "SwitchSummonPhase" | "ReturnPhase" = "SwitchSummonPhase";
@@ -145,29 +145,11 @@ export class SwitchSummonPhase extends SummonPhase {
       );
 
       // If the recipient pokemon lacks a baton, give our baton to it during the swap
-      if (
-        !globalScene.findModifier(
-          m =>
-            m instanceof SwitchEffectTransferModifier &&
-            (m as SwitchEffectTransferModifier).pokemonId === switchedInPokemon.id,
-        )
-      ) {
-        const batonPassModifier = globalScene.findModifier(
-          m =>
-            m instanceof SwitchEffectTransferModifier &&
-            (m as SwitchEffectTransferModifier).pokemonId === this.lastPokemon.id,
-        ) as SwitchEffectTransferModifier;
+      if (!switchedInPokemon.heldItemManager.hasItem(HeldItemId.BATON)) {
+        const batonPassModifier = this.lastPokemon.heldItemManager.hasItem(HeldItemId.BATON);
 
         if (batonPassModifier) {
-          globalScene.tryTransferHeldItemModifier(
-            batonPassModifier,
-            switchedInPokemon,
-            false,
-            undefined,
-            undefined,
-            undefined,
-            false,
-          );
+          globalScene.tryTransferHeldItem(HeldItemId.BATON, this.lastPokemon, switchedInPokemon, false);
         }
       }
     }