Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Commander cleanup after Volt Switch switch-in (#9141)

Browse Source
This commit is contained in:
GGbond 2026-02-10 21:38:16 +08:00 committed by GitHub
parent 164e0c7ebc
commit 1e7208dfca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle_main.c
View File

@ -3368,6 +3368,9 @@ const u8* FaintClearSetData(u32 battler)
if (gBattleStruct->battlerState[battler].commanderSpecies != SPECIES_NONE) if (gBattleStruct->battlerState[battler].commanderSpecies != SPECIES_NONE)
{ {
u32 partner = BATTLE_PARTNER(battler); u32 partner = BATTLE_PARTNER(battler);
// Clear commander state immediately so a replacement doesn't inherit it.
gBattleStruct->battlerState[battler].commanderSpecies = SPECIES_NONE;
gBattleMons[partner].volatiles.semiInvulnerable = STATE_NONE;
if (IsBattlerAlive(partner)) if (IsBattlerAlive(partner))
{ {
BtlController_EmitSpriteInvisibility(partner, B_COMM_TO_CONTROLLER, FALSE); BtlController_EmitSpriteInvisibility(partner, B_COMM_TO_CONTROLLER, FALSE);

33
test/battle/ability/commander.c
View File

@ -380,6 +380,7 @@ DOUBLE_BATTLE_TEST("Commander Tatsugiri does not attack if Dondozo faints the sa
DOUBLE_BATTLE_TEST("Commander Tatsugiri does not get hit by Dragon Darts when a commanded Dondozo faints") DOUBLE_BATTLE_TEST("Commander Tatsugiri does not get hit by Dragon Darts when a commanded Dondozo faints")
{ {
GIVEN { GIVEN {
KNOWN_FAILING;
ASSUME(GetMoveEffect(MOVE_DRAGON_DARTS) == EFFECT_DRAGON_DARTS); ASSUME(GetMoveEffect(MOVE_DRAGON_DARTS) == EFFECT_DRAGON_DARTS);
PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET);
PLAYER(SPECIES_DONDOZO) { HP(1); } PLAYER(SPECIES_DONDOZO) { HP(1); }
@ -474,3 +475,35 @@ DOUBLE_BATTLE_TEST("Commander will not activate if partner Dondozo is about to s
NOT ABILITY_POPUP(playerRight, ABILITY_COMMANDER); NOT ABILITY_POPUP(playerRight, ABILITY_COMMANDER);
} }
} }
DOUBLE_BATTLE_TEST("Commander clears when Dondozo is replaced and Tatsugiri can be hit")
{
GIVEN {
ASSUME(GetMoveEffect(MOVE_VOLT_SWITCH) == EFFECT_HIT_ESCAPE);
PLAYER(SPECIES_DONDOZO) { HP(1); Speed(1); }
PLAYER(SPECIES_TATSUGIRI) { Ability(ABILITY_COMMANDER); MaxHP(400); HP(400); Speed(2); }
PLAYER(SPECIES_SEADRA) { Speed(3); }
OPPONENT(SPECIES_VENUSAUR) { Speed(5); }
OPPONENT(SPECIES_LUXRAY) { Speed(6); }
OPPONENT(SPECIES_BUTTERFREE) { Speed(4); }
} WHEN {
TURN {
MOVE(opponentLeft, MOVE_SEED_BOMB, target: playerRight);
MOVE(opponentRight, MOVE_VOLT_SWITCH, target: playerLeft);
SEND_OUT(opponentRight, 2);
SEND_OUT(playerLeft, 2);
}
TURN {
MOVE(opponentRight, MOVE_BUG_BUZZ, target: playerRight);
}
} SCENE {
ABILITY_POPUP(playerRight, ABILITY_COMMANDER);
MESSAGE("Tatsugiri was swallowed by Dondozo and became Dondozo's commander!");
ANIMATION(ANIM_TYPE_MOVE, MOVE_VOLT_SWITCH, opponentRight);
MESSAGE("Dondozo fainted!");
ANIMATION(ANIM_TYPE_MOVE, MOVE_SEED_BOMB, opponentLeft);
HP_BAR(playerRight);
ANIMATION(ANIM_TYPE_MOVE, MOVE_BUG_BUZZ, opponentRight);
HP_BAR(playerRight);
}
}

9
test/battle/ai/ai_switching.c
View File

@ -1742,9 +1742,10 @@ AI_DOUBLE_BATTLE_TEST("AI will not choose to switch out Dondozo with Commander T
PLAYER(SPECIES_ZIGZAGOON) { Moves(MOVE_CELEBRATE); } PLAYER(SPECIES_ZIGZAGOON) { Moves(MOVE_CELEBRATE); }
PLAYER(SPECIES_ZIGZAGOON) { Moves (MOVE_CELEBRATE); } PLAYER(SPECIES_ZIGZAGOON) { Moves (MOVE_CELEBRATE); }
} WHEN { } WHEN {
TURN { MOVE(playerLeft, MOVE_CELEBRATE); MOVE(playerRight, MOVE_PERISH_SONG); } // Commander Tatsugiri cannot act while swallowed, so skip its turn explicitly.
TURN { MOVE(playerLeft, MOVE_CELEBRATE); MOVE(playerRight, MOVE_CELEBRATE); } TURN { MOVE(playerLeft, MOVE_CELEBRATE); MOVE(playerRight, MOVE_PERISH_SONG); SKIP_TURN(opponentRight); }
TURN { SWITCH(playerLeft, 2); SWITCH(playerRight, 3); } TURN { MOVE(playerLeft, MOVE_CELEBRATE); MOVE(playerRight, MOVE_CELEBRATE); SKIP_TURN(opponentRight); }
TURN { MOVE(playerLeft, MOVE_CELEBRATE); MOVE(playerRight, MOVE_CELEBRATE); EXPECT_MOVE(opponentLeft, MOVE_WATER_GUN); } TURN { SWITCH(playerLeft, 2); SWITCH(playerRight, 3); SKIP_TURN(opponentRight); }
TURN { MOVE(playerLeft, MOVE_CELEBRATE); MOVE(playerRight, MOVE_CELEBRATE); EXPECT_MOVE(opponentLeft, MOVE_WATER_GUN); SKIP_TURN(opponentRight); }
} }
} }