From cbbf6bad93483807954cd7717e2ce23b30c1d2e6 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Thu, 31 Dec 2020 14:24:34 +0000 Subject: [PATCH] Player is no longer asked if they want to switch after they already replaced a fainted battler that round --- .../012_Battle/003_Battle/006_Battle_Action_Switching.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Data/Scripts/012_Battle/003_Battle/006_Battle_Action_Switching.rb b/Data/Scripts/012_Battle/003_Battle/006_Battle_Action_Switching.rb index b435a5e43..182417b9d 100644 --- a/Data/Scripts/012_Battle/003_Battle/006_Battle_Action_Switching.rb +++ b/Data/Scripts/012_Battle/003_Battle/006_Battle_Action_Switching.rb @@ -164,8 +164,8 @@ class PokeBattle_Battle # Pokémon when an opponent replaces a fainted Pokémon in single # battles. In double battles, etc. there is no such offer. if @internalBattle && @switchStyle && trainerBattle? && pbSideSize(0)==1 && - opposes?(idxBattler) && !@battlers[0].fainted? && pbCanChooseNonActive?(0) && - @battlers[0].effects[PBEffects::Outrage]==0 + opposes?(idxBattler) && !@battlers[0].fainted? && !switched.include?(0) && + pbCanChooseNonActive?(0) && @battlers[0].effects[PBEffects::Outrage]==0 idxPartyForName = idxPartyNew enemyParty = pbParty(idxBattler) if isConst?(enemyParty[idxPartyNew].ability,PBAbilities,:ILLUSION)