Merge branch 'master' into decompile_use_pokeblock

2017-12-16 11:42:59 +01:00
parent 4351676749 224fdbf026
commit f4ab21ee67
133 changed files with 17392 additions and 19451 deletions
@@ -2,14 +2,14 @@
 #include "pokemon.h"
 #include "daycare.h"
 #include "string_util.h"
-#include "species.h"
-#include "items.h"
+#include "constants/species.h"
+#include "constants/items.h"
 #include "mail.h"
 #include "pokemon_storage_system.h"
 #include "event_data.h"
 #include "random.h"
 #include "main.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "egg_hatch.h"
 #include "text.h"
 #include "menu.h"