diff --git a/src/battle.ts b/src/battle.ts index 4602645d14a..10832681b66 100644 --- a/src/battle.ts +++ b/src/battle.ts @@ -29,12 +29,12 @@ export enum BattlerIndex { } export interface TurnCommand { - command: Command; - cursor?: number; - move?: TurnMove; - targets?: BattlerIndex[]; - skip?: boolean; - args?: any[]; + command: Command; + cursor?: number; + move?: TurnMove; + targets?: BattlerIndex[]; + skip?: boolean; + args?: any[]; } export interface FaintLogEntry { @@ -440,6 +440,3 @@ export class FixedBattle extends Battle { } } } - -export type GetTrainerFunc = () => Trainer; -export type GetEnemyPartyFunc = () => EnemyPokemon[]; diff --git a/src/data/balance/fixed-battle-configs.ts b/src/data/balance/fixed-battle-configs.ts index 5d9971fb99a..602de7043c5 100644 --- a/src/data/balance/fixed-battle-configs.ts +++ b/src/data/balance/fixed-battle-configs.ts @@ -1,4 +1,3 @@ -import type { GetEnemyPartyFunc, GetTrainerFunc } from "#app/battle"; import { BattleType } from "#enums/battle-spec"; import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves"; import Trainer, { TrainerVariant } from "#app/field/trainer"; @@ -9,6 +8,7 @@ import * as Utils from "#app/utils"; import { PlayerGender } from "#enums/player-gender"; import { TrainerType } from "#enums/trainer-type"; import { trainerConfigs } from "../trainer-config"; +import type { EnemyPokemon } from "#app/field/pokemon"; export class FixedBattleConfig { public battleType: BattleType; @@ -49,6 +49,9 @@ export class FixedBattleConfig { } } +type GetTrainerFunc = () => Trainer; +type GetEnemyPartyFunc = () => EnemyPokemon[]; + /** * Helper function to generate a random trainer for evil team trainers and the elite 4/champion * @param trainerPool The TrainerType or list of TrainerTypes that can possibly be generated