8 files changed, 12 insertions, 8 deletions
diff --git a/src/battle/anim/battle_intro.c b/src/battle/anim/battle_intro.c
index a189b1425..c18f5790c 100644
--- a/src/battle/anim/battle_intro.c
+++ b/src/battle/anim/battle_intro.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "constants/battle_constants.h"
+#include "constants/battle.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_anim_80CA710.h"
diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c
index 9b447ce5a..23bf9373d 100644
--- a/src/battle/anim/current.c
+++ b/src/battle/anim/current.c
@@ -4,7 +4,7 @@
 #include "rom_8077ABC.h"
 #include "sound.h"
 #include "trig.h"
-#include "constants/battle_constants.h"
+#include "constants/battle.h"
 #include "constants/songs.h"
 
 extern s16 gBattleAnimArgs[];
diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c
index 47f86b744..f98623ee6 100644
--- a/src/battle/anim/dark.c
+++ b/src/battle/anim/dark.c
@@ -9,7 +9,7 @@
 #include "sound.h"
 #include "sprite.h"
 #include "trig.h"
-#include "constants/battle_constants.h"
+#include "constants/battle.h"
 
 extern s16 gBattleAnimArgs[];
 extern u8 gBattleAnimAttacker;
diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c
index f51a5c56c..6b8d8a3b5 100644
--- a/src/battle/anim/fight.c
+++ b/src/battle/anim/fight.c
@@ -5,7 +5,7 @@
 #include "sprite.h"
 #include "task.h"
 #include "trig.h"
-#include "constants/battle_constants.h"
+#include "constants/battle.h"
 
 extern s16 gBattleAnimArgs[];
 extern u8 gBankAttacker;
diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c
index 69d47a998..d2db76975 100644
--- a/src/battle/anim/ghost.c
+++ b/src/battle/anim/ghost.c
@@ -7,7 +7,7 @@
 #include "scanline_effect.h"
 #include "sound.h"
 #include "trig.h"
-#include "constants/battle_constants.h"
+#include "constants/battle.h"
 #include "constants/songs.h"
 
 extern s16 gBattleAnimArgs[];
diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c
index fed21ebe9..76300df4b 100644
--- a/src/battle/anim/ice.c
+++ b/src/battle/anim/ice.c
@@ -4,7 +4,7 @@
 #include "rom_8077ABC.h"
 #include "battle.h"
 #include "battle_anim.h"
-#include "constants/battle_constants.h"
+#include "constants/battle.h"
 #include "task.h"
 #include "decompress.h"
 #include "palette.h"
diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c
index 4ac8737ad..b611ca62e 100644
--- a/src/battle/anim/normal.c
+++ b/src/battle/anim/normal.c
@@ -10,7 +10,7 @@
 #include "sound.h"
 #include "task.h"
 #include "trig.h"
-#include "constants/battle_constants.h"
+#include "constants/battle.h"
 #include "constants/songs.h"
 
 extern s16 gBattleAnimArgs[];
diff --git a/src/battle/anim/roots.c b/src/battle/anim/roots.c
index e2dd4a2af..245f201dd 100644
--- a/src/battle/anim/roots.c
+++ b/src/battle/anim/roots.c
@@ -6,7 +6,11 @@
 extern s16 gBattleAnimArgs[];
 extern u8 gBattleAnimAttacker;
 extern u8 gBattleAnimTarget;
-extern s16 gUnknown_03000728[];
+
+BSS_DATA u32 filler_03000724;
+BSS_DATA u16 gUnknown_03000728[4];
+BSS_DATA u16 gUnknown_03000730[6];
+BSS_DATA u32 filler_0300073c;
 
 void sub_80CB59C(struct Sprite* sprite);
 void sub_80CB620(struct Sprite *sprite);