diff --git a/src/mail_data.c b/src/mail_data.c index 2ae9bedab7c5..41f4c65f0e10 100644 --- a/src/mail_data.c +++ b/src/mail_data.c @@ -161,22 +161,6 @@ u8 TakeMailFromMon2(struct Pokemon *mon) u8 newHeldItem[2]; u8 newMailId; - newHeldItem[0] = ITEM_NONE; - newHeldItem[1] = ITEM_NONE << 8; - newMailId = MAIL_NONE; - - for (i = PARTY_SIZE; i < MAIL_COUNT; i++) - { - if (gSaveBlock1Ptr->mail[i].itemId == ITEM_NONE) - { - memcpy(&gSaveBlock1Ptr->mail[i], &gSaveBlock1Ptr->mail[GetMonData(mon, MON_DATA_MAIL)], sizeof(struct MailStruct)); - gSaveBlock1Ptr->mail[GetMonData(mon, MON_DATA_MAIL)].itemId = ITEM_NONE; - SetMonData(mon, MON_DATA_MAIL, &newMailId); - SetMonData(mon, MON_DATA_HELD_ITEM, newHeldItem); - return i; - } - } - return MAIL_NONE; } diff --git a/src/player_pc.c b/src/player_pc.c index 6d4f58869c9f..6dd59bd7db13 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -662,14 +662,7 @@ static void ItemStorage_EraseMainMenu(u8 taskId) static u8 GetMailboxMailCount(void) { - u8 mailInPC, i; - - // Count mail in PC (by first skipping over mail in party) - for (mailInPC = 0, i = PARTY_SIZE; i < MAIL_COUNT; i++) - if (gSaveBlock1Ptr->mail[i].itemId != ITEM_NONE) - mailInPC++; - - return mailInPC; + return 0; } static void Mailbox_CompactMailList(void)