diff --git a/src/data/balance/pokemon-evolutions.ts b/src/data/balance/pokemon-evolutions.ts
index fb3d0e119bf..cb30cc28bde 100644
--- a/src/data/balance/pokemon-evolutions.ts
+++ b/src/data/balance/pokemon-evolutions.ts
@@ -13,7 +13,7 @@ import { SpeciesFormKey } from "#enums/species-form-key";
 import { TimeOfDay } from "#enums/time-of-day";
 import { speciesStarterCosts } from "./starters";
 import i18next from "i18next";
-import { allMoves } from "#app/data/data-lists";
+import { allHeldItems, allMoves } from "#app/data/data-lists";
 import { getPokemonSpecies } from "#app/utils/pokemon-utils";
 import { HeldItemId } from "#enums/held-item-id";
 
@@ -177,10 +177,7 @@ export class SpeciesEvolutionCondition {
         case EvoCondKey.PARTY_TYPE:
           return globalScene.getPlayerParty().some(p => p.getTypes(false, false, true).includes(cond.pkmnType))
         case EvoCondKey.EVO_TREASURE_TRACKER:
-          return pokemon.getHeldItems().some(m =>
-            m.is("EvoTrackerModifier") &&
-            m.getStackCount() + pokemon.getPersistentTreasureCount() >= cond.value
-          );
+          return allHeldItems[HeldItemId.GIMMIGHOUL_EVO_TRACKER].getStackCount(pokemon) >= cond.value;
         case EvoCondKey.GENDER:
           return pokemon.gender === cond.gender;
         case EvoCondKey.SHEDINJA: // Shedinja cannot be evolved into directly
diff --git a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
index cf24d1dd7e0..b0d8a197287 100644
--- a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
+++ b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
@@ -154,7 +154,7 @@ export const DancingLessonsEncounter: MysteryEncounter = MysteryEncounterBuilder
     }
 
     const oricorioData = new PokemonData(enemyPokemon);
-    const oricorio = globalScene.addEnemyPokemon(species, level, TrainerSlot.NONE, false, false, oricorioData);
+    const oricorio = globalScene.addEnemyPokemon(species, level, TrainerSlot.NONE, false, false, [], oricorioData);
 
     // Adds a real Pokemon sprite to the field (required for the animation)
     for (const enemyPokemon of globalScene.getEnemyParty()) {
diff --git a/src/items/apply-trainer-items.ts b/src/items/apply-trainer-items.ts
index 7135edd0ff9..898c4067a68 100644
--- a/src/items/apply-trainer-items.ts
+++ b/src/items/apply-trainer-items.ts
@@ -1,4 +1,4 @@
-import { allTrainerItems } from "./all-trainer-items";
+import { allTrainerItems } from "#app/data/data-lists";
 import {
   type BooleanHolderParams,
   type NumberHolderParams,
diff --git a/src/items/held-item-pool.ts b/src/items/held-item-pool.ts
index 1cdd95ae744..9ad26e077af 100644
--- a/src/items/held-item-pool.ts
+++ b/src/items/held-item-pool.ts
@@ -7,7 +7,7 @@ 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 "./all-held-items";
+import { allHeldItems } from "#app/data/data-lists";
 import {
   type HeldItemConfiguration,
   type HeldItemPool,
diff --git a/src/items/held-items/item-steal.ts b/src/items/held-items/item-steal.ts
index f9dce8cc75b..02b46750ebd 100644
--- a/src/items/held-items/item-steal.ts
+++ b/src/items/held-items/item-steal.ts
@@ -4,7 +4,7 @@ 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 "../all-held-items";
+import { allHeldItems } from "#app/data/data-lists";
 import { globalScene } from "#app/global-scene";
 
 export interface ItemStealParams {
diff --git a/src/items/trainer-item-pool.ts b/src/items/trainer-item-pool.ts
index 86a87925325..72e38d4750b 100644
--- a/src/items/trainer-item-pool.ts
+++ b/src/items/trainer-item-pool.ts
@@ -2,7 +2,7 @@ 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 "./all-trainer-items";
+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/phases/berry-phase.ts b/src/phases/berry-phase.ts
index 1fe547d7469..524cfa5c698 100644
--- a/src/phases/berry-phase.ts
+++ b/src/phases/berry-phase.ts
@@ -6,7 +6,8 @@ import { BooleanHolder } from "#app/utils/common";
 import { FieldPhase } from "./field-phase";
 import { globalScene } from "#app/global-scene";
 import type Pokemon from "#app/field/pokemon";
-import { allHeldItems, applyHeldItems } from "#app/items/all-held-items";
+import { applyHeldItems } from "#app/items/all-held-items";
+import { allHeldItems } from "#app/data/data-lists";
 import { HeldItemEffect } from "#app/items/held-item";
 import { HeldItemCategoryId, isItemInCategory } from "#enums/held-item-id";