summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_anim_80A5C6C.s92
-rw-r--r--asm/battle_anim_80A9C70.s4
-rw-r--r--asm/battle_anim_80FE840.s706
-rwxr-xr-xasm/battle_anim_815A0D4.s116
-rw-r--r--asm/battle_anim_8170478.s20
-rw-r--r--asm/battle_link_817C95C.s12
-rw-r--r--asm/contest.s6
7 files changed, 478 insertions, 478 deletions
diff --git a/asm/battle_anim_80A5C6C.s b/asm/battle_anim_80A5C6C.s
index 08baa4595..1c19805a0 100644
--- a/asm/battle_anim_80A5C6C.s
+++ b/asm/battle_anim_80A5C6C.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start GetBankPosition
-GetBankPosition: @ 80A5C6C
+ thumb_func_start GetBankCoord
+GetBankCoord: @ 80A5C6C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -40,7 +40,7 @@ _080A5C9C:
_080A5CB0:
ldr r4, =gUnknown_08525F58
adds r0, r5, 0
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 22
ldr r1, =gBattleTypeFlags
@@ -56,7 +56,7 @@ _080A5CB0:
_080A5CD8:
ldr r4, =gUnknown_08525F58
adds r0, r5, 0
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 22
ldr r1, =gBattleTypeFlags
@@ -154,7 +154,7 @@ _080A5DB0:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end GetBankPosition
+ thumb_func_end GetBankCoord
thumb_func_start sub_80A5DB8
sub_80A5DB8: @ 80A5DB8
@@ -476,7 +476,7 @@ _080A603E:
lsrs r4, r0, 16
_080A605C:
adds r0, r6, 0
- bl GetBankIdentity
+ bl GetBankPosition
ldr r3, =gUnknown_08525F58
lsls r0, 24
lsrs r0, 22
@@ -577,7 +577,7 @@ _080A611C:
_080A6126:
adds r0, r4, 0
adds r1, r5, 0
- bl GetBankPosition
+ bl GetBankCoord
_080A612E:
lsls r0, 24
lsrs r0, 24
@@ -592,7 +592,7 @@ GetBankSpriteDefault_Y: @ 80A6138
lsls r0, 24
lsrs r0, 24
movs r1, 0x4
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -611,7 +611,7 @@ GetSubstituteSpriteDefault_Y: @ 80A614C
beq _080A6170
adds r0, r4, 0
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 8
movs r1, 0x80
@@ -620,7 +620,7 @@ GetSubstituteSpriteDefault_Y: @ 80A614C
_080A6170:
adds r0, r4, 0
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 8
movs r1, 0x88
@@ -642,7 +642,7 @@ sub_80A6190: @ 80A6190
lsrs r5, r0, 24
adds r0, r5, 0
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r6, r0, 24
bl IsContest
@@ -1245,13 +1245,13 @@ sub_80A65EC: @ 80A65EC
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -1442,13 +1442,13 @@ sub_80A6760: @ 80A6760
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -1550,13 +1550,13 @@ sub_80A6838: @ 80A6838
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1578,13 +1578,13 @@ sub_80A6864: @ 80A6864
ldr r7, =gAnimBankAttacker
ldrb r0, [r7]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
cmp r6, r0
@@ -1810,7 +1810,7 @@ _080A6A04:
GetBankSide: @ 80A6A30
lsls r0, 24
lsrs r0, 24
- ldr r1, =gBanksByIdentity
+ ldr r1, =gBankPositions
adds r0, r1
ldrb r1, [r0]
movs r0, 0x1
@@ -1819,16 +1819,16 @@ GetBankSide: @ 80A6A30
.pool
thumb_func_end GetBankSide
- thumb_func_start GetBankIdentity
-GetBankIdentity: @ 80A6A44
+ thumb_func_start GetBankPosition
+GetBankPosition: @ 80A6A44
lsls r0, 24
lsrs r0, 24
- ldr r1, =gBanksByIdentity
+ ldr r1, =gBankPositions
adds r0, r1
ldrb r0, [r0]
bx lr
.pool
- thumb_func_end GetBankIdentity
+ thumb_func_end GetBankPosition
thumb_func_start GetBankByIdentity
GetBankByIdentity: @ 80A6A54
@@ -1840,7 +1840,7 @@ GetBankByIdentity: @ 80A6A54
ldrb r2, [r0]
cmp r1, r2
bcs _080A6A7E
- ldr r4, =gBanksByIdentity
+ ldr r4, =gBankPositions
ldrb r0, [r4]
cmp r0, r3
beq _080A6A7E
@@ -1883,7 +1883,7 @@ IsBankSpritePresent: @ 80A6A90
b _080A6B18
.pool
_080A6ABC:
- ldr r0, =gBanksByIdentity
+ ldr r0, =gBankPositions
adds r0, r4, r0
ldrb r0, [r0]
cmp r0, 0xFF
@@ -3685,7 +3685,7 @@ _080A785C:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x4]
@@ -3693,7 +3693,7 @@ _080A785C:
strh r0, [r5, 0x32]
ldrb r0, [r4]
adds r1, r7, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x6]
@@ -3733,7 +3733,7 @@ _080A78CC:
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -3741,7 +3741,7 @@ _080A78CC:
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x6]
@@ -3828,7 +3828,7 @@ _080A798E:
strh r0, [r5, 0x2E]
adds r0, r6, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r2, [r4, 0x4]
@@ -3836,7 +3836,7 @@ _080A798E:
strh r0, [r5, 0x32]
adds r0, r6, 0
adds r1, r7, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
@@ -5027,7 +5027,7 @@ _080A82FC:
b _080A8320
_080A8300:
adds r0, r4, 0
- bl GetBankIdentity
+ bl GetBankPosition
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 GetBankIdentity
+ bl GetBankPosition
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 GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -5713,7 +5713,7 @@ _080A88A6:
_080A88AE:
mov r0, r8
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrb r1, [r4]
@@ -5722,7 +5722,7 @@ _080A88AE:
_080A88C0:
mov r0, r8
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrb r1, [r4]
@@ -5731,7 +5731,7 @@ _080A88C0:
_080A88D2:
mov r0, r8
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrb r2, [r4]
@@ -5744,7 +5744,7 @@ _080A88E4:
_080A88EA:
mov r0, r8
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrb r2, [r4]
@@ -5757,7 +5757,7 @@ _080A88FC:
_080A8902:
mov r0, r8
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x1F
@@ -5798,13 +5798,13 @@ _080A8942:
_080A8946:
adds r0, r4, 0
adds r1, r5, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
mov r8, r0
adds r0, r4, 0
adds r1, r6, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r7, r0, 24
bl IsDoubleBattle
@@ -5819,12 +5819,12 @@ _080A8946:
eors r4, r0
adds r0, r4, 0
adds r1, r5, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r5, r0, 24
adds r0, r4, 0
adds r1, r6, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r3, r0, 24
mov r0, r8
@@ -6392,13 +6392,13 @@ sub_80A8E30: @ 80A8E30
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
diff --git a/asm/battle_anim_80A9C70.s b/asm/battle_anim_80A9C70.s
index c471cc729..82981ff21 100644
--- a/asm/battle_anim_80A9C70.s
+++ b/asm/battle_anim_80A9C70.s
@@ -334,7 +334,7 @@ sub_80A9EF4: @ 80A9EF4
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 8
ldr r1, =0xffe00000
@@ -342,7 +342,7 @@ sub_80A9EF4: @ 80A9EF4
lsrs r5, r0, 16
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 8
ldr r1, =0xffdc0000
diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s
index e51dcedb7..c94826f40 100644
--- a/asm/battle_anim_80FE840.s
+++ b/asm/battle_anim_80FE840.s
@@ -99,13 +99,13 @@ sub_80FE8E0: @ 80FE8E0
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -135,13 +135,13 @@ sub_80FE930: @ 80FE930
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -170,7 +170,7 @@ sub_80FE988: @ 80FE988
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -178,7 +178,7 @@ sub_80FE988: @ 80FE988
strh r0, [r4, 0x34]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -324,13 +324,13 @@ sub_80FEAD8: @ 80FEAD8
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -377,13 +377,13 @@ sub_80FEB44: @ 80FEB44
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -413,7 +413,7 @@ _080FEB94:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -421,7 +421,7 @@ _080FEB94:
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -511,7 +511,7 @@ _080FEC68:
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -519,7 +519,7 @@ _080FEC68:
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x6]
@@ -774,7 +774,7 @@ sub_80FEE78: @ 80FEE78
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x4]
@@ -871,7 +871,7 @@ sub_80FEF44: @ 80FEF44
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x4]
@@ -953,13 +953,13 @@ sub_80FEFFC: @ 80FEFFC
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -1101,7 +1101,7 @@ _080FF114:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x4]
@@ -1109,7 +1109,7 @@ _080FF114:
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x6]
@@ -1799,7 +1799,7 @@ _080FF6AA:
_080FF6C2:
ldrb r0, [r6]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
@@ -1808,7 +1808,7 @@ _080FF6C2:
strh r0, [r5, 0x20]
ldrb r0, [r6]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x2]
@@ -1848,13 +1848,13 @@ _080FF704:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -1881,13 +1881,13 @@ sub_80FF768: @ 80FF768
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1944,13 +1944,13 @@ sub_80FF7EC: @ 80FF7EC
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
mov r8, r0
mov r0, r8
lsls r0, 24
@@ -1959,13 +1959,13 @@ sub_80FF7EC: @ 80FF7EC
ldr r6, =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r6]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
adds r2, r0, 0
lsls r2, 24
subs r4, r5
@@ -2098,7 +2098,7 @@ sub_80FF934: @ 80FF934
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
@@ -2107,7 +2107,7 @@ sub_80FF934: @ 80FF934
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
@@ -2352,12 +2352,12 @@ sub_80FFB18: @ 80FFB18
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =gAnimBankAttacker
@@ -2456,7 +2456,7 @@ sub_80FFBF4: @ 80FFBF4
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
@@ -2554,12 +2554,12 @@ sub_80FFCB4: @ 80FFCB4
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =gAnimBankTarget
@@ -2963,13 +2963,13 @@ sub_80FFFC0: @ 80FFFC0
strh r0, [r5, 0x10]
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x14]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x16]
@@ -3837,7 +3837,7 @@ _081006CE:
_081006D4:
adds r0, r6, 0
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5]
@@ -3860,7 +3860,7 @@ _08100700:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r7, [r7]
@@ -4082,12 +4082,12 @@ _081008C4:
_081008C6:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r5, r0, 24
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =gBattleAnimArgs
@@ -4346,13 +4346,13 @@ sub_8100AE0: @ 8100AE0
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -4444,7 +4444,7 @@ _08100BA8:
movs r4, 0x2
eors r0, r4
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r7, r0, 24
ldrb r0, [r5]
@@ -4456,12 +4456,12 @@ _08100BC8:
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r7, r0, 24
ldrb r0, [r5]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r4, r0, 24
ldrb r0, [r5]
@@ -4477,7 +4477,7 @@ _08100BC8:
mov r2, r8
eors r0, r2
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, r7
@@ -4486,7 +4486,7 @@ _08100BC8:
mov r1, r8
eors r0, r1
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -4497,13 +4497,13 @@ _08100C24:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r7, r0, 24
ldrb r0, [r4]
_08100C34:
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r4, r0, 24
_08100C3E:
@@ -5093,14 +5093,14 @@ sub_81010CC: @ 81010CC
ldr r6, =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
movs r5, 0
strh r0, [r4, 0x20]
ldrb r0, [r6]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldr r1, =0x0000ffe8
@@ -5470,7 +5470,7 @@ _081013C4:
bne _081013E8
adds r0, r6, 0
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
@@ -5481,14 +5481,14 @@ _081013C4:
_081013E8:
adds r0, r6, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
adds r0, r6, 0
movs r1, 0x3
_081013FA:
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x2]
@@ -5888,14 +5888,14 @@ _08101718:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, r7
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, r6
@@ -6930,7 +6930,7 @@ _08101F5C:
_08101F5E:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x2]
@@ -6938,7 +6938,7 @@ _08101F5E:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x4]
@@ -6965,7 +6965,7 @@ sub_8101FA8: @ 8101FA8
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldr r1, =0x0000ffd0
@@ -6973,7 +6973,7 @@ sub_8101FA8: @ 8101FA8
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -6995,7 +6995,7 @@ sub_8101FF0: @ 8101FF0
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldr r1, =gBattleAnimArgs
@@ -7007,7 +7007,7 @@ sub_8101FF0: @ 8101FF0
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -7123,7 +7123,7 @@ _081020F4:
_081020F6:
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x2]
@@ -7131,7 +7131,7 @@ _081020F6:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x4]
@@ -7194,14 +7194,14 @@ sub_810217C: @ 810217C
ldr r6, =gAnimBankAttacker
ldrb r0, [r6]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
movs r5, 0
strh r0, [r4, 0x20]
ldrb r0, [r6]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0xC
@@ -7319,7 +7319,7 @@ sub_8102268: @ 8102268
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r5, =gBattleAnimArgs
lsrs r0, 24
@@ -7328,7 +7328,7 @@ sub_8102268: @ 8102268
strh r0, [r6, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x2]
@@ -7468,13 +7468,13 @@ _08102390:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -7676,7 +7676,7 @@ sub_8102540: @ 8102540
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r2, =gBattleAnimArgs
lsrs r0, 24
@@ -8071,7 +8071,7 @@ _08102862:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6]
@@ -8079,7 +8079,7 @@ _08102862:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x2]
@@ -8660,12 +8660,12 @@ _08102D34:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r3, r0, 24
_08102D4E:
@@ -8870,7 +8870,7 @@ sub_8102EB0: @ 8102EB0
_08102ECE:
ldrb r0, [r7]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
@@ -8880,7 +8880,7 @@ _08102ECE:
strh r0, [r6, 0x20]
ldrb r0, [r7]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r2, [r4, 0x4]
@@ -9005,14 +9005,14 @@ _08102FDE:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, r6
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x8
@@ -9167,7 +9167,7 @@ _08103136:
strh r0, [r6, 0x20]
adds r0, r5, 0
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
adds r4, r0, 0
adds r0, r5, 0
movs r1, 0
@@ -9334,7 +9334,7 @@ _081032A2:
ldrb r5, [r0]
adds r0, r5, 0
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
movs r6, 0
@@ -9719,13 +9719,13 @@ sub_810358C: @ 810358C
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -10140,7 +10140,7 @@ _0810390E:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r6, =gBattleAnimArgs
lsrs r0, 24
@@ -10151,7 +10151,7 @@ _0810390E:
mov r8, r0
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r2, [r6, 0x6]
@@ -10676,7 +10676,7 @@ _08103D54:
strh r0, [r3, 0x4]
b _08103DB6
_08103D5C:
- ldr r1, =gBanksByIdentity
+ ldr r1, =gBankPositions
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
adds r0, r1
@@ -10719,7 +10719,7 @@ _08103DB6:
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
ldr r1, =gTasks
mov r3, r8
adds r4, r3, r7
@@ -10731,7 +10731,7 @@ _08103DB6:
adds r6, r0, 0
ldrb r0, [r5]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
@@ -10762,13 +10762,13 @@ _08103E20:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
mov r1, r10
@@ -11053,12 +11053,12 @@ sub_8104088: @ 8104088
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
@@ -11203,13 +11203,13 @@ sub_81041C4: @ 81041C4
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -11426,14 +11426,14 @@ _08104390:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
add r0, r8
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, r6
@@ -11513,7 +11513,7 @@ _08104448:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
add r0, r9
@@ -11522,7 +11522,7 @@ _08104448:
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, r6
@@ -12356,7 +12356,7 @@ sub_8104B1C: @ 8104B1C
bl StartSpriteAnim
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -12370,7 +12370,7 @@ _08104B50:
bl StartSpriteAnim
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x20
@@ -12381,7 +12381,7 @@ _08104B6A:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -12432,7 +12432,7 @@ _08104BCA:
_08104BE4:
adds r0, r5, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
@@ -12441,7 +12441,7 @@ _08104BE4:
strh r0, [r6, 0x20]
adds r0, r5, 0
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x4]
@@ -12962,7 +12962,7 @@ sub_810501C: @ 810501C
ldr r6, =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -13231,7 +13231,7 @@ _08105230:
adds r0, r5, 0
movs r1, 0x2
_08105234:
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r4, r0, 24
adds r0, r5, 0
@@ -13341,7 +13341,7 @@ _08105310:
beq _0810536C
adds r0, r7, 0
mov r1, r10
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r1, =gBattleAnimArgs
lsrs r0, 24
@@ -13372,7 +13372,7 @@ _0810535C:
_0810536C:
adds r0, r7, 0
mov r1, r10
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldr r1, =gBattleAnimArgs
@@ -13442,7 +13442,7 @@ _081053FA:
strb r0, [r1]
adds r0, r7, 0
ldr r1, [sp, 0x4]
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
@@ -13473,13 +13473,13 @@ _0810544C:
mov r4, sp
mov r0, r8
mov r1, r10
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
mov r0, r8
ldr r1, [sp, 0x4]
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
mov r2, sp
@@ -14295,13 +14295,13 @@ sub_8105AAC: @ 8105AAC
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x24]
ldrb r0, [r5]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -14700,7 +14700,7 @@ _08105E08:
strh r0, [r5, 0x2E]
ldrb r0, [r6]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -14708,7 +14708,7 @@ _08105E08:
strh r0, [r5, 0x32]
ldrb r0, [r6]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x6]
@@ -15075,7 +15075,7 @@ sub_8106140: @ 8106140
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -15083,7 +15083,7 @@ sub_8106140: @ 8106140
strh r0, [r4, 0x34]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -15776,13 +15776,13 @@ sub_810673C: @ 810673C
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -15927,13 +15927,13 @@ sub_8106878: @ 8106878
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -16032,13 +16032,13 @@ sub_8106944: @ 8106944
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -16513,13 +16513,13 @@ _08106CFC:
_08106CFE:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -16666,7 +16666,7 @@ _08106E1E:
_08106E38:
adds r0, r6, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r7, =gBattleAnimArgs
lsrs r0, 24
@@ -16676,7 +16676,7 @@ _08106E38:
strh r0, [r5, 0x20]
adds r0, r6, 0
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r7, 0x4]
@@ -17019,13 +17019,13 @@ _081070F8:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x28
@@ -17204,7 +17204,7 @@ sub_8107260: @ 8107260
beq _08107290
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldr r4, =gBattleAnimArgs
@@ -17215,7 +17215,7 @@ sub_8107260: @ 8107260
_08107290:
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
@@ -17225,7 +17225,7 @@ _081072A2:
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x2]
@@ -17256,7 +17256,7 @@ _081072D8:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x32]
@@ -17264,7 +17264,7 @@ _081072D8:
strh r0, [r6, 0x34]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x36]
@@ -17448,7 +17448,7 @@ _08107482:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, r6
@@ -17457,7 +17457,7 @@ _08107482:
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r7, [r7, 0x6]
@@ -17624,7 +17624,7 @@ sub_81075EC: @ 81075EC
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -17632,7 +17632,7 @@ sub_81075EC: @ 81075EC
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -17776,13 +17776,13 @@ sub_8107730: @ 8107730
ldr r7, =gAnimBankAttacker
ldrb r0, [r7]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r7]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -17863,12 +17863,12 @@ sub_81077C0: @ 81077C0
negs r0, r0
strh r0, [r4]
ldrb r0, [r5]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
cmp r0, 0
beq _08107802
ldrb r0, [r5]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -17913,7 +17913,7 @@ _08107842:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r5, 0x4]
@@ -17921,7 +17921,7 @@ _08107842:
strh r0, [r6, 0x32]
ldrb r0, [r4]
adds r1, r7, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
@@ -19353,13 +19353,13 @@ sub_8108408: @ 8108408
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0xAC
@@ -19959,14 +19959,14 @@ sub_81088E4: @ 81088E4
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
movs r6, 0
strh r0, [r5, 0xE]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x10]
@@ -20421,13 +20421,13 @@ sub_8108C94: @ 8108C94
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x30]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -21131,7 +21131,7 @@ sub_8109244: @ 8109244
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -21139,7 +21139,7 @@ sub_8109244: @ 8109244
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -21167,13 +21167,13 @@ sub_810929C: @ 810929C
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x22]
@@ -22359,7 +22359,7 @@ _08109BCE:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -22367,7 +22367,7 @@ _08109BCE:
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -23181,13 +23181,13 @@ sub_810A274: @ 810A274
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -23307,7 +23307,7 @@ _0810A384:
bne _0810A3AC
adds r0, r4, 0
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
@@ -23318,14 +23318,14 @@ _0810A384:
_0810A3AC:
adds r0, r4, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
adds r0, r4, 0
movs r1, 0x3
_0810A3BE:
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -23420,7 +23420,7 @@ sub_810A46C: @ 810A46C
ldr r6, =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -23428,7 +23428,7 @@ sub_810A46C: @ 810A46C
strh r0, [r4, 0x34]
ldrb r0, [r6]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -23591,7 +23591,7 @@ _0810A5E0:
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
@@ -23600,7 +23600,7 @@ _0810A5E0:
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -23657,7 +23657,7 @@ _0810A666:
_0810A66E:
adds r0, r6, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
@@ -23666,7 +23666,7 @@ _0810A66E:
strh r0, [r5, 0x20]
adds r0, r6, 0
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
@@ -23830,7 +23830,7 @@ sub_810A7DC: @ 810A7DC
ldr r6, =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
ldr r1, =gTasks
lsls r4, r5, 2
adds r4, r5
@@ -23844,7 +23844,7 @@ sub_810A7DC: @ 810A7DC
strh r0, [r4, 0x8]
ldrb r0, [r6]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r5, 0x2]
@@ -24228,13 +24228,13 @@ _0810AB28:
_0810AB2A:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x26]
@@ -24448,13 +24448,13 @@ _0810ACF4:
_0810ACF6:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -24486,13 +24486,13 @@ _0810AD4C:
_0810AD4E:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -24521,13 +24521,13 @@ sub_810AD98: @ 810AD98
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -24649,7 +24649,7 @@ _0810AE90:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
@@ -24855,13 +24855,13 @@ _0810B012:
_0810B048:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xE]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
@@ -24881,13 +24881,13 @@ _0810B070:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
movs r2, 0xA
@@ -25127,13 +25127,13 @@ _0810B24E:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -25194,13 +25194,13 @@ _0810B2DC:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x14]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x16]
@@ -25209,7 +25209,7 @@ _0810B2DC:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x1C]
@@ -25542,7 +25542,7 @@ _0810B58A:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -25564,7 +25564,7 @@ _0810B5B4:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -25724,26 +25724,26 @@ sub_810B6C4: @ 810B6C4
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r3, r0, 24
ldrb r0, [r4]
movs r1, 0x3
str r3, [sp]
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r6, r0, 24
ldr r1, =gBattleAnimArgs
@@ -25979,7 +25979,7 @@ sub_810B8EC: @ 810B8EC
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -26006,7 +26006,7 @@ _0810B936:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r1, =gBattleAnimArgs
lsrs r0, 24
@@ -26133,13 +26133,13 @@ sub_810BA24: @ 810BA24
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x6]
@@ -26434,13 +26434,13 @@ sub_810BC94: @ 810BC94
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -27182,13 +27182,13 @@ sub_810C2F0: @ 810C2F0
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -27460,12 +27460,12 @@ sub_810C560: @ 810C560
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
adds r4, r0, 0
ldr r7, =gAnimBankTarget
ldrb r0, [r7]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -27474,7 +27474,7 @@ sub_810C560: @ 810C560
lsls r0, 8
strh r0, [r5, 0x3C]
_0810C594:
- ldr r3, =gBanksByIdentity
+ ldr r3, =gBankPositions
ldrb r0, [r7]
adds r0, r3
ldrb r1, [r0]
@@ -27526,13 +27526,13 @@ _0810C5F4:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -27548,7 +27548,7 @@ _0810C5F4:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x6]
@@ -27570,7 +27570,7 @@ _0810C65C:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x6]
@@ -27583,7 +27583,7 @@ _0810C65C:
ldrb r0, [r4]
movs r1, 0x1
_0810C684:
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x8]
@@ -27679,7 +27679,7 @@ _0810C736:
ldr r6, =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
@@ -27699,7 +27699,7 @@ _0810C736:
lsls r0, 24
cmp r0, 0
bne _0810C78C
- ldr r1, =gBanksByIdentity
+ ldr r1, =gBankPositions
ldrb r0, [r6]
adds r0, r1
ldrb r1, [r0]
@@ -27843,7 +27843,7 @@ _0810C85A:
lsls r0, 24
cmp r0, 0
bne _0810C8B4
- ldr r1, =gBanksByIdentity
+ ldr r1, =gBankPositions
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
adds r0, r1
@@ -28062,12 +28062,12 @@ sub_810C9E4: @ 810C9E4
str r0, [sp, 0x4]
adds r0, r5, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r7, r0, 24
adds r0, r5, 0
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r6, r0, 24
mov r1, r8
@@ -28384,7 +28384,7 @@ _0810CCCE:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x4]
@@ -28392,7 +28392,7 @@ _0810CCCE:
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x6]
@@ -28705,13 +28705,13 @@ _0810CF74:
bl StartSpriteAnim
mov r0, r8
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
mov r0, r8
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -28771,7 +28771,7 @@ _0810D000:
negs r0, r0
lsrs r4, r0, 16
_0810D012:
- ldr r0, =gBanksByIdentity
+ ldr r0, =gBankPositions
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 GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -29149,13 +29149,13 @@ sub_810D308: @ 810D308
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -29275,13 +29275,13 @@ _0810D428:
_0810D42A:
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -29389,7 +29389,7 @@ sub_810D4F4: @ 810D4F4
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r2, [r6, 0x4]
@@ -29400,7 +29400,7 @@ _0810D520:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x4]
@@ -29409,7 +29409,7 @@ _0810D532:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x6]
@@ -29523,13 +29523,13 @@ sub_810D608: @ 810D608
ldr r4, =gBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -29601,7 +29601,7 @@ sub_810D6A8: @ 810D6A8
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -29611,7 +29611,7 @@ sub_810D6A8: @ 810D6A8
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -29715,13 +29715,13 @@ _0810D7C2:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -29729,14 +29729,14 @@ _0810D7C2:
mov r8, r2
ldrb r0, [r2]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
mov r1, r8
ldrb r0, [r1]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
subs r4, r6
strh r4, [r7, 0x2E]
@@ -29811,13 +29811,13 @@ sub_810D874: @ 810D874
ldr r4, =gBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -29879,7 +29879,7 @@ _0810D918:
strh r0, [r5, 0x30]
adds r0, r4, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -29887,7 +29887,7 @@ _0810D918:
strh r0, [r5, 0x34]
adds r0, r4, 0
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -29932,13 +29932,13 @@ sub_810D984: @ 810D984
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -30208,13 +30208,13 @@ _0810DBC2:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -30699,7 +30699,7 @@ _0810DFC8:
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -30709,7 +30709,7 @@ _0810DFC8:
strh r0, [r6, 0x34]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
@@ -30782,13 +30782,13 @@ _0810E070:
_0810E088:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r2, =gBattleAnimArgs
ldrh r1, [r2]
@@ -30808,13 +30808,13 @@ _0810E088:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -30958,7 +30958,7 @@ _0810E1FE:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -30966,7 +30966,7 @@ _0810E1FE:
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -31118,7 +31118,7 @@ _0810E33E:
_0810E354:
adds r0, r6, 0
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
@@ -31127,7 +31127,7 @@ _0810E354:
strh r0, [r7, 0x20]
adds r0, r6, 0
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldrh r1, [r4, 0x2]
lsrs r0, 24
@@ -32064,13 +32064,13 @@ sub_810EA4C: @ 810EA4C
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -32240,13 +32240,13 @@ sub_810EB88: @ 810EB88
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -32344,7 +32344,7 @@ _0810ECB0:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -32553,13 +32553,13 @@ _0810EE40:
_0810EE42:
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -32708,13 +32708,13 @@ _0810EF74:
_0810EF76:
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -32864,14 +32864,14 @@ sub_810F084: @ 810F084
ldr r6, =gAnimBankAttacker
ldrb r0, [r6]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x20]
ldrb r0, [r6]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
@@ -33139,7 +33139,7 @@ _0810F2B8:
_0810F2CE:
ldrb r0, [r6]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
@@ -33148,7 +33148,7 @@ _0810F2CE:
strh r0, [r5, 0x20]
ldrb r0, [r6]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x2]
@@ -33571,13 +33571,13 @@ sub_810F634: @ 810F634
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -33656,14 +33656,14 @@ sub_810F6B0: @ 810F6B0
_0810F6F6:
ldrb r0, [r6]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, r4
strh r0, [r5, 0x20]
ldrb r0, [r6]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, r7
@@ -33955,13 +33955,13 @@ sub_810F940: @ 810F940
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
@@ -34263,13 +34263,13 @@ sub_810FBA8: @ 810FBA8
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -35065,13 +35065,13 @@ _08110260:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -35254,7 +35254,7 @@ _081103C4:
strh r0, [r6, 0x2E]
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -35262,7 +35262,7 @@ _081103C4:
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
@@ -35333,13 +35333,13 @@ _08110478:
strh r0, [r6, 0x2E]
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x36]
@@ -35387,13 +35387,13 @@ _08110500:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -35688,12 +35688,12 @@ _08110762:
cmp r4, r0
bne _081107B2
ldrb r0, [r5]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
cmp r0, 0
beq _081107A0
ldrb r0, [r5]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -35715,7 +35715,7 @@ _081107B2:
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
adds r4, r0, 0
lsls r4, 24
ldr r6, =gBattleAnimArgs
@@ -35726,7 +35726,7 @@ _081107B2:
lsrs r4, 16
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -35797,7 +35797,7 @@ _08110870:
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -35805,7 +35805,7 @@ _08110870:
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x6]
@@ -35949,13 +35949,13 @@ _081109B0:
_081109B2:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x12
@@ -36623,13 +36623,13 @@ sub_8110F74: @ 8110F74
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldrb r0, [r5]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 8
movs r1, 0xC0
@@ -36639,13 +36639,13 @@ sub_8110F74: @ 8110F74
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
mov r10, r0
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 8
movs r2, 0xC0
@@ -37219,13 +37219,13 @@ sub_8111444: @ 8111444
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldr r2, =gBattleAnimArgs
@@ -37446,7 +37446,7 @@ sub_811160C: @ 811160C
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -37454,7 +37454,7 @@ sub_811160C: @ 811160C
strh r0, [r4, 0x34]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -37929,7 +37929,7 @@ sub_81119E0: @ 81119E0
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -37938,7 +37938,7 @@ sub_81119E0: @ 81119E0
mov r1, r8
ldrb r0, [r1]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -38045,13 +38045,13 @@ _08111AD2:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x30]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -38107,13 +38107,13 @@ _08111B3C:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -38982,12 +38982,12 @@ sub_8112264: @ 8112264
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 8
movs r2, 0xE0
@@ -39001,12 +39001,12 @@ _081122AC:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 8
movs r2, 0xE0
@@ -39017,13 +39017,13 @@ _081122AC:
_081122D0:
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
mov r10, r0
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 8
movs r1, 0xE0
@@ -39169,7 +39169,7 @@ sub_81123C4: @ 81123C4
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
@@ -39221,7 +39221,7 @@ _08112436:
beq _08112502
adds r0, r4, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -40198,7 +40198,7 @@ sub_8112C6C: @ 8112C6C
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1A]
@@ -40682,13 +40682,13 @@ sub_8113064: @ 8113064
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -40755,13 +40755,13 @@ sub_8113100: @ 8113100
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -40842,13 +40842,13 @@ _081131D0:
_081131D2:
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -40901,14 +40901,14 @@ sub_8113250: @ 8113250
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
movs r5, 0
strh r0, [r6, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x22]
@@ -41358,14 +41358,14 @@ sub_81135EC: @ 81135EC
mov r8, r1
ldrb r0, [r1]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
mov r2, r8
ldrb r0, [r2]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r3, [r5, 0x8]
@@ -41693,26 +41693,26 @@ sub_81138D4: @ 81138D4
ldr r6, =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x30]
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r6]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x34]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -42057,7 +42057,7 @@ sub_8113BAC: @ 8113BAC
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x1F
@@ -42076,7 +42076,7 @@ sub_8113BAC: @ 8113BAC
strh r1, [r5, 0x22]
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -42475,7 +42475,7 @@ _08113F84:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x1F
@@ -42492,7 +42492,7 @@ _08113F84:
strh r1, [r5, 0x22]
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
subs r1, r0, 0x4
@@ -43204,13 +43204,13 @@ _0811455C:
bne _081145D6
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
beq _0811458C
ldrb r0, [r4]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
cmp r0, 0
bne _081145D6
@@ -43658,13 +43658,13 @@ sub_8114994: @ 8114994
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -43673,13 +43673,13 @@ sub_8114994: @ 8114994
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -43719,13 +43719,13 @@ sub_81149FC: @ 81149FC
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -43781,7 +43781,7 @@ _08114A9C:
ldr r5, =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -43789,7 +43789,7 @@ _08114A9C:
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
@@ -43893,7 +43893,7 @@ sub_8114B80: @ 8114B80
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r2, [r6, 0x2]
@@ -43901,7 +43901,7 @@ sub_8114B80: @ 8114B80
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r3, [r6, 0x4]
@@ -44657,7 +44657,7 @@ _081151BE:
_081151DA:
adds r0, r4, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, r6
@@ -44723,7 +44723,7 @@ _08115262:
ldrb r5, [r0]
adds r0, r5, 0
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldr r2, =0x0000fff0
@@ -45244,7 +45244,7 @@ _0811565A:
adds r4, r0
adds r0, r5, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
movs r1, 0x20
@@ -45255,7 +45255,7 @@ _0811565A:
strh r1, [r4, 0xA]
adds r0, r5, 0
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
movs r1, 0x40
@@ -47869,13 +47869,13 @@ _08116BA2:
bne _08116C26
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
beq _08116BD2
ldrb r0, [r5]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
cmp r0, 0
bne _08116C26
@@ -48306,14 +48306,14 @@ _08116FBA:
cmp r0, 0
bne _08117036
ldrb r0, [r1]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
beq _08116FEC
ldr r0, [r4]
ldrb r0, [r0]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
cmp r0, 0
bne _08117036
diff --git a/asm/battle_anim_815A0D4.s b/asm/battle_anim_815A0D4.s
index d583f1e85..111dfb1b2 100755
--- a/asm/battle_anim_815A0D4.s
+++ b/asm/battle_anim_815A0D4.s
@@ -90,7 +90,7 @@ sub_815A160: @ 815A160
ldr r6, =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 8
@@ -100,7 +100,7 @@ sub_815A160: @ 815A160
asrs r4, 16
ldrb r0, [r6]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
adds r1, r0, 0
lsls r1, 24
lsrs r1, 8
@@ -210,13 +210,13 @@ sub_815A254: @ 815A254
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r7, r0, 0
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r6, r0, 0
@@ -1254,13 +1254,13 @@ sub_815AAA4: @ 815AAA4
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1510,7 +1510,7 @@ _0815ACEC:
_0815ACEE:
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x2]
@@ -1518,7 +1518,7 @@ _0815ACEE:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1906,13 +1906,13 @@ sub_815AFF0: @ 815AFF0
ldr r6, =gAnimBankAttacker
ldrb r0, [r6]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xC]
ldrb r0, [r6]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xE]
@@ -2281,13 +2281,13 @@ _0815B2D8:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -2373,13 +2373,13 @@ _0815B3BE:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2817,7 +2817,7 @@ _0815B71E:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -3020,7 +3020,7 @@ _0815B8A8:
.pool
_0815B8E0:
ldrb r0, [r5]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r1, r0, 24
_0815B8EA:
@@ -3624,14 +3624,14 @@ _0815BE2E:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, r5
strh r0, [r7, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -3998,7 +3998,7 @@ _0815C124:
_0815C15C:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r4, r0, 24
bl IsDoubleBattle
@@ -4994,13 +4994,13 @@ sub_815C95C: @ 815C95C
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -5531,13 +5531,13 @@ sub_815CDB4: @ 815CDB4
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -5842,13 +5842,13 @@ _0815D05A:
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
mov r2, r10
lsls r1, r2, 16
@@ -6840,7 +6840,7 @@ _0815D896:
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x2]
@@ -6848,7 +6848,7 @@ _0815D896:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x4]
@@ -7382,13 +7382,13 @@ _0815DCEA:
ldrb r4, [r0]
adds r0, r4, 0
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x10]
adds r0, r4, 0
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
@@ -7789,7 +7789,7 @@ sub_815E01C: @ 815E01C
_0815E038:
ldrb r0, [r6]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
@@ -7798,7 +7798,7 @@ _0815E038:
strh r0, [r5, 0x20]
ldrb r0, [r6]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
@@ -7931,7 +7931,7 @@ _0815E14E:
bne _0815E188
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
adds r4, r0, 0
ldrb r0, [r5]
movs r1, 0
@@ -7951,7 +7951,7 @@ _0815E17C:
_0815E188:
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
adds r4, r0, 0
ldrb r0, [r5]
movs r1, 0
@@ -7971,7 +7971,7 @@ _0815E1AC:
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
adds r4, r0, 0
ldrb r0, [r5]
movs r1, 0
@@ -7990,13 +7990,13 @@ _0815E1D0:
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x22]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x24]
@@ -8349,14 +8349,14 @@ sub_815E47C: @ 815E47C
mov r10, r0
ldrb r0, [r0]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x1E]
mov r1, r10
ldrb r0, [r1]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x20]
@@ -8364,14 +8364,14 @@ sub_815E47C: @ 815E47C
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x22]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
adds r4, r0, 0
mov r1, r8
ldrb r0, [r1]
@@ -8659,7 +8659,7 @@ _0815E724:
strh r1, [r4, 0x3C]
adds r0, r5, 0
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -8950,7 +8950,7 @@ _0815E970:
_0815E972:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
@@ -9342,7 +9342,7 @@ sub_815EC48: @ 815EC48
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -9350,7 +9350,7 @@ sub_815EC48: @ 815EC48
movs r0, 0x2
eors r0, r1
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -9771,14 +9771,14 @@ _0815EFEC:
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r5, r0, 24
ldrh r0, [r4, 0x3C]
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r1, r0, 24
_0815F00C:
@@ -9994,10 +9994,10 @@ sub_815F18C: @ 815F18C
ldr r4, =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
ldrb r0, [r4]
bl GetBankSide
lsls r0, 24
@@ -10387,7 +10387,7 @@ _0815F4C8:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -11180,7 +11180,7 @@ _0815FB50:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
lsls r3, r5, 16
@@ -11318,7 +11318,7 @@ _0815FC56:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -11331,7 +11331,7 @@ _0815FCB4:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -11469,7 +11469,7 @@ _0815FD8C:
mov r1, r10
ldrb r0, [r1]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r3, r5, 0
@@ -11499,7 +11499,7 @@ _0815FE0C:
mov r2, r10
ldrb r0, [r2]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r3, r5, 0
@@ -11566,7 +11566,7 @@ _0815FE92:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -11724,14 +11724,14 @@ _08160008:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
adds r2, r0, 0
@@ -12169,7 +12169,7 @@ sub_81603A8: @ 81603A8
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
diff --git a/asm/battle_anim_8170478.s b/asm/battle_anim_8170478.s
index 635c02e03..a7893ee94 100644
--- a/asm/battle_anim_8170478.s
+++ b/asm/battle_anim_8170478.s
@@ -907,13 +907,13 @@ _08170C44:
ldr r5, =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
adds r1, r0, 0
lsls r1, 24
ldr r2, =gSprites
@@ -1166,14 +1166,14 @@ sub_8170E04: @ 8170E04
mov r8, r2
ldrb r0, [r2]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x30]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -1317,14 +1317,14 @@ _08170F54:
mov r8, r1
ldrb r0, [r1]
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x30]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -5234,12 +5234,12 @@ _0817303A:
ldrb r0, [r4, 0x8]
mov r8, r0
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r5, r0, 24
mov r0, r8
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r2, r0, 24
movs r1, 0x1E
@@ -5579,7 +5579,7 @@ sub_817330C: @ 817330C
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
ldr r5, =gBattleAnimArgs
lsrs r0, 24
@@ -5591,7 +5591,7 @@ sub_817330C: @ 817330C
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
diff --git a/asm/battle_link_817C95C.s b/asm/battle_link_817C95C.s
index fedb50c45..d656946b4 100644
--- a/asm/battle_link_817C95C.s
+++ b/asm/battle_link_817C95C.s
@@ -136,18 +136,18 @@ _0817CA4C:
_0817CA9C:
ldr r0, =gBankAttacker
ldrb r0, [r0]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 25
mov r8, r0
ldr r0, =gBankTarget
ldrb r0, [r0]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r5, r0, 25
ldr r0, =gEffectBank
ldrb r0, [r0]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r3, r0, 25
ldr r1, [sp]
@@ -2593,7 +2593,7 @@ _0817E122:
_0817E184:
mov r2, r10
ldrb r0, [r2]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 25
lsls r0, 3
@@ -2617,7 +2617,7 @@ _0817E184:
strb r1, [r0]
mov r1, r10
ldrb r0, [r1]
- bl GetBankIdentity
+ bl GetBankPosition
lsls r0, 24
lsrs r0, 25
lsls r0, 3
@@ -4414,7 +4414,7 @@ _0817EFC2:
ldr r4, =gSideAffecting
mov r1, r9
ldrb r0, [r1]
- bl GetBankIdentity
+ bl GetBankPosition
movs r1, 0x1
ands r1, r0
lsls r1, 1
diff --git a/asm/contest.s b/asm/contest.s
index 3c34965ad..c35a29733 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, =gBanksByIdentity
+ ldr r1, =gBankPositions
strb r4, [r1]
movs r0, 0x1
strb r0, [r1, 0x1]
@@ -13829,13 +13829,13 @@ sub_80DEA5C: @ 80DEA5C
strh r0, [r4, 0x26]
movs r0, 0x3
movs r1, 0
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
movs r0, 0x3
movs r1, 0x1
- bl GetBankPosition
+ bl GetBankCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 06:57:34 +0000