add more const pokemon data, clear include

1 files changed, 3 insertions, 18 deletions

diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index d43ca6205..39eab24ee 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -21,26 +21,11 @@
 #include "pokeball.h"
 #include "data2.h"
 #include "pokeblock.h"
+#include "item_use.h"
 
-extern u32 gBattleControllerExecFlags;
-extern u8 gActiveBattler;
-extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gBattlersCount;
-extern bool8 gDoingBattleAnim;
-extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
-extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
-extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
-extern u16 gSpecialVar_ItemId;
-extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
-extern u8 gBankInMenu;
-extern u16 gUnknown_020243FC;
 
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
 
@@ -499,7 +484,7 @@ static void SafariHandleChooseItem(void)
 
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
     gBattlerControllerFuncs[gActiveBattler] = SafariOpenPokeblockCase;
-    gBankInMenu = gActiveBattler;
+    gBattlerInMenuId = gActiveBattler;
 }
 
 static void SafariHandleChoosePokemon(void)
@@ -647,7 +632,7 @@ static void SafariHandleFaintingCry(void)
 static void SafariHandleIntroSlide(void)
 {
     HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
-    gUnknown_020243FC |= 1;
+    gIntroSlideFlags |= 1;
     SafariBufferExecCompleted();
 }