summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_anim_812C144.s166
-rw-r--r--asm/battle_anim_813F0F4.s20
-rw-r--r--asm/current.s60
-rw-r--r--asm/flying.s62
-rw-r--r--asm/ghost.s42
-rw-r--r--asm/ground.s38
-rw-r--r--asm/ice.s50
-rw-r--r--asm/normal.s10
-rw-r--r--asm/water.s14
9 files changed, 231 insertions, 231 deletions
diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s
index 57b6b27d8..e49873ee6 100644
--- a/asm/battle_anim_812C144.s
+++ b/asm/battle_anim_812C144.s
@@ -92,7 +92,7 @@ sub_812C1D0: @ 812C1D0
ldr r6, _0812C21C @ =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 8
@@ -102,7 +102,7 @@ sub_812C1D0: @ 812C1D0
asrs r4, 16
ldrb r0, [r6]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
adds r1, r0, 0
lsls r1, 24
lsrs r1, 8
@@ -213,13 +213,13 @@ sub_812C2BC: @ 812C2BC
ldr r4, _0812C348 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r7, r0, 0
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r6, r0, 0
@@ -1309,13 +1309,13 @@ sub_812CAFC: @ 812CAFC
ldr r4, _0812CB74 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1562,7 +1562,7 @@ _0812CD04:
_0812CD06:
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x2]
@@ -1570,7 +1570,7 @@ _0812CD06:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1977,13 +1977,13 @@ sub_812D008: @ 812D008
ldr r6, _0812D060 @ =gAnimBankAttacker
ldrb r0, [r6]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xC]
ldrb r0, [r6]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xE]
@@ -1993,7 +1993,7 @@ sub_812D008: @ 812D008
strh r0, [r4, 0x12]
strh r5, [r4, 0x14]
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -2366,13 +2366,13 @@ _0812D2F0:
ldr r4, _0812D348 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -2409,7 +2409,7 @@ sub_812D350: @ 812D350
_0812D370: .4byte gTasks
_0812D374:
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2441,7 +2441,7 @@ sub_812D3AC: @ 812D3AC
push {r4-r6,lr}
adds r5, r0, 0
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r6, r0, 24
movs r1, 0x2E
@@ -2463,13 +2463,13 @@ _0812D3D6:
ldr r4, _0812D408 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2829,7 +2829,7 @@ sub_812D674: @ 812D674
cmp r0, 0
bne _0812D6B4
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2873,7 +2873,7 @@ sub_812D6CC: @ 812D6CC
cmp r0, 0
bne _0812D70C
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2922,7 +2922,7 @@ _0812D736:
ldr r0, _0812D75C @ =gAnimBankAttacker
ldrb r0, [r0]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -2974,7 +2974,7 @@ sub_812D790: @ 812D790
cmp r0, 0
bne _0812D7D0
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3858,14 +3858,14 @@ _0812DED6:
ldr r4, _0812DFD0 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, r5
strh r0, [r7, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -4587,7 +4587,7 @@ sub_812E498: @ 812E498
cmp r0, 0
bne _0812E4D8
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4739,7 +4739,7 @@ _0812E5AC:
subs r0, 0x1
strh r0, [r4, 0x14]
ldrb r0, [r5]
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -5090,7 +5090,7 @@ sub_812E860: @ 812E860
strh r0, [r4, 0x24]
ldr r0, _0812E8AC @ =gBattleAnimArgs
ldrb r0, [r0]
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -5332,13 +5332,13 @@ sub_812EA4C: @ 812EA4C
ldr r4, _0812EAA8 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -5453,7 +5453,7 @@ _0812EB4E:
strh r0, [r2, 0x1E]
mov r1, r8
ldrb r0, [r1]
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _0812EB8C @ =gTasks
@@ -5895,13 +5895,13 @@ sub_812EEA4: @ 812EEA4
ldr r5, _0812EEE0 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -6045,7 +6045,7 @@ sub_812EFC8: @ 812EFC8
lsrs r0, 24
str r0, [sp, 0x10]
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
bl IsContest
lsls r0, 24
cmp r0, 0
@@ -6219,13 +6219,13 @@ _0812F13E:
ldr r5, _0812F21C @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
mov r2, r10
lsls r1, r2, 16
@@ -6503,7 +6503,7 @@ _0812F388:
strh r0, [r4, 0x24]
ldr r0, _0812F3C4 @ =gBattleAnimArgs
ldrb r0, [r0]
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -6974,7 +6974,7 @@ sub_812F724: @ 812F724
strh r0, [r4, 0x8]
ldr r0, _0812F760 @ =gBattleAnimArgs
ldrb r0, [r0]
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7262,7 +7262,7 @@ _0812F96E:
ldr r4, _0812F9A8 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x2]
@@ -7270,7 +7270,7 @@ _0812F96E:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x4]
@@ -7833,13 +7833,13 @@ _0812FDC2:
ldrb r4, [r0]
adds r0, r4, 0
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x10]
adds r0, r4, 0
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
@@ -7850,7 +7850,7 @@ _0812FDC2:
strh r0, [r5, 0x14]
ldr r0, _0812FE14 @ =gBattleAnimArgs
ldrb r0, [r0]
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -8123,7 +8123,7 @@ sub_812FFE4: @ 812FFE4
ldrh r0, [r1, 0x2]
strh r0, [r4, 0xA]
ldrb r0, [r1]
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _08130034 @ =gSprites
@@ -8262,7 +8262,7 @@ sub_81300F4: @ 81300F4
_08130110:
ldrb r0, [r6]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _08130150 @ =gBattleAnimArgs
lsrs r0, 24
@@ -8271,7 +8271,7 @@ _08130110:
strh r0, [r5, 0x20]
ldrb r0, [r6]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
@@ -8410,7 +8410,7 @@ _08130226:
bne _08130260
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
adds r4, r0, 0
ldrb r0, [r5]
movs r1, 0
@@ -8431,7 +8431,7 @@ _0813025C: .4byte gAnimBankAttacker
_08130260:
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
adds r4, r0, 0
ldrb r0, [r5]
movs r1, 0
@@ -8451,7 +8451,7 @@ _08130284:
ldr r5, _081302D8 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
adds r4, r0, 0
ldrb r0, [r5]
movs r1, 0
@@ -8470,13 +8470,13 @@ _081302A8:
ldr r4, _081302DC @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x22]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x24]
@@ -8840,14 +8840,14 @@ sub_8130554: @ 8130554
mov r10, r0
ldrb r0, [r0]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x1E]
mov r1, r10
ldrb r0, [r1]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x20]
@@ -8855,14 +8855,14 @@ sub_8130554: @ 8130554
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x22]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
adds r4, r0, 0
mov r1, r8
ldrb r0, [r1]
@@ -9163,7 +9163,7 @@ _081307FC:
strh r1, [r4, 0x3C]
adds r0, r5, 0
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -9336,7 +9336,7 @@ _08130934:
ldrh r0, [r2, 0x2]
strh r0, [r4, 0x8]
ldrb r0, [r2]
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -9470,7 +9470,7 @@ _08130A48:
_08130A4A:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
@@ -9858,7 +9858,7 @@ sub_8130D20: @ 8130D20
ldr r0, _08130D7C @ =gTasks
adds r6, r1, r0
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x26]
@@ -9874,7 +9874,7 @@ sub_8130D20: @ 8130D20
ldr r5, _08130D80 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -9882,7 +9882,7 @@ sub_8130D20: @ 8130D20
movs r0, 0x2
eors r0, r1
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -10323,14 +10323,14 @@ _081310C4:
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r5, r0, 24
ldrh r0, [r4, 0x3C]
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r1, r0, 24
_081310E4:
@@ -10547,10 +10547,10 @@ sub_8131264: @ 8131264
ldr r4, _081312A0 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
ldrb r0, [r4]
bl GetBattlerSide
lsls r0, 24
@@ -10614,7 +10614,7 @@ sub_81312E4: @ 81312E4
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r5, r0, 24
adds r2, r5, 0
@@ -10755,7 +10755,7 @@ sub_8131408: @ 8131408
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r3, r0, 24
ldr r1, _08131434 @ =gTasks
@@ -10960,7 +10960,7 @@ _081315A0:
ldr r0, _081315C0 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -11473,7 +11473,7 @@ _0813197C:
.4byte _08131DC4
_08131990:
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r7, r0, 24
ldr r1, _081319DC @ =gTasks
@@ -11633,7 +11633,7 @@ _08131AE4:
ldrh r5, [r1, 0x2]
_08131AE6:
movs r0, 0x1
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
ldr r2, _08131B0C @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -11699,7 +11699,7 @@ _08131B70:
ldrh r5, [r1, 0x2]
_08131B72:
movs r0, 0x1
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
ldr r2, _08131C04 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -11719,7 +11719,7 @@ _08131B94:
ldr r0, _08131C0C @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
lsls r3, r6, 16
@@ -11861,7 +11861,7 @@ _08131C8E:
ldr r0, _08131CE8 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -11878,7 +11878,7 @@ _08131CEC:
ldr r0, _08131D30 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -11916,7 +11916,7 @@ _08131D38: .4byte 0x0000ffff
_08131D3C: .4byte gTasks
_08131D40:
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r7, r0, 24
ldr r1, _08131D8C @ =gTasks
@@ -11980,7 +11980,7 @@ _08131DB6:
_08131DC0: .4byte gTasks
_08131DC4:
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r7, r0, 24
ldr r1, _08131E38 @ =gTasks
@@ -12024,7 +12024,7 @@ _08131DC4:
mov r1, r10
ldrb r0, [r1]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r3, r5, 0
@@ -12057,7 +12057,7 @@ _08131E44:
mov r2, r10
ldrb r0, [r2]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r3, r5, 0
@@ -12126,7 +12126,7 @@ _08131ECA:
ldr r0, _08131F54 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -12155,7 +12155,7 @@ _08131ECA:
cmp r0, 0
bne _08131FF4
movs r0, 0x1
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
ldr r2, _08131F60 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -12292,14 +12292,14 @@ _08132040:
ldr r0, _08132084 @ =gAnimBankAttacker
ldrb r0, [r0]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
ldr r0, _08132088 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r2, r0, 0
@@ -12473,7 +12473,7 @@ sub_813219C: @ 813219C
ldr r0, _08132204 @ =gTasks
adds r4, r1, r0
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
movs r5, 0
@@ -12764,7 +12764,7 @@ sub_81323E0: @ 81323E0
ldr r4, _08132424 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
@@ -12996,7 +12996,7 @@ sub_813257C: @ 813257C
strh r0, [r4, 0x8]
ldr r0, _081325B8 @ =gBattleAnimArgs
ldrb r0, [r0]
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s
index 9b8881a18..df39aef31 100644
--- a/asm/battle_anim_813F0F4.s
+++ b/asm/battle_anim_813F0F4.s
@@ -972,13 +972,13 @@ _0813F8D8:
ldr r5, _0813F950 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
adds r1, r0, 0
lsls r1, 24
ldr r2, _0813F954 @ =gSprites
@@ -1238,14 +1238,14 @@ sub_813FA94: @ 813FA94
mov r8, r2
ldrb r0, [r2]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x30]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -1400,14 +1400,14 @@ _0813FBE0:
mov r8, r1
ldrb r0, [r1]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x30]
mov r1, r8
ldrb r0, [r1]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
subs r0, 0x10
@@ -5124,12 +5124,12 @@ _08141966:
ldrb r0, [r4, 0x8]
mov r8, r0
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r5, r0, 24
mov r0, r8
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r2, r0, 24
movs r1, 0x1E
@@ -5487,7 +5487,7 @@ sub_8141C30: @ 8141C30
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
ldr r5, _08141CA4 @ =gBattleAnimArgs
lsrs r0, 24
@@ -5499,7 +5499,7 @@ sub_8141C30: @ 8141C30
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
diff --git a/asm/current.s b/asm/current.s
index af5378d2d..2010b0336 100644
--- a/asm/current.s
+++ b/asm/current.s
@@ -21,7 +21,7 @@ sub_80D648C: @ 80D648C
ldr r6, _080D6504 @ =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -29,7 +29,7 @@ sub_80D648C: @ 80D648C
strh r0, [r4, 0x34]
ldrb r0, [r6]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -201,7 +201,7 @@ _080D6606:
ldr r5, _080D664C @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080D6650 @ =gBattleAnimArgs
lsrs r0, 24
@@ -210,7 +210,7 @@ _080D6606:
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -278,7 +278,7 @@ _080D669C:
_080D66A4:
adds r0, r6, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080D6718 @ =gBattleAnimArgs
lsrs r0, 24
@@ -287,7 +287,7 @@ _080D66A4:
strh r0, [r5, 0x20]
adds r0, r6, 0
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r2, [r4, 0x2]
@@ -465,7 +465,7 @@ sub_80D681C: @ 80D681C
ldr r6, _080D6864 @ =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
ldr r1, _080D6868 @ =gTasks
lsls r4, r5, 2
adds r4, r5
@@ -479,7 +479,7 @@ sub_80D681C: @ 80D681C
strh r0, [r4, 0x8]
ldrb r0, [r6]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r5, 0x2]
@@ -887,13 +887,13 @@ _080D6B68:
_080D6B6A:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x26]
@@ -1120,13 +1120,13 @@ _080D6D34:
_080D6D36:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1163,13 +1163,13 @@ _080D6D8C:
_080D6D8E:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1202,18 +1202,18 @@ sub_80D6DD8: @ 80D6DD8
ldr r4, _080D6E30 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x3A]
@@ -1326,7 +1326,7 @@ _080D6ECE:
b _080D7000
_080D6ED0:
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
movs r6, 0
@@ -1334,7 +1334,7 @@ _080D6ED0:
ldr r4, _080D6F04 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
@@ -1551,13 +1551,13 @@ _080D7084: .4byte 0x0000fff0
_080D7088:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xE]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
@@ -1577,13 +1577,13 @@ _080D70B0:
ldr r4, _080D70E4 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r2, 0xA
@@ -1829,13 +1829,13 @@ _080D728E:
ldr r4, _080D72BC @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1899,13 +1899,13 @@ _080D731C:
ldr r4, _080D73A0 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x14]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x16]
@@ -1914,7 +1914,7 @@ _080D731C:
ldr r0, _080D73A4 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x1C]
@@ -2257,7 +2257,7 @@ _080D75CA:
ldr r0, _080D7614 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -2279,7 +2279,7 @@ _080D75F4:
ldr r4, _080D7614 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
diff --git a/asm/flying.s b/asm/flying.s
index a39c797b4..72d1e3bdc 100644
--- a/asm/flying.s
+++ b/asm/flying.s
@@ -194,7 +194,7 @@ _080DA18C:
ldr r5, _080DA1E0 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -204,7 +204,7 @@ _080DA18C:
strh r0, [r6, 0x34]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
@@ -282,13 +282,13 @@ _080DA234:
_080DA24C:
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
ldr r2, _080DA2A8 @ =gBattleAnimArgs
ldrh r1, [r2]
@@ -308,13 +308,13 @@ _080DA24C:
ldr r4, _080DA2AC @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -374,7 +374,7 @@ sub_80DA300: @ 80DA300
ldr r0, _080DA340 @ =sub_80DA348
str r0, [r4, 0x1C]
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
ldr r2, _080DA344 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -470,7 +470,7 @@ _080DA3C2:
ldr r4, _080DA408 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -478,7 +478,7 @@ _080DA3C2:
strh r0, [r5, 0x34]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -537,7 +537,7 @@ _080DA438:
ble _080DA480
_080DA45A:
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
ldr r2, _080DA488 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -638,7 +638,7 @@ _080DA502:
_080DA518:
adds r0, r6, 0
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080DA5B4 @ =gBattleAnimArgs
lsrs r0, 24
@@ -647,7 +647,7 @@ _080DA518:
strh r0, [r7, 0x20]
adds r0, r6, 0
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
ldrh r1, [r4, 0x2]
lsrs r0, 24
@@ -1733,13 +1733,13 @@ sub_80DAD30: @ 80DAD30
ldr r5, _080DAD7C @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -1784,7 +1784,7 @@ sub_80DAD84: @ 80DAD84
beq _080DADE0
adds r0, r2, 0
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
@@ -1799,7 +1799,7 @@ _080DADDC: .4byte gAnimBankTarget
_080DADE0:
adds r0, r2, 0
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x28
@@ -1849,7 +1849,7 @@ _080DAE44:
ldr r0, _080DAEFC @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r5, [r5, 0x6]
@@ -2239,13 +2239,13 @@ sub_80DB0E8: @ 80DB0E8
ldr r5, _080DB190 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -2293,7 +2293,7 @@ _080DB1A6:
movs r1, 0x1
bl InitAnimSpritePos
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
ldr r2, _080DB1D4 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -2349,7 +2349,7 @@ _080DB210:
ldr r0, _080DB228 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -2385,7 +2385,7 @@ _080DB240:
cmp r0, r1
bge _080DB27E
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
ldr r2, _080DB284 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -2423,7 +2423,7 @@ sub_80DB288: @ 80DB288
ldr r0, _080DB2C8 @ =sub_80DB2D0
str r0, [r4, 0x1C]
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
ldr r2, _080DB2CC @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -2566,13 +2566,13 @@ _080DB3A0:
_080DB3A2:
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2726,13 +2726,13 @@ _080DB4D4:
_080DB4D6:
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -2885,14 +2885,14 @@ sub_80DB5E4: @ 80DB5E4
ldr r6, _080DB698 @ =gAnimBankAttacker
ldrb r0, [r6]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x20]
ldrb r0, [r6]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
@@ -3012,7 +3012,7 @@ unref_sub_80DB6E4: @ 80DB6E4
cmp r0, 0
bne _080DB71C
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _080DB718 @ =gSprites
@@ -3030,7 +3030,7 @@ _080DB714: .4byte gBattleAnimArgs
_080DB718: .4byte gSprites
_080DB71C:
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _080DB748 @ =gSprites
diff --git a/asm/ghost.s b/asm/ghost.s
index 130084a89..59671ec7f 100644
--- a/asm/ghost.s
+++ b/asm/ghost.s
@@ -21,7 +21,7 @@ sub_80DDB6C: @ 80DDB6C
ldr r5, _080DDBCC @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -29,7 +29,7 @@ sub_80DDB6C: @ 80DDB6C
strh r0, [r4, 0x34]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -358,7 +358,7 @@ sub_80DDDF0: @ 80DDDF0
adds r0, r2, 0
strh r0, [r1]
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -475,7 +475,7 @@ sub_80DDED0: @ 80DDED0
_080DDEF4: .4byte gTasks
_080DDEF8:
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r1, r0, 24
ldrh r0, [r4, 0x8]
@@ -524,7 +524,7 @@ sub_80DDF40: @ 80DDF40
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -533,7 +533,7 @@ sub_80DDF40: @ 80DDF40
mov r1, r8
ldrb r0, [r1]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -643,13 +643,13 @@ _080DE032:
ldr r4, _080DE098 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x30]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -706,13 +706,13 @@ _080DE09C:
ldr r4, _080DE0EC @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1219,7 +1219,7 @@ _080DE464:
movs r0, 0x10
strh r0, [r5, 0xE]
movs r0, 0x1
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1511,7 +1511,7 @@ _080DE6EE:
movs r0, 0x3
strb r0, [r1, 0x15]
movs r0, 0x1
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x24]
@@ -1620,12 +1620,12 @@ sub_80DE7B8: @ 80DE7B8
ldr r4, _080DE7F8 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
movs r2, 0xE0
@@ -1642,12 +1642,12 @@ _080DE800:
ldr r4, _080DE8C8 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
movs r2, 0xE0
@@ -1658,13 +1658,13 @@ _080DE800:
_080DE824:
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r10, r0
ldrb r0, [r4]
movs r1, 0x1
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 8
movs r1, 0xE0
@@ -1816,7 +1816,7 @@ sub_80DE918: @ 80DE918
ldr r4, _080DEA74 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
@@ -1868,7 +1868,7 @@ _080DE98A:
beq _080DEA56
adds r0, r4, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -2880,7 +2880,7 @@ sub_80DF1A4: @ 80DF1A4
ldr r5, _080DF240 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1A]
diff --git a/asm/ground.s b/asm/ground.s
index 549012627..82e56fcc0 100644
--- a/asm/ground.s
+++ b/asm/ground.s
@@ -14,13 +14,13 @@ sub_80E0F1C: @ 80E0F1C
ldr r5, _080E0F74 @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -29,13 +29,13 @@ sub_80E0F1C: @ 80E0F1C
ldr r5, _080E0F78 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -79,13 +79,13 @@ sub_80E0F84: @ 80E0F84
ldr r4, _080E0FE0 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -143,7 +143,7 @@ _080E1024:
ldr r5, _080E106C @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -151,7 +151,7 @@ _080E1024:
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
@@ -264,7 +264,7 @@ sub_80E1108: @ 80E1108
ldr r4, _080E1174 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r2, [r6, 0x2]
@@ -272,7 +272,7 @@ sub_80E1108: @ 80E1108
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r3, [r6, 0x4]
@@ -475,7 +475,7 @@ _080E12B0:
.4byte _080E1414
_080E12C4:
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
@@ -670,7 +670,7 @@ sub_80E143C: @ 80E143C
lsls r0, 24
lsrs r5, r0, 24
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _080E147C @ =gSprites
@@ -768,7 +768,7 @@ sub_80E14DC: @ 80E14DC
_080E14FC: .4byte gTasks
_080E1500:
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
@@ -848,7 +848,7 @@ _080E158C:
.4byte _080E165C
_080E15A0:
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
@@ -1082,7 +1082,7 @@ _080E1746:
_080E1762:
adds r0, r4, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, r6
@@ -1152,7 +1152,7 @@ _080E17EA:
ldrb r5, [r0]
adds r0, r5, 0
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldr r2, _080E184C @ =0x0000fff0
@@ -1288,7 +1288,7 @@ _080E18F8:
_080E1904: .4byte gBankSpriteIds
_080E1908:
ldrb r0, [r6]
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1A]
@@ -1700,7 +1700,7 @@ _080E1BE2:
adds r4, r0
adds r0, r5, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r1, 0x20
@@ -1711,7 +1711,7 @@ _080E1BE2:
strh r1, [r4, 0xA]
adds r0, r5, 0
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r1, 0x40
diff --git a/asm/ice.s b/asm/ice.s
index a716ef633..49381cb96 100644
--- a/asm/ice.s
+++ b/asm/ice.s
@@ -65,26 +65,26 @@ sub_80D7704: @ 80D7704
ldr r4, _080D7814 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r4, _080D7818 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r3, r0, 24
ldrb r0, [r4]
movs r1, 0x3
str r3, [sp]
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
ldr r1, _080D781C @ =gBattleAnimArgs
@@ -329,7 +329,7 @@ sub_80D792C: @ 80D792C
ldr r0, _080D7960 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -359,7 +359,7 @@ _080D7976:
ldr r0, _080D79A8 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
ldr r1, _080D79A4 @ =gBattleAnimArgs
lsrs r0, 24
@@ -495,13 +495,13 @@ sub_80D7A64: @ 80D7A64
ldr r4, _080D7AB0 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x6]
@@ -810,13 +810,13 @@ sub_80D7CD4: @ 80D7CD4
ldr r4, _080D7D1C @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -1686,13 +1686,13 @@ sub_80D83E0: @ 80D83E0
ldr r5, _080D840C @ =gAnimBankAttacker
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
@@ -2074,12 +2074,12 @@ sub_80D8700: @ 80D8700
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
adds r4, r0, 0
ldr r7, _080D87F0 @ =gAnimBankTarget
ldrb r0, [r7]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -2119,7 +2119,7 @@ _080D8734:
cmp r0, 0
bne _080D8790
movs r0, 0x1
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
ldr r2, _080D87F8 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -2140,13 +2140,13 @@ _080D8794:
ldr r4, _080D87EC @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2162,7 +2162,7 @@ _080D8794:
ldr r4, _080D87F0 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x6]
@@ -2189,7 +2189,7 @@ _080D87FC:
ldr r4, _080D886C @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x6]
@@ -2202,7 +2202,7 @@ _080D87FC:
ldrb r0, [r4]
movs r1, 0x1
_080D8824:
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x8]
@@ -2301,7 +2301,7 @@ _080D88D6:
ldr r6, _080D8928 @ =gAnimBankTarget
ldrb r0, [r6]
movs r1, 0
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
@@ -2713,12 +2713,12 @@ sub_80D8BA8: @ 80D8BA8
str r0, [sp, 0x4]
adds r0, r5, 0
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r7, r0, 24
adds r0, r5, 0
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
mov r1, r8
@@ -3043,7 +3043,7 @@ _080D8E92:
ldr r4, _080D8ED8 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x4]
@@ -3051,7 +3051,7 @@ _080D8E92:
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x6]
diff --git a/asm/normal.s b/asm/normal.s
index ee91ffd5f..55aae48fd 100644
--- a/asm/normal.s
+++ b/asm/normal.s
@@ -1208,7 +1208,7 @@ _080E25A0:
cmp r0, 0x1
bhi _080E25F4
movs r4, 0
- ldr r5, _080E2600 @ =gNoOfAllBanks
+ ldr r5, _080E2600 @ =gBattlersCount
ldrb r0, [r5]
cmp r4, r0
bcs _080E25F4
@@ -1243,7 +1243,7 @@ _080E25FA:
pop {r0}
bx r0
.align 2, 0
-_080E2600: .4byte gNoOfAllBanks
+_080E2600: .4byte gBattlersCount
_080E2604: .4byte gSprites
_080E2608: .4byte gBankSpriteIds
thumb_func_end sub_80E255C
@@ -1636,7 +1636,7 @@ sub_80E2908: @ 80E2908
adds r4, r0, 0
ldr r5, _080E2968 @ =gBattleAnimArgs
ldrb r0, [r5]
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
@@ -2619,7 +2619,7 @@ _080E30A8:
lsrs r4, r0, 16
_080E30B4:
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080E3168 @ =gAnimBankAttacker
@@ -2784,7 +2784,7 @@ _080E3208:
adds r0, 0x2
strh r5, [r0]
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
ldr r0, _080E32CC @ =gSprites
mov r8, r0
movs r2, 0x8
diff --git a/asm/water.s b/asm/water.s
index d7057ecc1..6f9c5cb9d 100644
--- a/asm/water.s
+++ b/asm/water.s
@@ -757,7 +757,7 @@ sub_80D40F4: @ 80D40F4
ldr r0, _080D4144 @ =gTasks
adds r4, r0
movs r0, 0
- bl GetAnimBankSpriteId
+ bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -1163,13 +1163,13 @@ sub_80D4418: @ 80D4418
ldr r4, _080D4520 @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0xAC
@@ -1791,14 +1791,14 @@ sub_80D48F4: @ 80D48F4
ldr r4, _080D497C @ =gAnimBankAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r6, 0
strh r0, [r5, 0xE]
ldrb r0, [r4]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x10]
@@ -2268,13 +2268,13 @@ sub_80D4CA4: @ 80D4CA4
ldr r5, _080D4CE0 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x30]
ldrb r0, [r5]
movs r1, 0x3
- bl GetBankPosition
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-01 03:02:18 +0000