From 80a4ee11457e82092f52a3aef5362f8b59b68633 Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Sat, 2 Mar 2019 17:23:10 -0500
Subject: [PATCH] Remove water.h and flying.h

---
 include/battle_anim.h       | 6 ++++++
 include/flying.h            | 6 ------
 include/water.h             | 6 ------
 src/battle_anim_effects_2.c | 1 -
 src/battle_anim_effects_3.c | 1 -
 src/electric.c              | 1 -
 src/normal.c                | 1 -
 7 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 include/flying.h
 delete mode 100644 include/water.h

diff --git a/include/battle_anim.h b/include/battle_anim.h
index ac47cadf1..b3350f893 100644
--- a/include/battle_anim.h
+++ b/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);
 
diff --git a/include/flying.h b/include/flying.h
deleted file mode 100644
index 062320b4d..000000000
--- a/include/flying.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GUARD_FLYING_H
-#define GUARD_FLYING_H
-
-void sub_810E2C8(struct Sprite *sprite);
-
-#endif // GUARD_FLYING_H
\ No newline at end of file
diff --git a/include/water.h b/include/water.h
deleted file mode 100644
index 9f876021c..000000000
--- a/include/water.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GUARD_WATER_H
-#define GUARD_WATER_H
-
-void sub_8108C94(struct Sprite *sprite);
-
-#endif // GUARD_WATER_H
\ No newline at end of file
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index a72b2c8dc..80b3258b4 100755
--- a/src/battle_anim_effects_2.c
+++ b/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 *);
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index de00892ba..efa2620fd 100755
--- a/src/battle_anim_effects_3.c
+++ b/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[];
diff --git a/src/electric.c b/src/electric.c
index 6c6c33746..5e7729842 100644
--- a/src/electric.c
+++ b/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 *);
diff --git a/src/normal.c b/src/normal.c
index cbf0caa83..2b592e199 100644
--- a/src/normal.c
+++ b/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 *);