merge mail with master, fix conflicts

2017-12-17 20:22:56 +01:00
parent 930fea6fad 6d73bb4b57
commit 46fa2557d7
217 changed files with 22013 additions and 26319 deletions
@@ -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"