Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow to send active mon to PC when capturing a Pokemon (#8111)

Browse Source
This commit is contained in:
FosterProgramming 2025-11-06 01:21:13 +01:00 committed by GitHub
parent c8159ba182
commit 1f8a40962a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/party_menu.c
View File

@ -1512,15 +1512,7 @@ static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr)
case PARTY_ACTION_SEND_MON_TO_BOX:
{
u8 partyId = (u8)*slotPtr;
if (partyId == 0 || ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && partyId == 1))
{
// Can't select if mon is currently on the field
PlaySE(SE_FAILURE);
DisplayPartyMenuMessage(gText_CannotSendMonToBoxActive, FALSE);
ScheduleBgCopyTilemapToVram(2);
gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
}
else if ((gBattleTypeFlags & BATTLE_TYPE_MULTI) && partyId >= (PARTY_SIZE / 2))
if ((gBattleTypeFlags & BATTLE_TYPE_MULTI) && partyId >= (PARTY_SIZE / 2))
{
// Can't select if mon doesn't belong to you
PlaySE(SE_FAILURE);