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/pokemon_2.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/pokemon_2.c')

diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 7fbfc1271..cab68b07e 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -1,9 +1,11 @@
+#include "rom_8077ABC.h"
+#include "util.h"
+#include "battle.h"
 #include "global.h"
-#include "asm.h"
+#include "pokemon.h"
 #include "data2.h"
 #include "event_data.h"
 #include "main.h"
-#include "pokemon.h"
 #include "rng.h"
 #include "species.h"
 #include "sprite.h"
@@ -12,9 +14,7 @@
 #include "strings2.h"
 
 extern u8 gPlayerPartyCount;
-extern struct Pokemon gPlayerParty[6];
 extern u8 gEnemyPartyCount;
-extern struct Pokemon gEnemyParty[6];
 
 extern u16 unk_20160BC[];
 extern struct SecretBaseRecord gSecretBaseRecord;
@@ -36,16 +36,9 @@ extern u16 gTrainerBattleOpponent;
 extern struct PokemonStorage gPokemonStorage;
 
 extern u8 gBadEggNickname[];
-extern u32 gBitTable[];
-extern struct BaseStats gBaseStats[];
 extern const struct SpriteTemplate gSpriteTemplate_8208288[];
 //array of pointers to arrays of pointers to union AnimCmd (We probably need to typedef this.)
-extern u8 gTrainerClassToPicIndex[];
-extern u8 gTrainerClassToNameIndex[];
 extern u8 gSecretBaseTrainerClasses[];
-extern u8 gUnknown_08208238[];
-extern u8 gUnknown_0820823C[];
-extern u8 gStatStageRatios[][2];
 extern u8 gHoldEffectToType[][2];
 
 u8 sub_803C348(u8 a1)
-- 
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/pokemon_2.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/pokemon_2.c')

diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index cab68b07e..91cd77f86 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -1,17 +1,17 @@
-#include "rom_8077ABC.h"
-#include "util.h"
-#include "battle.h"
 #include "global.h"
-#include "pokemon.h"
+#include "battle.h"
 #include "data2.h"
 #include "event_data.h"
 #include "main.h"
+#include "pokemon.h"
 #include "rng.h"
+#include "rom_8077ABC.h"
 #include "species.h"
 #include "sprite.h"
 #include "string_util.h"
-#include "text.h"
 #include "strings2.h"
+#include "text.h"
+#include "util.h"
 
 extern u8 gPlayerPartyCount;
 extern u8 gEnemyPartyCount;
-- 
cgit v1.2.3