Remove water.h and flying.h

include/battle_anim.h

@@ -223,6 +223,12 @@ void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5,
 void sub_810310C(u8 battler, struct Sprite* sprite);
 void AnimMoveTwisterParticle(struct Sprite* sprite);
 
+// water.c
+void sub_8108C94(struct Sprite *sprite);
+
+// flying.c
+void sub_810E2C8(struct Sprite *sprite);
+
 // smokescreen.c
 u8 sub_807521C(s16 x, s16 y, u8 a3);
 

include/flying.h

@@ -1,6 +0,0 @@
-#ifndef GUARD_FLYING_H
-#define GUARD_FLYING_H
-
-void sub_810E2C8(struct Sprite *sprite);
-
-#endif // GUARD_FLYING_H

include/water.h

@@ -1,6 +0,0 @@
-#ifndef GUARD_WATER_H
-#define GUARD_WATER_H
-
-void sub_8108C94(struct Sprite *sprite);
-
-#endif // GUARD_WATER_H

src/battle_anim_effects_2.c

@@ -15,7 +15,6 @@
 #include "util.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
-#include "water.h"
 
 void sub_8103448(struct Sprite *);
 void sub_8103498(struct Sprite *);

src/battle_anim_effects_3.c

@@ -23,7 +23,6 @@
 #include "constants/songs.h"
 #include "constants/species.h"
 #include "constants/weather.h"
-#include "flying.h"
 
 extern const struct SpriteTemplate gUnknown_08593114;
 extern const union AffineAnimCmd *const gUnknown_082FF6C0[];

src/electric.c

@@ -4,7 +4,6 @@
 #include "trig.h"
 #include "constants/songs.h"
 #include "sound.h"
-#include "flying.h"
 
 static void sub_810A1A8(struct Sprite *);
 static void sub_810A1F8(struct Sprite *);

src/normal.c

@@ -5,7 +5,6 @@
 #include "task.h"
 #include "trig.h"
 #include "constants/rgb.h"
-#include "flying.h"
 
 void AnimConfusionDuck(struct Sprite *);
 void AnimSimplePaletteBlend(struct Sprite *);