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
@@ -11,7 +11,7 @@
 #include "random.h"
 #include "string_util.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "item_menu.h"
 #include "text.h"
 #include "easy_chat.h"