diff options
author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-20 00:03:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-20 00:03:15 -0500 |
commit | bc82b539163636d37159aef9e92934e2cba4fb9a (patch) | |
tree | 0b394be6ad68d49fcb0d194303b3707d2f959797 /asm/battle_controller_player_partner.s | |
parent | 8ceecd9fba385442f55bff2d19977e3c2fd6e5e8 (diff) | |
parent | 36035518dcd36c915b8b8f3461881ea813933454 (diff) |
Merge pull request #85 from DizzyEggg/decompile_battle_anim
Decompile battle_anim.s
Diffstat (limited to 'asm/battle_controller_player_partner.s')
-rw-r--r-- | asm/battle_controller_player_partner.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/battle_controller_player_partner.s b/asm/battle_controller_player_partner.s index d519f5daa..10dc24fe4 100644 --- a/asm/battle_controller_player_partner.s +++ b/asm/battle_controller_player_partner.s @@ -4652,13 +4652,13 @@ _081BD7A2: ldrb r1, [r1] lsls r1, 8 orrs r0, r1 - ldr r5, =gUnknown_02038432 + ldr r5, =gAnimMoveTurn mov r1, r12 adds r1, 0x3 adds r2, r1 ldrb r1, [r2] strb r1, [r5] - ldr r4, =gMovePowerMoveAnim + ldr r4, =gAnimMovePower ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4672,7 +4672,7 @@ _081BD7A2: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, =gMoveDmgMoveAnim + ldr r4, =gAnimMoveDmg ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4698,7 +4698,7 @@ _081BD7A2: lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, =gHappinessMoveAnim + ldr r3, =gAnimFriendship ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -4720,7 +4720,7 @@ _081BD7A2: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, =gDisableStructMoveAnim + ldr r3, =gAnimDisableStructPtr ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4849,7 +4849,7 @@ _081BD960: movs r0, 0 bl sub_805EB9C adds r0, r4, 0 - bl move_anim_start_t1 + bl DoMoveAnim ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -6207,7 +6207,7 @@ sub_81BE53C: @ 81BE53C push {r4,lr} ldr r4, =gActiveBank ldrb r0, [r4] - bl sub_80A6A90 + bl AnimBankSpriteExists lsls r0, 24 cmp r0, 0 beq _081BE582 |