diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-17 20:22:56 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-17 20:22:56 +0100 |
| commit | 46fa2557d777096803ff90ba95d5500a9c03d2c5 (patch) | |
| tree | ded4f0e046be43e371631fca3ac013d96fa244e0 /src/mail.c | |
| parent | 930fea6fad24692773b930ec7448c59d599844b8 (diff) | |
| parent | 6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e (diff) | |
merge mail with master, fix conflicts
Diffstat (limited to 'src/mail.c')
| -rw-r--r-- | src/mail.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mail.c b/src/mail.c index bee0e5e88..ec7ff2ce2 100644 --- a/src/mail.c +++ b/src/mail.c @@ -1,5 +1,6 @@ #include "global.h" #include "mail.h" +#include "constants/items.h" #include "main.h" #include "overworld.h" #include "task.h" @@ -15,7 +16,7 @@ #include "gpu_regs.h" #include "bg.h" #include "pokemon_icon.h" -#include "species.h" +#include "constants/species.h" #include "malloc.h" #include "easy_chat.h" |