convert more constants

src/battle_2.c

@@ -11,7 +11,7 @@
 #include "palette.h"
 #include "task.h"
 #include "event_data.h"
-#include "species.h"
+#include "constants/species.h"
 #include "berry.h"
 #include "text.h"
 #include "item.h"
@@ -26,7 +26,7 @@
 #include "m4a.h"
 #include "window.h"
 #include "random.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "battle_message.h"
 #include "sprite.h"
@@ -37,7 +37,7 @@
 #include "battle_controllers.h"
 #include "pokedex.h"
 #include "constants/abilities.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "trainer_classes.h"
 #include "evolution_scene.h"
 #include "roamer.h"