diff options
| author | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-17 02:41:13 -0800 |
|---|---|---|
| committer | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-17 02:41:13 -0800 |
| commit | b5d877603b9d9ef0d1964aceb1430fe6a540f1c5 (patch) | |
| tree | d8579e53ef26f0824e8caf93bb9fed1b24ca24b6 /asm/calculate_base_damage.s | |
| parent | 670fef77ac4d9116d5fdc28c0da40622919a062b (diff) | |
import function names from pokeemerald
Diffstat (limited to 'asm/calculate_base_damage.s')
| -rw-r--r-- | asm/calculate_base_damage.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/calculate_base_damage.s b/asm/calculate_base_damage.s index bfbf9df3f..11dff8f6c 100644 --- a/asm/calculate_base_damage.s +++ b/asm/calculate_base_damage.s @@ -99,12 +99,12 @@ _0803ED6E: _0803ED9C: .4byte gUnknown_2023F54 _0803EDA0: ldrh r0, [r6, 0x2E] - bl sub_809A924 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 mov r10, r0 ldrh r0, [r6, 0x2E] - bl sub_809A948 + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r0, 24 _0803EDB6: @@ -135,13 +135,13 @@ _0803EDD4: _0803EDE6: ldr r2, [sp, 0x4] ldrh r0, [r2, 0x2E] - bl sub_809A924 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x1C] ldr r3, [sp, 0x4] ldrh r0, [r3, 0x2E] - bl sub_809A948 + bl ItemId_GetHoldEffectParam _0803EDFC: adds r0, r6, 0 adds r0, 0x20 @@ -168,7 +168,7 @@ _0803EE10: cmp r0, 0 beq _0803EE44 ldr r0, [sp, 0x10] - bl sub_80751C4 + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803EE44 @@ -191,7 +191,7 @@ _0803EE44: cmp r0, 0 beq _0803EE7A adds r0, r4, 0 - bl sub_80751C4 + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803EE7A @@ -216,7 +216,7 @@ _0803EE7A: cmp r0, 0 beq _0803EEB2 ldr r0, [sp, 0x10] - bl sub_80751C4 + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803EEB2 @@ -242,7 +242,7 @@ _0803EEB2: cmp r0, 0 beq _0803EEE8 adds r0, r4, 0 - bl sub_80751C4 + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803EEE8 |