diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
| commit | 44abbae60b6a39e2a1432426005e1860be196abb (patch) | |
| tree | f2405db72863761afcdcda57a88cf6ab0346e4fd /src/mail.c | |
| parent | 039c9f4bd8ee6bfb299d4422372804c569eddebd (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
nerge 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 dddc06feb..877035fb6 100644 --- a/src/mail.c +++ b/src/mail.c @@ -1,4 +1,5 @@ #include "global.h" +#include "constants/items.h" #include "main.h" #include "overworld.h" #include "task.h" @@ -14,7 +15,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" #include "mail_data.h" |