Merge branch 'master' into decompile_battle1

1 files changed, 12 insertions, 2 deletions

diff --git a/include/mail.h b/include/mail.h
index 0a70237bf..042586653 100644
--- a/include/mail.h
+++ b/include/mail.h
@@ -14,10 +14,20 @@
                               || itemId == ITEM_FAB_MAIL            \
                               || itemId == ITEM_RETRO_MAIL))
 
+// mail.h
+void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag);
 
+// mail_data.h
+void ClearMailData(void);
+void ClearMailStruct(struct MailStruct *mail);
 bool8 MonHasMail(struct Pokemon *mon);
-void TakeMailFromMon(struct Pokemon *mon);
+u8 GiveMailToMon(struct Pokemon *mon, u16 itemId);
+u16 SpeciesToMailSpecies(u16 species, u32 personality);
+u16 MailSpeciesToSpecies(u16 mailSpecies, u16 *buffer);
 u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail);
-void ClearMailStruct(struct MailStruct *mail);
+void TakeMailFromMon(struct Pokemon *mon);
+void ClearMailItemId(u8 mailId);
+u8 TakeMailFromMon2(struct Pokemon *mon);
+bool8 ItemIsMail(u16 itemId);
 
 #endif // GUARD_MAIL_H