diff options
Diffstat (limited to 'asm/battle_controller_wally.s')
-rw-r--r-- | asm/battle_controller_wally.s | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s index d028f3bac..e1d92de0d 100644 --- a/asm/battle_controller_wally.s +++ b/asm/battle_controller_wally.s @@ -676,7 +676,7 @@ sub_8168934: @ 8168934 adds r0, r6 ldrb r0, [r0] movs r2, 0 - bl heathbar_draw_hp + bl UpdateHpTextInHealthbox b _08168996 .pool _0816897C: @@ -3316,13 +3316,13 @@ sub_816A144: @ 816A144 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 @@ -3336,7 +3336,7 @@ sub_816A144: @ 816A144 lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, =gMoveDmgMoveAnim + ldr r4, =gAnimMoveDmg ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3362,7 +3362,7 @@ sub_816A144: @ 816A144 lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, =gHappinessMoveAnim + ldr r3, =gAnimFriendship ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -3384,7 +3384,7 @@ sub_816A144: @ 816A144 lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, =gDisableStructMoveAnim + ldr r3, =gAnimDisableStructPtr ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3505,7 +3505,7 @@ _0816A2F6: 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] @@ -3836,7 +3836,7 @@ sub_816A5D4: @ 816A5D4 push {r6,r7} sub sp, 0x4 movs r0, 0 - bl load_gfxc_health_bar + bl LoadBattleBarGfx ldr r3, =gBattleBufferA ldr r0, =gActiveBank mov r9, r0 @@ -3883,7 +3883,7 @@ sub_816A5D4: @ 816A5D4 ldrb r1, [r1] str r7, [sp] mov r2, r8 - bl sub_807294C + bl SetBattleBarStruct b _0816A69E .pool _0816A664: @@ -3905,14 +3905,14 @@ _0816A664: ldrb r1, [r1] str r7, [sp] movs r3, 0 - bl sub_807294C + bl SetBattleBarStruct mov r1, r9 ldrb r0, [r1] adds r0, r4 ldrb r0, [r0] movs r1, 0 movs r2, 0 - bl heathbar_draw_hp + bl UpdateHpTextInHealthbox _0816A69E: ldr r1, =gBattleBankFunc ldr r0, =gActiveBank @@ -4645,7 +4645,7 @@ _0816ACA8: subs r3, 0x2 adds r4, r3 ldrb r3, [r4] - bl sub_80735DC + bl CreatePartyStatusSummarySprites ldr r2, =gUnknown_020244B4 ldrb r1, [r5] adds r1, r2 |