Merge branch 'master' into mystery_gift

13 files changed, 9 insertions, 0 deletions

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 6098e2d3a..61876e0de 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "battle_ai_script_commands.h"
 #include "battle_factory.h"
 #include "battle_setup.h"
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index a5958ebc6..2d67fda99 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "battle_controllers.h"
 #include "pokemon.h"
 #include "random.h"
diff --git a/src/battle_anim_80D51AC.c b/src/battle_anim_mon_movement.c
index 250a0459f..250a0459f 100644
--- a/src/battle_anim_80D51AC.c
+++ b/src/battle_anim_mon_movement.c
diff --git a/src/battle_anim_80A5C6C.c b/src/battle_anim_mons.c
index 372377a0c..372377a0c 100644
--- a/src/battle_anim_80A5C6C.c
+++ b/src/battle_anim_mons.c
diff --git a/src/battle_anim_8170478.c b/src/battle_anim_special.c
index 92874fe09..92874fe09 100755
--- a/src/battle_anim_8170478.c
+++ b/src/battle_anim_special.c
diff --git a/src/battle_anim_80A9C70.c b/src/battle_anim_status_effects.c
index 1271680e0..1271680e0 100644
--- a/src/battle_anim_80A9C70.c
+++ b/src/battle_anim_status_effects.c
diff --git a/src/battle_main.c b/src/battle_main.c
index 0f593fef6..19fd01e3c 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "battle_ai_script_commands.h"
 #include "battle_arena.h"
 #include "battle_controllers.h"
diff --git a/src/battle_message.c b/src/battle_message.c
index 6762cd416..f93765b89 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "battle_controllers.h"
 #include "battle_message.h"
 #include "battle_setup.h"
diff --git a/src/battle_tv.c b/src/battle_tv.c
index d3ca9b61f..26df08786 100644
--- a/src/battle_tv.c
+++ b/src/battle_tv.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "pokemon.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "battle_tv.h"
 #include "constants/battle_string_ids.h"
 #include "constants/battle_anim.h"
diff --git a/src/battle_util.c b/src/battle_util.c
index aa88cf952..a7962b7f7 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "constants/battle_script_commands.h"
 #include "constants/abilities.h"
 #include "constants/moves.h"
diff --git a/src/battle_util2.c b/src/battle_util2.c
index 9c0d55a57..5ef969fd5 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "battle_controllers.h"
 #include "alloc.h"
 #include "pokemon.h"
diff --git a/src/pokemon.c b/src/pokemon.c
index 1ee9c4cff..7c26b4c22 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -2,6 +2,7 @@
 #include "alloc.h"
 #include "apprentice.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "battle_controllers.h"
 #include "battle_message.h"
 #include "battle_pike.h"
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index c11dc55e7..acd4c2ce6 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "recorded_battle.h"
 #include "main.h"
 #include "pokemon.h"