summaryrefslogtreecommitdiff
path: root/src/mail.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-06-18 13:01:55 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-06-18 13:01:55 -0400
commit5d04fe94d9eed2980ac0b439b0e45af13c792037 (patch)
treebf9f0c1eaecbcf25e9de4ef6d5c99c16f132e5a4 /src/mail.c
parent02af81bc95367d4557189fda0f1dccccf16c852a (diff)
parent13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff)
Merge remote-tracking branch 'origin/master' into field_map_obj_data
Diffstat (limited to 'src/mail.c')
-rw-r--r--src/mail.c8
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;