summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_anim_80A5C6C.s104
-rw-r--r--asm/battle_anim_80D51AC.s22
-rw-r--r--asm/battle_anim_80FE840.s376
-rw-r--r--asm/battle_anim_815A0D4.s80
-rw-r--r--asm/battle_anim_8170478.s30
-rw-r--r--asm/battle_anim_sound_tasks.s4
-rw-r--r--asm/battle_link_817C95C.s172
-rw-r--r--asm/contest.s14
-rw-r--r--asm/party_menu.s18
-rw-r--r--asm/pokemon_1.s2
-rw-r--r--asm/pokemon_item_effect.s44
11 files changed, 433 insertions, 433 deletions
diff --git a/asm/battle_anim_80A5C6C.s b/asm/battle_anim_80A5C6C.s
index b543a5ec2..12aa61185 100644
--- a/asm/battle_anim_80A5C6C.s
+++ b/asm/battle_anim_80A5C6C.s
@@ -40,7 +40,7 @@ _080A5C9C:
_080A5CB0:
ldr r4, =gUnknown_08525F58
adds r0, r5, 0
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 22
ldr r1, =gBattleTypeFlags
@@ -56,7 +56,7 @@ _080A5CB0:
_080A5CD8:
ldr r4, =gUnknown_08525F58
adds r0, r5, 0
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 22
ldr r1, =gBattleTypeFlags
@@ -90,7 +90,7 @@ _080A5D24:
b _080A5D9A
_080A5D28:
adds r0, r5, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080A5D60
@@ -164,7 +164,7 @@ sub_80A5DB8: @ 80A5DB8
lsls r1, 16
lsrs r5, r1, 16
adds r0, r4, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080A5DDA
@@ -394,7 +394,7 @@ sub_80A5FA0: @ 80A5FA0
adds r7, r4, 0
movs r5, 0
adds r0, r6, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -445,7 +445,7 @@ sub_80A600C: @ 80A600C
lsls r2, 24
lsrs r7, r2, 24
adds r0, r6, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080A6030
@@ -476,7 +476,7 @@ _080A603E:
lsrs r4, r0, 16
_080A605C:
adds r0, r6, 0
- bl GetBankPosition
+ bl GetBattlerPosition
ldr r3, =gUnknown_08525F58
lsls r0, 24
lsrs r0, 22
@@ -494,7 +494,7 @@ _080A605C:
cmp r7, 0
beq _080A609C
adds r0, r6, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080A6096
@@ -605,7 +605,7 @@ GetSubstituteSpriteDefault_Y: @ 80A614C
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080A6170
@@ -650,7 +650,7 @@ sub_80A6190: @ 80A6190
cmp r0, 0
bne _080A6238
adds r0, r5, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080A61E4
@@ -699,7 +699,7 @@ _080A621C:
ldrh r4, [r1, 0x2]
_080A621E:
adds r0, r5, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080A6238
@@ -1596,7 +1596,7 @@ sub_80A6864: @ 80A6864
.pool
_080A68A4:
ldrb r0, [r7]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080A68BC
@@ -1806,41 +1806,41 @@ _080A6A04:
.pool
thumb_func_end sub_80A69CC
- thumb_func_start GetBankSide
-GetBankSide: @ 80A6A30
+ thumb_func_start GetBattlerSide
+GetBattlerSide: @ 80A6A30
lsls r0, 24
lsrs r0, 24
- ldr r1, =gBankPositions
+ ldr r1, =gBattlerPositions
adds r0, r1
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
bx lr
.pool
- thumb_func_end GetBankSide
+ thumb_func_end GetBattlerSide
- thumb_func_start GetBankPosition
-GetBankPosition: @ 80A6A44
+ thumb_func_start GetBattlerPosition
+GetBattlerPosition: @ 80A6A44
lsls r0, 24
lsrs r0, 24
- ldr r1, =gBankPositions
+ ldr r1, =gBattlerPositions
adds r0, r1
ldrb r0, [r0]
bx lr
.pool
- thumb_func_end GetBankPosition
+ thumb_func_end GetBattlerPosition
- thumb_func_start GetBankByPosition
-GetBankByPosition: @ 80A6A54
+ thumb_func_start GetBattlerAtPosition
+GetBattlerAtPosition: @ 80A6A54
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
movs r1, 0
- ldr r0, =gBattleBanksCount
+ ldr r0, =gBattlersCount
ldrb r2, [r0]
cmp r1, r2
bcs _080A6A7E
- ldr r4, =gBankPositions
+ ldr r4, =gBattlerPositions
ldrb r0, [r4]
cmp r0, r3
beq _080A6A7E
@@ -1860,7 +1860,7 @@ _080A6A7E:
pop {r1}
bx r1
.pool
- thumb_func_end GetBankByPosition
+ thumb_func_end GetBattlerAtPosition
thumb_func_start IsBankSpritePresent
IsBankSpritePresent: @ 80A6A90
@@ -1883,13 +1883,13 @@ IsBankSpritePresent: @ 80A6A90
b _080A6B18
.pool
_080A6ABC:
- ldr r0, =gBankPositions
+ ldr r0, =gBattlerPositions
adds r0, r4, r0
ldrb r0, [r0]
cmp r0, 0xFF
beq _080A6B18
adds r0, r4, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080A6AF0
@@ -3496,7 +3496,7 @@ _080A76F2:
cmp r5, 0
beq _080A771A
movs r0, 0
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl IsAnimBankSpriteVisible
@@ -3504,7 +3504,7 @@ _080A76F2:
cmp r0, 0
beq _080A771A
movs r0, 0
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -3514,7 +3514,7 @@ _080A771A:
cmp r6, 0
beq _080A7746
movs r0, 0x2
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl IsAnimBankSpriteVisible
@@ -3522,7 +3522,7 @@ _080A771A:
cmp r0, 0
beq _080A7746
movs r0, 0x2
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3534,7 +3534,7 @@ _080A7746:
cmp r7, 0
beq _080A7772
movs r0, 0x1
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl IsAnimBankSpriteVisible
@@ -3542,7 +3542,7 @@ _080A7746:
cmp r0, 0
beq _080A7772
movs r0, 0x1
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3555,7 +3555,7 @@ _080A7772:
cmp r0, 0
beq _080A77A0
movs r0, 0x3
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl IsAnimBankSpriteVisible
@@ -3563,7 +3563,7 @@ _080A7772:
cmp r0, 0
beq _080A77A0
movs r0, 0x3
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3592,7 +3592,7 @@ sub_80A77B4: @ 80A77B4
push {lr}
lsls r0, 24
lsrs r0, 24
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -3672,7 +3672,7 @@ _080A7842:
bl sub_80A69CC
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080A785C
@@ -3718,7 +3718,7 @@ sub_80A78AC: @ 80A78AC
bl sub_80A69CC
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080A78CC
@@ -3811,7 +3811,7 @@ _080A7976:
ldrb r6, [r0]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080A798E
@@ -4567,7 +4567,7 @@ _080A7F42:
_080A7F78:
lsls r0, r4, 24
lsrs r0, 24
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080A7FD8
@@ -4959,7 +4959,7 @@ _080A825C:
sub_80A8278: @ 80A8278
push {r4-r6,lr}
movs r5, 0
- ldr r0, =gBattleBanksCount
+ ldr r0, =gBattlersCount
ldrb r0, [r0]
cmp r5, r0
bge _080A82D2
@@ -4998,7 +4998,7 @@ _080A8286:
strb r2, [r0, 0x5]
_080A82C8:
adds r5, 0x1
- ldr r0, =gBattleBanksCount
+ ldr r0, =gBattlersCount
ldrb r0, [r0]
cmp r5, r0
blt _080A8286
@@ -5027,7 +5027,7 @@ _080A82FC:
b _080A8320
_080A8300:
adds r0, r4, 0
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
movs r1, 0x1E
@@ -5053,7 +5053,7 @@ sub_80A8328: @ 80A8328
push {r4,lr}
lsls r0, 24
lsrs r0, 24
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r4, r0, 24
bl IsContest
@@ -5093,7 +5093,7 @@ sub_80A8364: @ 80A8364
cmp r0, 0
bne _080A838A
adds r0, r4, 0
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -5486,7 +5486,7 @@ _080A86AC:
.pool
_080A86C4:
mov r0, r8
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080A8790
@@ -5943,7 +5943,7 @@ sub_80A8A6C: @ 80A8A6C
bl sub_80A6838
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080A8AAC
@@ -6000,7 +6000,7 @@ sub_80A8AEC: @ 80A8AEC
adds r4, r0, 0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080A8B1C
@@ -6056,7 +6056,7 @@ sub_80A8B64: @ 80A8B64
bl sub_80A6838
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080A8B90
@@ -6108,7 +6108,7 @@ sub_80A8BC4: @ 80A8BC4
strh r0, [r5, 0x8]
ldr r7, =gAnimBankAttacker
ldrb r0, [r7]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
movs r1, 0x8
cmp r0, 0
@@ -6403,7 +6403,7 @@ sub_80A8E30: @ 80A8E30
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080A8E68
@@ -6489,7 +6489,7 @@ sub_80A8EE4: @ 80A8EE4
strh r0, [r4, 0x36]
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080A8F24
diff --git a/asm/battle_anim_80D51AC.s b/asm/battle_anim_80D51AC.s
index 3b1e9dcce..514bf2594 100644
--- a/asm/battle_anim_80D51AC.s
+++ b/asm/battle_anim_80D51AC.s
@@ -200,7 +200,7 @@ _080D5320:
_080D5324:
movs r0, 0x3
_080D5326:
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
@@ -844,7 +844,7 @@ sub_80D5830: @ 80D5830
lsrs r4, r0, 24
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D584C
@@ -873,7 +873,7 @@ sub_80D5860: @ 80D5860
strb r0, [r2]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D5890
@@ -1144,7 +1144,7 @@ _080D5AB2:
adds r0, r2, r0
ldrb r6, [r0]
adds r0, r2, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D5ADC
@@ -1229,7 +1229,7 @@ _080D5B72:
adds r0, r1, r0
ldrb r7, [r0]
adds r0, r1, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D5B9C
@@ -1340,7 +1340,7 @@ sub_80D5C50: @ 80D5C50
lsrs r7, r0, 16
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D5C82
@@ -1551,7 +1551,7 @@ _080D5E18:
strh r2, [r5, 0x8]
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D5E44
@@ -1624,7 +1624,7 @@ sub_80D5EB8: @ 80D5EB8
lsrs r5, r0, 24
ldr r6, =gAnimBankAttacker
ldrb r0, [r6]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D5ED4
@@ -1722,7 +1722,7 @@ sub_80D5F3C: @ 80D5F3C
.pool
_080D5F94:
ldrb r0, [r4, 0x12]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080D5FBC
@@ -2002,7 +2002,7 @@ _080D61C8:
ldr r0, =gAnimBankTarget
_080D61CA:
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
movs r1, 0
lsls r0, 24
cmp r0, 0
@@ -2083,7 +2083,7 @@ _080D6274:
ldr r0, =gAnimBankTarget
_080D6276:
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D6288
diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s
index 59e0556e7..7671f473d 100644
--- a/asm/battle_anim_80FE840.s
+++ b/asm/battle_anim_80FE840.s
@@ -24,7 +24,7 @@ sub_80FE840: @ 80FE840
strh r0, [r4, 0x30]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080FE87C
@@ -388,7 +388,7 @@ sub_80FEB44: @ 80FEB44
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080FEB90
@@ -496,7 +496,7 @@ sub_80FEC48: @ 80FEC48
bl sub_80A69CC
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080FEC68
@@ -1028,7 +1028,7 @@ sub_80FF090: @ 80FF090
adds r4, r0, 0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080FF0B4
@@ -1082,7 +1082,7 @@ sub_80FF0F4: @ 80FF0F4
bl sub_80A69CC
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080FF114
@@ -1141,11 +1141,11 @@ _080FF174:
bl sub_80A68D4
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
adds r4, r0, 0
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -1641,7 +1641,7 @@ sub_80FF53C: @ 80FF53C
strh r1, [r5, 0x24]
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080FF586
@@ -1787,7 +1787,7 @@ sub_80FF698: @ 80FF698
_080FF6AA:
ldr r6, =gAnimBankTarget
ldrb r0, [r6]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _080FF6C2
@@ -2460,7 +2460,7 @@ sub_80FFBF4: @ 80FFBF4
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -2982,7 +2982,7 @@ sub_80FFFC0: @ 80FFFC0
bl sub_80A861C
strh r0, [r5, 0x1E]
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
movs r2, 0x1
@@ -3780,7 +3780,7 @@ _0810065C:
_0810065E:
ldrb r6, [r0]
adds r0, r6, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08100688
@@ -4239,7 +4239,7 @@ sub_81009F8: @ 81009F8
adds r4, r0, 0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08100A20
@@ -4279,7 +4279,7 @@ sub_8100A50: @ 8100A50
adds r5, r0, 0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08100A6A
@@ -4357,7 +4357,7 @@ sub_8100AE0: @ 8100AE0
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08100B14
@@ -4511,7 +4511,7 @@ _08100C3E:
strh r4, [r6, 0x22]
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08100C56
@@ -4756,7 +4756,7 @@ sub_8100E1C: @ 8100E1C
strh r0, [r5, 0x2E]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08100E44
@@ -4885,7 +4885,7 @@ _08100F06:
adds r0, r4
strh r0, [r5, 0x22]
ldrb r0, [r6]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08100F44
@@ -5525,7 +5525,7 @@ sub_8101440: @ 8101440
bl sub_80A6838
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08101474
@@ -5613,7 +5613,7 @@ sub_81014F4: @ 81014F4
bl sub_80A6838
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0810152C
@@ -6201,7 +6201,7 @@ sub_8101998: @ 8101998
strh r0, [r4, 0x2E]
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
movs r2, 0x2
negs r2, r2
@@ -6246,7 +6246,7 @@ sub_81019E8: @ 81019E8
movs r1, 0
bl sub_80A7270
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x3A]
@@ -6303,7 +6303,7 @@ sub_8101A74: @ 8101A74
strh r0, [r4, 0x2E]
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
movs r1, 0x3
cmp r0, 0
@@ -6367,12 +6367,12 @@ sub_8101AE8: @ 8101AE8
ldrb r0, [r0]
strh r0, [r5, 0x34]
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x3A]
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08101B2C
@@ -6472,7 +6472,7 @@ _08101BBC:
ldrb r0, [r0]
strh r0, [r4, 0x32]
ldrb r0, [r2]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x34]
@@ -6583,7 +6583,7 @@ sub_8101C94: @ 8101C94
movs r4, 0
strh r0, [r5, 0x8]
ldrb r0, [r2]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r2, r0, 24
strh r2, [r5, 0xA]
@@ -7539,7 +7539,7 @@ sub_8102434: @ 8102434
lsls r0, 24
lsrs r7, r0, 24
movs r4, 0
- ldr r0, =gBattleBanksCount
+ ldr r0, =gBattlersCount
ldrb r0, [r0]
cmp r4, r0
bcs _08102490
@@ -7551,7 +7551,7 @@ _08102448:
cmp r0, 0x1
bne _08102464
adds r0, r4, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08102464
@@ -7564,7 +7564,7 @@ _08102464:
cmp r0, 0x1
bne _08102482
adds r0, r4, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -7576,7 +7576,7 @@ _08102482:
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gBattleBanksCount
+ ldr r0, =gBattlersCount
ldrb r0, [r0]
cmp r4, r0
bcc _08102448
@@ -7605,7 +7605,7 @@ _081024B2:
lsls r0, 24
lsrs r4, r0, 24
_081024C2:
- ldr r0, =gBattleBanksCount
+ ldr r0, =gBattlersCount
ldrb r0, [r0]
cmp r4, r0
bcc _081024B2
@@ -8115,7 +8115,7 @@ _08102862:
_081028D4:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0810291C
@@ -8857,7 +8857,7 @@ sub_8102EB0: @ 8102EB0
adds r6, r0, 0
ldr r7, =gAnimBankAttacker
ldrb r0, [r7]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -9149,7 +9149,7 @@ sub_810310C: @ 810310C
lsls r0, 24
lsrs r5, r0, 24
adds r0, r5, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0810312C
@@ -9208,7 +9208,7 @@ _08103182:
adds r1, r5, 0
bl sub_810310C
adds r0, r4, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -9474,7 +9474,7 @@ _081033AE:
adds r1, r5, 0
bl sub_810310C
adds r0, r4, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _081033D4
@@ -9735,7 +9735,7 @@ sub_810358C: @ 810358C
adds r0, r1
ldrb r6, [r0]
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _081035E4
@@ -9876,7 +9876,7 @@ sub_81036DC: @ 81036DC
ldrb r0, [r0]
adds r1, r0, r1
ldrb r4, [r1]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08103718
@@ -9994,7 +9994,7 @@ sub_81037D8: @ 81037D8
bl sub_80A6838
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08103804
@@ -10020,7 +10020,7 @@ _08103810:
strh r0, [r4, 0x22]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810384C
@@ -10119,7 +10119,7 @@ sub_81038C8: @ 81038C8
_081038EC:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810390E
@@ -10676,7 +10676,7 @@ _08103D54:
strh r0, [r3, 0x4]
b _08103DB6
_08103D5C:
- ldr r1, =gBankPositions
+ ldr r1, =gBattlerPositions
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
adds r0, r1
@@ -11068,7 +11068,7 @@ sub_8104088: @ 8104088
lsrs r7, r0, 16
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _081040CC
@@ -11147,7 +11147,7 @@ sub_8104154: @ 8104154
strh r0, [r4, 0x24]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08104178
@@ -11354,7 +11354,7 @@ sub_8104304: @ 8104304
bl sub_80A69CC
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08104322
@@ -12347,7 +12347,7 @@ sub_8104B1C: @ 8104B1C
adds r4, r0, 0
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08104B50
@@ -12419,7 +12419,7 @@ _08104BC8:
_08104BCA:
ldrb r5, [r0]
adds r0, r5, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -12561,7 +12561,7 @@ sub_8104CA4: @ 8104CA4
strh r0, [r4, 0x1A]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -13235,7 +13235,7 @@ _08105234:
lsls r0, 24
lsrs r4, r0, 24
adds r0, r5, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08105260
@@ -13335,7 +13335,7 @@ _08105308:
str r3, [sp, 0x4]
_08105310:
adds r0, r7, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810536C
@@ -13486,7 +13486,7 @@ _0810544C:
strh r0, [r2, 0x2]
_0810546C:
mov r0, r8
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08105490
@@ -13583,7 +13583,7 @@ sub_8105538: @ 8105538
bl sub_80A69CC
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
movs r1, 0xA0
cmp r0, 0
@@ -13624,7 +13624,7 @@ sub_810557C: @ 810557C
strh r2, [r4, 0x2E]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
movs r1, 0xA0
cmp r0, 0
@@ -13952,7 +13952,7 @@ sub_8105810: @ 8105810
strh r0, [r4, 0x20]
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08105850
@@ -14686,7 +14686,7 @@ sub_8105DE8: @ 8105DE8
bl sub_80A69CC
ldr r6, =gAnimBankAttacker
ldrb r0, [r6]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08105E08
@@ -15563,7 +15563,7 @@ _0810653A:
_08106578:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -16653,7 +16653,7 @@ _08106E1C:
_08106E1E:
ldrb r6, [r0]
adds r0, r6, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -17198,7 +17198,7 @@ sub_8107260: @ 8107260
adds r6, r0, 0
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08107290
@@ -17239,7 +17239,7 @@ _081072A2:
strb r0, [r2]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _081072D8
@@ -17424,7 +17424,7 @@ sub_810744C: @ 810744C
bl sub_80A69CC
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810747C
@@ -17797,7 +17797,7 @@ sub_8107730: @ 8107730
cmp r0, 0
bne _0810778A
ldrb r0, [r7]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08107784
@@ -17848,11 +17848,11 @@ sub_81077C0: @ 81077C0
adds r6, r0, 0
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
- bl GetBankSide
+ bl GetBattlerSide
adds r4, r0, 0
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -17863,12 +17863,12 @@ sub_81077C0: @ 81077C0
negs r0, r0
strh r0, [r4]
ldrb r0, [r5]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
cmp r0, 0
beq _08107802
ldrb r0, [r5]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -17900,7 +17900,7 @@ _08107828:
bl sub_80A69CC
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08107842
@@ -18071,7 +18071,7 @@ sub_8107954: @ 8107954
bl SetAnimBgAttribute
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -18176,7 +18176,7 @@ _08107A32:
_08107AB4:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x1
@@ -19280,7 +19280,7 @@ sub_8108384: @ 8108384
push {r4,r5,lr}
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _081083B8
@@ -19578,7 +19578,7 @@ sub_81085C8: @ 81085C8
strh r0, [r4, 0xA]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08108600
@@ -19971,7 +19971,7 @@ sub_81088E4: @ 81088E4
lsrs r0, 24
strh r0, [r5, 0x10]
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
movs r2, 0x1
negs r2, r2
@@ -20748,7 +20748,7 @@ sub_8108F4C: @ 8108F4C
bl sub_80A6838
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08108F88
@@ -20800,7 +20800,7 @@ sub_8108FBC: @ 8108FBC
adds r4, r0, 0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08108FF0
@@ -20888,7 +20888,7 @@ sub_8109064: @ 8109064
bl sub_80A6838
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08109090
@@ -21039,24 +21039,24 @@ sub_8109198: @ 8109198
adds r6, r0, 0
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
- bl GetBankSide
+ bl GetBattlerSide
adds r4, r0, 0
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
bne _081091DE
movs r0, 0x2
- bl GetBankByPosition
+ bl GetBattlerAtPosition
ldrb r1, [r5]
lsls r0, 24
lsrs r0, 24
cmp r1, r0
beq _081091D6
movs r0, 0x3
- bl GetBankByPosition
+ bl GetBattlerAtPosition
ldrb r1, [r5]
lsls r0, 24
lsrs r0, 24
@@ -21409,7 +21409,7 @@ sub_8109460: @ 8109460
strh r0, [r4, 0x10]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x12]
@@ -21822,7 +21822,7 @@ sub_81097B4: @ 81097B4
ldrh r4, [r0, 0x20]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0810980C
@@ -21994,7 +21994,7 @@ sub_8109930: @ 8109930
lsrs r4, r0, 16
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08109970
@@ -22250,7 +22250,7 @@ _08109B18:
strh r0, [r5, 0x3C]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08109B48
@@ -22281,7 +22281,7 @@ _08109B70:
strh r0, [r5, 0x30]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08109B94
@@ -22580,7 +22580,7 @@ sub_8109DBC: @ 8109DBC
adds r4, r1, r0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
movs r2, 0x1
negs r2, r2
@@ -23077,7 +23077,7 @@ sub_810A1A8: @ 810A1A8
adds r4, r0, 0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810A1D0
@@ -23131,7 +23131,7 @@ sub_810A214: @ 810A214
adds r4, r0, 0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810A23C
@@ -23193,7 +23193,7 @@ sub_810A274: @ 810A274
strh r0, [r5, 0x22]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810A2C4
@@ -23578,7 +23578,7 @@ sub_810A5BC: @ 810A5BC
bne _0810A5D8
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0810A5E0
@@ -23645,7 +23645,7 @@ _0810A64E:
cmp r0, 0
bne _0810A666
adds r0, r6, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0810A66E
@@ -24539,7 +24539,7 @@ sub_810AD98: @ 810AD98
movs r0, 0x10
strh r0, [r5, 0x3C]
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -24654,7 +24654,7 @@ _0810AE90:
lsrs r0, 24
strh r0, [r5, 0x24]
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0810AECC
@@ -24822,7 +24822,7 @@ _0810AFFA:
_0810AFFC:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
movs r2, 0x1
negs r2, r2
@@ -25985,7 +25985,7 @@ sub_810B8EC: @ 810B8EC
strh r0, [r4, 0x32]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810B92C
@@ -26051,7 +26051,7 @@ _0810B990:
bl sub_80A8924
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810B9B6
@@ -26159,7 +26159,7 @@ _0810BA74:
_0810BA86:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810BAAC
@@ -26279,7 +26279,7 @@ sub_810BB60: @ 810BB60
strh r0, [r4, 0x2E]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
ldr r1, =0x0000ffec
cmp r0, 0
@@ -26314,7 +26314,7 @@ sub_810BBC8: @ 810BBC8
adds r4, r0, 0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
ldr r1, =0x0000ffec
cmp r0, 0
@@ -26458,7 +26458,7 @@ _0810BCE0:
_0810BCF2:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810BD1C
@@ -26655,7 +26655,7 @@ _0810BE6C:
bl sub_80A8924
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810BE92
@@ -26721,7 +26721,7 @@ _0810BEF4:
movs r1, 0
bl sub_80A8924
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810BF20
@@ -26764,7 +26764,7 @@ _0810BF52:
movs r1, 0
bl sub_80A8924
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810BF7C
@@ -26808,7 +26808,7 @@ _0810BFB6:
strh r0, [r5, 0x3A]
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0810BFCC
@@ -27474,7 +27474,7 @@ sub_810C560: @ 810C560
lsls r0, 8
strh r0, [r5, 0x3C]
_0810C594:
- ldr r3, =gBankPositions
+ ldr r3, =gBattlerPositions
ldrb r0, [r7]
adds r0, r3
ldrb r1, [r0]
@@ -27699,7 +27699,7 @@ _0810C736:
lsls r0, 24
cmp r0, 0
bne _0810C78C
- ldr r1, =gBankPositions
+ ldr r1, =gBattlerPositions
ldrb r0, [r6]
adds r0, r1
ldrb r1, [r0]
@@ -27843,7 +27843,7 @@ _0810C85A:
lsls r0, 24
cmp r0, 0
bne _0810C8B4
- ldr r1, =gBankPositions
+ ldr r1, =gBattlerPositions
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
adds r0, r1
@@ -28050,7 +28050,7 @@ sub_810C9E4: @ 810C9E4
ldrh r0, [r4, 0x2]
lsls r0, 20
lsrs r0, 24
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r5, r0, 24
adds r0, r5, 0
@@ -28373,7 +28373,7 @@ _0810CCA6:
strh r0, [r5, 0x2E]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810CCCE
@@ -28583,7 +28583,7 @@ sub_810CE68: @ 810CE68
bne _0810CE90
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810CE90
@@ -28771,7 +28771,7 @@ _0810D000:
negs r0, r0
lsrs r4, r0, 16
_0810D012:
- ldr r0, =gBankPositions
+ ldr r0, =gBattlerPositions
add r0, r8
ldrb r1, [r0]
adds r0, r7, 0
@@ -28983,7 +28983,7 @@ sub_810D1B4: @ 810D1B4
cmp r0, r1
bne _0810D1E0
ldrb r0, [r2]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -28999,7 +28999,7 @@ _0810D1E0:
bl sub_80A6980
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810D1FE
@@ -29520,7 +29520,7 @@ sub_810D608: @ 810D608
ldrsh r0, [r0, r1]
cmp r0, 0
bne _0810D664
- ldr r4, =gBankAttacker
+ ldr r4, =gBattleAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankCoord
@@ -29808,7 +29808,7 @@ sub_810D874: @ 810D874
ldrsh r0, [r0, r1]
cmp r0, 0
bne _0810D8B8
- ldr r4, =gBankAttacker
+ ldr r4, =gBattleAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBankCoord
@@ -29857,7 +29857,7 @@ _0810D8BE:
.pool
_0810D8F8:
adds r0, r4, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0810D918
@@ -29954,7 +29954,7 @@ sub_810D984: @ 810D984
ldr r0, =gAnimMoveTurn
ldrb r6, [r0]
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0810D9CE
@@ -30020,7 +30020,7 @@ _0810DA34:
_0810DA48:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810DA5E
@@ -30130,7 +30130,7 @@ _0810DB1A:
strh r0, [r4, 0x1C]
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0810DB50
@@ -30273,7 +30273,7 @@ _0810DC44:
bl sub_80A8924
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810DC72
@@ -30399,7 +30399,7 @@ sub_810DD50: @ 810DD50
bl sub_80A8924
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810DD7C
@@ -30460,7 +30460,7 @@ _0810DDE0:
bl sub_80A8924
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810DE06
@@ -30682,7 +30682,7 @@ sub_810DFA8: @ 810DFA8
bl sub_80A69CC
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810DFC8
@@ -30750,7 +30750,7 @@ sub_810E044: @ 810E044
adds r5, r0, 0
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810E070
@@ -30931,7 +30931,7 @@ sub_810E1C8: @ 810E1C8
adds r5, r0, 0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810E1F8
@@ -31107,7 +31107,7 @@ _0810E33C:
_0810E33E:
ldrb r6, [r0]
adds r0, r6, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0810E354
@@ -32108,7 +32108,7 @@ _0810EAC4:
bne _0810EADC
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810EAF2
@@ -32119,7 +32119,7 @@ _0810EADC:
bne _0810EAF8
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0810EAF8
@@ -33040,7 +33040,7 @@ sub_810F1EC: @ 810F1EC
mov r8, r0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810F212
@@ -33064,7 +33064,7 @@ _0810F212:
bne _0810F2B8
_0810F22E:
movs r0, 0x1
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
adds r7, r4, 0
@@ -33111,7 +33111,7 @@ _0810F284:
beq _0810F2B8
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0810F2B0
@@ -33128,7 +33128,7 @@ _0810F2B0:
_0810F2B8:
ldr r6, =gAnimBankAttacker
ldrb r0, [r6]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810F2CE
@@ -33193,7 +33193,7 @@ sub_810F340: @ 810F340
push {r4,r5,lr}
adds r5, r0, 0
movs r0, 0x1
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
movs r1, 0x3C
@@ -33370,7 +33370,7 @@ sub_810F46C: @ 810F46C
cmp r0, 0
bne _0810F502
movs r0, 0x1
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
@@ -33441,7 +33441,7 @@ sub_810F524: @ 810F524
cmp r0, 0
bne _0810F57C
movs r0, 0x1
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
@@ -33507,7 +33507,7 @@ _0810F5A6:
beq _0810F5EE
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0810F5E0
@@ -33582,7 +33582,7 @@ sub_810F634: @ 810F634
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810F684
@@ -33645,7 +33645,7 @@ sub_810F6B0: @ 810F6B0
lsls r1, 16
lsrs r7, r1, 16
ldrb r0, [r6]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -33833,7 +33833,7 @@ sub_810F83C: @ 810F83C
strh r1, [r4, 0xC]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
movs r1, 0x8
cmp r0, 0
@@ -35211,7 +35211,7 @@ sub_8110368: @ 8110368
_08110394:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _081103C4
@@ -35299,7 +35299,7 @@ sub_8110438: @ 8110438
_0811045C:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08110478
@@ -35467,7 +35467,7 @@ sub_81105B4: @ 81105B4
bl sub_80A8924
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _081105F0
@@ -35492,7 +35492,7 @@ _081105FC:
strh r0, [r4, 0x22]
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08110618
@@ -35657,7 +35657,7 @@ sub_8110720: @ 8110720
_08110740:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08110762
@@ -35678,22 +35678,22 @@ _08110762:
bne _081107B2
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
adds r4, r0, 0
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
- bl GetBankSide
+ bl GetBattlerSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
bne _081107B2
ldrb r0, [r5]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
cmp r0, 0
beq _081107A0
ldrb r0, [r5]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -35782,7 +35782,7 @@ sub_8110850: @ 8110850
bl sub_80A69CC
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08110870
@@ -36066,7 +36066,7 @@ sub_8110AB4: @ 8110AB4
bl AnimateSprite
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08110AE4
@@ -36256,7 +36256,7 @@ _08110C10:
beq _08110C6E
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08110C6E
@@ -36482,7 +36482,7 @@ sub_8110E4C: @ 8110E4C
beq _08110E98
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08110E98
@@ -37195,7 +37195,7 @@ sub_8111418: @ 8111418
adds r4, r0, 0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -38287,7 +38287,7 @@ _08111C80:
strh r1, [r0, 0x2E]
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08111CF4
@@ -39596,7 +39596,7 @@ sub_8112758: @ 8112758
bl SetGpuReg
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _081127A0
@@ -39871,7 +39871,7 @@ sub_81129F0: @ 81129F0
bl sub_80A69CC
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08112A24
@@ -40066,7 +40066,7 @@ sub_8112B78: @ 8112B78
strh r0, [r5, 0x24]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08112B9C
@@ -40303,7 +40303,7 @@ _08112D56:
strh r7, [r5, 0x2E]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
movs r1, 0
lsls r0, 24
cmp r0, 0
@@ -40693,7 +40693,7 @@ sub_8113064: @ 8113064
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _081130B4
@@ -40767,7 +40767,7 @@ sub_8113100: @ 8113100
strh r0, [r5, 0x36]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08113164
@@ -40878,7 +40878,7 @@ sub_8113224: @ 8113224
adds r4, r0, 0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0811323E
@@ -40918,7 +40918,7 @@ sub_8113250: @ 8113250
ldr r0, =gBattleAnimArgs
ldrh r0, [r0]
strh r0, [r6, 0x3A]
- ldr r4, =gBankAttacker
+ ldr r4, =gBattleAttacker
ldrb r0, [r4]
movs r1, 0
bl sub_80A861C
@@ -42085,7 +42085,7 @@ sub_8113BAC: @ 8113BAC
adds r0, 0x20
strh r0, [r5, 0x26]
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08113C1C
@@ -42500,7 +42500,7 @@ _08113F84:
adds r0, 0x4
strh r0, [r5, 0x26]
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08113FD8
@@ -43204,13 +43204,13 @@ _0811455C:
bne _081145D6
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
beq _0811458C
ldrb r0, [r4]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
cmp r0, 0
bne _081145D6
@@ -43264,7 +43264,7 @@ _081145D6:
_08114614:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08114640
@@ -43586,7 +43586,7 @@ _08114902:
beq _0811492E
_08114908:
adds r0, r4, 0
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
@@ -43766,7 +43766,7 @@ sub_8114A7C: @ 8114A7C
bl sub_80A6980
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08114A9C
@@ -45335,7 +45335,7 @@ sub_811572C: @ 811572C
strh r0, [r4, 0x2E]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -45846,7 +45846,7 @@ sub_8115B0C: @ 8115B0C
strh r1, [r0, 0x12]
strh r5, [r0, 0x18]
movs r4, 0
- ldr r0, =gBattleBanksCount
+ ldr r0, =gBattlersCount
ldrb r1, [r0]
mov r9, r3
mov r8, r2
@@ -46650,7 +46650,7 @@ _0811618A:
cmp r0, 0x1
bhi _081161DC
movs r4, 0
- ldr r5, =gBattleBanksCount
+ ldr r5, =gBattlersCount
ldrb r0, [r5]
cmp r4, r0
bcs _081161DC
@@ -46957,7 +46957,7 @@ sub_8116420: @ 8116420
adds r4, r0, 0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08116444
@@ -47869,13 +47869,13 @@ _08116BA2:
bne _08116C26
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
beq _08116BD2
ldrb r0, [r5]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
cmp r0, 0
bne _08116C26
@@ -47934,7 +47934,7 @@ _08116C26:
_08116C64:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08116C90
@@ -48306,14 +48306,14 @@ _08116FBA:
cmp r0, 0
bne _08117036
ldrb r0, [r1]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
beq _08116FEC
ldr r0, [r4]
ldrb r0, [r0]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
cmp r0, 0
bne _08117036
@@ -48370,7 +48370,7 @@ _08117078:
ldr r4, =gUnknown_0203A110
ldr r0, [r4]
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _081170A8
@@ -49098,7 +49098,7 @@ sub_8117660: @ 8117660
beq _0811769C
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0811769C
@@ -49198,7 +49198,7 @@ sub_8117754: @ 8117754
lsrs r4, 24
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
ldr r1, =gBattleAnimArgs
lsls r0, 24
lsrs r0, 24
@@ -49219,7 +49219,7 @@ sub_8117780: @ 8117780
lsrs r4, 24
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
ldr r1, =gBattleAnimArgs
lsls r0, 24
lsrs r0, 24
@@ -49431,7 +49431,7 @@ _08117930:
.pool
_08117964:
adds r0, r7, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08117988
@@ -50065,7 +50065,7 @@ sub_8117E94: @ 8117E94
lsls r0, 24
lsrs r0, 24
ldr r2, =gAnimBankAttacker
- ldr r1, =gBankDefender
+ ldr r1, =gBattleDefender
ldrb r1, [r1]
strb r1, [r2]
ldr r2, =gAnimBankTarget
@@ -50085,11 +50085,11 @@ sub_8117EC4: @ 8117EC4
lsrs r5, r0, 24
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
adds r4, r0, 0
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -50117,7 +50117,7 @@ sub_8117F10: @ 8117F10
lsls r0, 24
lsrs r0, 24
ldr r2, =gAnimBankTarget
- ldr r1, =gBankDefender
+ ldr r1, =gBattleDefender
ldrb r1, [r1]
strb r1, [r2]
bl DestroyAnimVisualTask
@@ -50132,7 +50132,7 @@ sub_8117F30: @ 8117F30
lsls r0, 24
lsrs r0, 24
ldr r2, =gAnimBankAttacker
- ldr r1, =gBankAttacker
+ ldr r1, =gBattleAttacker
ldrb r1, [r1]
strb r1, [r2]
ldr r2, =gAnimBankTarget
@@ -52078,7 +52078,7 @@ sub_8118FBC: @ 8118FBC
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
ldr r1, =gMonSpritesGfxPtr
diff --git a/asm/battle_anim_815A0D4.s b/asm/battle_anim_815A0D4.s
index 09ce04a68..d4c1b90b9 100644
--- a/asm/battle_anim_815A0D4.s
+++ b/asm/battle_anim_815A0D4.s
@@ -778,7 +778,7 @@ sub_815A6C4: @ 815A6C4
bl sub_80A8924
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0815A6F8
@@ -921,7 +921,7 @@ sub_815A7EC: @ 815A7EC
bne _0815A840
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0815A830
@@ -1019,7 +1019,7 @@ sub_815A8C8: @ 815A8C8
lsrs r4, r0, 24
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2484,7 +2484,7 @@ sub_815B49C: @ 815B49C
adds r4, r0, 0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0815B4BC
@@ -2515,7 +2515,7 @@ sub_815B4D4: @ 815B4D4
strh r0, [r4, 0x2E]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0815B4F8
@@ -3020,7 +3020,7 @@ _0815B8A8:
.pool
_0815B8E0:
ldrb r0, [r5]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r1, r0, 24
_0815B8EA:
@@ -3234,7 +3234,7 @@ _0815BAB6:
bne _0815BAF6
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3392,7 +3392,7 @@ _0815BC02:
_0815BC34:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0815BC58
@@ -3998,7 +3998,7 @@ _0815C124:
_0815C15C:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r4, r0, 24
bl IsDoubleBattle
@@ -4087,7 +4087,7 @@ _0815C224:
strh r0, [r5, 0xE]
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4327,7 +4327,7 @@ _0815C41E:
strh r0, [r4, 0x32]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0815C450
@@ -4434,7 +4434,7 @@ _0815C508:
ldr r0, =gAnimBankTarget
_0815C50A:
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4645,7 +4645,7 @@ sub_815C6B0: @ 815C6B0
adds r4, r0, 0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -4685,7 +4685,7 @@ sub_815C700: @ 815C700
strh r0, [r4, 0x2E]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0815C744
@@ -5172,7 +5172,7 @@ _0815CAD2:
cmp r0, 0
bne _0815CAF8
ldrb r0, [r6, 0x1E]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsls r2, r5, 4
cmp r0, 0
@@ -5695,7 +5695,7 @@ sub_815CED8: @ 815CED8
_0815CF18:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0815CFC4
@@ -5733,7 +5733,7 @@ _0815CF18:
cmp r0, 0
bne _0815CFBC
adds r0, r2, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0815CF9C
@@ -5801,7 +5801,7 @@ _0815CFC4:
cmp r0, 0
bne _0815D054
adds r0, r2, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0815D03C
@@ -6093,7 +6093,7 @@ _0815D26E:
movs r0, 0x18
strh r0, [r4, 0x18]
adds r0, r5, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -6829,7 +6829,7 @@ sub_815D870: @ 815D870
bl StartSpriteAffineAnim
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0815D896
@@ -7261,7 +7261,7 @@ sub_815DB90: @ 815DB90
strh r0, [r4, 0x14]
_0815DBD4:
ldrb r0, [r2]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0815DC04
@@ -7777,7 +7777,7 @@ sub_815E01C: @ 815E01C
adds r5, r0, 0
ldr r6, =gAnimBankAttacker
ldrb r0, [r6]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -7839,7 +7839,7 @@ _0815E09A:
_0815E0A8:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0815E0C8
@@ -7925,7 +7925,7 @@ _0815E144:
_0815E14E:
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0815E188
@@ -8451,7 +8451,7 @@ _0815E4EE:
bl sub_80A68D4
mov r1, r10
ldrb r0, [r1]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -9365,7 +9365,7 @@ _0815ECAC:
_0815ECB4:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0815ECD0
@@ -9617,7 +9617,7 @@ _0815EEAA:
ldrh r0, [r4, 0x3C]
lsls r0, 24
lsrs r0, 24
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -9999,7 +9999,7 @@ sub_815F18C: @ 815F18C
movs r1, 0x3
bl GetBankCoord
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0815F1B8
@@ -10362,7 +10362,7 @@ sub_815F48C: @ 815F48C
adds r5, r0, 0
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0815F4B8
@@ -10960,7 +10960,7 @@ _0815F940:
strh r0, [r6, 0xA]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
mov r9, r4
cmp r0, 0
@@ -11047,7 +11047,7 @@ _0815F9F4:
_0815FA28:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0815FAC8
@@ -11255,7 +11255,7 @@ _0815FBE8:
strh r0, [r6, 0xA]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
mov r9, r4
cmp r0, 0
@@ -11309,7 +11309,7 @@ _0815FC56:
bne _0815FCD6
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0815FCB4
@@ -11385,7 +11385,7 @@ _0815FD08:
bl sub_80A8610
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
mov r9, r4
cmp r0, 0
@@ -11444,7 +11444,7 @@ _0815FD8C:
mov r10, r0
ldrb r0, [r0]
str r2, [sp, 0x18]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
mov r9, r4
ldr r2, [sp, 0x18]
@@ -11585,7 +11585,7 @@ _0815FE92:
strb r0, [r2]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -11654,7 +11654,7 @@ _0815FF6E:
strh r0, [r4, 0x32]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0815FF9C
@@ -11900,7 +11900,7 @@ sub_8160164: @ 8160164
strh r0, [r4, 0xE]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
movs r2, 0x1
negs r2, r2
@@ -12074,7 +12074,7 @@ sub_81602E0: @ 81602E0
adds r4, r0, 0
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
ldrh r0, [r4, 0x2E]
ldrh r1, [r4, 0x30]
@@ -12117,7 +12117,7 @@ sub_8160338: @ 8160338
adds r4, r0, 0
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0816037C
diff --git a/asm/battle_anim_8170478.s b/asm/battle_anim_8170478.s
index 956b30186..ad37b18d2 100644
--- a/asm/battle_anim_8170478.s
+++ b/asm/battle_anim_8170478.s
@@ -857,7 +857,7 @@ sub_8170BB0: @ 8170BB0
adds r1, r0, r1
ldrb r1, [r1]
mov r9, r1
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08170BF8
@@ -1283,7 +1283,7 @@ _08170F54:
lsls r4, 24
lsrs r4, 24
movs r0, 0x1
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
bl sub_80A82E4
@@ -1335,7 +1335,7 @@ _08170F54:
ldr r0, =SpriteCallbackDummy
str r0, [r4]
movs r0, 0
- bl GetBankByPosition
+ bl GetBattlerAtPosition
ldr r1, =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
@@ -1371,7 +1371,7 @@ sub_8171030: @ 8171030
lsrs r5, r0, 24
ldr r6, =gSprites
movs r0, 0
- bl GetBankByPosition
+ bl GetBattlerAtPosition
ldr r1, =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
@@ -1422,7 +1422,7 @@ sub_81710A8: @ 81710A8
lsrs r5, r0, 24
ldr r6, =gSprites
movs r0, 0
- bl GetBankByPosition
+ bl GetBattlerAtPosition
ldr r4, =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
@@ -1438,7 +1438,7 @@ sub_81710A8: @ 81710A8
cmp r0, 0
bge _081710F4
movs r0, 0
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -4764,7 +4764,7 @@ _08172C36:
adds r0, r4
strh r0, [r5, 0x8]
ldrb r0, [r3]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08172C78
@@ -4838,7 +4838,7 @@ _08172CDA:
adds r0, r2
strh r0, [r5, 0x8]
ldrb r0, [r3]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08172D10
@@ -4879,7 +4879,7 @@ _08172D28:
strh r1, [r0, 0x8]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
@@ -5347,7 +5347,7 @@ _08173118:
cmp r0, 0
bne _08173160
mov r0, r8
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
movs r1, 0x3F
cmp r0, 0
@@ -5575,7 +5575,7 @@ sub_817330C: @ 817330C
movs r0, 0x1E
strh r0, [r4, 0x2E]
movs r0, 0x1
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -5587,7 +5587,7 @@ sub_817330C: @ 817330C
adds r0, r1
strh r0, [r4, 0x32]
movs r0, 0x1
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -5732,7 +5732,7 @@ sub_817345C: @ 817345C
.pool
_08173478:
movs r0, 0
- bl GetBankByPosition
+ bl GetBattlerAtPosition
ldr r1, =gAnimBankAttacker
strb r0, [r1]
movs r0, 0x1
@@ -5740,12 +5740,12 @@ _08173478:
.pool
_0817348C:
movs r0, 0x1
- bl GetBankByPosition
+ bl GetBattlerAtPosition
ldr r1, =gAnimBankAttacker
strb r0, [r1]
movs r0, 0
_08173498:
- bl GetBankByPosition
+ bl GetBattlerAtPosition
ldr r1, =gAnimBankTarget
strb r0, [r1]
_081734A0:
diff --git a/asm/battle_anim_sound_tasks.s b/asm/battle_anim_sound_tasks.s
index 949934e1d..85148c8b6 100644
--- a/asm/battle_anim_sound_tasks.s
+++ b/asm/battle_anim_sound_tasks.s
@@ -379,7 +379,7 @@ _08158E1E:
.pool
_08158E38:
adds r0, r4, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08158E5C
@@ -504,7 +504,7 @@ _08158F2E:
.pool
_08158F48:
adds r0, r4, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08158F6C
diff --git a/asm/battle_link_817C95C.s b/asm/battle_link_817C95C.s
index f1a398ad6..b9205632b 100644
--- a/asm/battle_link_817C95C.s
+++ b/asm/battle_link_817C95C.s
@@ -34,26 +34,26 @@ _0817C988:
movs r1, 0x81
lsls r1, 2
adds r7, r0, r1
- ldr r5, =gBankAttacker
+ ldr r5, =gBattleAttacker
ldrb r0, [r5]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gBankDefender
+ ldr r0, =gBattleDefender
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =gEffectBank
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]
@@ -83,7 +83,7 @@ _0817CA10:
str r1, [sp, 0x8]
cmp r6, 0
bne _0817CA3C
- ldr r0, =gBankDefender
+ ldr r0, =gBattleDefender
ldrb r0, [r0]
lsls r0, 1
adds r0, r2
@@ -94,7 +94,7 @@ _0817CA10:
b _0817CA4C
.pool
_0817CA3C:
- ldr r0, =gBankDefender
+ ldr r0, =gBattleDefender
ldrb r0, [r0]
lsls r0, 1
adds r0, r2
@@ -105,7 +105,7 @@ _0817CA3C:
_0817CA4C:
adds r1, r0
str r1, [sp, 0xC]
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
ldr r1, =gStringInfo
ldr r1, [r1]
@@ -134,20 +134,20 @@ _0817CA4C:
bl _0817E0A2
.pool
_0817CA9C:
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
mov r8, r0
- ldr r0, =gBankDefender
+ ldr r0, =gBattleDefender
ldrb r0, [r0]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r5, r0, 25
ldr r0, =gEffectBank
ldrb r0, [r0]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r3, r0, 25
ldr r1, [sp]
@@ -572,7 +572,7 @@ _0817D0DC:
lsls r3, 2
adds r3, r7, r3
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -602,7 +602,7 @@ _0817D124:
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -635,7 +635,7 @@ _0817D16C:
lsls r0, 2
adds r5, r7, r0
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -716,7 +716,7 @@ _0817D216:
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -776,7 +776,7 @@ _0817D296:
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -834,7 +834,7 @@ _0817D314:
adds r3, r0
adds r3, r7, r3
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -940,8 +940,8 @@ _0817D3F2:
bne _0817D3FE
bl _0817E0A6
_0817D3FE:
- ldr r0, =gBankAttacker
- ldr r1, =gBankDefender
+ ldr r0, =gBattleAttacker
+ ldr r1, =gBattleDefender
ldrb r0, [r0]
ldrb r1, [r1]
cmp r0, r1
@@ -1015,7 +1015,7 @@ _0817D498:
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1092,7 +1092,7 @@ _0817D53C:
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1162,7 +1162,7 @@ _0817D5CE:
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1227,7 +1227,7 @@ _0817D65E:
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1314,7 +1314,7 @@ _0817D704:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1354,7 +1354,7 @@ _0817D76C:
bl _0817E0A6
_0817D77E:
ldr r6, =gBattlePartyID
- ldr r5, =gBankAttacker
+ ldr r5, =gBattleAttacker
ldrb r0, [r5]
lsls r0, 1
adds r0, r6
@@ -1408,7 +1408,7 @@ _0817D7D8:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
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, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1498,7 +1498,7 @@ _0817D8A4:
_0817D8B6:
ldr r2, =gBattlePartyID
mov r8, r2
- ldr r6, =gBankAttacker
+ ldr r6, =gBattleAttacker
ldrb r0, [r6]
lsls r0, 1
add r0, r8
@@ -1574,7 +1574,7 @@ _0817D94C:
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1640,7 +1640,7 @@ _0817D9C2:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1672,7 +1672,7 @@ _0817D9C2:
.pool
_0817DA24:
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1715,7 +1715,7 @@ _0817DA68:
lsls r4, 3
adds r2, r4
adds r2, r7, r2
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1748,7 +1748,7 @@ _0817DA68:
.pool
_0817DACC:
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1803,7 +1803,7 @@ _0817DB24:
lsls r4, 3
adds r3, r4
adds r3, r7, r3
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r5
@@ -1839,7 +1839,7 @@ _0817DB76:
.pool
_0817DB90:
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1876,7 +1876,7 @@ _0817DBD4:
adds r3, r0
adds r3, r7, r3
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -1944,7 +1944,7 @@ _0817DC62:
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2022,7 +2022,7 @@ _0817DCFC:
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2050,7 +2050,7 @@ _0817DD38:
adds r2, r0
adds r2, r7, r2
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2122,7 +2122,7 @@ _0817DDC8:
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2155,7 +2155,7 @@ _0817DE10:
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2254,7 +2254,7 @@ _0817DEDC:
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2332,7 +2332,7 @@ _0817DF70:
lsls r2, 2
adds r2, r7, r2
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2414,7 +2414,7 @@ _0817DFE6:
ands r0, r2
strb r0, [r1]
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -2557,16 +2557,16 @@ _0817E122:
lsls r1, 2
adds r1, r0, r1
str r1, [sp, 0x8]
- ldr r2, =gBankAttacker
+ ldr r2, =gBattleAttacker
mov r10, r2
ldrb r0, [r2]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
mov r9, r0
- ldr r0, =gBankDefender
+ ldr r0, =gBattleDefender
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r4, r0, 24
mov r1, r10
@@ -2593,7 +2593,7 @@ _0817E122:
_0817E184:
mov r2, r10
ldrb r0, [r2]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
lsls r0, 3
@@ -2617,7 +2617,7 @@ _0817E184:
strb r1, [r0]
mov r1, r10
ldrb r0, [r1]
- bl GetBankPosition
+ bl GetBattlerPosition
lsls r0, 24
lsrs r0, 25
lsls r0, 3
@@ -2812,9 +2812,9 @@ sub_817E32C: @ 817E32C
movs r1, 0x81
lsls r1, 2
adds r4, r0, r1
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
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, =gBattleAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gBankDefender
+ ldr r0, =gBattleDefender
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r3, r0, 24
mov r0, r10
@@ -3298,7 +3298,7 @@ _0817E6F0:
.4byte _0817E760
_0817E760:
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -3330,7 +3330,7 @@ _0817E79C:
lsls r2, r0, 4
ldr r4, =0x0000ffff
ldr r1, [r1]
- ldr r3, =gBankAttacker
+ ldr r3, =gBattleAttacker
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, =gBattleAttacker
mov r8, r3
ldrb r0, [r3]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gBankDefender
+ ldr r0, =gBattleDefender
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r2, r0, 24
lsls r0, r4, 1
@@ -4006,7 +4006,7 @@ _0817ECCC:
lsrs r0, 5
subs r6, r0, 0x1
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -4165,7 +4165,7 @@ _0817EE1C:
bne _0817EEBC
adds r2, r4, 0
ldr r1, =gBattlePartyID
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -4269,9 +4269,9 @@ sub_817EECC: @ 817EECC
beq _0817EEE6
b _0817F1FA
_0817EEE6:
- ldr r4, =gBankAttacker
+ ldr r4, =gBattleAttacker
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, =gBankDefender
+ ldr r0, =gBattleDefender
ldrb r0, [r0]
muls r0, r1
adds r0, r5
@@ -4367,7 +4367,7 @@ _0817EF8A:
beq _0817EF98
b _0817F1FA
_0817EF98:
- ldr r2, =gBankAttacker
+ ldr r2, =gBattleAttacker
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, =gBankDefender
+ ldr r4, =gBattleDefender
mov r9, r4
_0817EFC2:
lsls r1, r5, 1
- ldr r6, =gBankAttacker
+ ldr r6, =gBattleAttacker
ldrb r0, [r6]
movs r2, 0x58
muls r0, r2
@@ -4414,13 +4414,13 @@ _0817EFC2:
ldr r4, =gSideStatuses
mov r1, r9
ldrb r0, [r1]
- bl GetBankPosition
+ bl GetBattlerPosition
movs r1, 0x1
ands r1, r0
lsls r1, 1
adds r1, r4
ldrh r3, [r1]
- ldr r2, =gBankAttacker
+ ldr r2, =gBattleAttacker
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, =gBattleAttacker
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, =gBattleAttacker
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, =gBattleAttacker
ldrb r1, [r6]
lsls r1, 4
adds r1, r0
@@ -4513,7 +4513,7 @@ _0817F0B4:
cmp r5, 0x3
ble _0817EFC2
movs r5, 0
- ldr r3, =gBankAttacker
+ ldr r3, =gBattleAttacker
ldr r6, =gMoveSelectionCursor
ldr r4, =gBattlePartyID
mov r8, r4
@@ -4545,9 +4545,9 @@ _0817F0D8:
movs r7, 0
_0817F0F6:
movs r5, 0
- ldr r4, =gBankDefender
+ ldr r4, =gBattleDefender
ldr r6, =gEnemyParty
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
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, =gBattleAttacker
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, =gBattleAttacker
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, =gBattleAttacker
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, =gBattleAttacker
ldrb r1, [r0]
movs r0, 0x58
muls r0, r1
@@ -4801,7 +4801,7 @@ GetBankMoveSlotId: @ 817F33C
lsls r1, 16
lsrs r7, r1, 16
adds r0, r5, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
ldr r6, =gEnemyParty
cmp r0, 0
diff --git a/asm/contest.s b/asm/contest.s
index ba451fbdb..8760464aa 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -1048,7 +1048,7 @@ _080D8004:
bl sub_80DC594
bl sub_80DC5E8
bl sub_80DC7EC
- ldr r1, =gBankPositions
+ ldr r1, =gBattlerPositions
strb r4, [r1]
movs r0, 0x1
strb r0, [r1, 0x1]
@@ -1058,9 +1058,9 @@ _080D8004:
strb r2, [r1, 0x3]
ldr r0, =gBattleTypeFlags
str r4, [r0]
- ldr r4, =gBankAttacker
+ ldr r4, =gBattleAttacker
strb r2, [r4]
- ldr r0, =gBankDefender
+ ldr r0, =gBattleDefender
strb r3, [r0]
bl sub_80DB0C4
ldr r2, =gBankSpriteIds
@@ -2548,7 +2548,7 @@ _080D8DD0:
adds r4, r0
strh r5, [r4, 0xC]
ldr r1, =gBankSpriteIds
- ldr r0, =gBankAttacker
+ ldr r0, =gBattleAttacker
ldrb r0, [r0]
adds r0, r1
strb r5, [r0]
@@ -13798,7 +13798,7 @@ sub_80DEA20: @ 80DEA20
bl CreateInvisibleSpriteWithCallback
ldr r1, =gBankSpriteIds
strb r0, [r1, 0x3]
- ldr r0, =gBankDefender
+ ldr r0, =gBattleDefender
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -13905,12 +13905,12 @@ _080DEAD0:
.4byte _080DEB60
.4byte _080DEB60
_080DEB54:
- ldr r1, =gBankDefender
+ ldr r1, =gBattleDefender
movs r0, 0x2
b _080DEB64
.pool
_080DEB60:
- ldr r1, =gBankDefender
+ ldr r1, =gBattleDefender
movs r0, 0x3
_080DEB64:
strb r0, [r1]
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 9232d0ac6..6112d2413 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -16041,7 +16041,7 @@ _081B8AF8:
b _081B8B24
_081B8AFC:
adds r0, r4, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _081B8B1E
@@ -16060,7 +16060,7 @@ _081B8B1E:
lsls r0, 24
lsrs r4, r0, 24
_081B8B24:
- ldr r0, =gBattleBanksCount
+ ldr r0, =gBattlersCount
ldrb r0, [r0]
cmp r4, r0
bcc _081B8AFC
@@ -16228,7 +16228,7 @@ _081B8CBE:
bne _081B8CFC
movs r5, 0x1
movs r0, 0
- bl GetBankByPosition
+ bl GetBattlerAtPosition
mov r2, sp
ldr r1, =gBattlePartyID
lsls r0, 24
@@ -16255,7 +16255,7 @@ _081B8CF0:
_081B8CFC:
movs r5, 0x2
movs r0, 0
- bl GetBankByPosition
+ bl GetBattlerAtPosition
mov r1, sp
ldr r4, =gBattlePartyID
lsls r0, 24
@@ -16264,7 +16264,7 @@ _081B8CFC:
ldrh r0, [r0]
strb r0, [r1]
movs r0, 0x2
- bl GetBankByPosition
+ bl GetBattlerAtPosition
mov r1, sp
lsls r0, 24
lsrs r0, 23
@@ -16339,24 +16339,24 @@ sub_81B8D88: @ 81B8D88
lsrs r7, r1, 24
lsls r0, 24
lsrs r0, 24
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _081B8DB0
movs r0, 0
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x2
b _081B8DBC
_081B8DB0:
movs r0, 0x1
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
_081B8DBC:
- bl GetBankByPosition
+ bl GetBattlerAtPosition
lsls r0, 24
lsrs r6, r0, 24
bl sub_81B1250
diff --git a/asm/pokemon_1.s b/asm/pokemon_1.s
index 15b4af009..0ab5a3307 100644
--- a/asm/pokemon_1.s
+++ b/asm/pokemon_1.s
@@ -581,7 +581,7 @@ _080689E4:
beq _080689CE
_080689F4:
adds r0, r5, 0
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080689CE
diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s
index fb8ea0d3c..6da70ff2f 100644
--- a/asm/pokemon_item_effect.s
+++ b/asm/pokemon_item_effect.s
@@ -114,17 +114,17 @@ _0806BDC4:
lsrs r1, r0, 24
cmp r1, 0
beq _0806BE64
- ldr r0, =gActiveBank
+ ldr r0, =gActiveBattler
strb r2, [r0]
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
negs r1, r0
orrs r1, r0
lsrs r1, 31
str r1, [sp, 0x1C]
- ldr r0, =gBattleBanksCount
+ ldr r0, =gBattlersCount
ldr r4, [sp, 0xC]
subs r4, 0xD
ldrb r0, [r0]
@@ -148,7 +148,7 @@ _0806BE3C:
ldr r1, [sp, 0x1C]
adds r1, 0x2
str r1, [sp, 0x1C]
- ldr r0, =gBattleBanksCount
+ ldr r0, =gBattlersCount
ldrb r0, [r0]
cmp r1, r0
bge _0806BE70
@@ -165,7 +165,7 @@ _0806BE3C:
b _0806BE70
.pool
_0806BE64:
- ldr r0, =gActiveBank
+ ldr r0, =gActiveBattler
strb r1, [r0]
movs r3, 0x4
str r3, [sp, 0x38]
@@ -200,7 +200,7 @@ _0806BE9A:
ands r0, r1
cmp r0, 0
beq _0806BECC
- ldr r0, =gActiveBank
+ ldr r0, =gActiveBattler
ldrb r1, [r0]
lsls r0, r1, 3
subs r0, r1
@@ -297,7 +297,7 @@ _0806BF76:
cmp r0, 0
beq _0806BFA4
ldr r1, =gBattleMons
- ldr r0, =gActiveBank
+ ldr r0, =gActiveBattler
ldrb r2, [r0]
movs r0, 0x58
muls r0, r2
@@ -323,7 +323,7 @@ _0806BFA4:
bl _0806CD4C
_0806BFB2:
ldr r6, =gBattleMons
- ldr r5, =gActiveBank
+ ldr r5, =gActiveBattler
ldrb r0, [r5]
movs r4, 0x58
muls r0, r4
@@ -362,7 +362,7 @@ _0806BFFC:
cmp r3, 0
beq _0806C042
ldr r7, =gBattleMons
- ldr r5, =gActiveBank
+ ldr r5, =gActiveBattler
ldrb r0, [r5]
movs r4, 0x58
muls r0, r4
@@ -396,7 +396,7 @@ _0806C042:
bl _0806CD4C
_0806C050:
ldr r6, =gBattleMons
- ldr r5, =gActiveBank
+ ldr r5, =gActiveBattler
ldrb r0, [r5]
movs r4, 0x58
muls r0, r4
@@ -433,7 +433,7 @@ _0806C08C:
cmp r3, 0
beq _0806C0D2
ldr r7, =gBattleMons
- ldr r5, =gActiveBank
+ ldr r5, =gActiveBattler
ldrb r0, [r5]
movs r4, 0x58
muls r0, r4
@@ -467,7 +467,7 @@ _0806C0D2:
bl _0806CD4C
_0806C0E0:
ldr r6, =gBattleMons
- ldr r5, =gActiveBank
+ ldr r5, =gActiveBattler
ldrb r0, [r5]
movs r4, 0x58
muls r0, r4
@@ -506,9 +506,9 @@ _0806C120:
cmp r0, 0
beq _0806C168
ldr r5, =gSideTimers
- ldr r4, =gActiveBank
+ ldr r4, =gActiveBattler
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
@@ -519,7 +519,7 @@ _0806C120:
cmp r0, 0
bne _0806C168
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
@@ -965,7 +965,7 @@ _0806C4FC:
ldr r3, [sp, 0x38]
cmp r3, 0x4
beq _0806C55C
- ldr r2, =gAbsentBankFlags
+ ldr r2, =gAbsentBattlerFlags
ldr r1, =gBitTable
lsls r0, r3, 2
adds r0, r1
@@ -983,14 +983,14 @@ _0806C4FC:
lsrs r1, 24
ldr r0, [sp, 0x38]
bl CopyPlayerPartyMonToBattleData
- ldr r0, =gActiveBank
+ ldr r0, =gActiveBattler
ldrb r0, [r0]
b _0806C574
.pool
_0806C55C:
- ldr r3, =gAbsentBankFlags
+ ldr r3, =gAbsentBattlerFlags
ldr r1, =gBitTable
- ldr r2, =gActiveBank
+ ldr r2, =gActiveBattler
ldrb r0, [r2]
eors r0, r4
lsls r0, 2
@@ -1001,7 +1001,7 @@ _0806C55C:
strb r0, [r3]
ldrb r0, [r2]
_0806C574:
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0806C5B2
@@ -1135,9 +1135,9 @@ _0806C65E:
ands r0, r3
cmp r0, 0
bne _0806C6EC
- ldr r4, =gActiveBank
+ ldr r4, =gActiveBattler
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _0806C6EC
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 04:49:13 +0000