diff options
Diffstat (limited to 'asm/battle_controller_player.s')
| -rw-r--r-- | asm/battle_controller_player.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 821a7bbb2..0e387692d 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -991,7 +991,7 @@ _08057D24: cmp r0, 0 bne _08057D5A movs r0, 0 - bl sub_8069DEC + bl CountAliveMonsInBattle lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3399,7 +3399,7 @@ _080591FE: mov r2, sp bl SetMonData adds r0, r6, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats ldr r2, [sp] add r0, sp, 0x4 ldrh r0, [r0] @@ -3673,7 +3673,7 @@ _08059430: mov r2, sp bl SetMonData adds r0, r5, 0 - bl pokemon_calc_effective_stats + bl CalculateMonStats ldr r2, [sp] add r0, sp, 0x4 ldrh r0, [r0] @@ -7865,7 +7865,7 @@ sub_805B9F8: @ 805B9F8 lsls r0, 2 adds r0, r4 ldr r1, =SpriteCallbackDummy - bl oamt_set_x3A_32 + bl StoreSpriteCallbackInData6 ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -8455,7 +8455,7 @@ sub_805BF80: @ 805BF80 ldr r0, =gUnknown_02023066 adds r4, r0 ldrh r0, [r4] - bl battle_pick_message + bl BufferStringBattle ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe @@ -9743,7 +9743,7 @@ dp01t_2F_1_pokemon_enter: @ 805CA80 lsls r0, 2 adds r0, r5 ldr r1, =sub_805CC00 - bl oamt_set_x3A_32 + bl StoreSpriteCallbackInData6 ldrb r0, [r7] adds r0, r6 ldrb r1, [r0] |