From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 14:53:51 +0200
Subject: Add headers

---
 src/battle_interface.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/battle_interface.c')

diff --git a/src/battle_interface.c b/src/battle_interface.c
index 61a6a5853..b1c0c1497 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -1,5 +1,9 @@
+#include "rom_8077ABC.h"
+#include "task.h"
+#include "safari_zone.h"
+#include "pokedex.h"
 #include "global.h"
-#include "asm.h"
+#include "battle_interface.h"
 #include "sprite.h"
 #include "string_util.h"
 #include "text.h"
@@ -8,7 +12,6 @@
 #include "songs.h"
 #include "battle.h"
 #include "palette.h"
-#include "battle_interface.h"
 
 struct UnknownStruct5
 {
@@ -50,9 +53,7 @@ extern u8 gUnknown_02024A72[];
 extern u8 gUnknown_03004340[];
 
 extern u16 gBattleTypeFlags;
-extern u8 gNumSafariBalls;
 
-extern u32 gExperienceTables[8][101];
 extern const struct SpriteTemplate gSpriteTemplate_820A4EC[];
 extern const struct SpriteTemplate gSpriteTemplate_820A51C[];
 extern const struct SpriteTemplate gSpriteTemplate_820A54C;
@@ -82,23 +83,17 @@ extern const u8 gUnknown_0820A81C[];
 extern const u8 gUnknown_0820A864[];
 extern const u8 gUnknown_0820A89C[];
 extern const u8 gUnknown_0820A8B0[];
-extern const struct BaseStats gBaseStats[];
 extern const u8 BattleText_SafariBalls[];
 extern const u8 BattleText_SafariBallsLeft[];
 extern const u8 BattleText_HighlightRed[];
 extern const u8 gUnknown_08D1216C[][32];
 
-extern const u8 *const gNatureNames[];
 extern const u16 gBattleInterfaceStatusIcons_DynPal[];
 
 #define ABS(n) ((n) >= 0 ? (n) : -(n))
 // Used for computing copy destination addresses
 #define MACRO1(n) ((n) - (n) / 8 * 8) + 64 * ((n) / 8)
 
-extern int sub_8040D3C();
-extern u8 sub_8090D90();
-extern void load_gfxc_health_bar();
-
 static void sub_8043D5C(struct Sprite *);
 static const void *sub_8043CDC(u8);
 static void sub_8044210(u8, s16, u8);
-- 
cgit v1.2.3


From f26daa3d6954d2db3a7c44b79d319a7a084462c2 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 15:01:42 +0200
Subject: Sort includes

---
 src/battle_interface.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/battle_interface.c')

diff --git a/src/battle_interface.c b/src/battle_interface.c
index b1c0c1497..e555bbad6 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -1,17 +1,17 @@
-#include "rom_8077ABC.h"
-#include "task.h"
-#include "safari_zone.h"
-#include "pokedex.h"
 #include "global.h"
 #include "battle_interface.h"
+#include "battle.h"
+#include "decompress.h"
+#include "palette.h"
+#include "pokedex.h"
+#include "rom_8077ABC.h"
+#include "safari_zone.h"
+#include "songs.h"
+#include "sound.h"
 #include "sprite.h"
 #include "string_util.h"
+#include "task.h"
 #include "text.h"
-#include "decompress.h"
-#include "sound.h"
-#include "songs.h"
-#include "battle.h"
-#include "palette.h"
 
 struct UnknownStruct5
 {
-- 
cgit v1.2.3