diff --git a/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts b/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts
index 6f1a2716919..0ec25f537f5 100644
--- a/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts
+++ b/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts
@@ -1,4 +1,5 @@
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
+import { allTrainerItems } from "#app/data/data-lists";
 import { globalScene } from "#app/global-scene";
 import { speciesStarterCosts } from "#balance/starters";
 import { modifierTypes } from "#data/data-lists";
@@ -6,6 +7,7 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { SpeciesId } from "#enums/species-id";
+import { TrainerItemId } from "#enums/trainer-item-id";
 import {
   leaveEncounterWithoutBattle,
   setEncounterExp,
@@ -23,8 +25,6 @@ import {
 import { EXTORTION_ABILITIES, EXTORTION_MOVES } from "#mystery-encounters/requirement-groups";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import i18next from "i18next";
-import { allTrainerItems } from "#app/data/data-lists";
-import { TrainerItemId } from "#enums/trainer-item-id";
 
 /** the i18n namespace for this encounter */
 const namespace = "mysteryEncounters/anOfferYouCantRefuse";
diff --git a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
index 17935d814e1..8508b4644af 100644
--- a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
+++ b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
@@ -18,7 +18,11 @@ import {
 import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter";
 import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
 import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
-import { CombinationPokemonRequirement, HoldingItemRequirement, MoneyRequirement } from "#mystery-encounters/mystery-encounter-requirements";
+import {
+  CombinationPokemonRequirement,
+  HoldingItemRequirement,
+  MoneyRequirement,
+} from "#mystery-encounters/mystery-encounter-requirements";
 import i18next from "#plugins/i18n";
 import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler";
 import { randSeedItem } from "#utils/common";
diff --git a/src/field/pokemon-held-item-manager.ts b/src/field/pokemon-held-item-manager.ts
index 6185b5fc2c6..5f506ff0763 100644
--- a/src/field/pokemon-held-item-manager.ts
+++ b/src/field/pokemon-held-item-manager.ts
@@ -1,22 +1,22 @@
 import { allHeldItems } from "#app/data/data-lists";
 import {
   type HeldItemCategoryId,
+  type HeldItemId,
   isCategoryId,
   isItemInCategory,
   isItemInRequested,
-  type HeldItemId,
 } from "#app/enums/held-item-id";
-import type { FormChangeItem } from "#enums/form-change-item";
 import {
-  type HeldItemConfiguration,
-  isHeldItemSpecs,
-  type HeldItemDataMap,
-  type HeldItemSpecs,
   type FormChangeItemPropertyMap,
   type FormChangeItemSpecs,
+  type HeldItemConfiguration,
+  type HeldItemDataMap,
   type HeldItemSaveData,
+  type HeldItemSpecs,
+  isHeldItemSpecs,
 } from "#app/items/held-item-data-types";
 import { getTypedEntries, getTypedKeys } from "#app/utils/common";
+import type { FormChangeItem } from "#enums/form-change-item";
 
 export class PokemonItemManager {
   public heldItems: HeldItemDataMap;
diff --git a/src/items/all-held-items.ts b/src/items/all-held-items.ts
index f44563e6dbb..2b18fe5399a 100644
--- a/src/items/all-held-items.ts
+++ b/src/items/all-held-items.ts
@@ -4,50 +4,50 @@ import { BerryType } from "#enums/berry-type";
 import { HeldItemId } from "#enums/held-item-id";
 import type { PokemonType } from "#enums/pokemon-type";
 import { SpeciesId } from "#enums/species-id";
-import { Stat, type PermanentStat } from "#enums/stat";
+import { type PermanentStat, Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
 import { HeldItemEffect } from "./held-item";
-import { type AccuracyBoostParams, AccuracyBoosterHeldItem } from "./held-items/accuracy-booster";
+import { AccuracyBoosterHeldItem, type AccuracyBoostParams } from "./held-items/accuracy-booster";
 import {
-  type AttackTypeBoostParams,
   AttackTypeBoosterHeldItem,
+  type AttackTypeBoostParams,
   attackTypeToHeldItem,
 } from "./held-items/attack-type-booster";
 import {
-  type BaseStatBoosterParams,
   BaseStatBoosterHeldItem,
+  type BaseStatBoosterParams,
   permanentStatToHeldItem,
 } from "./held-items/base-stat-booster";
-import { type BaseStatFlatParams, BaseStatFlatHeldItem } from "./held-items/base-stat-flat";
-import { type BaseStatTotalParams, BaseStatTotalHeldItem } from "./held-items/base-stat-total";
-import { type BatonParams, BatonHeldItem } from "./held-items/baton";
-import { type BerryParams, BerryHeldItem, berryTypeToHeldItem } from "./held-items/berry";
-import { type BypassSpeedChanceParams, BypassSpeedChanceHeldItem } from "./held-items/bypass-speed-chance";
-import { type CritBoostParams, CritBoostHeldItem, SpeciesCritBoostHeldItem } from "./held-items/crit-booster";
-import { type DamageMoneyRewardParams, DamageMoneyRewardHeldItem } from "./held-items/damage-money-reward";
+import { BaseStatFlatHeldItem, type BaseStatFlatParams } from "./held-items/base-stat-flat";
+import { BaseStatTotalHeldItem, type BaseStatTotalParams } from "./held-items/base-stat-total";
+import { BatonHeldItem, type BatonParams } from "./held-items/baton";
+import { BerryHeldItem, type BerryParams, berryTypeToHeldItem } from "./held-items/berry";
+import { BypassSpeedChanceHeldItem, type BypassSpeedChanceParams } from "./held-items/bypass-speed-chance";
+import { CritBoostHeldItem, type CritBoostParams, SpeciesCritBoostHeldItem } from "./held-items/crit-booster";
+import { DamageMoneyRewardHeldItem, type DamageMoneyRewardParams } from "./held-items/damage-money-reward";
 import { type EvoTrackerParams, GimmighoulEvoTrackerHeldItem } from "./held-items/evo-tracker";
-import { type ExpBoostParams, ExpBoosterHeldItem } from "./held-items/exp-booster";
-import { type FieldEffectParams, FieldEffectHeldItem } from "./held-items/field-effect";
-import { type FlinchChanceParams, FlinchChanceHeldItem } from "./held-items/flinch-chance";
-import { type FriendshipBoostParams, FriendshipBoosterHeldItem } from "./held-items/friendship-booster";
-import { type HitHealParams, HitHealHeldItem } from "./held-items/hit-heal";
-import { type IncrementingStatParams, IncrementingStatHeldItem } from "./held-items/incrementing-stat";
+import { ExpBoosterHeldItem, type ExpBoostParams } from "./held-items/exp-booster";
+import { FieldEffectHeldItem, type FieldEffectParams } from "./held-items/field-effect";
+import { FlinchChanceHeldItem, type FlinchChanceParams } from "./held-items/flinch-chance";
+import { FriendshipBoosterHeldItem, type FriendshipBoostParams } from "./held-items/friendship-booster";
+import { HitHealHeldItem, type HitHealParams } from "./held-items/hit-heal";
+import { IncrementingStatHeldItem, type IncrementingStatParams } from "./held-items/incrementing-stat";
 import { InstantReviveHeldItem, type InstantReviveParams } from "./held-items/instant-revive";
 import {
   ContactItemStealChanceHeldItem,
   type ItemStealParams,
   TurnEndItemStealHeldItem,
 } from "./held-items/item-steal";
-import { type MultiHitParams, MultiHitHeldItem } from "./held-items/multi-hit";
-import { type NatureWeightBoostParams, NatureWeightBoosterHeldItem } from "./held-items/nature-weight-booster";
+import { MultiHitHeldItem, type MultiHitParams } from "./held-items/multi-hit";
+import { NatureWeightBoosterHeldItem, type NatureWeightBoostParams } from "./held-items/nature-weight-booster";
 import {
   ResetNegativeStatStageHeldItem,
   type ResetNegativeStatStageParams,
 } from "./held-items/reset-negative-stat-stage";
 import { EvolutionStatBoostHeldItem, SpeciesStatBoostHeldItem, type StatBoostParams } from "./held-items/stat-booster";
-import { type SurviveChanceParams, SurviveChanceHeldItem } from "./held-items/survive-chance";
-import { type TurnEndHealParams, TurnEndHealHeldItem } from "./held-items/turn-end-heal";
-import { type TurnEndStatusParams, TurnEndStatusHeldItem } from "./held-items/turn-end-status";
+import { SurviveChanceHeldItem, type SurviveChanceParams } from "./held-items/survive-chance";
+import { TurnEndHealHeldItem, type TurnEndHealParams } from "./held-items/turn-end-heal";
+import { TurnEndStatusHeldItem, type TurnEndStatusParams } from "./held-items/turn-end-status";
 
 export function initHeldItems() {
   for (const berry of getEnumValues(BerryType)) {
diff --git a/src/items/all-trainer-items.ts b/src/items/all-trainer-items.ts
index cd047a6bfa2..afb15aca431 100644
--- a/src/items/all-trainer-items.ts
+++ b/src/items/all-trainer-items.ts
@@ -24,8 +24,8 @@ import {
   TempAccuracyBoosterTrainerItem,
   TempCritBoosterTrainerItem,
   TempStatStageBoosterTrainerItem,
-  tempStatToTrainerItem,
   TrainerItem,
+  tempStatToTrainerItem,
 } from "./trainer-item";
 
 export function initTrainerItems() {
diff --git a/src/items/held-item-pool.ts b/src/items/held-item-pool.ts
index 9ad26e077af..8f8a761474d 100644
--- a/src/items/held-item-pool.ts
+++ b/src/items/held-item-pool.ts
@@ -1,5 +1,6 @@
-import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
+import { allHeldItems } from "#app/data/data-lists";
 import type Pokemon from "#app/field/pokemon";
+import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
 import { coerceArray, getEnumValues, isNullOrUndefined, pickWeightedIndex, randSeedInt } from "#app/utils/common";
 import { BerryType } from "#enums/berry-type";
 import { HeldItemCategoryId, HeldItemId, HeldItemNames, isCategoryId } from "#enums/held-item-id";
@@ -7,7 +8,6 @@ import { HeldItemPoolType } from "#enums/modifier-pool-type";
 import type { PokemonType } from "#enums/pokemon-type";
 import { RewardTier } from "#enums/reward-tier";
 import { PERMANENT_STATS } from "#enums/stat";
-import { allHeldItems } from "#app/data/data-lists";
 import {
   type HeldItemConfiguration,
   type HeldItemPool,
diff --git a/src/items/held-item.ts b/src/items/held-item.ts
index 6fdfc0dd6e7..e701a9b69c6 100644
--- a/src/items/held-item.ts
+++ b/src/items/held-item.ts
@@ -1,7 +1,7 @@
 import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs";
 import type Pokemon from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
-import { HeldItemNames, type HeldItemId } from "#enums/held-item-id";
+import { type HeldItemId, HeldItemNames } from "#enums/held-item-id";
 import i18next from "i18next";
 
 // TODO: this should be moved to its own file
diff --git a/src/items/held-items/accuracy-booster.ts b/src/items/held-items/accuracy-booster.ts
index fde2a06d351..f8aa332ab27 100644
--- a/src/items/held-items/accuracy-booster.ts
+++ b/src/items/held-items/accuracy-booster.ts
@@ -1,7 +1,7 @@
 import type Pokemon from "#app/field/pokemon";
 import type { NumberHolder } from "#app/utils/common";
 import type { HeldItemId } from "#enums/held-item-id";
-import { HeldItemEffect, HeldItem } from "../held-item";
+import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface AccuracyBoostParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/attack-type-booster.ts b/src/items/held-items/attack-type-booster.ts
index aad80b3c1d0..a1d93250d37 100644
--- a/src/items/held-items/attack-type-booster.ts
+++ b/src/items/held-items/attack-type-booster.ts
@@ -1,9 +1,9 @@
-import { HeldItemNames, HeldItemId } from "#enums/held-item-id";
+import type Pokemon from "#app/field/pokemon";
+import { HeldItem, HeldItemEffect } from "#app/items/held-item";
+import type { NumberHolder } from "#app/utils/common";
+import { HeldItemId, HeldItemNames } from "#enums/held-item-id";
 import { PokemonType } from "#enums/pokemon-type";
 import i18next from "i18next";
-import type { NumberHolder } from "#app/utils/common";
-import type Pokemon from "#app/field/pokemon";
-import { HeldItemEffect, HeldItem } from "#app/items/held-item";
 
 export interface AttackTypeBoostParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/base-stat-booster.ts b/src/items/held-items/base-stat-booster.ts
index 8ca87da7732..6f452a12996 100644
--- a/src/items/held-items/base-stat-booster.ts
+++ b/src/items/held-items/base-stat-booster.ts
@@ -2,7 +2,7 @@ import type Pokemon from "#app/field/pokemon";
 import { HeldItemId } from "#enums/held-item-id";
 import { getStatKey, type PermanentStat, Stat } from "#enums/stat";
 import i18next from "i18next";
-import { HeldItemEffect, HeldItem } from "../held-item";
+import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface BaseStatBoosterParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/base-stat-flat.ts b/src/items/held-items/base-stat-flat.ts
index 999e0788faa..30c8b5b9f80 100644
--- a/src/items/held-items/base-stat-flat.ts
+++ b/src/items/held-items/base-stat-flat.ts
@@ -1,7 +1,7 @@
 import type Pokemon from "#app/field/pokemon";
-import { HeldItemEffect, HeldItem } from "../held-item";
 import { Stat } from "#enums/stat";
 import i18next from "i18next";
+import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface BaseStatFlatParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/base-stat-total.ts b/src/items/held-items/base-stat-total.ts
index c862d56e176..643c6ef26a0 100644
--- a/src/items/held-items/base-stat-total.ts
+++ b/src/items/held-items/base-stat-total.ts
@@ -1,7 +1,7 @@
 import type Pokemon from "#app/field/pokemon";
-import i18next from "i18next";
-import { HeldItemEffect, HeldItem } from "../held-item";
 import type { HeldItemId } from "#enums/held-item-id";
+import i18next from "i18next";
+import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface BaseStatTotalParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/baton.ts b/src/items/held-items/baton.ts
index 9e2c31f2cf0..5b34fa3d519 100644
--- a/src/items/held-items/baton.ts
+++ b/src/items/held-items/baton.ts
@@ -1,6 +1,6 @@
 import type Pokemon from "#app/field/pokemon";
 import type { NumberHolder } from "#app/utils/common";
-import { HeldItemEffect, HeldItem } from "../held-item";
+import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface BatonParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/bypass-speed-chance.ts b/src/items/held-items/bypass-speed-chance.ts
index c99f1022114..99bc861dc3e 100644
--- a/src/items/held-items/bypass-speed-chance.ts
+++ b/src/items/held-items/bypass-speed-chance.ts
@@ -1,10 +1,10 @@
 import type Pokemon from "#app/field/pokemon";
-import { HeldItemEffect, HeldItem } from "#app/items/held-item";
-import type { BooleanHolder } from "#app/utils/common";
 import { globalScene } from "#app/global-scene";
-import i18next from "i18next";
+import { HeldItem, HeldItemEffect } from "#app/items/held-item";
 import { getPokemonNameWithAffix } from "#app/messages";
+import type { BooleanHolder } from "#app/utils/common";
 import { Command } from "#enums/command";
+import i18next from "i18next";
 
 export interface BypassSpeedChanceParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/crit-booster.ts b/src/items/held-items/crit-booster.ts
index 10bf5f0b1dd..53698a2b26d 100644
--- a/src/items/held-items/crit-booster.ts
+++ b/src/items/held-items/crit-booster.ts
@@ -2,7 +2,7 @@ import type Pokemon from "#app/field/pokemon";
 import type { NumberHolder } from "#app/utils/common";
 import type { HeldItemId } from "#enums/held-item-id";
 import type { SpeciesId } from "#enums/species-id";
-import { HeldItemEffect, HeldItem } from "../held-item";
+import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface CritBoostParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/damage-money-reward.ts b/src/items/held-items/damage-money-reward.ts
index cd97c61938f..5f00a751b78 100644
--- a/src/items/held-items/damage-money-reward.ts
+++ b/src/items/held-items/damage-money-reward.ts
@@ -1,7 +1,7 @@
 import type Pokemon from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
 import { NumberHolder } from "#app/utils/common";
-import { HeldItemEffect, HeldItem } from "../held-item";
+import { HeldItem, HeldItemEffect } from "../held-item";
 import { TrainerItemEffect } from "../trainer-item";
 
 export interface DamageMoneyRewardParams {
diff --git a/src/items/held-items/evo-tracker.ts b/src/items/held-items/evo-tracker.ts
index 9aa397bb421..4f2985a9e2f 100644
--- a/src/items/held-items/evo-tracker.ts
+++ b/src/items/held-items/evo-tracker.ts
@@ -2,9 +2,9 @@ import type Pokemon from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
 import { HeldItemId } from "#enums/held-item-id";
 import type { SpeciesId } from "#enums/species-id";
-import i18next from "i18next";
-import { HeldItemEffect, HeldItem } from "../held-item";
 import { TrainerItemId } from "#enums/trainer-item-id";
+import i18next from "i18next";
+import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface EvoTrackerParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/exp-booster.ts b/src/items/held-items/exp-booster.ts
index 4c38398e78b..98eed27392f 100644
--- a/src/items/held-items/exp-booster.ts
+++ b/src/items/held-items/exp-booster.ts
@@ -2,7 +2,7 @@ import type Pokemon from "#app/field/pokemon";
 import type { NumberHolder } from "#app/utils/common";
 import type { HeldItemId } from "#enums/held-item-id";
 import i18next from "i18next";
-import { HeldItemEffect, HeldItem } from "../held-item";
+import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface ExpBoostParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/field-effect.ts b/src/items/held-items/field-effect.ts
index 95ef5e0ab08..2b25a9d3ec7 100644
--- a/src/items/held-items/field-effect.ts
+++ b/src/items/held-items/field-effect.ts
@@ -1,5 +1,5 @@
 import type Pokemon from "#app/field/pokemon";
-import { HeldItemEffect, HeldItem } from "#app/items/held-item";
+import { HeldItem, HeldItemEffect } from "#app/items/held-item";
 import type { NumberHolder } from "#app/utils/common";
 
 export interface FieldEffectParams {
diff --git a/src/items/held-items/flinch-chance.ts b/src/items/held-items/flinch-chance.ts
index a8b65aa0db5..7a795226860 100644
--- a/src/items/held-items/flinch-chance.ts
+++ b/src/items/held-items/flinch-chance.ts
@@ -1,5 +1,5 @@
 import type Pokemon from "#app/field/pokemon";
-import { HeldItemEffect, HeldItem } from "#app/items/held-item";
+import { HeldItem, HeldItemEffect } from "#app/items/held-item";
 import type { BooleanHolder } from "#app/utils/common";
 import type { HeldItemId } from "#enums/held-item-id";
 
diff --git a/src/items/held-items/friendship-booster.ts b/src/items/held-items/friendship-booster.ts
index 5d187033fe6..3ad6e48e63e 100644
--- a/src/items/held-items/friendship-booster.ts
+++ b/src/items/held-items/friendship-booster.ts
@@ -1,7 +1,7 @@
 import type Pokemon from "#app/field/pokemon";
 import type { NumberHolder } from "#app/utils/common";
 import i18next from "i18next";
-import { HeldItemEffect, HeldItem } from "../held-item";
+import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface FriendshipBoostParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/hit-heal.ts b/src/items/held-items/hit-heal.ts
index 74e5168ee62..ede9f196ecb 100644
--- a/src/items/held-items/hit-heal.ts
+++ b/src/items/held-items/hit-heal.ts
@@ -1,10 +1,10 @@
 import type Pokemon from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
-import i18next from "i18next";
-import { HeldItemEffect, HeldItem } from "#app/items/held-item";
+import { HeldItem, HeldItemEffect } from "#app/items/held-item";
+import { getPokemonNameWithAffix } from "#app/messages";
 import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
 import { toDmgValue } from "#app/utils/common";
-import { getPokemonNameWithAffix } from "#app/messages";
+import i18next from "i18next";
 
 export interface HitHealParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/incrementing-stat.ts b/src/items/held-items/incrementing-stat.ts
index d95d2f81044..a29a2f2a877 100644
--- a/src/items/held-items/incrementing-stat.ts
+++ b/src/items/held-items/incrementing-stat.ts
@@ -1,8 +1,8 @@
 import type Pokemon from "#app/field/pokemon";
-import { HeldItemEffect, HeldItem } from "../held-item";
-import { Stat } from "#enums/stat";
 import type { NumberHolder } from "#app/utils/common";
+import { Stat } from "#enums/stat";
 import i18next from "i18next";
+import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface IncrementingStatParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/instant-revive.ts b/src/items/held-items/instant-revive.ts
index 765e3a611e5..dd97a28ccca 100644
--- a/src/items/held-items/instant-revive.ts
+++ b/src/items/held-items/instant-revive.ts
@@ -1,11 +1,11 @@
+import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs";
 import type Pokemon from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
-import i18next from "i18next";
-import { ConsumableHeldItem, HeldItemEffect } from "../held-item";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
 import { toDmgValue } from "#app/utils/common";
-import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs";
+import i18next from "i18next";
+import { ConsumableHeldItem, HeldItemEffect } from "../held-item";
 
 export interface InstantReviveParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/item-steal.ts b/src/items/held-items/item-steal.ts
index 02b46750ebd..68548a6c77a 100644
--- a/src/items/held-items/item-steal.ts
+++ b/src/items/held-items/item-steal.ts
@@ -1,11 +1,11 @@
+import { allHeldItems } from "#app/data/data-lists";
 import Pokemon from "#app/field/pokemon";
+import { globalScene } from "#app/global-scene";
+import { getPokemonNameWithAffix } from "#app/messages";
 import { randSeedFloat } from "#app/utils/common";
 import type { HeldItemId } from "#enums/held-item-id";
 import i18next from "i18next";
-import { HeldItemEffect, HeldItem } from "../held-item";
-import { getPokemonNameWithAffix } from "#app/messages";
-import { allHeldItems } from "#app/data/data-lists";
-import { globalScene } from "#app/global-scene";
+import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface ItemStealParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/multi-hit.ts b/src/items/held-items/multi-hit.ts
index d4773630739..3353c2b596b 100644
--- a/src/items/held-items/multi-hit.ts
+++ b/src/items/held-items/multi-hit.ts
@@ -1,8 +1,8 @@
+import { allMoves } from "#app/data/data-lists";
 import type Pokemon from "#app/field/pokemon";
-import { HeldItemEffect, HeldItem } from "#app/items/held-item";
+import { HeldItem, HeldItemEffect } from "#app/items/held-item";
 import { isNullOrUndefined, type NumberHolder } from "#app/utils/common";
 import type { MoveId } from "#enums/move-id";
-import { allMoves } from "#app/data/data-lists";
 import i18next from "i18next";
 
 export interface MultiHitParams {
diff --git a/src/items/held-items/nature-weight-booster.ts b/src/items/held-items/nature-weight-booster.ts
index f24646ee4ea..983c9173ab8 100644
--- a/src/items/held-items/nature-weight-booster.ts
+++ b/src/items/held-items/nature-weight-booster.ts
@@ -1,6 +1,6 @@
 import type Pokemon from "#app/field/pokemon";
 import type { NumberHolder } from "#app/utils/common";
-import { HeldItemEffect, HeldItem } from "../held-item";
+import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface NatureWeightBoostParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/reset-negative-stat-stage.ts b/src/items/held-items/reset-negative-stat-stage.ts
index fbda4a27e14..d0be04849be 100644
--- a/src/items/held-items/reset-negative-stat-stage.ts
+++ b/src/items/held-items/reset-negative-stat-stage.ts
@@ -1,9 +1,9 @@
 import type Pokemon from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
+import { getPokemonNameWithAffix } from "#app/messages";
 import { BATTLE_STATS } from "#enums/stat";
 import i18next from "i18next";
 import { ConsumableHeldItem, HeldItemEffect } from "../held-item";
-import { getPokemonNameWithAffix } from "#app/messages";
 
 export interface ResetNegativeStatStageParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/stat-booster.ts b/src/items/held-items/stat-booster.ts
index 43a655b364d..f64770ffce4 100644
--- a/src/items/held-items/stat-booster.ts
+++ b/src/items/held-items/stat-booster.ts
@@ -4,7 +4,7 @@ import type { NumberHolder } from "#app/utils/common";
 import { HeldItemId } from "#enums/held-item-id";
 import type { SpeciesId } from "#enums/species-id";
 import type { Stat } from "#enums/stat";
-import { HeldItemEffect, HeldItem } from "../held-item";
+import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface StatBoostParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/survive-chance.ts b/src/items/held-items/survive-chance.ts
index 2b9717163f3..d18247350fa 100644
--- a/src/items/held-items/survive-chance.ts
+++ b/src/items/held-items/survive-chance.ts
@@ -1,9 +1,9 @@
 import type Pokemon from "#app/field/pokemon";
-import { HeldItemEffect, HeldItem } from "#app/items/held-item";
-import type { BooleanHolder } from "#app/utils/common";
 import { globalScene } from "#app/global-scene";
-import i18next from "i18next";
+import { HeldItem, HeldItemEffect } from "#app/items/held-item";
 import { getPokemonNameWithAffix } from "#app/messages";
+import type { BooleanHolder } from "#app/utils/common";
+import i18next from "i18next";
 
 export interface SurviveChanceParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/turn-end-heal.ts b/src/items/held-items/turn-end-heal.ts
index f78f3e91d91..b2e267ffedd 100644
--- a/src/items/held-items/turn-end-heal.ts
+++ b/src/items/held-items/turn-end-heal.ts
@@ -1,10 +1,10 @@
 import type Pokemon from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
-import i18next from "i18next";
-import { HeldItemEffect, HeldItem } from "#app/items/held-item";
+import { HeldItem, HeldItemEffect } from "#app/items/held-item";
+import { getPokemonNameWithAffix } from "#app/messages";
 import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
 import { toDmgValue } from "#app/utils/common";
-import { getPokemonNameWithAffix } from "#app/messages";
+import i18next from "i18next";
 
 export interface TurnEndHealParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/turn-end-status.ts b/src/items/held-items/turn-end-status.ts
index ae6b9f6dffc..d346d54dca4 100644
--- a/src/items/held-items/turn-end-status.ts
+++ b/src/items/held-items/turn-end-status.ts
@@ -1,7 +1,7 @@
 import type Pokemon from "#app/field/pokemon";
-import { HeldItemEffect, HeldItem } from "#app/items/held-item";
-import type { StatusEffect } from "#enums/status-effect";
+import { HeldItem, HeldItemEffect } from "#app/items/held-item";
 import type { HeldItemId } from "#enums/held-item-id";
+import type { StatusEffect } from "#enums/status-effect";
 
 export interface TurnEndStatusParams {
   /** The pokemon with the item */
diff --git a/src/items/modifier-to-item-migrator-utils.ts b/src/items/modifier-to-item-migrator-utils.ts
index 0927099bac8..929c1229bb0 100644
--- a/src/items/modifier-to-item-migrator-utils.ts
+++ b/src/items/modifier-to-item-migrator-utils.ts
@@ -2,12 +2,12 @@ import type ModifierData from "#app/system/modifier-data";
 import type { BerryType } from "#enums/berry-type";
 import { HeldItemId } from "#enums/held-item-id";
 import type { PokemonType } from "#enums/pokemon-type";
-import { Stat, type PermanentStat } from "#enums/stat";
+import { SpeciesId } from "#enums/species-id";
+import { type PermanentStat, Stat } from "#enums/stat";
 import type { PokemonItemMap } from "./held-item-data-types";
 import { attackTypeToHeldItem } from "./held-items/attack-type-booster";
 import { permanentStatToHeldItem } from "./held-items/base-stat-booster";
 import { berryTypeToHeldItem } from "./held-items/berry";
-import { SpeciesId } from "#enums/species-id";
 
 const uniqueModifierToItem = {
   EvoTrackerModifier: HeldItemId.GIMMIGHOUL_EVO_TRACKER,
diff --git a/src/items/trainer-item-manager.ts b/src/items/trainer-item-manager.ts
index f8329ac6341..0bb49be2e12 100644
--- a/src/items/trainer-item-manager.ts
+++ b/src/items/trainer-item-manager.ts
@@ -2,9 +2,9 @@ import { allTrainerItems } from "#app/data/data-lists";
 import type { TrainerItemId } from "#app/enums/trainer-item-id";
 import {
   isTrainerItemSpecs,
-  type TrainerItemSaveData,
   type TrainerItemConfiguration,
   type TrainerItemDataMap,
+  type TrainerItemSaveData,
   type TrainerItemSpecs,
 } from "#app/items/trainer-item-data-types";
 import { getTypedEntries, getTypedKeys } from "#app/utils/common";
diff --git a/src/items/trainer-item-pool.ts b/src/items/trainer-item-pool.ts
index 72e38d4750b..12fecd88eaf 100644
--- a/src/items/trainer-item-pool.ts
+++ b/src/items/trainer-item-pool.ts
@@ -1,8 +1,8 @@
+import { allTrainerItems } from "#app/data/data-lists";
 import { globalScene } from "#app/global-scene";
 import { isNullOrUndefined, pickWeightedIndex } from "#app/utils/common";
 import { RewardTier } from "#enums/reward-tier";
 import type { TrainerItemId } from "#enums/trainer-item-id";
-import { allTrainerItems } from "#app/data/data-lists";
 import type { TrainerItemPool, TrainerItemTieredPool } from "./trainer-item-data-types";
 import type { TrainerItemManager } from "./trainer-item-manager";
 
diff --git a/src/items/trainer-item.ts b/src/items/trainer-item.ts
index bc7ce86644a..4858809db55 100644
--- a/src/items/trainer-item.ts
+++ b/src/items/trainer-item.ts
@@ -1,15 +1,15 @@
+import { getStatusEffectDescriptor, getStatusEffectHealText } from "#app/data/status-effect";
 import type Pokemon from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
-import { hslToHex, randSeedFloat, toDmgValue, type BooleanHolder, type NumberHolder } from "#app/utils/common";
+import { getPokemonNameWithAffix } from "#app/messages";
+import { addTextObject, TextStyle } from "#app/ui/text";
+import { type BooleanHolder, hslToHex, type NumberHolder, randSeedFloat, toDmgValue } from "#app/utils/common";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { getStatKey, Stat, type TempBattleStat } from "#enums/stat";
+import { StatusEffect } from "#enums/status-effect";
 import { TrainerItemId, TrainerItemNames } from "#enums/trainer-item-id";
 import i18next from "i18next";
 import type { TrainerItemManager } from "./trainer-item-manager";
-import { addTextObject, TextStyle } from "#app/ui/text";
-import { getStatKey, Stat, type TempBattleStat } from "#enums/stat";
-import { BattlerTagType } from "#enums/battler-tag-type";
-import { getStatusEffectDescriptor, getStatusEffectHealText } from "#app/data/status-effect";
-import { getPokemonNameWithAffix } from "#app/messages";
-import { StatusEffect } from "#enums/status-effect";
 
 export const TrainerItemEffect = {
   LEVEL_INCREMENT_BOOSTER: 1,
diff --git a/src/phases/reward-phase.ts b/src/phases/reward-phase.ts
index 65a301cb1f2..3c490f6c9cb 100644
--- a/src/phases/reward-phase.ts
+++ b/src/phases/reward-phase.ts
@@ -1,6 +1,6 @@
-import { globalScene } from "#app/global-scene";
-import { TrainerItemReward, type ModifierType } from "#app/modifier/modifier-type";
 import type { ModifierTypeFunc } from "#app/@types/modifier-types";
+import { globalScene } from "#app/global-scene";
+import { type ModifierType, TrainerItemReward } from "#app/modifier/modifier-type";
 import { getModifierType } from "#app/utils/modifier-utils";
 import i18next from "i18next";
 import { BattlePhase } from "./battle-phase";
diff --git a/test/items/multi_lens.test.ts b/test/items/multi_lens.test.ts
index de786555d90..96e38dce1fd 100644
--- a/test/items/multi_lens.test.ts
+++ b/test/items/multi_lens.test.ts
@@ -1,12 +1,12 @@
 import { AbilityId } from "#enums/ability-id";
 import { BattlerIndex } from "#enums/battler-index";
+import { HeldItemId } from "#enums/held-item-id";
 import { MoveId } from "#enums/move-id";
 import { SpeciesId } from "#enums/species-id";
 import { Stat } from "#enums/stat";
 import { GameManager } from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { HeldItemId } from "#enums/held-item-id";
 
 describe("Items - Multi Lens", () => {
   let phaserGame: Phaser.Game;
diff --git a/test/items/mystical_rock.test.ts b/test/items/mystical_rock.test.ts
index 2ca842a54b9..164feeed444 100644
--- a/test/items/mystical_rock.test.ts
+++ b/test/items/mystical_rock.test.ts
@@ -1,11 +1,11 @@
 import { globalScene } from "#app/global-scene";
 import { AbilityId } from "#enums/ability-id";
+import { HeldItemId } from "#enums/held-item-id";
 import { MoveId } from "#enums/move-id";
 import { SpeciesId } from "#enums/species-id";
 import { GameManager } from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { HeldItemId } from "#enums/held-item-id";
 
 describe("Items - Mystical Rock", () => {
   let phaserGame: Phaser.Game;
diff --git a/test/moves/ceaseless_edge.test.ts b/test/moves/ceaseless_edge.test.ts
index f98b3345d46..ca2009cb21a 100644
--- a/test/moves/ceaseless_edge.test.ts
+++ b/test/moves/ceaseless_edge.test.ts
@@ -3,6 +3,7 @@ import { allMoves } from "#data/data-lists";
 import { AbilityId } from "#enums/ability-id";
 import { ArenaTagSide } from "#enums/arena-tag-side";
 import { ArenaTagType } from "#enums/arena-tag-type";
+import { HeldItemId } from "#enums/held-item-id";
 import { MoveId } from "#enums/move-id";
 import { SpeciesId } from "#enums/species-id";
 import { MoveEffectPhase } from "#phases/move-effect-phase";
@@ -10,7 +11,6 @@ import { TurnEndPhase } from "#phases/turn-end-phase";
 import { GameManager } from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
-import { HeldItemId } from "#enums/held-item-id";
 
 describe("Moves - Ceaseless Edge", () => {
   let phaserGame: Phaser.Game;
diff --git a/test/moves/dragon_tail.test.ts b/test/moves/dragon_tail.test.ts
index 0ea3ba373b4..b1ee9c5e3bb 100644
--- a/test/moves/dragon_tail.test.ts
+++ b/test/moves/dragon_tail.test.ts
@@ -3,6 +3,7 @@ import { Status } from "#data/status-effect";
 import { AbilityId } from "#enums/ability-id";
 import { BattlerIndex } from "#enums/battler-index";
 import { Challenges } from "#enums/challenges";
+import { HeldItemId } from "#enums/held-item-id";
 import { MoveId } from "#enums/move-id";
 import { PokemonType } from "#enums/pokemon-type";
 import { SpeciesId } from "#enums/species-id";
@@ -10,7 +11,6 @@ import { StatusEffect } from "#enums/status-effect";
 import { GameManager } from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { HeldItemId } from "#enums/held-item-id";
 
 describe("Moves - Dragon Tail", () => {
   let phaserGame: Phaser.Game;
diff --git a/test/moves/heal_block.test.ts b/test/moves/heal_block.test.ts
index 9e2af554323..661720e7a4d 100644
--- a/test/moves/heal_block.test.ts
+++ b/test/moves/heal_block.test.ts
@@ -3,13 +3,13 @@ import { ArenaTagSide } from "#enums/arena-tag-side";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattlerIndex } from "#enums/battler-index";
 import { BattlerTagType } from "#enums/battler-tag-type";
+import { HeldItemId } from "#enums/held-item-id";
 import { MoveId } from "#enums/move-id";
 import { SpeciesId } from "#enums/species-id";
 import { WeatherType } from "#enums/weather-type";
 import { GameManager } from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { HeldItemId } from "#enums/held-item-id";
 
 // Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Heal_Block_(move)
 describe("Moves - Heal Block", () => {
diff --git a/test/testUtils/helpers/overridesHelper.ts b/test/testUtils/helpers/overridesHelper.ts
index e50d892484b..44ae5ef163d 100644
--- a/test/testUtils/helpers/overridesHelper.ts
+++ b/test/testUtils/helpers/overridesHelper.ts
@@ -2,6 +2,8 @@
 import type { NewArenaEvent } from "#events/battle-scene";
 /** biome-ignore-end lint/correctness/noUnusedImports: tsdoc imports */
 
+import type { HeldItemConfiguration } from "#app/items/held-item-data-types";
+import type { TrainerItemConfiguration } from "#app/items/trainer-item-data-types";
 import type { BattleStyle, RandomTrainerOverride } from "#app/overrides";
 import Overrides, { defaultOverrides } from "#app/overrides";
 import { AbilityId } from "#enums/ability-id";
@@ -20,8 +22,6 @@ import type { Variant } from "#sprites/variant";
 import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper";
 import { coerceArray, shiftCharCodes } from "#utils/common";
 import { expect, vi } from "vitest";
-import type { HeldItemConfiguration } from "#app/items/held-item-data-types";
-import type { TrainerItemConfiguration } from "#app/items/trainer-item-data-types";
 
 /**
  * Helper to handle overrides in tests