From 2b077151ef8cc93f8b06a0ff7654a7adbf027390 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Sun, 8 Jun 2025 20:15:56 +0200
Subject: [PATCH] Using held items in some places

---
 src/phases/move-effect-phase.ts | 8 ++------
 src/phases/turn-end-phase.ts    | 9 +++------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts
index 5978c88ad8b..477d0779d61 100644
--- a/src/phases/move-effect-phase.ts
+++ b/src/phases/move-effect-phase.ts
@@ -52,11 +52,7 @@ import { type DamageResult, PokemonMove, type TurnMove } from "#app/field/pokemo
 import type Pokemon from "#app/field/pokemon";
 import { HitResult, MoveResult } from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
-import {
-  ContactHeldItemTransferChanceModifier,
-  EnemyAttackStatusEffectChanceModifier,
-  EnemyEndureChanceModifier,
-} from "#app/modifier/modifier";
+import { EnemyAttackStatusEffectChanceModifier, EnemyEndureChanceModifier } from "#app/modifier/modifier";
 import { PokemonPhase } from "#app/phases/pokemon-phase";
 import { BooleanHolder, isNullOrUndefined, NumberHolder } from "#app/utils/common";
 import type { nil } from "#app/utils/common";
@@ -999,7 +995,7 @@ export class MoveEffectPhase extends PokemonPhase {
 
     // Apply Grip Claw's chance to steal an item from the target
     if (this.move instanceof AttackMove) {
-      globalScene.applyModifiers(ContactHeldItemTransferChanceModifier, this.player, user, target);
+      applyHeldItems(ITEM_EFFECT.CONTACT_ITEM_STEAL_CHANCE, { pokemon: user, target: target });
     }
   }
 }
diff --git a/src/phases/turn-end-phase.ts b/src/phases/turn-end-phase.ts
index f5924853601..5d4ac3f5f8c 100644
--- a/src/phases/turn-end-phase.ts
+++ b/src/phases/turn-end-phase.ts
@@ -5,11 +5,7 @@ import { WeatherType } from "#app/enums/weather-type";
 import { TurnEndEvent } from "#app/events/battle-scene";
 import type Pokemon from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
-import {
-  EnemyTurnHealModifier,
-  EnemyStatusEffectHealChanceModifier,
-  TurnHeldItemTransferModifier,
-} from "#app/modifier/modifier";
+import { EnemyTurnHealModifier, EnemyStatusEffectHealChanceModifier } from "#app/modifier/modifier";
 import i18next from "i18next";
 import { FieldPhase } from "./field-phase";
 import { globalScene } from "#app/global-scene";
@@ -53,7 +49,8 @@ export class TurnEndPhase extends FieldPhase {
       }
 
       applyHeldItems(ITEM_EFFECT.TURN_END_STATUS, { pokemon: pokemon });
-      globalScene.applyModifiers(TurnHeldItemTransferModifier, pokemon.isPlayer(), pokemon);
+
+      applyHeldItems(ITEM_EFFECT.TURN_END_ITEM_STEAL, { pokemon: pokemon });
 
       pokemon.tempSummonData.turnCount++;
       pokemon.tempSummonData.waveTurnCount++;