Compare commits

...

3 Commits

Author SHA1 Message Date
Natthapawn Hongcharoen
843dacce6a
Merge d34dcf7bea into 375587213e 2025-08-04 23:32:06 -05:00
DableUTeeF
d34dcf7bea Merge remote-tracking branch 'origin/beta' into beta 2025-08-02 21:05:51 +07:00
DableUTeeF
db9e65b8a8 Show battle end phase in wild battle if the last pokemon fled.
I don't know about you guys but if my enemy fled the field I'd count that as a win.

Simply skipping to next battle is really infuriating when the one pokemon with this ability has a really strong priority move. Especially when it shows up right before an important fight.
2025-08-02 21:03:27 +07:00

View File

@ -6309,6 +6309,9 @@ class ForceSwitchOutHelper {
if (globalScene.currentBattle.double && !isNullOrUndefined(allyPokemon)) { if (globalScene.currentBattle.double && !isNullOrUndefined(allyPokemon)) {
globalScene.redirectPokemonMoves(switchOutTarget, allyPokemon); globalScene.redirectPokemonMoves(switchOutTarget, allyPokemon);
} }
else{
globalScene.phaseManager.pushNew("BattleEndPhase", true);
}
} }
if (!allyPokemon?.isActive(true)) { if (!allyPokemon?.isActive(true)) {