From adb4e54e950e7eb19eac79d06b2a29a8ee5f41eb Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 18 Sep 2022 22:34:06 -0300 Subject: [PATCH] =?UTF-8?q?Fixed=20multi=20battle=20battler=20coordinates?= =?UTF-8?q?=20and=20party=20menu=20when=20only=20one=20Pok=C3=A9mon=20is?= =?UTF-8?q?=20chosen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/battle_interface.c | 4 +++- src/party_menu.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/battle_interface.c b/src/battle_interface.c index ebd7a3ab3..6c3daf8e9 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -767,7 +767,9 @@ static void InitLastUsedBallAssets(void) // This function is here to cover a specific case - one player's mon in a 2 vs 1 double battle. In this scenario - display singles layout. u32 WhichBattleCoords(u32 battlerId) // 0 - singles, 1 - doubles { - if (GetBattlerPosition(battlerId) == B_POSITION_PLAYER_LEFT && gPlayerPartyCount == 1) + if (GetBattlerPosition(battlerId) == B_POSITION_PLAYER_LEFT + && gPlayerPartyCount == 1 + && !(gBattleTypeFlags & BATTLE_TYPE_MULTI)) return 0; else return IsDoubleBattle(); diff --git a/src/party_menu.c b/src/party_menu.c index a93f66ebb..7d58dbf4f 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -6158,10 +6158,10 @@ void ChooseMonForWirelessMinigame(void) static u8 GetPartyLayoutFromBattleType(void) { - if (!IsDoubleBattle() || gPlayerPartyCount == 1) // Draw the single layout in a double battle where the player has only one pokemon. - return PARTY_LAYOUT_SINGLE; if (IsMultiBattle() == TRUE) return PARTY_LAYOUT_MULTI; + if (!IsDoubleBattle() || gPlayerPartyCount == 1) // Draw the single layout in a double battle where the player has only one pokemon. + return PARTY_LAYOUT_SINGLE; return PARTY_LAYOUT_DOUBLE; }