From 5ac6cc48609f34f8d0d75093ecf6d9d056c0a92b Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 7 Feb 2018 22:53:40 +0100
Subject: move battle vars to c file

---
 src/battle_controller_player.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/battle_controller_player.c')

diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 08af2e902..e62985b3b 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -58,7 +58,7 @@ extern u8 gNumberOfMovesToChoose;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 extern s32 gUnknown_0203CD70;
-extern u8 gBankInMenu;
+extern u8 gBattlerInMenuId;
 extern u32 gBattlePalaceMoveSelectionRngValue;
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_020244B4[];
@@ -2677,7 +2677,7 @@ static void PlayerHandleChooseItem(void)
 
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
     gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
-    gBankInMenu = gActiveBattler;
+    gBattlerInMenuId = gActiveBattler;
 
     for (i = 0; i < 3; i++)
         gUnknown_0203CF00[i] = gBattleBufferA[gActiveBattler][1 + i];
@@ -2704,7 +2704,7 @@ static void PlayerHandleChoosePokemon(void)
         *(&gBattleStruct->field_B0) = gBattleBufferA[gActiveBattler][3];
         BeginNormalPaletteFade(-1, 0, 0, 16, 0);
         gBattlerControllerFuncs[gActiveBattler] = sub_80597CC;
-        gBankInMenu = gActiveBattler;
+        gBattlerInMenuId = gActiveBattler;
     }
 }
 
-- 
cgit v1.2.3