diff options
Diffstat (limited to 'asm/battle_anim_813F0F4.s')
| -rw-r--r-- | asm/battle_anim_813F0F4.s | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s index a2e942ec9..df454dcaf 100644 --- a/asm/battle_anim_813F0F4.s +++ b/asm/battle_anim_813F0F4.s @@ -919,7 +919,7 @@ sub_813F844: @ 813F844 lsls r0, 24 cmp r0, 0 bne _0813F88C - ldr r1, _0813F884 @ =gBattlePartyID + ldr r1, _0813F884 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -931,10 +931,10 @@ sub_813F844: @ 813F844 .align 2, 0 _0813F87C: .4byte gBankSpriteIds _0813F880: .4byte gAnimBankAttacker -_0813F884: .4byte gBattlePartyID +_0813F884: .4byte gBattlerPartyIndexes _0813F888: .4byte gPlayerParty _0813F88C: - ldr r1, _0813F8CC @ =gBattlePartyID + ldr r1, _0813F8CC @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -965,7 +965,7 @@ _0813F89C: beq _0813F958 b _0813F982 .align 2, 0 -_0813F8CC: .4byte gBattlePartyID +_0813F8CC: .4byte gBattlerPartyIndexes _0813F8D0: .4byte gEnemyParty _0813F8D4: .4byte gTasks _0813F8D8: @@ -1366,7 +1366,7 @@ _0813FBE0: lsls r4, 24 lsrs r4, 24 movs r0, 0x1 - bl GetBankByIdentity + bl GetBattlerAtPosition lsls r0, 24 lsrs r0, 24 bl sub_8079E90 @@ -1418,7 +1418,7 @@ _0813FBE0: ldr r0, _0813FCAC @ =SpriteCallbackDummy str r0, [r4] movs r0, 0 - bl GetBankByIdentity + bl GetBattlerAtPosition ldr r1, _0813FCB0 @ =gBankSpriteIds lsls r0, 24 lsrs r0, 24 @@ -1462,7 +1462,7 @@ sub_813FCBC: @ 813FCBC lsrs r5, r0, 24 ldr r6, _0813FD1C @ =gSprites movs r0, 0 - bl GetBankByIdentity + bl GetBattlerAtPosition ldr r1, _0813FD20 @ =gBankSpriteIds lsls r0, 24 lsrs r0, 24 @@ -1519,7 +1519,7 @@ sub_813FD34: @ 813FD34 lsrs r5, r0, 24 ldr r6, _0813FD88 @ =gSprites movs r0, 0 - bl GetBankByIdentity + bl GetBattlerAtPosition ldr r4, _0813FD8C @ =gBankSpriteIds lsls r0, 24 lsrs r0, 24 @@ -1535,7 +1535,7 @@ sub_813FD34: @ 813FD34 cmp r0, 0 bge _0813FD80 movs r0, 0 - bl GetBankByIdentity + bl GetBattlerAtPosition lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -4817,7 +4817,7 @@ _081416EC: _081416F2: ldr r0, _08141708 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankIdentity_permutated + bl GetBattlerPosition_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -5483,7 +5483,7 @@ sub_8141C30: @ 8141C30 movs r0, 0x1E strh r0, [r4, 0x2E] movs r0, 0x1 - bl GetBankByIdentity + bl GetBattlerAtPosition lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -5495,7 +5495,7 @@ sub_8141C30: @ 8141C30 adds r0, r1 strh r0, [r4, 0x32] movs r0, 0x1 - bl GetBankByIdentity + bl GetBattlerAtPosition lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -5644,11 +5644,11 @@ sub_8141D7C: @ 8141D7C lsls r4, 24 lsrs r4, 24 movs r0, 0 - bl GetBankByIdentity + bl GetBattlerAtPosition ldr r1, _08141DA4 @ =gAnimBankAttacker strb r0, [r1] movs r0, 0x1 - bl GetBankByIdentity + bl GetBattlerAtPosition ldr r1, _08141DA8 @ =gAnimBankTarget strb r0, [r1] adds r0, r4, 0 |