Merge branch 'beta' into wimpOutHotfix

This commit is contained in:
Mumble 2024-11-17 12:27:03 -08:00 committed by GitHub
commit ee4c569d6a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -4954,7 +4954,7 @@ class ForceSwitchOutHelper {
* It will not flee if it is a wave 10x boss battle or a battle in a Mystery Encounter * It will not flee if it is a wave 10x boss battle or a battle in a Mystery Encounter
*/ */
} else { } else {
if (!pokemon.scene.currentBattle.waveIndex || pokemon.scene.currentBattle.waveIndex % 10 === 0 || pokemon.scene.currentBattle.isBattleMysteryEncounter()) { if (!pokemon.scene.currentBattle.waveIndex || pokemon.scene.currentBattle.waveIndex % 10 === 0) {
return false; return false;
} }