From ae869bf2140a0b2dcaa34cf9dab3adee5957a627 Mon Sep 17 00:00:00 2001
From: Aurastic <33085835+ISenseAura@users.noreply.github.com>
Date: Sat, 2 May 2026 16:11:40 +0530
Subject: [PATCH] Preact: Skip choices for tatsugiri when in commanding mode
 (#2642)

---
 play.pokemonshowdown.com/src/battle-choices.ts | 6 +++++-
 play.pokemonshowdown.com/src/battle.ts         | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/play.pokemonshowdown.com/src/battle-choices.ts b/play.pokemonshowdown.com/src/battle-choices.ts
index 3c97f1f6b..0f893997e 100644
--- a/play.pokemonshowdown.com/src/battle-choices.ts
+++ b/play.pokemonshowdown.com/src/battle-choices.ts
@@ -295,7 +295,11 @@ export class BattleChoiceBuilder {
 		const request = this.request;
 		switch (request.requestType) {
 		case 'move':
-			while (this.choices.length < request.active.length && !request.active[this.choices.length]) {
+			while (
+				(this.choices.length < request.active.length &&
+					!request.active[this.choices.length]) ||
+					request.side?.pokemon[this.choices.length]?.commanding
+			) {
 				this.choices.push('pass');
 			}
 			break;
diff --git a/play.pokemonshowdown.com/src/battle.ts b/play.pokemonshowdown.com/src/battle.ts
index 0fba1a79f..fcae1ba8b 100644
--- a/play.pokemonshowdown.com/src/battle.ts
+++ b/play.pokemonshowdown.com/src/battle.ts
@@ -1031,6 +1031,7 @@ export interface ServerPokemon extends PokemonDetails, PokemonHealth {
 	condition: string;
 	active: boolean;
 	reviving: boolean;
+	commanding: boolean;
 	/** unboosted stats */
 	stats: {
 		atk: number,