summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/party_menu.s4
-rw-r--r--asm/pokemon_item_effect.s4
2 files changed, 4 insertions, 4 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s
index a70baf3df..991ad3623 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -16302,7 +16302,7 @@ _081B8BA8:
movs r0, 0x1
strb r0, [r1]
ldr r1, =gBattlerPartyIndexes
- ldr r0, =gBankInMenu
+ ldr r0, =gBattlerInMenuId
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -16334,7 +16334,7 @@ _081B8BFC:
b _081B8C42
.pool
_081B8C20:
- ldr r0, =gBankInMenu
+ ldr r0, =gBattlerInMenuId
ldrb r0, [r0]
ldr r1, =gBattlerPartyIndexes
lsls r0, 1
diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s
index be7d3be49..877a721b4 100644
--- a/asm/pokemon_item_effect.s
+++ b/asm/pokemon_item_effect.s
@@ -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