Merge branch 'master' into battle

2019-08-03 06:59:28 +08:00
parent 6a063cf74a d58bf398b2
commit 26a7192186
80 changed files with 4813 additions and 7283 deletions
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "task.h"
 #include "malloc.h"
@@ -22,7 +23,6 @@
 #include "map_obj_8097404.h"
 #include "unk_810c3a4.h"
 #include "constants/movement_commands.h"
-#include "constants/songs.h"
 #include "vs_seeker.h"

 typedef enum