summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-04-21 08:29:52 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2020-04-21 08:29:52 -0400
commitaa2cb11a71a85faf0f84a8d07376a303792e3703 (patch)
treec8d156131f95390672c1a1803560a85b445322d6
parent8b0123170320acdf8cd8b472e057987828955c7f (diff)
Rename two libmwcc funcs
-rw-r--r--asm/rom2.s8
-rw-r--r--asm/unk_020023C0.s138
-rw-r--r--global.inc4
3 files changed, 75 insertions, 75 deletions
diff --git a/asm/rom2.s b/asm/rom2.s
index 2fc66ad7..46e54560 100644
--- a/asm/rom2.s
+++ b/asm/rom2.s
@@ -5,8 +5,8 @@
.incbin "baserom.nds", 0xD9150, 0x16AE0
- arm_func_start FUN_020EBC30
-FUN_020EBC30: ; 0x020EBC30
+ arm_func_start _ll_mul
+_ll_mul: ; 0x020EBC30
stmdb sp!, {r4, r5, lr}
umull r5, r4, r0, r2
mla r4, r0, r3, r4
@@ -16,8 +16,8 @@ FUN_020EBC30: ; 0x020EBC30
ldmia sp!, {r4, r5, lr}
bx lr
- arm_func_start FUN_020EBC50
-FUN_020EBC50: ; 0x020EBC50
+ arm_func_start _ll_shl
+_ll_shl: ; 0x020EBC50
ands r2, r2, #0x3F
bxeq lr
subs r3, r2, #0x20
diff --git a/asm/unk_020023C0.s b/asm/unk_020023C0.s
index 8d7d4558..6bcd42ad 100644
--- a/asm/unk_020023C0.s
+++ b/asm/unk_020023C0.s
@@ -27091,7 +27091,7 @@ FUN_0200F0D0: ; 0x0200F0D0
lsl r2, r4, #0xc
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -27125,7 +27125,7 @@ _0200F116:
ldr r1, [sp, #0x4]
asr r3, r4, #0x1f
add r2, r4, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
lsl r2, r2, #0xa
add r0, r0, r2
@@ -29269,14 +29269,14 @@ _020100FA:
asr r1, r0, #0x1f
add r2, r0, #0x0
add r3, r1, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
str r0, [sp, #0x8]
ldr r0, [sp, #0x4]
add r6, r1, #0x0
add r1, r7, #0x0
add r2, r0, #0x0
add r3, r7, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
add r2, r0, #0x0
add r3, r1, #0x0
mov r0, #0x2
@@ -29876,7 +29876,7 @@ FUN_020105A0: ; 0x020105A0
asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -31547,7 +31547,7 @@ FUN_0201127C: ; 0x0201127C
add r7, r3, #0x0
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
add r2, r0, #0x0
mov r0, #0x2
mov r3, #0x0
@@ -31679,7 +31679,7 @@ FUN_0201137C: ; 0x0201137C
add r7, r3, #0x0
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
add r2, r0, #0x0
mov r0, #0x2
mov r3, #0x0
@@ -34976,7 +34976,7 @@ _02012BA0:
ldrsh r0, [r0, r1]
ldr r3, [sp, #0x8]
asr r1, r0, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
lsl r2, r2, #0xa
add r0, r0, r2
@@ -54871,14 +54871,14 @@ FUN_0201BBD0: ; 0x0201BBD0
str r5, [sp, #0x2c]
str r4, [sp, #0x30]
str r6, [sp, #0x24]
- blx FUN_020EBC30
+ blx _ll_mul
str r0, [sp, #0x4]
add r2, r4, #0x0
ldr r0, [sp, #0x20]
add r7, r1, #0x0
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
ldr r3, [sp, #0x4]
lsl r2, r2, #0xa
@@ -54947,7 +54947,7 @@ FUN_0201BC84: ; 0x0201BC84
ldr r2, _0201BCB4 ; =0x0000323D
asr r1, r0, #0x1f
mov r3, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
add r5, r0, #0x0
ldr r0, _0201BCB8 ; =0x0000FFFF
mov r2, #0x2
@@ -56550,14 +56550,14 @@ FUN_0201C7B0: ; 0x0201C7B0
ldr r3, [sp, #0xc]
add r1, r7, #0x0
str r0, [sp, #0x10]
- blx FUN_020EBC30
+ blx _ll_mul
str r0, [sp, #0x14]
add r5, r1, #0x0
ldr r0, [sp, #0x0]
ldr r1, [sp, #0x4]
add r2, r4, #0x0
add r3, r6, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
ldr r3, [sp, #0x14]
lsl r2, r2, #0xa
@@ -56580,14 +56580,14 @@ FUN_0201C7B0: ; 0x0201C7B0
add r1, r7, #0x0
add r2, r4, #0x0
add r3, r6, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
add r6, r0, #0x0
add r4, r1, #0x0
ldr r0, [sp, #0x0]
ldr r1, [sp, #0x4]
ldr r2, [sp, #0x8]
ldr r3, [sp, #0xc]
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -56665,7 +56665,7 @@ FUN_0201C878: ; 0x0201C878
ldr r0, [sp, #0x8]
ldr r1, [sp, #0x1c]
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
add r7, r0, #0x0
add r6, r1, #0x0
ldr r3, [sp, #0x68]
@@ -56674,14 +56674,14 @@ FUN_0201C878: ; 0x0201C878
sub r2, r3, r2
ldr r1, [sp, #0x34]
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
add r5, r1, #0x0
str r0, [sp, #0x3c]
ldr r1, [sp, #0x38]
ldr r2, [sp, #0x20]
ldr r3, [sp, #0x24]
add r0, r4, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
str r0, [sp, #0x4c]
add r0, r1, #0x0
@@ -56717,7 +56717,7 @@ FUN_0201C878: ; 0x0201C878
sub r2, r3, r2
ldr r1, [sp, #0x34]
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
add r7, r0, #0x0
add r6, r1, #0x0
ldr r3, [sp, #0x68]
@@ -56726,14 +56726,14 @@ FUN_0201C878: ; 0x0201C878
sub r2, r3, r2
ldr r1, [sp, #0x28]
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
str r0, [sp, #0x40]
add r5, r1, #0x0
ldr r1, [sp, #0x38]
ldr r2, [sp, #0x14]
ldr r3, [sp, #0x18]
add r0, r4, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
str r0, [sp, #0x50]
add r0, r1, #0x0
@@ -56769,7 +56769,7 @@ FUN_0201C878: ; 0x0201C878
sub r2, r3, r2
ldr r1, [sp, #0x28]
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
add r7, r0, #0x0
add r6, r1, #0x0
ldr r3, [sp, #0x68]
@@ -56778,14 +56778,14 @@ FUN_0201C878: ; 0x0201C878
sub r2, r3, r2
ldr r1, [sp, #0x1c]
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
add r5, r1, #0x0
str r0, [sp, #0x44]
ldr r1, [sp, #0x38]
ldr r2, [sp, #0x2c]
ldr r3, [sp, #0x30]
add r0, r4, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
mov r3, #0x2
mov r2, #0x0
lsl r3, r3, #0xa
@@ -56815,21 +56815,21 @@ FUN_0201C878: ; 0x0201C878
ldr r1, [sp, #0x34]
ldr r2, [sp, #0x2c]
ldr r3, [sp, #0x30]
- blx FUN_020EBC30
+ blx _ll_mul
add r7, r0, #0x0
add r5, r1, #0x0
ldr r0, [sp, #0xc]
ldr r1, [sp, #0x28]
ldr r2, [sp, #0x20]
ldr r3, [sp, #0x24]
- blx FUN_020EBC30
+ blx _ll_mul
str r0, [sp, #0x48]
add r4, r1, #0x0
ldr r0, [sp, #0x8]
ldr r1, [sp, #0x1c]
ldr r2, [sp, #0x14]
ldr r3, [sp, #0x18]
- blx FUN_020EBC30
+ blx _ll_mul
mov r12, r0
mov r0, #0x2
add r2, r1, #0x0
@@ -57018,7 +57018,7 @@ FUN_0201CB7C: ; 0x0201CB7C
asr r1, r6, #0x1f
add r0, r6, #0x0
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r6, #0x2
mov r2, #0x0
lsl r6, r6, #0xa
@@ -57041,7 +57041,7 @@ FUN_0201CB7C: ; 0x0201CB7C
asr r3, r7, #0x1f
add r2, r7, #0x0
str r0, [r4, #0x0]
- blx FUN_020EBC30
+ blx _ll_mul
mov r3, #0x0
add r2, r6, #0x0
add r2, r0, r2
@@ -60941,7 +60941,7 @@ FUN_0201E7D8: ; 0x0201E7D8
asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -60958,7 +60958,7 @@ FUN_0201E7D8: ; 0x0201E7D8
orr r0, r1
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -60978,7 +60978,7 @@ FUN_0201E7D8: ; 0x0201E7D8
asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
lsl r2, r2, #0xa
mov r3, #0x0
@@ -60996,7 +60996,7 @@ FUN_0201E7D8: ; 0x0201E7D8
ldrsh r2, [r2, r3]
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -61016,7 +61016,7 @@ FUN_0201E7D8: ; 0x0201E7D8
ldrsh r0, [r0, r1]
asr r3, r2, #0x1f
asr r1, r0, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -61049,7 +61049,7 @@ FUN_0201E8B8: ; 0x0201E8B8
asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -61066,7 +61066,7 @@ FUN_0201E8B8: ; 0x0201E8B8
orr r0, r1
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -61087,7 +61087,7 @@ FUN_0201E8B8: ; 0x0201E8B8
asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
lsl r2, r2, #0xa
mov r3, #0x0
@@ -61105,7 +61105,7 @@ FUN_0201E8B8: ; 0x0201E8B8
ldrsh r2, [r2, r3]
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -61126,7 +61126,7 @@ FUN_0201E8B8: ; 0x0201E8B8
ldrsh r0, [r0, r1]
asr r3, r2, #0x1f
asr r1, r0, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -61814,7 +61814,7 @@ _0201EE6C:
asr r1, r0, #0x1f
asr r3, r4, #0x1f
add r2, r4, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -61827,7 +61827,7 @@ _0201EE6C:
asr r1, r4, #0x1f
add r0, r4, #0x0
asr r3, r2, #0x1f
- blx FUN_020EBC30
+ blx _ll_mul
mov r6, #0x2
mov r2, #0x0
lsl r6, r6, #0xa
@@ -67130,14 +67130,14 @@ _02021400:
ldr r2, [sp, #0x28]
ldr r3, [sp, #0x2c]
add r0, r4, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
add r7, r1, #0x0
str r0, [sp, #0x30]
ldr r1, [sp, #0x24]
ldr r2, [sp, #0x1c]
ldr r3, [sp, #0x20]
add r0, r4, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
add r2, r0, #0x0
add r3, r1, #0x0
mov r0, #0x2
@@ -67167,14 +67167,14 @@ _02021400:
str r0, [sp, #0x34]
ldr r0, [sp, #0x10]
ldr r1, [sp, #0x34]
- blx FUN_020EBC30
+ blx _ll_mul
str r0, [sp, #0x38]
add r4, r1, #0x0
ldr r0, [sp, #0x10]
ldr r1, [sp, #0x34]
ldr r2, [sp, #0x1c]
ldr r3, [sp, #0x20]
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
ldr r3, [sp, #0x38]
lsl r2, r2, #0xa
@@ -67210,14 +67210,14 @@ _02021400:
ldr r0, [sp, #0xc]
ldr r2, [sp, #0x48]
ldr r3, [sp, #0x4c]
- blx FUN_020EBC30
+ blx _ll_mul
str r0, [sp, #0x50]
add r5, r1, #0x0
ldr r0, [sp, #0xc]
ldr r1, [sp, #0x44]
ldr r2, [sp, #0x3c]
ldr r3, [sp, #0x40]
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
ldr r3, [sp, #0x50]
lsl r2, r2, #0xa
@@ -67245,14 +67245,14 @@ _02021400:
ldr r1, [sp, #0x54]
ldr r2, [sp, #0x48]
ldr r3, [sp, #0x4c]
- blx FUN_020EBC30
+ blx _ll_mul
str r0, [sp, #0x58]
str r1, [sp, #0x4]
ldr r0, [sp, #0x8]
ldr r1, [sp, #0x54]
ldr r2, [sp, #0x3c]
ldr r3, [sp, #0x40]
- blx FUN_020EBC30
+ blx _ll_mul
mov r12, r0
add r2, r1, #0x0
mov r0, #0x2
@@ -68281,7 +68281,7 @@ _02021C98:
add r1, r2, #0x0
add r2, r7, #0x0
add r3, r5, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
add r2, r1, #0x0
ldr r1, [sp, #0x8]
add r0, r1, r0
@@ -68293,7 +68293,7 @@ _02021C98:
add r1, r5, #0x0
mov r2, #0xa
mov r3, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
add r7, r0, #0x0
ldr r0, [sp, #0x4]
add r5, r1, #0x0
@@ -101249,7 +101249,7 @@ _020306F2:
ldr r1, [r6, #0xc]
ldr r2, [r5, r2]
ldr r3, [r6, #0x4]
- blx FUN_020EBC30
+ blx _ll_mul
add r3, r0, #0x0
add r2, r1, #0x0
ldr r0, [r6, #0x10]
@@ -101296,7 +101296,7 @@ _02030746:
ldr r1, [r6, #0xc]
ldr r2, [r6, #0x0]
ldr r3, [r6, #0x4]
- blx FUN_020EBC30
+ blx _ll_mul
ldr r3, [r6, #0x10]
ldr r2, [r6, #0x14]
add r0, r3, r0
@@ -104300,7 +104300,7 @@ _02031D42:
ldr r1, [r4, #0xc]
ldr r2, [r5, #0xc]
ldr r3, [r4, #0x4]
- blx FUN_020EBC30
+ blx _ll_mul
ldr r2, [r4, #0x10]
ldr r3, [r4, #0x14]
add r0, r2, r0
@@ -104311,7 +104311,7 @@ _02031D42:
mov r1, #0x0
mov r2, #0x14
mov r3, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
mov r0, #0x0
add r5, #0x43
strb r0, [r5, #0x0]
@@ -104384,7 +104384,7 @@ _02031E32:
ldr r1, [r4, #0xc]
ldr r2, [r5, #0xc]
ldr r3, [r4, #0x4]
- blx FUN_020EBC30
+ blx _ll_mul
ldr r2, [r4, #0x10]
ldr r3, [r4, #0x14]
add r0, r2, r0
@@ -104432,7 +104432,7 @@ FUN_02031E8C: ; 0x02031E8C
ldr r1, [r5, #0xc]
ldr r2, [r4, #0xc]
ldr r3, [r5, #0x4]
- blx FUN_020EBC30
+ blx _ll_mul
ldr r2, [r5, #0x10]
ldr r3, [r5, #0x14]
add r0, r2, r0
@@ -104660,7 +104660,7 @@ FUN_02032058: ; 0x02032058
ldr r1, [r4, #0xc]
ldr r2, [r5, #0xc]
ldr r3, [r4, #0x4]
- blx FUN_020EBC30
+ blx _ll_mul
ldr r2, [r4, #0x10]
ldr r3, [r4, #0x14]
add r0, r2, r0
@@ -104671,7 +104671,7 @@ FUN_02032058: ; 0x02032058
mov r1, #0x0
mov r2, #0x14
mov r3, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
mov r0, #0x0
add r5, #0x43
strb r0, [r5, #0x0]
@@ -105269,7 +105269,7 @@ FUN_02032510: ; 0x02032510
ldr r1, [r5, #0xc]
ldr r2, [r4, #0xc]
ldr r3, [r5, #0x4]
- blx FUN_020EBC30
+ blx _ll_mul
ldr r2, [r5, #0x10]
ldr r3, [r5, #0x14]
add r0, r2, r0
@@ -105356,7 +105356,7 @@ FUN_020325D0: ; 0x020325D0
ldr r1, [r5, #0xc]
ldr r2, [r4, #0xc]
ldr r3, [r5, #0x4]
- blx FUN_020EBC30
+ blx _ll_mul
ldr r2, [r5, #0x10]
ldr r3, [r5, #0x14]
add r0, r2, r0
@@ -175957,7 +175957,7 @@ FUN_02054EA0: ; 0x02054EA0
asr r1, r0, #0x1f
asr r3, r5, #0x1f
add r2, r5, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -175973,7 +175973,7 @@ FUN_02054EA0: ; 0x02054EA0
asr r1, r0, #0x1f
asr r3, r5, #0x1f
add r2, r5, #0x0
- blx FUN_020EBC30
+ blx _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -214925,7 +214925,7 @@ _020675AA:
sub r2, #0x19
add r1, r4, #0x0
str r2, [sp, #0x4]
- blx FUN_020EBC50
+ blx _ll_shl
ldr r2, [r5, #0x1c]
add r3, r4, #0x0
and r3, r1
@@ -215021,7 +215021,7 @@ _02067654:
sub r2, #0x4e
add r1, r4, #0x0
str r2, [sp, #0x4]
- blx FUN_020EBC50
+ blx _ll_shl
ldr r2, [r6, #0x14]
add r3, r4, #0x0
and r3, r1
@@ -215120,7 +215120,7 @@ _02067706:
sub r2, #0x7a
add r1, r4, #0x0
str r2, [sp, #0x4]
- blx FUN_020EBC50
+ blx _ll_shl
ldr r3, [r7, #0x18]
ldr r2, [r7, #0x1c]
and r3, r0
@@ -215885,7 +215885,7 @@ _02067C98:
sub r2, #0x19
add r0, r4, #0x0
str r2, [sp, #0x4]
- blx FUN_020EBC50
+ blx _ll_shl
cmp r4, #0x0
beq _02067CB6
ldr r1, [r7, #0x1c]
@@ -216023,7 +216023,7 @@ _02067D94:
sub r2, #0x4e
add r0, r4, #0x0
str r2, [sp, #0x4]
- blx FUN_020EBC50
+ blx _ll_shl
cmp r4, #0x0
beq _02067DB2
ldr r1, [r5, #0x14]
@@ -216153,7 +216153,7 @@ _02067E8A:
sub r2, #0x7a
add r0, r4, #0x0
str r2, [sp, #0x4]
- blx FUN_020EBC50
+ blx _ll_shl
cmp r4, #0x0
beq _02067EB2
add r4, r6, #0x0
diff --git a/global.inc b/global.inc
index c5a6fb2b..ffc62ba7 100644
--- a/global.inc
+++ b/global.inc
@@ -463,8 +463,8 @@
.extern FUN_020EB7B0
.extern FUN_020EBA38
.extern _ll_udiv
-.extern FUN_020EBC30
-.extern FUN_020EBC50
+.extern _ll_mul
+.extern _ll_shl
.extern _s32_div_f
.extern _u32_div_f
.extern FUN_020EC5CC