merge mail with master, fix conflicts

src/mail_data.c

@@ -1,9 +1,9 @@
 #include "global.h"
 #include "mail.h"
-#include "items.h"
+#include "constants/items.h"
 #include "pokemon.h"
 #include "pokemon_icon.h"
-#include "species.h"
+#include "constants/species.h"
 #include "text.h"
 #include "international_string_util.h"
 
@@ -199,5 +199,5 @@ bool8 ItemIsMail(u16 itemId)
         return TRUE;
     default:
         return FALSE;
-}
+    }
 }