diff options
Diffstat (limited to 'asm/battle_controller_recorded_opponent.s')
-rw-r--r-- | asm/battle_controller_recorded_opponent.s | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/asm/battle_controller_recorded_opponent.s b/asm/battle_controller_recorded_opponent.s index 562b55d4d..f98c10a6c 100644 --- a/asm/battle_controller_recorded_opponent.s +++ b/asm/battle_controller_recorded_opponent.s @@ -966,7 +966,7 @@ sub_8186D04: @ 8186D04 adds r0, r5 ldrb r0, [r0] movs r2, 0 - bl heathbar_draw_hp + bl UpdateHpTextInHealthbox b _08186D50 .pool _08186D4C: @@ -1553,7 +1553,7 @@ _0818727E: lsrs r1, 16 movs r0, 0x1 mov r2, sp - bl dp01_build_cmdbuf_x1D_1D_numargs_varargs + bl EmitDataTransfer bl RecordedOpponentBufferExecCompleted add sp, 0x100 pop {r4-r6} @@ -4408,13 +4408,13 @@ _08188BE6: 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 @@ -4428,7 +4428,7 @@ _08188BE6: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, =gMoveDmgMoveAnim + ldr r4, =gAnimMoveDmg ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4454,7 +4454,7 @@ _08188BE6: lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, =gHappinessMoveAnim + ldr r3, =gAnimFriendship ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -4476,7 +4476,7 @@ _08188BE6: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, =gDisableStructMoveAnim + ldr r3, =gAnimDisableStructPtr ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -4605,7 +4605,7 @@ _08188DA4: 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] @@ -4754,7 +4754,7 @@ sub_8188EF0: @ 8188EF0 lsrs r1, 24 movs r0, 0x1 movs r2, 0 - bl EmitCmd_x21 + bl EmitCmd33 bl RecordedOpponentBufferExecCompleted pop {r0} bx r0 @@ -4785,7 +4785,7 @@ sub_8188F20: @ 8188F20 lsrs r2, 16 movs r0, 0x1 movs r1, 0xA - bl EmitCmd_x21 + bl EmitCmd33 b _08188F6C .pool _08188F48: @@ -4803,7 +4803,7 @@ _08188F48: orrs r2, r4 movs r0, 0x1 movs r1, 0xA - bl EmitCmd_x21 + bl EmitCmd33 _08188F6C: bl RecordedOpponentBufferExecCompleted pop {r4,r5} @@ -4839,7 +4839,7 @@ sub_8188F88: @ 8188F88 ldrb r1, [r0] movs r0, 0x1 movs r2, 0 - bl dp01_build_cmdbuf_x22_a_three_bytes + bl EmitCmd34 bl RecordedOpponentBufferExecCompleted pop {r4} pop {r0} @@ -4863,7 +4863,7 @@ sub_8188FD0: @ 8188FD0 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 @@ -4910,7 +4910,7 @@ sub_8188FD0: @ 8188FD0 ldrb r1, [r1] str r7, [sp] mov r2, r8 - bl sub_807294C + bl SetBattleBarStruct b _0818908A .pool _08189060: @@ -4932,7 +4932,7 @@ _08189060: ldrb r1, [r1] str r7, [sp] movs r3, 0 - bl sub_807294C + bl SetBattleBarStruct _0818908A: ldr r1, =gBattleBankFunc ldr r0, =gActiveBank @@ -5693,7 +5693,7 @@ _081896E4: subs r4, 0x2 adds r3, r4 ldrb r3, [r3] - bl sub_80735DC + bl CreatePartyStatusSummarySprites ldr r2, =gUnknown_020244B4 ldrb r1, [r5] adds r1, r2 @@ -5819,7 +5819,7 @@ sub_8189800: @ 8189800 push {r4,lr} ldr r4, =gActiveBank ldrb r0, [r4] - bl sub_80A6A90 + bl AnimBankSpriteExists lsls r0, 24 cmp r0, 0 beq _08189846 |