Fix bug where mon selection doesn't properly account for party order (#8088)
This commit is contained in:
parent
0b005d4b6f
commit
79441c6574
@ -1511,7 +1511,7 @@ static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr)
|
||||
}
|
||||
case PARTY_ACTION_SEND_MON_TO_BOX:
|
||||
{
|
||||
u8 partyId = GetPartyIdFromBattleSlot((u8)*slotPtr);
|
||||
u8 partyId = (u8)*slotPtr;
|
||||
if (partyId == 0 || ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && partyId == 1))
|
||||
{
|
||||
// Can't select if mon is currently on the field
|
||||
@ -1538,7 +1538,7 @@ static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr)
|
||||
else
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
gSelectedMonPartyId = partyId;
|
||||
gSelectedMonPartyId = GetPartyIdFromBattleSlot(partyId);
|
||||
Task_ClosePartyMenu(taskId);
|
||||
}
|
||||
break;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user