diff --git a/src/data/phase-priority-queue.ts b/src/data/phase-priority-queue.ts index 2248fa2b05c..b815a6ac34f 100644 --- a/src/data/phase-priority-queue.ts +++ b/src/data/phase-priority-queue.ts @@ -81,9 +81,9 @@ export class PostSummonPhasePriorityQueue extends PhasePriorityQueue { phasePokemon.getAbilityPriorities().forEach((priority, idx) => { this.queue.push(new PostSummonActivateAbilityPhase(phasePokemon.getBattlerIndex(), priority, !!idx)); - globalScene.appendToPhase( + globalScene.phaseManager.appendToPhase( new ActivatePriorityQueuePhase(DynamicPhaseType.POST_SUMMON), - ActivatePriorityQueuePhase, + "ActivatePriorityQueuePhase", (p: ActivatePriorityQueuePhase) => p.getType() === DynamicPhaseType.POST_SUMMON, ); }); diff --git a/src/phase-manager.ts b/src/phase-manager.ts index 8b4b23c7ae3..e1c363f28e4 100644 --- a/src/phase-manager.ts +++ b/src/phase-manager.ts @@ -115,6 +115,7 @@ import { WeatherEffectPhase } from "#app/phases/weather-effect-phase"; * This allows for easy creation of new phases without needing to import each phase individually. */ const PHASES = Object.freeze({ + ActivatePriorityQueuePhase, AddEnemyBuffModifierPhase, AttemptCapturePhase, AttemptRunPhase, diff --git a/src/phases/activate-priority-queue-phase.ts b/src/phases/activate-priority-queue-phase.ts index 9d1850a2451..df42c491676 100644 --- a/src/phases/activate-priority-queue-phase.ts +++ b/src/phases/activate-priority-queue-phase.ts @@ -3,6 +3,7 @@ import { globalScene } from "#app/global-scene"; import { Phase } from "#app/phase"; export class ActivatePriorityQueuePhase extends Phase { + public readonly phaseName = "ActivatePriorityQueuePhase"; private type: DynamicPhaseType; constructor(type: DynamicPhaseType) { @@ -12,7 +13,7 @@ export class ActivatePriorityQueuePhase extends Phase { override start() { super.start(); - globalScene.startDynamicPhaseType(this.type); + globalScene.phaseManager.startDynamicPhaseType(this.type); this.end(); } diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts index d732ab0fdf4..eb5e82782ab 100644 --- a/src/phases/switch-summon-phase.ts +++ b/src/phases/switch-summon-phase.ts @@ -18,7 +18,6 @@ import i18next from "i18next"; import { SummonPhase } from "./summon-phase"; import { SubstituteTag } from "#app/data/battler-tags"; import { SwitchType } from "#enums/switch-type"; -import { PostSummonPhase } from "#app/phases/post-summon-phase"; export class SwitchSummonPhase extends SummonPhase { public readonly phaseName: "SwitchSummonPhase" | "ReturnPhase" = "SwitchSummonPhase"; @@ -252,7 +251,7 @@ export class SwitchSummonPhase extends SummonPhase { } queuePostSummon(): void { - globalScene.phaseManager.startDynamicPhase(new PostSummonPhase(this.getPokemon().getBattlerIndex())); + globalScene.phaseManager.pushNew("PostSummonPhase", this.getPokemon().getBattlerIndex()); } /**