From 9a431dae99b018bdc1d7c4174cccd3bc4b1ae233 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 14 Oct 2019 14:56:49 -0400 Subject: Decompile mail --- include/mail.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/mail.h') diff --git a/include/mail.h b/include/mail.h index 3ba731c66..e31b44d5d 100644 --- a/include/mail.h +++ b/include/mail.h @@ -18,7 +18,10 @@ || itemId == ITEM_FAB_MAIL \ || itemId == ITEM_RETRO_MAIL)) +#define FIRST_MAIL_IDX ITEM_ORANGE_MAIL -void sub_80BEBEC(struct MailStruct * mail, void (* callback)(void), u8 a2); +#define ITEM_TO_MAIL(itemId) (itemId - FIRST_MAIL_IDX) + +void ReadMail(struct MailStruct * mail, void (* callback)(void), bool8 messageExists); #endif // GUARD_MAIL_H -- cgit v1.2.3 From efe992763fa74a5ceab40ba7c89cd70430902fa3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 14 Oct 2019 15:53:09 -0400 Subject: Address review comments --- include/mail.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/mail.h') diff --git a/include/mail.h b/include/mail.h index e31b44d5d..7fb8ad96a 100644 --- a/include/mail.h +++ b/include/mail.h @@ -21,7 +21,8 @@ #define FIRST_MAIL_IDX ITEM_ORANGE_MAIL #define ITEM_TO_MAIL(itemId) (itemId - FIRST_MAIL_IDX) +#define MAIL(name) (ITEM_TO_MAIL(ITEM_##name##_MAIL)) -void ReadMail(struct MailStruct * mail, void (* callback)(void), bool8 messageExists); +void ReadMail(struct MailStruct * mail, void (*savedCallback)(void), bool8 messageExists); #endif // GUARD_MAIL_H -- cgit v1.2.3 From 19df609026e349c893c92e2c1018a3727c13acb8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 15 Oct 2019 09:54:42 -0400 Subject: Revert MAIL(name) macro --- include/mail.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/mail.h') diff --git a/include/mail.h b/include/mail.h index 7fb8ad96a..ca2fbfcc8 100644 --- a/include/mail.h +++ b/include/mail.h @@ -21,7 +21,6 @@ #define FIRST_MAIL_IDX ITEM_ORANGE_MAIL #define ITEM_TO_MAIL(itemId) (itemId - FIRST_MAIL_IDX) -#define MAIL(name) (ITEM_TO_MAIL(ITEM_##name##_MAIL)) void ReadMail(struct MailStruct * mail, void (*savedCallback)(void), bool8 messageExists); -- cgit v1.2.3