diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-26 14:18:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-26 14:18:38 -0400 |
| commit | d6571f2355d356431809668e8e905606a28ce7cf (patch) | |
| tree | 9961920c8d686f8e06cd3c050c0ee8bd536b09c4 /src/party_menu.c | |
| parent | 4f7f6c1082ff759967b42741050534dfbc175361 (diff) | |
| parent | 7a89ad98c38cee231a2659135ef487bb5fc5ad9d (diff) | |
Merge pull request #1525 from GriffinRichards/doc-recmix
Document remainder of Record Mixing
Diffstat (limited to 'src/party_menu.c')
| -rwxr-xr-x | src/party_menu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/party_menu.c b/src/party_menu.c index 9829d62e9..95a4852db 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1726,7 +1726,7 @@ static void GiveItemToMon(struct Pokemon *mon, u16 item) if (ItemIsMail(item) == TRUE) { - if (GiveMailToMon(mon, item) == 0xFF) + if (GiveMailToMonByItemId(mon, item) == MAIL_NONE) return; } itemBytes[0] = item; @@ -5468,7 +5468,7 @@ void ChooseMonToGiveMailFromMailbox(void) static void TryGiveMailToSelectedMon(u8 taskId) { struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId]; - struct MailStruct *mail; + struct Mail *mail; gPartyMenuUseExitCallback = FALSE; mail = &gSaveBlock1Ptr->mail[gPlayerPCItemPageInfo.itemsAbove + PARTY_SIZE + gPlayerPCItemPageInfo.cursorPos]; @@ -5478,8 +5478,8 @@ static void TryGiveMailToSelectedMon(u8 taskId) } else { - GiveMailToMon2(mon, mail); - ClearMailStruct(mail); + GiveMailToMon(mon, mail); + ClearMail(mail); DisplayPartyMenuMessage(gText_MailTransferredFromMailbox, TRUE); } ScheduleBgCopyTilemapToVram(2); |