diff --git a/sim/pokemon.ts b/sim/pokemon.ts index b9283feb3a..d79a980f08 100644 --- a/sim/pokemon.ts +++ b/sim/pokemon.ts @@ -1194,7 +1194,10 @@ export class Pokemon { if (!this.isActive) return false; const allyActive = this.side.active; for (let i = this.position + 1; i < allyActive.length; i++) { - if (allyActive[i] && !allyActive[i].fainted) return false; + const ally = allyActive[i]; + if (ally && !ally.fainted && !ally.getLockedMove() && !ally.volatiles['commanding']) { + return false; + } } return true; }