move battle vars to c file

2018-02-07 22:53:40 +01:00
parent 802b505d7b
commit 5ac6cc4860
20 changed files with 360 additions and 548 deletions
@@ -77,7 +77,7 @@ ExecuteTableBasedItemEffect: @ 806BD28
 	cmp r0, 0
 	beq _0806BDA8
 	ldr r2, =gEnigmaBerries
-	ldr r0, =gBankInMenu
+	ldr r0, =gBattlerInMenuId
 	ldrb r1, [r0]
 	lsls r0, r1, 3
 	subs r0, r1
@@ -101,7 +101,7 @@ _0806BDBC:
 _0806BDC4:
 	str r0, [sp, 0x34]
 	ldr r1, =gStringBattler
-	ldr r0, =gBankInMenu
+	ldr r0, =gBattlerInMenuId
 	ldrb r2, [r0]
 	strb r2, [r1]
 	ldr r0, =gMain