From fed5f03097aef2dd39e33abdece1daaaf27da39f Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 28 Feb 2018 23:57:08 +0100
Subject: [PATCH] get rid of unnecessary externs

---
 src/battle_controllers.c   | 18 ------------------
 src/evolution_scene.c      |  2 --
 src/reshow_battle_screen.c | 21 ++++++---------------
 3 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 3c8b1563f..be39bfbc8 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -12,27 +12,9 @@
 #include "constants/abilities.h"
 #include "battle_message.h"
 
-extern u32 gBattleExecBuffer;
-extern void (*gBattleBankFunc[4])(void);
-extern u8 gBanksByIdentity[4];
-extern u8 gActionSelectionCursor[4];
-extern u8 gMoveSelectionCursor[4];
-extern u8 gNoOfAllBanks;
-extern u8 gActiveBank;
-extern u16 gBattlePartyID[4];
-extern u8 gBattleBufferA[4][0x200];
-extern u8 gBattleBufferB[4][0x200];
 extern u8 gUnknown_02022D08;
 extern u8 gUnknown_02022D09;
 extern u8 gUnknown_02022D0A;
-extern u8 gBankAttacker;
-extern u8 gBankTarget;
-extern u8 gAbsentBankFlags;
-extern u8 gEffectBank;
-extern struct BattlePokemon gBattleMons[4];
-extern u16 gLastUsedMove;
-extern u8 gStringBank;
-extern u8 gBattleBuffersTransferData[0x100];
 
 static EWRAM_DATA u8 sBattleBuffersTransferData[0x100] = {};
 
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 4bec70bb4..74eac32de 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -49,7 +49,6 @@ extern u16 gBattle_BG2_Y;
 extern u16 gBattle_BG3_X;
 extern u16 gBattle_BG3_Y;
 extern bool8 gAffineAnimsDisabled;
-extern u16 gMoveToLearn;
 extern const u8 gSpeciesNames[][11];
 
 #define sEvoCursorPos           gBattleCommunication[1] // when learning a new move
@@ -59,7 +58,6 @@ extern const struct WindowTemplate gUnknown_0833900C;
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 
 // strings
-extern const u8 gText_BattleYesNoChoice[];
 extern const u8 gText_CommunicationStandby5[];
 
 extern void sub_80356D0(void);
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index cedd3aee4..45f0f5a9e 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -13,6 +13,7 @@
 #include "constants/species.h"
 #include "battle_interface.h"
 #include "battle_anim.h"
+#include "data2.h"
 
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
@@ -25,14 +26,14 @@ extern u16 gBattle_BG3_Y;
 
 extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[];
 
-extern void sub_806A068(u16 species, u8 bankIdentity);
-extern void sub_806A12C(u16 backPicId, u8 bankIdentity);
+extern void sub_806A068(u16 species, u8 battlerPosition);
+extern void sub_806A12C(u16 backPicId, u8 battlerPosition);
 
 // this file's functions
 static void CB2_ReshowBattleScreenAfterMenu(void);
-static bool8 LoadBattlerSpriteGfx(u8 bank);
-static void CreateBattlerSprite(u8 bank);
-static void CreateHealthboxSprite(u8 bank);
+static bool8 LoadBattlerSpriteGfx(u8 battlerId);
+static void CreateBattlerSprite(u8 battlerId);
+static void CreateHealthboxSprite(u8 battlerId);
 static void sub_80A95F4(void);
 
 void nullsub_35(void)
@@ -217,16 +218,6 @@ static bool8 LoadBattlerSpriteGfx(u8 battler)
     return TRUE;
 }
 
-// todo: get rid of it once the struct is declared in a header
-struct MonCoords
-{
-    // This would use a bitfield, but sub_8079F44
-    // uses it as a u8 and casting won't match.
-    u8 coords; // u8 x:4, y:4;
-    u8 y_offset;
-};
-extern const struct MonCoords gTrainerBackPicCoords[];
-
 static void CreateBattlerSprite(u8 battler)
 {
     if (battler < gBattlersCount)