summaryrefslogtreecommitdiff
path: root/asm/battle_link_817C95C.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/battle_link_817C95C.s')
-rw-r--r--asm/battle_link_817C95C.s286
1 files changed, 143 insertions, 143 deletions
diff --git a/asm/battle_link_817C95C.s b/asm/battle_link_817C95C.s
index fedb50c45..55d0bae39 100644
--- a/asm/battle_link_817C95C.s
+++ b/asm/battle_link_817C95C.s
@@ -34,32 +34,32 @@ _0817C988:
movs r1, 0x81
lsls r1, 2
adds r7, r0, r1
- ldr r5, =gBankAttacker
+ ldr r5, =gBattlerAttacker
ldrb r0, [r5]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gBankTarget
+ ldr r0, =gBattlerTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r6, r0, 24
- ldr r0, =gEffectBank
+ ldr r0, =gEffectBattler
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldr r0, =gStringInfo
ldr r0, [r0]
ldrb r0, [r0, 0x7]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
cmp r4, 0
bne _0817CA00
- ldr r2, =gBattlePartyID
+ ldr r2, =gBattlerPartyIndexes
ldrb r0, [r5]
lsls r0, 1
adds r0, r2
@@ -70,7 +70,7 @@ _0817C988:
b _0817CA10
.pool
_0817CA00:
- ldr r2, =gBattlePartyID
+ ldr r2, =gBattlerPartyIndexes
ldrb r0, [r5]
lsls r0, 1
adds r0, r2
@@ -83,7 +83,7 @@ _0817CA10:
str r1, [sp, 0x8]
cmp r6, 0
bne _0817CA3C
- ldr r0, =gBankTarget
+ ldr r0, =gBattlerTarget
ldrb r0, [r0]
lsls r0, 1
adds r0, r2
@@ -94,7 +94,7 @@ _0817CA10:
b _0817CA4C
.pool
_0817CA3C:
- ldr r0, =gBankTarget
+ ldr r0, =gBattlerTarget
ldrb r0, [r0]
lsls r0, 1
adds r0, r2
@@ -105,12 +105,12 @@ _0817CA3C:
_0817CA4C:
adds r1, r0
str r1, [sp, 0xC]
- ldr r0, =gBankAttacker
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
ldr r1, =gStringInfo
ldr r1, [r1]
ldrh r1, [r1]
- bl GetBankMoveSlotId
+ bl GetBattlerMoveSlotId
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -134,20 +134,20 @@ _0817CA4C:
bl _0817E0A2
.pool
_0817CA9C:
- ldr r0, =gBankAttacker
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
- bl GetBankIdentity
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
mov r8, r0
- ldr r0, =gBankTarget
+ ldr r0, =gBattlerTarget
ldrb r0, [r0]
- bl GetBankIdentity
+ bl GetBattlerPosition
lsls r0, 24
lsrs r5, r0, 25
- ldr r0, =gEffectBank
+ ldr r0, =gEffectBattler
ldrb r0, [r0]
- bl GetBankIdentity
+ bl GetBattlerPosition
lsls r0, 24
lsrs r3, r0, 25
ldr r1, [sp]
@@ -571,8 +571,8 @@ _0817D0DC:
adds r3, r4
lsls r3, 2
adds r3, r7, r3
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -601,8 +601,8 @@ _0817D124:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -634,8 +634,8 @@ _0817D16C:
adds r0, r4
lsls r0, 2
adds r5, r7, r0
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -715,8 +715,8 @@ _0817D216:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -775,8 +775,8 @@ _0817D296:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -833,8 +833,8 @@ _0817D314:
lsls r0, r4, 4
adds r3, r0
adds r3, r7, r3
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -940,8 +940,8 @@ _0817D3F2:
bne _0817D3FE
bl _0817E0A6
_0817D3FE:
- ldr r0, =gBankAttacker
- ldr r1, =gBankTarget
+ ldr r0, =gBattlerAttacker
+ ldr r1, =gBattlerTarget
ldrb r0, [r0]
ldrb r1, [r1]
cmp r0, r1
@@ -1014,8 +1014,8 @@ _0817D498:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1091,8 +1091,8 @@ _0817D53C:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1161,8 +1161,8 @@ _0817D5CE:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1226,8 +1226,8 @@ _0817D65E:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1301,8 +1301,8 @@ _0817D6F2:
strb r0, [r1]
bl _0817E0A6
_0817D704:
- ldr r5, =gBattlePartyID
- ldr r6, =gEffectBank
+ ldr r5, =gBattlerPartyIndexes
+ ldr r6, =gEffectBattler
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@@ -1314,7 +1314,7 @@ _0817D704:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
- ldr r0, =gBankAttacker
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1353,8 +1353,8 @@ _0817D76C:
bne _0817D77E
bl _0817E0A6
_0817D77E:
- ldr r6, =gBattlePartyID
- ldr r5, =gBankAttacker
+ ldr r6, =gBattlerPartyIndexes
+ ldr r5, =gBattlerAttacker
ldrb r0, [r5]
lsls r0, 1
adds r0, r6
@@ -1395,8 +1395,8 @@ _0817D7B2:
b _0817D934
.pool
_0817D7D8:
- ldr r5, =gBattlePartyID
- ldr r6, =gEffectBank
+ ldr r5, =gBattlerPartyIndexes
+ ldr r6, =gEffectBattler
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@@ -1408,7 +1408,7 @@ _0817D7D8:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
- ldr r0, =gBankAttacker
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1439,8 +1439,8 @@ _0817D7D8:
b _0817D88C
.pool
_0817D838:
- ldr r5, =gBattlePartyID
- ldr r6, =gEffectBank
+ ldr r5, =gBattlerPartyIndexes
+ ldr r6, =gEffectBattler
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@@ -1452,7 +1452,7 @@ _0817D838:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
- ldr r0, =gBankAttacker
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1496,9 +1496,9 @@ _0817D8A4:
bne _0817D8B6
bl _0817E0A6
_0817D8B6:
- ldr r2, =gBattlePartyID
+ ldr r2, =gBattlerPartyIndexes
mov r8, r2
- ldr r6, =gBankAttacker
+ ldr r6, =gBattlerAttacker
ldrb r0, [r6]
lsls r0, 1
add r0, r8
@@ -1573,8 +1573,8 @@ _0817D94C:
lsls r0, r6, 4
adds r2, r0
adds r2, r7, r2
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1627,8 +1627,8 @@ _0817D9AE:
movs r0, 0x9
b _0817E086
_0817D9C2:
- ldr r5, =gBattlePartyID
- ldr r6, =gEffectBank
+ ldr r5, =gBattlerPartyIndexes
+ ldr r6, =gEffectBattler
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@@ -1640,7 +1640,7 @@ _0817D9C2:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
- ldr r0, =gBankAttacker
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1671,8 +1671,8 @@ _0817D9C2:
b _0817DB76
.pool
_0817DA24:
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1702,8 +1702,8 @@ _0817DA48:
b _0817E0A6
.pool
_0817DA68:
- ldr r5, =gBattlePartyID
- ldr r6, =gEffectBank
+ ldr r5, =gBattlerPartyIndexes
+ ldr r6, =gEffectBattler
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@@ -1715,7 +1715,7 @@ _0817DA68:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
- ldr r0, =gBankAttacker
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1747,8 +1747,8 @@ _0817DA68:
b _0817DB76
.pool
_0817DACC:
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1790,8 +1790,8 @@ _0817DB10:
b _0817E0A6
.pool
_0817DB24:
- ldr r5, =gBattlePartyID
- ldr r6, =gEffectBank
+ ldr r5, =gBattlerPartyIndexes
+ ldr r6, =gEffectBattler
ldrb r0, [r6]
lsls r0, 1
adds r0, r5
@@ -1803,7 +1803,7 @@ _0817DB24:
lsls r4, 3
adds r3, r4
adds r3, r7, r3
- ldr r0, =gBankAttacker
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1838,8 +1838,8 @@ _0817DB76:
b _0817E0A6
.pool
_0817DB90:
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1875,8 +1875,8 @@ _0817DBD4:
lsls r0, r1, 4
adds r3, r0
adds r3, r7, r3
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1943,8 +1943,8 @@ _0817DC62:
adds r2, r6
lsls r2, 2
adds r2, r7, r2
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2021,8 +2021,8 @@ _0817DCFC:
lsls r0, r4, 4
adds r2, r0
adds r2, r7, r2
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2049,8 +2049,8 @@ _0817DD38:
lsls r0, r4, 4
adds r2, r0
adds r2, r7, r2
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2121,8 +2121,8 @@ _0817DDC8:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2154,8 +2154,8 @@ _0817DE10:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2253,8 +2253,8 @@ _0817DEDC:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2331,8 +2331,8 @@ _0817DF70:
adds r2, r4
lsls r2, 2
adds r2, r7, r2
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2413,8 +2413,8 @@ _0817DFE6:
negs r0, r0
ands r0, r2
strb r0, [r1]
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2557,22 +2557,22 @@ _0817E122:
lsls r1, 2
adds r1, r0, r1
str r1, [sp, 0x8]
- ldr r2, =gBankAttacker
+ ldr r2, =gBattlerAttacker
mov r10, r2
ldrb r0, [r2]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
mov r9, r0
- ldr r0, =gBankTarget
+ ldr r0, =gBattlerTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r4, r0, 24
mov r1, r10
ldrb r0, [r1]
adds r1, r7, 0
- bl GetBankMoveSlotId
+ bl GetBattlerMoveSlotId
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x3
@@ -2593,7 +2593,7 @@ _0817E122:
_0817E184:
mov r2, r10
ldrb r0, [r2]
- bl GetBankIdentity
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
lsls r0, 3
@@ -2604,7 +2604,7 @@ _0817E184:
mov r2, r10
ldrb r1, [r2]
lsls r1, 1
- ldr r2, =gBattlePartyID
+ ldr r2, =gBattlerPartyIndexes
adds r1, r2
ldrh r2, [r1]
adds r2, 0x1
@@ -2617,7 +2617,7 @@ _0817E184:
strb r1, [r0]
mov r1, r10
ldrb r0, [r1]
- bl GetBankIdentity
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
lsls r0, 3
@@ -2685,7 +2685,7 @@ _0817E23C:
mov r1, r10
ldrb r0, [r1]
lsls r0, 1
- ldr r2, =gBattlePartyID
+ ldr r2, =gBattlerPartyIndexes
adds r0, r2
ldrh r1, [r0]
adds r1, 0x1
@@ -2723,7 +2723,7 @@ _0817E27A:
mov r1, r10
ldrb r0, [r1]
lsls r0, 1
- ldr r1, =gBattlePartyID
+ ldr r1, =gBattlerPartyIndexes
adds r0, r1
ldrh r1, [r0]
adds r1, 0x1
@@ -2812,9 +2812,9 @@ sub_817E32C: @ 817E32C
movs r1, 0x81
lsls r1, 2
adds r4, r0, r1
- ldr r0, =gBankAttacker
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r2, r0, 24
cmp r5, 0x12
@@ -3244,14 +3244,14 @@ sub_817E684: @ 817E684
movs r2, 0x81
lsls r2, 2
adds r7, r0, r2
- ldr r0, =gBankAttacker
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gBankTarget
+ ldr r0, =gBattlerTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r3, r0, 24
mov r0, r10
@@ -3297,8 +3297,8 @@ _0817E6F0:
.4byte _0817E760
.4byte _0817E760
_0817E760:
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -3324,13 +3324,13 @@ _0817E760:
_0817E79C:
ldr r1, =gUnknown_0860A834
add r1, r12
- ldr r7, =gBattlePartyID
+ ldr r7, =gBattlerPartyIndexes
lsls r0, r4, 1
adds r0, r4
lsls r2, r0, 4
ldr r4, =0x0000ffff
ldr r1, [r1]
- ldr r3, =gBankAttacker
+ ldr r3, =gBattlerAttacker
ldrh r0, [r1]
cmp r6, r0
bne _0817E7E0
@@ -3708,15 +3708,15 @@ sub_817EA80: @ 817EA80
movs r1, 0x81
lsls r1, 2
adds r5, r0, r1
- ldr r3, =gBankAttacker
+ ldr r3, =gBattlerAttacker
mov r8, r3
ldrb r0, [r3]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gBankTarget
+ ldr r0, =gBattlerTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r2, r0, 24
lsls r0, r4, 1
@@ -4005,8 +4005,8 @@ _0817ECCC:
ldrb r0, [r0]
lsrs r0, 5
subs r6, r0, 0x1
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -4164,8 +4164,8 @@ _0817EE1C:
cmp r7, 0x1
bne _0817EEBC
adds r2, r4, 0
- ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r1, =gBattlerPartyIndexes
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -4227,7 +4227,7 @@ _0817EE8E:
b _0817EEBC
_0817EE96:
adds r2, r4, 0
- ldr r1, =gBattlePartyID
+ ldr r1, =gBattlerPartyIndexes
mov r3, r8
ldrb r0, [r3]
lsls r0, 1
@@ -4269,9 +4269,9 @@ sub_817EECC: @ 817EECC
beq _0817EEE6
b _0817F1FA
_0817EEE6:
- ldr r4, =gBankAttacker
+ ldr r4, =gBattlerAttacker
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4291,7 +4291,7 @@ _0817EEF8:
bgt _0817EF10
b _0817F1FA
_0817EF10:
- ldr r0, =gBankTarget
+ ldr r0, =gBattlerTarget
ldrb r0, [r0]
muls r0, r1
adds r0, r5
@@ -4367,7 +4367,7 @@ _0817EF8A:
beq _0817EF98
b _0817F1FA
_0817EF98:
- ldr r2, =gBankAttacker
+ ldr r2, =gBattlerAttacker
ldrb r0, [r2]
adds r0, r6
ldrb r0, [r0]
@@ -4386,11 +4386,11 @@ _0817EF98:
mov r10, r3
mov r8, r0
add r7, sp, 0x10
- ldr r4, =gBankTarget
+ ldr r4, =gBattlerTarget
mov r9, r4
_0817EFC2:
lsls r1, r5, 1
- ldr r6, =gBankAttacker
+ ldr r6, =gBattlerAttacker
ldrb r0, [r6]
movs r2, 0x58
muls r0, r2
@@ -4411,16 +4411,16 @@ _0817EFC2:
lsls r0, 24
cmp r0, 0
beq _0817F0B4
- ldr r4, =gSideAffecting
+ ldr r4, =gSideStatuses
mov r1, r9
ldrb r0, [r1]
- bl GetBankIdentity
+ bl GetBattlerPosition
movs r1, 0x1
ands r1, r0
lsls r1, 1
adds r1, r4
ldrh r3, [r1]
- ldr r2, =gBankAttacker
+ ldr r2, =gBattlerAttacker
ldrb r0, [r2]
movs r4, 0x58
muls r0, r4
@@ -4437,7 +4437,7 @@ _0817EFC2:
str r4, [sp]
movs r4, 0
str r4, [sp, 0x4]
- ldr r6, =gBankAttacker
+ ldr r6, =gBattlerAttacker
ldrb r4, [r6]
str r4, [sp, 0x8]
mov r6, r9
@@ -4448,7 +4448,7 @@ _0817EFC2:
ldr r4, =gBattleMoveDamage
str r3, [r4]
ldr r1, =gStatuses3
- ldr r2, =gBankAttacker
+ ldr r2, =gBattlerAttacker
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
@@ -4472,7 +4472,7 @@ _0817EFC2:
str r0, [r4]
_0817F06A:
ldr r0, =gProtectStructs
- ldr r6, =gBankAttacker
+ ldr r6, =gBattlerAttacker
ldrb r1, [r6]
lsls r1, 4
adds r1, r0
@@ -4513,9 +4513,9 @@ _0817F0B4:
cmp r5, 0x3
ble _0817EFC2
movs r5, 0
- ldr r3, =gBankAttacker
+ ldr r3, =gBattlerAttacker
ldr r6, =gMoveSelectionCursor
- ldr r4, =gBattlePartyID
+ ldr r4, =gBattlerPartyIndexes
mov r8, r4
movs r7, 0x64
mov r9, r7
@@ -4545,9 +4545,9 @@ _0817F0D8:
movs r7, 0
_0817F0F6:
movs r5, 0
- ldr r4, =gBankTarget
+ ldr r4, =gBattlerTarget
ldr r6, =gEnemyParty
- ldr r0, =gBankAttacker
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
add r0, r10
ldrb r3, [r0]
@@ -4582,7 +4582,7 @@ _0817F11A:
adds r6, r0, 0
lsls r6, 16
lsrs r6, 16
- ldr r2, =gBankAttacker
+ ldr r2, =gBattlerAttacker
ldrb r0, [r2]
lsls r0, 1
add r0, r8
@@ -4598,7 +4598,7 @@ _0817F11A:
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
- ldr r4, =gBankAttacker
+ ldr r4, =gBattlerAttacker
ldrb r3, [r4]
mov r2, r10
adds r0, r3, r2
@@ -4625,7 +4625,7 @@ _0817F1D4:
_0817F1DC:
ldr r2, =gBattleMoveDamage
ldr r1, =gMoveSelectionCursor
- ldr r0, =gBankAttacker
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -4695,7 +4695,7 @@ _0817F270:
cmp r2, 0x95
bne _0817F294
ldr r2, =gBattleMons
- ldr r0, =gBankAttacker
+ ldr r0, =gBattlerAttacker
ldrb r1, [r0]
movs r0, 0x58
muls r0, r1
@@ -4793,15 +4793,15 @@ _0817F324:
.pool
thumb_func_end sub_817F2A8
- thumb_func_start GetBankMoveSlotId
-GetBankMoveSlotId: @ 817F33C
+ thumb_func_start GetBattlerMoveSlotId
+GetBattlerMoveSlotId: @ 817F33C
push {r4-r7,lr}
lsls r0, 24
lsrs r5, r0, 24
lsls r1, 16
lsrs r7, r1, 16
adds r0, r5, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
ldr r6, =gEnemyParty
cmp r0, 0
@@ -4809,7 +4809,7 @@ GetBankMoveSlotId: @ 817F33C
ldr r6, =gPlayerParty
_0817F356:
movs r4, 0
- ldr r1, =gBattlePartyID
+ ldr r1, =gBattlerPartyIndexes
lsls r0, r5, 1
adds r5, r0, r1
b _0817F36E
@@ -4835,7 +4835,7 @@ _0817F388:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end GetBankMoveSlotId
+ thumb_func_end GetBattlerMoveSlotId
thumb_func_start sub_817F394
sub_817F394: @ 817F394
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 13:27:23 +0000