ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2335 from AsparagusEduardo/RHH/pr/MultiBattleFix

Browse Source 
Multi battle interface fix
This commit is contained in:
ghoulslash 2022-09-26 09:12:40 -04:00 committed by GitHub
commit ff42806e04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_interface.c
View File

@ -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. // 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 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; return 0;
else else
return IsDoubleBattle(); return IsDoubleBattle();

4
src/party_menu.c
View File

@ -6157,10 +6157,10 @@ void ChooseMonForWirelessMinigame(void)
static u8 GetPartyLayoutFromBattleType(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) if (IsMultiBattle() == TRUE)
return PARTY_LAYOUT_MULTI; 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; return PARTY_LAYOUT_DOUBLE;
} }