From 9a431dae99b018bdc1d7c4174cccd3bc4b1ae233 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 14 Oct 2019 14:56:49 -0400 Subject: Decompile mail --- include/graphics.h | 38 ++++++++++++++++++++++++++++++++++++++ include/mail.h | 5 ++++- include/player_pc.h | 1 + include/pokemon_icon.h | 2 ++ include/strings.h | 3 +++ 5 files changed, 48 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 1c0612fd1..9af673992 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -1036,4 +1036,42 @@ extern const u32 gBerryPouchBgPal0FemaleOverride[]; extern const u32 gBerryPouchSpritePalette[]; extern const u8 gBerryPouchBg1Tilemap[]; +// mail +extern const u16 gFile_graphics_mail_orange_palette_pal[]; +extern const u16 gFile_graphics_mail_harbor_palette_pal[]; +extern const u16 gFile_graphics_mail_glitter_palette_pal[]; +extern const u16 gFile_graphics_mail_mech_palette_pal[]; +extern const u16 gFile_graphics_mail_wood_palette_pal[]; +extern const u16 gFile_graphics_mail_wave_palette_pal[]; +extern const u16 gFile_graphics_mail_bead_palette_pal[]; +extern const u16 gFile_graphics_mail_shadow_palette_pal[]; +extern const u16 gFile_graphics_mail_tropic_palette_pal[]; +extern const u16 gFile_graphics_mail_dream_palette_pal[]; +extern const u16 gFile_graphics_mail_fab_palette_pal[]; +extern const u16 gFile_graphics_mail_retro_palette_pal[]; +extern const u32 gFile_graphics_mail_orange_tiles_sheet[]; +extern const u32 gFile_graphics_mail_harbor_tiles_sheet[]; +extern const u32 gFile_graphics_mail_glitter_tiles_sheet[]; +extern const u32 gFile_graphics_mail_mech_tiles_sheet[]; +extern const u32 gFile_graphics_mail_wood_tiles_sheet[]; +extern const u32 gFile_graphics_mail_wave_tiles_sheet[]; +extern const u32 gFile_graphics_mail_bead_tiles_sheet[]; +extern const u32 gFile_graphics_mail_shadow_tiles_sheet[]; +extern const u32 gFile_graphics_mail_tropic_tiles_sheet[]; +extern const u32 gFile_graphics_mail_dream_tiles_sheet[]; +extern const u32 gFile_graphics_mail_fab_tiles_sheet[]; +extern const u32 gFile_graphics_mail_retro_tiles_sheet[]; +extern const u32 gFile_graphics_mail_orange_map_tilemap[]; +extern const u32 gFile_graphics_mail_harbor_map_tilemap[]; +extern const u32 gFile_graphics_mail_glitter_map_tilemap[]; +extern const u32 gFile_graphics_mail_mech_map_tilemap[]; +extern const u32 gFile_graphics_mail_wood_map_tilemap[]; +extern const u32 gFile_graphics_mail_wave_map_tilemap[]; +extern const u32 gFile_graphics_mail_bead_map_tilemap[]; +extern const u32 gFile_graphics_mail_shadow_map_tilemap[]; +extern const u32 gFile_graphics_mail_tropic_map_tilemap[]; +extern const u32 gFile_graphics_mail_dream_map_tilemap[]; +extern const u32 gFile_graphics_mail_fab_map_tilemap[]; +extern const u32 gFile_graphics_mail_retro_map_tilemap[]; + #endif //GUARD_GRAPHICS_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 diff --git a/include/player_pc.h b/include/player_pc.h index ecaf023e5..a1ebcddaa 100644 --- a/include/player_pc.h +++ b/include/player_pc.h @@ -19,6 +19,7 @@ struct PlayerPCItemPageStruct }; // Exported RAM declarations +extern struct PlayerPCItemPageStruct gPlayerPcMenuManager; // Exported ROM declarations diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index 60da74bcb..d5aab71de 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -17,5 +17,7 @@ u8 sub_8096ECC(u16, void (*)(struct Sprite *), s16, s16, u8, bool32); void sub_8097070(struct Sprite *); u16 GetUnownLetterByPersonality(u32 personality); u8 UpdateMonIconFrame(struct Sprite *sprite); +void sub_80970E0(u16 iconId); +void sub_8097168(u16 iconId); #endif // GUARD_POKEMON_ICON_H diff --git a/include/strings.h b/include/strings.h index 2c2756eb5..8f3da98cf 100644 --- a/include/strings.h +++ b/include/strings.h @@ -472,4 +472,7 @@ extern const u8 gSaveStatName_Badges[]; extern const u8 gSaveStatName_Pokedex[]; extern const u8 gSaveStatName_Time[]; +// mail +extern const u8 gText_From[]; + #endif //GUARD_STRINGS_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') 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') 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