diff --git a/src/loading-scene.ts b/src/loading-scene.ts index 17cd5c277f1..f67d19e1027 100644 --- a/src/loading-scene.ts +++ b/src/loading-scene.ts @@ -22,6 +22,7 @@ import { BiomeId } from "#enums/biome-id"; import { initMysteryEncounters } from "#app/data/mystery-encounters/mystery-encounters"; import { timedEventManager } from "./global-event-manager"; import { initModifierPools } from "./modifier/init-modifier-pools"; +import { initModifierTypes } from "./modifier/modifier-type"; export class LoadingScene extends SceneBase { public static readonly KEY = "loading"; @@ -364,6 +365,7 @@ export class LoadingScene extends SceneBase { this.loadLoadingScreen(); + initModifierTypes(); initModifierPools(); initAchievements(); diff --git a/src/modifier/init-modifier-pools.ts b/src/modifier/init-modifier-pools.ts index 2fdac392065..60697333600 100644 --- a/src/modifier/init-modifier-pools.ts +++ b/src/modifier/init-modifier-pools.ts @@ -24,6 +24,8 @@ import { MoveId } from "#enums/move-id"; import { StatusEffect } from "#enums/status-effect"; import { AbilityId } from "#enums/ability-id"; import { MAX_PER_TYPE_POKEBALLS } from "#app/data/pokeball"; +// biome-ignore lint/correctness/noUnusedImports: This is used in a tsdoc comment +import type { initModifierTypes } from "./modifier-type"; /** * Initialize the wild modifier pool @@ -780,6 +782,10 @@ function initDailyStarterModifierPool() { }); } +/** + * Initialize {@linkcode modifierPool} with the initial set of modifier types. + * {@linkcode initModifierTypes} MUST be called before this function. + */ export function initModifierPools() { // The modifier pools the player chooses from during modifier selection initCommonModifierPool(); diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index b34c23efdec..2c848c69e18 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -126,13 +126,9 @@ import i18next from "i18next"; import { timedEventManager } from "#app/global-event-manager"; import { TYPE_BOOST_ITEM_BOOST_PERCENT } from "#app/constants"; import { ModifierPoolType } from "#enums/modifier-pool-type"; - import { getModifierPoolForType, getModifierType } from "#app/utils/modifier-utils"; import type { ModifierTypeFunc, WeightedModifierTypeWeightFunc } from "#app/@types/modifier-types"; -// biome-ignore lint/correctness/noUnusedImports: This import is used in a -import type { initModifierPools } from "./init-modifier-pools"; - const outputModifierData = false; const useMaxWeightForOutput = false; @@ -2993,10 +2989,6 @@ export function getLuckTextTint(luckValue: number): number { return getModifierTierTextTint(modifierTier); } -/** - * Initialize the modifier types object with the initial set of modifier types. - * {@linkcode initModifierPools} MUST be called before this function. - */ export function initModifierTypes() { for (const [key, value] of Object.entries(modifierTypeInitObj)) { modifierTypes[key] = value;