From 0cf1b7b7914c63c97d8cbd52b866e05f1dd21934 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Wed, 24 Jul 2024 00:11:18 -0700 Subject: [PATCH] Make on-summon abilities trigger after the switch check --- src/battle-scene.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 961abe1eea51..19f8dad862ed 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -2056,8 +2056,8 @@ export default class BattleScene extends SceneBase { const conditionalPhase = this.conditionalQueue.shift(); // Evaluate the condition associated with the phase if (conditionalPhase[0]()) { - // If the condition is met, add the phase to the front of the phase queue - this.unshiftPhase(conditionalPhase[1]); + // If the condition is met, add the phase to the phase queue + this.pushPhase(conditionalPhase[1]); } else { // If the condition is not met, re-add the phase back to the front of the conditional queue this.conditionalQueue.unshift(conditionalPhase);