From eb6c3ba83f2a34572fda88707d3d8eaf3bde82ae Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Fri, 8 Mar 2024 18:38:04 -0500 Subject: [PATCH] Fix enemy trainers being able to switch out during multi-turn moves --- src/phases.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/phases.ts b/src/phases.ts index 3d6559789..c7f0e97e5 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -1562,7 +1562,7 @@ export class EnemyCommandPhase extends FieldPhase { const trainer = this.scene.currentBattle.trainer; - if (trainer) { + if (trainer && !enemyPokemon.getMoveQueue().length) { const opponents = enemyPokemon.getOpponents(); const trapTag = enemyPokemon.findTag(t => t instanceof TrappedTag) as TrappedTag;