From c4d83f0640b3cdae7698bdf14800f61b80a8ef34 Mon Sep 17 00:00:00 2001
From: Aaron B-D <pyredrid@gmail.com>
Date: Fri, 25 Sep 2020 17:40:38 -0400
Subject: [PATCH] Fixed 2v1 Multi battles stalling indefinitely at the battle's
 intro Fixes Issue #492

---
 src/battle_controller_opponent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index f244377aa5..78765a3867 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -299,7 +299,7 @@ static void sub_805F560(void)
         TryShinyAnimation(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
-     && !(gBattleTypeFlags & BATTLE_TYPE_MULTI)
+     && (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) || BATTLE_TWO_VS_ONE_OPPONENT)
      && IsDoubleBattle()
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive