From fe043d734043b4d08ffaa3292cec31711a4e1dc0 Mon Sep 17 00:00:00 2001
From: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Mon, 6 Apr 2026 01:44:36 +0200
Subject: [PATCH] fix multi partner intro

---
 .../multi_battle_intro_bg_opponent.bin        | Bin 4096 -> 4096 bytes
 .../multi_battle_intro_bg_player.bin          | Bin 4096 -> 4096 bytes
 src/battle_bg.c                               |   8 ++------
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/graphics/battle_frontier/multi_battle_intro_bg_opponent.bin b/graphics/battle_frontier/multi_battle_intro_bg_opponent.bin
index c38b76d4a2c5dd0f71264708c40ddcd64220db51..3793cef43bb0b95ed635f7b1b0334c94847f2f03 100644
GIT binary patch
literal 4096
zcmeH}Ne+TQ5JhnUXPgIccq(eEsK-F${`ZlE8&?=B!5FLG`uFfs$?uq0#0?n<GVaKT
z$dMp=CG+e8MM{*ZVB@6NL6sVH8Z<Mr5iQ!dbm-Ef&wwE##!Q&v;WNwJVNTn)X2BBZ
zhrMvcnoUZ8XMD5G%t!3lV>occHcpBio(MT};rdKly3~LgPy=e<D+Xlk9}C<6CT#yi
h*#7r7IxNTk!5`knLOAxno)<n}<7z++sDV!nJOIBy`Gx=h

literal 4096
zcmeIz$4){)7zJPy3)L<~Q9pY@rCKQJtH6E#hah23?&2;;%s*#2Iho|kBqxz%%3QY0
zL{<xI*p#<r+m2lYMI~hwReSbR<qjM=a_q#Zn!1LjGv`_^T)Il_bM3~hJNF(udh+Z=
z+p9P4I;s7xp1y&h51+n#8yTCJ`tj>;+0VrZfe;9R5Lk;qw)IakuKzrBLsoBN-24ZD
QwS4+`Gz3B*1VSLU0HQN75C8xG

diff --git a/graphics/battle_frontier/multi_battle_intro_bg_player.bin b/graphics/battle_frontier/multi_battle_intro_bg_player.bin
index 7cc984cffd02b6e7621f257f246b3f890ebdda09..8ec9100f294bda69dc569834d0ff1266ab7386db 100644
GIT binary patch
literal 4096
zcmeH|OAdoD3<Wug7aU+(e*M!z+Yq?_eTcea6(LJer8u*TWjUFJpBJxU5*>@^m_>(^
zgp_Ve%Gox{4E&=3TmTLnsi*^0-O$qg?n5o|<`ZWwT)A=QK_7VXVqoOWhi|mMuww=?
uHlRy?uT1|*nf{A1{pZMbiEW>q^=<l>JG;}q)ux$&3=Cwv`t9pxpjZLK;s&4q

literal 4096
zcmeIz$q|Dv5JXWz`Jn)2wb?O?ZOo$lgK!8ssC-hZ&pOPjnjV93%7t4_6bVScSAmd-
zm>UTx894<dcOF#KG_=-s=;#?3c``Axu=3)~hm9{ghxLD;CjpNI+^)ZIy#AMUKYi^*
R%`E{5{9nN1>euKJ2!5~Ze$M~^

diff --git a/src/battle_bg.c b/src/battle_bg.c
index b59a5069b..4643320ac 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -916,7 +916,7 @@ static u8 GetBattleEnvironmentOverride(void)
         return gBattleEnvironment;
     }
 
-    if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_RECORDED_LINK))
+    if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER))
     {
         return BATTLE_ENVIRONMENT_LINK;
     }
@@ -1308,11 +1308,7 @@ void DrawBattleEntryBackground(void)
     {
         LoadBattleEnvironmentEntryGfx(BATTLE_ENVIRONMENT_GRASS);
     }
-    else if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_RECORDED_LINK))
-    {
-        LoadBattleEnvironmentEntryGfx(BATTLE_ENVIRONMENT_BUILDING);
-    }
-    else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER))
+    else if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER))
     {
         if (TestRunner_Battle_GetForcedEnvironment()
          && gBattleEnvironmentInfo[gBattleEnvironment].background.tilemap