From 9fe513ca16486388d6d097ae092406f0f3646bce Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Mon, 8 Feb 2021 18:36:02 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20fixes=20for=20Illusion=20with=201=20Pok?=
 =?UTF-8?q?=C3=A9mon=20in=20team,=20Magician=20triggering=20and=20Fake=20O?=
 =?UTF-8?q?ut=20failing=20after=20switching=20in=20by=20an=20effect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../012_Battle/001_Battler/002_Battler_Initialize.rb        | 2 +-
 .../Scripts/012_Battle/002_Move/005_Move_Effects_000-07F.rb | 2 +-
 .../Scripts/012_Battle/002_Move/007_Move_Effects_100-17F.rb | 4 ++--
 .../012_Battle/003_Battle/006_Battle_Action_Switching.rb    | 6 ++++--
 Data/Scripts/012_Battle/004_AI/005_AI_Move_EffectScores.rb  | 2 +-
 Data/Scripts/012_Battle/007_BattleHandlers_Abilities.rb     | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Data/Scripts/012_Battle/001_Battler/002_Battler_Initialize.rb b/Data/Scripts/012_Battle/001_Battler/002_Battler_Initialize.rb
index c99913020..ce1a26e8f 100644
--- a/Data/Scripts/012_Battle/001_Battler/002_Battler_Initialize.rb
+++ b/Data/Scripts/012_Battle/001_Battler/002_Battler_Initialize.rb
@@ -195,7 +195,7 @@ class PokeBattle_Battler
     @effects[PBEffects::Illusion]            = nil
     if hasActiveAbility?(:ILLUSION)
       idxLastParty = @battle.pbLastInTeam(@index)
-      if idxLastParty!=@pokemonIndex
+      if idxLastParty >= 0 && idxLastParty != @pokemonIndex
         @effects[PBEffects::Illusion]        = @battle.pbParty(@index)[idxLastParty]
       end
     end
diff --git a/Data/Scripts/012_Battle/002_Move/005_Move_Effects_000-07F.rb b/Data/Scripts/012_Battle/002_Move/005_Move_Effects_000-07F.rb
index 211697740..e038989c4 100644
--- a/Data/Scripts/012_Battle/002_Move/005_Move_Effects_000-07F.rb
+++ b/Data/Scripts/012_Battle/002_Move/005_Move_Effects_000-07F.rb
@@ -274,7 +274,7 @@ end
 #===============================================================================
 class PokeBattle_Move_012 < PokeBattle_FlinchMove
   def pbMoveFailed?(user,targets)
-    if user.turnCount>1 || user.lastRoundMoved>=0
+    if user.turnCount > 1
       @battle.pbDisplay(_INTL("But it failed!"))
       return true
     end
diff --git a/Data/Scripts/012_Battle/002_Move/007_Move_Effects_100-17F.rb b/Data/Scripts/012_Battle/002_Move/007_Move_Effects_100-17F.rb
index e8fbadf2e..29d993a13 100644
--- a/Data/Scripts/012_Battle/002_Move/007_Move_Effects_100-17F.rb
+++ b/Data/Scripts/012_Battle/002_Move/007_Move_Effects_100-17F.rb
@@ -1557,7 +1557,7 @@ end
 #===============================================================================
 class PokeBattle_Move_149 < PokeBattle_Move
   def pbMoveFailed?(user,targets)
-    if user.turnCount>1 || user.lastRoundMoved>=0
+    if user.turnCount > 1
       @battle.pbDisplay(_INTL("But it failed!"))
       return true
     end
@@ -2576,7 +2576,7 @@ end
 #===============================================================================
 class PokeBattle_Move_174 < PokeBattle_Move
   def pbMoveFailed?(user,targets)
-    if user.turnCount>1 || user.lastRoundMoved>=0
+    if user.turnCount > 1
       @battle.pbDisplay(_INTL("But it failed!"))
       return true
     end
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 6a3541dff..8f5e33410 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
@@ -169,7 +169,8 @@ class PokeBattle_Battle
             idxPartyForName = idxPartyNew
             enemyParty = pbParty(idxBattler)
             if isConst?(enemyParty[idxPartyNew].ability,PBAbilities,:ILLUSION)
-              idxPartyForName = pbLastInTeam(idxBattler)
+              new_index = pbLastInTeam(idxBattler)
+              idxPartyForName = new_index if new_index >= 0
             end
             if pbDisplayConfirm(_INTL("{1} is about to send in {2}. Will you switch your Pokémon?",
                opponent.fullname,enemyParty[idxPartyForName].name))
@@ -255,7 +256,8 @@ class PokeBattle_Battle
     party = pbParty(idxBattler)
     newPkmnName = party[idxParty].name
     if isConst?(party[idxParty].ability,PBAbilities,:ILLUSION)
-      newPkmnName = party[pbLastInTeam(idxBattler)].name
+      new_index = pbLastInTeam(idxBattler)
+      newPkmnName = party[new_index].name if new_index >= 0
     end
     if pbOwnedByPlayer?(idxBattler)
       opposing = @battlers[idxBattler].pbDirectOpposing
diff --git a/Data/Scripts/012_Battle/004_AI/005_AI_Move_EffectScores.rb b/Data/Scripts/012_Battle/004_AI/005_AI_Move_EffectScores.rb
index f9afd1b77..f7caaae82 100644
--- a/Data/Scripts/012_Battle/004_AI/005_AI_Move_EffectScores.rb
+++ b/Data/Scripts/012_Battle/004_AI/005_AI_Move_EffectScores.rb
@@ -3064,7 +3064,7 @@ class PokeBattle_AI
     when "173"
     #---------------------------------------------------------------------------
     when "174"
-      score -= 90 if user.turnCount>0 || user.lastRoundMoved>=0
+      score -= 90 if user.turnCount > 0
     #---------------------------------------------------------------------------
     when "175"
       score += 30 if target.effects[PBEffects::Minimize]
diff --git a/Data/Scripts/012_Battle/007_BattleHandlers_Abilities.rb b/Data/Scripts/012_Battle/007_BattleHandlers_Abilities.rb
index b28019536..791e0faa3 100644
--- a/Data/Scripts/012_Battle/007_BattleHandlers_Abilities.rb
+++ b/Data/Scripts/012_Battle/007_BattleHandlers_Abilities.rb
@@ -1672,7 +1672,7 @@ BattleHandlers::UserAbilityEndOfMove.add(:BEASTBOOST,
 
 BattleHandlers::UserAbilityEndOfMove.add(:MAGICIAN,
   proc { |ability,user,targets,move,battle|
-    next if !battle.futureSight
+    next if battle.futureSight
     next if !move.pbDamagingMove?
     next if user.item>0
     next if battle.wildBattle? && user.opposes?