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
@@ -8,7 +8,7 @@
 #include "link.h"
 #include "util.h"
 #include "main.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "window.h"
 #include "m4a.h"