summaryrefslogtreecommitdiff
path: root/asm/rom3.s
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-10-17 18:55:49 -0700
committerYamaArashi <shadow962@live.com>2016-10-17 18:55:49 -0700
commit8703c1edc9d324ef8fb0e939299d08e86cbe734b (patch)
tree949d9b93efde7a8ea825dc9da6e6241da12a9d8e /asm/rom3.s
parent3d23a0c3cc6a08228a477786f5d28f484e62c403 (diff)
rename rom_803BA2C.s to calculate_base_damage.s
Diffstat (limited to 'asm/rom3.s')
-rw-r--r--asm/rom3.s12
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/rom3.s b/asm/rom3.s
index cced0538f..c00ae23e2 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -24358,7 +24358,7 @@ _08017CB8:
adds r0, r1, 0
movs r2, 0x1
movs r3, 0
- bl sub_803BA2C
+ bl CalculateBaseDamage
ldr r1, _08017D10
str r0, [r1]
ldr r0, _08017D14
@@ -31846,7 +31846,7 @@ _0801BBE0:
adds r0, r1, 0
movs r2, 0x1
movs r3, 0
- bl sub_803BA2C
+ bl CalculateBaseDamage
ldr r1, _0801BC3C
str r0, [r1]
ldr r1, _0801BC40
@@ -33607,7 +33607,7 @@ atk05_cmd5: @ 801C9EC
str r4, [sp, 0x8]
ldrb r4, [r6]
str r4, [sp, 0xC]
- bl sub_803BA2C
+ bl CalculateBaseDamage
ldr r4, _0801CADC
ldr r1, _0801CAE0
ldrb r1, [r1]
@@ -33727,7 +33727,7 @@ sub_801CAF8: @ 801CAF8
str r4, [sp, 0x4]
str r7, [sp, 0x8]
str r5, [sp, 0xC]
- bl sub_803BA2C
+ bl CalculateBaseDamage
ldr r4, _0801CBD4
movs r1, 0
mov r2, r8
@@ -51767,7 +51767,7 @@ _08025C1C:
str r4, [sp, 0x8]
ldrb r4, [r5]
str r4, [sp, 0xC]
- bl sub_803BA2C
+ bl CalculateBaseDamage
ldrb r2, [r6]
lsls r1, r2, 3
subs r1, r2
@@ -59477,7 +59477,7 @@ _08029964:
str r4, [sp, 0x8]
ldrb r4, [r7]
str r4, [sp, 0xC]
- bl sub_803BA2C
+ bl CalculateBaseDamage
ldrb r1, [r7]
lsls r1, 2
mov r2, r8