Create and apply #items import alias

src/@types/trainer-funcs.ts

@@ -1,7 +1,7 @@
-import type { TrainerItemConfiguration } from "#app/items/trainer-item-data-types";
 import type { PartyMemberStrength } from "#enums/party-member-strength";
 import type { SpeciesId } from "#enums/species-id";
 import type { EnemyPokemon } from "#field/pokemon";
+import type { TrainerItemConfiguration } from "#items/trainer-item-data-types";
 import type { TrainerPartyTemplate } from "#trainers/TrainerPartyTemplate";
 import type { TrainerConfig } from "#trainers/trainer-config";
 

src/battle-scene.ts

@@ -13,20 +13,6 @@ import { timedEventManager } from "#app/global-event-manager";
 import { initGlobalScene } from "#app/global-scene";
 import { starterColors } from "#app/global-vars/starter-colors";
 import { InputsController } from "#app/inputs-controller";
-import { applyHeldItems } from "#app/items/all-held-items";
-import { type ApplyTrainerItemsParams, applyTrainerItems } from "#app/items/apply-trainer-items";
-import { HeldItemEffect } from "#app/items/held-item";
-import type { HeldItemConfiguration } from "#app/items/held-item-data-types";
-import { assignEnemyHeldItemsForWave, assignItemsFromConfiguration } from "#app/items/held-item-pool";
-import { type EnemyAttackStatusEffectChanceTrainerItem, TrainerItemEffect } from "#app/items/trainer-item";
-import {
-  isTrainerItemPool,
-  isTrainerItemSpecs,
-  type TrainerItemConfiguration,
-  type TrainerItemSaveData,
-} from "#app/items/trainer-item-data-types";
-import { TrainerItemManager } from "#app/items/trainer-item-manager";
-import { getNewTrainerItemFromPool } from "#app/items/trainer-item-pool";
 import { LoadingScene } from "#app/loading-scene";
 import Overrides from "#app/overrides";
 import type { Phase } from "#app/phase";
@@ -94,6 +80,20 @@ import type { Pokemon } from "#field/pokemon";
 import { EnemyPokemon, PlayerPokemon } from "#field/pokemon";
 import { PokemonSpriteSparkleHandler } from "#field/pokemon-sprite-sparkle-handler";
 import { Trainer } from "#field/trainer";
+import { applyHeldItems } from "#items/all-held-items";
+import { type ApplyTrainerItemsParams, applyTrainerItems } from "#items/apply-trainer-items";
+import { HeldItemEffect } from "#items/held-item";
+import type { HeldItemConfiguration } from "#items/held-item-data-types";
+import { assignEnemyHeldItemsForWave, assignItemsFromConfiguration } from "#items/held-item-pool";
+import { type EnemyAttackStatusEffectChanceTrainerItem, TrainerItemEffect } from "#items/trainer-item";
+import {
+  isTrainerItemPool,
+  isTrainerItemSpecs,
+  type TrainerItemConfiguration,
+  type TrainerItemSaveData,
+} from "#items/trainer-item-data-types";
+import { TrainerItemManager } from "#items/trainer-item-manager";
+import { getNewTrainerItemFromPool } from "#items/trainer-item-pool";
 import type { Modifier } from "#modifiers/modifier";
 import {
   ConsumableModifier,

src/battle.ts

@@ -1,6 +1,5 @@
 import type { GameMode } from "#app/game-mode";
 import { globalScene } from "#app/global-scene";
-import { TrainerItemEffect } from "#app/items/trainer-item";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattleSpec } from "#enums/battle-spec";
 import { BattleType } from "#enums/battle-type";
@@ -20,6 +19,7 @@ import { TrainerType } from "#enums/trainer-type";
 import { TrainerVariant } from "#enums/trainer-variant";
 import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon";
 import { Trainer } from "#field/trainer";
+import { TrainerItemEffect } from "#items/trainer-item";
 import type { CustomModifierSettings } from "#modifiers/modifier-type";
 import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter";
 import i18next from "#plugins/i18n";

src/data/abilities/ability.ts

@@ -5,7 +5,6 @@ import type { SpeciesFormChangeRevertWeatherFormTrigger } from "#data/form-chang
 
 import { applyAbAttrs } from "#abilities/apply-ab-attrs";
 import { globalScene } from "#app/global-scene";
-import { type BerryHeldItem, berryTypeToHeldItem } from "#app/items/held-items/berry";
 import { getPokemonNameWithAffix } from "#app/messages";
 import type { ArenaTrapTag, SuppressAbilitiesTag } from "#data/arena-tag";
 import type { BattlerTag } from "#data/battler-tags";
@@ -47,6 +46,7 @@ import { SwitchType } from "#enums/switch-type";
 import { WeatherType } from "#enums/weather-type";
 import { BerryUsedEvent } from "#events/battle-scene";
 import type { EnemyPokemon, Pokemon } from "#field/pokemon";
+import { type BerryHeldItem, berryTypeToHeldItem } from "#items/berry";
 import { applyMoveAttrs } from "#moves/apply-attrs";
 import { noAbilityTypeOverrideMoves } from "#moves/invalid-moves";
 import type { Move } from "#moves/move";

src/data/data-lists.ts

@@ -1,9 +1,9 @@
 import type { Ability } from "#abilities/ability";
-import type { HeldItem } from "#app/items/held-item";
-import type { TrainerItem } from "#app/items/trainer-item";
 import type { PokemonSpecies } from "#data/pokemon-species";
 import type { HeldItemId } from "#enums/held-item-id";
 import type { TrainerItemId } from "#enums/trainer-item-id";
+import type { HeldItem } from "#items/held-item";
+import type { TrainerItem } from "#items/trainer-item";
 import type { ModifierTypes } from "#modifiers/modifier-type";
 import type { Move } from "#moves/move";
 

src/data/moves/move.ts

@@ -5,10 +5,6 @@ import {
 import { loggedInUser } from "#app/account";
 import type { GameMode } from "#app/game-mode";
 import { globalScene } from "#app/global-scene";
-import { applyHeldItems } from "#app/items/all-held-items";
-import { HeldItemEffect } from "#app/items/held-item";
-import { berryTypeToHeldItem, BerryHeldItem } from "#app/items/held-items/berry";
-import { TrainerItemEffect } from "#app/items/trainer-item";
 import { getPokemonNameWithAffix } from "#app/messages";
 import type { ArenaTrapTag } from "#data/arena-tag";
 import { WeakenMoveTypeTag } from "#data/arena-tag";
@@ -46,7 +42,7 @@ import { BiomeId } from "#enums/biome-id";
 import { ChallengeType } from "#enums/challenge-type";
 import { Command } from "#enums/command";
 import { FieldPosition } from "#enums/field-position";
-import { HeldItemId, isItemInCategory, HeldItemCategoryId } from "#enums/held-item-id";
+import { HeldItemCategoryId, HeldItemId, isItemInCategory } from "#enums/held-item-id";
 import { HitResult } from "#enums/hit-result";
 import { ChargeAnim } from "#enums/move-anims-common";
 import { MoveId } from "#enums/move-id";
@@ -71,6 +67,10 @@ import { SwitchType } from "#enums/switch-type";
 import { WeatherType } from "#enums/weather-type";
 import { MoveUsedEvent } from "#events/battle-scene";
 import type { EnemyPokemon, Pokemon } from "#field/pokemon";
+import { applyHeldItems } from "#items/all-held-items";
+import { BerryHeldItem, berryTypeToHeldItem } from "#items/berry";
+import { HeldItemEffect } from "#items/held-item";
+import { TrainerItemEffect } from "#items/trainer-item";
 import { applyMoveAttrs } from "#moves/apply-attrs";
 import { invalidAssistMoves, invalidCopycatMoves, invalidMetronomeMoves, invalidMirrorMoveMoves, invalidSketchMoves, invalidSleepTalkMoves } from "#moves/invalid-moves";
 import { frenzyMissFunc, getMoveTargets } from "#moves/move-utils";

src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts

@@ -1,5 +1,4 @@
 import { globalScene } from "#app/global-scene";
-import type { HeldItemConfiguration, PokemonItemMap } from "#app/items/held-item-data-types";
 import { allHeldItems } from "#data/data-lists";
 import { BattlerIndex } from "#enums/battler-index";
 import { BattlerTagType } from "#enums/battler-tag-type";
@@ -16,6 +15,7 @@ import { TrainerSlot } from "#enums/trainer-slot";
 import type { MysteryEncounterSpriteConfig } from "#field/mystery-encounter-intro";
 import type { Pokemon } from "#field/pokemon";
 import { EnemyPokemon } from "#field/pokemon";
+import type { HeldItemConfiguration, PokemonItemMap } from "#items/held-item-data-types";
 import { PokemonMove } from "#moves/pokemon-move";
 import { queueEncounterMessage } from "#mystery-encounters/encounter-dialogue-utils";
 import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils";

src/data/mystery-encounters/encounters/berries-abound-encounter.ts

@@ -1,6 +1,5 @@
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { globalScene } from "#app/global-scene";
-import { berryTypeToHeldItem } from "#app/items/held-items/berry";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { modifierTypes } from "#data/data-lists";
 import { BattlerTagType } from "#enums/battler-tag-type";
@@ -11,6 +10,7 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { PERMANENT_STATS, Stat } from "#enums/stat";
 import type { PlayerPokemon, Pokemon } from "#field/pokemon";
+import { berryTypeToHeldItem } from "#items/berry";
 import type { ModifierTypeOption } from "#modifiers/modifier-type";
 import { regenerateModifierPoolThresholds } from "#modifiers/modifier-type";
 import { queueEncounterMessage, showEncounterText } from "#mystery-encounters/encounter-dialogue-utils";

src/data/mystery-encounters/encounters/clowning-around-encounter.ts

@@ -1,7 +1,5 @@
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { globalScene } from "#app/global-scene";
-import { assignItemsFromConfiguration } from "#app/items/held-item-pool";
-import { getHeldItemTier } from "#app/items/held-item-tiers";
 import { EncounterBattleAnim } from "#data/battle-anims";
 import { allAbilities } from "#data/data-lists";
 import { CustomPokemonData } from "#data/pokemon-data";
@@ -23,6 +21,8 @@ import { SpeciesId } from "#enums/species-id";
 import { TrainerType } from "#enums/trainer-type";
 import { UiMode } from "#enums/ui-mode";
 import type { PlayerPokemon } from "#field/pokemon";
+import { assignItemsFromConfiguration } from "#items/held-item-pool";
+import { getHeldItemTier } from "#items/held-item-tiers";
 import { PokemonMove } from "#moves/pokemon-move";
 import { showEncounterDialogue, showEncounterText } from "#mystery-encounters/encounter-dialogue-utils";
 import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils";

src/data/mystery-encounters/encounters/dark-deal-encounter.ts

@@ -1,6 +1,5 @@
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { globalScene } from "#app/global-scene";
-import type { HeldItemConfiguration } from "#app/items/held-item-data-types";
 import { modifierTypes } from "#data/data-lists";
 import { Challenges } from "#enums/challenges";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
@@ -8,6 +7,7 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import type { PokemonType } from "#enums/pokemon-type";
 import { SpeciesId } from "#enums/species-id";
+import type { HeldItemConfiguration } from "#items/held-item-data-types";
 import type { EnemyPartyConfig, EnemyPokemonConfig } from "#mystery-encounters/encounter-phase-utils";
 import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle } from "#mystery-encounters/encounter-phase-utils";
 import { getRandomPlayerPokemon, getRandomSpeciesByStarterCost } from "#mystery-encounters/encounter-pokemon-utils";

src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts

@@ -1,6 +1,5 @@
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { globalScene } from "#app/global-scene";
-import { getNewHeldItemFromCategory } from "#app/items/held-item-pool";
 import { EncounterBattleAnim } from "#data/battle-anims";
 import { allAbilities, allHeldItems } from "#data/data-lists";
 import { Gender } from "#data/gender";
@@ -20,6 +19,7 @@ import { Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
 import { WeatherType } from "#enums/weather-type";
 import type { Pokemon } from "#field/pokemon";
+import { getNewHeldItemFromCategory } from "#items/held-item-pool";
 import { PokemonMove } from "#moves/pokemon-move";
 import { queueEncounterMessage } from "#mystery-encounters/encounter-dialogue-utils";
 import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils";

src/data/mystery-encounters/encounters/global-trade-system-encounter.ts

@@ -1,8 +1,6 @@
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { timedEventManager } from "#app/global-event-manager";
 import { globalScene } from "#app/global-scene";
-import { getHeldItemTier } from "#app/items/held-item-tiers";
-import { TrainerItemEffect } from "#app/items/trainer-item";
 import { allHeldItems, allSpecies } from "#data/data-lists";
 import { Gender, getGenderSymbol } from "#data/gender";
 import { getNatureName } from "#data/nature";
@@ -22,6 +20,8 @@ import { TrainerType } from "#enums/trainer-type";
 import { doShinySparkleAnim } from "#field/anims";
 import type { PlayerPokemon, Pokemon } from "#field/pokemon";
 import { EnemyPokemon } from "#field/pokemon";
+import { getHeldItemTier } from "#items/held-item-tiers";
+import { TrainerItemEffect } from "#items/trainer-item";
 import type { ModifierTypeOption } from "#modifiers/modifier-type";
 import { getPlayerModifierTypeOptions, regenerateModifierPoolThresholds } from "#modifiers/modifier-type";
 import { PokemonMove } from "#moves/pokemon-move";

src/data/mystery-encounters/encounters/safari-zone-encounter.ts

@@ -1,6 +1,5 @@
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { globalScene } from "#app/global-scene";
-import { TrainerItemEffect } from "#app/items/trainer-item";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { NON_LEGEND_PARADOX_POKEMON } from "#balance/special-species-groups";
 import type { PokemonSpecies } from "#data/pokemon-species";
@@ -12,6 +11,7 @@ import { PokeballType } from "#enums/pokeball";
 import { TrainerItemId } from "#enums/trainer-item-id";
 import { TrainerSlot } from "#enums/trainer-slot";
 import type { EnemyPokemon } from "#field/pokemon";
+import { TrainerItemEffect } from "#items/trainer-item";
 import { getEncounterText, showEncounterText } from "#mystery-encounters/encounter-dialogue-utils";
 import {
   initSubsequentOptionSelect,

src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts

@@ -1,7 +1,6 @@
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { allHeldItems } from "#app/data/data-lists";
 import { globalScene } from "#app/global-scene";
-import { getNewVitaminHeldItem } from "#app/items/held-item-pool";
 import { getNatureName } from "#data/nature";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
@@ -9,6 +8,7 @@ import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import type { Nature } from "#enums/nature";
 import { SpeciesId } from "#enums/species-id";
 import type { PlayerPokemon, Pokemon } from "#field/pokemon";
+import { getNewVitaminHeldItem } from "#items/held-item-pool";
 import { getEncounterText, queueEncounterMessage } from "#mystery-encounters/encounter-dialogue-utils";
 import {
   leaveEncounterWithoutBattle,

src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts

@@ -1,6 +1,5 @@
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { globalScene } from "#app/global-scene";
-import type { PokemonItemMap } from "#app/items/held-item-data-types";
 import { BattlerIndex } from "#enums/battler-index";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { HeldItemCategoryId, type HeldItemId } from "#enums/held-item-id";
@@ -12,6 +11,7 @@ import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { PokeballType } from "#enums/pokeball";
 import { Stat } from "#enums/stat";
 import type { EnemyPokemon, Pokemon } from "#field/pokemon";
+import type { PokemonItemMap } from "#items/held-item-data-types";
 import { PokemonMove } from "#moves/pokemon-move";
 import { queueEncounterMessage } from "#mystery-encounters/encounter-dialogue-utils";
 import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils";

src/data/mystery-encounters/encounters/weird-dream-encounter.ts

@@ -1,6 +1,4 @@
 import { globalScene } from "#app/global-scene";
-import type { HeldItemConfiguration } from "#app/items/held-item-data-types";
-import { TrainerItemEffect } from "#app/items/trainer-item";
 import { allSpecies, modifierTypes } from "#data/data-lists";
 import { getLevelTotalExp } from "#data/exp";
 import type { PokemonSpecies } from "#data/pokemon-species";
@@ -17,6 +15,8 @@ import { RewardTier } from "#enums/reward-tier";
 import { SpeciesId } from "#enums/species-id";
 import { TrainerType } from "#enums/trainer-type";
 import type { PlayerPokemon, Pokemon } from "#field/pokemon";
+import type { HeldItemConfiguration } from "#items/held-item-data-types";
+import { TrainerItemEffect } from "#items/trainer-item";
 import { PokemonMove } from "#moves/pokemon-move";
 import { showEncounterText } from "#mystery-encounters/encounter-dialogue-utils";
 import type { EnemyPartyConfig, EnemyPokemonConfig } from "#mystery-encounters/encounter-phase-utils";

src/data/mystery-encounters/utils/encounter-phase-utils.ts

@@ -2,7 +2,6 @@ import type { Battle } from "#app/battle";
 import { AVERAGE_ENCOUNTERS_PER_RUN_TARGET, WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/constants";
 import { timedEventManager } from "#app/global-event-manager";
 import { globalScene } from "#app/global-scene";
-import type { HeldItemConfiguration, PokemonItemMap } from "#app/items/held-item-data-types";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { BiomePoolTier, biomeLinks } from "#balance/biomes";
 import { initMoveAnim, loadMoveAnimAssets } from "#data/battle-anims";
@@ -32,6 +31,7 @@ import { UiMode } from "#enums/ui-mode";
 import type { PlayerPokemon, Pokemon } from "#field/pokemon";
 import { EnemyPokemon } from "#field/pokemon";
 import { Trainer } from "#field/trainer";
+import type { HeldItemConfiguration, PokemonItemMap } from "#items/held-item-data-types";
 import type { CustomModifierSettings, ModifierType } from "#modifiers/modifier-type";
 import { getPartyLuckValue, ModifierTypeGenerator, ModifierTypeOption } from "#modifiers/modifier-type";
 import { PokemonMove } from "#moves/pokemon-move";

src/data/pokeball.ts

@@ -1,6 +1,6 @@
 import { globalScene } from "#app/global-scene";
-import { TrainerItemEffect } from "#app/items/trainer-item";
 import { PokeballType } from "#enums/pokeball";
+import { TrainerItemEffect } from "#items/trainer-item";
 import { NumberHolder } from "#utils/common";
 import i18next from "i18next";
 

src/field/arena.ts

@@ -1,7 +1,5 @@
 import { applyAbAttrs } from "#abilities/apply-ab-attrs";
 import { globalScene } from "#app/global-scene";
-import { applyHeldItems } from "#app/items/all-held-items";
-import { HeldItemEffect } from "#app/items/held-item";
 import Overrides from "#app/overrides";
 import type { BiomeTierTrainerPools, PokemonPools } from "#balance/biomes";
 import { BiomePoolTier, biomePokemonPools, biomeTrainerPools } from "#balance/biomes";
@@ -30,6 +28,8 @@ import { TrainerType } from "#enums/trainer-type";
 import { WeatherType } from "#enums/weather-type";
 import { TagAddedEvent, TagRemovedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#events/arena";
 import type { Pokemon } from "#field/pokemon";
+import { applyHeldItems } from "#items/all-held-items";
+import { HeldItemEffect } from "#items/held-item";
 import type { Move } from "#moves/move";
 import { type Constructor, isNullOrUndefined, NumberHolder, randSeedInt } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";

src/field/pokemon-held-item-manager.ts

@@ -6,6 +6,8 @@ import {
   isItemInCategory,
   isItemInRequested,
 } from "#app/enums/held-item-id";
+import { getTypedEntries, getTypedKeys } from "#app/utils/common";
+import type { FormChangeItem } from "#enums/form-change-item";
 import {
   type FormChangeItemPropertyMap,
   type FormChangeItemSpecs,
@@ -14,9 +16,7 @@ import {
   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";
+} from "#items/held-item-data-types";
 
 export class PokemonItemManager {
   public heldItems: HeldItemDataMap;

src/field/pokemon.ts

@@ -4,11 +4,6 @@ import type { AnySound, BattleScene } from "#app/battle-scene";
 import { PLAYER_PARTY_MAX_SIZE } from "#app/constants";
 import { timedEventManager } from "#app/global-event-manager";
 import { globalScene } from "#app/global-scene";
-import { applyHeldItems } from "#app/items/all-held-items";
-import { HeldItemEffect } from "#app/items/held-item";
-import type { HeldItemConfiguration } from "#app/items/held-item-data-types";
-import { assignItemsFromConfiguration } from "#app/items/held-item-pool";
-import { TrainerItemEffect } from "#app/items/trainer-item";
 import { getPokemonNameWithAffix } from "#app/messages";
 import Overrides from "#app/overrides";
 import { speciesEggMoves } from "#balance/egg-moves";
@@ -116,6 +111,11 @@ import { UiMode } from "#enums/ui-mode";
 import { WeatherType } from "#enums/weather-type";
 import { doShinySparkleAnim } from "#field/anims";
 import { PokemonItemManager } from "#field/pokemon-held-item-manager";
+import { applyHeldItems } from "#items/all-held-items";
+import { HeldItemEffect } from "#items/held-item";
+import type { HeldItemConfiguration } from "#items/held-item-data-types";
+import { assignItemsFromConfiguration } from "#items/held-item-pool";
+import { TrainerItemEffect } from "#items/trainer-item";
 import { applyMoveAttrs } from "#moves/apply-attrs";
 import type { Move } from "#moves/move";
 import { getMoveTargets } from "#moves/move-utils";

src/field/trainer.ts

@@ -1,5 +1,4 @@
 import { globalScene } from "#app/global-scene";
-import type { TrainerItemConfiguration } from "#app/items/trainer-item-data-types";
 import { pokemonPrevolutions } from "#balance/pokemon-evolutions";
 import { signatureSpecies } from "#balance/signature-species";
 import { ArenaTrapTag } from "#data/arena-tag";
@@ -13,6 +12,7 @@ import { TrainerSlot } from "#enums/trainer-slot";
 import { TrainerType } from "#enums/trainer-type";
 import { TrainerVariant } from "#enums/trainer-variant";
 import type { EnemyPokemon } from "#field/pokemon";
+import type { TrainerItemConfiguration } from "#items/trainer-item-data-types";
 import { getIsInitialized, initI18n } from "#plugins/i18n";
 import type { TrainerPartyTemplate } from "#trainers/TrainerPartyTemplate";
 import { TrainerPartyCompoundTemplate, trainerPartyTemplates } from "#trainers/TrainerPartyTemplate";

src/items/held-items/attack-type-booster.ts

@@ -1,8 +1,8 @@
 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 { HeldItem, HeldItemEffect } from "#items/held-item";
 import i18next from "i18next";
 
 export interface AttackTypeBoostParams {

src/items/held-items/berry.ts

@@ -2,10 +2,10 @@ import { getBerryEffectDescription, getBerryEffectFunc, getBerryName, getBerryPr
 import { BerryUsedEvent } from "#app/events/battle-scene";
 import type Pokemon from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
-import { ConsumableHeldItem, HeldItemEffect } from "#app/items/held-item";
 import { BooleanHolder } from "#app/utils/common";
 import { BerryType } from "#enums/berry-type";
 import { HeldItemId } from "#enums/held-item-id";
+import { ConsumableHeldItem, HeldItemEffect } from "#items/held-item";
 import { TrainerItemEffect } from "../trainer-item";
 
 interface BerryTypeToHeldItemMap {

src/items/held-items/bypass-speed-chance.ts

@@ -1,9 +1,9 @@
 import type Pokemon from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
-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 { HeldItem, HeldItemEffect } from "#items/held-item";
 import i18next from "i18next";
 
 export interface BypassSpeedChanceParams {

src/items/held-items/field-effect.ts

@@ -1,6 +1,6 @@
 import type Pokemon from "#app/field/pokemon";
-import { HeldItem, HeldItemEffect } from "#app/items/held-item";
 import type { NumberHolder } from "#app/utils/common";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 
 export interface FieldEffectParams {
   pokemon: Pokemon;

src/items/held-items/flinch-chance.ts

@@ -1,7 +1,7 @@
 import type Pokemon from "#app/field/pokemon";
-import { HeldItem, HeldItemEffect } from "#app/items/held-item";
 import type { BooleanHolder } from "#app/utils/common";
 import type { HeldItemId } from "#enums/held-item-id";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 
 export interface FlinchChanceParams {
   /** The pokemon with the item */

src/items/held-items/hit-heal.ts

@@ -1,9 +1,9 @@
 import type Pokemon from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
-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 { HeldItem, HeldItemEffect } from "#items/held-item";
 import i18next from "i18next";
 
 export interface HitHealParams {

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 { HeldItem, HeldItemEffect } from "#app/items/held-item";
 import { isNullOrUndefined, type NumberHolder } from "#app/utils/common";
 import type { MoveId } from "#enums/move-id";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 import i18next from "i18next";
 
 export interface MultiHitParams {

src/items/held-items/survive-chance.ts

@@ -1,8 +1,8 @@
 import type Pokemon from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
-import { HeldItem, HeldItemEffect } from "#app/items/held-item";
 import { getPokemonNameWithAffix } from "#app/messages";
 import type { BooleanHolder } from "#app/utils/common";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 import i18next from "i18next";
 
 export interface SurviveChanceParams {

src/items/held-items/turn-end-heal.ts

@@ -1,9 +1,9 @@
 import type Pokemon from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
-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 { HeldItem, HeldItemEffect } from "#items/held-item";
 import i18next from "i18next";
 
 export interface TurnEndHealParams {

src/items/held-items/turn-end-status.ts

@@ -1,7 +1,7 @@
 import type Pokemon from "#app/field/pokemon";
-import { HeldItem, HeldItemEffect } from "#app/items/held-item";
 import type { HeldItemId } from "#enums/held-item-id";
 import type { StatusEffect } from "#enums/status-effect";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 
 export interface TurnEndStatusParams {
   /** The pokemon with the item */

src/items/trainer-item-manager.ts

@@ -1,13 +1,13 @@
 import { allTrainerItems } from "#app/data/data-lists";
 import type { TrainerItemId } from "#app/enums/trainer-item-id";
+import { getTypedEntries, getTypedKeys } from "#app/utils/common";
 import {
   isTrainerItemSpecs,
   type TrainerItemConfiguration,
   type TrainerItemDataMap,
   type TrainerItemSaveData,
   type TrainerItemSpecs,
-} from "#app/items/trainer-item-data-types";
-import { getTypedEntries, getTypedKeys } from "#app/utils/common";
+} from "#items/trainer-item-data-types";
 
 export class TrainerItemManager {
   public trainerItems: TrainerItemDataMap;

src/loading-scene.ts

@@ -1,9 +1,5 @@
 import { initAbilities } from "#abilities/ability";
 import { timedEventManager } from "#app/global-event-manager";
-import { initHeldItems } from "#app/items/all-held-items";
-import { initTrainerItems } from "#app/items/all-trainer-items";
-import { initHeldItemPools } from "#app/items/init-held-item-pools";
-import { initTrainerItemPools } from "#app/items/init-trainer-item-pools";
 import { SceneBase } from "#app/scene-base";
 import { isMobile } from "#app/touch-controls";
 import { initBiomes } from "#balance/biomes";
@@ -16,6 +12,10 @@ import { initSpecies } from "#data/pokemon-species";
 import { BiomeId } from "#enums/biome-id";
 import { GachaType } from "#enums/gacha-types";
 import { getBiomeHasProps } from "#field/arena";
+import { initHeldItems } from "#items/all-held-items";
+import { initTrainerItems } from "#items/all-trainer-items";
+import { initHeldItemPools } from "#items/init-held-item-pools";
+import { initTrainerItemPools } from "#items/init-trainer-item-pools";
 import { initModifierPools } from "#modifiers/init-modifier-pools";
 import { initModifierTypes } from "#modifiers/modifier-type";
 import { initMoves } from "#moves/move";

src/modifier/init-modifier-pools.ts

@@ -4,7 +4,6 @@ import type { initModifierTypes } from "#modifiers/modifier-type";
 
 import { timedEventManager } from "#app/global-event-manager";
 import { globalScene } from "#app/global-scene";
-import type { TurnEndStatusHeldItem } from "#app/items/held-items/turn-end-status";
 import { pokemonEvolutions } from "#balance/pokemon-evolutions";
 import { allHeldItems, allTrainerItems, modifierTypes } from "#data/data-lists";
 import { MAX_PER_TYPE_POKEBALLS } from "#data/pokeball";
@@ -18,6 +17,7 @@ import { StatusEffect } from "#enums/status-effect";
 import { TrainerItemId } from "#enums/trainer-item-id";
 import { Unlockables } from "#enums/unlockables";
 import type { Pokemon } from "#field/pokemon";
+import type { TurnEndStatusHeldItem } from "#items/turn-end-status";
 import { modifierPool } from "#modifiers/modifier-pools";
 import { WeightedModifierType } from "#modifiers/modifier-type";
 import type { WeightedModifierTypeWeightFunc } from "#types/modifier-types";

src/modifier/modifier-type.ts

@@ -1,16 +1,6 @@
 import { TYPE_BOOST_ITEM_BOOST_PERCENT } from "#app/constants";
 import { timedEventManager } from "#app/global-event-manager";
 import { globalScene } from "#app/global-scene";
-import { getNewAttackTypeBoosterHeldItem, getNewBerryHeldItem, getNewVitaminHeldItem } from "#app/items/held-item-pool";
-import { attackTypeToHeldItem } from "#app/items/held-items/attack-type-booster";
-import { permanentStatToHeldItem, statBoostItems } from "#app/items/held-items/base-stat-booster";
-import { berryTypeToHeldItem } from "#app/items/held-items/berry";
-import {
-  SPECIES_STAT_BOOSTER_ITEMS,
-  type SpeciesStatBoosterItemId,
-  type SpeciesStatBoostHeldItem,
-} from "#app/items/held-items/stat-booster";
-import { TrainerItemEffect, tempStatToTrainerItem } from "#app/items/trainer-item";
 import { getPokemonNameWithAffix } from "#app/messages";
 import Overrides from "#app/overrides";
 import { EvolutionItem, pokemonEvolutions } from "#balance/pokemon-evolutions";
@@ -36,6 +26,16 @@ import type { PermanentStat, TempBattleStat } from "#enums/stat";
 import { Stat, TEMP_BATTLE_STATS } from "#enums/stat";
 import { TrainerItemId } from "#enums/trainer-item-id";
 import type { PlayerPokemon, Pokemon } from "#field/pokemon";
+import { attackTypeToHeldItem } from "#items/attack-type-booster";
+import { permanentStatToHeldItem, statBoostItems } from "#items/base-stat-booster";
+import { berryTypeToHeldItem } from "#items/berry";
+import { getNewAttackTypeBoosterHeldItem, getNewBerryHeldItem, getNewVitaminHeldItem } from "#items/held-item-pool";
+import {
+  SPECIES_STAT_BOOSTER_ITEMS,
+  type SpeciesStatBoosterItemId,
+  type SpeciesStatBoostHeldItem,
+} from "#items/stat-booster";
+import { TrainerItemEffect, tempStatToTrainerItem } from "#items/trainer-item";
 import {
   AddPokeballModifier,
   AddVoucherModifier,

src/modifier/modifier.ts

@@ -1,8 +1,4 @@
 import { globalScene } from "#app/global-scene";
-import type { HeldItemConfiguration } from "#app/items/held-item-data-types";
-import { assignItemsFromConfiguration } from "#app/items/held-item-pool";
-import { TrainerItemEffect } from "#app/items/trainer-item";
-import type { TrainerItemConfiguration } from "#app/items/trainer-item-data-types";
 import Overrides from "#app/overrides";
 import { FusionSpeciesFormEvolution, pokemonEvolutions } from "#balance/pokemon-evolutions";
 import { FRIENDSHIP_GAIN_FROM_RARE_CANDY } from "#balance/starters";
@@ -15,6 +11,10 @@ import type { PokeballType } from "#enums/pokeball";
 import type { PokemonType } from "#enums/pokemon-type";
 import { SpeciesId } from "#enums/species-id";
 import type { PlayerPokemon, Pokemon } from "#field/pokemon";
+import type { HeldItemConfiguration } from "#items/held-item-data-types";
+import { assignItemsFromConfiguration } from "#items/held-item-pool";
+import { TrainerItemEffect } from "#items/trainer-item";
+import type { TrainerItemConfiguration } from "#items/trainer-item-data-types";
 import type {
   EvolutionItemModifierType,
   ModifierType,

src/overrides.ts

@@ -1,6 +1,4 @@
 import { type PokeballCounts } from "#app/battle-scene";
-import { HeldItemConfiguration } from "#app/items/held-item-data-types";
-import { TrainerItemConfiguration } from "#app/items/trainer-item-data-types";
 import { EvolutionItem } from "#balance/pokemon-evolutions";
 import { Gender } from "#data/gender";
 import { AbilityId } from "#enums/ability-id";
@@ -23,6 +21,8 @@ import { TrainerType } from "#enums/trainer-type";
 import { Unlockables } from "#enums/unlockables";
 import { VariantTier } from "#enums/variant-tier";
 import { WeatherType } from "#enums/weather-type";
+import { HeldItemConfiguration } from "#items/held-item-data-types";
+import { TrainerItemConfiguration } from "#items/trainer-item-data-types";
 import { type ModifierOverride } from "#modifiers/modifier-type";
 import { Variant } from "#sprites/variant";
 

src/phases/add-enemy-buff-modifier-phase.ts

@@ -1,7 +1,7 @@
 import { globalScene } from "#app/global-scene";
-import { assignEnemyBuffTokenForWave } from "#app/items/trainer-item-pool";
 import { Phase } from "#app/phase";
 import { RewardTier } from "#enums/reward-tier";
+import { assignEnemyBuffTokenForWave } from "#items/trainer-item-pool";
 
 export class AddEnemyBuffModifierPhase extends Phase {
   public readonly phaseName = "AddEnemyBuffModifierPhase";

src/phases/berry-phase.ts

@@ -1,12 +1,12 @@
 import { applyAbAttrs } from "#abilities/apply-ab-attrs";
 import { globalScene } from "#app/global-scene";
-import { applyHeldItems } from "#app/items/all-held-items";
-import { HeldItemEffect } from "#app/items/held-item";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { allHeldItems } from "#data/data-lists";
 import { HeldItemCategoryId, isItemInCategory } from "#enums/held-item-id";
 import { CommonAnim } from "#enums/move-anims-common";
 import type { Pokemon } from "#field/pokemon";
+import { applyHeldItems } from "#items/all-held-items";
+import { HeldItemEffect } from "#items/held-item";
 import { FieldPhase } from "#phases/field-phase";
 import { BooleanHolder } from "#utils/common";
 import i18next from "i18next";

src/phases/exp-phase.ts

@@ -1,6 +1,6 @@
 import { globalScene } from "#app/global-scene";
-import { TrainerItemEffect } from "#app/items/trainer-item";
 import { getPokemonNameWithAffix } from "#app/messages";
+import { TrainerItemEffect } from "#items/trainer-item";
 import { PlayerPartyMemberPokemonPhase } from "#phases/player-party-member-pokemon-phase";
 import { NumberHolder } from "#utils/common";
 import i18next from "i18next";

src/phases/faint-phase.ts

@@ -1,7 +1,5 @@
 import { applyAbAttrs } from "#abilities/apply-ab-attrs";
 import { globalScene } from "#app/global-scene";
-import { applyHeldItems } from "#app/items/all-held-items";
-import { HeldItemEffect } from "#app/items/held-item";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { FRIENDSHIP_LOSS_FROM_FAINT } from "#balance/starters";
 import { allMoves } from "#data/data-lists";
@@ -16,6 +14,8 @@ import { HitResult } from "#enums/hit-result";
 import { StatusEffect } from "#enums/status-effect";
 import { SwitchType } from "#enums/switch-type";
 import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon";
+import { applyHeldItems } from "#items/all-held-items";
+import { HeldItemEffect } from "#items/held-item";
 import { PokemonMove } from "#moves/pokemon-move";
 import { PokemonPhase } from "#phases/pokemon-phase";
 import { isNullOrUndefined } from "#utils/common";

src/phases/money-reward-phase.ts

@@ -1,6 +1,6 @@
 import { globalScene } from "#app/global-scene";
-import { TrainerItemEffect } from "#app/items/trainer-item";
 import { ArenaTagType } from "#enums/arena-tag-type";
+import { TrainerItemEffect } from "#items/trainer-item";
 import { BattlePhase } from "#phases/battle-phase";
 import { NumberHolder } from "#utils/common";
 import i18next from "i18next";

src/phases/move-effect-phase.ts

@@ -1,8 +1,5 @@
 import { applyAbAttrs } from "#abilities/apply-ab-attrs";
 import { globalScene } from "#app/global-scene";
-import { applyHeldItems } from "#app/items/all-held-items";
-import { HeldItemEffect } from "#app/items/held-item";
-import { TrainerItemEffect } from "#app/items/trainer-item";
 import { getPokemonNameWithAffix } from "#app/messages";
 import type { Phase } from "#app/phase";
 import { ConditionalProtectTag } from "#data/arena-tag";
@@ -25,6 +22,9 @@ import { MoveResult } from "#enums/move-result";
 import { isReflected, isVirtual, MoveUseMode } from "#enums/move-use-mode";
 import { PokemonType } from "#enums/pokemon-type";
 import type { Pokemon } from "#field/pokemon";
+import { applyHeldItems } from "#items/all-held-items";
+import { HeldItemEffect } from "#items/held-item";
+import { TrainerItemEffect } from "#items/trainer-item";
 import { applyFilteredMoveAttrs, applyMoveAttrs } from "#moves/apply-attrs";
 import type { Move, MoveAttr } from "#moves/move";
 import { getMoveTargets, isFieldTargeted } from "#moves/move-utils";

src/phases/pokemon-heal-phase.ts

@@ -1,5 +1,4 @@
 import { globalScene } from "#app/global-scene";
-import { TrainerItemEffect } from "#app/items/trainer-item";
 import { getPokemonNameWithAffix } from "#app/messages";
 import type { HealBlockTag } from "#data/battler-tags";
 import { getStatusEffectHealText } from "#data/status-effect";
@@ -8,6 +7,7 @@ import { BattlerTagType } from "#enums/battler-tag-type";
 import { HitResult } from "#enums/hit-result";
 import { CommonAnim } from "#enums/move-anims-common";
 import { StatusEffect } from "#enums/status-effect";
+import { TrainerItemEffect } from "#items/trainer-item";
 import { CommonAnimPhase } from "#phases/common-anim-phase";
 import { HealAchv } from "#system/achv";
 import { NumberHolder } from "#utils/common";

src/phases/select-reward-phase.ts

@@ -1,9 +1,9 @@
 import { globalScene } from "#app/global-scene";
-import { TrainerItemEffect } from "#app/items/trainer-item";
 import Overrides from "#app/overrides";
 import { ModifierPoolType } from "#enums/modifier-pool-type";
 import type { RewardTier } from "#enums/reward-tier";
 import { UiMode } from "#enums/ui-mode";
+import { TrainerItemEffect } from "#items/trainer-item";
 import type { Modifier } from "#modifiers/modifier";
 import type { CustomModifierSettings, ModifierType, ModifierTypeOption } from "#modifiers/modifier-type";
 import {

src/phases/show-party-exp-bar-phase.ts

@@ -1,7 +1,7 @@
 import { globalScene } from "#app/global-scene";
-import { TrainerItemEffect } from "#app/items/trainer-item";
 import { ExpGainsSpeed } from "#enums/exp-gains-speed";
 import { ExpNotification } from "#enums/exp-notification";
+import { TrainerItemEffect } from "#items/trainer-item";
 import { PlayerPartyMemberPokemonPhase } from "#phases/player-party-member-pokemon-phase";
 import { NumberHolder } from "#utils/common";
 

src/phases/stat-stage-change-phase.ts

@@ -1,7 +1,5 @@
 import { applyAbAttrs } from "#abilities/apply-ab-attrs";
 import { globalScene } from "#app/global-scene";
-import { applyHeldItems } from "#app/items/all-held-items";
-import { HeldItemEffect } from "#app/items/held-item";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { handleTutorial, Tutorial } from "#app/tutorial";
 import type { ArenaTag } from "#data/arena-tag";
@@ -12,6 +10,8 @@ import { ArenaTagType } from "#enums/arena-tag-type";
 import type { BattlerIndex } from "#enums/battler-index";
 import { type BattleStat, getStatKey, getStatStageChangeDescriptionKey, Stat } from "#enums/stat";
 import type { Pokemon } from "#field/pokemon";
+import { applyHeldItems } from "#items/all-held-items";
+import { HeldItemEffect } from "#items/held-item";
 import { PokemonPhase } from "#phases/pokemon-phase";
 import type { ConditionalUserFieldProtectStatAbAttrParams, PreStatStageChangeAbAttrParams } from "#types/ability-types";
 import { BooleanHolder, isNullOrUndefined, NumberHolder } from "#utils/common";

src/phases/title-phase.ts

@@ -1,7 +1,6 @@
 import { loggedInUser } from "#app/account";
 import { GameMode, getGameMode } from "#app/game-mode";
 import { globalScene } from "#app/global-scene";
-import { assignDailyRunStarterHeldItems } from "#app/items/held-item-pool";
 import Overrides from "#app/overrides";
 import { Phase } from "#app/phase";
 import { fetchDailyRunSeed, getDailyRunStarters } from "#data/daily-run";
@@ -12,6 +11,7 @@ import { TrainerItemId } from "#enums/trainer-item-id";
 import { UiMode } from "#enums/ui-mode";
 import { Unlockables } from "#enums/unlockables";
 import { getBiomeKey } from "#field/arena";
+import { assignDailyRunStarterHeldItems } from "#items/held-item-pool";
 import type { SessionSaveData } from "#system/game-data";
 import { vouchers } from "#system/voucher";
 import type { OptionSelectConfig, OptionSelectItem } from "#ui/abstact-option-select-ui-handler";

src/phases/turn-end-phase.ts

@@ -1,14 +1,14 @@
 import { applyAbAttrs } from "#abilities/apply-ab-attrs";
 import { globalScene } from "#app/global-scene";
-import { applyHeldItems } from "#app/items/all-held-items";
-import { HeldItemEffect } from "#app/items/held-item";
-import { TrainerItemEffect } from "#app/items/trainer-item";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { TerrainType } from "#data/terrain";
 import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type";
 import { WeatherType } from "#enums/weather-type";
 import { TurnEndEvent } from "#events/battle-scene";
 import type { Pokemon } from "#field/pokemon";
+import { applyHeldItems } from "#items/all-held-items";
+import { HeldItemEffect } from "#items/held-item";
+import { TrainerItemEffect } from "#items/trainer-item";
 import { FieldPhase } from "#phases/field-phase";
 import i18next from "i18next";
 

src/phases/turn-start-phase.ts

@@ -1,7 +1,5 @@
 import { applyAbAttrs } from "#abilities/apply-ab-attrs";
 import { globalScene } from "#app/global-scene";
-import { applyHeldItems } from "#app/items/all-held-items";
-import { HeldItemEffect } from "#app/items/held-item";
 import { TrickRoomTag } from "#data/arena-tag";
 import { allMoves } from "#data/data-lists";
 import { BattlerIndex } from "#enums/battler-index";
@@ -9,6 +7,8 @@ import { Command } from "#enums/command";
 import { Stat } from "#enums/stat";
 import { SwitchType } from "#enums/switch-type";
 import type { Pokemon } from "#field/pokemon";
+import { applyHeldItems } from "#items/all-held-items";
+import { HeldItemEffect } from "#items/held-item";
 import { PokemonMove } from "#moves/pokemon-move";
 import { FieldPhase } from "#phases/field-phase";
 import { BooleanHolder, randSeedShuffle } from "#utils/common";

src/system/game-data.ts

@@ -5,7 +5,6 @@ import { defaultStarterSpecies, saveKey } from "#app/constants";
 import { getGameMode } from "#app/game-mode";
 import { globalScene } from "#app/global-scene";
 import { bypassLogin } from "#app/global-vars/bypass-login";
-import type { TrainerItemConfiguration, TrainerItemSaveData } from "#app/items/trainer-item-data-types";
 import Overrides from "#app/overrides";
 import { Tutorial } from "#app/tutorial";
 import { speciesEggMoves } from "#balance/egg-moves";
@@ -37,6 +36,7 @@ import { Unlockables } from "#enums/unlockables";
 import { WeatherType } from "#enums/weather-type";
 import { TagAddedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#events/arena";
 import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon";
+import type { TrainerItemConfiguration, TrainerItemSaveData } from "#items/trainer-item-data-types";
 import { MysteryEncounterSaveData } from "#mystery-encounters/mystery-encounter-save-data";
 import type { Variant } from "#sprites/variant";
 import { achvs } from "#system/achv";

src/system/pokemon-data.ts

@@ -1,6 +1,4 @@
 import { globalScene } from "#app/global-scene";
-import type { HeldItemSaveData } from "#app/items/held-item-data-types";
-import { saveDataToConfig } from "#app/items/held-item-pool";
 import type { Gender } from "#data/gender";
 import { CustomPokemonData, PokemonBattleData, PokemonSummonData } from "#data/pokemon-data";
 import { getPokemonSpeciesForm } from "#data/pokemon-species";
@@ -14,6 +12,8 @@ import type { PokemonType } from "#enums/pokemon-type";
 import type { SpeciesId } from "#enums/species-id";
 import { TrainerSlot } from "#enums/trainer-slot";
 import { EnemyPokemon, Pokemon } from "#field/pokemon";
+import type { HeldItemSaveData } from "#items/held-item-data-types";
+import { saveDataToConfig } from "#items/held-item-pool";
 import { PokemonMove } from "#moves/pokemon-move";
 import type { Variant } from "#sprites/variant";
 import { getPokemonSpecies } from "#utils/pokemon-utils";

src/ui/item-bar-ui.ts

@@ -1,8 +1,8 @@
 import { allHeldItems, allTrainerItems } from "#app/data/data-lists";
 import type { Pokemon } from "#app/field/pokemon";
 import { globalScene } from "#app/global-scene";
-import { heldItemSortFunc, trainerItemSortFunc } from "#app/items/item-utility";
-import type { TrainerItemManager } from "#app/items/trainer-item-manager";
+import { heldItemSortFunc, trainerItemSortFunc } from "#items/item-utility";
+import type { TrainerItemManager } from "#items/trainer-item-manager";
 
 const iconOverflowIndex = 24;
 

src/ui/reward-select-ui-handler.ts

@@ -1,5 +1,4 @@
 import { globalScene } from "#app/global-scene";
-import { TrainerItemEffect } from "#app/items/trainer-item";
 import Overrides from "#app/overrides";
 import { handleTutorial, Tutorial } from "#app/tutorial";
 import { allMoves } from "#data/data-lists";
@@ -9,6 +8,7 @@ import type { PokeballType } from "#enums/pokeball";
 import { ShopCursorTarget } from "#enums/shop-cursor-target";
 import { TrainerItemId } from "#enums/trainer-item-id";
 import { UiMode } from "#enums/ui-mode";
+import { TrainerItemEffect } from "#items/trainer-item";
 import type { ModifierTypeOption } from "#modifiers/modifier-type";
 import { getPlayerShopModifierTypeOptionsForWave, TmModifierType } from "#modifiers/modifier-type";
 import { AwaitableUiHandler } from "#ui/awaitable-ui-handler";

src/ui/run-info-ui-handler.ts

@@ -1,5 +1,4 @@
 import { globalScene } from "#app/global-scene";
-import { heldItemSortFunc } from "#app/items/item-utility";
 import { getBiomeName } from "#balance/biomes";
 import { allHeldItems, allTrainerItems } from "#data/data-lists";
 import { getNatureName, getNatureStatMultiplier } from "#data/nature";
@@ -16,6 +15,7 @@ import { PokemonType } from "#enums/pokemon-type";
 import type { SpeciesId } from "#enums/species-id";
 import { TrainerVariant } from "#enums/trainer-variant";
 import { UiMode } from "#enums/ui-mode";
+import { heldItemSortFunc } from "#items/item-utility";
 import { getLuckString, getLuckTextTint } from "#modifiers/modifier-type";
 import { getVariantTint } from "#sprites/variant";
 import type { SessionSaveData } from "#system/game-data";

src/ui/summary-ui-handler.ts

@@ -2,7 +2,6 @@ import type { Ability } from "#abilities/ability";
 import { loggedInUser } from "#app/account";
 import { globalScene } from "#app/global-scene";
 import { starterColors } from "#app/global-vars/starter-colors";
-import { heldItemSortFunc } from "#app/items/item-utility";
 import { getBiomeName } from "#balance/biomes";
 import { getStarterValueFriendshipCap, speciesStarterCosts } from "#balance/starters";
 import { allHeldItems } from "#data/data-lists";
@@ -20,6 +19,7 @@ import { getStatKey, PERMANENT_STATS, Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
 import { UiMode } from "#enums/ui-mode";
 import type { PlayerPokemon } from "#field/pokemon";
+import { heldItemSortFunc } from "#items/item-utility";
 import type { Move } from "#moves/move";
 import type { PokemonMove } from "#moves/pokemon-move";
 import type { Variant } from "#sprites/variant";

test/items/eviolite.test.ts

@@ -1,8 +1,8 @@
-import { applyHeldItems } from "#app/items/all-held-items";
-import { HeldItemEffect } from "#app/items/held-item";
 import { HeldItemId } from "#enums/held-item-id";
 import { SpeciesId } from "#enums/species-id";
 import { Stat } from "#enums/stat";
+import { applyHeldItems } from "#items/all-held-items";
+import { HeldItemEffect } from "#items/held-item";
 import { GameManager } from "#test/testUtils/gameManager";
 import { NumberHolder, randItem } from "#utils/common";
 import Phaser from "phaser";

test/items/exp_booster.test.ts

@@ -1,7 +1,7 @@
-import { applyHeldItems } from "#app/items/all-held-items";
-import { HeldItemEffect } from "#app/items/held-item";
 import { AbilityId } from "#enums/ability-id";
 import { HeldItemId } from "#enums/held-item-id";
+import { applyHeldItems } from "#items/all-held-items";
+import { HeldItemEffect } from "#items/held-item";
 import { GameManager } from "#test/testUtils/gameManager";
 import { NumberHolder } from "#utils/common";
 import Phaser from "phaser";

test/items/light_ball.test.ts

@@ -1,8 +1,8 @@
-import { applyHeldItems } from "#app/items/all-held-items";
-import { HeldItemEffect } from "#app/items/held-item";
 import { HeldItemId } from "#enums/held-item-id";
 import { SpeciesId } from "#enums/species-id";
 import { Stat } from "#enums/stat";
+import { applyHeldItems } from "#items/all-held-items";
+import { HeldItemEffect } from "#items/held-item";
 import i18next from "#plugins/i18n";
 import { GameManager } from "#test/testUtils/gameManager";
 import { NumberHolder } from "#utils/common";

test/items/reviver_seed.test.ts

@@ -1,4 +1,3 @@
-import type { InstantReviveHeldItem } from "#app/items/held-items/instant-revive";
 import { allHeldItems, allMoves } from "#data/data-lists";
 import { AbilityId } from "#enums/ability-id";
 import { BattlerIndex } from "#enums/battler-index";
@@ -6,6 +5,7 @@ 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 type { InstantReviveHeldItem } from "#items/instant-revive";
 import { GameManager } from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";

test/mystery-encounter/encounters/clowning-around-encounter.test.ts

@@ -1,5 +1,4 @@
 import type { BattleScene } from "#app/battle-scene";
-import { getHeldItemTier } from "#app/items/held-item-tiers";
 import * as BattleAnims from "#data/battle-anims";
 import { AbilityId } from "#enums/ability-id";
 import { BiomeId } from "#enums/biome-id";
@@ -14,6 +13,7 @@ import { RewardTier } from "#enums/reward-tier";
 import { SpeciesId } from "#enums/species-id";
 import { TrainerType } from "#enums/trainer-type";
 import { UiMode } from "#enums/ui-mode";
+import { getHeldItemTier } from "#items/held-item-tiers";
 import { PokemonMove } from "#moves/pokemon-move";
 import { ClowningAroundEncounter } from "#mystery-encounters/clowning-around-encounter";
 import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils";

test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts

@@ -1,6 +1,4 @@
 import type { BattleScene } from "#app/battle-scene";
-import { applyHeldItems } from "#app/items/all-held-items";
-import { HeldItemEffect } from "#app/items/held-item";
 import * as BattleAnims from "#data/battle-anims";
 import { CustomPokemonData } from "#data/pokemon-data";
 import { AbilityId } from "#enums/ability-id";
@@ -14,6 +12,8 @@ import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { Nature } from "#enums/nature";
 import { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
+import { applyHeldItems } from "#items/all-held-items";
+import { HeldItemEffect } from "#items/held-item";
 import { PokemonMove } from "#moves/pokemon-move";
 import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";

test/testUtils/helpers/overridesHelper.ts

@@ -2,8 +2,6 @@
 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";
@@ -17,6 +15,8 @@ import { SpeciesId } from "#enums/species-id";
 import { StatusEffect } from "#enums/status-effect";
 import type { Unlockables } from "#enums/unlockables";
 import { WeatherType } from "#enums/weather-type";
+import type { HeldItemConfiguration } from "#items/held-item-data-types";
+import type { TrainerItemConfiguration } from "#items/trainer-item-data-types";
 import type { ModifierOverride } from "#modifiers/modifier-type";
 import type { Variant } from "#sprites/variant";
 import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper";

test/testUtils/testFileInitialization.ts

@@ -1,15 +1,15 @@
 import { initAbilities } from "#abilities/ability";
 import { initLoggedInUser } from "#app/account";
 import { SESSION_ID_COOKIE_NAME } from "#app/constants";
-import { initHeldItems } from "#app/items/all-held-items";
-import { initTrainerItems } from "#app/items/all-trainer-items";
-import { initHeldItemPools } from "#app/items/init-held-item-pools";
-import { initTrainerItemPools } from "#app/items/init-trainer-item-pools";
 import { initBiomes } from "#balance/biomes";
 import { initEggMoves } from "#balance/egg-moves";
 import { initPokemonPrevolutions, initPokemonStarters } from "#balance/pokemon-evolutions";
 import { initPokemonForms } from "#data/pokemon-forms";
 import { initSpecies } from "#data/pokemon-species";
+import { initHeldItems } from "#items/all-held-items";
+import { initTrainerItems } from "#items/all-trainer-items";
+import { initHeldItemPools } from "#items/init-held-item-pools";
+import { initTrainerItemPools } from "#items/init-trainer-item-pools";
 import { initModifierPools } from "#modifiers/init-modifier-pools";
 import { initModifierTypes } from "#modifiers/modifier-type";
 import { initMoves } from "#moves/move";

tsconfig.json

@@ -18,6 +18,7 @@
       "#events/*": ["./events/*.ts"],
       "#field/*": ["./field/*.ts"],
       "#inputs/*": ["./configs/inputs/*.ts"],
+      "#items/*": ["./items/held-items/*.ts", "./items/*.ts"],
       "#modifiers/*": ["./modifier/*.ts"],
       "#moves/*": ["./data/moves/*.ts"],
       "#mystery-encounters/*": [