Merge c8bb8c8825 into 00c061991c

sim/pokemon.ts

@@ -1199,7 +1199,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;
 	}