diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-20 20:41:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 20:41:33 -0400 |
| commit | 4ba573ed1eba7c37160ce6107d95447f42902385 (patch) | |
| tree | 5973f1e72156bb75cb6561a11dd7f333b90fcb3f /src/mail.c | |
| parent | 13b02fc8232ce61062afe46ca13a1930a3bbc286 (diff) | |
| parent | b22e5219ba01c70da9a03397430bff10d0b99060 (diff) | |
Merge branch 'master' into patch-1
Diffstat (limited to 'src/mail.c')
| -rw-r--r-- | src/mail.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mail.c b/src/mail.c index 4ec107011..658d37976 100644 --- a/src/mail.c +++ b/src/mail.c @@ -1,16 +1,20 @@ #include "global.h" #include "mail.h" -#include "asm.h" +#include "easy_chat.h" #include "items.h" +#include "mail_data.h" #include "menu.h" +#include "menu_helpers.h" #include "name_string_util.h" #include "palette.h" +#include "pokemon_icon.h" #include "rom4.h" #include "sprite.h" #include "string_util.h" #include "strings2.h" #include "task.h" #include "text.h" +#include "unknown_task.h" struct UnkMailStruct { @@ -84,7 +88,7 @@ static void sub_80F8FB4(void); void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) { u16 mailDesign; - u8 buffer[4]; + u16 buffer[2]; ewram0.varFF = GAME_LANGUAGE; ewram0.var100 = 1; |