diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-05 20:13:34 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-05 20:13:34 +0200 |
| commit | b6661e7736138bb61c4d58e61add686cec9e7739 (patch) | |
| tree | 100511f746b70eb74756abcf09f79cddf5635936 /asm/battle_controller_player_partner.s | |
| parent | a7486afb4e28cc0bbd9856990c4af2c7b7140f2a (diff) | |
name some pokemon and battle labels
Diffstat (limited to 'asm/battle_controller_player_partner.s')
| -rw-r--r-- | asm/battle_controller_player_partner.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/battle_controller_player_partner.s b/asm/battle_controller_player_partner.s index 9c262071d..ef8ffd8fb 100644 --- a/asm/battle_controller_player_partner.s +++ b/asm/battle_controller_player_partner.s @@ -631,7 +631,7 @@ _081BB2E2: 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] @@ -905,7 +905,7 @@ _081BB514: 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] @@ -4963,7 +4963,7 @@ sub_81BDA4C: @ 81BDA4C ldr r1, =gUnknown_02023066 adds r0, r1 ldrh r0, [r0] - bl battle_pick_message + bl BufferStringBattle ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe |