diff options
| author | YamaArashi <shadow962@live.com> | 2016-10-24 22:52:18 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-10-24 22:52:18 -0700 |
| commit | e1191bfe667671cdcc1f77839769eae686245ac4 (patch) | |
| tree | 3cf5060ef013246d7a458375a59b65696a298399 /asm/calculate_base_damage.s | |
| parent | 040bf705bbd8588a5114fe1631756df2ee77e662 (diff) | |
name/rename a lot of functions
Diffstat (limited to 'asm/calculate_base_damage.s')
| -rw-r--r-- | asm/calculate_base_damage.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/calculate_base_damage.s b/asm/calculate_base_damage.s index c633e4cdc..99b6efaab 100644 --- a/asm/calculate_base_damage.s +++ b/asm/calculate_base_damage.s @@ -100,12 +100,12 @@ _0803BAAE: _0803BADC: .4byte gEnigmaBerries _0803BAE0: ldrh r0, [r7, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 mov r10, r0 ldrh r0, [r7, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r0, 24 _0803BAF6: @@ -136,13 +136,13 @@ _0803BB14: _0803BB26: ldr r2, [sp, 0x4] ldrh r0, [r2, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x1C] ldr r3, [sp, 0x4] ldrh r0, [r3, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam _0803BB3C: adds r0, r7, 0 adds r0, 0x20 |