summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
authorMade <made111@gmx.de>2020-05-15 04:17:23 +0200
committerMade <made111@gmx.de>2020-05-15 04:17:23 +0200
commit4da3a82551b27f94c2f493fbf01cf58db711c03e (patch)
tree1ff9fd6cd8d79402abb9286bbd622901d33a4b54 /arm9/asm
parenta92d77224c8ec645752a56aa35cc8a8457cd4cd3 (diff)
parent0252f2028d60248db23770a6a33030b40fbcee1e (diff)
Merge branch 'master' of https://github.com/martmists/pokediamond
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/CP_context.s (renamed from arm9/asm/libcp.s)0
-rw-r--r--arm9/asm/DGT_hash1.s404
-rw-r--r--arm9/asm/DGT_hash2.s443
-rw-r--r--arm9/asm/DGT_sha1s_arm4cw.s179
-rw-r--r--arm9/asm/OS_interrupt_asm.s23
-rw-r--r--arm9/asm/OS_printf.s757
-rw-r--r--arm9/asm/OS_spinLock.s4
-rw-r--r--arm9/asm/arm9_itcm.s4
-rw-r--r--arm9/asm/crt0.s2
-rw-r--r--arm9/asm/filesystem.s140
-rw-r--r--arm9/asm/libcard.s2
-rw-r--r--arm9/asm/libctrdg.s8
-rw-r--r--arm9/asm/libdgt.s1017
-rw-r--r--arm9/asm/libmath.s6
-rw-r--r--arm9/asm/scrcmd.s490
-rw-r--r--arm9/asm/secure.s9
-rw-r--r--arm9/asm/unk_02000E0C.s343
-rw-r--r--arm9/asm/unk_020023C0.s250
-rw-r--r--arm9/asm/unk_020061E8.s2
-rw-r--r--arm9/asm/unk_02006864.s220
-rw-r--r--arm9/asm/unk_02038C78.s8
-rw-r--r--arm9/asm/unk_02046030.s1868
-rw-r--r--arm9/asm/unk_0208AC14.s48
-rw-r--r--arm9/asm/unk_020910EC.s14
-rw-r--r--arm9/asm/unk_020AF030.s4
25 files changed, 2559 insertions, 3686 deletions
diff --git a/arm9/asm/libcp.s b/arm9/asm/CP_context.s
index c756e8e2..c756e8e2 100644
--- a/arm9/asm/libcp.s
+++ b/arm9/asm/CP_context.s
diff --git a/arm9/asm/DGT_hash1.s b/arm9/asm/DGT_hash1.s
new file mode 100644
index 00000000..a9d6778d
--- /dev/null
+++ b/arm9/asm/DGT_hash1.s
@@ -0,0 +1,404 @@
+ .include "asm/macros.inc"
+ .include "global.inc"
+
+ .text
+
+ arm_func_start ProcessBlock
+ProcessBlock: ; 0x020D2798
+ stmdb sp!, {r4-r11,lr}
+ sub sp, sp, #0x4
+ add r3, r0, #0x18
+ ldr r5, [r0, #0x0]
+ ldr r4, [r0, #0x4]
+ ldr lr, [r0, #0x8]
+ ldr r12, [r0, #0xc]
+ ldr r2, _020D2B78 ; =0x02106900
+ mov r8, r3
+ mov r7, #0x0
+_020D27C0:
+ mvn r1, r4
+ and r6, r4, lr
+ and r1, r1, r12
+ orr r1, r6, r1
+ ldr r6, [r8, #0x0]
+ add r1, r5, r1
+ ldr r5, [r2, #0x0]
+ add r1, r6, r1
+ add r5, r5, r1
+ mov r1, r5, lsl #0x7
+ orr r1, r1, r5, lsr #0x19
+ add r5, r4, r1
+ mvn r1, r5
+ and r6, r5, r4
+ and r1, r1, lr
+ orr r1, r6, r1
+ ldr r6, [r8, #0x4]
+ add r1, r12, r1
+ ldr r9, [r2, #0x4]
+ add r1, r6, r1
+ add r6, r9, r1
+ mov r1, r6, lsl #0xc
+ orr r1, r1, r6, lsr #0x14
+ add r12, r5, r1
+ mvn r1, r12
+ and r6, r12, r5
+ and r1, r1, r4
+ orr r6, r6, r1
+ add r1, r8, #0xc
+ ldr r9, [r8, #0x8]
+ add r6, lr, r6
+ add r6, r9, r6
+ ldr r9, [r2, #0x8]
+ ldr r1, [r1, #0x0]
+ add r10, r9, r6
+ add r6, r2, #0xc
+ ldr r6, [r6, #0x0]
+ mov r9, r10, lsl #0x11
+ orr r9, r9, r10, lsr #0xf
+ add lr, r12, r9
+ add r2, r2, #0x10
+ add r8, r8, #0x10
+ and r10, lr, r12
+ mvn r9, lr
+ and r9, r9, r5
+ orr r9, r10, r9
+ add r4, r4, r9
+ add r1, r1, r4
+ add r4, r6, r1
+ mov r1, r4, lsl #0x16
+ orr r1, r1, r4, lsr #0xa
+ add r4, lr, r1
+ add r7, r7, #0x1
+ cmp r7, #0x4
+ blt _020D27C0
+ ldr r6, _020D2B7C ; =0x02106840
+ mov r1, #0x0
+_020D28A4:
+ mvn r7, r12
+ ldr r9, [r6, #0x0]
+ and r8, r4, r12
+ and r7, lr, r7
+ orr r7, r8, r7
+ ldr r8, [r3, r9, lsl #0x2]
+ add r5, r5, r7
+ ldr r7, [r2, #0x0]
+ add r5, r8, r5
+ add r7, r7, r5
+ mov r5, r7, lsl #0x5
+ orr r5, r5, r7, lsr #0x1b
+ add r5, r4, r5
+ mvn r8, lr
+ ldr r7, [r6, #0x4]
+ and r9, r5, lr
+ and r8, r4, r8
+ orr r10, r9, r8
+ mvn r8, r4
+ ldr r9, [r6, #0x8]
+ ldr r11, [r3, r7, lsl #0x2]
+ add r7, r12, r10
+ add r10, r11, r7
+ add r7, r6, #0xc
+ ldr r9, [r3, r9, lsl #0x2]
+ and r8, r5, r8
+ ldr r7, [r7, #0x0]
+ ldr r11, [r2, #0x4]
+ ldr r7, [r3, r7, lsl #0x2]
+ add r11, r11, r10
+ mov r10, r11, lsl #0x9
+ orr r10, r10, r11, lsr #0x17
+ add r12, r5, r10
+ ldr r10, [r2, #0x8]
+ and r11, r12, r4
+ orr r8, r11, r8
+ add r8, lr, r8
+ add r8, r9, r8
+ add r10, r10, r8
+ add r8, r2, #0xc
+ ldr r8, [r8, #0x0]
+ mov r9, r10, lsl #0xe
+ orr r9, r9, r10, lsr #0x12
+ add lr, r12, r9
+ add r2, r2, #0x10
+ add r6, r6, #0x10
+ and r10, lr, r5
+ mvn r9, r5
+ and r9, r12, r9
+ orr r9, r10, r9
+ add r4, r4, r9
+ add r4, r7, r4
+ add r7, r8, r4
+ mov r4, r7, lsl #0x14
+ orr r4, r4, r7, lsr #0xc
+ add r4, lr, r4
+ add r1, r1, #0x1
+ cmp r1, #0x4
+ blt _020D28A4
+ mov r7, #0x0
+_020D2994:
+ ldr r8, [r6, #0x0]
+ eor r1, r4, lr
+ eor r1, r12, r1
+ add r1, r5, r1
+ ldr r8, [r3, r8, lsl #0x2]
+ ldr r5, [r2, #0x0]
+ add r1, r8, r1
+ add r5, r5, r1
+ mov r1, r5, lsl #0x4
+ orr r1, r1, r5, lsr #0x1c
+ add r5, r4, r1
+ ldr r8, [r6, #0x4]
+ eor r1, r5, r4
+ eor r1, lr, r1
+ ldr r8, [r3, r8, lsl #0x2]
+ add r1, r12, r1
+ ldr r9, [r6, #0x8]
+ ldr r10, [r2, #0x4]
+ add r1, r8, r1
+ add r8, r10, r1
+ mov r1, r8, lsl #0xb
+ orr r1, r1, r8, lsr #0x15
+ add r12, r5, r1
+ eor r8, r12, r5
+ eor r8, r4, r8
+ ldr r9, [r3, r9, lsl #0x2]
+ add r8, lr, r8
+ add r9, r9, r8
+ ldr r10, [r2, #0x8]
+ add r1, r2, #0xc
+ ldr r8, [r6, #0xc]
+ add r10, r10, r9
+ ldr r9, [r3, r8, lsl #0x2]
+ mov r8, r10, lsl #0x10
+ orr r8, r8, r10, lsr #0x10
+ add lr, r12, r8
+ eor r8, lr, r12
+ eor r8, r5, r8
+ add r4, r4, r8
+ add r7, r7, #0x1
+ ldr r1, [r1, #0x0]
+ add r4, r9, r4
+ add r4, r1, r4
+ mov r1, r4, lsl #0x17
+ orr r1, r1, r4, lsr #0x9
+ add r2, r2, #0x10
+ add r6, r6, #0x10
+ add r4, lr, r1
+ cmp r7, #0x4
+ blt _020D2994
+ mov r10, #0x0
+_020D2A60:
+ mvn r1, r12
+ ldr r7, [r6, #0x0]
+ orr r1, r4, r1
+ eor r1, lr, r1
+ ldr r7, [r3, r7, lsl #0x2]
+ add r1, r5, r1
+ ldr r5, [r2, #0x0]
+ add r1, r7, r1
+ add r5, r5, r1
+ mov r1, r5, lsl #0x6
+ orr r1, r1, r5, lsr #0x1a
+ add r5, r4, r1
+ mvn r1, lr
+ ldr r7, [r6, #0x4]
+ orr r1, r5, r1
+ eor r1, r4, r1
+ ldr r8, [r6, #0x8]
+ ldr r7, [r3, r7, lsl #0x2]
+ add r1, r12, r1
+ ldr r9, [r2, #0x4]
+ add r1, r7, r1
+ add r9, r9, r1
+ mov r7, r9, lsl #0xa
+ add r1, r6, #0xc
+ orr r9, r7, r9, lsr #0x16
+ ldr r1, [r1, #0x0]
+ add r7, r2, #0xc
+ add r12, r5, r9
+ ldr r8, [r3, r8, lsl #0x2]
+ ldr r7, [r7, #0x0]
+ ldr r1, [r3, r1, lsl #0x2]
+ ldr r9, [r2, #0x8]
+ mvn r11, r4
+ orr r11, r12, r11
+ eor r11, r5, r11
+ add r11, lr, r11
+ add r8, r8, r11
+ add r9, r9, r8
+ mov r8, r9, lsl #0xf
+ orr r8, r8, r9, lsr #0x11
+ add lr, r12, r8
+ add r2, r2, #0x10
+ add r6, r6, #0x10
+ mvn r8, r5
+ orr r8, lr, r8
+ eor r8, r12, r8
+ add r4, r4, r8
+ add r1, r1, r4
+ add r4, r7, r1
+ mov r1, r4, lsl #0x15
+ orr r1, r1, r4, lsr #0xb
+ add r4, lr, r1
+ add r10, r10, #0x1
+ cmp r10, #0x4
+ blt _020D2A60
+ ldr r1, [r0, #0x0]
+ add r1, r1, r5
+ str r1, [r0, #0x0]
+ ldr r1, [r0, #0x4]
+ add r1, r1, r4
+ str r1, [r0, #0x4]
+ ldr r1, [r0, #0x8]
+ add r1, r1, lr
+ str r1, [r0, #0x8]
+ ldr r1, [r0, #0xc]
+ add r1, r1, r12
+ str r1, [r0, #0xc]
+ add sp, sp, #0x4
+ ldmia sp!, {r4-r11,lr}
+ bx lr
+ .balign 4
+_020D2B78: .word Unk_02106900 ; = 0x02106900
+_020D2B7C: .word Unk_02106840 ; = 0x02106840
+
+ arm_func_start DGT_Hash1GetDigest_R
+DGT_Hash1GetDigest_R: ; 0x020D2B80
+ stmdb sp!, {r4-r7,lr}
+ sub sp, sp, #0x4
+ mov r6, r1
+ ldr r1, [r6, #0x14]
+ ldr r3, [r6, #0x10]
+ mov r7, r0
+ mov r4, r1, lsl #0x3
+ ldr r1, _020D2C40 ; =0x0210683C
+ mov r0, r6
+ mov r2, #0x1
+ orr r4, r4, r3, lsr #0x1d
+ mov r5, r3, lsl #0x3
+ bl DGT_Hash1SetSource
+ ldr r0, [r6, #0x10]
+ mov r1, #0x0
+ and r3, r0, #0x3f
+ rsb r2, r3, #0x40
+ cmp r2, #0x8
+ bhs _020D2BE8
+ add r0, r6, #0x18
+ add r0, r0, r3
+ bl MI_CpuFill8
+ mov r0, r6
+ bl ProcessBlock
+ mov r3, #0x0
+ mov r2, #0x40
+_020D2BE8:
+ cmp r2, #0x8
+ bls _020D2C04
+ add r0, r6, #0x18
+ add r0, r0, r3
+ sub r2, r2, #0x8
+ mov r1, #0x0
+ bl MI_CpuFill8
+_020D2C04:
+ str r5, [r6, #0x50]
+ mov r0, r6
+ str r4, [r6, #0x54]
+ bl ProcessBlock
+ mov r0, r6
+ mov r1, r7
+ mov r2, #0x10
+ bl MI_CpuCopy8
+ mov r0, r6
+ mov r1, #0x0
+ mov r2, #0x58
+ bl MI_CpuFill8
+ add sp, sp, #0x4
+ ldmia sp!, {r4-r7,lr}
+ bx lr
+ .balign 4
+_020D2C40: .word Unk_0210683C ; = 0x0210683C
+
+ arm_func_start DGT_Hash1SetSource
+DGT_Hash1SetSource: ; 0x020D2C44
+ stmdb sp!, {r4-r9,lr}
+ sub sp, sp, #0x4
+ mov r8, r0
+ add r12, r8, #0x10
+ ldr r4, [r8, #0x10]
+ mov r6, r2
+ and r3, r4, #0x3f
+ ldr r0, [r12, #0x4]
+ adds r4, r4, r6
+ str r4, [r8, #0x10]
+ adc r0, r0, #0x0
+ rsb r5, r3, #0x40
+ mov r7, r1
+ str r0, [r12, #0x4]
+ cmp r5, r6
+ bls _020D2CB0
+ cmp r6, #0x0
+ addeq sp, sp, #0x4
+ ldmeqia sp!, {r4-r9,lr}
+ bxeq lr
+ add r1, r8, #0x18
+ mov r0, r7
+ add r1, r1, r3
+ bl MI_CpuCopy8
+ add sp, sp, #0x4
+ ldmia sp!, {r4-r9,lr}
+ bx lr
+_020D2CB0:
+ add r1, r8, #0x18
+ mov r0, r7
+ mov r2, r5
+ add r1, r1, r3
+ bl MI_CpuCopy8
+ mov r0, r8
+ bl ProcessBlock
+ sub r6, r6, r5
+ mov r4, r6, lsr #0x6
+ cmp r4, #0x0
+ add r9, r7, r5
+ ble _020D2D10
+ add r7, r8, #0x18
+ mov r5, #0x40
+_020D2CE8:
+ mov r0, r9
+ mov r1, r7
+ mov r2, r5
+ bl MI_CpuCopy8
+ mov r0, r8
+ add r9, r9, #0x40
+ bl ProcessBlock
+ sub r4, r4, #0x1
+ cmp r4, #0x0
+ bgt _020D2CE8
+_020D2D10:
+ ands r2, r6, #0x3f
+ addeq sp, sp, #0x4
+ ldmeqia sp!, {r4-r9,lr}
+ bxeq lr
+ mov r0, r9
+ add r1, r8, #0x18
+ bl MI_CpuCopy8
+ add sp, sp, #0x4
+ ldmia sp!, {r4-r9,lr}
+ bx lr
+
+ arm_func_start DGT_Hash1Reset
+DGT_Hash1Reset: ; 0x020D2D38
+ ldr r2, _020D2D68 ; =0x67452301
+ ldr r1, _020D2D6C ; =0xEFCDAB89
+ str r2, [r0, #0x0]
+ ldr r2, _020D2D70 ; =0x98BADCFE
+ str r1, [r0, #0x4]
+ ldr r1, _020D2D74 ; =0x10325476
+ str r2, [r0, #0x8]
+ str r1, [r0, #0xc]
+ mov r1, #0x0
+ str r1, [r0, #0x10]
+ str r1, [r0, #0x14]
+ bx lr
+ .balign 4
+_020D2D68: .word 0x67452301
+_020D2D6C: .word 0xEFCDAB89
+_020D2D70: .word 0x98BADCFE
+_020D2D74: .word 0x10325476
diff --git a/arm9/asm/DGT_hash2.s b/arm9/asm/DGT_hash2.s
new file mode 100644
index 00000000..614d700d
--- /dev/null
+++ b/arm9/asm/DGT_hash2.s
@@ -0,0 +1,443 @@
+ .include "asm/macros.inc"
+ .include "global.inc"
+
+ .text
+
+ arm_func_start DGT_Hash2CalcHmac
+DGT_Hash2CalcHmac: ; 0x020D2D78
+ stmdb sp!, {r4-r8,lr}
+ sub sp, sp, #0xa0
+ ldr lr, _020D2E00 ; =0x02106A04
+ add r12, sp, #0x1c
+ mov r8, r0
+ mov r7, r1
+ mov r6, r2
+ mov r5, r3
+ mov r4, r12
+ ldmia lr!, {r0-r3}
+ stmia r12!, {r0-r3}
+ ldmia lr, {r0-r2}
+ stmia r12, {r0-r2}
+ add lr, sp, #0x38
+ add r12, sp, #0x8
+ str lr, [sp, #0x24]
+ ldr lr, _020D2E04 ; =DGT_Hash2Reset
+ str r12, [sp, #0x28]
+ ldr ip, _020D2E08 ; =DGT_Hash2SetSource
+ str lr, [sp, #0x2c]
+ ldr lr, _020D2E0C ; =DGT_Hash2GetDigest
+ str r12, [sp, #0x30]
+ ldr r12, [sp, #0xb8]
+ str lr, [sp, #0x34]
+ str r12, [sp, #0x0]
+ mov r3, r5
+ mov r0, r8
+ mov r1, r7
+ mov r2, r6
+ str r4, [sp, #0x4]
+ bl DGTi_Hash2CalcHmac
+ add sp, sp, #0xa0
+ ldmia sp!, {r4-r8,lr}
+ bx lr
+ .balign 4
+_020D2E00: .word Unk_02106A04 ; = 0x02106A04
+_020D2E04: .word DGT_Hash2Reset
+_020D2E08: .word DGT_Hash2SetSource
+_020D2E0C: .word DGT_Hash2GetDigest
+
+ arm_func_start DGT_Hash2GetDigest
+DGT_Hash2GetDigest: ; 0x020D2E10
+ stmdb sp!, {r0-r3}
+ stmdb sp!, {r4-r6,lr}
+ ldr r0, [sp, #0x10]
+ mov r6, r1
+ ldr r3, [r0, #0x1c]
+ add r5, r0, #0x20
+ ands r1, r3, #0x3
+ mov r0, r3, asr #0x2
+ moveq r1, #0x0
+ streq r1, [r5, r0, lsl #0x2]
+ ldr r2, [sp, #0x10]
+ mov r1, #0x80
+ add r4, r2, #0x20
+ strb r1, [r4, r3]
+ add r3, r3, #0x1
+ ands r1, r3, #0x3
+ beq _020D2E68
+ mov r2, #0x0
+_020D2E58:
+ strb r2, [r4, r3]
+ add r3, r3, #0x1
+ ands r1, r3, #0x3
+ bne _020D2E58
+_020D2E68:
+ ldr r1, [sp, #0x10]
+ add r0, r0, #0x1
+ ldr r1, [r1, #0x1c]
+ cmp r1, #0x38
+ blt _020D2EB4
+ cmp r0, #0x10
+ bge _020D2E98
+ mov r1, #0x0
+_020D2E88:
+ str r1, [r5, r0, lsl #0x2]
+ add r0, r0, #0x1
+ cmp r0, #0x10
+ blt _020D2E88
+_020D2E98:
+ ldr r1, _020D3008 ; =0x02106A00
+ ldr r0, [sp, #0x10]
+ ldr r3, [r1, #0x0]
+ mov r1, r5
+ mov r2, #0x40
+ blx r3
+ mov r0, #0x0
+_020D2EB4:
+ cmp r0, #0xe
+ bge _020D2ED0
+ mov r1, #0x0
+_020D2EC0:
+ str r1, [r5, r0, lsl #0x2]
+ add r0, r0, #0x1
+ cmp r0, #0xe
+ blt _020D2EC0
+_020D2ED0:
+ ldr r0, [sp, #0x10]
+ mov r1, r5
+ ldr r2, [r0, #0x14]
+ ldr r3, _020D3008 ; =0x02106A00
+ strb r2, [r4, #0x3f]
+ mov r0, r2, lsr #0x8
+ strb r0, [r4, #0x3e]
+ mov r0, r2, lsr #0x10
+ strb r0, [r4, #0x3d]
+ mov r0, r2, lsr #0x18
+ strb r0, [r4, #0x3c]
+ ldr r0, [sp, #0x10]
+ mov r2, #0x40
+ ldr r5, [r0, #0x18]
+ strb r5, [r4, #0x3b]
+ mov r0, r5, lsr #0x8
+ strb r0, [r4, #0x3a]
+ mov r0, r5, lsr #0x10
+ strb r0, [r4, #0x39]
+ mov r0, r5, lsr #0x18
+ strb r0, [r4, #0x38]
+ ldr r0, [sp, #0x10]
+ ldr r3, [r3, #0x0]
+ blx r3
+ ldr r0, [sp, #0x10]
+ add r1, sp, #0x10
+ ldr r3, [r0, #0x0]
+ mov r0, #0x0
+ mov r2, r3, lsr #0x18
+ strb r2, [r6, #0x0]
+ mov r2, r3, lsr #0x10
+ strb r2, [r6, #0x1]
+ mov r2, r3, lsr #0x8
+ strb r2, [r6, #0x2]
+ strb r3, [r6, #0x3]
+ ldr r3, [sp, #0x10]
+ mov r2, #0x4
+ ldr r4, [r3, #0x4]
+ mov r3, r4, lsr #0x18
+ strb r3, [r6, #0x4]
+ mov r3, r4, lsr #0x10
+ strb r3, [r6, #0x5]
+ mov r3, r4, lsr #0x8
+ strb r3, [r6, #0x6]
+ strb r4, [r6, #0x7]
+ ldr r3, [sp, #0x10]
+ ldr r4, [r3, #0x8]
+ mov r3, r4, lsr #0x18
+ strb r3, [r6, #0x8]
+ mov r3, r4, lsr #0x10
+ strb r3, [r6, #0x9]
+ mov r3, r4, lsr #0x8
+ strb r3, [r6, #0xa]
+ strb r4, [r6, #0xb]
+ ldr r3, [sp, #0x10]
+ ldr r4, [r3, #0xc]
+ mov r3, r4, lsr #0x18
+ strb r3, [r6, #0xc]
+ mov r3, r4, lsr #0x10
+ strb r3, [r6, #0xd]
+ mov r3, r4, lsr #0x8
+ strb r3, [r6, #0xe]
+ strb r4, [r6, #0xf]
+ ldr r3, [sp, #0x10]
+ ldr r4, [r3, #0x10]
+ mov r3, r4, lsr #0x18
+ strb r3, [r6, #0x10]
+ mov r3, r4, lsr #0x10
+ strb r3, [r6, #0x11]
+ mov r3, r4, lsr #0x8
+ strb r3, [r6, #0x12]
+ strb r4, [r6, #0x13]
+ ldr r3, [sp, #0x10]
+ str r0, [r3, #0x1c]
+ bl MIi_CpuClear32
+ ldmia sp!, {r4-r6,lr}
+ add sp, sp, #0x10
+ bx lr
+ .balign 4
+_020D3008: .word Unk_02106A00 ; = 0x02106A00
+
+ arm_func_start DGT_Hash2SetSource
+DGT_Hash2SetSource: ; 0x020D300C
+ stmdb sp!, {r4-r8,lr}
+ mov r8, r0
+ movs r6, r2
+ mov r7, r1
+ add r5, r8, #0x20
+ ldmeqia sp!, {r4-r8,lr}
+ bxeq lr
+ ldr r0, [r8, #0x14]
+ add r1, r0, r6, lsl #0x3
+ cmp r1, r0
+ ldrcc r0, [r8, #0x18]
+ addcc r0, r0, #0x1
+ strcc r0, [r8, #0x18]
+ ldr r0, [r8, #0x18]
+ add r0, r0, r6, lsr #0x1d
+ str r0, [r8, #0x18]
+ str r1, [r8, #0x14]
+ ldr r1, [r8, #0x1c]
+ cmp r1, #0x0
+ beq _020D30CC
+ add r0, r1, r6
+ cmp r0, #0x40
+ blo _020D30A8
+ rsb r4, r1, #0x40
+ mov r0, r7
+ mov r2, r4
+ add r1, r5, r1
+ bl MI_CpuCopy8
+ ldr r1, _020D3164 ; =0x02106A00
+ mov r0, r8
+ ldr r3, [r1, #0x0]
+ mov r1, r5
+ mov r2, #0x40
+ sub r6, r6, r4
+ add r7, r7, r4
+ blx r3
+ mov r0, #0x0
+ str r0, [r8, #0x1c]
+ b _020D30CC
+_020D30A8:
+ mov r0, r7
+ mov r2, r6
+ add r1, r5, r1
+ bl MI_CpuCopy8
+ ldr r0, [r8, #0x1c]
+ add r0, r0, r6
+ str r0, [r8, #0x1c]
+ ldmia sp!, {r4-r8,lr}
+ bx lr
+_020D30CC:
+ cmp r6, #0x40
+ blo _020D313C
+ bic r4, r6, #0x3f
+ sub r6, r6, r4
+ ands r0, r7, #0x3
+ bne _020D3104
+ ldr r1, _020D3164 ; =0x02106A00
+ mov r0, r8
+ ldr r3, [r1, #0x0]
+ mov r1, r7
+ mov r2, r4
+ blx r3
+ add r7, r7, r4
+ b _020D313C
+_020D3104:
+ mov r0, r7
+ mov r1, r5
+ mov r2, #0x40
+ bl MI_CpuCopy8
+ ldr r1, _020D3164 ; =0x02106A00
+ mov r0, r8
+ ldr r3, [r1, #0x0]
+ mov r1, r5
+ mov r2, #0x40
+ add r7, r7, #0x40
+ blx r3
+ sub r4, r4, #0x40
+ cmp r4, #0x0
+ bgt _020D3104
+_020D313C:
+ str r6, [r8, #0x1c]
+ cmp r6, #0x0
+ ldmeqia sp!, {r4-r8,lr}
+ bxeq lr
+ mov r0, r7
+ mov r1, r5
+ mov r2, r6
+ bl MI_CpuCopy8
+ ldmia sp!, {r4-r8,lr}
+ bx lr
+ .balign 4
+_020D3164: .word Unk_02106A00 ; = 0x02106A00
+
+ arm_func_start DGT_Hash2Reset
+DGT_Hash2Reset: ; 0x020D3168
+ ldr r1, _020D31A4 ; =0x67452301
+ ldr r2, _020D31A8 ; =0xEFCDAB89
+ str r1, [r0, #0x0]
+ ldr r1, _020D31AC ; =0x98BADCFE
+ str r2, [r0, #0x4]
+ ldr r2, _020D31B0 ; =0x10325476
+ str r1, [r0, #0x8]
+ ldr r1, _020D31B4 ; =0xC3D2E1F0
+ str r2, [r0, #0xc]
+ str r1, [r0, #0x10]
+ mov r1, #0x0
+ str r1, [r0, #0x14]
+ str r1, [r0, #0x18]
+ str r1, [r0, #0x1c]
+ bx lr
+ .balign 4
+_020D31A4: .word 0x67452301
+_020D31A8: .word 0xEFCDAB89
+_020D31AC: .word 0x98BADCFE
+_020D31B0: .word 0x10325476
+_020D31B4: .word 0xC3D2E1F0
+
+ arm_func_start DGTi_Hash2CalcHmac
+DGTi_Hash2CalcHmac: ; 0x020D31B8
+ stmdb sp!, {r4-r9,lr}
+ sub sp, sp, #0xc4
+ ldr r5, [sp, #0xe0]
+ ldr r4, [sp, #0xe4]
+ movs r9, r0
+ mov r8, r1
+ mov r7, r2
+ mov r6, r3
+ addeq sp, sp, #0xc4
+ ldmeqia sp!, {r4-r9,lr}
+ bxeq lr
+ cmp r8, #0x0
+ addeq sp, sp, #0xc4
+ ldmeqia sp!, {r4-r9,lr}
+ bxeq lr
+ cmp r7, #0x0
+ addeq sp, sp, #0xc4
+ ldmeqia sp!, {r4-r9,lr}
+ bxeq lr
+ cmp r6, #0x0
+ addeq sp, sp, #0xc4
+ ldmeqia sp!, {r4-r9,lr}
+ bxeq lr
+ cmp r5, #0x0
+ addeq sp, sp, #0xc4
+ ldmeqia sp!, {r4-r9,lr}
+ bxeq lr
+ cmp r4, #0x0
+ addeq sp, sp, #0xc4
+ ldmeqia sp!, {r4-r9,lr}
+ bxeq lr
+ ldr r0, [r4, #0x4]
+ cmp r5, r0
+ ble _020D3278
+ ldr r0, [r4, #0x8]
+ ldr r1, [r4, #0x10]
+ blx r1
+ ldr r0, [r4, #0x8]
+ ldr r3, [r4, #0x14]
+ mov r1, r6
+ mov r2, r5
+ blx r3
+ ldr r0, [r4, #0x8]
+ ldr r2, [r4, #0x18]
+ add r1, sp, #0x0
+ blx r2
+ ldr r5, [r4, #0x0]
+ add r6, sp, #0x0
+_020D3278:
+ cmp r5, #0x0
+ mov r0, #0x0
+ ble _020D32A0
+ add r2, sp, #0x40
+_020D3288:
+ ldrb r1, [r6, r0]
+ add r0, r0, #0x1
+ cmp r0, r5
+ eor r1, r1, #0x36
+ strb r1, [r2], #0x1
+ blt _020D3288
+_020D32A0:
+ ldr r1, [r4, #0x4]
+ cmp r0, r1
+ bge _020D32CC
+ add r1, sp, #0x40
+ add r3, r1, r0
+ mov r2, #0x36
+_020D32B8:
+ strb r2, [r3], #0x1
+ ldr r1, [r4, #0x4]
+ add r0, r0, #0x1
+ cmp r0, r1
+ blt _020D32B8
+_020D32CC:
+ ldr r0, [r4, #0x8]
+ ldr r1, [r4, #0x10]
+ blx r1
+ ldr r0, [r4, #0x8]
+ ldr r2, [r4, #0x4]
+ ldr r3, [r4, #0x14]
+ add r1, sp, #0x40
+ blx r3
+ ldr r0, [r4, #0x8]
+ ldr r3, [r4, #0x14]
+ mov r1, r8
+ mov r2, r7
+ blx r3
+ ldr r0, [r4, #0x8]
+ ldr r1, [r4, #0xc]
+ ldr r2, [r4, #0x18]
+ blx r2
+ cmp r5, #0x0
+ mov r2, #0x0
+ ble _020D3338
+ add r1, sp, #0x80
+_020D3320:
+ ldrb r0, [r6, r2]
+ add r2, r2, #0x1
+ cmp r2, r5
+ eor r0, r0, #0x5c
+ strb r0, [r1], #0x1
+ blt _020D3320
+_020D3338:
+ ldr r0, [r4, #0x4]
+ cmp r2, r0
+ bge _020D3364
+ add r0, sp, #0x80
+ add r3, r0, r2
+ mov r1, #0x5c
+_020D3350:
+ strb r1, [r3], #0x1
+ ldr r0, [r4, #0x4]
+ add r2, r2, #0x1
+ cmp r2, r0
+ blt _020D3350
+_020D3364:
+ ldr r0, [r4, #0x8]
+ ldr r1, [r4, #0x10]
+ blx r1
+ ldr r0, [r4, #0x8]
+ ldr r2, [r4, #0x4]
+ ldr r3, [r4, #0x14]
+ add r1, sp, #0x80
+ blx r3
+ ldr r0, [r4, #0x8]
+ ldr r1, [r4, #0xc]
+ ldr r2, [r4, #0x0]
+ ldr r3, [r4, #0x14]
+ blx r3
+ ldr r0, [r4, #0x8]
+ ldr r2, [r4, #0x18]
+ mov r1, r9
+ blx r2
+ add sp, sp, #0xc4
+ ldmia sp!, {r4-r9,lr}
+ bx lr
+ .balign 4
diff --git a/arm9/asm/DGT_sha1s_arm4cw.s b/arm9/asm/DGT_sha1s_arm4cw.s
new file mode 100644
index 00000000..1f110a72
--- /dev/null
+++ b/arm9/asm/DGT_sha1s_arm4cw.s
@@ -0,0 +1,179 @@
+ .include "asm/macros.inc"
+ .include "global.inc"
+
+ .text
+
+_020D33B4: .word 0x00FF00FF
+_020D33B8: .word 0x5A827999
+_020D33BC: .word 0x6ED9EBA1
+_020D33C0: .word 0x8F1BBCDC
+_020D33C4: .word 0xCA62C1D6
+
+ arm_func_start DGTi_hash2_arm4_small
+DGTi_hash2_arm4_small: ; 0x020D33C8
+ stmdb sp!, {r4-r12,lr}
+ ldmia r0, {r3,r9-r12}
+ sub sp, sp, #0x84
+ str r2, [sp, #0x80]
+_020D33D8:
+ ldr r8, _020D33B8 ; =0x5A827999
+ ldr r7, _020D33B4 ; =0x00FF00FF
+ mov r6, sp
+ mov r5, #0x0
+_020D33E8:
+ ldr r4, [r1], #0x4
+ add r2, r8, r12
+ add r2, r2, r3, ror #0x1B
+ and lr, r4, r7
+ and r4, r7, r4, ror #0x18
+ orr r4, r4, lr, ror #0x8
+ str r4, [r6, #0x40]
+ str r4, [r6], #0x4
+ add r2, r2, r4
+ eor r4, r10, r11
+ and r4, r4, r9
+ eor r4, r4, r11
+ add r2, r2, r4
+ mov r9, r9, ror #0x2
+ mov r12, r11
+ mov r11, r10
+ mov r10, r9
+ mov r9, r3
+ mov r3, r2
+ add r5, r5, #0x4
+ cmp r5, #0x40
+ blt _020D33E8
+ mov r7, #0x0
+ mov r6, sp
+_020D3448:
+ ldr r2, [r6, #0x0]
+ ldr r5, [r6, #0x8]
+ ldr r4, [r6, #0x20]
+ ldr lr, [r6, #0x34]
+ eor r2, r2, r5
+ eor r4, r4, lr
+ eor r2, r2, r4
+ mov r2, r2, ror #0x1F
+ str r2, [r6, #0x40]
+ str r2, [r6], #0x4
+ add r2, r2, r12
+ add r2, r2, r8
+ add r2, r2, r3, ror #0x1B
+ eor r4, r10, r11
+ and r4, r4, r9
+ eor r4, r4, r11
+ add r2, r2, r4
+ mov r9, r9, ror #0x2
+ mov r12, r11
+ mov r11, r10
+ mov r10, r9
+ mov r9, r3
+ mov r3, r2
+ add r7, r7, #0x4
+ cmp r7, #0x10
+ blt _020D3448
+ ldr r8, _020D33BC ; =0x6ED9EBA1
+ mov r7, #0x0
+_020D34B8:
+ ldr r2, [r6, #0x0]
+ ldr r4, [r6, #0x8]
+ ldr lr, [r6, #0x20]
+ ldr r5, [r6, #0x34]
+ eor r2, r2, r4
+ eor lr, lr, r5
+ eor r2, r2, lr
+ mov r2, r2, ror #0x1F
+ str r2, [r6, #0x40]
+ str r2, [r6], #0x4
+ add r2, r2, r12
+ add r2, r2, r8
+ add r2, r2, r3, ror #0x1B
+ eor lr, r9, r10
+ eor lr, lr, r11
+ add r2, r2, lr
+ mov r9, r9, ror #0x2
+ mov r12, r11
+ mov r11, r10
+ mov r10, r9
+ mov r9, r3
+ mov r3, r2
+ add r7, r7, #0x1
+ cmp r7, #0xc
+ moveq r6, sp
+ cmp r7, #0x14
+ blt _020D34B8
+ ldr r8, _020D33C0 ; =0x8F1BBCDC
+ mov r7, #0x0
+_020D352C:
+ ldr r2, [r6, #0x0]
+ ldr lr, [r6, #0x8]
+ ldr r5, [r6, #0x20]
+ ldr r4, [r6, #0x34]
+ eor r2, r2, lr
+ eor r5, r5, r4
+ eor r2, r2, r5
+ mov r2, r2, ror #0x1F
+ str r2, [r6, #0x40]
+ str r2, [r6], #0x4
+ add r2, r2, r12
+ add r2, r2, r8
+ add r2, r2, r3, ror #0x1B
+ orr r5, r9, r10
+ and r5, r5, r11
+ and r4, r9, r10
+ orr r5, r5, r4
+ add r2, r2, r5
+ mov r9, r9, ror #0x2
+ mov r12, r11
+ mov r11, r10
+ mov r10, r9
+ mov r9, r3
+ mov r3, r2
+ add r7, r7, #0x1
+ cmp r7, #0x8
+ moveq r6, sp
+ cmp r7, #0x14
+ blt _020D352C
+ ldr r8, _020D33C4 ; =0xCA62C1D6
+ mov r7, #0x0
+_020D35A8:
+ ldr r2, [r6, #0x0]
+ ldr r5, [r6, #0x8]
+ ldr r4, [r6, #0x20]
+ ldr lr, [r6, #0x34]
+ eor r2, r2, r5
+ eor r4, r4, lr
+ eor r2, r2, r4
+ mov r2, r2, ror #0x1F
+ str r2, [r6, #0x40]
+ str r2, [r6], #0x4
+ add r2, r2, r12
+ add r2, r2, r8
+ add r2, r2, r3, ror #0x1B
+ eor r4, r9, r10
+ eor r4, r4, r11
+ add r2, r2, r4
+ mov r9, r9, ror #0x2
+ mov r12, r11
+ mov r11, r10
+ mov r10, r9
+ mov r9, r3
+ mov r3, r2
+ add r7, r7, #0x1
+ cmp r7, #0x4
+ moveq r6, sp
+ cmp r7, #0x14
+ blt _020D35A8
+ ldmia r0, {r2,r4,r6-r7,lr}
+ add r3, r3, r2
+ add r9, r9, r4
+ add r10, r10, r6
+ add r11, r11, r7
+ add r12, r12, lr
+ stmia r0, {r3,r9-r12}
+ ldr lr, [sp, #0x80]
+ subs lr, lr, #0x40
+ str lr, [sp, #0x80]
+ bgt _020D33D8
+ add sp, sp, #0x84
+ ldmia sp!, {r4-r12,pc}
diff --git a/arm9/asm/OS_interrupt_asm.s b/arm9/asm/OS_interrupt_asm.s
index ea17cf8d..7fdc1ccc 100644
--- a/arm9/asm/OS_interrupt_asm.s
+++ b/arm9/asm/OS_interrupt_asm.s
@@ -93,26 +93,3 @@ OS_SetIrqMask: ; 0x020C9E94
.balign 4
_020C9EC0: .word 0x04000208
_020C9EC4: .word 0x04000210
-
- arm_func_start OSi_EnterTimerCallback
-OSi_EnterTimerCallback: ; 0x020C9EC8
- stmdb sp!, {r4,lr}
- mov r3, #0xc
- mul r4, r0, r3
- ldr ip, _020C9F08 ; =0x021D344C
- add r0, r0, #0x3
- mov r3, #0x1
- mov r0, r3, lsl r0
- ldr r3, _020C9F0C ; =0x021D3454
- str r1, [r12, r4]
- str r2, [r3, r4]
- bl OS_EnableIrqMask
- ldr r0, _020C9F10 ; =0x021D3450
- mov r1, #0x1
- str r1, [r0, r4]
- ldmia sp!, {r4,lr}
- bx lr
- .balign 4
-_020C9F08: .word OSi_IrqCallbackInfo+0x30
-_020C9F0C: .word OSi_IrqCallbackInfo+0x38
-_020C9F10: .word OSi_IrqCallbackInfo+0x34
diff --git a/arm9/asm/OS_printf.s b/arm9/asm/OS_printf.s
deleted file mode 100644
index f5175955..00000000
--- a/arm9/asm/OS_printf.s
+++ /dev/null
@@ -1,757 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .text
-
- arm_func_start OS_VSNPrintf
-OS_VSNPrintf: ; 0x020CA49C
- stmdb sp!, {r4-r11,lr}
- sub sp, sp, #0x64
- mov r9, r2
- str r1, [sp, #0x54]
- str r0, [sp, #0x5c]
- str r0, [sp, #0x58]
- ldrsb r0, [r9, #0x0]
- str r1, [sp, #0x0]
- mov r11, r3
- cmp r0, #0x0
- beq _020CAD18
- mov r0, #0xa
- str r0, [sp, #0xc]
- mov r0, #0x0
- str r0, [sp, #0x4]
- mov r0, #0x20
- str r0, [sp, #0x1c]
- mov r0, #0x30
- str r0, [sp, #0x20]
- mvn r0, #0x0
- str r0, [sp, #0x8]
- mov r0, #0x57
- str r0, [sp, #0x10]
- mov r0, #0x8
- str r0, [sp, #0x14]
- mov r0, #0x37
- str r0, [sp, #0x18]
- mov r0, #0x10
- str r0, [sp, #0x24]
- mov r0, #0x1
- str r0, [sp, #0x28]
- mov r0, #0x2b
- str r0, [sp, #0x34]
- mov r0, #0x2d
- str r0, [sp, #0x30]
- mov r0, #0x2
- str r0, [sp, #0x2c]
-_020CA530:
- ldrsb r1, [r9, #0x0]
- and r0, r1, #0xff
- eor r0, r0, #0x20
- sub r0, r0, #0xa1
- cmp r0, #0x3c
- bhs _020CA56C
- add r0, sp, #0x54
- bl string_put_char
- ldrsb r1, [r9, #0x1]!
- cmp r1, #0x0
- beq _020CAD0C
- add r0, sp, #0x54
- add r9, r9, #0x1
- bl string_put_char
- b _020CAD0C
-_020CA56C:
- cmp r1, #0x25
- beq _020CA584
- add r0, sp, #0x54
- add r9, r9, #0x1
- bl string_put_char
- b _020CAD0C
-_020CA584:
- ldr r6, [sp, #0x4]
- ldr r5, [sp, #0x8]
- ldr r2, [sp, #0xc]
- ldr r0, [sp, #0x10]
- mov r10, r6
- mov r3, r9
-_020CA59C:
- ldrsb r4, [r9, #0x1]!
- cmp r4, #0x20
- bgt _020CA5B4
- cmp r4, #0x20
- beq _020CA5F4
- b _020CA60C
-_020CA5B4:
- cmp r4, #0x30
- bgt _020CA60C
- cmp r4, #0x2b
- blt _020CA60C
- cmp r4, #0x2b
- beq _020CA5E0
- cmp r4, #0x2d
- beq _020CA5FC
- cmp r4, #0x30
- beq _020CA604
- b _020CA60C
-_020CA5E0:
- ldrsb r1, [r9, #-0x1]
- cmp r1, #0x20
- bne _020CA60C
- orr r6, r6, #0x2
- b _020CA59C
-_020CA5F4:
- orr r6, r6, #0x1
- b _020CA59C
-_020CA5FC:
- orr r6, r6, #0x8
- b _020CA59C
-_020CA604:
- orr r6, r6, #0x10
- b _020CA59C
-_020CA60C:
- cmp r4, #0x2a
- bne _020CA640
- add r11, r11, #0x4
- ldr r10, [r11, #-0x4]
- add r9, r9, #0x1
- cmp r10, #0x0
- rsblt r10, r10, #0x0
- orrlt r6, r6, #0x8
- b _020CA654
-_020CA630:
- ldrsb r4, [r9], #0x1
- mov r1, #0xa
- mla r1, r10, r1, r4
- sub r10, r1, #0x30
-_020CA640:
- ldrsb r1, [r9, #0x0]
- cmp r1, #0x30
- blt _020CA654
- cmp r1, #0x39
- ble _020CA630
-_020CA654:
- ldrsb r1, [r9, #0x0]
- cmp r1, #0x2e
- bne _020CA6AC
- ldrsb r1, [r9, #0x1]!
- ldr r5, [sp, #0x4]
- cmp r1, #0x2a
- bne _020CA698
- add r11, r11, #0x4
- ldr r5, [r11, #-0x4]
- add r9, r9, #0x1
- cmp r5, #0x0
- ldrlt r5, [sp, #0x8]
- b _020CA6AC
-_020CA688:
- ldrsb r4, [r9], #0x1
- mov r1, #0xa
- mla r1, r5, r1, r4
- sub r5, r1, #0x30
-_020CA698:
- ldrsb r1, [r9, #0x0]
- cmp r1, #0x30
- blt _020CA6AC
- cmp r1, #0x39
- ble _020CA688
-_020CA6AC:
- ldrsb r1, [r9, #0x0]
- cmp r1, #0x68
- beq _020CA6C4
- cmp r1, #0x6c
- beq _020CA6DC
- b _020CA6F0
-_020CA6C4:
- ldrsb r1, [r9, #0x1]!
- cmp r1, #0x68
- orrne r6, r6, #0x40
- addeq r9, r9, #0x1
- orreq r6, r6, #0x100
- b _020CA6F0
-_020CA6DC:
- ldrsb r1, [r9, #0x1]!
- cmp r1, #0x6c
- orrne r6, r6, #0x20
- addeq r9, r9, #0x1
- orreq r6, r6, #0x80
-_020CA6F0:
- ldrsb r1, [r9, #0x0]
- cmp r1, #0x69
- bgt _020CA740
- cmp r1, #0x63
- blt _020CA720
- cmp r1, #0x63
- beq _020CA7B4
- cmp r1, #0x64
- beq _020CA96C
- cmp r1, #0x69
- beq _020CA96C
- b _020CA950
-_020CA720:
- cmp r1, #0x25
- bgt _020CA734
- cmp r1, #0x25
- beq _020CA934
- b _020CA950
-_020CA734:
- cmp r1, #0x58
- beq _020CA7A0
- b _020CA950
-_020CA740:
- cmp r1, #0x6e
- bgt _020CA754
- cmp r1, #0x6e
- beq _020CA8DC
- b _020CA950
-_020CA754:
- sub r1, r1, #0x6f
- cmp r1, #0x9
- addls pc, pc, r1, lsl #0x2
- b _020CA950
-_020CA764:
- b _020CA78C
- b _020CA7A8
- b _020CA950
- b _020CA950
- b _020CA828
- b _020CA950
- b _020CA798
- b _020CA950
- b _020CA950
- b _020CA964
-_020CA78C:
- ldr r2, [sp, #0x14]
- orr r6, r6, #0x1000
- b _020CA96C
-_020CA798:
- orr r6, r6, #0x1000
- b _020CA96C
-_020CA7A0:
- ldr r0, [sp, #0x18]
- b _020CA964
-_020CA7A8:
- orr r6, r6, #0x4
- ldr r5, [sp, #0x14]
- b _020CA964
-_020CA7B4:
- cmp r5, #0x0
- bge _020CA950
- ands r0, r6, #0x8
- add r11, r11, #0x4
- ldr r4, [r11, #-0x4]
- beq _020CA7F0
- mov r0, r4, lsl #0x18
- mov r1, r0, asr #0x18
- add r0, sp, #0x54
- bl string_put_char
- ldr r1, [sp, #0x1c]
- sub r2, r10, #0x1
- add r0, sp, #0x54
- bl string_fill_char
- b _020CA820
-_020CA7F0:
- ands r0, r6, #0x10
- ldrne r0, [sp, #0x20]
- sub r2, r10, #0x1
- ldreq r0, [sp, #0x1c]
- mov r0, r0, lsl #0x18
- mov r1, r0, asr #0x18
- add r0, sp, #0x54
- bl string_fill_char
- mov r0, r4, lsl #0x18
- mov r1, r0, asr #0x18
- add r0, sp, #0x54
- bl string_put_char
-_020CA820:
- add r9, r9, #0x1
- b _020CAD0C
-_020CA828:
- add fp, fp, #0x4
- cmp r5, #0x0
- ldr r7, [sp, #0x4]
- ldr r4, [fp, #-0x4]
- bge _020CA860
- ldrsb r0, [r4]
- cmp r0, #0x0
- beq _020CA874
-_020CA848:
- add r7, r7, #0x1
- ldrsb r0, [r4, r7]
- cmp r0, #0x0
- bne _020CA848
- b _020CA874
-_020CA85C:
- add r7, r7, #0x1
-_020CA860:
- cmp r7, r5
- bge _020CA874
- ldrsb r0, [r4, r7]
- cmp r0, #0x0
- bne _020CA85C
-_020CA874:
- ands r0, r6, #0x8
- sub sl, sl, r7
- beq _020CA8A4
- mov r1, r4
- mov r2, r7
- add r0, sp, #0x54
- bl string_put_string
- ldr r1, [sp, #0x1C]
- mov r2, sl
- add r0, sp, #0x54
- bl string_fill_char
- b _020CA8D4
-_020CA8A4:
- ands r0, r6, #0x10
- ldrne r0, [sp, #0x20]
- mov r2, sl
- ldreq r0, [sp, #0x1C]
- mov r0, r0, lsl #0x18
- mov r1, r0, asr #0x18
- add r0, sp, #0x54
- bl string_fill_char
- mov r1, r4
- mov r2, r7
- add r0, sp, #0x54
- bl string_put_string
-_020CA8D4:
- add r9, r9, #0x1
- b _020CAD0C
-_020CA8DC:
- ands r0, r6, #0x100
- ldr r1, [sp, #0x58]
- ldr r0, [sp, #0x5c]
- sub r2, r1, r0
- bne _020CA92C
- ands r0, r6, #0x40
- addne r11, r11, #0x4
- ldrne r0, [r11, #-0x4]
- strneh r2, [r0, #0x0]
- bne _020CA92C
- ands r0, r6, #0x80
- addeq r11, r11, #0x4
- ldreq r0, [r11, #-0x4]
- streq r2, [r0, #0x0]
- beq _020CA92C
- add r11, r11, #0x4
- ldr r0, [r11, #-0x4]
- mov r1, r2, asr #0x1f
- str r2, [r0, #0x0]
- str r1, [r0, #0x4]
-_020CA92C:
- add r9, r9, #0x1
- b _020CAD0C
-_020CA934:
- add r0, r3, #0x1
- cmp r0, r9
- bne _020CA950
- add r0, sp, #0x54
- add r9, r9, #0x1
- bl string_put_char
- b _020CAD0C
-_020CA950:
- add r0, sp, #0x54
- mov r1, r3
- sub r2, r9, r3
- bl string_put_string
- b _020CAD0C
-_020CA964:
- ldr r2, [sp, #0x24]
- orr r6, r6, #0x1000
-_020CA96C:
- ands r1, r6, #0x8
- bicne r6, r6, #0x10
- cmp r5, #0x0
- bicge r6, r6, #0x10
- ldrlt r5, [sp, #0x28]
- ldr r7, [sp, #0x4]
- ands r1, r6, #0x1000
- beq _020CAA20
- ands r1, r6, #0x100
- addne r11, r11, #0x4
- ldrneb r4, [r11, #-0x4]
- movne r1, #0x0
- bne _020CA9D0
- ands r1, r6, #0x40
- addne r11, r11, #0x4
- ldrneh r4, [r11, #-0x4]
- movne r1, #0x0
- bne _020CA9D0
- ands r1, r6, #0x80
- addne r11, r11, #0x8
- ldrne r1, [r11, #-0x4]
- ldrne r4, [r11, #-0x8]
- addeq r11, r11, #0x4
- ldreq r4, [r11, #-0x4]
- moveq r1, #0x0
-_020CA9D0:
- bic r6, r6, #0x3
- ands r3, r6, #0x4
- beq _020CAAD8
- cmp r2, #0x10
- bne _020CAA0C
- mov r3, #0x0
- cmp r1, r3
- cmpeq r4, r3
- beq _020CAAD8
- ldr r3, [sp, #0x20]
- ldr r7, [sp, #0x2c]
- strb r3, [sp, #0x39]
- add r3, r0, #0x21
- strb r3, [sp, #0x38]
- b _020CAAD8
-_020CAA0C:
- cmp r2, #0x8
- ldreq r3, [sp, #0x20]
- ldreq r7, [sp, #0x28]
- streqb r3, [sp, #0x38]
- b _020CAAD8
-_020CAA20:
- ands r1, r6, #0x100
- addne r11, r11, #0x4
- ldrnesb r4, [r11, #-0x4]
- movne r1, r4, asr #0x1f
- bne _020CAA64
- ands r1, r6, #0x40
- addne r11, r11, #0x4
- ldrnesh r4, [r11, #-0x4]
- movne r1, r4, asr #0x1f
- bne _020CAA64
- ands r1, r6, #0x80
- addne r11, r11, #0x8
- ldrne r4, [r11, #-0x8]
- ldrne r1, [r11, #-0x4]
- addeq r11, r11, #0x4
- ldreq r4, [r11, #-0x4]
- moveq r1, r4, asr #0x1f
-_020CAA64:
- mov r3, #0x0
- and r8, r3, #0x0
- cmp r8, r3
- and r8, r1, #0x80000000
- cmpeq r8, r3
- beq _020CAAA0
- ldr r7, [sp, #0x30]
- mvn r4, r4
- strb r7, [sp, #0x38]
- mvn r7, r1
- mov r1, #0x1
- adds r4, r4, r1
- adc r1, r7, r3
- ldr r7, [sp, #0x28]
- b _020CAAD8
-_020CAAA0:
- cmp r1, r3
- cmpeq r4, r3
- bne _020CAAB4
- cmp r5, #0x0
- beq _020CAAD8
-_020CAAB4:
- ands r3, r6, #0x2
- ldrne r3, [sp, #0x34]
- ldrne r7, [sp, #0x28]
- strneb r3, [sp, #0x38]
- bne _020CAAD8
- ands r3, r6, #0x1
- ldrne r3, [sp, #0x1c]
- ldrne r7, [sp, #0x28]
- strneb r3, [sp, #0x38]
-_020CAAD8:
- cmp r2, #0x8
- ldr r8, [sp, #0x4]
- beq _020CAAF8
- cmp r2, #0xa
- beq _020CAB40
- cmp r2, #0x10
- beq _020CABDC
- b _020CAC28
-_020CAAF8:
- mov r0, #0x0
- cmp r1, r0
- cmpeq r4, r0
- beq _020CAC28
-_020CAB08:
- and r0, r4, #0x7
- add r3, r0, #0x30
- add r0, sp, #0x3a
- strb r3, [r0, r8]
- mov r4, r4, lsr #0x3
- mov r2, #0x0
- mov r0, r1, lsr #0x3
- orr r4, r4, r1, lsl #0x1d
- cmp r0, r2
- cmpeq r4, r2
- mov r1, r0
- add r8, r8, #0x1
- bne _020CAB08
- b _020CAC28
-_020CAB40:
- mov r0, #0x0
- cmp r0, r0
- cmpeq r1, r0
- bne _020CAB8C
- cmp r4, #0x0
- beq _020CAC28
-_020CAB58:
- ldr r0, _020CAD60 ; =0xCCCCCCCD
- umull r1, r0, r4, r0
- movs r0, r0, lsr #0x3
- mov r1, #0xa
- mul r1, r0, r1
- sub r1, r4, r1
- mov r4, r0
- add r1, r1, #0x30
- add r0, sp, #0x3a
- strb r1, [r0, r8]
- add r8, r8, #0x1
- bne _020CAB58
- b _020CAC28
-_020CAB8C:
- cmp r1, r0
- cmpeq r4, r0
- beq _020CAC28
-_020CAB98:
- ldr r2, [sp, #0xc]
- ldr r3, [sp, #0x4]
- mov r0, r4
- bl _ll_udiv
- mov r3, #0xa
- umull r3, r12, r0, r3
- subs r3, r4, r3
- mov r2, #0x0
- add r4, r3, #0x30
- add r3, sp, #0x3a
- strb r4, [r3, r8]
- cmp r1, r2
- cmpeq r0, r2
- mov r4, r0
- add r8, r8, #0x1
- bne _020CAB98
- b _020CAC28
-_020CABDC:
- mov r2, #0x0
- cmp r1, r2
- cmpeq r4, r2
- beq _020CAC28
-_020CABEC:
- and r3, r4, #0xf
- cmp r3, #0xa
- mov r4, r4, lsr #0x4
- addlt r3, r3, #0x30
- mov r2, r1, lsr #0x4
- orr r4, r4, r1, lsl #0x1c
- mov r1, r2
- addge r3, r3, r0
- add r2, sp, #0x3a
- strb r3, [r2, r8]
- mov r2, #0x0
- cmp r1, r2
- add r8, r8, #0x1
- cmpeq r4, r2
- bne _020CABEC
-_020CAC28:
- cmp r7, #0x0
- ble _020CAC4C
- ldrsb r0, [sp, #0x38]
- cmp r0, #0x30
- ldreq r1, [sp, #0x20]
- addeq r0, sp, #0x3a
- streqb r1, [r0, r8]
- ldreq r7, [sp, #0x4]
- addeq r8, r8, #0x1
-_020CAC4C:
- sub r5, r5, r8
- ands r0, r6, #0x10
- beq _020CAC68
- sub r0, r10, r8
- sub r0, r0, r7
- cmp r5, r0
- movlt r5, r0
-_020CAC68:
- cmp r5, #0x0
- subgt r10, r10, r5
- add r0, r7, r8
- ands r6, r6, #0x8
- sub r10, r10, r0
- bne _020CAC90
- ldr r1, [sp, #0x1c]
- add r0, sp, #0x54
- mov r2, r10
- bl string_fill_char
-_020CAC90:
- cmp r7, #0x0
- ble _020CACB8
- add r0, sp, #0x38
- add r4, r0, r7
-_020CACA0:
- ldrsb r1, [r4, #-0x1]!
- sub r7, r7, #0x1
- add r0, sp, #0x54
- bl string_put_char
-_020CACB0:
- cmp r7, #0x0
- bgt _020CACA0
-_020CACB8:
- ldr r1, [sp, #0x20]
- mov r2, r5
- add r0, sp, #0x54
- bl string_fill_char
-_020CACC8:
- cmp r8, #0x0
- ble _020CACF0
- add r0, sp, #0x3A
- add r4, r0, r8
-_020CACD8:
- ldrsb r1, [r4, #-0x1]!
- sub r8, r8, #0x1
- add r0, sp, #0x54
- bl string_put_char
- cmp r8, #0x0
- bgt _020CACD8
-_020CACF0:
- cmp r6, #0x0
- beq _020CAD08
- ldr r1, [sp, #0x1C]
- mov r2, sl
- add r0, sp, #0x54
- bl string_fill_char
-_020CAD08:
- add r9, r9, #0x1
-_020CAD0C:
- ldrsb r0, [r9, #0x0]
- cmp r0, #0x0
- bne _020CA530
-_020CAD18:
- ldr r0, [sp, #0x54]
- cmp r0, #0x0
- ldrne r0, [sp, #0x58]
- movne r1, #0x0
- strneb r1, [r0, #0x0]
- bne _020CAD48
- ldr r0, [sp, #0x0]
- cmp r0, #0x0
- ldrne r1, [sp, #0x5c]
- movne r2, #0x0
- addne r0, r1, r0
- strneb r2, [r0, #-0x1]
-_020CAD48:
- ldr r1, [sp, #0x58]
- ldr r0, [sp, #0x5c]
- sub r0, r1, r0
- add sp, sp, #0x64
- ldmia sp!, {r4-r11,lr}
- bx lr
- .balign 4
-_020CAD60: .word 0xCCCCCCCD
-
- arm_func_start OS_SNPrintf
-OS_SNPrintf: ; 0x020CAD64
- stmdb sp!, {r0-r3}
- stmdb sp!, {lr}
- sub sp, sp, #0x4
- add r3, sp, #0x10
- bic r3, r3, #0x3
- ldr r2, [sp, #0x10]
- add r3, r3, #0x4
- bl OS_VSNPrintf
- add sp, sp, #0x4
- ldmia sp!, {lr}
- add sp, sp, #0x10
- bx lr
-
- arm_func_start OS_VSPrintf
-OS_VSPrintf: ; 0x020CAD94
- ldr ip, _020CADA8 ; =OS_VSNPrintf
- mov r3, r2
- mov r2, r1
- mvn r1, #0x80000000
- bx r12
- .balign 4
-_020CADA8: .word OS_VSNPrintf
-
- arm_func_start OS_SPrintf
-OS_SPrintf: ; 0x020CADAC
- stmdb sp!, {r0-r3}
- stmdb sp!, {lr}
- sub sp, sp, #0x4
- add r2, sp, #0xc
- bic r2, r2, #0x3
- ldr r1, [sp, #0xc]
- add r2, r2, #0x4
- bl OS_VSPrintf
- add sp, sp, #0x4
- ldmia sp!, {lr}
- add sp, sp, #0x10
- bx lr
-
- arm_func_start string_put_string
-string_put_string: ; 0x020CADDC
- stmdb sp!, {r4,lr}
- cmp r2, #0x0
- ldmleia sp!, {r4,lr}
- bxle lr
- ldr lr, [r0, #0x0]
- mov r4, #0x0
- cmp lr, r2
- movhi lr, r2
- cmp lr, #0x0
- bls _020CAE1C
-_020CAE04:
- ldrsb r12, [r1, r4]
- ldr r3, [r0, #0x4]
- strb r12, [r3, r4]
- add r4, r4, #0x1
- cmp r4, lr
- blo _020CAE04
-_020CAE1C:
- ldr r1, [r0, #0x0]
- sub r1, r1, lr
- str r1, [r0, #0x0]
- ldr r1, [r0, #0x4]
- add r1, r1, r2
- str r1, [r0, #0x4]
- ldmia sp!, {r4,lr}
- bx lr
-
- arm_func_start string_fill_char
-string_fill_char:
- stmdb sp!, {lr}
- sub sp, sp, #0x4
- cmp r2, #0x0
- addle sp, sp, #0x4
- ldmleia sp!, {lr}
- bxle lr
- ldr r12, [r0, #0x0]
- mov lr, #0x0
- cmp r12, r2
- movhi r12, r2
- cmp r12, #0x0
- bls _020CAE80
-_020CAE6C:
- ldr r3, [r0, #0x4]
- strb r1, [r3, lr]
- add lr, lr, #0x1
- cmp lr, r12
- blo _020CAE6C
-_020CAE80:
- ldr r1, [r0, #0x0]
- sub r1, r1, r12
- str r1, [r0, #0x0]
- ldr r1, [r0, #0x4]
- add r1, r1, r2
- str r1, [r0, #0x4]
- add sp, sp, #0x4
- ldmia sp!, {lr}
- bx lr
-
- arm_func_start string_put_char
-string_put_char:
- ldr r2, [r0, #0x0]
- cmp r2, #0x0
- ldrne r2, [r0, #0x4]
- strneb r1, [r2, #0x0]
- ldrne r1, [r0, #0x0]
- subne r1, r1, #0x1
- strne r1, [r0, #0x0]
- ldr r1, [r0, #0x4]
- add r1, r1, #0x1
- str r1, [r0, #0x4]
- bx lr
diff --git a/arm9/asm/OS_spinLock.s b/arm9/asm/OS_spinLock.s
index 36ab2cf5..3137a69b 100644
--- a/arm9/asm/OS_spinLock.s
+++ b/arm9/asm/OS_spinLock.s
@@ -272,7 +272,7 @@ FUN_020CA358: ; 0x020CA358
mov r4, #0x400
_020CA380:
mov r0, r4
- blx SVC_WaitByLoop
+ bl SVC_WaitByLoop
mov r0, r8
mov r1, r7
mov r2, r6
@@ -307,7 +307,7 @@ OS_InitLock: ; 0x020CA3AC
mov r4, #0x400
_020CA3FC:
mov r0, r4
- blx SVC_WaitByLoop
+ bl SVC_WaitByLoop
ldrh r0, [r5, #0x6]
cmp r0, #0x0
bne _020CA3FC
diff --git a/arm9/asm/arm9_itcm.s b/arm9/asm/arm9_itcm.s
index 79c0de28..7db3d194 100644
--- a/arm9/asm/arm9_itcm.s
+++ b/arm9/asm/arm9_itcm.s
@@ -1,6 +1,6 @@
.include "asm/macros.inc"
.include "global.inc"
- .section .itcm
+ .section .text
; OS
arm_func_start OS_IrqHandler
@@ -125,7 +125,7 @@ _01FF81A8: .word OSi_ThreadInfo
_01FF81AC: .word CP_SaveContext
_01FF81B0: .word CP_RestoreContext
- .section .itcm
+ .section .text
arm_func_start OSi_DoBoot
OSi_DoBoot: ; 0x01FF81B4
mov ip, #0x04000000
diff --git a/arm9/asm/crt0.s b/arm9/asm/crt0.s
index 05a91b28..65084858 100644
--- a/arm9/asm/crt0.s
+++ b/arm9/asm/crt0.s
@@ -73,7 +73,7 @@ _020008C4:
bl _fp_init
bl NitroStartUp
bl __call_static_initializers
- ldr r1, _02000934 ; =0x02000C55
+ ldr r1, _02000934 ; =NitroMain
ldr lr, _02000938 ; =0xFFFF0000
tst sp, #4
subne sp, sp, #4
diff --git a/arm9/asm/filesystem.s b/arm9/asm/filesystem.s
index 75af021d..a52f38b9 100644
--- a/arm9/asm/filesystem.s
+++ b/arm9/asm/filesystem.s
@@ -18,31 +18,31 @@ ReadNARCFile: ; 0x02006314
add r0, sp, #0x18
add r5, r2, #0x0
str r3, [sp, #0x4]
- blx FS_InitFile
+ bl FS_InitFile
add r0, sp, #0x18
add r1, r4, #0x0
- blx FS_OpenFile
+ bl FS_OpenFile
add r0, sp, #0x18
mov r1, #0xc
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, sp, #0x18
add r1, sp, #0x14
mov r2, #0x2
- blx FS_ReadFile
+ bl FS_ReadFile
ldr r4, [sp, #0x14]
add r0, sp, #0x18
add r1, r4, #0x4
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, sp, #0x18
add r1, sp, #0x14
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r0, sp, #0x18
add r1, sp, #0x8
mov r2, #0x2
- blx FS_ReadFile
+ bl FS_ReadFile
add r0, sp, #0x8
ldrh r0, [r0, #0x0]
cmp r0, r5
@@ -54,26 +54,26 @@ _0200637A:
add r6, r4, r0
add r0, sp, #0x18
add r1, r6, #0x4
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, sp, #0x18
add r1, sp, #0x14
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r4, #0xc
lsl r1, r5, #0x3
add r0, sp, #0x18
add r1, r4, r1
mov r2, #0x0
ldr r7, [sp, #0x14]
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, sp, #0x18
add r1, sp, #0x10
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r0, sp, #0x18
add r1, sp, #0xc
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r2, r6, r7
ldr r1, [sp, #0x10]
add r2, #0x8
@@ -82,7 +82,7 @@ _0200637A:
add r0, sp, #0x18
add r1, r1, r2
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
ldr r0, [sp, #0x78]
cmp r0, #0x0
bne _020063D6
@@ -98,9 +98,9 @@ _020063E0:
ldr r1, [sp, #0x0]
ldr r2, [sp, #0x14]
add r0, sp, #0x18
- blx FS_ReadFile
+ bl FS_ReadFile
add r0, sp, #0x18
- blx FS_CloseFile
+ bl FS_CloseFile
add sp, #0x60
pop {r3-r7, pc}
@@ -119,31 +119,31 @@ LoadFileIntoMemory: ; 0x020063F4
add r0, sp, #0x18
str r2, [sp, #0x0]
str r3, [sp, #0x4]
- blx FS_InitFile
+ bl FS_InitFile
add r0, sp, #0x18
add r1, r4, #0x0
- blx FS_OpenFile
+ bl FS_OpenFile
add r0, sp, #0x18
mov r1, #0xc
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, sp, #0x18
add r1, sp, #0x14
mov r2, #0x2
- blx FS_ReadFile
+ bl FS_ReadFile
ldr r4, [sp, #0x14]
add r0, sp, #0x18
add r1, r4, #0x4
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, sp, #0x18
add r1, sp, #0x14
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r0, sp, #0x18
add r1, sp, #0x8
mov r2, #0x2
- blx FS_ReadFile
+ bl FS_ReadFile
add r0, sp, #0x8
ldrh r0, [r0, #0x0]
cmp r0, r5
@@ -155,26 +155,26 @@ _0200645A:
add r6, r4, r0
add r0, sp, #0x18
add r1, r6, #0x4
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, sp, #0x18
add r1, sp, #0x14
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r4, #0xc
lsl r1, r5, #0x3
add r0, sp, #0x18
add r1, r4, r1
mov r2, #0x0
ldr r7, [sp, #0x14]
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, sp, #0x18
add r1, sp, #0x10
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r0, sp, #0x18
add r1, sp, #0xc
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r2, r6, r7
ldr r1, [sp, #0x10]
add r2, #0x8
@@ -183,7 +183,7 @@ _0200645A:
add r0, sp, #0x18
add r1, r1, r2
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
ldr r0, [sp, #0x78]
cmp r0, #0x0
bne _020064B6
@@ -212,9 +212,9 @@ _020064D8:
ldr r2, [sp, #0x14]
add r0, sp, #0x18
add r1, r4, #0x0
- blx FS_ReadFile
+ bl FS_ReadFile
add r0, sp, #0x18
- blx FS_CloseFile
+ bl FS_CloseFile
add r0, r4, #0x0
add sp, #0x60
pop {r3-r7, pc}
@@ -329,33 +329,33 @@ LoadFromNARC_7: ; 0x020065A4
add r0, sp, #0x0
strh r1, [r0, #0x0]
add r0, sp, #0x10
- blx FS_InitFile
+ bl FS_InitFile
ldr r1, _0200666C ; =0x021058A0
lsl r2, r4, #0x2
ldr r1, [r1, r2]
add r0, sp, #0x10
- blx FS_OpenFile
+ bl FS_OpenFile
add r0, sp, #0x10
mov r1, #0xc
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, sp, #0x10
add r1, sp, #0xc
mov r2, #0x2
- blx FS_ReadFile
+ bl FS_ReadFile
ldr r4, [sp, #0xc]
add r0, sp, #0x10
add r1, r4, #0x4
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, sp, #0x10
add r1, sp, #0xc
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r0, sp, #0x10
add r1, sp, #0x0
mov r2, #0x2
- blx FS_ReadFile
+ bl FS_ReadFile
add r0, sp, #0x0
ldrh r0, [r0, #0x0]
cmp r0, r5
@@ -367,33 +367,33 @@ _0200660A:
add r6, r4, r0
add r0, sp, #0x10
add r1, r6, #0x4
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, sp, #0x10
add r1, sp, #0xc
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r4, #0xc
lsl r1, r5, #0x3
add r0, sp, #0x10
add r1, r4, r1
mov r2, #0x0
ldr r7, [sp, #0xc]
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, sp, #0x10
add r1, sp, #0x8
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r0, sp, #0x10
add r1, sp, #0x4
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r2, r6, r7
ldr r1, [sp, #0x8]
add r2, #0x8
add r1, r2, r1
add r0, sp, #0x10
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
ldr r1, [sp, #0x4]
ldr r0, [sp, #0x8]
sub r0, r1, r0
@@ -418,46 +418,46 @@ FUN_02006670: ; 0x02006670
beq _020066EC
mov r1, #0x0
str r1, [r4, #0x48]
- blx FS_InitFile
+ bl FS_InitFile
ldr r1, _020066F0 ; =0x021058A0
lsl r2, r5, #0x2
ldr r1, [r1, r2]
add r0, r4, #0x0
- blx FS_OpenFile
+ bl FS_OpenFile
add r0, r4, #0x0
mov r1, #0xc
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
add r1, r4, #0x0
add r0, r4, #0x0
add r1, #0x48
mov r2, #0x2
- blx FS_ReadFile
+ bl FS_ReadFile
ldr r1, [r4, #0x48]
add r0, r4, #0x0
add r1, r1, #0x4
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, r4, #0x0
add r1, sp, #0x0
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r1, r4, #0x0
add r0, r4, #0x0
add r1, #0x50
mov r2, #0x2
- blx FS_ReadFile
+ bl FS_ReadFile
ldr r1, [r4, #0x48]
ldr r0, [sp, #0x0]
mov r2, #0x0
add r5, r1, r0
add r0, r4, #0x0
add r1, r5, #0x4
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, r4, #0x0
add r1, sp, #0x0
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
ldr r0, [sp, #0x0]
add r0, r5, r0
str r0, [r4, #0x4c]
@@ -471,7 +471,7 @@ _020066F0: .word 0x021058A0
FUN_020066F4: ; 0x020066F4
push {r4, lr}
add r4, r0, #0x0
- blx FS_CloseFile
+ bl FS_CloseFile
add r0, r4, #0x0
bl FUN_02016A18
pop {r4, pc}
@@ -495,22 +495,22 @@ _0200671A:
add r1, r2, r1
add r0, r5, #0x0
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, r5, #0x0
add r1, sp, #0x4
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r0, r5, #0x0
add r1, sp, #0x0
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
ldr r2, [r5, #0x4c]
ldr r1, [sp, #0x4]
add r2, #0x8
add r1, r2, r1
add r0, r5, #0x0
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
ldr r2, [sp, #0x0]
ldr r1, [sp, #0x4]
add r0, r6, #0x0
@@ -523,7 +523,7 @@ _0200671A:
add r0, r5, #0x0
add r1, r4, #0x0
sub r2, r3, r2
- blx FS_ReadFile
+ bl FS_ReadFile
_0200676C:
add r0, r4, #0x0
add sp, #0x8
@@ -549,28 +549,28 @@ _0200678A:
add r1, r2, r1
add r0, r5, #0x0
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, r5, #0x0
add r1, sp, #0x4
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r0, r5, #0x0
add r1, sp, #0x0
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
ldr r2, [r5, #0x4c]
ldr r1, [sp, #0x4]
add r2, #0x8
add r1, r2, r1
add r0, r5, #0x0
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
ldr r3, [sp, #0x0]
ldr r2, [sp, #0x4]
add r0, r5, #0x0
add r1, r6, #0x0
sub r2, r3, r2
- blx FS_ReadFile
+ bl FS_ReadFile
add sp, #0x8
pop {r4-r6, pc}
@@ -592,15 +592,15 @@ _020067E4:
add r1, r2, r1
add r0, r5, #0x0
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, r5, #0x0
add r1, sp, #0x4
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
add r0, r5, #0x0
add r1, sp, #0x0
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
ldr r1, [sp, #0x0]
ldr r0, [sp, #0x4]
sub r0, r1, r0
@@ -627,11 +627,11 @@ _0200682A:
add r1, r2, r1
add r0, r5, #0x0
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, r5, #0x0
add r1, sp, #0x0
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
ldr r2, [r5, #0x4c]
ldr r1, [sp, #0x0]
add r2, #0x8
@@ -639,10 +639,10 @@ _0200682A:
add r0, r5, #0x0
add r1, r6, r1
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
ldr r1, [sp, #0x18]
add r0, r5, #0x0
add r2, r7, #0x0
- blx FS_ReadFile
+ bl FS_ReadFile
pop {r3-r7, pc}
.balign 4
diff --git a/arm9/asm/libcard.s b/arm9/asm/libcard.s
index 959c6f64..1eb74e0d 100644
--- a/arm9/asm/libcard.s
+++ b/arm9/asm/libcard.s
@@ -1637,7 +1637,7 @@ _020D7BEC: ; 0x020D7BEC
mov r4, #0x0
_020D7C04:
mov r0, r6
- blx SVC_WaitByLoop
+ bl SVC_WaitByLoop
mov r0, r5
mov r1, r7
mov r2, r4
diff --git a/arm9/asm/libctrdg.s b/arm9/asm/libctrdg.s
index 301ea233..6d8cf4a5 100644
--- a/arm9/asm/libctrdg.s
+++ b/arm9/asm/libctrdg.s
@@ -333,7 +333,7 @@ _020DB520: ; 0x020DB520
mov r4, #0x0
_020DB53C:
mov r0, r6
- blx SVC_WaitByLoop
+ bl SVC_WaitByLoop
mov r0, r5
mov r1, r7
mov r2, r4
@@ -389,7 +389,7 @@ _020DB5DC: ; 0x020DB5DC
ldr r0, [r6, #0x4]
bl OS_RestoreInterrupts
mov r0, r4
- blx SVC_WaitByLoop
+ bl SVC_WaitByLoop
b _020DB5A8
_020DB600: ; 0x020DB600
add sp, sp, #0x4
@@ -666,7 +666,7 @@ CTRDGi_InitCommon: ; 0x020DB938
ldr r2, _020DB974 ; =0x05000001
add r0, sp, #0x0
str r3, [sp, #0x0]
- blx FUN_020002FE
+ bl FUN_020002FE
bl OS_GetLockID
ldr r1, _020DB970 ; =0x021D6944
strh r0, [r1, #0x2]
@@ -872,7 +872,7 @@ _020DBBDC:
mov r7, #0x1
_020DBC1C:
mov r0, r7
- blx SVC_WaitByLoop
+ bl SVC_WaitByLoop
ldrh r0, [r5, #0x0]
cmp r0, #0x1
bne _020DBC1C
diff --git a/arm9/asm/libdgt.s b/arm9/asm/libdgt.s
deleted file mode 100644
index 02a3293f..00000000
--- a/arm9/asm/libdgt.s
+++ /dev/null
@@ -1,1017 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .text
-
- arm_func_start ProcessBlock
-ProcessBlock: ; 0x020D2798
- stmdb sp!, {r4-r11,lr}
- sub sp, sp, #0x4
- add r3, r0, #0x18
- ldr r5, [r0, #0x0]
- ldr r4, [r0, #0x4]
- ldr lr, [r0, #0x8]
- ldr r12, [r0, #0xc]
- ldr r2, _020D2B78 ; =0x02106900
- mov r8, r3
- mov r7, #0x0
-_020D27C0:
- mvn r1, r4
- and r6, r4, lr
- and r1, r1, r12
- orr r1, r6, r1
- ldr r6, [r8, #0x0]
- add r1, r5, r1
- ldr r5, [r2, #0x0]
- add r1, r6, r1
- add r5, r5, r1
- mov r1, r5, lsl #0x7
- orr r1, r1, r5, lsr #0x19
- add r5, r4, r1
- mvn r1, r5
- and r6, r5, r4
- and r1, r1, lr
- orr r1, r6, r1
- ldr r6, [r8, #0x4]
- add r1, r12, r1
- ldr r9, [r2, #0x4]
- add r1, r6, r1
- add r6, r9, r1
- mov r1, r6, lsl #0xc
- orr r1, r1, r6, lsr #0x14
- add r12, r5, r1
- mvn r1, r12
- and r6, r12, r5
- and r1, r1, r4
- orr r6, r6, r1
- add r1, r8, #0xc
- ldr r9, [r8, #0x8]
- add r6, lr, r6
- add r6, r9, r6
- ldr r9, [r2, #0x8]
- ldr r1, [r1, #0x0]
- add r10, r9, r6
- add r6, r2, #0xc
- ldr r6, [r6, #0x0]
- mov r9, r10, lsl #0x11
- orr r9, r9, r10, lsr #0xf
- add lr, r12, r9
- add r2, r2, #0x10
- add r8, r8, #0x10
- and r10, lr, r12
- mvn r9, lr
- and r9, r9, r5
- orr r9, r10, r9
- add r4, r4, r9
- add r1, r1, r4
- add r4, r6, r1
- mov r1, r4, lsl #0x16
- orr r1, r1, r4, lsr #0xa
- add r4, lr, r1
- add r7, r7, #0x1
- cmp r7, #0x4
- blt _020D27C0
- ldr r6, _020D2B7C ; =0x02106840
- mov r1, #0x0
-_020D28A4:
- mvn r7, r12
- ldr r9, [r6, #0x0]
- and r8, r4, r12
- and r7, lr, r7
- orr r7, r8, r7
- ldr r8, [r3, r9, lsl #0x2]
- add r5, r5, r7
- ldr r7, [r2, #0x0]
- add r5, r8, r5
- add r7, r7, r5
- mov r5, r7, lsl #0x5
- orr r5, r5, r7, lsr #0x1b
- add r5, r4, r5
- mvn r8, lr
- ldr r7, [r6, #0x4]
- and r9, r5, lr
- and r8, r4, r8
- orr r10, r9, r8
- mvn r8, r4
- ldr r9, [r6, #0x8]
- ldr r11, [r3, r7, lsl #0x2]
- add r7, r12, r10
- add r10, r11, r7
- add r7, r6, #0xc
- ldr r9, [r3, r9, lsl #0x2]
- and r8, r5, r8
- ldr r7, [r7, #0x0]
- ldr r11, [r2, #0x4]
- ldr r7, [r3, r7, lsl #0x2]
- add r11, r11, r10
- mov r10, r11, lsl #0x9
- orr r10, r10, r11, lsr #0x17
- add r12, r5, r10
- ldr r10, [r2, #0x8]
- and r11, r12, r4
- orr r8, r11, r8
- add r8, lr, r8
- add r8, r9, r8
- add r10, r10, r8
- add r8, r2, #0xc
- ldr r8, [r8, #0x0]
- mov r9, r10, lsl #0xe
- orr r9, r9, r10, lsr #0x12
- add lr, r12, r9
- add r2, r2, #0x10
- add r6, r6, #0x10
- and r10, lr, r5
- mvn r9, r5
- and r9, r12, r9
- orr r9, r10, r9
- add r4, r4, r9
- add r4, r7, r4
- add r7, r8, r4
- mov r4, r7, lsl #0x14
- orr r4, r4, r7, lsr #0xc
- add r4, lr, r4
- add r1, r1, #0x1
- cmp r1, #0x4
- blt _020D28A4
- mov r7, #0x0
-_020D2994:
- ldr r8, [r6, #0x0]
- eor r1, r4, lr
- eor r1, r12, r1
- add r1, r5, r1
- ldr r8, [r3, r8, lsl #0x2]
- ldr r5, [r2, #0x0]
- add r1, r8, r1
- add r5, r5, r1
- mov r1, r5, lsl #0x4
- orr r1, r1, r5, lsr #0x1c
- add r5, r4, r1
- ldr r8, [r6, #0x4]
- eor r1, r5, r4
- eor r1, lr, r1
- ldr r8, [r3, r8, lsl #0x2]
- add r1, r12, r1
- ldr r9, [r6, #0x8]
- ldr r10, [r2, #0x4]
- add r1, r8, r1
- add r8, r10, r1
- mov r1, r8, lsl #0xb
- orr r1, r1, r8, lsr #0x15
- add r12, r5, r1
- eor r8, r12, r5
- eor r8, r4, r8
- ldr r9, [r3, r9, lsl #0x2]
- add r8, lr, r8
- add r9, r9, r8
- ldr r10, [r2, #0x8]
- add r1, r2, #0xc
- ldr r8, [r6, #0xc]
- add r10, r10, r9
- ldr r9, [r3, r8, lsl #0x2]
- mov r8, r10, lsl #0x10
- orr r8, r8, r10, lsr #0x10
- add lr, r12, r8
- eor r8, lr, r12
- eor r8, r5, r8
- add r4, r4, r8
- add r7, r7, #0x1
- ldr r1, [r1, #0x0]
- add r4, r9, r4
- add r4, r1, r4
- mov r1, r4, lsl #0x17
- orr r1, r1, r4, lsr #0x9
- add r2, r2, #0x10
- add r6, r6, #0x10
- add r4, lr, r1
- cmp r7, #0x4
- blt _020D2994
- mov r10, #0x0
-_020D2A60:
- mvn r1, r12
- ldr r7, [r6, #0x0]
- orr r1, r4, r1
- eor r1, lr, r1
- ldr r7, [r3, r7, lsl #0x2]
- add r1, r5, r1
- ldr r5, [r2, #0x0]
- add r1, r7, r1
- add r5, r5, r1
- mov r1, r5, lsl #0x6
- orr r1, r1, r5, lsr #0x1a
- add r5, r4, r1
- mvn r1, lr
- ldr r7, [r6, #0x4]
- orr r1, r5, r1
- eor r1, r4, r1
- ldr r8, [r6, #0x8]
- ldr r7, [r3, r7, lsl #0x2]
- add r1, r12, r1
- ldr r9, [r2, #0x4]
- add r1, r7, r1
- add r9, r9, r1
- mov r7, r9, lsl #0xa
- add r1, r6, #0xc
- orr r9, r7, r9, lsr #0x16
- ldr r1, [r1, #0x0]
- add r7, r2, #0xc
- add r12, r5, r9
- ldr r8, [r3, r8, lsl #0x2]
- ldr r7, [r7, #0x0]
- ldr r1, [r3, r1, lsl #0x2]
- ldr r9, [r2, #0x8]
- mvn r11, r4
- orr r11, r12, r11
- eor r11, r5, r11
- add r11, lr, r11
- add r8, r8, r11
- add r9, r9, r8
- mov r8, r9, lsl #0xf
- orr r8, r8, r9, lsr #0x11
- add lr, r12, r8
- add r2, r2, #0x10
- add r6, r6, #0x10
- mvn r8, r5
- orr r8, lr, r8
- eor r8, r12, r8
- add r4, r4, r8
- add r1, r1, r4
- add r4, r7, r1
- mov r1, r4, lsl #0x15
- orr r1, r1, r4, lsr #0xb
- add r4, lr, r1
- add r10, r10, #0x1
- cmp r10, #0x4
- blt _020D2A60
- ldr r1, [r0, #0x0]
- add r1, r1, r5
- str r1, [r0, #0x0]
- ldr r1, [r0, #0x4]
- add r1, r1, r4
- str r1, [r0, #0x4]
- ldr r1, [r0, #0x8]
- add r1, r1, lr
- str r1, [r0, #0x8]
- ldr r1, [r0, #0xc]
- add r1, r1, r12
- str r1, [r0, #0xc]
- add sp, sp, #0x4
- ldmia sp!, {r4-r11,lr}
- bx lr
- .balign 4
-_020D2B78: .word Unk_02106900 ; = 0x02106900
-_020D2B7C: .word Unk_02106840 ; = 0x02106840
-
- arm_func_start DGT_Hash1GetDigest_R
-DGT_Hash1GetDigest_R: ; 0x020D2B80
- stmdb sp!, {r4-r7,lr}
- sub sp, sp, #0x4
- mov r6, r1
- ldr r1, [r6, #0x14]
- ldr r3, [r6, #0x10]
- mov r7, r0
- mov r4, r1, lsl #0x3
- ldr r1, _020D2C40 ; =0x0210683C
- mov r0, r6
- mov r2, #0x1
- orr r4, r4, r3, lsr #0x1d
- mov r5, r3, lsl #0x3
- bl DGT_Hash1SetSource
- ldr r0, [r6, #0x10]
- mov r1, #0x0
- and r3, r0, #0x3f
- rsb r2, r3, #0x40
- cmp r2, #0x8
- bhs _020D2BE8
- add r0, r6, #0x18
- add r0, r0, r3
- bl MI_CpuFill8
- mov r0, r6
- bl ProcessBlock
- mov r3, #0x0
- mov r2, #0x40
-_020D2BE8:
- cmp r2, #0x8
- bls _020D2C04
- add r0, r6, #0x18
- add r0, r0, r3
- sub r2, r2, #0x8
- mov r1, #0x0
- bl MI_CpuFill8
-_020D2C04:
- str r5, [r6, #0x50]
- mov r0, r6
- str r4, [r6, #0x54]
- bl ProcessBlock
- mov r0, r6
- mov r1, r7
- mov r2, #0x10
- bl MI_CpuCopy8
- mov r0, r6
- mov r1, #0x0
- mov r2, #0x58
- bl MI_CpuFill8
- add sp, sp, #0x4
- ldmia sp!, {r4-r7,lr}
- bx lr
- .balign 4
-_020D2C40: .word Unk_0210683C ; = 0x0210683C
-
- arm_func_start DGT_Hash1SetSource
-DGT_Hash1SetSource: ; 0x020D2C44
- stmdb sp!, {r4-r9,lr}
- sub sp, sp, #0x4
- mov r8, r0
- add r12, r8, #0x10
- ldr r4, [r8, #0x10]
- mov r6, r2
- and r3, r4, #0x3f
- ldr r0, [r12, #0x4]
- adds r4, r4, r6
- str r4, [r8, #0x10]
- adc r0, r0, #0x0
- rsb r5, r3, #0x40
- mov r7, r1
- str r0, [r12, #0x4]
- cmp r5, r6
- bls _020D2CB0
- cmp r6, #0x0
- addeq sp, sp, #0x4
- ldmeqia sp!, {r4-r9,lr}
- bxeq lr
- add r1, r8, #0x18
- mov r0, r7
- add r1, r1, r3
- bl MI_CpuCopy8
- add sp, sp, #0x4
- ldmia sp!, {r4-r9,lr}
- bx lr
-_020D2CB0:
- add r1, r8, #0x18
- mov r0, r7
- mov r2, r5
- add r1, r1, r3
- bl MI_CpuCopy8
- mov r0, r8
- bl ProcessBlock
- sub r6, r6, r5
- mov r4, r6, lsr #0x6
- cmp r4, #0x0
- add r9, r7, r5
- ble _020D2D10
- add r7, r8, #0x18
- mov r5, #0x40
-_020D2CE8:
- mov r0, r9
- mov r1, r7
- mov r2, r5
- bl MI_CpuCopy8
- mov r0, r8
- add r9, r9, #0x40
- bl ProcessBlock
- sub r4, r4, #0x1
- cmp r4, #0x0
- bgt _020D2CE8
-_020D2D10:
- ands r2, r6, #0x3f
- addeq sp, sp, #0x4
- ldmeqia sp!, {r4-r9,lr}
- bxeq lr
- mov r0, r9
- add r1, r8, #0x18
- bl MI_CpuCopy8
- add sp, sp, #0x4
- ldmia sp!, {r4-r9,lr}
- bx lr
-
- arm_func_start DGT_Hash1Reset
-DGT_Hash1Reset: ; 0x020D2D38
- ldr r2, _020D2D68 ; =0x67452301
- ldr r1, _020D2D6C ; =0xEFCDAB89
- str r2, [r0, #0x0]
- ldr r2, _020D2D70 ; =0x98BADCFE
- str r1, [r0, #0x4]
- ldr r1, _020D2D74 ; =0x10325476
- str r2, [r0, #0x8]
- str r1, [r0, #0xc]
- mov r1, #0x0
- str r1, [r0, #0x10]
- str r1, [r0, #0x14]
- bx lr
- .balign 4
-_020D2D68: .word 0x67452301
-_020D2D6C: .word 0xEFCDAB89
-_020D2D70: .word 0x98BADCFE
-_020D2D74: .word 0x10325476
-
- arm_func_start DGT_Hash2CalcHmac
-DGT_Hash2CalcHmac: ; 0x020D2D78
- stmdb sp!, {r4-r8,lr}
- sub sp, sp, #0xa0
- ldr lr, _020D2E00 ; =0x02106A04
- add r12, sp, #0x1c
- mov r8, r0
- mov r7, r1
- mov r6, r2
- mov r5, r3
- mov r4, r12
- ldmia lr!, {r0-r3}
- stmia r12!, {r0-r3}
- ldmia lr, {r0-r2}
- stmia r12, {r0-r2}
- add lr, sp, #0x38
- add r12, sp, #0x8
- str lr, [sp, #0x24]
- ldr lr, _020D2E04 ; =MATH_SHA1Init
- str r12, [sp, #0x28]
- ldr ip, _020D2E08 ; =MATH_SHA1Update
- str lr, [sp, #0x2c]
- ldr lr, _020D2E0C ; =MATH_SHA1GetHash
- str r12, [sp, #0x30]
- ldr r12, [sp, #0xb8]
- str lr, [sp, #0x34]
- str r12, [sp, #0x0]
- mov r3, r5
- mov r0, r8
- mov r1, r7
- mov r2, r6
- str r4, [sp, #0x4]
- bl MATHi_CalcHMAC
- add sp, sp, #0xa0
- ldmia sp!, {r4-r8,lr}
- bx lr
- .balign 4
-_020D2E00: .word Unk_02106A04 ; = 0x02106A04
-_020D2E04: .word MATH_SHA1Init
-_020D2E08: .word MATH_SHA1Update
-_020D2E0C: .word MATH_SHA1GetHash
-
- arm_func_start MATH_SHA1GetHash
-MATH_SHA1GetHash: ; 0x020D2E10
- stmdb sp!, {r0-r3}
- stmdb sp!, {r4-r6,lr}
- ldr r0, [sp, #0x10]
- mov r6, r1
- ldr r3, [r0, #0x1c]
- add r5, r0, #0x20
- ands r1, r3, #0x3
- mov r0, r3, asr #0x2
- moveq r1, #0x0
- streq r1, [r5, r0, lsl #0x2]
- ldr r2, [sp, #0x10]
- mov r1, #0x80
- add r4, r2, #0x20
- strb r1, [r4, r3]
- add r3, r3, #0x1
- ands r1, r3, #0x3
- beq _020D2E68
- mov r2, #0x0
-_020D2E58:
- strb r2, [r4, r3]
- add r3, r3, #0x1
- ands r1, r3, #0x3
- bne _020D2E58
-_020D2E68:
- ldr r1, [sp, #0x10]
- add r0, r0, #0x1
- ldr r1, [r1, #0x1c]
- cmp r1, #0x38
- blt _020D2EB4
- cmp r0, #0x10
- bge _020D2E98
- mov r1, #0x0
-_020D2E88:
- str r1, [r5, r0, lsl #0x2]
- add r0, r0, #0x1
- cmp r0, #0x10
- blt _020D2E88
-_020D2E98:
- ldr r1, _020D3008 ; =0x02106A00
- ldr r0, [sp, #0x10]
- ldr r3, [r1, #0x0]
- mov r1, r5
- mov r2, #0x40
- blx r3
- mov r0, #0x0
-_020D2EB4:
- cmp r0, #0xe
- bge _020D2ED0
- mov r1, #0x0
-_020D2EC0:
- str r1, [r5, r0, lsl #0x2]
- add r0, r0, #0x1
- cmp r0, #0xe
- blt _020D2EC0
-_020D2ED0:
- ldr r0, [sp, #0x10]
- mov r1, r5
- ldr r2, [r0, #0x14]
- ldr r3, _020D3008 ; =0x02106A00
- strb r2, [r4, #0x3f]
- mov r0, r2, lsr #0x8
- strb r0, [r4, #0x3e]
- mov r0, r2, lsr #0x10
- strb r0, [r4, #0x3d]
- mov r0, r2, lsr #0x18
- strb r0, [r4, #0x3c]
- ldr r0, [sp, #0x10]
- mov r2, #0x40
- ldr r5, [r0, #0x18]
- strb r5, [r4, #0x3b]
- mov r0, r5, lsr #0x8
- strb r0, [r4, #0x3a]
- mov r0, r5, lsr #0x10
- strb r0, [r4, #0x39]
- mov r0, r5, lsr #0x18
- strb r0, [r4, #0x38]
- ldr r0, [sp, #0x10]
- ldr r3, [r3, #0x0]
- blx r3
- ldr r0, [sp, #0x10]
- add r1, sp, #0x10
- ldr r3, [r0, #0x0]
- mov r0, #0x0
- mov r2, r3, lsr #0x18
- strb r2, [r6, #0x0]
- mov r2, r3, lsr #0x10
- strb r2, [r6, #0x1]
- mov r2, r3, lsr #0x8
- strb r2, [r6, #0x2]
- strb r3, [r6, #0x3]
- ldr r3, [sp, #0x10]
- mov r2, #0x4
- ldr r4, [r3, #0x4]
- mov r3, r4, lsr #0x18
- strb r3, [r6, #0x4]
- mov r3, r4, lsr #0x10
- strb r3, [r6, #0x5]
- mov r3, r4, lsr #0x8
- strb r3, [r6, #0x6]
- strb r4, [r6, #0x7]
- ldr r3, [sp, #0x10]
- ldr r4, [r3, #0x8]
- mov r3, r4, lsr #0x18
- strb r3, [r6, #0x8]
- mov r3, r4, lsr #0x10
- strb r3, [r6, #0x9]
- mov r3, r4, lsr #0x8
- strb r3, [r6, #0xa]
- strb r4, [r6, #0xb]
- ldr r3, [sp, #0x10]
- ldr r4, [r3, #0xc]
- mov r3, r4, lsr #0x18
- strb r3, [r6, #0xc]
- mov r3, r4, lsr #0x10
- strb r3, [r6, #0xd]
- mov r3, r4, lsr #0x8
- strb r3, [r6, #0xe]
- strb r4, [r6, #0xf]
- ldr r3, [sp, #0x10]
- ldr r4, [r3, #0x10]
- mov r3, r4, lsr #0x18
- strb r3, [r6, #0x10]
- mov r3, r4, lsr #0x10
- strb r3, [r6, #0x11]
- mov r3, r4, lsr #0x8
- strb r3, [r6, #0x12]
- strb r4, [r6, #0x13]
- ldr r3, [sp, #0x10]
- str r0, [r3, #0x1c]
- bl MIi_CpuClear32
- ldmia sp!, {r4-r6,lr}
- add sp, sp, #0x10
- bx lr
- .balign 4
-_020D3008: .word Unk_02106A00 ; = 0x02106A00
-
- arm_func_start MATH_SHA1Update
-MATH_SHA1Update: ; 0x020D300C
- stmdb sp!, {r4-r8,lr}
- mov r8, r0
- movs r6, r2
- mov r7, r1
- add r5, r8, #0x20
- ldmeqia sp!, {r4-r8,lr}
- bxeq lr
- ldr r0, [r8, #0x14]
- add r1, r0, r6, lsl #0x3
- cmp r1, r0
- ldrcc r0, [r8, #0x18]
- addcc r0, r0, #0x1
- strcc r0, [r8, #0x18]
- ldr r0, [r8, #0x18]
- add r0, r0, r6, lsr #0x1d
- str r0, [r8, #0x18]
- str r1, [r8, #0x14]
- ldr r1, [r8, #0x1c]
- cmp r1, #0x0
- beq _020D30CC
- add r0, r1, r6
- cmp r0, #0x40
- blo _020D30A8
- rsb r4, r1, #0x40
- mov r0, r7
- mov r2, r4
- add r1, r5, r1
- bl MI_CpuCopy8
- ldr r1, _020D3164 ; =0x02106A00
- mov r0, r8
- ldr r3, [r1, #0x0]
- mov r1, r5
- mov r2, #0x40
- sub r6, r6, r4
- add r7, r7, r4
- blx r3
- mov r0, #0x0
- str r0, [r8, #0x1c]
- b _020D30CC
-_020D30A8:
- mov r0, r7
- mov r2, r6
- add r1, r5, r1
- bl MI_CpuCopy8
- ldr r0, [r8, #0x1c]
- add r0, r0, r6
- str r0, [r8, #0x1c]
- ldmia sp!, {r4-r8,lr}
- bx lr
-_020D30CC:
- cmp r6, #0x40
- blo _020D313C
- bic r4, r6, #0x3f
- sub r6, r6, r4
- ands r0, r7, #0x3
- bne _020D3104
- ldr r1, _020D3164 ; =0x02106A00
- mov r0, r8
- ldr r3, [r1, #0x0]
- mov r1, r7
- mov r2, r4
- blx r3
- add r7, r7, r4
- b _020D313C
-_020D3104:
- mov r0, r7
- mov r1, r5
- mov r2, #0x40
- bl MI_CpuCopy8
- ldr r1, _020D3164 ; =0x02106A00
- mov r0, r8
- ldr r3, [r1, #0x0]
- mov r1, r5
- mov r2, #0x40
- add r7, r7, #0x40
- blx r3
- sub r4, r4, #0x40
- cmp r4, #0x0
- bgt _020D3104
-_020D313C:
- str r6, [r8, #0x1c]
- cmp r6, #0x0
- ldmeqia sp!, {r4-r8,lr}
- bxeq lr
- mov r0, r7
- mov r1, r5
- mov r2, r6
- bl MI_CpuCopy8
- ldmia sp!, {r4-r8,lr}
- bx lr
- .balign 4
-_020D3164: .word Unk_02106A00 ; = 0x02106A00
-
- arm_func_start MATH_SHA1Init
-MATH_SHA1Init: ; 0x020D3168
- ldr r1, _020D31A4 ; =0x67452301
- ldr r2, _020D31A8 ; =0xEFCDAB89
- str r1, [r0, #0x0]
- ldr r1, _020D31AC ; =0x98BADCFE
- str r2, [r0, #0x4]
- ldr r2, _020D31B0 ; =0x10325476
- str r1, [r0, #0x8]
- ldr r1, _020D31B4 ; =0xC3D2E1F0
- str r2, [r0, #0xc]
- str r1, [r0, #0x10]
- mov r1, #0x0
- str r1, [r0, #0x14]
- str r1, [r0, #0x18]
- str r1, [r0, #0x1c]
- bx lr
- .balign 4
-_020D31A4: .word 0x67452301
-_020D31A8: .word 0xEFCDAB89
-_020D31AC: .word 0x98BADCFE
-_020D31B0: .word 0x10325476
-_020D31B4: .word 0xC3D2E1F0
-
- arm_func_start MATHi_CalcHMAC
-MATHi_CalcHMAC: ; 0x020D31B8
- stmdb sp!, {r4-r9,lr}
- sub sp, sp, #0xc4
- ldr r5, [sp, #0xe0]
- ldr r4, [sp, #0xe4]
- movs r9, r0
- mov r8, r1
- mov r7, r2
- mov r6, r3
- addeq sp, sp, #0xc4
- ldmeqia sp!, {r4-r9,lr}
- bxeq lr
- cmp r8, #0x0
- addeq sp, sp, #0xc4
- ldmeqia sp!, {r4-r9,lr}
- bxeq lr
- cmp r7, #0x0
- addeq sp, sp, #0xc4
- ldmeqia sp!, {r4-r9,lr}
- bxeq lr
- cmp r6, #0x0
- addeq sp, sp, #0xc4
- ldmeqia sp!, {r4-r9,lr}
- bxeq lr
- cmp r5, #0x0
- addeq sp, sp, #0xc4
- ldmeqia sp!, {r4-r9,lr}
- bxeq lr
- cmp r4, #0x0
- addeq sp, sp, #0xc4
- ldmeqia sp!, {r4-r9,lr}
- bxeq lr
- ldr r0, [r4, #0x4]
- cmp r5, r0
- ble _020D3278
- ldr r0, [r4, #0x8]
- ldr r1, [r4, #0x10]
- blx r1
- ldr r0, [r4, #0x8]
- ldr r3, [r4, #0x14]
- mov r1, r6
- mov r2, r5
- blx r3
- ldr r0, [r4, #0x8]
- ldr r2, [r4, #0x18]
- add r1, sp, #0x0
- blx r2
- ldr r5, [r4, #0x0]
- add r6, sp, #0x0
-_020D3278:
- cmp r5, #0x0
- mov r0, #0x0
- ble _020D32A0
- add r2, sp, #0x40
-_020D3288:
- ldrb r1, [r6, r0]
- add r0, r0, #0x1
- cmp r0, r5
- eor r1, r1, #0x36
- strb r1, [r2], #0x1
- blt _020D3288
-_020D32A0:
- ldr r1, [r4, #0x4]
- cmp r0, r1
- bge _020D32CC
- add r1, sp, #0x40
- add r3, r1, r0
- mov r2, #0x36
-_020D32B8:
- strb r2, [r3], #0x1
- ldr r1, [r4, #0x4]
- add r0, r0, #0x1
- cmp r0, r1
- blt _020D32B8
-_020D32CC:
- ldr r0, [r4, #0x8]
- ldr r1, [r4, #0x10]
- blx r1
- ldr r0, [r4, #0x8]
- ldr r2, [r4, #0x4]
- ldr r3, [r4, #0x14]
- add r1, sp, #0x40
- blx r3
- ldr r0, [r4, #0x8]
- ldr r3, [r4, #0x14]
- mov r1, r8
- mov r2, r7
- blx r3
- ldr r0, [r4, #0x8]
- ldr r1, [r4, #0xc]
- ldr r2, [r4, #0x18]
- blx r2
- cmp r5, #0x0
- mov r2, #0x0
- ble _020D3338
- add r1, sp, #0x80
-_020D3320:
- ldrb r0, [r6, r2]
- add r2, r2, #0x1
- cmp r2, r5
- eor r0, r0, #0x5c
- strb r0, [r1], #0x1
- blt _020D3320
-_020D3338:
- ldr r0, [r4, #0x4]
- cmp r2, r0
- bge _020D3364
- add r0, sp, #0x80
- add r3, r0, r2
- mov r1, #0x5c
-_020D3350:
- strb r1, [r3], #0x1
- ldr r0, [r4, #0x4]
- add r2, r2, #0x1
- cmp r2, r0
- blt _020D3350
-_020D3364:
- ldr r0, [r4, #0x8]
- ldr r1, [r4, #0x10]
- blx r1
- ldr r0, [r4, #0x8]
- ldr r2, [r4, #0x4]
- ldr r3, [r4, #0x14]
- add r1, sp, #0x80
- blx r3
- ldr r0, [r4, #0x8]
- ldr r1, [r4, #0xc]
- ldr r2, [r4, #0x0]
- ldr r3, [r4, #0x14]
- blx r3
- ldr r0, [r4, #0x8]
- ldr r2, [r4, #0x18]
- mov r1, r9
- blx r2
- add sp, sp, #0xc4
- ldmia sp!, {r4-r9,lr}
- bx lr
- .balign 4
-_020D33B4: .word 0x00FF00FF
-_020D33B8: .word 0x5A827999
-_020D33BC: .word 0x6ED9EBA1
-_020D33C0: .word 0x8F1BBCDC
-_020D33C4: .word 0xCA62C1D6
-
- arm_func_start DGTi_hash2_arm4_small
-DGTi_hash2_arm4_small: ; 0x020D33C8
- stmdb sp!, {r4-r12,lr}
- ldmia r0, {r3,r9-r12}
- sub sp, sp, #0x84
- str r2, [sp, #0x80]
-_020D33D8:
- ldr r8, _020D33B8 ; =0x5A827999
- ldr r7, _020D33B4 ; =0x00FF00FF
- mov r6, sp
- mov r5, #0x0
-_020D33E8:
- ldr r4, [r1], #0x4
- add r2, r8, r12
- add r2, r2, r3, ror #0x1B
- and lr, r4, r7
- and r4, r7, r4, ror #0x18
- orr r4, r4, lr, ror #0x8
- str r4, [r6, #0x40]
- str r4, [r6], #0x4
- add r2, r2, r4
- eor r4, r10, r11
- and r4, r4, r9
- eor r4, r4, r11
- add r2, r2, r4
- mov r9, r9, ror #0x2
- mov r12, r11
- mov r11, r10
- mov r10, r9
- mov r9, r3
- mov r3, r2
- add r5, r5, #0x4
- cmp r5, #0x40
- blt _020D33E8
- mov r7, #0x0
- mov r6, sp
-_020D3448:
- ldr r2, [r6, #0x0]
- ldr r5, [r6, #0x8]
- ldr r4, [r6, #0x20]
- ldr lr, [r6, #0x34]
- eor r2, r2, r5
- eor r4, r4, lr
- eor r2, r2, r4
- mov r2, r2, ror #0x1F
- str r2, [r6, #0x40]
- str r2, [r6], #0x4
- add r2, r2, r12
- add r2, r2, r8
- add r2, r2, r3, ror #0x1B
- eor r4, r10, r11
- and r4, r4, r9
- eor r4, r4, r11
- add r2, r2, r4
- mov r9, r9, ror #0x2
- mov r12, r11
- mov r11, r10
- mov r10, r9
- mov r9, r3
- mov r3, r2
- add r7, r7, #0x4
- cmp r7, #0x10
- blt _020D3448
- ldr r8, _020D33BC ; =0x6ED9EBA1
- mov r7, #0x0
-_020D34B8:
- ldr r2, [r6, #0x0]
- ldr r4, [r6, #0x8]
- ldr lr, [r6, #0x20]
- ldr r5, [r6, #0x34]
- eor r2, r2, r4
- eor lr, lr, r5
- eor r2, r2, lr
- mov r2, r2, ror #0x1F
- str r2, [r6, #0x40]
- str r2, [r6], #0x4
- add r2, r2, r12
- add r2, r2, r8
- add r2, r2, r3, ror #0x1B
- eor lr, r9, r10
- eor lr, lr, r11
- add r2, r2, lr
- mov r9, r9, ror #0x2
- mov r12, r11
- mov r11, r10
- mov r10, r9
- mov r9, r3
- mov r3, r2
- add r7, r7, #0x1
- cmp r7, #0xc
- moveq r6, sp
- cmp r7, #0x14
- blt _020D34B8
- ldr r8, _020D33C0 ; =0x8F1BBCDC
- mov r7, #0x0
-_020D352C:
- ldr r2, [r6, #0x0]
- ldr lr, [r6, #0x8]
- ldr r5, [r6, #0x20]
- ldr r4, [r6, #0x34]
- eor r2, r2, lr
- eor r5, r5, r4
- eor r2, r2, r5
- mov r2, r2, ror #0x1F
- str r2, [r6, #0x40]
- str r2, [r6], #0x4
- add r2, r2, r12
- add r2, r2, r8
- add r2, r2, r3, ror #0x1B
- orr r5, r9, r10
- and r5, r5, r11
- and r4, r9, r10
- orr r5, r5, r4
- add r2, r2, r5
- mov r9, r9, ror #0x2
- mov r12, r11
- mov r11, r10
- mov r10, r9
- mov r9, r3
- mov r3, r2
- add r7, r7, #0x1
- cmp r7, #0x8
- moveq r6, sp
- cmp r7, #0x14
- blt _020D352C
- ldr r8, _020D33C4 ; =0xCA62C1D6
- mov r7, #0x0
-_020D35A8:
- ldr r2, [r6, #0x0]
- ldr r5, [r6, #0x8]
- ldr r4, [r6, #0x20]
- ldr lr, [r6, #0x34]
- eor r2, r2, r5
- eor r4, r4, lr
- eor r2, r2, r4
- mov r2, r2, ror #0x1F
- str r2, [r6, #0x40]
- str r2, [r6], #0x4
- add r2, r2, r12
- add r2, r2, r8
- add r2, r2, r3, ror #0x1B
- eor r4, r9, r10
- eor r4, r4, r11
- add r2, r2, r4
- mov r9, r9, ror #0x2
- mov r12, r11
- mov r11, r10
- mov r10, r9
- mov r9, r3
- mov r3, r2
- add r7, r7, #0x1
- cmp r7, #0x4
- moveq r6, sp
- cmp r7, #0x14
- blt _020D35A8
- ldmia r0, {r2,r4,r6-r7,lr}
- add r3, r3, r2
- add r9, r9, r4
- add r10, r10, r6
- add r11, r11, r7
- add r12, r12, lr
- stmia r0, {r3,r9-r12}
- ldr lr, [sp, #0x80]
- subs lr, lr, #0x40
- str lr, [sp, #0x80]
- bgt _020D33D8
- add sp, sp, #0x84
- ldmia sp!, {r4-r12,pc}
diff --git a/arm9/asm/libmath.s b/arm9/asm/libmath.s
index 02dcfbcf..e841f5da 100644
--- a/arm9/asm/libmath.s
+++ b/arm9/asm/libmath.s
@@ -32,16 +32,16 @@ MATH_CalcSHA1: ; 0x020DDCA0
add r0, sp, #0x0
mov r5, r1
mov r4, r2
- bl MATH_SHA1Init
+ bl DGT_Hash2Reset
_020DDCBC: ; 0x020DDCBC
add r0, sp, #0x0
mov r1, r5
mov r2, r4
- bl MATH_SHA1Update
+ bl DGT_Hash2SetSource
_020DDCCC: ; 0x020DDCCC
add r0, sp, #0x0
mov r1, r6
- bl MATH_SHA1GetHash
+ bl DGT_Hash2GetDigest
add sp, sp, #0x68
ldmia sp!, {r4-r6,lr}
bx lr
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index d75850de..dfda1697 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd.s
@@ -898,7 +898,7 @@ FUN_0203A038: ; 0x0203A038
str r1, [r0, #0x8]
ldrb r2, [r2, #0x0]
ldr r1, [r0, #0x78]
- bl FUN_021E2C24
+ bl MOD05_021E2C24
mov r0, #0x0
pop {r3, pc}
@@ -930,7 +930,7 @@ FUN_0203A04C: ; 0x0203A04C
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- bl FUN_021E2C24
+ bl MOD05_021E2C24
add r0, r5, #0x0
bl FUN_0200A8B8
mov r0, #0x0
@@ -968,7 +968,7 @@ FUN_0203A098: ; 0x0203A098
add r1, r5, #0x0
add r2, r6, #0x0
mov r3, #0x1
- bl FUN_021E2BD0
+ bl MOD05_021E2BD0
add r0, r5, #0x0
bl FUN_0200A8B8
ldr r1, _0203A0F8 ; =FUN_0203A2F0
@@ -1004,7 +1004,7 @@ FUN_0203A0FC: ; 0x0203A0FC
add r1, r4, #0x0
add r2, r6, #0x0
add r3, r7, #0x0
- bl FUN_021E2C58
+ bl MOD05_021E2C58
mov r0, #0x0
add sp, #0x8
pop {r3-r7, pc}
@@ -1034,7 +1034,7 @@ FUN_0203A13C: ; 0x0203A13C
add r1, r4, #0x0
add r2, r6, #0x0
add r3, r7, #0x0
- bl FUN_021E2C58
+ bl MOD05_021E2C58
ldr r1, _0203A184 ; =FUN_0203A2F0
add r0, r5, #0x0
bl SetupNativeScript
@@ -1085,7 +1085,7 @@ _0203A1AA:
add r0, r5, #0x0
add r1, r6, #0x0
mov r3, #0x1
- bl FUN_021E2BD0
+ bl MOD05_021E2BD0
add r0, r6, #0x0
bl FUN_0200A8B8
b _0203A1F4
@@ -1097,7 +1097,7 @@ _0203A1E2:
str r2, [sp, #0x4]
ldrh r2, [r4, #0x2]
ldrh r3, [r4, #0x4]
- bl FUN_021E2C58
+ bl MOD05_021E2C58
_0203A1F4:
ldr r1, _0203A20C ; =FUN_0203A2F0
add r0, r5, #0x0
@@ -1143,7 +1143,7 @@ FUN_0203A210: ; 0x0203A210
str r0, [sp, #0x0]
ldr r0, [r6, #0xc]
add r1, r7, #0x0
- bl FUN_02244210
+ bl MOD06_02244210
add r6, r0, #0x0
add r2, sp, #0x4
ldrb r2, [r2, #0x0]
@@ -1153,7 +1153,7 @@ FUN_0203A210: ; 0x0203A210
lsl r2, r2, #0x18
lsr r2, r2, #0x18
mov r3, #0x1
- bl FUN_021E2CBC
+ bl MOD05_021E2CBC
add r0, r6, #0x0
bl FUN_0200AB18
ldr r1, _0203A284 ; =FUN_0203A2F0
@@ -1174,7 +1174,7 @@ FUN_0203A288: ; 0x0203A288
add r4, r0, #0x0
add r0, sp, #0x4
add r1, r5, #0x0
- bl FUN_021E2BB8
+ bl MOD05_021E2BB8
mov r1, #0x3
add r0, sp, #0x4
strb r1, [r0, #0x2]
@@ -1184,7 +1184,7 @@ FUN_0203A288: ; 0x0203A288
add r0, r5, #0x0
add r2, r4, #0x0
mov r3, #0x0
- bl FUN_021E2BD0
+ bl MOD05_021E2BD0
ldr r1, _0203A2C0 ; =FUN_0203A2F0
add r0, r5, #0x0
bl SetupNativeScript
@@ -1207,7 +1207,7 @@ FUN_0203A2C4: ; 0x0203A2C4
str r1, [sp, #0x0]
ldrb r2, [r2, #0x0]
ldr r1, [r4, #0x78]
- bl FUN_021E2BD0
+ bl MOD05_021E2BD0
ldr r1, _0203A2EC ; =FUN_0203A2F0
add r0, r4, #0x0
bl SetupNativeScript
@@ -1247,7 +1247,7 @@ FUN_0203A304: ; 0x0203A304
add r0, r4, #0x0
lsr r2, r2, #0x18
mov r3, #0x1
- bl FUN_021E2BD0
+ bl MOD05_021E2BD0
ldr r1, _0203A33C ; =FUN_0203A2F0
add r0, r4, #0x0
bl SetupNativeScript
@@ -1271,7 +1271,7 @@ FUN_0203A340: ; 0x0203A340
add r4, r0, #0x0
add r0, sp, #0x4
add r1, r5, #0x0
- bl FUN_021E2BB8
+ bl MOD05_021E2BB8
lsl r2, r4, #0x18
mov r3, #0x1
add r0, sp, #0x4
@@ -1281,7 +1281,7 @@ FUN_0203A340: ; 0x0203A340
ldr r1, [r5, #0x78]
add r0, r5, #0x0
lsr r2, r2, #0x18
- bl FUN_021E2BD0
+ bl MOD05_021E2BD0
ldr r1, _0203A384 ; =FUN_0203A2F0
add r0, r5, #0x0
bl SetupNativeScript
@@ -1309,7 +1309,7 @@ FUN_0203A388: ; 0x0203A388
ldr r1, [r4, #0x78]
add r0, r4, #0x0
lsr r2, r2, #0x18
- bl FUN_021E2BD0
+ bl MOD05_021E2BD0
ldr r1, _0203A3C0 ; =FUN_0203A2F0
add r0, r4, #0x0
bl SetupNativeScript
@@ -1337,7 +1337,7 @@ FUN_0203A3C4: ; 0x0203A3C4
ldr r1, [r4, #0x78]
add r0, r4, #0x0
mov r3, #0x1
- bl FUN_021E2BD0
+ bl MOD05_021E2BD0
ldr r1, _0203A3FC ; =FUN_0203A2F0
add r0, r4, #0x0
bl SetupNativeScript
@@ -1365,12 +1365,12 @@ FUN_0203A400: ; 0x0203A400
add r0, r5, #0x0
add r2, r4, #0x0
mov r3, #0x1
- bl FUN_021E2BD0
+ bl MOD05_021E2BD0
b _0203A448
_0203A428:
add r0, sp, #0x4
add r1, r5, #0x0
- bl FUN_021E2BB8
+ bl MOD05_021E2BB8
mov r1, #0x1
add r0, sp, #0x4
strb r1, [r0, #0x0]
@@ -1381,7 +1381,7 @@ _0203A428:
add r0, r5, #0x0
add r2, r4, #0x0
mov r3, #0x0
- bl FUN_021E2BD0
+ bl MOD05_021E2BD0
_0203A448:
ldr r1, _0203A458 ; =FUN_0203A2F0
add r0, r5, #0x0
@@ -1854,12 +1854,12 @@ _0203A7E0:
ldr r0, [r4, #0x60]
ldr r1, [sp, #0x10]
add r2, r6, #0x0
- bl FUN_021E8128
+ bl MOD05_021E8128
ldr r0, [r4, #0x60]
mov r1, #0x1
- bl FUN_021E8130
+ bl MOD05_021E8130
add r0, r4, #0x0
- bl FUN_021E8158
+ bl MOD05_021E8158
ldr r2, [sp, #0x18]
ldr r0, [r5, #0x78]
ldr r1, [sp, #0xc]
@@ -1872,7 +1872,7 @@ _0203A7E0:
ldr r2, [r2, #0x0]
bl FUN_0200B7B8
ldr r0, [r4, #0x60]
- bl FUN_021E8140
+ bl MOD05_021E8140
mov r3, #0x0
str r3, [sp, #0x0]
str r3, [sp, #0x4]
@@ -1899,10 +1899,10 @@ FUN_0203A830: ; 0x0203A830
add r2, r0, #0x0
ldr r0, [r4, #0x60]
add r1, r5, #0x0
- bl FUN_021E8128
+ bl MOD05_021E8128
ldr r0, [r4, #0x60]
mov r1, #0x1
- bl FUN_021E8130
+ bl MOD05_021E8130
mov r0, #0x1
pop {r3-r5, pc}
.balign 4
@@ -1918,7 +1918,7 @@ FUN_0203A85C: ; 0x0203A85C
str r1, [r0, #0x8]
ldrb r1, [r2, #0x0]
ldr r0, [r3, #0x60]
- bl FUN_021E8130
+ bl MOD05_021E8130
mov r0, #0x1
pop {r3, pc}
.balign 4
@@ -1930,7 +1930,7 @@ FUN_0203A878: ; 0x0203A878
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x60]
- bl FUN_021E8148
+ bl MOD05_021E8148
cmp r0, #0x1
bne _0203A88E
mov r0, #0x0
@@ -1950,7 +1950,7 @@ FUN_0203A8A0: ; 0x0203A8A0
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x60]
- bl FUN_021E8148
+ bl MOD05_021E8148
cmp r0, #0x1
bne _0203A8B4
mov r0, #0x1
@@ -2000,7 +2000,7 @@ FUN_0203A8B8: ; 0x0203A8B8
ldr r2, [r6, #0x0]
bl FUN_0200B7B8
ldr r0, [r4, #0x60]
- bl FUN_021E8140
+ bl MOD05_021E8140
add r4, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
@@ -2042,7 +2042,7 @@ FUN_0203A94C: ; 0x0203A94C
bl FUN_020394B8
add r4, r0, #0x0
ldr r0, [r5, #0x60]
- bl FUN_021E8144
+ bl MOD05_021E8144
ldrb r0, [r6, #0x0]
ldr r5, _0203A9E8 ; =0x0000FFFF
bl FUN_020546C8
@@ -2376,7 +2376,7 @@ FUN_0203AB8C: ; 0x0203AB8C
ldr r1, [sp, #0x18]
ldr r2, [sp, #0x14]
add r0, r6, #0x0
- bl FUN_021E1BF8
+ bl MOD05_021E1BF8
ldr r1, [sp, #0x1c]
str r0, [r1, #0x0]
ldr r0, [sp, #0x24]
@@ -2441,7 +2441,7 @@ FUN_0203AC14: ; 0x0203AC14
ldr r1, [sp, #0x18]
ldr r2, [sp, #0x14]
add r0, r6, #0x0
- bl FUN_021E1BF8
+ bl MOD05_021E1BF8
ldr r1, [sp, #0x1c]
str r0, [r1, #0x0]
ldr r0, [sp, #0x24]
@@ -2467,7 +2467,7 @@ FUN_0203AC9C: ; 0x0203AC9C
str r2, [r4, #0x8]
ldrb r2, [r3, #0x0]
ldr r0, [r0, #0x0]
- bl FUN_021E1C4C
+ bl MOD05_021E1C4C
mov r0, #0x0
pop {r4, pc}
.balign 4
@@ -2498,7 +2498,7 @@ FUN_0203ACC4: ; 0x0203ACC4
add r2, r0, #0x0
ldr r0, [r4, #0x0]
add r1, r6, #0x0
- bl FUN_021E1C4C
+ bl MOD05_021E1C4C
mov r0, #0x0
pop {r4-r6, pc}
.balign 4
@@ -2512,7 +2512,7 @@ FUN_0203AD08: ; 0x0203AD08
mov r1, #0x0
bl FUN_02039438
ldr r0, [r0, #0x0]
- bl FUN_021E1C54
+ bl MOD05_021E1C54
ldr r1, _0203AD28 ; =FUN_0203AD2C
add r0, r4, #0x0
bl SetupNativeScript
@@ -2552,7 +2552,7 @@ FUN_0203AD54: ; 0x0203AD54
mov r1, #0x0
bl FUN_02039438
ldr r0, [r0, #0x0]
- bl FUN_021E1C54
+ bl MOD05_021E1C54
ldr r1, _0203AD74 ; =FUN_0203AD78
add r0, r4, #0x0
bl SetupNativeScript
@@ -2588,7 +2588,7 @@ FUN_0203AD78: ; 0x0203AD78
mov r0, #0x8
strh r0, [r4, #0x0]
ldr r0, [r6, #0x0]
- bl FUN_021E1ECC
+ bl MOD05_021E1ECC
mov r0, #0x1
pop {r4-r6, pc}
_0203ADB8:
@@ -2655,7 +2655,7 @@ FUN_0203ADC4: ; 0x0203ADC4
ldr r1, [sp, #0x18]
ldr r2, [sp, #0x14]
add r0, r6, #0x0
- bl FUN_021E1F34
+ bl MOD05_021E1F34
ldr r1, [sp, #0x1c]
str r0, [r1, #0x0]
ldr r0, [sp, #0x24]
@@ -2720,7 +2720,7 @@ FUN_0203AE4C: ; 0x0203AE4C
ldr r1, [sp, #0x18]
ldr r2, [sp, #0x14]
add r0, r6, #0x0
- bl FUN_021E1F34
+ bl MOD05_021E1F34
ldr r1, [sp, #0x1c]
str r0, [r1, #0x0]
ldr r0, [sp, #0x24]
@@ -2769,7 +2769,7 @@ FUN_0203AED4: ; 0x0203AED4
lsr r1, r1, #0x18
lsr r2, r2, #0x18
lsr r3, r3, #0x18
- bl FUN_021E1F58
+ bl MOD05_021E1F58
mov r0, #0x0
pop {r3-r7, pc}
@@ -2782,7 +2782,7 @@ FUN_0203AF34: ; 0x0203AF34
mov r1, #0x0
bl FUN_02039438
ldr r0, [r0, #0x0]
- bl FUN_021E1F60
+ bl MOD05_021E1F60
ldr r1, _0203AF54 ; =FUN_0203AD2C
add r0, r4, #0x0
bl SetupNativeScript
@@ -2804,7 +2804,7 @@ FUN_0203AF58: ; 0x0203AF58
str r1, [r4, #0x8]
ldrb r1, [r2, #0x0]
ldr r0, [r0, #0x0]
- bl FUN_021E26CC
+ bl MOD05_021E26CC
ldr r1, _0203AF80 ; =FUN_0203AD2C
add r0, r4, #0x0
bl SetupNativeScript
@@ -2826,7 +2826,7 @@ FUN_0203AF84: ; 0x0203AF84
str r1, [r4, #0x8]
ldrb r1, [r2, #0x0]
ldr r0, [r0, #0x0]
- bl FUN_021E2B80
+ bl MOD05_021E2B80
mov r0, #0x1
pop {r4, pc}
@@ -2843,7 +2843,7 @@ FUN_0203AFA4: ; 0x0203AFA4
str r1, [r4, #0x8]
ldrb r1, [r2, #0x0]
ldr r0, [r0, #0x0]
- bl FUN_021E2B9C
+ bl MOD05_021E2B9C
mov r0, #0x1
pop {r4, pc}
@@ -3479,7 +3479,7 @@ FUN_0203B468: ; 0x0203B468
ldr r1, [r1, #0x0]
add r4, r0, #0x0
ldr r1, [r1, #0x24]
- bl FUN_021EF5E0
+ bl MOD05_021EF5E0
add r5, #0x80
ldr r1, [r5, #0x0]
add r0, r4, #0x0
@@ -3512,7 +3512,7 @@ FUN_0203B500: ; 0x0203B500
ldr r1, [r1, #0x0]
add r4, r0, #0x0
ldr r1, [r1, #0x24]
- bl FUN_021EF5E0
+ bl MOD05_021EF5E0
add r5, #0x80
ldr r1, [r5, #0x0]
add r0, r4, #0x0
@@ -3540,7 +3540,7 @@ FUN_0203B544: ; 0x0203B544
pop {r3-r5, pc}
_0203B568:
add r1, r4, #0x0
- bl FUN_021F1EC0
+ bl MOD05_021F1EC0
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
@@ -3669,56 +3669,56 @@ FUN_0203B640: ; 0x0203B640
cmp r7, #0x0
beq _0203B696
lsl r0, r7, #0xc
- blx _fflt
+ bl _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
+ bl _fadd
b _0203B6A4
_0203B696:
lsl r0, r7, #0xc
- blx _fflt
+ bl _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
+ bl _fsub
_0203B6A4:
- blx _ffix
+ bl _ffix
str r0, [sp, #0x0]
cmp r6, #0x0
beq _0203B6C0
lsl r0, r6, #0xc
- blx _fflt
+ bl _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
+ bl _fadd
b _0203B6CE
_0203B6C0:
lsl r0, r6, #0xc
- blx _fflt
+ bl _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
+ bl _fsub
_0203B6CE:
- blx _ffix
+ bl _ffix
str r0, [sp, #0x4]
cmp r4, #0x0
beq _0203B6EA
lsl r0, r4, #0xc
- blx _fflt
+ bl _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
+ bl _fadd
b _0203B6F8
_0203B6EA:
lsl r0, r4, #0xc
- blx _fflt
+ bl _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
+ bl _fsub
_0203B6F8:
- blx _ffix
+ bl _ffix
str r0, [sp, #0x8]
add r0, r5, #0x0
add r0, #0x80
@@ -4254,7 +4254,7 @@ FUN_0203BB34: ; 0x0203BB34
ldr r0, [r5, #0x0]
ldr r1, [r4, #0x0]
add r2, r7, #0x0
- bl FUN_021E1858
+ bl MOD05_021E1858
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -4446,7 +4446,7 @@ FUN_0203BCBC: ; 0x0203BCBC
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
- bl FUN_021F02C4
+ bl MOD05_021F02C4
mov r0, #0x1
pop {r3, pc}
.balign 4
@@ -4723,7 +4723,7 @@ FUN_0203BECC: ; 0x0203BECC
add r2, r0, #0x0
ldr r0, [r5, #0x74]
ldr r1, [r4, #0x0]
- bl FUN_021E1374
+ bl MOD05_021E1374
mov r0, #0x1
pop {r4-r6, pc}
.balign 4
@@ -4741,7 +4741,7 @@ FUN_0203BF00: ; 0x0203BF00
beq _0203BF1C
add r4, #0x80
ldr r0, [r4, #0x0]
- bl FUN_021E1994
+ bl MOD05_021E1994
_0203BF1C:
mov r0, #0x0
pop {r4, pc}
@@ -5134,7 +5134,7 @@ FUN_0203C200: ; 0x0203C200
mov r2, #0x8
str r0, [r6, #0x0]
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, [sp, #0x0]
strh r7, [r4, #0x4]
strh r0, [r4, #0x6]
@@ -5889,7 +5889,7 @@ FUN_0203C844: ; 0x0203C844
add r1, r0, #0x0
ldr r0, [r5, #0x74]
add r2, r4, #0x0
- bl FUN_021E6990
+ bl MOD05_021E6990
mov r0, #0x1
pop {r3-r5, pc}
@@ -5918,7 +5918,7 @@ FUN_0203C874: ; 0x0203C874
add r1, r0, #0x0
ldr r0, [r5, #0x74]
add r2, r4, #0x0
- bl FUN_021E6410
+ bl MOD05_021E6410
mov r0, #0x1
pop {r3-r5, pc}
.balign 4
@@ -5942,7 +5942,7 @@ FUN_0203C8B4: ; 0x0203C8B4
add r1, r0, #0x0
ldr r0, [r5, #0x74]
add r2, r4, #0x0
- bl FUN_021E6BF4
+ bl MOD05_021E6BF4
mov r0, #0x1
pop {r3-r5, pc}
@@ -5999,7 +5999,7 @@ FUN_0203C930: ; 0x0203C930
ldr r0, [r4, #0x0]
ldr r0, [r0, #0x4]
ldr r0, [r0, #0xc]
- bl FUN_021DC174
+ bl MOD05_021DC174
mov r0, #0x1
pop {r3-r5, pc}
.balign 4
@@ -6022,7 +6022,7 @@ FUN_0203C960: ; 0x0203C960
ldr r0, [r4, #0x0]
ldr r0, [r0, #0x4]
ldr r0, [r0, #0xc]
- bl FUN_021DC174
+ bl MOD05_021DC174
mov r0, #0x1
pop {r3-r5, pc}
.balign 4
@@ -6063,7 +6063,7 @@ FUN_0203C990: ; 0x0203C990
ldr r0, [r0, #0x0]
mov r1, #0x0
add r2, r6, #0x0
- bl FUN_0224666C
+ bl MOD06_0224666C
str r0, [r4, #0x0]
ldr r1, _0203C9F4 ; =FUN_0203C9F8
add r0, r5, #0x0
@@ -6082,11 +6082,11 @@ FUN_0203C9F8: ; 0x0203C9F8
bl FUN_02039438
add r4, r0, #0x0
ldr r0, [r4, #0x0]
- bl FUN_022466A0
+ bl MOD06_022466A0
cmp r0, #0x1
bne _0203CA1A
ldr r0, [r4, #0x0]
- bl FUN_022466AC
+ bl MOD06_022466AC
mov r0, #0x1
pop {r4, pc}
_0203CA1A:
@@ -6098,7 +6098,7 @@ _0203CA1A:
FUN_0203CA20: ; 0x0203CA20
push {r3, lr}
ldr r0, [r0, #0x74]
- bl FUN_021E7030
+ bl MOD05_021E7030
mov r0, #0x1
pop {r3, pc}
@@ -6156,11 +6156,11 @@ FUN_0203CA5C: ; 0x0203CA5C
ldr r0, [r0, #0x0]
mov r1, #0x2
ldr r0, [r0, #0x38]
- bl FUN_021E5FD8
+ bl MOD05_021E5FD8
add r4, #0x80
ldr r0, [r4, #0x0]
ldr r0, [r0, #0x38]
- bl FUN_021E5FE0
+ bl MOD05_021E5FE0
b _0203CAE4
_0203CAA4:
add r0, r4, #0x0
@@ -6168,12 +6168,12 @@ _0203CAA4:
ldr r0, [r0, #0x0]
mov r1, #0x1
ldr r0, [r0, #0x38]
- bl FUN_021E5FD8
+ bl MOD05_021E5FD8
add r0, r4, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x38]
- bl FUN_021E5FE0
+ bl MOD05_021E5FE0
add r0, r4, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
@@ -6202,7 +6202,7 @@ FUN_0203CAE8: ; 0x0203CAE8
ldr r0, [r0, #0x0]
mov r1, #0x2
ldr r0, [r0, #0x38]
- bl FUN_021E5FD8
+ bl MOD05_021E5FD8
add r4, #0x80
mov r1, #0x12
ldr r0, [r4, #0x0]
@@ -6264,7 +6264,7 @@ FUN_0203CB60: ; 0x0203CB60
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x38]
- bl FUN_021E5FE0
+ bl MOD05_021E5FE0
mov r0, #0x0
pop {r3, pc}
@@ -6297,7 +6297,7 @@ FUN_0203CB70: ; 0x0203CB70
bl FUN_0202A990
add r1, r6, #0x0
add r2, r4, #0x0
- bl FUN_02245910
+ bl MOD06_02245910
mov r0, #0x0
pop {r4-r6, pc}
.balign 4
@@ -6429,7 +6429,7 @@ FUN_0203CC88: ; 0x0203CC88
ldr r3, [sp, #0x4]
add r0, r4, #0x0
add r1, r7, #0x0
- bl FUN_02240790
+ bl MOD06_02240790
ldr r1, _0203CCF4 ; =FUN_0203CCF8
add r0, r5, #0x0
str r6, [r5, #0x64]
@@ -6451,7 +6451,7 @@ FUN_0203CCF8: ; 0x0203CCF8
lsr r1, r1, #0x10
bl FUN_020394B8
add r4, r0, #0x0
- bl FUN_022407DC
+ bl MOD06_022407DC
cmp r0, #0x0
bne _0203CD18
mov r0, #0x0
@@ -6500,7 +6500,7 @@ FUN_0203CD20: ; 0x0203CD20
ldr r3, [sp, #0x4]
add r0, r4, #0x0
add r1, r7, #0x0
- bl FUN_022407F8
+ bl MOD06_022407F8
ldr r1, _0203CD8C ; =FUN_0203CD90
add r0, r5, #0x0
str r6, [r5, #0x64]
@@ -6522,7 +6522,7 @@ FUN_0203CD90: ; 0x0203CD90
lsr r1, r1, #0x10
bl FUN_020394B8
add r4, r0, #0x0
- bl FUN_02240844
+ bl MOD06_02240844
cmp r0, #0x0
bne _0203CDB0
mov r0, #0x0
@@ -6653,7 +6653,7 @@ FUN_0203CE8C: ; 0x0203CE8C
bl FUN_02034E30
bl FUN_02034DD0
ldr r0, [r0, #0x0]
- bl FUN_021E2608
+ bl MOD05_021E2608
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -6688,7 +6688,7 @@ FUN_0203CEBC: ; 0x0203CEBC
str r0, [sp, #0x0]
ldr r0, [sp, #0x4]
add r2, r4, #0x0
- bl FUN_021E2464
+ bl MOD05_021E2464
mov r0, #0x0
add sp, #0x8
pop {r3-r7, pc}
@@ -6971,7 +6971,7 @@ FUN_0203D140: ; 0x0203D140
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
- bl FUN_021F4DC8
+ bl MOD05_021F4DC8
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -6990,7 +6990,7 @@ FUN_0203D150: ; 0x0203D150
bl FUN_020394B8
add r5, r0, #0x0
add r0, r4, #0x0
- bl FUN_021F4D80
+ bl MOD05_021F4D80
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -7016,7 +7016,7 @@ FUN_0203D194: ; 0x0203D194
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
- bl FUN_021F4E7C
+ bl MOD05_021F4E7C
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -7094,7 +7094,7 @@ FUN_0203D214: ; 0x0203D214
bl FUN_020394B8
add r5, r0, #0x0
add r0, r4, #0x0
- bl FUN_021E85FC
+ bl MOD05_021E85FC
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -7104,7 +7104,7 @@ FUN_0203D214: ; 0x0203D214
FUN_0203D23C: ; 0x0203D23C
push {r3, lr}
ldr r0, [r0, #0x74]
- bl FUN_021E3424
+ bl MOD05_021E3424
mov r0, #0x1
pop {r3, pc}
@@ -8277,7 +8277,7 @@ FUN_0203DB88: ; 0x0203DB88
_0203DBC6:
add r0, r5, #0x0
add r1, r4, #0x0
- bl FUN_021F1EC0
+ bl MOD05_021F1EC0
mov r0, #0x0
pop {r4-r6, pc}
.balign 4
@@ -8340,7 +8340,7 @@ FUN_0203DC00: ; 0x0203DC00
ldr r0, [r5, #0x0]
add r1, r7, r1
add r2, r2, r4
- bl FUN_021DAE40
+ bl MOD05_021DAE40
mov r0, #0x0
pop {r3-r7, pc}
.balign 4
@@ -8354,7 +8354,7 @@ FUN_0203DC58: ; 0x0203DC58
add r0, #0x80
ldrb r1, [r2, #0x0]
ldr r0, [r0, #0x0]
- bl FUN_021DAF78
+ bl MOD05_021DAF78
mov r0, #0x1
pop {r3, pc}
.balign 4
@@ -8368,7 +8368,7 @@ FUN_0203DC70: ; 0x0203DC70
add r0, #0x80
ldrb r1, [r2, #0x0]
ldr r0, [r0, #0x0]
- bl FUN_021DAF98
+ bl MOD05_021DAF98
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -8382,7 +8382,7 @@ FUN_0203DC88: ; 0x0203DC88
add r0, #0x80
ldrb r1, [r2, #0x0]
ldr r0, [r0, #0x0]
- bl FUN_021DAED4
+ bl MOD05_021DAED4
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -8396,7 +8396,7 @@ FUN_0203DCA0: ; 0x0203DCA0
add r0, #0x80
ldrb r1, [r2, #0x0]
ldr r0, [r0, #0x0]
- bl FUN_021DAF28
+ bl MOD05_021DAF28
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -8416,7 +8416,7 @@ FUN_0203DCC8: ; 0x0203DCC8
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
- bl FUN_02241230
+ bl MOD06_02241230
mov r0, #0x1
pop {r3, pc}
.balign 4
@@ -8436,7 +8436,7 @@ FUN_0203DCE8: ; 0x0203DCE8
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
- bl FUN_02241914
+ bl MOD06_02241914
mov r0, #0x1
pop {r3, pc}
.balign 4
@@ -8488,7 +8488,7 @@ FUN_0203DD34: ; 0x0203DD34
str r1, [r0, #0x8]
ldrb r1, [r2, #0x0]
add r0, r3, #0x0
- bl FUN_02242A38
+ bl MOD06_02242A38
mov r0, #0x1
pop {r3, pc}
.balign 4
@@ -8536,7 +8536,7 @@ FUN_0203DD60: ; 0x0203DD60
add r2, r0, #0x0
ldr r1, [r1, #0x0]
add r0, r7, #0x0
- bl FUN_0224CA54
+ bl MOD18_0224CA54
str r0, [r4, #0x0]
ldr r1, _0203DDBC ; =FUN_0203DDC0
add r0, r5, #0x0
@@ -8564,7 +8564,7 @@ FUN_0203DDC0: ; 0x0203DDC0
bl FUN_020394B8
add r5, r0, #0x0
ldr r0, [r4, #0x0]
- bl FUN_0224CA2C
+ bl MOD18_0224CA2C
strh r0, [r5, #0x0]
ldrh r1, [r5, #0x0]
ldr r0, _0203DDFC ; =0x0000FFFE
@@ -8594,7 +8594,7 @@ FUN_0203DE00: ; 0x0203DE00
add r0, #0x80
ldr r0, [r0, #0x0]
bl FUN_020394F0
- bl FUN_0224CA58
+ bl MOD06_0224CA58
strb r0, [r4, #0x0]
ldr r1, _0203DE34 ; =FUN_0203DE38
add r0, r5, #0x0
@@ -8618,7 +8618,7 @@ FUN_0203DE38: ; 0x0203DE38
thumb_func_start FUN_0203DE4C
FUN_0203DE4C: ; 0x0203DE4C
push {r3, lr}
- bl FUN_0224CA94
+ bl MOD11_0224CA94
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -8638,7 +8638,7 @@ FUN_0203DE58: ; 0x0203DE58
bl FUN_020394F0
add r1, r0, #0x0
add r0, r5, #0x0
- bl FUN_0224CAA0
+ bl MOD18_0224CAA0
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
@@ -8658,7 +8658,7 @@ FUN_0203DE80: ; 0x0203DE80
bl FUN_020394F0
add r1, r0, #0x0
add r0, r5, #0x0
- bl FUN_0224CAB4
+ bl MOD18_0224CAB4
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
@@ -8673,7 +8673,7 @@ FUN_0203DEA8: ; 0x0203DEA8
mov r1, #0x1
ldr r0, [r0, #0x74]
add r2, r1, #0x0
- bl FUN_02242BE0
+ bl MOD06_02242BE0
mov r0, #0x1
add sp, #0x8
pop {r3, pc}
@@ -8812,7 +8812,7 @@ FUN_0203DFA8: ; 0x0203DFA8
add r5, r0, #0x0
bl FUN_0201B9EC
add r1, r5, #0x0
- blx _s32_div_f
+ bl _s32_div_f
strh r1, [r4, #0x0]
mov r0, #0x1
pop {r3-r5, pc}
@@ -8837,7 +8837,7 @@ FUN_0203DFE0: ; 0x0203DFE0
add r5, r0, #0x0
bl FUN_0201B9EC
add r1, r5, #0x0
- blx _s32_div_f
+ bl _s32_div_f
strh r1, [r4, #0x0]
mov r0, #0x1
pop {r3-r5, pc}
@@ -8864,7 +8864,7 @@ FUN_0203E018: ; 0x0203E018
bl FUN_020394F0
add r1, r0, #0x0
add r0, r4, #0x0
- bl FUN_021F3A18
+ bl MOD05_021F3A18
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@@ -8884,7 +8884,7 @@ FUN_0203E054: ; 0x0203E054
bl FUN_020394F0
add r1, r0, #0x0
add r0, r5, #0x0
- bl FUN_021F3AB4
+ bl MOD05_021F3AB4
mov r0, #0x0
pop {r3-r5, pc}
@@ -8922,7 +8922,7 @@ FUN_0203E078: ; 0x0203E078
add r0, r4, #0x0
lsr r1, r1, #0x18
lsr r2, r2, #0x18
- bl FUN_021F3B7C
+ bl MOD05_021F3B7C
mov r0, #0x0
pop {r3-r7, pc}
@@ -8960,7 +8960,7 @@ FUN_0203E0CC: ; 0x0203E0CC
add r0, r4, #0x0
lsr r1, r1, #0x18
lsr r2, r2, #0x18
- bl FUN_021F3B4C
+ bl MOD05_021F3B4C
mov r0, #0x0
pop {r3-r7, pc}
@@ -9394,7 +9394,7 @@ FUN_0203E4A0: ; 0x0203E4A0
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_0224CBB0
+ bl MOD06_0224CBB0
mov r0, #0x0
pop {r3, pc}
@@ -9412,7 +9412,7 @@ FUN_0203E4B0: ; 0x0203E4B0
add r4, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_0224CC24
+ bl MOD06_0224CC24
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -9642,7 +9642,7 @@ FUN_0203E684: ; 0x0203E684
add r6, r0, #0x0
ldr r0, [r5, #0x0]
add r1, r4, #0x0
- bl FUN_022456E8
+ bl MOD06_022456E8
strh r0, [r6, #0x0]
mov r0, #0x1
pop {r4-r6, pc}
@@ -9680,7 +9680,7 @@ FUN_0203E6C4: ; 0x0203E6C4
ldrh r1, [r4, #0x0]
ldr r0, [r5, #0x0]
add r2, r6, #0x0
- bl FUN_0224525C
+ bl MOD06_0224525C
mov r0, #0x1
pop {r4-r6, pc}
@@ -9701,7 +9701,7 @@ FUN_0203E6FC: ; 0x0203E6FC
add r4, r0, #0x0
ldr r0, [r5, #0x0]
add r1, r6, #0x0
- bl FUN_02245340
+ bl MOD06_02245340
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@@ -9765,7 +9765,7 @@ FUN_0203E774: ; 0x0203E774
add r4, r0, #0x0
bl FUN_0201B9EC
add r1, r4, #0x0
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r1, #0x10
lsr r6, r0, #0x10
ldr r0, [sp, #0x0]
@@ -9885,7 +9885,7 @@ FUN_0203E870: ; 0x0203E870
str r0, [r5, #0x8]
ldrb r1, [r1, #0x0]
mov r0, #0xb
- bl FUN_0224884C
+ bl MOD06_0224884C
str r0, [r4, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -9907,7 +9907,7 @@ FUN_0203E894: ; 0x0203E894
bl FUN_020394B8
add r5, r0, #0x0
ldr r0, [r4, #0x0]
- bl FUN_022488EC
+ bl MOD06_022488EC
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -9930,7 +9930,7 @@ FUN_0203E8C4: ; 0x0203E8C4
bl FUN_020394B8
add r5, r0, #0x0
ldr r0, [r4, #0x0]
- bl FUN_022488F4
+ bl MOD06_022488F4
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -9969,7 +9969,7 @@ FUN_0203E928: ; 0x0203E928
mov r1, #0x14
bl FUN_02039438
ldr r0, [r0, #0x0]
- bl FUN_022488CC
+ bl MOD06_022488CC
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -10144,7 +10144,7 @@ FUN_0203EA90: ; 0x0203EA90
bl FUN_020394B8
add r1, r0, #0x0
ldr r0, [r4, #0x74]
- bl FUN_022411F4
+ bl MOD06_022411F4
mov r0, #0x1
pop {r4, pc}
@@ -10187,10 +10187,10 @@ FUN_0203EAB0: ; 0x0203EAB0
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r5, #0x0
- bl FUN_021F61E8
+ bl MOD05_021F61E8
strh r0, [r4, #0x0]
add r0, r5, #0x0
- bl FUN_021F61DC
+ bl MOD05_021F61DC
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -10211,7 +10211,7 @@ FUN_0203EB20: ; 0x0203EB20
lsl r1, r1, #0x18
ldr r0, [r4, #0x0]
lsr r1, r1, #0x18
- bl FUN_0224C27C
+ bl MOD06_0224C27C
mov r0, #0x1
pop {r4, pc}
.balign 4
@@ -10241,7 +10241,7 @@ FUN_0203EB48: ; 0x0203EB48
ldr r0, [r5, #0x0]
lsr r1, r1, #0x18
lsr r2, r2, #0x18
- bl FUN_0224C520
+ bl MOD06_0224C520
mov r0, #0x1
pop {r3-r5, pc}
.balign 4
@@ -10349,7 +10349,7 @@ FUN_0203EBE4: ; 0x0203EBE4
ldr r2, [sp, #0x8]
ldr r3, [sp, #0xc]
add r1, r7, #0x0
- bl FUN_0224D14C
+ bl MOD06_0224D14C
add r5, r0, #0x0
mov r0, #0x0
mvn r0, r0
@@ -10415,7 +10415,7 @@ FUN_0203ECD8: ; 0x0203ECD8
str r1, [r0, #0x8]
ldrb r1, [r2, #0x0]
add r0, r3, #0x0
- bl FUN_0224C678
+ bl MOD06_0224C678
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -10431,7 +10431,7 @@ FUN_0203ECF4: ; 0x0203ECF4
str r1, [r0, #0x8]
ldrb r1, [r2, #0x0]
add r0, r3, #0x0
- bl FUN_0224C6E8
+ bl MOD06_0224C6E8
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -10447,7 +10447,7 @@ FUN_0203ED10: ; 0x0203ED10
str r1, [r0, #0x8]
ldrb r1, [r2, #0x0]
add r0, r3, #0x0
- bl FUN_0224C6F4
+ bl MOD06_0224C6F4
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -10521,7 +10521,7 @@ FUN_0203EDA4: ; 0x0203EDA4
add r5, #0x80
str r0, [r4, #0x0]
ldr r0, [r5, #0x0]
- bl FUN_021E7184
+ bl MOD05_021E7184
str r0, [r4, #0x0]
mov r0, #0x1
pop {r3-r5, pc}
@@ -10535,7 +10535,7 @@ FUN_0203EDC8: ; 0x0203EDC8
mov r1, #0x16
bl FUN_02039438
ldr r0, [r0, #0x0]
- bl FUN_021E71E8
+ bl MOD05_021E71E8
mov r0, #0x1
pop {r3, pc}
.balign 4
@@ -10555,7 +10555,7 @@ FUN_0203EDE0: ; 0x0203EDE0
lsl r1, r1, #0x18
ldr r0, [r4, #0x0]
lsr r1, r1, #0x18
- bl FUN_0224E554
+ bl MOD06_0224E554
mov r0, #0x1
pop {r4, pc}
.balign 4
@@ -10611,7 +10611,7 @@ FUN_0203EE58: ; 0x0203EE58
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
- bl FUN_0224E764
+ bl MOD06_0224E764
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -10621,7 +10621,7 @@ FUN_0203EE68: ; 0x0203EE68
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
- bl FUN_0224E7C4
+ bl MOD06_0224E7C4
mov r0, #0x1
pop {r3, pc}
.balign 4
@@ -11059,7 +11059,7 @@ _0203F1E0:
_0203F1F8:
bl FUN_0201B9EC
add r1, r6, #0x0
- blx _s32_div_f
+ bl _s32_div_f
mov r4, #0x0
add r2, sp, #0x4
_0203F206:
@@ -11485,7 +11485,7 @@ _0203F54C:
_0203F556:
bl FUN_0201B9EC
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
cmp r1, #0x19
bge _0203F568
ldr r7, _0203F5CC ; =0x0000010D
@@ -11493,7 +11493,7 @@ _0203F556:
_0203F568:
bl FUN_0201B9EC
mov r1, #0x6
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r1, #0x10
lsr r1, r0, #0x10
mov r0, #0x6
@@ -11900,7 +11900,7 @@ FUN_0203F880: ; 0x0203F880
_0203F8A2:
bl FUN_0201B9EC
mov r1, #0x65
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r1, #0x10
lsr r0, r0, #0x10
cmp r0, r4
@@ -11945,17 +11945,17 @@ FUN_0203F8C0: ; 0x0203F8C0
_0203F8FC:
mov r2, #0x0
mov r3, #0x20
- bl FUN_0224F12C
+ bl MOD06_0224F12C
b _0203F91E
_0203F906:
mov r2, #0x1
mov r3, #0x20
- bl FUN_0224F12C
+ bl MOD06_0224F12C
b _0203F91E
_0203F910:
mov r2, #0x2
mov r3, #0x20
- bl FUN_0224F12C
+ bl MOD06_0224F12C
b _0203F91E
_0203F91A:
bl ErrorHandling
@@ -12002,13 +12002,13 @@ FUN_0203F954: ; 0x0203F954
add r4, #0x80
ldr r0, [r4, #0x0]
ldr r0, [r0, #0x10]
- bl FUN_02239944
+ bl MOD06_02239944
b _0203F982
_0203F978:
add r4, #0x80
ldr r0, [r4, #0x0]
ldr r0, [r0, #0x10]
- bl FUN_02239AAC
+ bl MOD06_02239AAC
_0203F982:
mov r0, #0x1
pop {r4, pc}
@@ -12389,9 +12389,9 @@ FUN_0203FC80: ; 0x0203FC80
add r0, r5, #0x0
mov r1, #0x4
mov r2, #0x3
- bl FUN_021E8588
+ bl MOD05_021E8588
str r0, [r4, #0x0]
- bl FUN_021E84F4
+ bl MOD05_021E84F4
_0203FCAA:
mov r0, #0x0
pop {r3-r5, pc}
@@ -12411,9 +12411,9 @@ FUN_0203FCB0: ; 0x0203FCB0
cmp r0, #0x0
bne _0203FCD6
ldr r0, [r4, #0x0]
- bl FUN_021E856C
+ bl MOD05_021E856C
ldr r0, [r4, #0x0]
- bl FUN_021E85E4
+ bl MOD05_021E85E4
_0203FCD6:
mov r0, #0x0
pop {r3-r5, pc}
@@ -12535,7 +12535,7 @@ _0203FD8E:
ldr r0, [r7, #0x74]
add r7, #0x80
ldr r1, [r7, #0x0]
- bl FUN_0223D3D0
+ bl MOD06_0223D3D0
mov r0, #0x1
add sp, #0x84
pop {r4-r7, pc}
@@ -12574,7 +12574,7 @@ _0203FDE6:
ldr r2, [r2, r3]
ldr r1, [r4, #0x0]
mov r3, #0x0
- bl FUN_0223D3D0
+ bl MOD06_0223D3D0
mov r0, #0x1
add sp, #0x4
pop {r3-r4, pc}
@@ -12609,7 +12609,7 @@ _0203FE2A:
ldr r2, [r2, r3]
ldr r1, [r4, #0x0]
mov r3, #0x1
- bl FUN_0223D3D0
+ bl MOD06_0223D3D0
mov r0, #0x1
add sp, #0x4
pop {r3-r4, pc}
@@ -12637,7 +12637,7 @@ FUN_0203FE48: ; 0x0203FE48
ldr r2, [r2, r3]
ldr r1, [r4, #0x0]
mov r3, #0x2
- bl FUN_0223D3D0
+ bl MOD06_0223D3D0
mov r0, #0x1
add sp, #0x4
pop {r3-r4, pc}
@@ -13575,7 +13575,7 @@ FUN_02040638: ; 0x02040638
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x4]
ldr r0, [r0, #0x1c]
- bl FUN_021F4608
+ bl MOD05_021F4608
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -13587,7 +13587,7 @@ FUN_0204064C: ; 0x0204064C
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x4]
ldr r0, [r0, #0x1c]
- bl FUN_021F45E8
+ bl MOD05_021F45E8
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -13646,7 +13646,7 @@ _020406BA:
FUN_020406C0: ; 0x020406C0
push {r3, lr}
ldr r0, [r0, #0x74]
- bl FUN_0224D3E8
+ bl MOD06_0224D3E8
mov r0, #0x1
pop {r3, pc}
@@ -13994,11 +13994,11 @@ FUN_02040964: ; 0x02040964
bl FUN_020394F0
add r5, r0, #0x0
mov r1, #0x1e
- blx _s32_div_f
+ bl _s32_div_f
add r7, r0, #0x0
add r0, r5, #0x0
mov r1, #0x1e
- blx _s32_div_f
+ bl _s32_div_f
add r2, r1, #0x0
ldr r0, [sp, #0x0]
add r1, r7, #0x0
@@ -15183,14 +15183,14 @@ FUN_02041354: ; 0x02041354
_02041360:
add r0, r5, #0x0
mov r1, #0xa
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r1, #0x10
lsr r0, r0, #0x10
str r1, [sp, #0x0]
str r0, [sp, #0x4]
add r0, r4, #0x0
mov r1, #0xa
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r1, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x8]
@@ -15199,12 +15199,12 @@ _02041360:
bne _020413AC
add r0, r5, #0x0
mov r1, #0xa
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r4, #0x0
mov r1, #0xa
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r6, #0x1
@@ -16556,7 +16556,7 @@ _02041E68:
add r4, #0x80
add r5, r0, #0x0
ldr r0, [r4, #0x0]
- bl FUN_02248CD0
+ bl MOD06_02248CD0
strh r0, [r5, #0x0]
b _02041FD2
_02041E88:
@@ -16584,7 +16584,7 @@ _02041E88:
strh r0, [r5, #0x0]
ldr r0, [r4, #0x0]
add r1, r7, #0x0
- bl FUN_02249038
+ bl MOD06_02249038
strh r0, [r6, #0x0]
b _02041FD2
_02041ECA:
@@ -16623,12 +16623,12 @@ _02041ECA:
ldr r1, [r5, #0x0]
add r2, r6, #0x0
add r3, r7, #0x0
- bl FUN_022490A0
+ bl MOD06_022490A0
b _02041FD2
_02041F24:
add r4, #0x80
ldr r0, [r4, #0x0]
- bl FUN_02248CC0
+ bl MOD06_02248CC0
b _02041FD2
_02041F2E:
add r0, r4, #0x0
@@ -16652,7 +16652,7 @@ _02041F2E:
add r4, #0x80
strh r0, [r5, #0x0]
ldr r0, [r4, #0x0]
- bl FUN_022491FC
+ bl MOD06_022491FC
strh r0, [r6, #0x0]
b _02041FD2
_02041F68:
@@ -16684,7 +16684,7 @@ _02041F68:
ldr r0, [r4, #0x0]
add r1, r6, #0x0
add r2, r7, #0x0
- bl FUN_02248F70
+ bl MOD06_02248F70
strh r0, [r5, #0x0]
b _02041FD2
_02041FB4:
@@ -16698,7 +16698,7 @@ _02041FB4:
add r4, #0x80
add r5, r0, #0x0
ldr r0, [r4, #0x0]
- bl FUN_02248FE0
+ bl MOD06_02248FE0
strh r0, [r5, #0x0]
_02041FD2:
mov r0, #0x0
@@ -17053,7 +17053,7 @@ FUN_020422A8: ; 0x020422A8
ldr r0, [r0, #0x4]
add r4, r1, #0x0
ldr r0, [r0, #0x14]
- bl FUN_02252538
+ bl MOD20_02252538
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x0
@@ -17145,7 +17145,7 @@ FUN_02042354: ; 0x02042354
add r0, #0x80
ldr r0, [r0, #0x0]
add r0, #0xa8
- bl FUN_022434BC
+ bl MOD06_022434BC
mov r0, #0x0
pop {r3, pc}
@@ -17164,7 +17164,7 @@ FUN_02042364: ; 0x02042364
bl FUN_020377AC
add r1, r4, #0x0
add r2, r6, #0x0
- bl FUN_022434D0
+ bl MOD06_022434D0
add r5, #0x80
ldr r1, [r5, #0x0]
add r1, #0xa8
@@ -17180,7 +17180,7 @@ FUN_02042394: ; 0x02042394
ldr r0, [r0, #0x0]
add r0, #0xa8
ldr r0, [r0, #0x0]
- bl FUN_02243694
+ bl MOD06_02243694
add r4, #0x80
ldr r1, [r4, #0x0]
mov r0, #0x0
@@ -17333,7 +17333,7 @@ _02042406: ; jump table (using 16-bit offset)
.short _020426E6 - _02042406 - 2; case 100
_020424D0:
add r0, r6, #0x0
- bl FUN_0224312C
+ bl MOD06_0224312C
strh r0, [r4, #0x0]
b _020426FA
_020424DA:
@@ -17341,76 +17341,76 @@ _020424DA:
bne _020424EA
ldrb r0, [r5, #0xe]
ldr r1, [r1, #0xc]
- bl FUN_022432E4
+ bl MOD06_022432E4
strh r0, [r4, #0x0]
b _020426FA
_020424EA:
ldr r1, [r1, #0xc]
add r0, r6, #0x0
- bl FUN_022432E4
+ bl MOD06_022432E4
strh r0, [r4, #0x0]
b _020426FA
_020424F6:
- bl FUN_0224339C
+ bl MOD06_0224339C
b _020426FA
_020424FC:
ldr r0, [r1, #0xc]
bl FUN_0202A8CC
- bl FUN_022433A8
+ bl MOD06_022433A8
b _020426FA
_02042508:
ldr r0, [r1, #0xc]
bl FUN_0202A8CC
- bl FUN_022433B0
+ bl MOD06_022433B0
strh r0, [r4, #0x0]
b _020426FA
_02042516:
add r0, r1, #0x0
- bl FUN_022433B8
+ bl MOD06_022433B8
b _020426FA
_0204251E:
add r0, r1, #0x0
- bl FUN_022433F8
+ bl MOD06_022433F8
b _020426FA
_02042526:
ldr r0, [r1, #0xc]
add r1, r6, #0x0
- bl FUN_02243408
+ bl MOD06_02243408
strh r0, [r4, #0x0]
b _020426FA
_02042532:
ldr r1, [r1, #0xc]
mov r0, #0x0
mov r2, #0x2
- bl FUN_02243E74
+ bl MOD06_02243E74
strh r0, [r4, #0x0]
b _020426FA
_02042540:
mov r0, #0x0
ldr r1, [r1, #0xc]
add r2, r0, #0x0
- bl FUN_02243E74
+ bl MOD06_02243E74
strh r0, [r4, #0x0]
b _020426FA
_0204254E:
ldr r0, [r1, #0xc]
lsl r1, r6, #0x18
lsr r1, r1, #0x18
- bl FUN_02243428
+ bl MOD06_02243428
b _020426FA
_0204255A:
ldr r0, [r1, #0xc]
- bl FUN_02243448
+ bl MOD06_02243448
strh r0, [r4, #0x0]
b _020426FA
_02042564:
ldr r0, [r1, #0xc]
- bl FUN_0224345C
+ bl MOD06_0224345C
strh r0, [r4, #0x0]
b _020426FA
_0204256E:
ldr r0, [r1, #0xc]
- bl FUN_022434AC
+ bl MOD06_022434AC
strh r0, [r4, #0x0]
b _020426FA
_02042578:
@@ -17429,7 +17429,7 @@ _0204258A:
add r2, r0, #0x0
ldr r1, [r7, #0x74]
add r0, r5, #0x0
- bl FUN_022436C8
+ bl MOD06_022436C8
add sp, #0x8
mov r0, #0x1
pop {r3-r7, pc}
@@ -17442,60 +17442,60 @@ _020425A2:
add r1, r0, #0x0
ldr r2, [r2, #0xc]
add r0, r5, #0x0
- bl FUN_022436E8
+ bl MOD06_022436E8
strh r0, [r4, #0x0]
b _020426FA
_020425BC:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
- bl FUN_02243780
+ bl MOD06_02243780
strh r0, [r4, #0x0]
b _020426FA
_020425C8:
add r0, r5, #0x0
- bl FUN_022438DC
+ bl MOD06_022438DC
strh r0, [r4, #0x0]
b _020426FA
_020425D2:
add r0, r5, #0x0
- bl FUN_022438E0
+ bl MOD06_022438E0
strh r0, [r4, #0x0]
b _020426FA
_020425DC:
add r0, r5, #0x0
- bl FUN_022438FC
+ bl MOD06_022438FC
strh r0, [r4, #0x0]
b _020426FA
_020425E6:
add r0, r5, #0x0
- bl FUN_02243920
+ bl MOD06_02243920
strh r0, [r4, #0x0]
b _020426FA
_020425F0:
add r0, r5, #0x0
- bl FUN_022439F8
+ bl MOD06_022439F8
b _020426FA
_020425F8:
add r0, r5, #0x0
- bl FUN_02243AD8
+ bl MOD06_02243AD8
b _020426FA
_02042600:
add r0, r5, #0x0
- bl FUN_02243BA8
+ bl MOD06_02243BA8
b _020426FA
_02042608:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
- bl FUN_02243C5C
+ bl MOD06_02243C5C
b _020426FA
_02042612:
add r0, r5, #0x0
- bl FUN_02243D3C
+ bl MOD06_02243D3C
b _020426FA
_0204261A:
add r0, r5, #0x0
add r1, r6, #0x0
- bl FUN_02243DA0
+ bl MOD06_02243DA0
strh r0, [r4, #0x0]
b _020426FA
_02042626:
@@ -17507,45 +17507,45 @@ _02042626:
ldr r0, [r7, #0x0]
add r1, r5, #0x0
ldr r0, [r0, #0x10]
- bl FUN_02243DB8
+ bl MOD06_02243DB8
add sp, #0x8
mov r0, #0x1
pop {r3-r7, pc}
_02042642:
add r0, r5, #0x0
- bl FUN_02243DC0
+ bl MOD06_02243DC0
strh r0, [r4, #0x0]
b _020426FA
_0204264C:
add r0, r5, #0x0
add r1, r6, #0x0
- bl FUN_02243DC4
+ bl MOD06_02243DC4
b _020426FA
_02042656:
add r0, r5, #0x0
- bl FUN_02243DD8
+ bl MOD06_02243DD8
strh r0, [r4, #0x0]
b _020426FA
_02042660:
add r0, r5, #0x0
- bl FUN_02243DE0
+ bl MOD06_02243DE0
strh r0, [r4, #0x0]
b _020426FA
_0204266A:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
- bl FUN_02243E34
+ bl MOD06_02243E34
b _020426FA
_02042674:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
- bl FUN_02243F18
+ bl MOD06_02243F18
strh r0, [r4, #0x0]
b _020426FA
_02042680:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
- bl FUN_02243F50
+ bl MOD06_02243F50
strh r0, [r4, #0x0]
b _020426FA
_0204268C:
@@ -17568,7 +17568,7 @@ _020426A0:
_020426AA:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
- bl FUN_02243838
+ bl MOD06_02243838
b _020426FA
_020426B4:
add r0, r5, r6
@@ -17580,7 +17580,7 @@ _020426BE:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
mov r2, #0x1
- bl FUN_02243E74
+ bl MOD06_02243E74
strh r0, [r4, #0x0]
b _020426FA
_020426CC:
@@ -17593,7 +17593,7 @@ _020426CC:
_020426DA:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
- bl FUN_02243F9C
+ bl MOD06_02243F9C
strh r0, [r4, #0x0]
b _020426FA
_020426E6:
@@ -17741,7 +17741,7 @@ FUN_020427D0: ; 0x020427D0
ldr r0, _0204285C ; =0x00000884
mov r2, #0x46
add r0, r6, r0
- blx MI_CpuFill8
+ bl MI_CpuFill8
cmp r4, #0x0
beq _0204281E
cmp r4, #0x1
@@ -17756,14 +17756,14 @@ _0204281E:
add r0, #0xa8
ldr r0, [r0, #0x0]
ldr r1, [r1, #0xc]
- bl FUN_022446FC
+ bl MOD06_022446FC
b _0204284C
_02042830:
add r5, #0x80
ldr r0, [r5, #0x0]
add r0, #0xa8
ldr r0, [r0, #0x0]
- bl FUN_02244758
+ bl MOD06_02244758
b _0204284C
_0204283E:
add r5, #0x80
@@ -17771,7 +17771,7 @@ _0204283E:
add r1, r7, #0x0
add r0, #0xa8
ldr r0, [r0, #0x0]
- bl FUN_02244770
+ bl MOD06_02244770
_0204284C:
bl FUN_02031190
ldr r1, _02042860 ; =0x0000083E
@@ -17924,7 +17924,7 @@ FUN_02042950: ; 0x02042950
ldr r0, [r5, #0x0]
add r1, r6, #0x0
add r2, r4, #0x0
- bl FUN_021E2A70
+ bl MOD05_021E2A70
str r0, [r7, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -17937,7 +17937,7 @@ FUN_02042980: ; 0x02042980
mov r1, #0x26
bl FUN_02039438
ldr r0, [r0, #0x0]
- bl FUN_021E29B4
+ bl MOD05_021E29B4
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -17954,7 +17954,7 @@ FUN_02042998: ; 0x02042998
add r4, #0x80
ldr r0, [r4, #0x0]
ldr r1, [r1, #0x0]
- bl FUN_021E2AD4
+ bl MOD05_021E2AD4
mov r0, #0x0
pop {r4, pc}
.balign 4
@@ -18698,7 +18698,7 @@ FUN_02042F6C: ; 0x02042F6C
add r2, r7, #0x0
bl FUN_020671BC
add r6, r0, #0x0
- blx OS_GetTick
+ bl OS_GetTick
bl FUN_0201BA10
add r1, r0, #0x0
ldr r0, [sp, #0x14]
@@ -20033,7 +20033,7 @@ FUN_02043A44: ; 0x02043A44
ldr r0, [r4, #0x0]
lsr r1, r1, #0x18
lsr r2, r2, #0x18
- bl FUN_021E2950
+ bl MOD05_021E2950
str r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -20046,7 +20046,7 @@ FUN_02043A94: ; 0x02043A94
mov r1, #0x26
bl FUN_02039438
ldr r0, [r0, #0x0]
- bl FUN_021E29B4
+ bl MOD05_021E29B4
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -20063,7 +20063,7 @@ FUN_02043AAC: ; 0x02043AAC
add r4, #0x80
ldr r0, [r4, #0x0]
ldr r1, [r1, #0x0]
- bl FUN_021E29C8
+ bl MOD05_021E29C8
mov r0, #0x0
pop {r4, pc}
.balign 4
@@ -20423,7 +20423,7 @@ FUN_02043D78: ; 0x02043D78
ldr r0, [r4, #0x0]
lsr r1, r1, #0x18
lsr r2, r2, #0x18
- bl FUN_021E27E8
+ bl MOD05_021E27E8
str r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -20436,7 +20436,7 @@ FUN_02043DC8: ; 0x02043DC8
mov r1, #0x27
bl FUN_02039438
ldr r0, [r0, #0x0]
- bl FUN_021E288C
+ bl MOD05_021E288C
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -20453,7 +20453,7 @@ FUN_02043DE0: ; 0x02043DE0
add r4, #0x80
ldr r0, [r4, #0x0]
ldr r1, [r1, #0x0]
- bl FUN_021E28A0
+ bl MOD05_021E28A0
mov r0, #0x0
pop {r4, pc}
.balign 4
@@ -20470,7 +20470,7 @@ FUN_02043E00: ; 0x02043E00
add r0, r5, #0x0
bl FUN_02023D58
ldr r1, [r4, #0x0]
- bl FUN_021ED4E0
+ bl MOD05_021ED4E0
mov r0, #0x0
pop {r3-r5, pc}
@@ -20491,7 +20491,7 @@ FUN_02043E20: ; 0x02043E20
add r0, r4, #0x0
mov r1, #0x8
bl FUN_02022610
- bl FUN_021ED5EC
+ bl MOD05_021ED5EC
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -20505,7 +20505,7 @@ FUN_02043E50: ; 0x02043E50
mov r1, #0x8
ldr r0, [r0, #0xc]
bl FUN_02022610
- bl FUN_021ECD64
+ bl MOD05_021ECD64
mov r0, #0x0
pop {r3, pc}
.balign 4
@@ -20530,7 +20530,7 @@ FUN_02043E68: ; 0x02043E68
add r2, r0, #0x0
add r0, r6, #0x0
add r1, r5, #0x0
- bl FUN_021ED0CC
+ bl MOD05_021ED0CC
mov r0, #0x0
pop {r4-r6, pc}
@@ -20570,7 +20570,7 @@ FUN_02043E9C: ; 0x02043E9C
ldr r1, [r7, #0x0]
add r2, r6, #0x0
lsr r3, r3, #0x18
- bl FUN_021EC71C
+ bl MOD05_021EC71C
ldr r1, [sp, #0x0]
strh r0, [r1, #0x0]
mov r0, #0x0
@@ -20609,7 +20609,7 @@ FUN_02043EFC: ; 0x02043EFC
lsl r1, r4, #0x18
ldr r2, [r7, #0x0]
lsr r1, r1, #0x18
- bl FUN_021EC854
+ bl MOD05_021EC854
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -20645,7 +20645,7 @@ FUN_02043F50: ; 0x02043F50
bl FUN_02022610
ldr r2, [r6, #0x0]
add r1, r5, #0x0
- bl FUN_021EC864
+ bl MOD05_021EC864
strh r0, [r7, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -20682,7 +20682,7 @@ FUN_02043FA0: ; 0x02043FA0
bl FUN_0206BB1C
ldr r2, [r6, #0x0]
add r1, r7, #0x0
- bl FUN_021ED5C4
+ bl MOD05_021ED5C4
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -20713,7 +20713,7 @@ FUN_02043FF4: ; 0x02043FF4
add r0, r4, #0x0
lsr r1, r1, #0x18
add r3, r5, #0x0
- bl FUN_021EC57C
+ bl MOD05_021EC57C
mov r0, #0x0
pop {r4-r6, pc}
.balign 4
@@ -20775,7 +20775,7 @@ FUN_02044034: ; 0x02044034
lsr r1, r1, #0x18
lsr r2, r2, #0x18
lsr r3, r3, #0x18
- bl FUN_021ED52C
+ bl MOD05_021ED52C
mov r0, #0x0
add sp, #0x10
pop {r3-r7, pc}
@@ -20797,7 +20797,7 @@ FUN_020440C0: ; 0x020440C0
add r0, r4, #0x0
mov r1, #0x8
bl FUN_02022610
- bl FUN_021ED644
+ bl MOD05_021ED644
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -20914,7 +20914,7 @@ FUN_02044198: ; 0x02044198
add r5, r0, #0x0
bl FUN_0201B9EC
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r1, #0x10
lsr r0, r0, #0x10
cmp r0, #0xf
@@ -21263,7 +21263,7 @@ FUN_02044414: ; 0x02044414
add r0, r4, #0x0
mov r2, #0x1
add r3, r7, #0x0
- bl FUN_021ECF14
+ bl MOD05_021ECF14
add r0, r6, #0x0
add r1, r4, #0x0
bl FUN_0206B900
@@ -21824,7 +21824,7 @@ FUN_020448D4: ; 0x020448D4
mov r0, #0x96
mul r0, r4
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r4, r0, #0x10
_0204495A:
diff --git a/arm9/asm/secure.s b/arm9/asm/secure.s
index 632f43bc..f97ccac8 100644
--- a/arm9/asm/secure.s
+++ b/arm9/asm/secure.s
@@ -3,7 +3,14 @@
.section .text
-.incbin "baserom.nds", 0x4000, 0x19E
+.incbin "baserom.nds", 0x4000, 0xC8
+ non_word_aligned_thumb_func_start SVC_GetCRC16
+SVC_GetCRC16: ; 0x020000C8
+ swi 14
+ bx lr
+ thumb_func_end SVC_GetCRC16
+
+.incbin "baserom.nds", 0x40CC, 0xD2
non_word_aligned_thumb_func_start SVC_Sqrt
SVC_Sqrt: ; 0x0200019E
diff --git a/arm9/asm/unk_02000E0C.s b/arm9/asm/unk_02000E0C.s
index 9c67c9fd..15275ac8 100644
--- a/arm9/asm/unk_02000E0C.s
+++ b/arm9/asm/unk_02000E0C.s
@@ -2,337 +2,8 @@
.include "global.inc"
.text
-
- thumb_func_start FUN_02000E0C
-FUN_02000E0C: ; 0x02000E0C
- push {r3, lr}
- ldr r0, _02000E74 ; =0x02106FA0
- ldr r1, [r0, #0xc]
- cmp r1, #0x0
- bne _02000E4A
- ldr r1, [r0, #0x14]
- cmp r1, #0x0
- beq _02000E70
- mov r1, #0x0
- ldr r0, [r0, #0x10]
- mvn r1, r1
- cmp r0, r1
- beq _02000E2C
- mov r1, #0x0
- bl HandleLoadOverlay
-_02000E2C:
- ldr r0, _02000E74 ; =0x02106FA0
- mov r2, #0x0
- ldr r1, [r0, #0x10]
- str r1, [r0, #0x8]
- ldr r0, [r0, #0x14]
- ldr r1, _02000E78 ; =0x02106FB8
- bl FUN_02006234
- ldr r1, _02000E74 ; =0x02106FA0
- str r0, [r1, #0xc]
- mov r0, #0x0
- mvn r0, r0
- str r0, [r1, #0x10]
- mov r0, #0x0
- str r0, [r1, #0x14]
-_02000E4A:
- ldr r0, _02000E74 ; =0x02106FA0
- ldr r0, [r0, #0xc]
- bl FUN_02006290
- cmp r0, #0x0
- beq _02000E70
- ldr r0, _02000E74 ; =0x02106FA0
- ldr r0, [r0, #0xc]
- bl FUN_02006260
- ldr r0, _02000E74 ; =0x02106FA0
- mov r1, #0x0
- str r1, [r0, #0xc]
- ldr r0, [r0, #0x8]
- sub r1, r1, #0x1
- cmp r0, r1
- beq _02000E70
- bl UnloadOverlayByID
-_02000E70:
- pop {r3, pc}
- nop
-_02000E74: .word 0x02106FA0
-_02000E78: .word 0x02106FB8
-
- thumb_func_start FUN_02000E7C
-FUN_02000E7C: ; 0x02000E7C
- push {r3-r5, lr}
- add r5, r0, #0x0
- ldr r0, _02000E98 ; =0x02106FA0
- add r4, r1, #0x0
- ldr r0, [r0, #0x14]
- cmp r0, #0x0
- beq _02000E8E
- bl ErrorHandling
-_02000E8E:
- ldr r0, _02000E98 ; =0x02106FA0
- str r5, [r0, #0x10]
- str r4, [r0, #0x14]
- pop {r3-r5, pc}
- nop
-_02000E98: .word 0x02106FA0
-
- thumb_func_start FUN_02000E9C
-FUN_02000E9C: ; 0x02000E9C
- push {r3, lr}
- bl FUN_0202FB80
- mov r0, #0x1
- add r1, r0, #0x0
- blx OS_WaitIrq
- ldr r0, _02000EC4 ; =0x021C48B8
- ldr r1, [r0, #0x2c]
- add r1, r1, #0x1
- str r1, [r0, #0x2c]
- mov r1, #0x0
- str r1, [r0, #0x30]
- ldr r1, [r0, #0x0]
- cmp r1, #0x0
- beq _02000EC0
- ldr r0, [r0, #0x4]
- blx r1
-_02000EC0:
- pop {r3, pc}
- nop
-_02000EC4: .word 0x021C48B8
-
- thumb_func_start FUN_02000EC8
-FUN_02000EC8: ; 0x02000EC8
- push {r4, lr}
- add r4, r0, #0x0
- bl FUN_02033678
- cmp r0, #0x0
- beq _02000EE2
- blx CARD_TryWaitBackupAsync
- cmp r0, #0x1
- bne _02000EE2
- add r0, r4, #0x0
- blx OS_ResetSystem
-_02000EE2:
- bl FUN_02000E9C
- pop {r4, pc}
-
- thumb_func_start FUN_02000EE8
-FUN_02000EE8: ; 0x02000EE8
- push {r3, lr}
- bl FUN_020335B8
- add r1, r0, #0x0
- cmp r1, #0x1
- beq _02000EFE
- cmp r1, #0x2
- beq _02000F06
- cmp r1, #0x3
- beq _02000F0E
- pop {r3, pc}
-_02000EFE:
- mov r0, #0x1
- bl FUN_02000F4C
- pop {r3, pc}
-_02000F06:
- mov r0, #0x0
- bl FUN_02000F4C
- pop {r3, pc}
-_02000F0E:
- mov r0, #0x1
- bl FUN_02000F4C
- pop {r3, pc}
- .balign 4
-
- thumb_func_start FUN_02000F18
-FUN_02000F18: ; 0x02000F18
- push {r4, lr}
- ldr r1, _02000F48 ; =0x00007FFF
- add r4, r0, #0x0
- mov r0, #0x0
- bl FUN_0200E3A0
- ldr r1, _02000F48 ; =0x00007FFF
- mov r0, #0x1
- bl FUN_0200E3A0
- bl FUN_02032DAC
- cmp r0, #0x0
- beq _02000F3C
- bl FUN_020225F8
- bl FUN_0202287C
-_02000F3C:
- bl FUN_02000FE8
- add r0, r4, #0x0
- bl FUN_02000EC8
- b _02000F3C
- .balign 4
-_02000F48: .word 0x00007FFF
-
- thumb_func_start FUN_02000F4C
-FUN_02000F4C: ; 0x02000F4C
- push {r4-r6, lr}
- add r6, r0, #0x0
- cmp r1, #0x3
- bne _02000F60
- mov r0, #0x0
- mov r1, #0x3
- add r2, r0, #0x0
- bl FUN_02033F70
- b _02000F7A
-_02000F60:
- cmp r6, #0x0
- bne _02000F70
- mov r0, #0x0
- mov r1, #0x2
- add r2, r0, #0x0
- bl FUN_02033F70
- b _02000F7A
-_02000F70:
- mov r0, #0x0
- add r1, r0, #0x0
- add r2, r0, #0x0
- bl FUN_02033F70
-_02000F7A:
- bl FUN_02032DAC
- ldr r5, _02000FA0 ; =0x021C48B8
- mov r4, #0x1
-_02000F82:
- bl FUN_02000FE8
- bl FUN_02016464
- ldr r0, [r5, #0x48]
- tst r0, r4
- bne _02000F96
- bl FUN_02000E9C
- b _02000F82
-_02000F96:
- add r0, r6, #0x0
- bl FUN_02000F18
- pop {r4-r6, pc}
- nop
-_02000FA0: .word 0x021C48B8
-
- thumb_func_start FUN_02000FA4
-FUN_02000FA4: ; 0x02000FA4
- push {r4-r5, lr}
- sub sp, #0x1c
- add r0, sp, #0xc
- add r1, sp, #0x0
- bl FUN_0201265C
- ldr r0, _02000FE4 ; =0x021C48B8
- ldr r3, [sp, #0x10]
- ldr r4, [r0, #0x2c]
- ldr r1, [sp, #0x4]
- ldr r0, [sp, #0x8]
- ldr r5, [sp, #0x14]
- add r0, r1, r0
- lsl r2, r0, #0x18
- ldr r0, [sp, #0x0]
- lsl r3, r3, #0x8
- lsl r1, r0, #0x10
- mul r3, r5
- ldr r0, [sp, #0xc]
- lsl r3, r3, #0x10
- add r0, r0, r3
- add r0, r1, r0
- add r5, r2, r0
- add r0, r4, r5
- bl FUN_0201BA1C
- add r0, r4, r5
- bl FUN_0201B9E0
- add sp, #0x1c
- pop {r4-r5, pc}
- nop
-_02000FE4: .word 0x021C48B8
-
- thumb_func_start FUN_02000FE8
-FUN_02000FE8: ; 0x02000FE8
- push {r3-r7, lr}
- sub sp, #0x8
- ldr r0, _0200109C ; =0x027FFFA8
- ldrh r1, [r0, #0x0]
- mov r0, #0x2
- lsl r0, r0, #0xe
- and r0, r1
- asr r0, r0, #0xf
- beq _0200107E
- ldr r0, _020010A0 ; =0x021C4918
- ldrb r0, [r0, #0x7]
- cmp r0, #0x0
- bne _02001064
- bl FUN_0201CE04
- blx CTRDG_IsPulledOut
- cmp r0, #0x1
- bne _02001014
- ldr r0, _020010A4 ; =0x02106FA0
- mov r1, #0x1
- str r1, [r0, #0x4]
-_02001014:
- ldr r6, _020010A4 ; =0x02106FA0
- mov r0, #0xc
- ldr r1, [r6, #0x4]
- ldr r4, _0200109C ; =0x027FFFA8
- mov r2, #0x10
- add r5, r0, #0x0
- ldr r7, _020010A0 ; =0x021C4918
- orr r5, r2
-_02001024:
- ldrb r2, [r7, #0x6]
- mov r0, #0xc
- cmp r2, #0x0
- beq _02001032
- cmp r1, #0x0
- bne _02001032
- add r0, r5, #0x0
-_02001032:
- mov r1, #0x0
- add r2, r1, #0x0
- blx PM_GoSleepMode
- blx CARD_IsPulledOut
- cmp r0, #0x0
- beq _02001048
- blx PM_ForceToPowerOff
- b _0200105C
-_02001048:
- ldrh r1, [r4, #0x0]
- mov r0, #0x2
- lsl r0, r0, #0xe
- and r0, r1
- asr r0, r0, #0xf
- beq _0200105C
- mov r0, #0x1
- str r0, [r6, #0x4]
- add r1, r0, #0x0
- b _02001024
-_0200105C:
- bl FUN_0201CDD0
- add sp, #0x8
- pop {r3-r7, pc}
-_02001064:
- add r0, sp, #0x4
- add r1, sp, #0x0
- blx PM_GetBackLight
- ldr r0, [sp, #0x4]
- cmp r0, #0x1
- bne _02001096
- mov r0, #0x2
- mov r1, #0x0
- blx PM_SetBackLight
- add sp, #0x8
- pop {r3-r7, pc}
-_0200107E:
- add r0, sp, #0x4
- add r1, sp, #0x0
- blx PM_GetBackLight
- ldr r0, [sp, #0x4]
- cmp r0, #0x0
- bne _02001096
- ldr r1, _020010A4 ; =0x02106FA0
- mov r0, #0x2
- ldr r1, [r1, #0x0]
- blx PM_SetBackLight
-_02001096:
- add sp, #0x8
- pop {r3-r7, pc}
- nop
-_0200109C: .word 0x027FFFA8
-_020010A0: .word 0x021C4918
-_020010A4: .word 0x02106FA0
+ .extern FUN_02000E9C
+ .extern FUN_02000EC8
thumb_func_start FUN_020010A8
FUN_020010A8: ; 0x020010A8
@@ -2291,7 +1962,7 @@ _02001ECE:
ldrb r4, [r5, #0x15]
add r1, r6, #0x0
add r0, r4, #0x0
- blx _s32_div_f
+ bl _s32_div_f
cmp r1, #0x0
bne _02001EF2
ldrb r0, [r5, #0xb]
@@ -2323,7 +1994,7 @@ _02001F08:
ldrb r6, [r5, #0x15]
sub r4, r1, #0x1
add r0, r6, #0x0
- blx _s32_div_f
+ bl _s32_div_f
cmp r4, r1
bne _02001F2A
ldrb r0, [r5, #0xb]
@@ -2393,7 +2064,7 @@ _02001F72:
mov r0, #0x0
pop {r4-r6, pc}
_02001F8A:
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r1, #0x18
asr r2, r0, #0x18
b _02001F9A
@@ -2563,7 +2234,7 @@ FUN_020020B0: ; 0x020020B0
ldrb r1, [r5, #0xa]
add r0, r7, #0x0
add r6, r2, #0x0
- blx _s32_div_f
+ bl _s32_div_f
ldrb r2, [r5, #0x19]
ldrb r1, [r5, #0x16]
lsl r2, r2, #0x1
@@ -2572,7 +2243,7 @@ FUN_020020B0: ; 0x020020B0
strb r1, [r4, #0x0]
ldrb r1, [r5, #0xa]
add r0, r7, #0x0
- blx _s32_div_f
+ bl _s32_div_f
ldrb r2, [r5, #0xb]
ldrb r3, [r5, #0x1a]
ldrb r0, [r5, #0x18]
diff --git a/arm9/asm/unk_020023C0.s b/arm9/asm/unk_020023C0.s
index 0e8dfbdf..3295bcc9 100644
--- a/arm9/asm/unk_020023C0.s
+++ b/arm9/asm/unk_020023C0.s
@@ -1631,7 +1631,7 @@ FUN_02002FD0: ; 0x02002FD0
mov r1, #0x0
lsl r2, r2, #0x4
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r4, #0x0
pop {r4, pc}
.balign 4
@@ -1710,13 +1710,13 @@ FUN_02003054: ; 0x02003054
lsl r4, r3, #0x1
add r1, r1, r4
add r2, r7, #0x0
- blx MIi_CpuCopy16
+ bl MIi_CpuCopy16
add r1, r5, r6
ldr r1, [r1, #0x4]
ldr r0, [sp, #0x0]
add r1, r1, r4
add r2, r7, #0x0
- blx MIi_CpuCopy16
+ bl MIi_CpuCopy16
pop {r3-r7, pc}
.balign 4
@@ -1876,7 +1876,7 @@ _0200319A:
lsl r0, r0, #0x1
add r0, r1, r0
ldr r1, [sp, #0x14]
- blx MIi_CpuCopy16
+ bl MIi_CpuCopy16
add r0, r4, #0x0
bl FUN_02016A18
pop {r3-r5, pc}
@@ -1904,7 +1904,7 @@ FUN_020031B8: ; 0x020031B8
ldr r1, [r5, r6]
add r0, r0, r4
add r1, r1, r7
- blx MIi_CpuCopy16
+ bl MIi_CpuCopy16
ldr r0, [sp, #0x4]
add r1, r5, r6
ldr r0, [r5, r0]
@@ -1912,7 +1912,7 @@ FUN_020031B8: ; 0x020031B8
ldr r2, [sp, #0x0]
add r0, r0, r4
add r1, r1, r7
- blx MIi_CpuCopy16
+ bl MIi_CpuCopy16
add sp, #0x8
pop {r3-r7, pc}
.balign 4
@@ -2156,7 +2156,7 @@ FUN_020033A4: ; 0x020033A4
cmp r2, #0x0
bge _020033D4
add r0, r2, #0x0
- blx abs
+ bl abs
add r0, r0, #0x2
ldrh r1, [r5, #0x6]
mov r2, #0xf
@@ -2659,7 +2659,7 @@ _02003750:
_02003770:
ldr r0, [r4, #0x4]
ldr r1, [r4, #0x8]
- blx DC_FlushRange
+ bl DC_FlushRange
cmp r5, #0xd
bls _0200377E
_0200377C:
@@ -2690,109 +2690,109 @@ _020037A6:
ldr r0, [r4, #0x4]
ldr r2, [r4, #0x8]
mov r1, #0x0
- blx GX_LoadBGPltt
+ bl GX_LoadBGPltt
b _020038A4
_020037B2:
ldr r0, [r4, #0x4]
ldr r2, [r4, #0x8]
mov r1, #0x0
- blx GXS_LoadBGPltt
+ bl GXS_LoadBGPltt
b _020038A4
_020037BE:
ldr r0, [r4, #0x4]
ldr r2, [r4, #0x8]
mov r1, #0x0
- blx GX_LoadOBJPltt
+ bl GX_LoadOBJPltt
b _020038A4
_020037CA:
ldr r0, [r4, #0x4]
ldr r2, [r4, #0x8]
mov r1, #0x0
- blx GXS_LoadOBJPltt
+ bl GXS_LoadOBJPltt
b _020038A4
_020037D6:
- blx GX_BeginLoadBGExtPltt
+ bl GX_BeginLoadBGExtPltt
ldr r0, [r4, #0x4]
ldr r2, [r4, #0x8]
mov r1, #0x0
- blx GX_LoadBGExtPltt
- blx GX_EndLoadBGExtPltt
+ bl GX_LoadBGExtPltt
+ bl GX_EndLoadBGExtPltt
b _020038A4
_020037EA:
- blx GX_BeginLoadBGExtPltt
+ bl GX_BeginLoadBGExtPltt
ldr r0, [r4, #0x4]
ldr r2, [r4, #0x8]
add r1, r7, #0x0
- blx GX_LoadBGExtPltt
- blx GX_EndLoadBGExtPltt
+ bl GX_LoadBGExtPltt
+ bl GX_EndLoadBGExtPltt
b _020038A4
_020037FE:
- blx GX_BeginLoadBGExtPltt
+ bl GX_BeginLoadBGExtPltt
mov r1, #0x1
ldr r0, [r4, #0x4]
ldr r2, [r4, #0x8]
lsl r1, r1, #0xe
- blx GX_LoadBGExtPltt
- blx GX_EndLoadBGExtPltt
+ bl GX_LoadBGExtPltt
+ bl GX_EndLoadBGExtPltt
b _020038A4
_02003814:
- blx GX_BeginLoadBGExtPltt
+ bl GX_BeginLoadBGExtPltt
mov r1, #0x6
ldr r0, [r4, #0x4]
ldr r2, [r4, #0x8]
lsl r1, r1, #0xc
- blx GX_LoadBGExtPltt
- blx GX_EndLoadBGExtPltt
+ bl GX_LoadBGExtPltt
+ bl GX_EndLoadBGExtPltt
b _020038A4
_0200382A:
- blx GXS_BeginLoadBGExtPltt
+ bl GXS_BeginLoadBGExtPltt
ldr r0, [r4, #0x4]
ldr r2, [r4, #0x8]
mov r1, #0x0
- blx GXS_LoadBGExtPltt
- blx GXS_EndLoadBGExtPltt
+ bl GXS_LoadBGExtPltt
+ bl GXS_EndLoadBGExtPltt
b _020038A4
_0200383E:
- blx GXS_BeginLoadBGExtPltt
+ bl GXS_BeginLoadBGExtPltt
ldr r0, [r4, #0x4]
ldr r2, [r4, #0x8]
add r1, r7, #0x0
- blx GXS_LoadBGExtPltt
- blx GXS_EndLoadBGExtPltt
+ bl GXS_LoadBGExtPltt
+ bl GXS_EndLoadBGExtPltt
b _020038A4
_02003852:
- blx GXS_BeginLoadBGExtPltt
+ bl GXS_BeginLoadBGExtPltt
mov r1, #0x1
ldr r0, [r4, #0x4]
ldr r2, [r4, #0x8]
lsl r1, r1, #0xe
- blx GXS_LoadBGExtPltt
- blx GXS_EndLoadBGExtPltt
+ bl GXS_LoadBGExtPltt
+ bl GXS_EndLoadBGExtPltt
b _020038A4
_02003868:
- blx GXS_BeginLoadBGExtPltt
+ bl GXS_BeginLoadBGExtPltt
mov r1, #0x6
ldr r0, [r4, #0x4]
ldr r2, [r4, #0x8]
lsl r1, r1, #0xc
- blx GXS_LoadBGExtPltt
- blx GXS_EndLoadBGExtPltt
+ bl GXS_LoadBGExtPltt
+ bl GXS_EndLoadBGExtPltt
b _020038A4
_0200387E:
- blx GX_BeginLoadOBJExtPltt
+ bl GX_BeginLoadOBJExtPltt
ldr r0, [r4, #0x4]
ldr r2, [r4, #0x8]
mov r1, #0x0
- blx GX_LoadOBJExtPltt
- blx GX_EndLoadOBJExtPltt
+ bl GX_LoadOBJExtPltt
+ bl GX_EndLoadOBJExtPltt
b _020038A4
_02003892:
- blx GXS_BeginLoadOBJExtPltt
+ bl GXS_BeginLoadOBJExtPltt
ldr r0, [r4, #0x4]
ldr r2, [r4, #0x8]
mov r1, #0x0
- blx GXS_LoadOBJExtPltt
- blx GXS_EndLoadOBJExtPltt
+ bl GXS_LoadOBJExtPltt
+ bl GXS_EndLoadOBJExtPltt
_020038A4:
add r5, r5, #0x1
add r4, #0x14
@@ -2887,7 +2887,7 @@ _0200393A:
ldr r0, [sp, #0x0]
sub r2, r2, r5
lsl r2, r2, #0x1
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
_02003952:
cmp r7, #0x0
beq _0200395A
@@ -2902,7 +2902,7 @@ _0200395A:
ldr r0, [sp, #0x0]
sub r2, r2, r5
lsl r2, r2, #0x1
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
_0200396E:
add sp, #0x8
pop {r3-r7, pc}
@@ -3216,14 +3216,14 @@ FUN_02003B98: ; 0x02003B98
add r6, r1, #0x0
bl FUN_02003D30
add r4, r0, #0x0
- blx FUN_020C01D0
+ bl FUN_020C01D0
bl FUN_020040C8
add r0, r4, #0x0
bl FUN_02004064
add r0, r4, #0x0
ldr r1, _02003C00 ; =0x000BBC00
add r0, #0x94
- blx FUN_020C2A94
+ bl FUN_020C2A94
add r1, r4, #0x0
add r1, #0x90
str r0, [r1, #0x0]
@@ -3233,11 +3233,11 @@ FUN_02003B98: ; 0x02003B98
ldr r2, [r2, #0x0]
add r0, r4, #0x0
mov r3, #0x0
- blx FUN_020C26F8
+ bl FUN_020C26F8
add r0, r4, #0x0
add r0, #0x90
ldr r0, [r0, #0x0]
- blx FUN_020C39CC
+ bl FUN_020C39CC
add r0, r4, #0x0
bl FUN_02004088
add r0, r4, #0x0
@@ -3276,7 +3276,7 @@ _02003C2C:
bl FUN_02003C40
_02003C30:
bl FUN_02005CFC
- blx FUN_020C01A0
+ bl FUN_020C01A0
pop {r4, pc}
nop
_02003C3C: .word 0x000BCD00
@@ -3672,7 +3672,7 @@ FUN_02003F3C: ; 0x02003F3C
bl FUN_02003D30
add r0, #0x90
ldr r0, [r0, #0x0]
- blx FUN_020C290C
+ bl FUN_020C290C
add r4, r0, #0x0
mov r0, #0x0
mvn r0, r0
@@ -3695,7 +3695,7 @@ FUN_02003F64: ; 0x02003F64
add r0, #0x90
ldr r0, [r0, #0x0]
add r1, r4, #0x0
- blx FUN_020C2828
+ bl FUN_020C2828
pop {r4, pc}
thumb_func_start FUN_02003F78
@@ -3707,7 +3707,7 @@ FUN_02003F78: ; 0x02003F78
add r1, #0x90
ldr r1, [r1, #0x0]
add r0, r4, #0x0
- blx FUN_020C36A8
+ bl FUN_020C36A8
pop {r4, pc}
.balign 4
@@ -3720,7 +3720,7 @@ FUN_02003F90: ; 0x02003F90
add r1, #0x90
ldr r1, [r1, #0x0]
add r0, r4, #0x0
- blx FUN_020C3674
+ bl FUN_020C3674
pop {r4, pc}
.balign 4
@@ -3735,7 +3735,7 @@ FUN_02003FA8: ; 0x02003FA8
ldr r2, [r2, #0x0]
add r0, r5, #0x0
add r1, r4, #0x0
- blx FUN_020C35E0
+ bl FUN_020C35E0
pop {r3-r5, pc}
.balign 4
@@ -3748,7 +3748,7 @@ FUN_02003FC4: ; 0x02003FC4
add r1, #0x90
ldr r1, [r1, #0x0]
add r0, r4, #0x0
- blx FUN_020C360C
+ bl FUN_020C360C
pop {r4, pc}
.balign 4
@@ -3761,7 +3761,7 @@ FUN_02003FDC: ; 0x02003FDC
add r1, #0x90
ldr r1, [r1, #0x0]
add r0, r4, #0x0
- blx FUN_020C3640
+ bl FUN_020C3640
pop {r4, pc}
.balign 4
@@ -3840,7 +3840,7 @@ FUN_02004064: ; 0x02004064
ldr r2, _02004080 ; =0x000BCD60
mov r1, #0x0
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, _02004084 ; =0x000BCD1C
mov r1, #0x0
_02004074:
@@ -3862,7 +3862,7 @@ FUN_02004088: ; 0x02004088
add r5, r0, r1
_02004090:
add r0, r5, #0x0
- blx FUN_020C0F80
+ bl FUN_020C0F80
add r4, r4, #0x1
add r5, r5, #0x4
cmp r4, #0x9
@@ -3891,11 +3891,11 @@ _020040C4: .word 0x000BCD20
thumb_func_start FUN_020040C8
FUN_020040C8: ; 0x020040C8
push {r3, lr}
- blx MIC_Init
+ bl MIC_Init
mov r0, #0x1
- blx PM_SetAmp
+ bl PM_SetAmp
mov r0, #0x2
- blx PM_SetAmpGain
+ bl PM_SetAmpGain
pop {r3, pc}
thumb_func_start FUN_020040DC
@@ -3903,10 +3903,10 @@ FUN_020040DC: ; 0x020040DC
push {r3, lr}
mov r0, #0x7
mov r1, #0x0
- blx FUN_020C1040
+ bl FUN_020C1040
mov r0, #0x7
bl FUN_02003FF4
- blx FUN_020C0F68
+ bl FUN_020C0F68
pop {r3, pc}
.balign 4
@@ -4814,7 +4814,7 @@ _02004800:
add r0, r4, #0x0
bl FUN_02003FF4
add r1, r5, #0x0
- blx FUN_020C0F8C
+ bl FUN_020C0F8C
strb r5, [r6, #0x0]
_0200480E:
pop {r4-r6, pc}
@@ -4840,7 +4840,7 @@ FUN_02004828: ; 0x02004828
bl FUN_02003FF4
add r1, r5, #0x0
add r2, r4, #0x0
- blx FUN_020C0EF4
+ bl FUN_020C0EF4
pop {r3-r5, pc}
thumb_func_start FUN_0200483C
@@ -4856,7 +4856,7 @@ _02004844:
_0200484A:
bl FUN_02003FF4
add r1, r4, #0x0
- blx FUN_020C0F30
+ bl FUN_020C0F30
pop {r4, pc}
.balign 4
@@ -4864,7 +4864,7 @@ _0200484A:
FUN_02004858: ; 0x02004858
push {r3-r5, lr}
add r5, r1, #0x0
- blx FUN_020C23FC
+ bl FUN_020C23FC
cmp r5, #0x1
beq _02004868
cmp r5, #0x8
@@ -4882,7 +4882,7 @@ _02004872:
bne _0200488A
add r0, r4, #0x0
mov r1, #0x5
- blx _s32_div_f
+ bl _s32_div_f
add r1, r0, #0x0
add r0, r5, #0x0
bl FUN_0200483C
@@ -4910,7 +4910,7 @@ FUN_020048A0: ; 0x020048A0
add r1, r5, #0x0
add r3, r2, #0x0
str r4, [sp, #0x0]
- blx FUN_020C3910
+ bl FUN_020C3910
pop {r3-r5, pc}
.balign 4
@@ -4922,7 +4922,7 @@ FUN_020048BC: ; 0x020048BC
bl ErrorHandling
_020048C6:
add r0, r4, #0x0
- blx FUN_020C0F50
+ bl FUN_020C0F50
pop {r4, pc}
.balign 4
@@ -4934,7 +4934,7 @@ FUN_020048D0: ; 0x020048D0
mov r0, #0xff
pop {r3, pc}
_020048DA:
- blx FUN_020C23FC
+ bl FUN_020C23FC
cmp r0, #0x0
bne _020048E6
mov r0, #0xff
@@ -4955,13 +4955,13 @@ _020048F0: .word FUN_020C0E14
FUN_020048F4: ; 0x020048F4
push {r3, lr}
bl FUN_02004900
- blx FUN_020C22D0
+ bl FUN_020C22D0
pop {r3, pc}
thumb_func_start FUN_02004900
FUN_02004900: ; 0x02004900
push {r3, lr}
- blx FUN_020C23FC
+ bl FUN_020C23FC
cmp r0, #0x0
bne _0200490E
mov r0, #0x0
@@ -4982,13 +4982,13 @@ _02004918: .word MIC_StartAutoSampling
FUN_0200491C: ; 0x0200491C
push {r3, lr}
bl FUN_02003D30
- blx MIC_StopAutoSampling
+ bl MIC_StopAutoSampling
pop {r3, pc}
thumb_func_start FUN_02004928
FUN_02004928: ; 0x02004928
push {r3, lr}
- blx MIC_DoSamplingAsync
+ bl MIC_DoSamplingAsync
pop {r3, pc}
thumb_func_start FUN_02004930
@@ -5058,7 +5058,7 @@ _020049A8:
bl FUN_02003D38
add r4, r0, #0x0
add r0, r5, #0x0
- blx FUN_020C0688
+ bl FUN_020C0688
str r0, [r4, #0x0]
cmp r0, #0x0
bne _020049CA
@@ -5079,7 +5079,7 @@ _020049D6:
bl FUN_02003D38
add r6, r0, #0x0
add r0, r5, #0x0
- blx FUN_020C0688
+ bl FUN_020C0688
str r0, [r6, #0x0]
cmp r0, #0x0
bne _020049F4
@@ -5122,7 +5122,7 @@ _02004A2A:
add r0, r5, #0x0
bl FUN_02004930
ldr r0, [r0, #0x0]
- blx FUN_020C0670
+ bl FUN_020C0670
mov r0, #0x0
strb r0, [r6, #0x0]
pop {r4-r6, pc}
@@ -5136,7 +5136,7 @@ _02004A4C:
add r0, r5, #0x0
bl FUN_02004930
ldr r0, [r0, #0x0]
- blx FUN_020C0670
+ bl FUN_020C0670
mov r0, #0x0
strb r0, [r4, #0x0]
pop {r4-r6, pc}
@@ -5168,7 +5168,7 @@ FUN_02004A6C: ; 0x02004A6C
ldr r2, [r3, #0x8]
ldr r0, [r0, #0x0]
ldr r3, [r3, #0xc]
- blx FUN_020C054C
+ bl FUN_020C054C
add r5, r0, #0x0
bne _02004AA4
add r0, r4, #0x0
@@ -5184,7 +5184,7 @@ FUN_02004AAC: ; 0x02004AAC
push {r3, lr}
bl FUN_02004930
ldr r0, [r0, #0x0]
- blx FUN_020C0510
+ bl FUN_020C0510
pop {r3, pc}
.balign 4
@@ -5193,7 +5193,7 @@ FUN_02004ABC: ; 0x02004ABC
push {r3, lr}
bl FUN_02004930
ldr r0, [r0, #0x0]
- blx FUN_020C03B8
+ bl FUN_020C03B8
pop {r3, pc}
.balign 4
@@ -5208,7 +5208,7 @@ _02004AD6:
bl FUN_02004930
ldr r0, [r0, #0x0]
add r1, r4, #0x0
- blx FUN_020C041C
+ bl FUN_020C041C
pop {r4, pc}
thumb_func_start FUN_02004AE4
@@ -5218,7 +5218,7 @@ FUN_02004AE4: ; 0x02004AE4
bl FUN_02004930
ldr r0, [r0, #0x0]
add r1, r4, #0x0
- blx FUN_020C044C
+ bl FUN_020C044C
pop {r4, pc}
.balign 4
@@ -5235,17 +5235,17 @@ FUN_02004AF8: ; 0x02004AF8
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x5
- blx _s32_div_f
+ bl _s32_div_f
add r1, r0, #0x0
ldr r0, [r4, #0x0]
- blx FUN_020C04DC
+ bl FUN_020C04DC
pop {r3-r5, pc}
_02004B20:
add r0, r4, #0x0
bl FUN_02004930
ldr r0, [r0, #0x0]
add r1, r5, #0x0
- blx FUN_020C04DC
+ bl FUN_020C04DC
pop {r3-r5, pc}
thumb_func_start FUN_02004B30
@@ -5267,7 +5267,7 @@ FUN_02004B30: ; 0x02004B30
bl ErrorHandling
_02004B54:
add r0, r6, #0x0
- blx FUN_020C226C
+ bl FUN_020C226C
add r7, r0, #0x0
bne _02004B68
bl ErrorHandling
@@ -5278,7 +5278,7 @@ _02004B68:
ldr r0, [r7, #0x0]
lsl r0, r0, #0x8
lsr r0, r0, #0x8
- blx FUN_020C217C
+ bl FUN_020C217C
add r6, r0, #0x0
bne _02004B80
bl ErrorHandling
@@ -5301,14 +5301,14 @@ _02004B80:
_02004B9C:
mov r1, #0x0
add r2, r6, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [r7, #0x0]
ldr r1, [r4, #0x0]
lsl r0, r0, #0x8
lsr r0, r0, #0x8
add r2, r6, #0x0
mov r3, #0x0
- blx FUN_020C2104
+ bl FUN_020C2104
mov r1, #0x0
mvn r1, r1
cmp r0, r1
@@ -5429,7 +5429,7 @@ FUN_02004C80: ; 0x02004C80
mov r2, #0x0
lsl r3, r3, #0x6
str r4, [sp, #0x0]
- blx FUN_020C1FF0
+ bl FUN_020C1FF0
add sp, #0x4
pop {r3-r4, pc}
@@ -5456,7 +5456,7 @@ FUN_02004CB4: ; 0x02004CB4
bl FUN_02003D38
mov r1, #0x0
mov r2, #0x1c
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x3
bl FUN_02003D38
add r4, r0, #0x0
@@ -5471,7 +5471,7 @@ FUN_02004CB4: ; 0x02004CB4
ldr r3, _02004CF8 ; =0x000055F0
add r0, r4, #0x0
mov r2, #0x0
- blx FUN_020C1EA4
+ bl FUN_020C1EA4
add sp, #0xc
pop {r3-r4, pc}
nop
@@ -5511,7 +5511,7 @@ FUN_02004D20: ; 0x02004D20
bl FUN_02003FF4
add r1, r5, #0x0
add r2, r4, #0x0
- blx FUN_020C0EA4
+ bl FUN_020C0EA4
pop {r3-r5, pc}
thumb_func_start FUN_02004D34
@@ -5534,14 +5534,14 @@ FUN_02004D4C: ; 0x02004D4C
bl FUN_02003FF4
add r1, r5, #0x0
add r2, r4, #0x0
- blx FUN_020C0E7C
+ bl FUN_020C0E7C
pop {r3-r5, pc}
thumb_func_start FUN_02004D60
FUN_02004D60: ; 0x02004D60
push {r4, lr}
add r4, r0, #0x0
- blx FUN_020C0174
+ bl FUN_020C0174
ldr r0, _02004D70 ; =0x021C3DD8
str r4, [r0, #0x0]
pop {r4, pc}
@@ -5758,7 +5758,7 @@ FUN_02004ED0: ; 0x02004ED0
_02004EF0:
mov r0, #0x1
_02004EF2:
- blx FUN_020C226C
+ bl FUN_020C226C
cmp r0, #0x0
bne _02004F02
bl ErrorHandling
@@ -5768,7 +5768,7 @@ _02004F02:
ldr r0, [r0, #0x0]
lsl r0, r0, #0x8
lsr r0, r0, #0x8
- blx FUN_020C20DC
+ bl FUN_020C20DC
cmp r0, #0x0
bne _02004F18
bl ErrorHandling
@@ -5776,7 +5776,7 @@ _02004F02:
pop {r3-r5, pc}
_02004F18:
mov r1, #0x0
- blx SND_GetWaveDataAddress
+ bl SND_GetWaveDataAddress
str r0, [r4, #0x0]
pop {r3-r5, pc}
nop
@@ -5794,11 +5794,11 @@ FUN_02004F28: ; 0x02004F28
add r0, r6, #0x0
lsl r1, r1, #0x8
ldr r5, [r5, #0x8]
- blx _s32_div_f
+ bl _s32_div_f
lsl r1, r0, #0x1
bpl _02004F50
mov r0, #0x20
- blx _s32_div_f
+ bl _s32_div_f
neg r0, r0
b _02004F5A
_02004F50:
@@ -5820,7 +5820,7 @@ _02004F62:
FUN_02004F64: ; 0x02004F64
push {r3, lr}
bl FUN_02003FF4
- blx FUN_020C0DD4
+ bl FUN_020C0DD4
pop {r3, pc}
thumb_func_start FUN_02004F70
@@ -6043,7 +6043,7 @@ _020050D8:
blt _020050D8
_020050E6:
add r1, r2, #0x0
- blx _s32_div_f
+ bl _s32_div_f
ldr r1, [sp, #0x8]
strh r0, [r1, #0x0]
mov r0, #0x0
@@ -6060,7 +6060,7 @@ _020050FA:
cmp r2, r1
blt _020050FA
_02005108:
- blx _s32_div_f
+ bl _s32_div_f
ldr r1, [sp, #0x4]
sub r4, r4, #0x1
strh r0, [r1, #0x0]
@@ -6097,10 +6097,10 @@ _02005130:
_0200514A:
ldr r1, [sp, #0x0]
add r0, r5, #0x0
- blx DC_FlushRange
+ bl DC_FlushRange
ldr r1, [sp, #0x0]
add r0, r6, #0x0
- blx DC_FlushRange
+ bl DC_FlushRange
_0200515A:
add sp, #0x30
pop {r3-r7, pc}
@@ -6188,7 +6188,7 @@ FUN_020051F4: ; 0x020051F4
add r4, r0, #0x0
bl FUN_02003FF4
add r1, r5, #0x0
- blx FUN_020C3980
+ bl FUN_020C3980
add r6, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
@@ -6266,7 +6266,7 @@ FUN_02005288: ; 0x02005288
add r0, r4, #0x0
bl FUN_02003FF4
add r1, r5, #0x0
- blx FUN_020C3980
+ bl FUN_020C3980
pop {r3-r5, pc}
.balign 4
@@ -6299,7 +6299,7 @@ FUN_020052B8: ; 0x020052B8
add r0, r6, #0x0
add r3, r1, #0x0
str r5, [sp, #0x0]
- blx FUN_020C3910
+ bl FUN_020C3910
add sp, #0x4
pop {r3-r6, pc}
.balign 4
@@ -6328,7 +6328,7 @@ _0200532A:
mov r0, #0x7
bl FUN_02003FF4
add r1, r5, #0x0
- blx FUN_020C3980
+ bl FUN_020C3980
add r4, r0, #0x0
add r0, r5, #0x0
bl FUN_02004110
@@ -6341,14 +6341,14 @@ _0200532A:
FUN_02005350: ; 0x02005350
push {r4, lr}
add r4, r0, #0x0
- blx FUN_020C0FDC
+ bl FUN_020C0FDC
add r0, r4, #0x0
bl FUN_020048D0
cmp r0, #0xff
beq _0200536E
bl FUN_02004018
bl FUN_02003FF4
- blx FUN_020C0F68
+ bl FUN_020C0F68
_0200536E:
bl FUN_02005374
pop {r4, pc}
@@ -6446,7 +6446,7 @@ FUN_0200541C: ; 0x0200541C
bl FUN_02003D38
add r4, r0, #0x0
mov r0, #0x0
- blx FUN_020C0F9C
+ bl FUN_020C0F9C
ldrb r0, [r5, #0x0]
cmp r0, #0x1
bne _02005440
@@ -6475,7 +6475,7 @@ FUN_02005454: ; 0x02005454
mov r0, #0x7
bl FUN_02003FF4
mov r1, #0x0
- blx FUN_020C10A4
+ bl FUN_020C10A4
bl FUN_02005374
mov r5, #0x0
add r4, r5, #0x0
@@ -6527,7 +6527,7 @@ FUN_020054C8: ; 0x020054C8
add r4, r0, #0x0
bl FUN_02003FF4
add r1, r5, #0x0
- blx FUN_020C3980
+ bl FUN_020C3980
add r6, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
@@ -6549,7 +6549,7 @@ FUN_020054F8: ; 0x020054F8
add r4, r1, #0x0
bl FUN_02003FF4
add r1, r4, #0x0
- blx FUN_020C10A4
+ bl FUN_020C10A4
pop {r4, pc}
thumb_func_start FUN_02005508
@@ -6587,7 +6587,7 @@ FUN_02005530: ; 0x02005530
bl FUN_02003FF4
add r1, r5, #0x0
add r2, r4, #0x0
- blx FUN_020C0E7C
+ bl FUN_020C0E7C
pop {r3-r5, pc}
thumb_func_start FUN_0200554C
@@ -6604,7 +6604,7 @@ _0200555C:
bl FUN_02003FF4
add r1, r7, #0x0
add r2, r6, #0x0
- blx FUN_020C0E7C
+ bl FUN_020C0E7C
add r5, r5, #0x1
cmp r5, #0x4
blt _0200555C
@@ -6659,7 +6659,7 @@ _020055BC:
sub r1, r1, #0x3
add r2, r5, #0x0
add r3, r1, #0x0
- blx FUN_020C3910
+ bl FUN_020C3910
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x1
@@ -6673,7 +6673,7 @@ _020055E8:
sub r1, r1, #0x3
add r2, r5, #0x0
add r3, r1, #0x0
- blx FUN_020C3910
+ bl FUN_020C3910
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x8
@@ -6701,11 +6701,11 @@ FUN_02005614: ; 0x02005614
mov r0, #0x1
bl FUN_02003FF4
add r1, r5, #0x0
- blx FUN_020C10A4
+ bl FUN_020C10A4
mov r0, #0x8
bl FUN_02003FF4
add r1, r5, #0x0
- blx FUN_020C10A4
+ bl FUN_020C10A4
ldrb r0, [r6, #0x0]
cmp r0, #0x1
bne _02005658
@@ -7415,7 +7415,7 @@ _02005C48:
mov r0, #0x2
bl FUN_02003FF4
add r1, r5, #0x0
- blx FUN_020C3980
+ bl FUN_020C3980
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x2
@@ -7455,7 +7455,7 @@ FUN_02005CA0: ; 0x02005CA0
mov r0, #0x2
bl FUN_02003FF4
add r1, r4, #0x0
- blx FUN_020C10A4
+ bl FUN_020C10A4
mov r0, #0x6
bl FUN_02004748
bl FUN_02003F64
diff --git a/arm9/asm/unk_020061E8.s b/arm9/asm/unk_020061E8.s
index 3b8df8d6..a3c6d702 100644
--- a/arm9/asm/unk_020061E8.s
+++ b/arm9/asm/unk_020061E8.s
@@ -19,7 +19,7 @@ FUN_020061E8: ; 0x020061E8
_02006202:
mov r1, #0x0
add r2, r5, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
b _0200620E
_0200620C:
mov r4, #0x0
diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s
index bcbdc275..008599ed 100644
--- a/arm9/asm/unk_02006864.s
+++ b/arm9/asm/unk_02006864.s
@@ -5096,13 +5096,13 @@ _02008DD8: .word 0x0001FE00
thumb_func_start FUN_02008DDC
FUN_02008DDC: ; 0x02008DDC
- ldr r3, _02008DE8 ; =0x0201E069
+ ldr r3, _02008DE8 ; =FUN_0201E068
add r1, r0, #0x0
mov r0, #0x3
lsl r0, r0, #0xe
bx r3
nop
-_02008DE8: .word 0x0201E069
+_02008DE8: .word FUN_0201E068
thumb_func_start FUN_02008DEC
FUN_02008DEC: ; 0x02008DEC
@@ -12523,11 +12523,11 @@ _0200C5A4: .word FUN_020201E4
thumb_func_start FUN_0200C5A8
FUN_0200C5A8: ; 0x0200C5A8
- ldr r3, _0200C5B0 ; =0x0200C59D
+ ldr r3, _0200C5B0 ; =FUN_0200C59C
ldr r0, [r0, #0x0]
bx r3
nop
-_0200C5B0: .word 0x0200C59D
+_0200C5B0: .word FUN_0200C59C
thumb_func_start FUN_0200C5B4
FUN_0200C5B4: ; 0x0200C5B4
@@ -12607,11 +12607,11 @@ _0200C618: .word FUN_02020208
thumb_func_start FUN_0200C61C
FUN_0200C61C: ; 0x0200C61C
- ldr r3, _0200C624 ; =0x0200C615
+ ldr r3, _0200C624 ; =FUN_0200C614
ldr r0, [r0, #0x0]
bx r3
nop
-_0200C624: .word 0x0200C615
+_0200C624: .word FUN_0200C614
thumb_func_start FUN_0200C628
FUN_0200C628: ; 0x0200C628
@@ -12707,11 +12707,11 @@ _0200C6A0: .word FUN_02020238
thumb_func_start FUN_0200C6A4
FUN_0200C6A4: ; 0x0200C6A4
- ldr r3, _0200C6AC ; =0x02020241
+ ldr r3, _0200C6AC ; =FUN_02020240
ldr r0, [r0, #0x0]
bx r3
nop
-_0200C6AC: .word 0x02020241
+_0200C6AC: .word FUN_02020240
thumb_func_start FUN_0200C6B0
FUN_0200C6B0: ; 0x0200C6B0
@@ -12949,11 +12949,11 @@ _0200C83C: .word FUN_020200EC
thumb_func_start FUN_0200C840
FUN_0200C840: ; 0x0200C840
- ldr r3, _0200C848 ; =0x0200C839
+ ldr r3, _0200C848 ; =FUN_0200C838
ldr r0, [r0, #0x0]
bx r3
nop
-_0200C848: .word 0x0200C839
+_0200C848: .word FUN_0200C838
thumb_func_start FUN_0200C84C
FUN_0200C84C: ; 0x0200C84C
@@ -13057,11 +13057,11 @@ FUN_0200C8DC: ; 0x0200C8DC
thumb_func_start FUN_0200C8F8
FUN_0200C8F8: ; 0x0200C8F8
- ldr r3, _0200C900 ; =0x02020359
+ ldr r3, _0200C900 ; =FUN_02020358
ldr r0, [r0, #0x0]
bx r3
nop
-_0200C900: .word 0x02020359
+_0200C900: .word FUN_02020358
thumb_func_start FUN_0200C904
FUN_0200C904: ; 0x0200C904
@@ -15571,7 +15571,7 @@ _0200DD10:
ldr r0, [r4, r0]
bl FUN_0200C3DC
add r0, r4, #0x0
- bl FUN_021D99F8
+ bl MOD05_021D99F8
add r0, r5, #0x0
bl FUN_0200621C
pop {r3-r5, pc}
@@ -15656,7 +15656,7 @@ FUN_0200DDAC: ; 0x0200DDAC
add r1, r2, #0x0
add r0, r6, #0x0
mov r2, #0x1
- bl FUN_021D959C
+ bl MOD05_021D959C
add sp, #0x18
pop {r4-r6, pc}
.balign 4
@@ -15675,21 +15675,21 @@ FUN_0200DDD8: ; 0x0200DDD8
mov r1, #0x26
mov r3, #0x0
add r4, r0, #0x0
- bl FUN_021D967C
+ bl MOD05_021D967C
ldr r0, _0200DE2C ; =0x00015CD5
mov r1, #0x26
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r2, #0x2f
mov r3, #0x0
- bl FUN_021D96F4
+ bl MOD05_021D96F4
ldr r0, _0200DE2C ; =0x00015CD5
mov r1, #0x26
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r2, #0x2e
mov r3, #0x0
- bl FUN_021D9708
+ bl MOD05_021D9708
mov r0, #0x1
str r0, [sp, #0x0]
ldr r0, _0200DE2C ; =0x00015CD5
@@ -15698,7 +15698,7 @@ FUN_0200DDD8: ; 0x0200DDD8
add r0, r4, #0x0
mov r2, #0x30
mov r3, #0x0
- bl FUN_021D971C
+ bl MOD05_021D971C
add sp, #0xc
pop {r3-r4, pc}
nop
@@ -15730,7 +15730,7 @@ _0200DE40:
strh r1, [r0, #0x2]
add r0, r4, #0x0
add r1, sp, #0x0
- bl FUN_021D9820
+ bl MOD05_021D9820
mov r1, #0x59
lsl r1, r1, #0x2
str r0, [r4, r1]
@@ -31039,11 +31039,11 @@ _02014F24: .word FUN_02014F08
thumb_func_start FUN_02014F28
FUN_02014F28: ; 0x02014F28
- ldr r3, _02014F30 ; =0x02014F1D
+ ldr r3, _02014F30 ; =FUN_02014F1C
mov r1, #0x1
bx r3
nop
-_02014F30: .word 0x02014F1D
+_02014F30: .word FUN_02014F1C
thumb_func_start FUN_02014F34
FUN_02014F34: ; 0x02014F34
@@ -47117,21 +47117,21 @@ _0201C4F0: .word 0xFFFF0000
thumb_func_start FUN_0201C4F4
FUN_0201C4F4: ; 0x0201C4F4
- ldr r3, _0201C4FC ; =0x0201C50D
+ ldr r3, _0201C4FC ; =FUN_0201C50C
ldr r0, [r0, #0x4]
ldrb r1, [r1, #0x0]
bx r3
.balign 4
-_0201C4FC: .word 0x0201C50D
+_0201C4FC: .word FUN_0201C50C
thumb_func_start FUN_0201C500
FUN_0201C500: ; 0x0201C500
- ldr r3, _0201C508 ; =0x0201C541
+ ldr r3, _0201C508 ; =FUN_0201C540
ldr r0, [r0, #0x4]
ldrb r1, [r1, #0x1]
bx r3
.balign 4
-_0201C508: .word 0x0201C541
+_0201C508: .word FUN_0201C540
thumb_func_start FUN_0201C50C
FUN_0201C50C: ; 0x0201C50C
@@ -66319,11 +66319,11 @@ _02024EBC: .word FUN_02022610
thumb_func_start FUN_02024EC0
FUN_02024EC0: ; 0x02024EC0
- ldr r3, _02024EC8 ; =0x02022635
+ ldr r3, _02024EC8 ; =FUN_02022634
mov r1, #0xa
bx r3
nop
-_02024EC8: .word 0x02022635
+_02024EC8: .word FUN_02022634
thumb_func_start FUN_02024ECC
FUN_02024ECC: ; 0x02024ECC
@@ -70860,9 +70860,9 @@ FUN_02026D34: ; 0x02026D34
add r0, r4, #0x0
add r1, sp, #0x4
add r2, sp, #0x8
- bl FUN_021DB858
+ bl MOD17_021DB858
add r0, r4, #0x0
- bl FUN_021DB7E8
+ bl MOD17_021DB7E8
add r4, r0, #0x0
mov r0, #0x1
ldr r1, [sp, #0x4]
@@ -90692,7 +90692,7 @@ FUN_0202FA5C: ; 0x0202FA5C
bl FUN_02033534
cmp r0, #0x13
blt _0202FA78
- bl FUN_021D83C0
+ bl MOD04_021D83C0
mov r4, #0x1
b _0202FA82
_0202FA78:
@@ -90997,7 +90997,7 @@ FUN_0202FCCC: ; 0x0202FCCC
cmp r1, #0x0
beq _0202FCF8
mov r1, #0x26
- bl FUN_021D78FC
+ bl MOD04_021D78FC
cmp r0, #0x0
bne _0202FCFA
_0202FCF8:
@@ -91079,7 +91079,7 @@ _0202FD90:
ldr r0, _0202FE14 ; =0x021C59F4
mov r1, #0x26
ldr r0, [r0, #0x4]
- bl FUN_021D78FC
+ bl MOD04_021D78FC
cmp r0, #0x0
beq _0202FE10
ldr r0, _0202FE20 ; =0x02105D58
@@ -91458,7 +91458,7 @@ FUN_02030074: ; 0x02030074
lsl r0, r0, #0x2
add r0, r1, r0
mov r1, #0x4c
- bl FUN_021D79B4
+ bl MOD04_021D79B4
cmp r0, #0x0
beq _020300DC
ldr r0, _02030228 ; =0x021C59F4
@@ -91552,7 +91552,7 @@ _02030150:
lsl r0, r0, #0x2
add r0, r1, r0
mov r1, #0x4c
- bl FUN_021D79B4
+ bl MOD04_021D79B4
cmp r0, #0x0
beq _02030224
ldr r0, _02030230 ; =0x02105D58
@@ -93257,7 +93257,7 @@ _02030E8C:
ldrb r0, [r1, r0]
cmp r0, #0x0
beq _02030EBC
- bl FUN_021D8018
+ bl MOD04_021D8018
mov r1, #0x0
mvn r1, r1
cmp r0, r1
@@ -93669,7 +93669,7 @@ FUN_02031190: ; 0x02031190
bl FUN_02033534
cmp r0, #0x13
blt _020311B4
- bl FUN_021D8018
+ bl MOD04_021D8018
mov r1, #0x0
mvn r1, r1
cmp r0, r1
@@ -93997,7 +93997,7 @@ FUN_020313EC: ; 0x020313EC
mov r0, #0x0
pop {r3, pc}
_020313FA:
- bl FUN_021D8624
+ bl MOD04_021D8624
pop {r3, pc}
thumb_func_start FUN_02031400
@@ -95240,7 +95240,7 @@ _02031CEE:
bl FUN_02033590
cmp r0, #0x0
beq _02031D04
- bl FUN_021DDB08
+ bl MOD04_021DDB08
mov r1, #0x3
sub r0, r1, r0
bl FUN_02033EEC
@@ -97388,7 +97388,7 @@ _02032DBE:
lsr r0, r0, #0x18
cmp r0, #0x1
bhi _02032DD4
- bl FUN_021D83C0
+ bl MOD04_021D83C0
mov r0, #0x1
pop {r3, pc}
_02032DD4:
@@ -97482,7 +97482,7 @@ FUN_02032E8C: ; 0x02032E8C
thumb_func_start FUN_02032E90
FUN_02032E90: ; 0x02032E90
push {r3, lr}
- bl FUN_021D7F8C
+ bl MOD04_021D7F8C
cmp r0, #0x0
bge _02032EA2
ldr r0, _02032EA4 ; =FUN_02032E8C
@@ -97508,7 +97508,7 @@ FUN_02032EB0: ; 0x02032EB0
push {r3, lr}
mov r0, #0x1
bl FUN_020313A0
- bl FUN_021D7F8C
+ bl MOD04_021D7F8C
cmp r0, #0xa
blt _02032ECA
ldr r0, _02032F0C ; =FUN_02032EAC
@@ -97573,7 +97573,7 @@ _02032F30: .word 0x021C5A00
FUN_02032F34: ; 0x02032F34
push {r3, lr}
mov r0, #0x0
- bl FUN_021D7800
+ bl MOD04_021D7800
cmp r0, #0xa
blt _02032F4A
ldr r0, _02032F88 ; =FUN_02032EAC
@@ -97620,7 +97620,7 @@ _02032F94: .word FUN_02032EA8
FUN_02032F98: ; 0x02032F98
push {r3, lr}
mov r0, #0x1
- bl FUN_021D7800
+ bl MOD04_021D7800
cmp r0, #0x0
bge _02032FB2
bl FUN_02032F20
@@ -97633,7 +97633,7 @@ _02032FB2:
ldr r0, [r0, #0x0]
add r0, #0x42
ldrb r0, [r0, #0x0]
- bl FUN_021D8494
+ bl MOD04_021D8494
cmp r0, #0x0
beq _02032FCE
bl FUN_0202FC60
@@ -97653,7 +97653,7 @@ FUN_02032FDC: ; 0x02032FDC
add r4, r0, #0x0
ldr r0, _02032FFC ; =FUN_020303BC
ldr r1, _02033000 ; =FUN_02030238
- bl FUN_021D77C4
+ bl MOD04_021D77C4
ldr r0, _02033004 ; =0x021C5A00
mov r1, #0x0
ldr r0, [r0, #0x0]
@@ -97719,10 +97719,10 @@ FUN_02033060: ; 0x02033060
push {r3, lr}
ldr r0, _02033090 ; =FUN_020303BC
ldr r1, _02033094 ; =FUN_02030238
- bl FUN_021D77C4
+ bl MOD04_021D77C4
mov r0, #0x0
mvn r0, r0
- bl FUN_021D8494
+ bl MOD04_021D8494
cmp r0, #0x0
beq _0203308C
ldr r0, _02033098 ; =0x021C5A00
@@ -97751,16 +97751,16 @@ FUN_020330A0: ; 0x020330A0
ldr r0, [r0, #0x0]
add r0, #0x41
ldrb r0, [r0, #0x0]
- bl FUN_021D82BC
+ bl MOD04_021D82BC
cmp r0, #0x0
beq _020330C6
- bl FUN_021D836C
+ bl MOD04_021D836C
ldr r0, _020330DC ; =FUN_02033060
mov r1, #0x0
bl FUN_02031D20
pop {r3, pc}
_020330C6:
- bl FUN_021D7F8C
+ bl MOD04_021D7F8C
cmp r0, #0x0
bge _020330D6
ldr r0, _020330E0 ; =FUN_02032E8C
@@ -97873,15 +97873,15 @@ FUN_0203318C: ; 0x0203318C
mov r0, #0x0
bl FUN_020313A0
mov r0, #0x0
- bl FUN_021D82BC
+ bl MOD04_021D82BC
cmp r0, #0x0
beq _020331AA
- bl FUN_021D836C
+ bl MOD04_021D836C
ldr r0, _020331BC ; =FUN_02032440
mov r1, #0x0
bl FUN_02031D20
_020331AA:
- bl FUN_021D7F8C
+ bl MOD04_021D7F8C
cmp r0, #0x0
bge _020331BA
ldr r0, _020331C0 ; =FUN_02032E8C
@@ -98149,10 +98149,10 @@ _020333AA:
bne _020333C8
add r0, sp, #0x4
add r1, sp, #0x0
- bl FUN_021DD718
+ bl MOD04_021DD718
cmp r0, #0x0
beq _020333E4
- bl FUN_021DD6F0
+ bl MOD04_021DD6F0
add sp, #0x8
mov r0, #0x1
pop {r3, pc}
@@ -98161,7 +98161,7 @@ _020333C8:
bne _020333E4
add r0, sp, #0x4
add r1, sp, #0x0
- bl FUN_021DD718
+ bl MOD04_021DD718
cmp r0, #0x0
beq _020333E4
ldr r0, [sp, #0x0]
@@ -98180,7 +98180,7 @@ _020333EC: .word 0x021C5A00
thumb_func_start FUN_020333F0
FUN_020333F0: ; 0x020333F0
push {r3, lr}
- bl FUN_021D76AC
+ bl MOD04_021D76AC
cmp r0, #0x0
bge _02033408
bl FUN_02032F20
@@ -98222,7 +98222,7 @@ FUN_0203341C: ; 0x0203341C
ldr r0, [r0, #0x28]
bl MOD05_021D74E0
ldr r0, _02033464 ; =FUN_020335D0
- bl FUN_021D83A8
+ bl MOD04_021D83A8
bl FUN_0202FA10
ldr r0, _02033468 ; =FUN_020333F0
mov r1, #0x0
@@ -102476,7 +102476,7 @@ _02035398:
add r0, r6, #0x0
bl FUN_02035734
mov r0, #0x1
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
mov r0, #0xe
strh r0, [r4, #0x2a]
b _02035484
@@ -102486,7 +102486,7 @@ _020353C0:
cmp r0, #0x0
beq _02035484
mov r0, #0x1
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
mov r0, #0x9
strh r0, [r4, #0x2a]
b _02035484
@@ -102511,7 +102511,7 @@ _020353F6:
ldr r0, [r5, #0x34]
bl FUN_02058780
mov r0, #0x1
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
mov r0, #0xb
strh r0, [r4, #0x2a]
b _02035484
@@ -103217,7 +103217,7 @@ FUN_020359B8: ; 0x020359B8
add r0, #0x38
mov r2, #0x8
mov r3, #0xb
- bl FUN_021D959C
+ bl MOD05_021D959C
mov r0, #0x2
str r0, [sp, #0x0]
mov r0, #0x1
@@ -103229,7 +103229,7 @@ FUN_020359B8: ; 0x020359B8
mov r2, #0x5
add r0, #0x38
mov r3, #0x0
- bl FUN_021D967C
+ bl MOD05_021D967C
ldr r0, _02035B64 ; =0x000034D8
mov r1, #0x42
str r0, [sp, #0x0]
@@ -103237,7 +103237,7 @@ FUN_020359B8: ; 0x020359B8
mov r2, #0x1
add r0, #0x38
mov r3, #0x0
- bl FUN_021D96F4
+ bl MOD05_021D96F4
ldr r0, _02035B64 ; =0x000034D8
mov r2, #0x0
str r0, [sp, #0x0]
@@ -103245,7 +103245,7 @@ FUN_020359B8: ; 0x020359B8
mov r1, #0x42
add r0, #0x38
add r3, r2, #0x0
- bl FUN_021D9708
+ bl MOD05_021D9708
mov r0, #0x1
str r0, [sp, #0x0]
ldr r0, _02035B64 ; =0x000034D8
@@ -103255,11 +103255,11 @@ FUN_020359B8: ; 0x020359B8
mov r2, #0x2
add r0, #0x38
mov r3, #0x0
- bl FUN_021D971C
+ bl MOD05_021D971C
ldr r0, [sp, #0xc]
ldr r1, _02035B68 ; =0x020F2B14
add r0, #0x38
- bl FUN_021D9820
+ bl MOD05_021D9820
mov r2, #0x67
ldr r1, [sp, #0xc]
lsl r2, r2, #0x2
@@ -103276,7 +103276,7 @@ FUN_020359B8: ; 0x020359B8
mov r2, #0x4
add r0, #0x38
mov r3, #0x0
- bl FUN_021D96F4
+ bl MOD05_021D96F4
ldr r0, _02035B6C ; =0x000034D9
mov r1, #0x42
str r0, [sp, #0x0]
@@ -103284,7 +103284,7 @@ FUN_020359B8: ; 0x020359B8
mov r2, #0x3
add r0, #0x38
mov r3, #0x0
- bl FUN_021D9708
+ bl MOD05_021D9708
mov r0, #0x1
str r0, [sp, #0x0]
ldr r0, _02035B6C ; =0x000034D9
@@ -103294,7 +103294,7 @@ FUN_020359B8: ; 0x020359B8
mov r2, #0x6
add r0, #0x38
mov r3, #0x0
- bl FUN_021D971C
+ bl MOD05_021D971C
ldr r0, [sp, #0x14]
mov r4, #0x0
cmp r0, #0x0
@@ -103352,7 +103352,7 @@ _02035AF2:
ldr r0, [sp, #0xc]
add r1, sp, #0x68
add r0, #0x38
- bl FUN_021D9820
+ bl MOD05_021D9820
mov r1, #0x1a
lsl r1, r1, #0x4
add r2, sp, #0x5c
@@ -103437,7 +103437,7 @@ _02035B90:
_02035BA6:
add r5, #0x38
add r0, r5, #0x0
- bl FUN_021D99F8
+ bl MOD05_021D99F8
pop {r3-r7, pc}
thumb_func_start FUN_02035BB0
@@ -103629,7 +103629,7 @@ FUN_02035D10: ; 0x02035D10
bl FUN_0204652C
add r4, r0, #0x0
mov r0, #0x0
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
mov r0, #0x72
ldr r1, _02035D30 ; =FUN_02035D34
lsl r0, r0, #0x2
@@ -103736,7 +103736,7 @@ FUN_02035DF8: ; 0x02035DF8
bl FUN_0204652C
add r4, r0, #0x0
mov r0, #0x0
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
mov r0, #0x72
ldr r1, _02035E18 ; =FUN_02035E1C
lsl r0, r0, #0x2
@@ -104266,7 +104266,7 @@ FUN_02036284: ; 0x02036284
bl FUN_0204652C
add r4, r0, #0x0
mov r0, #0x0
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
mov r0, #0x72
ldr r1, _020362A4 ; =FUN_020362A8
lsl r0, r0, #0x2
@@ -104561,7 +104561,7 @@ FUN_02036510: ; 0x02036510
bl FUN_0204652C
add r4, r0, #0x0
mov r0, #0x0
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
mov r0, #0x72
ldr r1, _02036530 ; =FUN_02036534
lsl r0, r0, #0x2
@@ -104740,7 +104740,7 @@ FUN_02036684: ; 0x02036684
bl FUN_0204652C
add r4, r0, #0x0
mov r0, #0x0
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
mov r0, #0x72
ldr r1, _020366A4 ; =FUN_020366A8
lsl r0, r0, #0x2
@@ -104801,7 +104801,7 @@ FUN_02036700: ; 0x02036700
bl FUN_0204652C
add r4, r0, #0x0
mov r0, #0x0
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
mov r0, #0x72
ldr r1, _02036720 ; =FUN_02036724
lsl r0, r0, #0x2
@@ -106308,17 +106308,17 @@ _0203732E:
FUN_02037334: ; 0x02037334
push {r3, lr}
bl FUN_020374B0
- ldr r0, _02037348 ; =0x0000003F
+ ldr r0, _02037348 ; =SDK_OVERLAY_MODULE_63_ID
ldr r1, _0203734C ; =0x021DBAB8
bl FUN_02000E7C
mov r0, #0x1
pop {r3, pc}
nop
-_02037348: .word 0x0000003F
+_02037348: .word SDK_OVERLAY_MODULE_63_ID
_0203734C: .word 0x021DBAB8
- thumb_func_start FUN_02037350
-FUN_02037350: ; 0x02037350
+ thumb_func_start LoadOverlay_MODULE_05
+LoadOverlay_MODULE_05: ; 0x02037350
push {r4, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x0]
@@ -106333,7 +106333,7 @@ _02037360:
beq _0203736C
bl ErrorHandling
_0203736C:
- ldr r0, _0203738C ; =0x00000005
+ ldr r0, _0203738C ; =SDK_OVERLAY_MODULE_05_ID
mov r1, #0x2
bl HandleLoadOverlay
mov r1, #0x0
@@ -106348,7 +106348,7 @@ _0203736C:
str r0, [r1, #0x0]
pop {r4, pc}
.balign 4
-_0203738C: .word 0x00000005
+_0203738C: .word SDK_OVERLAY_MODULE_05_ID
_02037390: .word 0x021F64C8
thumb_func_start FUN_02037394
@@ -106564,7 +106564,7 @@ FUN_02037524: ; 0x02037524
mov r1, #0x0
add r0, r4, #0x0
add r2, r1, #0x0
- bl FUN_021EFA9C
+ bl MOD05_021EFA9C
_02037546:
ldr r0, [r4, #0x0]
ldr r1, [r0, #0x0]
@@ -106575,7 +106575,7 @@ _02037546:
ldr r0, [r0, #0x0]
cmp r0, #0x0
bne _0203756E
- ldr r0, _02037590 ; =0x00000005
+ ldr r0, _02037590 ; =SDK_OVERLAY_MODULE_05_ID
bl UnloadOverlayByID
b _0203756E
_02037562:
@@ -106604,7 +106604,7 @@ _0203758C:
mov r0, #0x0
pop {r4, pc}
.balign 4
-_02037590: .word 0x00000005
+_02037590: .word SDK_OVERLAY_MODULE_05_ID
thumb_func_start FUN_02037594
FUN_02037594: ; 0x02037594
@@ -106637,7 +106637,7 @@ _020375B4:
add r1, r4, #0x0
lsr r2, r2, #0x10
lsr r3, r3, #0x10
- bl FUN_021D8164
+ bl MOD05_021D8164
_020375D4:
ldr r0, [r4, #0x1c]
ldr r2, [r4, #0x6c]
@@ -106669,7 +106669,7 @@ _020375FC:
beq _02037610
add r0, sp, #0x8
add r1, r4, #0x0
- bl FUN_021D85FC
+ bl MOD05_021D85FC
_02037610:
add r0, r4, #0x0
add r1, r5, #0x0
@@ -106684,7 +106684,7 @@ _0203761C:
beq _02037638
add r0, sp, #0x8
add r1, r4, #0x0
- bl FUN_021D865C
+ bl MOD04_021D865C
cmp r0, #0x1
bne _0203763A
mov r5, #0x0
@@ -106704,7 +106704,7 @@ _02037646:
_0203764C:
add r0, sp, #0x8
add r1, r4, #0x0
- bl FUN_021D8758
+ bl MOD05_021D8758
cmp r0, #0x1
beq _02037754
add r3, sp, #0x8
@@ -106724,21 +106724,21 @@ _02037672:
beq _02037754
add r0, sp, #0x8
add r1, r4, #0x0
- bl FUN_021D8820
+ bl MOD05_021D8820
cmp r0, #0x1
bne _020376A6
ldr r0, [r4, #0x4]
ldr r0, [r0, #0x8]
- bl FUN_021E32F0
+ bl MOD05_021E32F0
add r0, r4, #0x0
mov r1, #0x4
- bl FUN_021E81BC
+ bl MOD05_021E81BC
ldr r0, [r4, #0x38]
- bl FUN_021E7138
+ bl MOD05_021E7138
add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x1
- bl FUN_021EFA9C
+ bl MOD05_021EFA9C
add sp, #0x10
pop {r3-r5, pc}
_020376A6:
@@ -106749,13 +106749,13 @@ _020376A6:
beq _020376B8
ldr r0, [r4, #0x4]
ldr r0, [r0, #0x8]
- bl FUN_021E32F0
+ bl MOD05_021E32F0
_020376B8:
mov r5, #0x0
bl FUN_02037790
cmp r0, #0x0
beq _020376C8
- bl FUN_02252534
+ bl MOD20_02252534
add r5, r0, #0x0
_020376C8:
add r3, sp, #0x8
@@ -106775,23 +106775,23 @@ _020376E2:
beq _02037754
add r0, sp, #0x8
add r1, r4, #0x0
- bl FUN_021D8320
+ bl MOD05_021D8320
cmp r0, #0x1
bne _0203771C
ldr r0, [r4, #0x4]
ldr r0, [r0, #0x8]
- bl FUN_021E32F0
+ bl MOD05_021E32F0
add r0, r4, #0x0
mov r1, #0x4
- bl FUN_021E81BC
+ bl MOD05_021E81BC
ldr r0, [r4, #0x38]
bl FUN_02055B14
ldr r0, [r4, #0x38]
- bl FUN_021E7138
+ bl MOD05_021E7138
add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x1
- bl FUN_021EFA9C
+ bl MOD05_021EFA9C
add sp, #0x10
pop {r3-r5, pc}
_0203771C:
@@ -106802,13 +106802,13 @@ _0203771C:
beq _0203772E
ldr r0, [r4, #0x4]
ldr r0, [r0, #0x8]
- bl FUN_021E32F0
+ bl MOD05_021E32F0
_0203772E:
mov r5, #0x0
bl FUN_02037790
cmp r0, #0x0
beq _0203773E
- bl FUN_02252534
+ bl MOD20_02252534
add r5, r0, #0x0
_0203773E:
add r3, sp, #0x8
@@ -106923,7 +106923,7 @@ FUN_020377F0: ; 0x020377F0
thumb_func_start FUN_020377F4
FUN_020377F4: ; 0x020377F4
push {r3, lr}
- bl FUN_0222D5C0
+ bl MOD11_0222D5C0
cmp r0, #0x0
beq _02037802
mov r0, #0x1
@@ -109041,7 +109041,7 @@ FUN_020388B4: ; 0x020388B4
add r4, r0, #0x0
ldr r0, [r4, #0xc]
bl FUN_0206BB1C
- bl FUN_021ED49C
+ bl MOD05_021ED49C
add r5, r0, #0x0
bne _020388CC
bl ErrorHandling
@@ -109269,11 +109269,11 @@ FUN_02038AB0: ; 0x02038AB0
push {r4, lr}
bl FUN_0204652C
add r4, r0, #0x0
- bl FUN_0224D79C
+ bl MOD06_0224D79C
cmp r0, #0x1
bne _02038ACA
add r0, r4, #0x0
- bl FUN_0224D76C
+ bl MOD06_0224D76C
mov r0, #0x1
pop {r4, pc}
_02038ACA:
@@ -109290,7 +109290,7 @@ FUN_02038AD0: ; 0x02038AD0
ldr r1, [r2, #0xc]
ldr r2, [r2, #0x8]
mov r0, #0x4
- bl FUN_0224D70C
+ bl MOD06_0224D70C
add r2, r0, #0x0
ldr r1, _02038AF0 ; =FUN_02038AB0
add r0, r4, #0x0
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index 785e5b48..dadbc8aa 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -224,7 +224,7 @@ _02038E32:
add r0, r4, #0x0
mov r1, #0x0
mov r2, #0xdc
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, _02038E44 ; =0x0003643F
str r0, [r4, #0x0]
add r0, r4, #0x0
@@ -1187,7 +1187,7 @@ FUN_02039564: ; 0x02039564
bl FUN_02046380
mov r1, #0x0
mov r2, #0x40
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
pop {r4, pc}
.balign 4
@@ -1540,14 +1540,14 @@ _020397EC:
sub r1, r0, r1
mov r0, #0x7
sub r0, r0, r1
- blx abs
+ bl abs
strh r0, [r5, #0x0]
ldr r1, [r4, #0x8]
ldr r0, [sp, #0x14]
sub r1, r0, r1
mov r0, #0x7
sub r0, r0, r1
- blx abs
+ bl abs
strh r0, [r5, #0x2]
add r5, r5, #0x6
add r6, r6, #0x1
diff --git a/arm9/asm/unk_02046030.s b/arm9/asm/unk_02046030.s
index 872e976a..874a600a 100644
--- a/arm9/asm/unk_02046030.s
+++ b/arm9/asm/unk_02046030.s
@@ -597,10 +597,10 @@ _02046496:
thumb_func_start FUN_0204649C
FUN_0204649C: ; 0x0204649C
- ldr r3, _020464A0 ; =FUN_02037350
+ ldr r3, _020464A0 ; =LoadOverlay_MODULE_05
bx r3
.balign 4
-_020464A0: .word FUN_02037350
+_020464A0: .word LoadOverlay_MODULE_05
thumb_func_start FUN_020464A4
FUN_020464A4: ; 0x020464A4
@@ -1231,7 +1231,7 @@ FUN_02046948: ; 0x02046948
bl FUN_02046528
add r1, r0, #0x0
add r0, r4, #0x0
- bl FUN_02244558
+ bl MOD06_02244558
add r4, r0, #0x0
bl FUN_020475A0
add r6, r0, #0x0
@@ -1507,7 +1507,7 @@ _02046BA0:
_02046BAE:
ldr r1, [r4, #0x10]
add r0, r5, #0x0
- bl FUN_02248724
+ bl MOD06_02248724
add r0, r6, #0x0
bl FUN_0204B00C
ldr r0, [r4, #0x0]
@@ -1769,7 +1769,7 @@ FUN_02046DB4: ; 0x02046DB4
str r1, [r4, r0]
add r0, r5, #0x0
add r1, r4, #0x0
- bl FUN_0223CCDC
+ bl MOD06_0223CCDC
ldr r0, [r5, #0xc]
bl FUN_02029FC8
mov r1, #0x7
@@ -1811,7 +1811,7 @@ FUN_02046E18: ; 0x02046E18
add r0, r5, #0x0
add r1, r7, #0x0
add r3, r4, #0x0
- bl FUN_0223CD7C
+ bl MOD06_0223CD7C
ldr r0, [sp, #0x20]
cmp r0, #0x0
beq _02046E60
@@ -1991,7 +1991,7 @@ FUN_02046FA0: ; 0x02046FA0
add r1, r6, #0x0
add r2, r7, #0x0
add r3, r4, #0x0
- bl FUN_0223CD7C
+ bl MOD06_0223CD7C
mov r0, #0x63
mov r1, #0x1
lsl r0, r0, #0x2
@@ -2691,7 +2691,7 @@ _0204756A:
cmp r0, r1
bne _0204757C
add r0, r4, #0x0
- bl FUN_021E495C
+ bl MOD05_021E495C
_0204757C:
pop {r3-r5, pc}
nop
@@ -2910,7 +2910,7 @@ FUN_020476CC: ; 0x020476CC
mov r1, #0x0
lsl r2, r2, #0x2
add r7, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r1, #0x63
str r4, [r7, #0x0]
mov r0, #0x0
@@ -2926,7 +2926,7 @@ _020476FA:
add r1, r4, #0x0
mov r2, #0x34
str r0, [r6, #0x18]
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
ldr r0, [sp, #0x0]
add r6, r6, #0x4
add r0, r0, #0x1
@@ -3034,7 +3034,7 @@ _02047774:
add r0, r2, #0x4
add r0, r7, r0
mov r2, #0xc
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r7, #0x0
pop {r3-r7, pc}
@@ -4191,7 +4191,7 @@ _0204817A:
add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x24
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
mov r0, #0x0
str r0, [r4, #0x0]
str r5, [r4, #0x4]
@@ -4788,7 +4788,7 @@ _02048666:
mov r0, #0x4
bl FUN_020168D0
mov r0, #0x0
- blx OS_ResetSystem
+ bl OS_ResetSystem
add sp, #0xc
mov r0, #0x1
pop {r4-r7, pc}
@@ -5889,7 +5889,7 @@ _02048F9A:
str r1, [r6, #0x0]
add r0, r4, #0x0
add r2, r6, #0x0
- bl FUN_021E7750
+ bl MOD05_021E7750
ldr r0, [r5, #0x0]
add r0, r0, #0x1
str r0, [r5, #0x0]
@@ -6460,7 +6460,7 @@ _02049408:
str r0, [r4, #0x0]
b _0204942C
_02049416:
- bl FUN_021E331C
+ bl MOD05_021E331C
add r0, r5, #0x0
bl FUN_02049430
ldr r0, [r4, #0x0]
@@ -6494,7 +6494,7 @@ _02049452:
bl FUN_020553E8
add r1, r0, #0x0
add r0, r5, #0x0
- bl FUN_022483BC
+ bl MOD06_022483BC
str r0, [r4, #0x4]
ldr r1, _02049470 ; =FUN_02049474
add r0, r6, #0x0
@@ -6510,11 +6510,11 @@ FUN_02049474: ; 0x02049474
bl FUN_0204652C
add r4, r0, #0x0
ldr r0, [r4, #0x4]
- bl FUN_022483E0
+ bl MOD06_022483E0
cmp r0, #0x1
bne _02049490
ldr r0, [r4, #0x4]
- bl FUN_022483EC
+ bl MOD06_022483EC
mov r0, #0x1
pop {r4, pc}
_02049490:
@@ -6710,7 +6710,7 @@ _020495F0:
b _02049616
_020495FE:
add r0, r6, #0x0
- bl FUN_021E331C
+ bl MOD05_021E331C
add r0, r5, #0x0
bl FUN_0204961C
ldr r0, [r4, #0x0]
@@ -6744,7 +6744,7 @@ _0204963E:
ldr r2, [r6, #0x4]
add r0, r4, #0x0
mov r1, #0x4
- bl FUN_0224C8C8
+ bl MOD06_0224C8C8
add r2, r0, #0x0
ldr r1, _02049654 ; =0x0224C8E9
add r0, r5, #0x0
@@ -6785,7 +6785,7 @@ _0204968E:
add r0, r7, #0x0
mov r1, #0x1
add r2, r4, #0x4
- bl FUN_021E7750
+ bl MOD05_021E7750
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -6829,7 +6829,7 @@ _020496EA:
str r1, [r4, #0x4]
add r0, r7, #0x0
add r2, r4, #0x4
- bl FUN_021E7750
+ bl MOD05_021E7750
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -6863,7 +6863,7 @@ FUN_02049718: ; 0x02049718
mov r1, #0x0
mov r2, #0x1c
add r7, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, [r5, #0x38]
bl FUN_020552F8
mov r1, #0x0
@@ -7152,9 +7152,9 @@ _02049976:
add r0, r5, #0x0
mov r1, #0xb
mov r2, #0x3
- bl FUN_021E8588
+ bl MOD05_021E8588
str r0, [r4, #0x20]
- bl FUN_021E84F4
+ bl MOD05_021E84F4
add r3, r4, #0x0
mov r2, #0x0
ldr r1, _02049AC4 ; =0x000007D5
@@ -7176,9 +7176,9 @@ _020499A2:
b _02049AB2
_020499B2:
ldr r0, [r4, #0x20]
- bl FUN_021E856C
+ bl MOD05_021E856C
ldr r0, [r4, #0x20]
- bl FUN_021E85E4
+ bl MOD05_021E85E4
ldrh r0, [r4, #0x1c]
cmp r0, #0x0
bne _020499CA
@@ -7225,7 +7225,7 @@ _02049A06:
_02049A14:
mov r0, #0x1
str r0, [r5, #0x6c]
- ldr r0, _02049AC8 ; =0x00000012
+ ldr r0, _02049AC8 ; =SDK_OVERLAY_MODULE_18_ID
mov r1, #0x2
bl HandleLoadOverlay
add r0, r5, #0x0
@@ -7265,7 +7265,7 @@ _02049A64:
beq _02049AB2
bl FUN_0204FCA0
add r0, r5, #0x0
- bl FUN_02244824
+ bl MOD18_02244824
mov r1, #0x0
str r0, [r5, #0x68]
mov r0, #0x2
@@ -7285,7 +7285,7 @@ _02049A96:
cmp r0, #0x0
beq _02049AB2
mov r0, #0x1
- bl FUN_02247970
+ bl MOD18_02247970
add r0, r4, #0x0
bl FUN_02016A18
add sp, #0x8
@@ -7300,7 +7300,7 @@ _02049AB8: .word 0x000003D9
_02049ABC: .word 0x020F46D8
_02049AC0: .word 0x000007F2
_02049AC4: .word 0x000007D5
-_02049AC8: .word 0x00000012
+_02049AC8: .word SDK_OVERLAY_MODULE_18_ID
thumb_func_start FUN_02049ACC
FUN_02049ACC: ; 0x02049ACC
@@ -7332,10 +7332,10 @@ _02049AF2: ; jump table (using 16-bit offset)
.short _02049BD2 - _02049AF2 - 2; case 7
_02049B02:
mov r0, #0x0
- bl FUN_02247970
+ bl MOD18_02247970
bl FUN_0204FCD8
ldr r0, [r5, #0x68]
- bl FUN_0224484C
+ bl MOD18_0224484C
mov r0, #0x2
str r0, [sp, #0x0]
mov r0, #0x1e
@@ -7386,7 +7386,7 @@ _02049B68:
_02049B76:
mov r0, #0x0
str r0, [r5, #0x6c]
- ldr r0, _02049BE4 ; =0x00000012
+ ldr r0, _02049BE4 ; =SDK_OVERLAY_MODULE_18_ID
bl UnloadOverlayByID
ldr r0, [r4, #0x14]
mov r2, #0x1
@@ -7435,7 +7435,7 @@ _02049BDC:
add sp, #0x8
pop {r4-r6, pc}
nop
-_02049BE4: .word 0x00000012
+_02049BE4: .word SDK_OVERLAY_MODULE_18_ID
thumb_func_start FUN_02049BE8
FUN_02049BE8: ; 0x02049BE8
@@ -7614,7 +7614,7 @@ _02049D30:
add r0, r7, #0x0
mov r1, #0x1
add r2, r5, #0x4
- bl FUN_021E7750
+ bl MOD05_021E7750
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -7675,7 +7675,7 @@ FUN_02049D9C: ; 0x02049D9C
add r6, r0, #0x0
mov r1, #0x0
mov r2, #0x1c
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r2, r6, #0x0
ldmia r4!, {r0-r1}
add r2, #0x8
@@ -7768,7 +7768,7 @@ _02049E74:
str r1, [r5, #0x4]
add r0, r7, #0x0
add r2, r5, #0x4
- bl FUN_021E7750
+ bl MOD05_021E7750
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@@ -7806,7 +7806,7 @@ FUN_02049EA4: ; 0x02049EA4
mov r1, #0x0
mov r2, #0x1c
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r7, #0x0
add r1, r5, #0x0
bl FUN_02048CB0
@@ -8074,7 +8074,7 @@ FUN_0204A0C8: ; 0x0204A0C8
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r7, #0x0
- bl FUN_021ECF14
+ bl MOD05_021ECF14
add r0, r6, #0x0
add r1, r4, #0x0
bl FUN_0206B900
@@ -8608,7 +8608,7 @@ FUN_0204A4A4: ; 0x0204A4A4
ldr r2, [r2, #0x0]
add r0, r7, #0x0
add r3, sp, #0x28
- bl FUN_021F4520
+ bl MOD05_021F4520
str r0, [sp, #0x20]
lsr r0, r7, #0x5
str r0, [sp, #0x18]
@@ -8632,7 +8632,7 @@ FUN_0204A4A4: ; 0x0204A4A4
mul r0, r1
ldr r1, [sp, #0xc]
add r0, r7, r0
- bl FUN_021EF620
+ bl MOD05_021EF620
ldr r2, [sp, #0x14]
add r1, r0, #0x0
add r3, r2, #0x0
@@ -8641,7 +8641,7 @@ FUN_0204A4A4: ; 0x0204A4A4
mul r3, r0
ldr r0, [sp, #0x18]
add r0, r0, r3
- bl FUN_021EF654
+ bl MOD05_021EF654
add r1, r0, #0x0
cmp r1, #0x3
bls _0204A53C
@@ -8651,14 +8651,14 @@ _0204A53C:
lsl r1, r1, #0x18
ldr r0, [sp, #0x8]
lsr r1, r1, #0x18
- bl FUN_021EF8C8
+ bl MOD05_021EF8C8
add r3, r0, #0x0
add r0, sp, #0x30
str r0, [sp, #0x0]
ldr r0, [sp, #0x4]
ldr r1, [sp, #0x2c]
ldr r2, [sp, #0x34]
- bl FUN_021F3DA4
+ bl MOD05_021F3DA4
add r4, r0, #0x0
_0204A558:
ldr r0, [sp, #0x20]
@@ -8668,7 +8668,7 @@ _0204A558:
add r5, #0x9c
ldrb r0, [r0, #0x0]
ldr r1, [r5, #0x0]
- bl FUN_021F4568
+ bl MOD05_021F4568
add r5, r0, #0x0
cmp r4, #0x0
beq _0204A59E
@@ -8731,7 +8731,7 @@ FUN_0204A5C0: ; 0x0204A5C0
asr r1, r1, #0x10
asr r2, r2, #0x10
mov r3, #0x0
- bl FUN_021EF844
+ bl MOD05_021EF844
ldr r1, [sp, #0x8]
cmp r1, #0x0
beq _0204A5EE
@@ -8758,7 +8758,7 @@ FUN_0204A5F4: ; 0x0204A5F4
add r3, sp, #0x0
add r5, r1, #0x0
add r6, r2, #0x0
- bl FUN_021EF844
+ bl MOD05_021EF844
cmp r0, #0x0
bne _0204A612
mov r0, #0xff
@@ -8769,7 +8769,7 @@ _0204A612:
add r1, sp, #0x0
ldrb r1, [r1, #0x0]
add r0, r7, #0x0
- bl FUN_021EF8DC
+ bl MOD05_021EF8DC
lsr r2, r5, #0x1f
lsl r1, r5, #0x1b
sub r1, r1, r2
@@ -9114,7 +9114,7 @@ FUN_0204A87C: ; 0x0204A87C
add r4, r2, #0x0
add r0, sp, #0x0
add r1, r3, #0x0
- bl FUN_021E7EA0
+ bl MOD05_021E7EA0
ldr r1, [sp, #0x0]
ldr r0, [r4, #0x0]
ldr r2, [sp, #0x8]
@@ -9159,11 +9159,11 @@ _0204A8D4:
ldr r0, [sp, #0x8]
ldr r1, [r1, #0x24]
add r2, sp, #0xc
- bl FUN_021EF604
+ bl MOD05_021EF604
ldr r0, [sp, #0x0]
ldr r1, [sp, #0x8]
ldr r0, [r0, #0x24]
- bl FUN_021EF824
+ bl MOD05_021EF824
add r4, r0, #0x0
ldr r0, [sp, #0x0]
ldr r0, [r0, #0x28]
@@ -9176,7 +9176,7 @@ _0204A8D4:
_0204A900:
ldr r0, [sp, #0xc]
add r1, r5, #0x0
- bl FUN_021E7ED0
+ bl MOD05_021E7ED0
add r1, r7, #0x0
add r2, sp, #0x10
add r4, r0, #0x0
@@ -9184,7 +9184,7 @@ _0204A900:
cmp r0, #0x0
beq _0204A92E
add r0, r4, #0x0
- bl FUN_021E7EC4
+ bl MOD05_021E7EC4
cmp r0, r6
bne _0204A92E
ldr r0, [sp, #0x4]
@@ -9227,11 +9227,11 @@ _0204A95C:
ldr r0, [sp, #0x8]
ldr r1, [r1, #0x24]
add r2, sp, #0xc
- bl FUN_021EF604
+ bl MOD05_021EF604
ldr r0, [sp, #0x0]
ldr r1, [sp, #0x8]
ldr r0, [r0, #0x24]
- bl FUN_021EF824
+ bl MOD05_021EF824
add r6, r0, #0x0
ldr r0, [sp, #0x0]
ldr r0, [r0, #0x28]
@@ -9244,7 +9244,7 @@ _0204A95C:
_0204A988:
ldr r0, [sp, #0xc]
add r1, r6, #0x0
- bl FUN_021E7ED0
+ bl MOD05_021E7ED0
ldr r1, [sp, #0x4]
add r2, sp, #0x10
add r7, r0, #0x0
@@ -9252,7 +9252,7 @@ _0204A988:
cmp r0, #0x0
beq _0204A9D2
add r0, r7, #0x0
- bl FUN_021E7EC4
+ bl MOD05_021E7EC4
mov r1, #0x0
cmp r4, #0x0
bls _0204A9D2
@@ -9311,14 +9311,14 @@ _0204A9FE:
add r0, r7, #0x0
ldr r1, [r1, #0x24]
add r2, sp, #0xc
- bl FUN_021EF604
+ bl MOD05_021EF604
mov r4, #0x0
_0204AA0C:
ldr r0, [sp, #0xc]
add r1, r4, #0x0
- bl FUN_021E7ED0
+ bl MOD05_021E7ED0
add r6, r0, #0x0
- bl FUN_021E7EC4
+ bl MOD05_021E7EC4
cmp r0, r5
bne _0204AA40
ldr r0, [sp, #0x4]
@@ -9332,7 +9332,7 @@ _0204AA26:
ldr r0, [sp, #0x0]
add r1, r7, #0x0
ldr r0, [r0, #0x24]
- bl FUN_021EF824
+ bl MOD05_021EF824
ldr r1, [sp, #0x8]
str r0, [r1, #0x0]
_0204AA3A:
@@ -9370,14 +9370,14 @@ _0204AA6C:
ldr r0, [sp, #0x8]
ldr r1, [r1, #0x24]
add r2, sp, #0xc
- bl FUN_021EF604
+ bl MOD05_021EF604
mov r6, #0x0
_0204AA7A:
ldr r0, [sp, #0xc]
add r1, r6, #0x0
- bl FUN_021E7ED0
+ bl MOD05_021E7ED0
add r7, r0, #0x0
- bl FUN_021E7EC4
+ bl MOD05_021E7EC4
mov r1, #0x0
cmp r4, #0x0
bls _0204AAB6
@@ -9432,7 +9432,7 @@ FUN_0204AAD4: ; 0x0204AAD4
add r5, r0, #0x0
add r6, r1, #0x0
str r2, [r4, #0x8]
- blx _s32_div_f
+ bl _s32_div_f
lsl r1, r1, #0x10
lsr r1, r1, #0x10
ldr r0, [r4, #0x0]
@@ -9441,7 +9441,7 @@ FUN_0204AAD4: ; 0x0204AAD4
str r0, [r4, #0x0]
add r0, r5, #0x0
add r1, r6, #0x0
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r0, r0, #0x10
ldr r1, [r4, #0x8]
@@ -9890,7 +9890,7 @@ _0204AE28:
ldr r0, [r4, #0x0]
mov r1, #0x6
add r0, r0, #0x1
- blx _s32_div_f
+ bl _s32_div_f
str r1, [r4, #0x0]
_0204AE58:
pop {r4, pc}
@@ -9933,7 +9933,7 @@ _0204AE74:
ldr r0, [r4, #0x0]
mov r1, #0x6
add r0, r0, #0x1
- blx _s32_div_f
+ bl _s32_div_f
str r1, [r4, #0x0]
_0204AEA6:
pop {r4, pc}
@@ -9957,7 +9957,7 @@ _0204AEC6:
ldr r0, [r4, #0x8]
add r1, r5, #0x0
add r2, r4, #0x4
- bl FUN_021E3444
+ bl MOD05_021E3444
ldr r1, [r4, #0xc]
mov r0, #0x5
lsl r1, r1, #0x10
@@ -10221,7 +10221,7 @@ _0204B0C0:
str r0, [r4, #0x0]
b _0204B0E4
_0204B0CE:
- bl FUN_021E331C
+ bl MOD05_021E331C
add r0, r5, #0x0
bl FUN_0204B00C
ldr r0, [r4, #0x0]
@@ -10279,7 +10279,7 @@ FUN_0204B130: ; 0x0204B130
add r6, r0, #0x0
add r5, r1, #0x0
add r0, r2, #0x0
- blx RTC_ConvertDateToDay
+ bl RTC_ConvertDateToDay
ldr r1, [r5, #0x20]
add r4, r0, #0x0
cmp r4, r1
@@ -10306,13 +10306,13 @@ FUN_0204B158: ; 0x0204B158
add r5, r1, #0x0
add r0, r4, #0x0
add r1, r6, #0x0
- blx RTC_ConvertDateTimeToSecond
+ bl RTC_ConvertDateTimeToSecond
str r1, [sp, #0x8]
add r1, r5, #0x0
add r7, r0, #0x0
add r0, r5, #0x4
add r1, #0x14
- blx RTC_ConvertDateTimeToSecond
+ bl RTC_ConvertDateTimeToSecond
add r2, r1, #0x0
sub r1, r7, r0
ldr r1, [sp, #0x8]
@@ -10337,7 +10337,7 @@ _0204B19C:
mov r2, #0x3c
mov r3, #0x0
str r1, [sp, #0x8]
- blx _ll_sdiv
+ bl _ll_sdiv
add r7, r0, #0x0
cmp r7, #0x0
ble _0204B1D8
@@ -10505,7 +10505,7 @@ FUN_0204B2F0: ; 0x0204B2F0
ldr r3, [r3, #0x28]
add r0, r5, #0x0
add r1, r4, #0x0
- blx RTC_ConvertSecondToDateTime
+ bl RTC_ConvertSecondToDateTime
pop {r3-r5, pc}
thumb_func_start FUN_0204B30C
@@ -10520,7 +10520,7 @@ FUN_0204B30C: ; 0x0204B30C
ldr r3, [r3, #0x30]
add r0, r5, #0x0
add r1, r4, #0x0
- blx RTC_ConvertSecondToDateTime
+ bl RTC_ConvertSecondToDateTime
pop {r3-r5, pc}
thumb_func_start FUN_0204B328
@@ -10600,7 +10600,7 @@ FUN_0204B388: ; 0x0204B388
add r4, r0, #0x0
mov r1, #0x0
mov r2, #0x64
- blx MI_CpuFill8
+ bl MI_CpuFill8
str r6, [r4, #0x0]
add r0, r6, #0x0
bl FUN_02025128
@@ -10661,7 +10661,7 @@ FUN_0204B410: ; 0x0204B410
add r5, r1, #0x0
add r0, r4, #0x0
mov r1, #0x11
- bl FUN_021E4C54
+ bl MOD05_021E4C54
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl FUN_02016998
@@ -10669,7 +10669,7 @@ FUN_0204B410: ; 0x0204B410
ldr r2, [r5, #0x60]
add r0, r4, #0x0
mov r1, #0x11
- bl FUN_021E4C60
+ bl MOD05_021E4C60
add r0, r5, #0x0
add r1, r5, #0x0
add r5, #0x60
@@ -10681,11 +10681,11 @@ FUN_0204B410: ; 0x0204B410
thumb_func_start FUN_0204B444
FUN_0204B444: ; 0x0204B444
- ldr r3, _0204B44C ; =0x021E4C01
+ ldr r3, _0204B44C ; =MOD05_021E4C00
ldr r0, [r0, #0x60]
bx r3
nop
-_0204B44C: .word 0x021E4C01
+_0204B44C: .word MOD05_021E4C00
thumb_func_start FUN_0204B450
FUN_0204B450: ; 0x0204B450
@@ -10700,7 +10700,7 @@ FUN_0204B450: ; 0x0204B450
ldr r0, [r3, #0x0]
str r0, [r2, #0x0]
add r0, sp, #0x0
- blx MTX_Identity33_
+ bl MTX_Identity33_
ldr r0, [r5, #0x4]
add r1, r4, #0x0
ldr r0, [r0, #0x18]
@@ -11203,9 +11203,9 @@ _0204B83E: ; jump table (using 16-bit offset)
_0204B848:
ldr r0, [r5, #0x38]
mov r1, #0x10
- bl FUN_021E5FD8
+ bl MOD05_021E5FD8
ldr r0, [r5, #0x38]
- bl FUN_021E5FE0
+ bl MOD05_021E5FE0
ldr r0, [r5, #0x38]
bl FUN_020553A0
bl FUN_02058914
@@ -11392,9 +11392,9 @@ FUN_0204B9CC: ; 0x0204B9CC
bl FUN_02055648
add r1, r0, #0x0
ldr r0, [r4, #0x38]
- bl FUN_021E5FD8
+ bl MOD05_021E5FD8
ldr r0, [r4, #0x38]
- bl FUN_021E5FE0
+ bl MOD05_021E5FE0
pop {r4, pc}
.balign 4
@@ -11405,7 +11405,7 @@ FUN_0204B9EC: ; 0x0204B9EC
add r4, r0, #0x0
mov r0, #0x0
mov r2, #0x4c
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
ldr r1, _0204BA14 ; =0x021C5A1C
add r0, r4, #0x0
bl FUN_0204BB20
@@ -11519,11 +11519,11 @@ _0204BAD0: .word 0x021C5A1C
thumb_func_start FUN_0204BAD4
FUN_0204BAD4: ; 0x0204BAD4
- ldr r3, _0204BADC ; =0x0204BE11
+ ldr r3, _0204BADC ; =FUN_0204BE10
ldr r0, _0204BAE0 ; =0x021C5A1C
bx r3
nop
-_0204BADC: .word 0x0204BE11
+_0204BADC: .word FUN_0204BE10
_0204BAE0: .word 0x021C5A1C
thumb_func_start FUN_0204BAE4
@@ -11651,7 +11651,7 @@ FUN_0204BBC4: ; 0x0204BBC4
add r4, r0, #0x0
bl FUN_0201B9EC
ldr r1, _0204BBE4 ; =0x0000199A
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r5, r0, #0x10
cmp r5, #0xa
@@ -11780,13 +11780,13 @@ _0204BCA4:
lsl r1, r1, #0x10
ldr r0, _0204BD14 ; =0x0000FFFF
lsr r1, r1, #0x10
- blx _s32_div_f
+ bl _s32_div_f
add r1, r0, #0x0
add r1, r1, #0x1
lsl r1, r1, #0x10
add r0, r4, #0x0
lsr r1, r1, #0x10
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
add r6, #0x14
lsr r4, r0, #0x10
@@ -12410,7 +12410,7 @@ FUN_0204C0D4: ; 0x0204C0D4
beq _0204C0E6
add r0, #0x2a
mov r2, #0x78
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
_0204C0E6:
pop {r3, pc}
@@ -12422,7 +12422,7 @@ FUN_0204C0E8: ; 0x0204C0E8
add r1, r4, #0x0
add r1, #0x2a
mov r2, #0x78
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldrb r1, [r4, #0x0]
mov r0, #0x4
orr r0, r1
@@ -12581,7 +12581,7 @@ FUN_0204C1F4: ; 0x0204C1F4
_0204C214:
ldr r0, [r5, #0x4]
ldr r0, [r0, #0x1c]
- bl FUN_021F4608
+ bl MOD05_021F4608
ldr r0, [r4, #0x14]
str r0, [sp, #0x0]
ldr r0, [r4, #0x18]
@@ -12603,7 +12603,7 @@ _0204C23C:
beq _0204C258
ldr r0, [r5, #0x4]
ldr r0, [r0, #0x1c]
- bl FUN_021F45E8
+ bl MOD05_021F45E8
add r0, r4, #0x0
bl FUN_02016A18
add sp, #0xc
@@ -12843,7 +12843,7 @@ _0204C41E:
add r0, r7, #0x0
bl FUN_0204AD8C
add r0, r7, #0x0
- bl FUN_021E331C
+ bl MOD05_021E331C
mov r0, #0x0
str r0, [r4, #0x4]
ldr r1, [r4, #0x20]
@@ -12925,7 +12925,7 @@ _0204C4C8: ; jump table (using 16-bit offset)
.short _0204C510 - _0204C4C8 - 2; case 2
.short _0204C51E - _0204C4C8 - 2; case 3
_0204C4D0:
- bl FUN_021DA5B8
+ bl MOD05_021DA5B8
str r0, [r4, #0x1c]
ldr r0, [r5, #0x38]
bl FUN_02055320
@@ -12935,7 +12935,7 @@ _0204C4D0:
add r1, r0, #0x0
ldr r2, [r4, #0x1c]
add r0, r6, #0x0
- bl FUN_021DA5D0
+ bl MOD05_021DA5D0
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -12943,11 +12943,11 @@ _0204C4D0:
_0204C4F6:
ldr r1, [r4, #0x1c]
add r0, r5, #0x0
- bl FUN_021DA5D8
+ bl MOD05_021DA5D8
cmp r0, #0x0
beq _0204C522
ldr r0, [r4, #0x1c]
- bl FUN_021DA5C8
+ bl MOD05_021DA5C8
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -12985,7 +12985,7 @@ FUN_0204C528: ; 0x0204C528
beq _0204C598
b _0204C59C
_0204C54A:
- bl FUN_021DA5B8
+ bl MOD05_021DA5B8
str r0, [r4, #0x1c]
ldr r0, [r5, #0x38]
bl FUN_02055320
@@ -12995,7 +12995,7 @@ _0204C54A:
add r1, r0, #0x0
ldr r2, [r4, #0x1c]
add r0, r6, #0x0
- bl FUN_021DA5D0
+ bl MOD05_021DA5D0
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -13009,11 +13009,11 @@ _0204C570:
add r0, r5, #0x0
add r1, r6, #0x0
lsr r2, r2, #0x18
- bl FUN_021DAC70
+ bl MOD05_021DAC70
cmp r0, #0x0
beq _0204C59C
ldr r0, [r4, #0x1c]
- bl FUN_021DA5C8
+ bl MOD05_021DA5C8
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -13089,7 +13089,7 @@ _0204C61C:
ldr r0, _0204C640 ; =0x00000603
bl FUN_020054C8
mov r0, #0x0
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -13124,7 +13124,7 @@ FUN_0204C644: ; 0x0204C644
beq _0204C67E
b _0204C682
_0204C668:
- bl FUN_021DB030
+ bl MOD05_021DB030
add r2, r0, #0x0
ldr r1, _0204C688 ; =0x021DB1D1
add r0, r5, #0x0
@@ -13160,7 +13160,7 @@ FUN_0204C68C: ; 0x0204C68C
beq _0204C6C6
b _0204C6CA
_0204C6B0:
- bl FUN_021DB030
+ bl MOD05_021DB030
add r2, r0, #0x0
ldr r1, _0204C6D0 ; =0x021DB145
add r0, r5, #0x0
@@ -13224,7 +13224,7 @@ _0204C700:
str r0, [r5, #0x4]
b _0204C798
_0204C736:
- bl FUN_021DB030
+ bl MOD05_021DB030
add r2, r0, #0x0
ldr r1, _0204C79C ; =0x021DB251
add r0, r6, #0x0
@@ -13233,7 +13233,7 @@ _0204C736:
str r0, [r5, #0x4]
b _0204C798
_0204C74A:
- bl FUN_021DA5B8
+ bl MOD05_021DA5B8
str r0, [r5, #0x1c]
ldr r0, [r4, #0x38]
bl FUN_02055320
@@ -13243,7 +13243,7 @@ _0204C74A:
add r1, r0, #0x0
ldr r2, [r5, #0x1c]
add r0, r6, #0x0
- bl FUN_021DA5D0
+ bl MOD05_021DA5D0
ldr r0, [r5, #0x4]
add r0, r0, #0x1
str r0, [r5, #0x4]
@@ -13252,11 +13252,11 @@ _0204C770:
ldr r5, [r5, #0x1c]
add r0, r4, #0x0
add r1, r5, #0x0
- bl FUN_021DA7B4
+ bl MOD05_021DA7B4
cmp r0, #0x0
beq _0204C798
add r0, r5, #0x0
- bl FUN_021DA5C8
+ bl MOD05_021DA5C8
ldr r0, [r4, #0x38]
bl FUN_020553A0
mov r1, #0x0
@@ -13314,7 +13314,7 @@ _0204C7BE:
bl FUN_020463EC
b _0204C818
_0204C7FE:
- bl FUN_021DB030
+ bl MOD05_021DB030
add r2, r0, #0x0
ldr r1, _0204C820 ; =0x021DB381
add r0, r6, #0x0
@@ -13351,7 +13351,7 @@ FUN_0204C824: ; 0x0204C824
beq _0204C894
b _0204C898
_0204C846:
- bl FUN_021DA5B8
+ bl MOD05_021DA5B8
str r0, [r4, #0x1c]
ldr r0, [r5, #0x38]
bl FUN_02055320
@@ -13361,7 +13361,7 @@ _0204C846:
add r1, r0, #0x0
ldr r2, [r4, #0x1c]
add r0, r6, #0x0
- bl FUN_021DA5D0
+ bl MOD05_021DA5D0
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -13375,11 +13375,11 @@ _0204C86C:
add r0, r5, #0x0
add r1, r6, #0x0
lsr r2, r2, #0x18
- bl FUN_021DAAA4
+ bl MOD05_021DAAA4
cmp r0, #0x0
beq _0204C898
ldr r0, [r4, #0x1c]
- bl FUN_021DA5C8
+ bl MOD05_021DA5C8
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -13416,7 +13416,7 @@ _0204C8C0: ; jump table (using 16-bit offset)
.short _0204C932 - _0204C8C0 - 2; case 3
_0204C8C8:
mov r0, #0x1
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
ldr r0, [r5, #0x38]
bl FUN_020553A0
add r6, r0, #0x0
@@ -13489,7 +13489,7 @@ FUN_0204C93C: ; 0x0204C93C
beq _0204C976
b _0204C97A
_0204C960:
- bl FUN_021DB030
+ bl MOD05_021DB030
add r2, r0, #0x0
ldr r1, _0204C980 ; =0x021DB041
add r0, r5, #0x0
@@ -13740,7 +13740,7 @@ _0204CB32:
str r0, [r1, #0x0]
mov r1, #0x0
lsl r2, r2, #0x2
- blx MI_CpuFill8
+ bl MI_CpuFill8
_0204CB40:
ldr r1, _0204CC34 ; =0x021C5A68
ldr r0, _0204CC38 ; =0x000002BE
@@ -13751,7 +13751,7 @@ _0204CB40:
cmp r5, #0x0
str r2, [r0, #0x4]
beq _0204CB6C
- bl FUN_02244D1C
+ bl MOD18_02244D1C
add r1, r0, #0x0
mov r0, #0xf
bl FUN_02016998
@@ -13760,7 +13760,7 @@ _0204CB40:
str r0, [r2, #0x4]
ldr r0, [r1, #0x0]
ldr r0, [r0, #0x4]
- bl FUN_02244D20
+ bl MOD18_02244D20
_0204CB6C:
ldr r0, _0204CC34 ; =0x021C5A68
ldr r7, _0204CC3C ; =0x0000FFFF
@@ -14005,7 +14005,7 @@ _0204CD2C:
ldr r0, [r0, #0x4]
cmp r0, #0x0
beq _0204CD60
- bl FUN_02244D3C
+ bl MOD18_02244D3C
ldr r0, _0204CD70 ; =0x021C5A68
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x4]
@@ -14831,7 +14831,7 @@ _0204D3B2:
cmp r0, #0x0
beq _0204D3DC
add r0, r5, #0x0
- bl FUN_0223E4D4
+ bl MOD18_0223E4D4
_0204D3DC:
ldr r0, _0204D430 ; =0x021C5A68
ldr r1, _0204D438 ; =0x000002BE
@@ -14856,7 +14856,7 @@ _0204D3DC:
ldrh r1, [r1, #0x0]
ldrh r3, [r3, #0x0]
mov r2, #0x0
- bl FUN_021E5B30
+ bl MOD05_021E5B30
_0204D40E:
ldr r0, _0204D430 ; =0x021C5A68
mov r1, #0x1
@@ -14894,7 +14894,7 @@ FUN_0204D43C: ; 0x0204D43C
add r0, #0x5a
mov r1, #0x0
mov r2, #0x8
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r5, #0x0
bl FUN_0204CD78
ldr r0, _0204D4CC ; =0x021C5A68
@@ -14995,7 +14995,7 @@ FUN_0204D4F0: ; 0x0204D4F0
ldr r0, [r0, #0x4]
cmp r0, #0x0
beq _0204D52A
- bl FUN_02244D58
+ bl MOD18_02244D58
b _0204D52A
_0204D524:
add r0, r4, #0x0
@@ -15020,7 +15020,7 @@ _0204D536:
cmp r0, #0x0
bne _0204D556
add r0, r5, #0x0
- bl FUN_02245358
+ bl MOD18_02245358
_0204D556:
add r5, r5, #0x1
cmp r5, #0x8
@@ -15057,7 +15057,7 @@ _0204D58A:
cmp r0, #0x0
beq _0204D5A0
add r0, r5, #0x0
- bl FUN_02247614
+ bl MOD18_02247614
_0204D5A0:
lsl r0, r5, #0x10
lsr r0, r0, #0x10
@@ -15091,9 +15091,9 @@ _0204D5C6:
cmp r0, #0x0
beq _0204D5F0
add r0, r5, #0x0
- bl FUN_0223EB8C
+ bl MOD18_0223EB8C
add r0, r5, #0x0
- bl FUN_0223CB08
+ bl MOD18_0223CB08
_0204D5F0:
strb r5, [r6, #0x0]
ldr r3, [r4, #0x0]
@@ -15384,7 +15384,7 @@ _0204D7F6:
beq _0204D812
add r0, r5, #0x0
add r1, r6, #0x0
- bl FUN_02246F1C
+ bl MOD18_02246F1C
cmp r0, #0x0
bne _0204D812
mov r0, #0x1
@@ -15411,8 +15411,8 @@ FUN_0204D830: ; 0x0204D830
ldr r0, [r0, #0x4]
cmp r0, #0x0
beq _0204D852
- bl FUN_02244D40
- bl FUN_02244DA0
+ bl MOD18_02244D40
+ bl MOD18_02244DA0
cmp r0, #0x0
bne _0204D84E
mov r0, #0x1
@@ -15500,7 +15500,7 @@ _0204D8AA:
cmp r0, #0x0
beq _0204D8E0
add r1, r5, #0x0
- bl FUN_02244D40
+ bl MOD18_02244D40
str r0, [sp, #0x4]
_0204D8E0:
ldr r1, [r6, #0x0]
@@ -15509,7 +15509,7 @@ _0204D8E0:
cmp r0, #0x0
beq _0204D8F4
add r0, r5, #0x0
- bl FUN_02245F4C
+ bl MOD18_02245F4C
cmp r0, #0x0
bne _0204D976
_0204D8F4:
@@ -15536,7 +15536,7 @@ _0204D90A:
cmp r0, #0x0
beq _0204D93C
add r0, r5, #0x0
- bl FUN_0223F8D8
+ bl MOD18_0223F8D8
cmp r0, #0x0
bne _0204D976
add r0, r5, #0x0
@@ -15544,14 +15544,14 @@ _0204D90A:
cmp r0, #0x0
bne _0204D93C
add r0, r5, #0x0
- bl FUN_02247544
+ bl MOD06_02247544
cmp r0, #0x0
bne _0204D976
_0204D93C:
ldr r0, [sp, #0x4]
cmp r0, #0x0
beq _0204D94A
- bl FUN_02244DB0
+ bl MOD06_02244DB0
cmp r0, #0x0
beq _0204D976
_0204D94A:
@@ -15693,7 +15693,7 @@ _0204DA44:
ldr r1, [sp, #0xc]
ldr r2, [sp, #0x8]
add r0, r5, #0x0
- bl FUN_0224566C
+ bl MOD18_0224566C
cmp r0, #0x1
beq _0204DAE2
_0204DA66:
@@ -15756,7 +15756,7 @@ _0204DA8E:
add r0, r5, #0x0
add r2, sp, #0x14
mov r3, #0x0
- bl FUN_0224089C
+ bl MOD18_0224089C
_0204DAE2:
ldr r0, [sp, #0x0]
add r5, r5, #0x1
@@ -15889,7 +15889,7 @@ FUN_0204DBCC: ; 0x0204DBCC
cmp r0, #0x0
beq _0204DC14
add r0, r4, #0x0
- bl FUN_0223E554
+ bl MOD18_0223E554
ldr r0, _0204DC28 ; =0x021C5A68
ldr r3, [r0, #0x0]
ldr r0, _0204DC30 ; =0x000002BD
@@ -15905,7 +15905,7 @@ FUN_0204DBCC: ; 0x0204DBCC
ldrh r1, [r1, #0x0]
ldrh r3, [r3, #0x0]
mov r2, #0x0
- bl FUN_021E5B30
+ bl MOD05_021E5B30
_0204DC14:
mov r1, #0x0
add r0, r4, #0x0
@@ -16246,10 +16246,10 @@ _0204DE98:
b _0204DEEC
_0204DEC2:
ldr r0, [sp, #0x10]
- blx abs
+ bl abs
add r6, r0, #0x0
add r0, r7, #0x0
- blx abs
+ bl abs
cmp r6, r0
ble _0204DEE2
ldr r0, [sp, #0x10]
@@ -16269,9 +16269,9 @@ _0204DEEA:
mov r6, #0x80
_0204DEEC:
add r0, r7, #0x0
- blx abs
+ bl abs
ldr r0, [sp, #0x10]
- blx abs
+ bl abs
ldrb r3, [r5, #0x5]
add r0, r4, #0x0
add r1, r6, #0x0
@@ -16566,7 +16566,7 @@ _0204E124:
add r0, r5, #0x0
add r2, sp, #0x4
mov r3, #0x0
- bl FUN_0224089C
+ bl MOD18_0224089C
add sp, #0x8
mov r0, #0x1
pop {r3-r7, pc}
@@ -16813,11 +16813,11 @@ FUN_0204E2E0: ; 0x0204E2E0
thumb_func_start FUN_0204E2F0
FUN_0204E2F0: ; 0x0204E2F0
- ldr r3, _0204E2F8 ; =0x0223E4BD
+ ldr r3, _0204E2F8 ; =MOD18_0223E4BC
ldrb r0, [r2, #0x0]
bx r3
nop
-_0204E2F8: .word 0x0223E4BD
+_0204E2F8: .word MOD18_0223E4BC
thumb_func_start FUN_0204E2FC
FUN_0204E2FC: ; 0x0204E2FC
@@ -17428,9 +17428,9 @@ FUN_0204E758: ; 0x0204E758
ldr r0, [r0, #0x0]
add r1, r2, #0x0
ldr r0, [r0, #0x4]
- bl FUN_02244D40
+ bl MOD18_02244D40
add r1, r4, #0x0
- bl FUN_02244D98
+ bl MOD18_02244D98
pop {r4, pc}
nop
_0204E774: .word 0x021C5A68
@@ -17442,9 +17442,9 @@ FUN_0204E778: ; 0x0204E778
ldr r0, _0204E790 ; =0x021C5A68
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x4]
- bl FUN_02244D40
+ bl MOD18_02244D40
mov r1, #0x0
- bl FUN_02244D98
+ bl MOD18_02244D98
pop {r3, pc}
nop
_0204E790: .word 0x021C5A68
@@ -17500,7 +17500,7 @@ FUN_0204E7CC: ; 0x0204E7CC
ldrh r3, [r4, #0x2]
ldr r0, [r0, #0x54]
mov r2, #0x0
- bl FUN_021E5B30
+ bl MOD05_021E5B30
_0204E7FA:
strh r6, [r4, #0x0]
ldr r0, [sp, #0x0]
@@ -17528,7 +17528,7 @@ _0204E81A:
ldrh r1, [r4, #0x0]
ldrh r3, [r4, #0x2]
mov r2, #0x0
- bl FUN_021E5B30
+ bl MOD05_021E5B30
_0204E832:
ldr r0, _0204E848 ; =0x021C5A68
ldr r1, [r0, #0x0]
@@ -17664,7 +17664,7 @@ FUN_0204E8FC: ; 0x0204E8FC
ldr r1, [r1, #0x0]
ldr r0, _0204E968 ; =FUN_0204D308
ldr r1, [r1, #0x54]
- bl FUN_022494C8
+ bl MOD18_022494C8
pop {r4, pc}
_0204E936:
ldrb r0, [r4, #0x0]
@@ -17686,7 +17686,7 @@ _0204E936:
ldr r1, [r1, #0x0]
ldr r0, _0204E968 ; =FUN_0204D308
ldr r1, [r1, #0x54]
- bl FUN_0224A7C8
+ bl MOD06_0224A7C8
_0204E962:
pop {r4, pc}
.balign 4
@@ -17716,11 +17716,11 @@ _0204E988:
cmp r1, r0
bne _0204E9AA
bl FUN_0204F7E4
- bl FUN_0223D638
+ bl MOD18_0223D638
ldr r3, _0204EAD0 ; =FUN_0204E2AC
mov r1, #0x48
mov r2, #0x1
- bl FUN_0224DCB8
+ bl MOD18_0224DCB8
_0204E9AA:
ldrb r0, [r5, #0x0]
cmp r0, #0x1
@@ -17741,7 +17741,7 @@ _0204E9B8:
ldr r2, [r2, #0x0]
ldr r1, _0204EAD4 ; =FUN_0204D308
ldr r2, [r2, #0x54]
- bl FUN_02247A34
+ bl MOD18_02247A34
ldr r0, _0204EACC ; =0x021C5A68
ldrb r4, [r5, #0x1]
ldr r2, [r0, #0x0]
@@ -17831,7 +17831,7 @@ _0204EA7C:
ldr r2, [r2, #0x0]
add r0, r4, #0x0
ldr r2, [r2, #0x54]
- bl FUN_02248DF8
+ bl MOD18_02248DF8
_0204EA9A:
ldrb r0, [r5, #0x0]
cmp r0, #0x2
@@ -17841,18 +17841,18 @@ _0204EA9A:
cmp r1, r0
bne _0204EABC
bl FUN_0204F7E4
- bl FUN_0223D638
+ bl MOD18_0223D638
ldr r3, _0204EAD0 ; =FUN_0204E2AC
mov r1, #0x2
mov r2, #0x1
- bl FUN_0224DCB8
+ bl MOD18_0224DCB8
_0204EABC:
ldrb r0, [r5, #0x0]
cmp r0, #0x1
bne _0204EACA
ldrb r0, [r5, #0x1]
ldrb r1, [r5, #0x2]
- bl FUN_0223E4A8
+ bl MOD18_0223E4A8
_0204EACA:
pop {r4-r6, pc}
.balign 4
@@ -18548,7 +18548,7 @@ _0204F004:
bne _0204F01E
add r0, r1, #0x0
bl FUN_020553A0
- bl FUN_021E5970
+ bl MOD05_021E5970
ldr r1, _0204F06C ; =0x021C5A68
ldr r2, [r1, #0x0]
lsl r1, r4, #0x2
@@ -18568,7 +18568,7 @@ _0204F02C:
bne _0204F068
add r0, r1, #0x0
bl FUN_020553A0
- bl FUN_021E57D4
+ bl MOD05_021E57D4
ldr r1, _0204F06C ; =0x021C5A68
ldr r2, [r1, #0x0]
lsl r1, r4, #0x2
@@ -18581,7 +18581,7 @@ _0204F048:
bne _0204F068
add r0, r1, #0x0
bl FUN_020553A0
- bl FUN_021E5614
+ bl MOD05_021E5614
ldr r1, _0204F06C ; =0x021C5A68
ldr r2, [r1, #0x0]
lsl r1, r4, #0x2
@@ -18689,8 +18689,8 @@ FUN_0204F108: ; 0x0204F108
push {r3, lr}
bl FUN_02031190
bl FUN_0204F0A8
- bl FUN_0223D648
- bl FUN_0224DD94
+ bl MOD18_0223D648
+ bl MOD18_0224DD94
mov r0, #0x4
bl FUN_0204F774
pop {r3, pc}
@@ -18848,18 +18848,18 @@ FUN_0204F23C: ; 0x0204F23C
sub sp, #0x8
add r5, r0, #0x0
add r4, r1, #0x0
- bl FUN_0223E6B8
+ bl MOD18_0223E6B8
mov r0, #0x0
bl FUN_0204D628
mov r0, #0x4
bl FUN_0204F74C
- bl FUN_0223D648
+ bl MOD18_0223D648
add r6, r0, #0x0
ldrb r0, [r5, #0x1]
bl FUN_0202DFA4
add r1, r0, #0x0
add r0, r6, #0x0
- bl FUN_0224DDB8
+ bl MOD18_0224DDB8
cmp r4, #0x0
beq _0204F29C
bl FUN_02031190
@@ -18873,18 +18873,18 @@ FUN_0204F23C: ; 0x0204F23C
bl FUN_0204F0A8
bl FUN_02031190
bl FUN_0204F074
- bl FUN_0223D648
+ bl MOD18_0223D648
ldr r3, _0204F2CC ; =FUN_0204F108
mov r1, #0xa
mov r2, #0x1
- bl FUN_0224DCB8
+ bl MOD18_0224DCB8
b _0204F2AA
_0204F29C:
- bl FUN_0223D648
+ bl MOD18_0223D648
ldr r3, _0204F2CC ; =FUN_0204F108
mov r1, #0xb
mov r2, #0x1
- bl FUN_0224DCB8
+ bl MOD18_0224DCB8
_0204F2AA:
mov r0, #0xff
str r0, [sp, #0x0]
@@ -18965,11 +18965,11 @@ _0204F346:
b _0204F5DA
_0204F348:
bl FUN_0204F7E4
- bl FUN_0223D648
+ bl MOD18_0223D648
ldr r3, _0204F5E4 ; =FUN_0204E2B4
mov r1, #0x2
mov r2, #0x1
- bl FUN_0224DCB8
+ bl MOD18_0224DCB8
mov r0, #0xff
str r0, [sp, #0x0]
mov r3, #0x0
@@ -19033,11 +19033,11 @@ _0204F3AC:
add r0, r4, #0x0
bl FUN_02026C00
bl FUN_0204F7E4
- bl FUN_0223D648
+ bl MOD18_0223D648
ldr r3, _0204F5EC ; =FUN_0204E2AC
mov r1, #0xd
mov r2, #0x1
- bl FUN_0224DCB8
+ bl MOD18_0224DCB8
ldr r0, _0204F5F0 ; =0x00000625
bl FUN_020054C8
b _0204F410
@@ -19052,7 +19052,7 @@ _0204F3FC:
bl FUN_0204F23C
_0204F410:
ldrb r0, [r5, #0x1]
- bl FUN_022472AC
+ bl MOD18_022472AC
add sp, #0xc
pop {r4-r5, pc}
_0204F41A:
@@ -19069,18 +19069,18 @@ _0204F41A:
bl FUN_02026970
mov r0, #0x1
bl FUN_0204F74C
- bl FUN_0223D648
+ bl MOD18_0223D648
add r4, r0, #0x0
ldrb r0, [r5, #0x2]
bl FUN_0202DFA4
add r1, r0, #0x0
add r0, r4, #0x0
- bl FUN_0224DDB8
- bl FUN_0223D648
+ bl MOD18_0224DDB8
+ bl MOD18_0223D648
ldr r3, _0204F5F4 ; =FUN_0204E2D4
mov r1, #0xc
mov r2, #0x1
- bl FUN_0224DCB8
+ bl MOD18_0224DCB8
ldr r0, _0204F5F8 ; =0x00000425
bl FUN_0200521C
ldr r0, _0204F5F0 ; =0x00000625
@@ -19098,7 +19098,7 @@ _0204F46C:
_0204F480:
ldrb r0, [r5, #0x1]
ldrb r1, [r5, #0x2]
- bl FUN_02247294
+ bl MOD18_02247294
add sp, #0xc
pop {r4-r5, pc}
_0204F48C:
@@ -19108,11 +19108,11 @@ _0204F48C:
bne _0204F4B8
mov r0, #0x2
bl FUN_0204F74C
- bl FUN_0223D648
+ bl MOD18_0223D648
ldr r3, _0204F5FC ; =FUN_0204E2BC
mov r1, #0x6
mov r2, #0x1
- bl FUN_0224DCB8
+ bl MOD18_0224DCB8
add sp, #0xc
pop {r4-r5, pc}
_0204F4AE:
@@ -19125,11 +19125,11 @@ _0204F4B8:
_0204F4BA:
mov r0, #0x20
bl FUN_0204F74C
- bl FUN_0223D648
+ bl MOD18_0223D648
ldr r3, _0204F600 ; =FUN_0204E2C8
mov r1, #0x5
mov r2, #0x1
- bl FUN_0224DCB8
+ bl MOD18_0224DCB8
add sp, #0xc
pop {r4-r5, pc}
_0204F4D2:
@@ -19194,11 +19194,11 @@ _0204F54A:
ldrb r1, [r1, #0x0]
cmp r1, r0
bne _0204F572
- bl FUN_0223D648
+ bl MOD18_0223D648
ldr r3, _0204F5EC ; =FUN_0204E2AC
mov r1, #0x7
mov r2, #0x1
- bl FUN_0224DCB8
+ bl MOD18_0224DCB8
b _0204F57A
_0204F572:
mov r0, #0x60
@@ -19569,7 +19569,7 @@ FUN_0204F80C: ; 0x0204F80C
pop {r3, pc}
_0204F832:
bl FUN_02031190
- bl FUN_0223E734
+ bl MOD12_0223E734
cmp r0, #0x0
beq _0204F84C
bl FUN_0204F7FC
@@ -19598,7 +19598,7 @@ FUN_0204F858: ; 0x0204F858
cmp r0, #0x0
beq _0204F880
bl FUN_02031190
- bl FUN_0223E734
+ bl MOD12_0223E734
cmp r0, #0x0
bne _0204F880
mov r0, #0x0
@@ -20040,7 +20040,7 @@ FUN_0204FBB0: ; 0x0204FBB0
mov r2, #0x48
str r0, [r1, #0x0]
mov r1, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _0204FC08 ; =0x021C5A6C
mov r1, #0x32
ldr r0, [r0, #0x0]
@@ -20157,7 +20157,7 @@ FUN_0204FCA0: ; 0x0204FCA0
ldr r0, _0204FCD0 ; =0x021C5A6C
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x18]
- bl FUN_0223E060
+ bl MOD18_0223E060
ldr r0, _0204FCD4 ; =FUN_020500A4
mov r1, #0x0
bl FUN_02050094
@@ -20199,7 +20199,7 @@ FUN_0204FD08: ; 0x0204FD08
bl FUN_0202EDD8
cmp r0, #0x0
bne _0204FD1E
- bl FUN_02245F1C
+ bl MOD18_02245F1C
ldr r0, _0204FD20 ; =FUN_020500A4
mov r1, #0x0
bl FUN_02050094
@@ -20673,12 +20673,12 @@ _020500B6:
ldr r0, _02050108 ; =0x021C5A6C
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x18]
- bl FUN_0223E1E0
+ bl MOD18_0223E1E0
bl FUN_0202DBE0
mov r0, #0x0
bl FUN_0204D168
- bl FUN_0223EF7C
- bl FUN_02245FA0
+ bl MOD18_0223EF7C
+ bl MOD06_02245FA0
ldr r0, _02050108 ; =0x021C5A6C
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x18]
@@ -20748,7 +20748,7 @@ _02050164: .word FUN_02050168
thumb_func_start FUN_02050168
FUN_02050168: ; 0x02050168
push {r3, lr}
- bl FUN_0223DFB4
+ bl MOD06_0223DFB4
bl FUN_0204F80C
bl FUN_020318C4
cmp r0, #0x0
@@ -20756,7 +20756,7 @@ FUN_02050168: ; 0x02050168
bl FUN_02031190
cmp r0, #0x0
bne _02050190
- bl FUN_02245324
+ bl MOD18_02245324
ldr r0, _0205019C ; =FUN_0205024C
mov r1, #0x3c
bl FUN_02050094
@@ -20817,17 +20817,17 @@ _020501DC:
cmp r0, r1
bne _0205023C
_02050202:
- bl FUN_0223E6B8
+ bl MOD18_0223E6B8
mov r0, #0x0
bl FUN_0204D040
mov r0, #0x0
add r1, r0, #0x0
add r2, r0, #0x0
add r3, r0, #0x0
- bl FUN_022408FC
+ bl MOD18_022408FC
mov r0, #0x0
mov r1, #0x1
- bl FUN_0223FCE8
+ bl MOD18_0223FCE8
mov r0, #0x0
bl FUN_0202DE78
mov r0, #0x0
@@ -20848,7 +20848,7 @@ _02050248: .word FUN_02050350
thumb_func_start FUN_0205024C
FUN_0205024C: ; 0x0205024C
push {r3, lr}
- bl FUN_0223DFB4
+ bl MOD06_0223DFB4
ldr r0, _020502A0 ; =0x021C5A6C
ldr r1, [r0, #0x0]
ldrh r0, [r1, #0x3c]
@@ -20866,7 +20866,7 @@ _02050260:
cmp r0, #0x0
bne _0205029E
_02050272:
- bl FUN_0223E6B8
+ bl MOD18_0223E6B8
cmp r0, #0x0
beq _0205027E
bl FUN_0204F7FC
@@ -20876,8 +20876,8 @@ _0205027E:
mov r0, #0x0
bl FUN_0204D168
bl FUN_0204F930
- bl FUN_02245FA0
- bl FUN_0223E7FC
+ bl MOD06_02245FA0
+ bl MOD18_0223E7FC
ldr r0, _020502A8 ; =FUN_020502AC
mov r1, #0x0
bl FUN_02050094
@@ -20891,7 +20891,7 @@ _020502A8: .word FUN_020502AC
thumb_func_start FUN_020502AC
FUN_020502AC: ; 0x020502AC
push {r3, lr}
- bl FUN_0223DFB4
+ bl MOD06_0223DFB4
ldr r0, _02050314 ; =0x021C5A6C
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x18]
@@ -20913,15 +20913,15 @@ FUN_020502AC: ; 0x020502AC
bne _02050310
_020502E2:
mov r0, #0x0
- bl FUN_02245358
+ bl MOD18_02245358
bl FUN_0204F90C
- bl FUN_02247808
+ bl MOD06_02247808
mov r0, #0x2b
bl FUN_020311DC
bl FUN_02031190
mov r1, #0x1
- bl FUN_0223FCE8
- bl FUN_0223E6B8
+ bl MOD18_0223FCE8
+ bl MOD18_0223E6B8
bl FUN_020318B4
ldr r0, _02050318 ; =FUN_02050458
mov r1, #0x0
@@ -20945,15 +20945,15 @@ _0205032C: .word FUN_02050330
thumb_func_start FUN_02050330
FUN_02050330: ; 0x02050330
- ldr r3, _02050334 ; =FUN_0223DFB4
+ ldr r3, _02050334 ; =MOD06_0223DFB4
bx r3
.balign 4
-_02050334: .word FUN_0223DFB4 + 1
+_02050334: .word MOD06_0223DFB4
thumb_func_start FUN_02050338
FUN_02050338: ; 0x02050338
push {r3, lr}
- bl FUN_02245F1C
+ bl MOD18_02245F1C
bl FUN_0204CC9C
ldr r0, _0205034C ; =FUN_020502AC
mov r1, #0x0
@@ -20971,7 +20971,7 @@ FUN_02050350: ; 0x02050350
cmp r0, #0x9
bne _02050364
bl FUN_0202DBE0
- bl FUN_0223E7FC
+ bl MOD18_0223E7FC
_02050364:
ldr r0, _020503A8 ; =0x021C5A6C
ldr r0, [r0, #0x0]
@@ -21014,7 +21014,7 @@ FUN_020503B4: ; 0x020503B4
bl FUN_0204FB00
cmp r0, #0x0
beq _020503CC
- bl FUN_0223EF7C
+ bl MOD18_0223EF7C
ldr r0, _020503E8 ; =FUN_020503F0
mov r1, #0x0
bl FUN_02050094
@@ -21039,13 +21039,13 @@ _020503EC: .word 0x021C5A6C
thumb_func_start FUN_020503F0
FUN_020503F0: ; 0x020503F0
push {r3, lr}
- bl FUN_0223F4D8
+ bl MOD18_0223F4D8
cmp r0, #0x0
beq _02050412
ldr r0, _02050418 ; =0x02105E94
bl FUN_0204FBAC
- bl FUN_0223F4F4
- bl FUN_02245FA0
+ bl MOD18_0223F4F4
+ bl MOD06_02245FA0
ldr r0, _0205041C ; =FUN_02050420
mov r1, #0x0
bl FUN_02050094
@@ -21060,12 +21060,12 @@ _0205041C: .word FUN_02050420
thumb_func_start FUN_02050420
FUN_02050420: ; 0x02050420
push {r3, lr}
- bl FUN_022461A4
+ bl MOD18_022461A4
cmp r0, #0x0
beq _0205044A
ldr r0, _02050450 ; =0x02105EB0
bl FUN_0204FBAC
- bl FUN_022461B8
+ bl MOD18_022461B8
mov r0, #0x1
bl FUN_0204D168
mov r0, #0x1f
@@ -21148,10 +21148,10 @@ _020504CC: .word FUN_020500A4
thumb_func_start FUN_020504D0
FUN_020504D0: ; 0x020504D0
- ldr r3, _020504D4 ; =FUN_0223DFB4
+ ldr r3, _020504D4 ; =MOD06_0223DFB4
bx r3
.balign 4
-_020504D4: .word FUN_0223DFB4 + 1
+_020504D4: .word MOD06_0223DFB4
thumb_func_start FUN_020504D8
FUN_020504D8: ; 0x020504D8
@@ -21162,12 +21162,12 @@ FUN_020504D8: ; 0x020504D8
ldr r0, _02050508 ; =0x021C5A6C
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x18]
- bl FUN_0223E1E0
+ bl MOD18_0223E1E0
bl FUN_0202DBE0
mov r0, #0x0
bl FUN_0204D168
- bl FUN_0223EF7C
- bl FUN_02245FA0
+ bl MOD18_0223EF7C
+ bl MOD06_02245FA0
ldr r0, _0205050C ; =FUN_020504D0
mov r1, #0x0
bl FUN_02050094
@@ -21182,13 +21182,13 @@ FUN_02050510: ; 0x02050510
push {r3, lr}
bl FUN_02031190
mov r1, #0x1
- bl FUN_0223FCE8
+ bl MOD18_0223FCE8
bl FUN_02031190
mov r1, #0x1
- bl FUN_02247728
- bl FUN_0223CACC
+ bl MOD18_02247728
+ bl MOD18_0223CACC
bl FUN_0204CEF8
- bl FUN_0223E6B8
+ bl MOD18_0223E6B8
bl FUN_02031880
bl FUN_0204FB28
ldr r0, _02050544 ; =FUN_020504A4
@@ -21201,7 +21201,7 @@ _02050544: .word FUN_020504A4
thumb_func_start FUN_02050548
FUN_02050548: ; 0x02050548
push {r3, lr}
- bl FUN_0223DFB4
+ bl MOD06_0223DFB4
bl FUN_0204F80C
ldr r0, _02050574 ; =0x021C5A6C
ldr r0, [r0, #0x0]
@@ -21235,15 +21235,15 @@ _02050588: .word FUN_0205058C
thumb_func_start FUN_0205058C
FUN_0205058C: ; 0x0205058C
- ldr r3, _02050590 ; =0x02247831
+ ldr r3, _02050590 ; =MOD18_02247830
bx r3
.balign 4
-_02050590: .word 0x02247831
+_02050590: .word MOD18_02247830
thumb_func_start FUN_02050594
FUN_02050594: ; 0x02050594
push {r3, lr}
- bl FUN_02245F1C
+ bl MOD18_02245F1C
bl FUN_0204CC9C
bl FUN_0202EE44
cmp r0, #0x0
@@ -21252,9 +21252,9 @@ FUN_02050594: ; 0x02050594
cmp r0, #0x0
beq _020505CC
_020505AE:
- bl FUN_022452A4
+ bl MOD18_022452A4
bl FUN_0204CEF8
- bl FUN_0223E6B8
+ bl MOD18_0223E6B8
bl FUN_02031880
bl FUN_0204FB28
ldr r0, _020505D8 ; =FUN_020504A4
@@ -21289,7 +21289,7 @@ FUN_020505F4: ; 0x020505F4
thumb_func_start FUN_020505F8
FUN_020505F8: ; 0x020505F8
push {r3, lr}
- bl FUN_02245F1C
+ bl MOD18_02245F1C
bl FUN_0204CC9C
ldr r0, _0205060C ; =FUN_02050168
mov r1, #0x0
@@ -21317,7 +21317,7 @@ FUN_02050624: ; 0x02050624
thumb_func_start FUN_02050628
FUN_02050628: ; 0x02050628
push {r3, lr}
- bl FUN_02245F1C
+ bl MOD18_02245F1C
bl FUN_0204CC9C
ldr r0, _0205063C ; =FUN_020504D0
mov r1, #0x0
@@ -21333,7 +21333,7 @@ FUN_02050640: ; 0x02050640
bl FUN_02030E7C
cmp r0, #0x0
beq _0205065E
- bl FUN_02240834
+ bl MOD06_02240834
bl FUN_0202DBE0
ldr r0, _02050660 ; =FUN_02050664
mov r1, #0x0
@@ -21354,7 +21354,7 @@ FUN_02050668: ; 0x02050668
bl FUN_0202E4C8
cmp r0, #0x0
beq _0205067E
- bl FUN_022407CC
+ bl MOD06_022407CC
ldr r0, _02050680 ; =FUN_02050684
mov r1, #0x0
bl FUN_02050094
@@ -22247,7 +22247,7 @@ FUN_02050D54: ; 0x02050D54
strh r0, [r1, #0x3c]
pop {r3, pc}
_02050D66:
- bl FUN_0223E1A4
+ bl MOD18_0223E1A4
bl FUN_02031860
mov r0, #0x21
bl FUN_020168D0
@@ -22329,7 +22329,7 @@ _02050E02:
mov r0, #0x0
pop {r3, pc}
_02050E06:
- bl FUN_0223E2AC
+ bl MOD18_0223E2AC
pop {r3, pc}
.balign 4
_02050E0C: .word 0x021C5A6C
@@ -22345,7 +22345,7 @@ FUN_02050E10: ; 0x02050E10
ldrb r0, [r0, #0x0]
cmp r0, #0x0
beq _02050E26
- bl FUN_0223E118
+ bl MOD18_0223E118
_02050E26:
pop {r3, pc}
.balign 4
@@ -22362,7 +22362,7 @@ FUN_02050E2C: ; 0x02050E2C
ldrb r0, [r0, #0x0]
cmp r0, #0x0
beq _02050E42
- bl FUN_0223E154
+ bl MOD18_0223E154
_02050E42:
pop {r3, pc}
.balign 4
@@ -22383,7 +22383,7 @@ FUN_02050E48: ; 0x02050E48
mov r1, #0x0
mov r2, #0x30
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, [r5, #0xc]
bl FUN_020238F4
add r1, r0, #0x0
@@ -22438,7 +22438,7 @@ FUN_02050ED4: ; 0x02050ED4
mov r1, #0x0
mov r2, #0x40
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, [r5, #0x24]
ldr r0, [r0, #0xc]
bl LoadPlayerDataAddress
@@ -22564,7 +22564,7 @@ _02050FDA:
add r0, #0x2c
add r1, #0x3d
mov r2, #0x6
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r0, [r4, #0x4]
add r0, #0x22
ldrb r0, [r0, #0x0]
@@ -22628,7 +22628,7 @@ FUN_0205104C: ; 0x0205104C
cmp r0, #0x0
beq _02051066
mov r0, #0x1
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
bl FUN_0204CC9C
mov r0, #0x1
pop {r3, pc}
@@ -22921,7 +22921,7 @@ _02051288:
b _020517B8
_0205129C:
mov r0, #0x0
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
mov r0, #0xe
str r0, [r4, #0x34]
b _020517B8
@@ -23392,7 +23392,7 @@ _02051642:
b _020517B8
_0205167A:
mov r0, #0x0
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
mov r0, #0x21
str r0, [r4, #0x34]
b _020517B8
@@ -23654,7 +23654,7 @@ _0205188E:
add r4, r0, #0x0
mov r1, #0x0
mov r2, #0x8c
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r4, #0x0
mov r1, #0x5
add r0, #0x43
@@ -23840,7 +23840,7 @@ _02051A16:
bl FUN_0206B9B0
add r1, r4, #0x0
add r2, r6, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r5, r5, #0x1
add r4, r4, r6
cmp r5, #0x3
@@ -24002,7 +24002,7 @@ FUN_02051B1C: ; 0x02051B1C
mul r2, r4
add r1, r3, r2
add r2, r4, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r0, [r6, #0x50]
mov r1, #0x3
bl FUN_0206B8CC
@@ -24562,7 +24562,7 @@ _02051F7C:
add r0, #0x8
bl FUN_02019178
mov r0, #0x0
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
ldr r0, [r4, #0x28]
add r0, r0, #0x1
str r0, [r4, #0x28]
@@ -24605,7 +24605,7 @@ _0205200C:
cmp r0, #0x0
bne _0205203A
mov r0, #0x1
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
bl FUN_0204CC9C
ldr r0, [r4, #0x28]
add r0, r0, #0x1
@@ -24746,7 +24746,7 @@ _0205211E:
mov r1, #0x0
lsl r2, r2, #0x4
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x0
str r0, [r4, #0x10]
mov r0, #0x28
@@ -26131,7 +26131,7 @@ FUN_02052B74: ; 0x02052B74
add r0, sp, #0x0
mov r1, #0x0
mov r2, #0x20
- blx MI_CpuFill8
+ bl MI_CpuFill8
cmp r4, #0xb
bhi _02052BFA
add r0, r4, r4
@@ -26593,7 +26593,7 @@ FUN_02052EE8: ; 0x02052EE8
ldr r2, _02052F58 ; =0x000004E8
mov r0, #0x0
add r1, r4, #0x0
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
mov r0, #0x4e
str r5, [r4, #0x0]
mov r1, #0x1
@@ -27251,7 +27251,7 @@ _020533CC:
cmp r0, #0x1
bne _0205342A
add r0, r4, #0x0
- bl FUN_02249668
+ bl MOD06_02249668
str r0, [r5, #0x14]
b _02053438
_0205342A:
@@ -27259,7 +27259,7 @@ _0205342A:
blo _02053438
add r0, r4, #0x0
mov r1, #0x2
- bl FUN_02249668
+ bl MOD06_02249668
str r0, [r5, #0x14]
_02053438:
mov r0, #0x0
@@ -27306,7 +27306,7 @@ FUN_02053478: ; 0x02053478
cmp r0, #0x0
bne _0205349C
add r0, r1, #0x0
- bl FUN_021EDA48
+ bl MOD05_021EDA48
str r0, [r4, #0x10]
mov r0, #0x1e
strh r0, [r4, #0x6]
@@ -27408,7 +27408,7 @@ _02053524:
bne _02053566
add r0, r4, #0x0
mov r1, #0x1
- bl FUN_02249668
+ bl MOD06_02249668
str r0, [r5, #0x14]
b _02053574
_02053566:
@@ -27416,7 +27416,7 @@ _02053566:
blo _02053574
add r0, r4, #0x0
mov r1, #0x2
- bl FUN_02249668
+ bl MOD06_02249668
str r0, [r5, #0x14]
_02053574:
mov r0, #0x0
@@ -30706,7 +30706,7 @@ FUN_02054C14: ; 0x02054C14
push {r4, lr}
mov r1, #0xa
add r4, r0, #0x0
- blx _u32_div_f
+ bl _u32_div_f
cmp r0, #0x0
bne _02054C26
mov r0, #0x1
@@ -30714,7 +30714,7 @@ FUN_02054C14: ; 0x02054C14
_02054C26:
add r0, r4, #0x0
mov r1, #0x64
- blx _u32_div_f
+ bl _u32_div_f
cmp r0, #0x0
bne _02054C36
mov r0, #0x2
@@ -30723,7 +30723,7 @@ _02054C36:
mov r1, #0xfa
add r0, r4, #0x0
lsl r1, r1, #0x2
- blx _u32_div_f
+ bl _u32_div_f
cmp r0, #0x0
bne _02054C48
mov r0, #0x3
@@ -30731,7 +30731,7 @@ _02054C36:
_02054C48:
ldr r1, _02054C9C ; =0x00002710
add r0, r4, #0x0
- blx _u32_div_f
+ bl _u32_div_f
cmp r0, #0x0
bne _02054C58
mov r0, #0x4
@@ -30739,7 +30739,7 @@ _02054C48:
_02054C58:
ldr r1, _02054CA0 ; =0x000186A0
add r0, r4, #0x0
- blx _u32_div_f
+ bl _u32_div_f
cmp r0, #0x0
bne _02054C68
mov r0, #0x5
@@ -30747,7 +30747,7 @@ _02054C58:
_02054C68:
ldr r1, _02054CA4 ; =0x000F4240
add r0, r4, #0x0
- blx _u32_div_f
+ bl _u32_div_f
cmp r0, #0x0
bne _02054C78
mov r0, #0x6
@@ -30755,7 +30755,7 @@ _02054C68:
_02054C78:
ldr r1, _02054CA8 ; =0x00989680
add r0, r4, #0x0
- blx _u32_div_f
+ bl _u32_div_f
cmp r0, #0x0
bne _02054C88
mov r0, #0x7
@@ -30763,7 +30763,7 @@ _02054C78:
_02054C88:
ldr r1, _02054CAC ; =0x05F5E100
add r0, r4, #0x0
- blx _u32_div_f
+ bl _u32_div_f
cmp r0, #0x0
bne _02054C98
mov r0, #0x8
@@ -31092,7 +31092,7 @@ FUN_02054EA0: ; 0x02054EA0
asr r1, r0, #0x1f
asr r3, r5, #0x1f
add r2, r5, #0x0
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -31108,7 +31108,7 @@ FUN_02054EA0: ; 0x02054EA0
asr r1, r0, #0x1f
asr r3, r5, #0x1f
add r2, r5, #0x0
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -31171,46 +31171,46 @@ FUN_02054F50: ; 0x02054F50
mov r1, #0x0
mov r2, #0x14
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, sp, #0x8
ldrh r0, [r0, #0x10]
cmp r0, #0x0
beq _02054F8A
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
+ bl _fadd
b _02054F98
_02054F8A:
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
+ bl _fsub
_02054F98:
- blx _ffix
+ bl _ffix
str r0, [r4, #0x4]
add r0, sp, #0x8
ldrh r0, [r0, #0x14]
cmp r0, #0x0
beq _02054FB8
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
+ bl _fadd
b _02054FC6
_02054FB8:
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
+ bl _fsub
_02054FC6:
- blx _ffix
+ bl _ffix
str r0, [r4, #0x8]
strh r6, [r4, #0xc]
strh r7, [r4, #0x10]
@@ -31274,7 +31274,7 @@ FUN_0205502C: ; 0x0205502C
add r4, r0, #0x0
mov r1, #0x0
mov r2, #0xc
- blx MI_CpuFill8
+ bl MI_CpuFill8
strh r6, [r4, #0x4]
strh r7, [r4, #0x6]
str r5, [r4, #0x0]
@@ -31373,7 +31373,7 @@ _02055118:
add r0, r4, #0x0
bl FUN_02058578
add r0, r5, #0x0
- bl FUN_021EDBC8
+ bl MOD05_021EDBC8
add r0, r5, #0x0
bl FUN_020553C4
cmp r0, #0x2
@@ -31392,7 +31392,7 @@ _02055118:
add r0, r4, #0x0
add r1, r6, #0x0
add r2, r7, #0x0
- bl FUN_0224ABAC
+ bl MOD06_0224ABAC
add r1, r0, #0x0
add r0, r5, #0x0
bl FUN_02055450
@@ -31430,7 +31430,7 @@ _0205518E:
add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x3c
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
pop {r4, pc}
@@ -32477,14 +32477,14 @@ _02055812:
add r2, r6, #0x0
bl FUN_02055900
add r0, r5, #0x0
- bl FUN_021E5FE0
+ bl MOD05_021E5FE0
add r0, r5, #0x0
add r1, r4, #0x0
bl FUN_02055BD4
cmp r0, #0x1
bne _0205584E
add r0, r5, #0x0
- bl FUN_021E7138
+ bl MOD05_021E7138
pop {r3-r7, pc}
_0205584E:
add r0, r5, #0x0
@@ -32497,14 +32497,14 @@ _0205584E:
cmp r0, #0x0
beq _0205586C
add r0, r5, #0x0
- bl FUN_021E7138
+ bl MOD05_021E7138
b _02055878
_0205586C:
ldr r0, [sp, #0x1c]
cmp r0, #0x1
bne _02055878
add r0, r5, #0x0
- bl FUN_021E70F0
+ bl MOD05_021E70F0
_02055878:
add r0, sp, #0x8
ldrh r0, [r0, #0x10]
@@ -36009,7 +36009,7 @@ _02057430:
bl FUN_020583A0
add r1, r0, #0x0
ldr r0, [sp, #0x0]
- bl FUN_021F2AF4
+ bl MOD05_021F2AF4
add sp, #0x8
pop {r3-r7, pc}
.balign 4
@@ -36030,7 +36030,7 @@ _0205745A:
add r0, r5, #0x0
mov r1, #0x0
lsl r2, r2, #0x2
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
mov r0, #0x4a
lsl r0, r0, #0x2
add r6, r4, #0x0
@@ -36045,7 +36045,7 @@ _0205747E:
add r0, r4, #0x0
mov r1, #0x0
add r2, r6, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r5, #0x0
add r1, r4, #0x0
bl FUN_020583B4
@@ -36489,7 +36489,7 @@ _02057846:
add r0, r5, #0x0
mov r1, #0x0
mul r2, r4
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
_02057856:
add sp, #0x8
pop {r3-r7, pc}
@@ -36889,7 +36889,7 @@ _02057BD4:
ldr r2, [sp, #0x4]
add r0, r6, #0x0
add r1, r4, #0x0
- blx memcpy
+ bl memcpy
mov r0, #0xb
mov r1, #0x14
bl FUN_020169D8
@@ -37619,7 +37619,7 @@ FUN_020581B4: ; 0x020581B4
bl FUN_02058544
add r0, r4, #0x0
mov r1, #0x0
- bl FUN_021F2E0C
+ bl MOD05_021F2E0C
add r0, r4, #0x0
bl FUN_02058884
cmp r0, #0x0
@@ -37812,7 +37812,7 @@ FUN_02058348: ; 0x02058348
cmp r0, #0x1
bne _0205835E
add r0, r4, #0x0
- bl FUN_021F1D8C
+ bl MOD05_021F1D8C
_0205835E:
pop {r4, pc}
@@ -38313,7 +38313,7 @@ _0205859A:
mov r1, #0x0
add r2, r5, #0x0
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -38337,7 +38337,7 @@ _020585C2:
mov r1, #0x0
add r2, r5, #0x0
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -38361,7 +38361,7 @@ _020585EA:
mov r1, #0x0
add r2, r5, #0x0
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -38385,7 +38385,7 @@ _02058612:
mov r1, #0x0
add r2, r5, #0x0
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -40122,7 +40122,7 @@ FUN_02059064: ; 0x02059064
lsl r0, r0, #0x18
lsr r4, r0, #0x18
add r0, r5, #0x0
- bl FUN_021F1DC8
+ bl MOD05_021F1DC8
add r7, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -40185,7 +40185,7 @@ FUN_020590F4: ; 0x020590F4
lsl r0, r0, #0x18
lsr r4, r0, #0x18
add r0, r5, #0x0
- bl FUN_021F1DC8
+ bl MOD05_021F1DC8
add r7, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -40263,7 +40263,7 @@ FUN_020591A8: ; 0x020591A8
lsl r0, r0, #0x18
lsr r4, r0, #0x18
add r0, r5, #0x0
- bl FUN_021F1DC8
+ bl MOD05_021F1DC8
add r7, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -40311,7 +40311,7 @@ FUN_02059214: ; 0x02059214
lsl r0, r0, #0x18
lsr r4, r0, #0x18
add r0, r5, #0x0
- bl FUN_021F1DC8
+ bl MOD05_021F1DC8
add r7, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -40364,7 +40364,7 @@ FUN_0205928C: ; 0x0205928C
lsl r0, r0, #0x18
lsr r4, r0, #0x18
add r0, r5, #0x0
- bl FUN_021F1DC8
+ bl MOD05_021F1DC8
add r7, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@@ -40539,7 +40539,7 @@ FUN_0205941C: ; 0x0205941C
bne _02059432
add r0, r4, #0x0
mov r1, #0x0
- bl FUN_0224B568
+ bl MOD06_0224B568
_02059432:
pop {r4, pc}
@@ -40553,7 +40553,7 @@ FUN_02059434: ; 0x02059434
bne _0205944A
add r0, r4, #0x0
mov r1, #0x1
- bl FUN_0224B568
+ bl MOD06_0224B568
_0205944A:
pop {r4, pc}
@@ -40577,13 +40577,13 @@ FUN_0205944C: ; 0x0205944C
cmp r0, #0x1
bne _02059478
add r0, r5, #0x0
- bl FUN_02249E6C
+ bl MOD06_02249E6C
pop {r4-r6, pc}
_02059478:
cmp r0, #0x2
bne _020594BC
add r0, r5, #0x0
- bl FUN_02249E78
+ bl MOD06_02249E78
pop {r4-r6, pc}
_02059484:
add r0, r4, #0x0
@@ -40600,7 +40600,7 @@ _02059484:
beq _020594AA
_020594A2:
add r0, r5, #0x0
- bl FUN_02249E90
+ bl MOD06_02249E90
pop {r4-r6, pc}
_020594AA:
add r0, r5, #0x0
@@ -40609,7 +40609,7 @@ _020594AA:
cmp r0, #0x1
bne _020594BC
add r0, r5, #0x0
- bl FUN_02249E84
+ bl MOD06_02249E84
_020594BC:
pop {r4-r6, pc}
.balign 4
@@ -40628,7 +40628,7 @@ FUN_020594C0: ; 0x020594C0
bne _020594F2
add r0, r4, #0x0
mov r1, #0x1
- bl FUN_0224B9E0
+ bl MOD06_0224B9E0
add r0, r4, #0x0
mov r1, #0x1
bl FUN_020589E4
@@ -40716,7 +40716,7 @@ _02059584:
cmp r0, #0x0
bne _020595A2
add r0, r5, #0x0
- bl FUN_02249508
+ bl MOD06_02249508
mov r1, #0x2
add r0, r5, #0x0
lsl r1, r1, #0xe
@@ -40816,7 +40816,7 @@ FUN_0205962C: ; 0x0205962C
cmp r0, #0x1
beq _02059674
add r0, r5, #0x0
- bl FUN_0224BBEC
+ bl MOD06_0224BBEC
_02059674:
pop {r3-r5, pc}
.balign 4
@@ -40831,7 +40831,7 @@ FUN_02059678: ; 0x02059678
bne _0205968E
add r0, r4, #0x0
mov r1, #0x0
- bl FUN_0224BD90
+ bl MOD06_0224BD90
_0205968E:
pop {r4, pc}
@@ -40845,7 +40845,7 @@ FUN_02059690: ; 0x02059690
bne _020596A6
add r0, r4, #0x0
mov r1, #0x1
- bl FUN_0224BD90
+ bl MOD06_0224BD90
_020596A6:
pop {r4, pc}
@@ -40859,7 +40859,7 @@ FUN_020596A8: ; 0x020596A8
bne _020596BE
add r0, r4, #0x0
mov r1, #0x0
- bl FUN_0224C038
+ bl MOD06_0224C038
_020596BE:
pop {r4, pc}
@@ -40873,7 +40873,7 @@ FUN_020596C0: ; 0x020596C0
bne _020596D6
add r0, r4, #0x0
mov r1, #0x1
- bl FUN_0224C038
+ bl MOD06_0224C038
_020596D6:
pop {r4, pc}
@@ -40897,7 +40897,7 @@ FUN_020596D8: ; 0x020596D8
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
- bl FUN_0224B124
+ bl MOD06_0224B124
_02059708:
pop {r4-r6, pc}
.balign 4
@@ -40922,7 +40922,7 @@ FUN_0205970C: ; 0x0205970C
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
- bl FUN_0224B124
+ bl MOD06_0224B124
_0205973C:
pop {r4-r6, pc}
.balign 4
@@ -40947,7 +40947,7 @@ FUN_02059740: ; 0x02059740
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
- bl FUN_0224B2C4
+ bl MOD06_0224B2C4
_02059770:
pop {r4-r6, pc}
.balign 4
@@ -40972,7 +40972,7 @@ FUN_02059774: ; 0x02059774
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
- bl FUN_0224B2C4
+ bl MOD06_0224B2C4
_020597A4:
pop {r4-r6, pc}
.balign 4
@@ -41012,12 +41012,12 @@ _020597DE:
bne _020597FA
add r0, r5, #0x0
mov r1, #0x0
- bl FUN_022497E8
+ bl MOD06_022497E8
pop {r4-r6, pc}
_020597FA:
add r0, r5, #0x0
mov r1, #0x1
- bl FUN_022497E8
+ bl MOD06_022497E8
_02059802:
pop {r4-r6, pc}
@@ -43565,7 +43565,7 @@ FUN_0205AAB0: ; 0x0205AAB0
bl FUN_0205AA90
add r1, r0, #0x0
add r0, r6, #0x0
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r1, #0x2
ldr r0, [r5, r0]
pop {r4-r6, pc}
@@ -43584,7 +43584,7 @@ FUN_0205AAD4: ; 0x0205AAD4
bl FUN_0205AA90
add r1, r0, #0x0
add r0, r6, #0x0
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r1, #0x2
ldr r0, [r4, r0]
pop {r4-r6, pc}
@@ -45936,7 +45936,7 @@ FUN_0205BB90: ; 0x0205BB90
add r0, r5, #0x0
add r1, r6, #0x0
mov r2, #0x1
- bl FUN_021E7AC0
+ bl MOD05_021E7AC0
str r0, [r4, #0x4]
add r0, r5, #0x0
bl FUN_02058700
@@ -45949,7 +45949,7 @@ FUN_0205BBB4: ; 0x0205BBB4
bl FUN_02058600
add r4, r0, #0x0
ldr r0, [r4, #0x4]
- bl FUN_021E799C
+ bl MOD05_021E799C
cmp r0, #0x1
bne _0205BBD8
ldr r0, [r4, #0x4]
@@ -46273,7 +46273,7 @@ _0205BDFE:
add r0, r4, #0x0
bl FUN_02058B94
add r0, r4, #0x0
- bl FUN_0224D2E0
+ bl MOD06_0224D2E0
ldr r1, _0205BE34 ; =0x00010004
add r0, r4, #0x0
bl FUN_02058410
@@ -47060,7 +47060,7 @@ FUN_0205C3B0: ; 0x0205C3B0
mov r1, #0x0
str r1, [r0, #0x4]
add r0, r4, #0x0
- bl FUN_0224A310
+ bl MOD06_0224A310
pop {r4, pc}
nop
_0205C3CC: .word 0x0000FFFF
@@ -47080,7 +47080,7 @@ FUN_0205C3D0: ; 0x0205C3D0
bl FUN_0204B5FC
add r6, r0, #0x0
add r0, r5, #0x0
- bl FUN_021F2E28
+ bl MOD05_021F2E28
cmp r0, #0x1
beq _0205C488
ldr r0, [r4, #0x4]
@@ -47090,7 +47090,7 @@ FUN_0205C3D0: ; 0x0205C3D0
ldr r2, [r4, #0x0]
add r0, r5, #0x0
add r1, #0x8
- bl FUN_021F2094
+ bl MOD05_021F2094
add r0, r5, #0x0
bl FUN_02058738
add r1, r5, #0x0
@@ -47105,13 +47105,13 @@ FUN_0205C3D0: ; 0x0205C3D0
cmp r0, #0x0
beq _0205C432
add r0, r5, #0x0
- bl FUN_0224A528
+ bl MOD06_0224A528
_0205C432:
add r1, r4, #0x0
ldr r2, [r4, #0x0]
add r0, r5, #0x0
add r1, #0x8
- bl FUN_021F1F78
+ bl MOD05_021F1F78
b _0205C450
_0205C440:
cmp r0, #0x0
@@ -47120,23 +47120,23 @@ _0205C440:
cmp r0, #0x0
bne _0205C450
add r0, r5, #0x0
- bl FUN_0224A528
+ bl MOD06_0224A528
_0205C450:
mov r0, #0x0
strh r0, [r7, #0x2]
_0205C454:
add r0, r5, #0x0
str r6, [r4, #0x4]
- bl FUN_021F2E28
+ bl MOD05_021F2E28
cmp r0, #0x1
beq _0205C488
ldr r1, [r4, #0x8]
cmp r1, #0x0
beq _0205C488
add r0, r5, #0x0
- bl FUN_021F2F48
+ bl MOD05_021F2F48
add r0, r5, #0x0
- bl FUN_021F1DFC
+ bl MOD05_021F1DFC
cmp r0, #0x0
bne _0205C480
mov r1, #0x1
@@ -47146,7 +47146,7 @@ _0205C454:
_0205C480:
ldr r1, [r4, #0x8]
add r0, r5, #0x0
- bl FUN_021F2F6C
+ bl MOD05_021F2F6C
_0205C488:
pop {r3-r7, pc}
nop
@@ -47162,7 +47162,7 @@ FUN_0205C490: ; 0x0205C490
ldr r2, [r2, #0x0]
add r0, r4, #0x0
add r1, #0x8
- bl FUN_021F2094
+ bl MOD05_021F2094
pop {r4, pc}
thumb_func_start FUN_0205C4A8
@@ -47176,13 +47176,13 @@ FUN_0205C4A8: ; 0x0205C4A8
beq _0205C4C0
add r1, r4, #0x0
add r1, #0xc
- bl FUN_021F20D8
+ bl MOD05_021F20D8
_0205C4C0:
add r1, r4, #0x0
ldr r2, [r4, #0x0]
add r0, r5, #0x0
add r1, #0x8
- bl FUN_021F2094
+ bl MOD05_021F2094
mov r1, #0x2
add r0, r5, #0x0
lsl r1, r1, #0x14
@@ -47196,7 +47196,7 @@ FUN_0205C4D8: ; 0x0205C4D8
bl FUN_02058628
add r4, r0, #0x0
add r0, r5, #0x0
- bl FUN_021F2E28
+ bl MOD05_021F2E28
cmp r0, #0x1
beq _0205C536
ldr r0, [r4, #0x8]
@@ -47209,7 +47209,7 @@ FUN_0205C4D8: ; 0x0205C4D8
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x8
- bl FUN_021F1F78
+ bl MOD05_021F1F78
b _0205C510
_0205C506:
mov r1, #0x2
@@ -47218,17 +47218,17 @@ _0205C506:
bl FUN_02058418
_0205C510:
add r0, r5, #0x0
- bl FUN_0224A310
+ bl MOD06_0224A310
_0205C516:
ldr r0, [r4, #0x8]
cmp r0, #0x0
beq _0205C536
add r1, r4, #0x0
add r1, #0xc
- bl FUN_021F20F8
+ bl MOD05_021F20F8
ldr r1, [r4, #0x8]
add r0, r5, #0x0
- bl FUN_021F2F48
+ bl MOD05_021F2F48
mov r1, #0x2
add r0, r5, #0x0
lsl r1, r1, #0x14
@@ -47960,7 +47960,7 @@ _0205CA9A:
add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x2c
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [sp, #0x0]
str r7, [r4, #0x8]
str r0, [r4, #0xc]
@@ -48052,7 +48052,7 @@ FUN_0205CB30: ; 0x0205CB30
_0205CB44:
ldr r0, [r4, #0x24]
ldr r1, [r4, #0x8]
- bl FUN_021F1EC0
+ bl MOD05_021F1EC0
add r0, r5, #0x0
mov r1, #0x40
bl FUN_02058410
@@ -48154,7 +48154,7 @@ FUN_0205CBF8: ; 0x0205CBF8
mov r1, #0x0
ldr r0, [r4, #0x24]
add r2, r1, #0x0
- bl FUN_021E7AC0
+ bl MOD05_021E7AC0
str r0, [r4, #0x20]
mov r0, #0x6
str r0, [r4, #0x0]
@@ -48166,7 +48166,7 @@ FUN_0205CC10: ; 0x0205CC10
push {r4, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x20]
- bl FUN_021E799C
+ bl MOD05_021E799C
cmp r0, #0x1
bne _0205CC28
ldr r0, [r4, #0x20]
@@ -48724,7 +48724,7 @@ FUN_0205D024: ; 0x0205D024
mov r1, #0x0
mov r2, #0x40
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
str r0, [r4, #0x0]
@@ -49024,9 +49024,9 @@ _0205D296:
bl FUN_02058914
ldr r0, [r4, #0x38]
mov r1, #0x1
- bl FUN_021E5FD8
+ bl MOD05_021E5FD8
ldr r0, [r4, #0x38]
- bl FUN_021E5FE0
+ bl MOD05_021E5FE0
add r0, r4, #0x0
mov r1, #0x0
bl FUN_0204AB20
@@ -49054,9 +49054,9 @@ _0205D2D6:
bl FUN_02058914
ldr r0, [r4, #0x38]
mov r1, #0x2
- bl FUN_021E5FD8
+ bl MOD05_021E5FD8
ldr r0, [r4, #0x38]
- bl FUN_021E5FE0
+ bl MOD05_021E5FE0
add r4, #0x90
ldr r0, [r4, #0x0]
bl FUN_0205DD40
@@ -49207,7 +49207,7 @@ FUN_0205D400: ; 0x0205D400
mov r1, #0x0
mov r2, #0x40
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
str r0, [r4, #0x0]
@@ -49566,7 +49566,7 @@ FUN_0205D6BC: ; 0x0205D6BC
add r4, r0, #0x0
add r0, r6, #0x0
bl FUN_0204649C
- bl FUN_021F57EC
+ bl MOD05_021F57EC
str r0, [sp, #0x0]
ldr r1, [sp, #0x0]
mov r0, #0xb
@@ -49574,7 +49574,7 @@ FUN_0205D6BC: ; 0x0205D6BC
ldr r2, [sp, #0x0]
mov r1, #0x0
add r7, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
mov r0, #0x72
ldr r1, _0205D710 ; =0x021F57F1
lsl r0, r0, #0x2
@@ -49646,7 +49646,7 @@ FUN_0205D74C: ; 0x0205D74C
add r0, r5, #0x0
mov r1, #0xb
mov r2, #0x0
- bl FUN_021F5C44
+ bl MOD05_021F5C44
mov r1, #0x7e
lsl r1, r1, #0x2
str r0, [r4, r1]
@@ -49663,7 +49663,7 @@ FUN_0205D788: ; 0x0205D788
ldr r0, [r4, #0x0]
mov r1, #0x4
mov r2, #0x0
- bl FUN_021F5C44
+ bl MOD05_021F5C44
add r2, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, _0205D7A4 ; =0x021F5C71
@@ -49692,7 +49692,7 @@ FUN_0205D7A8: ; 0x0205D7A8
add r0, r5, #0x0
mov r1, #0xb
mov r2, #0x1
- bl FUN_021F5C44
+ bl MOD05_021F5C44
mov r1, #0x7e
lsl r1, r1, #0x2
str r0, [r4, r1]
@@ -49709,7 +49709,7 @@ FUN_0205D7E4: ; 0x0205D7E4
ldr r0, [r4, #0x0]
mov r1, #0x4
mov r2, #0x1
- bl FUN_021F5C44
+ bl MOD05_021F5C44
add r2, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, _0205D800 ; =0x021F5C71
@@ -49738,7 +49738,7 @@ FUN_0205D804: ; 0x0205D804
add r0, r5, #0x0
mov r1, #0xb
mov r2, #0x2
- bl FUN_021F5C44
+ bl MOD05_021F5C44
mov r1, #0x7e
lsl r1, r1, #0x2
str r0, [r4, r1]
@@ -49755,7 +49755,7 @@ FUN_0205D840: ; 0x0205D840
ldr r0, [r4, #0x0]
mov r1, #0x4
mov r2, #0x2
- bl FUN_021F5C44
+ bl MOD05_021F5C44
add r2, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, _0205D85C ; =0x021F5C71
@@ -49938,7 +49938,7 @@ FUN_0205D9A8: ; 0x0205D9A8
mov r1, #0x0
mov r2, #0x40
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
str r0, [r4, #0x0]
@@ -50049,7 +50049,7 @@ FUN_0205DAAC: ; 0x0205DAAC
add r4, r0, #0x0
bl FUN_02046528
mov r1, #0xb
- bl FUN_0224C700
+ bl MOD06_0224C700
add r2, r0, #0x0
ldr r1, _0205DAC8 ; =0x0224C721
add r0, r4, #0x0
@@ -50170,7 +50170,7 @@ _0205DB9C:
add r4, r0, #0x0
mov r1, #0x0
mov r2, #0x2c
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
str r5, [r4, #0x0]
ldr r0, [sp, #0x0]
add r1, r4, #0x4
@@ -50269,7 +50269,7 @@ _0205DC68:
ldr r0, [r5, #0x34]
bl FUN_02058780
mov r0, #0x0
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
mov r0, #0x1
add r4, #0x2a
strb r0, [r4, #0x0]
@@ -50317,7 +50317,7 @@ _0205DCC4:
ldr r0, [r5, #0x34]
bl FUN_02058780
mov r0, #0x1
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
mov r0, #0x4
add r4, #0x2a
strb r0, [r4, #0x0]
@@ -50392,7 +50392,7 @@ FUN_0205DD40: ; 0x0205DD40
add r0, #0x1c
mov r2, #0xa0
str r1, [r4, #0x18]
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r3, #0x0
add r2, r3, #0x0
mov r0, #0x28
@@ -50453,13 +50453,13 @@ _0205DDCA:
add r6, r0, #0x0
ldr r0, _0205DED0 ; =0x0000FFFF
add r1, r4, #0x0
- blx _s32_div_f
+ bl _s32_div_f
add r1, r0, #0x0
add r1, r1, #0x1
lsl r1, r1, #0x10
add r0, r6, #0x0
lsr r1, r1, #0x10
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r6, r0, #0x10
cmp r6, r4
@@ -50475,13 +50475,13 @@ _0205DDF2:
lsr r6, r0, #0x18
add r0, r6, #0x0
add r1, r4, #0x0
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x18
lsr r0, r0, #0x18
bne _0205DE1C
add r0, r6, #0x0
add r1, r4, #0x0
- blx _s32_div_f
+ bl _s32_div_f
add r1, r5, r1
add r0, r5, #0x0
b _0205DE5C
@@ -50490,7 +50490,7 @@ _0205DE1C:
bne _0205DE30
add r0, r6, #0x0
add r1, r4, #0x0
- blx _s32_div_f
+ bl _s32_div_f
add r0, r5, r4
add r1, r5, r1
sub r0, r0, #0x1
@@ -50603,7 +50603,7 @@ _0205DEE0:
bl FUN_0201B9EC
mov r1, #0x29
lsl r1, r1, #0x4
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r7, r0, #0x10
cmp r7, #0x64
@@ -50659,7 +50659,7 @@ _0205DF4C:
beq _0205DF6E
add r0, r5, #0x0
mov r3, #0x2
- bl FUN_0224B818
+ bl MOD06_0224B818
str r0, [r4, #0x34]
b _0205DF90
_0205DF6E:
@@ -50668,13 +50668,13 @@ _0205DF6E:
bne _0205DF80
add r0, r5, #0x0
mov r3, #0x0
- bl FUN_0224B818
+ bl MOD06_0224B818
str r0, [r4, #0x34]
b _0205DF90
_0205DF80:
add r0, r5, #0x0
mov r3, #0x1
- bl FUN_0224B818
+ bl MOD06_0224B818
str r0, [r4, #0x34]
b _0205DF90
_0205DF8C:
@@ -50701,7 +50701,7 @@ _0205DFA4:
ldr r0, [r5, #0x34]
cmp r0, #0x0
beq _0205DFCA
- bl FUN_0224B86C
+ bl MOD06_0224B86C
cmp r0, #0x0
beq _0205DFD0
ldr r0, [r5, #0x34]
@@ -51041,7 +51041,7 @@ FUN_0205E1F0: ; 0x0205E1F0
ldr r2, [r5, #0x8]
lsl r1, r1, #0x2
strh r2, [r4, r1]
- bl FUN_02245844
+ bl MOD06_02245844
add r0, r5, #0x0
add r0, #0xd0
ldrb r0, [r0, #0x0]
@@ -51150,7 +51150,7 @@ _0205E2DC:
bl FUN_0201B9EC
mov r1, #0x29
lsl r1, r1, #0x4
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r4, r0, #0x10
cmp r4, #0x64
@@ -51325,13 +51325,13 @@ _0205E43C:
lsl r1, r5, #0x10
ldr r0, _0205E47C ; =0x0000FFFF
lsr r1, r1, #0x10
- blx _s32_div_f
+ bl _s32_div_f
add r1, r0, #0x0
add r1, r1, #0x1
lsl r1, r1, #0x10
add r0, r4, #0x0
lsr r1, r1, #0x10
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r4, r0, #0x10
lsl r0, r5, #0x10
@@ -52131,7 +52131,7 @@ FUN_0205EA64: ; 0x0205EA64
bl FUN_0205EB20
cmp r0, #0x0
beq _0205EA72
- bl FUN_021E4DE4
+ bl MOD05_021E4DE4
_0205EA72:
pop {r3, pc}
@@ -52174,7 +52174,7 @@ FUN_0205EAB0: ; 0x0205EAB0
cmp r1, #0x0
bne _0205EACA
ldrb r1, [r4, #0x1]
- bl FUN_0224CECC
+ bl MOD06_0224CECC
add r1, r0, #0x0
add r0, r5, #0x0
bl FUN_0205EB14
@@ -52206,7 +52206,7 @@ FUN_0205EAE0: ; 0x0205EAE0
bne _0205EB0E
ldrb r1, [r4, #0x1]
add r0, r5, #0x0
- bl FUN_0224CECC
+ bl MOD06_0224CECC
add r1, r0, #0x0
add r0, r5, #0x0
bl FUN_0205EB14
@@ -52260,12 +52260,12 @@ FUN_0205EB38: ; 0x0205EB38
add r7, r0, #0x0
mov r1, #0x0
lsl r2, r2, #0x2
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r7, #0x0
add r1, sp, #0xc
mov r2, #0x2
mov r3, #0xb
- bl FUN_021D959C
+ bl MOD05_021D959C
mov r0, #0x2
str r0, [sp, #0x0]
mov r0, #0x1
@@ -52276,21 +52276,21 @@ FUN_0205EB38: ; 0x0205EB38
add r0, r7, #0x0
mov r1, #0x55
add r3, r2, #0x0
- bl FUN_021D967C
+ bl MOD05_021D967C
ldr r0, _0205EBE4 ; =0x000034D8
mov r1, #0x55
str r0, [sp, #0x0]
add r0, r7, #0x0
mov r2, #0x2
mov r3, #0x0
- bl FUN_021D96F4
+ bl MOD05_021D96F4
ldr r0, _0205EBE4 ; =0x000034D8
mov r1, #0x55
str r0, [sp, #0x0]
add r0, r7, #0x0
mov r2, #0x3
mov r3, #0x0
- bl FUN_021D9708
+ bl MOD05_021D9708
mov r2, #0x1
ldr r0, _0205EBE4 ; =0x000034D8
str r2, [sp, #0x0]
@@ -52298,14 +52298,14 @@ FUN_0205EB38: ; 0x0205EB38
add r0, r7, #0x0
mov r1, #0x55
mov r3, #0x0
- bl FUN_021D971C
+ bl MOD05_021D971C
ldr r4, _0205EBE8 ; =0x020F73C8
mov r6, #0x0
add r5, r7, #0x0
_0205EBC0:
add r0, r7, #0x0
add r1, r4, #0x0
- bl FUN_021D9820
+ bl MOD05_021D9820
mov r1, #0x59
lsl r1, r1, #0x2
str r0, [r5, r1]
@@ -52341,7 +52341,7 @@ _0205EC02:
cmp r4, #0x2
blt _0205EBF8
add r0, r7, #0x0
- bl FUN_021D99F8
+ bl MOD05_021D99F8
add r0, r7, #0x0
bl FUN_02016A18
pop {r3-r7, pc}
@@ -53787,7 +53787,7 @@ FUN_0205F668: ; 0x0205F668
add r4, r0, #0x0
bl FUN_0201B9EC
mov r1, #0x62
- blx _s32_div_f
+ bl _s32_div_f
add r1, r1, #0x2
lsl r1, r1, #0x10
add r0, r4, #0x0
@@ -53977,7 +53977,7 @@ FUN_0205F7A0: ; 0x0205F7A0
add r0, r5, #0x0
mov r1, #0x0
lsl r2, r2, #0x6
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [sp, #0x0]
ldr r0, [r0, #0x38]
bl FUN_02055320
@@ -54024,7 +54024,7 @@ _0205F812:
ldr r0, [r0, #0x0]
mov r1, #0x6
add r0, r0, #0x4
- blx _s32_div_f
+ bl _s32_div_f
mov r6, #0x0
add r4, r5, #0x0
_0205F83E:
@@ -54046,7 +54046,7 @@ _0205F85A:
strh r0, [r4, #0x28]
add r0, r1, #0x5
mov r1, #0x6
- blx _s32_div_f
+ bl _s32_div_f
add r6, r6, #0x1
add r4, #0xc
cmp r6, #0x5
@@ -54109,10 +54109,10 @@ FUN_0205F8CC: ; 0x0205F8CC
bl FUN_020462AC
str r0, [sp, #0x0]
add r0, sp, #0x28
- blx FS_InitFile
+ bl FS_InitFile
add r0, sp, #0x28
add r1, r4, #0x0
- blx FS_OpenFile
+ bl FS_OpenFile
cmp r0, #0x0
bne _0205F8F8
bl ErrorHandling
@@ -54122,7 +54122,7 @@ _0205F8F8:
add r0, sp, #0x28
add r1, sp, #0x24
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
cmp r0, #0x0
bge _0205F90A
bl ErrorHandling
@@ -54133,7 +54133,7 @@ _0205F90A:
mov r1, #0x0
mov r2, #0x4
add r6, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r1, [sp, #0x24]
ldr r0, _0205FA28 ; =0x0000013A
mov r4, #0x0
@@ -54162,7 +54162,7 @@ _0205F94C:
add r0, sp, #0x28
add r1, r6, #0x0
mov r2, #0x4
- blx FS_ReadFile
+ bl FS_ReadFile
ldrb r0, [r6, #0x0]
cmp r0, #0x1
beq _0205F962
@@ -54263,7 +54263,7 @@ _0205FA0E:
blt _0205F94C
_0205FA16:
add r0, sp, #0x28
- blx FS_CloseFile
+ bl FS_CloseFile
add r0, r6, #0x0
bl FUN_02016A18
add sp, #0x70
@@ -54283,7 +54283,7 @@ FUN_0205FA2C: ; 0x0205FA2C
mov r1, #0x0
mov r2, #0x40
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r6, #0x0
bl LoadPlayerDataAddress
str r0, [r4, #0xc]
@@ -54390,7 +54390,7 @@ _0205FB0C:
add r0, #0x2c
add r1, #0xe
mov r2, #0x6
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r0, r4, #0x0
add r0, #0x22
ldrb r0, [r0, #0x0]
@@ -54416,7 +54416,7 @@ FUN_0205FB34: ; 0x0205FB34
mov r1, #0x0
mov r2, #0x30
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r5, #0x0
bl LoadPlayerDataAddress
str r0, [r4, #0x4]
@@ -54554,7 +54554,7 @@ FUN_0205FC50: ; 0x0205FC50
add r4, r0, #0x0
mov r1, #0x0
mov r2, #0x18
- blx MI_CpuFill8
+ bl MI_CpuFill8
strb r6, [r4, #0x8]
strb r7, [r4, #0x9]
add r0, sp, #0x8
@@ -54673,7 +54673,7 @@ FUN_0205FD38: ; 0x0205FD38
add r4, r0, #0x0
mov r1, #0x0
mov r2, #0x18
- blx MI_CpuFill8
+ bl MI_CpuFill8
strh r5, [r4, #0x12]
strh r7, [r4, #0x14]
ldr r0, [sp, #0x0]
@@ -54719,19 +54719,19 @@ _0205FD96:
_0205FDB0:
add r0, r6, #0x0
add r1, r7, #0x0
- bl FUN_02244660
+ bl MOD06_02244660
strh r0, [r4, #0x0]
b _0205FDD2
_0205FDBC:
add r0, r6, #0x0
add r1, r7, #0x0
- bl FUN_022446BC
+ bl MOD06_022446BC
strh r0, [r4, #0x0]
b _0205FDD2
_0205FDC8:
add r0, r6, #0x0
add r1, r7, #0x0
- bl FUN_022446E0
+ bl MOD06_022446E0
strh r0, [r4, #0x0]
_0205FDD2:
add r0, r5, #0x0
@@ -54752,7 +54752,7 @@ FUN_0205FDDC: ; 0x0205FDDC
add r4, r0, #0x0
mov r1, #0x0
mov r2, #0x4
- blx MI_CpuFill8
+ bl MI_CpuFill8
strh r5, [r4, #0x0]
strh r6, [r4, #0x2]
ldr r0, [r7, #0x10]
@@ -55197,11 +55197,11 @@ FUN_0206015C: ; 0x0206015C
bl FUN_020169D8
add r4, r0, #0x0
mov r0, #0xb
- bl FUN_02244DB0
+ bl MOD06_02244DB0
str r0, [r4, #0x0]
mov r0, #0xb
add r1, r5, #0x0
- bl FUN_02245114
+ bl MOD06_02245114
str r0, [r4, #0x4]
mov r0, #0x0
strb r0, [r4, #0xc]
@@ -55251,9 +55251,9 @@ _020601CE:
bl FUN_0206367C
ldrb r0, [r4, #0xd]
ldr r1, [r4, #0x4]
- bl FUN_02245198
+ bl MOD06_02245198
ldr r0, [r4, #0x4]
- bl FUN_022451F0
+ bl MOD06_022451F0
str r0, [r4, #0x8]
add r0, r5, #0x0
bl FUN_0204AFC8
@@ -55302,16 +55302,16 @@ _02060232:
cmp r1, #0x5
bhi _02060290
add r0, r6, #0x0
- bl FUN_02245088
+ bl MOD06_02245088
add r6, r0, #0x0
add r0, r7, #0x0
mov r1, #0x1
bl FUN_0205889C
ldr r0, [r4, #0x0]
add r1, r6, #0x0
- bl FUN_02244DC4
+ bl MOD06_02244DC4
ldr r0, [r4, #0x0]
- bl FUN_02244EF8
+ bl MOD06_02244EF8
mov r0, #0x0
strb r0, [r4, #0xe]
ldr r0, _02060338 ; =0x00000679
@@ -55355,9 +55355,9 @@ _020602A2:
_020602B8:
ldrb r0, [r4, #0xd]
ldr r1, [r4, #0x4]
- bl FUN_02245198
+ bl MOD06_02245198
ldr r0, [r4, #0x4]
- bl FUN_022451F0
+ bl MOD06_022451F0
str r0, [r4, #0x8]
ldr r0, _02060338 ; =0x00000679
bl FUN_020054C8
@@ -55379,17 +55379,17 @@ _020602B8:
b _02060332
_020602F0:
ldr r0, [r4, #0x0]
- bl FUN_02244F18
+ bl MOD06_02244F18
mov r0, #0x7
strb r0, [r4, #0xc]
b _02060332
_020602FC:
ldr r0, [r4, #0x0]
- bl FUN_02244F24
+ bl MOD06_02244F24
cmp r0, #0x0
beq _02060332
ldr r0, [r4, #0x0]
- bl FUN_02244F2C
+ bl MOD06_02244F2C
mov r0, #0x1
strb r0, [r4, #0xc]
b _02060332
@@ -55398,9 +55398,9 @@ _02060312:
mov r1, #0x0
bl FUN_0206367C
ldr r0, [r4, #0x4]
- bl FUN_02245190
+ bl MOD06_02245190
ldr r0, [r4, #0x0]
- bl FUN_02244DBC
+ bl MOD06_02244DBC
add r0, r4, #0x0
bl FUN_02016A18
add sp, #0x10
@@ -55722,7 +55722,7 @@ FUN_02060588: ; 0x02060588
_0206059C:
bl FUN_0201B9EC
ldr r1, _020605D4 ; =0x000008D4
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r5, r0, #0x10
cmp r5, #0x1d
@@ -55796,13 +55796,13 @@ _02060630:
add r6, r0, #0x0
ldr r0, _02060684 ; =0x0000FFFF
add r1, r5, #0x0
- blx _s32_div_f
+ bl _s32_div_f
add r1, r0, #0x0
add r1, r1, #0x1
lsl r1, r1, #0x10
add r0, r6, #0x0
lsr r1, r1, #0x10
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r6, r0, #0x10
cmp r6, r5
@@ -55903,11 +55903,11 @@ _02060704:
ldr r1, [r4, #0x0]
ldr r2, [r4, #0x8]
add r0, r6, #0x0
- bl FUN_0224891C
+ bl MOD06_0224891C
ldr r1, [r4, #0x0]
ldr r2, [r4, #0x8]
add r0, r6, #0x0
- bl FUN_022488FC
+ bl MOD06_022488FC
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@@ -55975,7 +55975,7 @@ FUN_02060790: ; 0x02060790
mov r1, #0x0
mov r2, #0x2c
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
mov r0, #0x0
str r0, [r4, #0x4]
str r5, [r4, #0x0]
@@ -56277,23 +56277,23 @@ _020609EC:
ldr r0, [r5, #0x50]
mov r1, #0x1
mov r2, #0x0
- bl FUN_021DA4EC
+ bl MOD05_021DA4EC
ldr r0, [r5, #0x50]
mov r1, #0x2
mov r2, #0x0
- bl FUN_021DA4EC
+ bl MOD05_021DA4EC
ldr r0, _02060B08 ; =0x000006DE
bl FUN_020054C8
b _02060B00
_02060A2C:
ldr r0, [r5, #0x50]
mov r1, #0x1
- bl FUN_021DA58C
+ bl MOD05_021DA58C
cmp r0, #0x0
beq _02060B00
ldr r0, [r5, #0x50]
mov r1, #0x2
- bl FUN_021DA58C
+ bl MOD05_021DA58C
cmp r0, #0x0
beq _02060B00
cmp r6, #0x0
@@ -56339,11 +56339,11 @@ _02060A8A:
ldr r0, [r5, #0x4c]
ldr r1, [r5, #0x50]
mov r2, #0x1
- bl FUN_021DA54C
+ bl MOD05_021DA54C
ldr r0, [r5, #0x4c]
ldr r1, [r5, #0x50]
mov r2, #0x2
- bl FUN_021DA54C
+ bl MOD05_021DA54C
_02060AA8:
add r0, r6, #0x0
bl FUN_0204AF3C
@@ -56401,7 +56401,7 @@ FUN_02060B0C: ; 0x02060B0C
add r4, r0, #0x0
ldr r1, [r4, #0x30]
add r0, sp, #0x0
- bl FUN_021E7EA0
+ bl MOD05_021E7EA0
ldrb r0, [r4, #0x1]
cmp r0, #0x3
bhi _02060B7C
@@ -56481,7 +56481,7 @@ _02060B86:
_02060BA6:
ldr r0, [r4, #0x30]
add r1, sp, #0x0
- bl FUN_021E7EB0
+ bl MOD05_021E7EB0
ldr r1, [r4, #0x14]
ldr r0, [r4, #0x7c]
add r1, r1, r0
@@ -56539,9 +56539,9 @@ _02060BF6:
beq _02060C6A
ldr r1, [r5, #0x2c]
add r0, r4, #0x0
- bl FUN_021F4BD0
+ bl MOD05_021F4BD0
ldr r0, [r0, #0x0]
- blx FUN_020BC13C
+ bl FUN_020BC13C
ldrh r1, [r0, #0xe]
add r2, sp, #0x20
mov r3, #0x0
@@ -56557,10 +56557,10 @@ _02060BF6:
bl ErrorHandling
_02060C38:
ldr r0, [sp, #0x20]
- bl FUN_021E7EC8
+ bl MOD05_021E7EC8
str r0, [sp, #0x1c]
ldr r0, [r5, #0x2c]
- bl FUN_021F4C88
+ bl MOD05_021F4C88
ldr r1, [sp, #0x1c]
add r2, sp, #0x24
str r1, [sp, #0x0]
@@ -56576,7 +56576,7 @@ _02060C38:
ldr r0, [r5, #0x4c]
ldr r1, [r5, #0x50]
add r3, r4, #0x0
- bl FUN_021DA464
+ bl MOD05_021DA464
b _02060C6E
_02060C6A:
bl ErrorHandling
@@ -56665,7 +56665,7 @@ FUN_02060CF8: ; 0x02060CF8
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
- bl FUN_02248B6C
+ bl MOD06_02248B6C
add r4, r0, #0x0
cmp r4, #0x0
ble _02060D0E
@@ -56781,13 +56781,13 @@ FUN_02060DCC: ; 0x02060DCC
add r5, r0, #0x0
add r0, r6, #0x0
add r4, r1, #0x0
- bl FUN_02248B5C
+ bl MOD06_02248B5C
add r7, r0, #0x0
add r0, r6, #0x0
- bl FUN_02248B54
+ bl MOD06_02248B54
str r0, [sp, #0x8]
add r0, r6, #0x0
- bl FUN_02248B58
+ bl MOD06_02248B58
str r0, [sp, #0x0]
mov r0, #0x1
str r0, [sp, #0x4]
@@ -57077,7 +57077,7 @@ FUN_02061008: ; 0x02061008
mov r0, #0x0
add r1, r4, #0x0
mov r2, #0x24
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r0, r4, #0x0
pop {r4, pc}
@@ -57098,7 +57098,7 @@ FUN_02061028: ; 0x02061028
add r1, r5, #0x0
mov r2, #0x24
add r7, r3, #0x0
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
str r6, [r5, #0x0]
add r0, r5, #0x0
add r2, r5, #0x0
@@ -57205,7 +57205,7 @@ FUN_020610F8: ; 0x020610F8
add r6, r2, #0x0
add r0, r6, #0x0
add r5, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
ldrb r0, [r4, #0xb]
cmp r0, #0x0
@@ -57287,7 +57287,7 @@ FUN_020611A8: ; 0x020611A8
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -57321,7 +57321,7 @@ FUN_020611E8: ; 0x020611E8
bl FUN_02024DA0
add r4, r0, #0x0
add r0, r5, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r1, r0, #0x0
ldrh r1, [r1, #0x6]
add r0, r4, #0x0
@@ -57364,7 +57364,7 @@ FUN_0206123C: ; 0x0206123C
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -57400,7 +57400,7 @@ FUN_02061288: ; 0x02061288
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r4, #0x8]
cmp r0, #0x0
@@ -57426,7 +57426,7 @@ FUN_020612AC: ; 0x020612AC
mov r0, #0x0
add r1, sp, #0x0
mov r2, #0x28
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r0, r6, #0x0
mov r1, #0x1
mov r2, #0x0
@@ -57467,10 +57467,10 @@ FUN_02061304: ; 0x02061304
add r4, r2, #0x0
add r0, r4, #0x0
add r5, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r6, r0, #0x0
add r0, r4, #0x0
- bl FUN_02248B58
+ bl MOD06_02248B58
str r0, [sp, #0x0]
mov r1, #0x1
add r0, r5, #0x0
@@ -57494,10 +57494,10 @@ FUN_0206133C: ; 0x0206133C
add r4, r2, #0x0
add r0, r4, #0x0
add r5, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r6, r0, #0x0
add r0, r4, #0x0
- bl FUN_02248B58
+ bl MOD06_02248B58
str r0, [sp, #0x0]
mov r1, #0x1
add r0, r5, #0x0
@@ -57541,7 +57541,7 @@ FUN_0206139C: ; 0x0206139C
add r6, r2, #0x0
add r0, r6, #0x0
add r5, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
ldrh r2, [r4, #0x2]
add r0, r5, #0x0
@@ -57593,7 +57593,7 @@ FUN_02061404: ; 0x02061404
add r6, r2, #0x0
add r0, r6, #0x0
add r5, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
ldrh r2, [r4, #0x6]
add r0, r5, #0x0
@@ -57622,7 +57622,7 @@ FUN_02061444: ; 0x02061444
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl FUN_02024DA0
@@ -57666,7 +57666,7 @@ FUN_02061498: ; 0x02061498
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -57692,7 +57692,7 @@ FUN_02061498: ; 0x02061498
bl FUN_02060D90
bl FUN_0201B9EC
ldr r1, _020614F8 ; =0x00003334
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r4, r0, #0x10
cmp r4, #0x5
@@ -57714,7 +57714,7 @@ FUN_020614FC: ; 0x020614FC
bl FUN_02024DA0
add r4, r0, #0x0
add r0, r5, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r1, r0, #0x0
ldrh r1, [r1, #0x0]
add r0, r4, #0x0
@@ -57743,7 +57743,7 @@ FUN_02061534: ; 0x02061534
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -57805,7 +57805,7 @@ FUN_020615B0: ; 0x020615B0
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -57841,7 +57841,7 @@ FUN_020615F8: ; 0x020615F8
bl FUN_02024DA0
add r4, r0, #0x0
add r0, r5, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r1, r0, #0x0
ldrh r1, [r1, #0x0]
add r0, r4, #0x0
@@ -57881,7 +57881,7 @@ FUN_02061648: ; 0x02061648
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -57910,7 +57910,7 @@ FUN_02061688: ; 0x02061688
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl FUN_02024DA0
@@ -57963,7 +57963,7 @@ FUN_020616E8: ; 0x020616E8
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -57993,7 +57993,7 @@ FUN_02061728: ; 0x02061728
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -58014,7 +58014,7 @@ FUN_02061750: ; 0x02061750
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -58051,7 +58051,7 @@ FUN_02061798: ; 0x02061798
strb r2, [r0, #0x6]
bl FUN_0201BA60
mov r1, #0x3
- blx _u32_div_f
+ bl _u32_div_f
add r0, sp, #0x4
strb r1, [r0, #0x5]
add r0, sp, #0x8
@@ -58079,7 +58079,7 @@ FUN_020617D8: ; 0x020617D8
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -58100,7 +58100,7 @@ FUN_020617D8: ; 0x020617D8
bl FUN_02060E70
bl FUN_0201B9EC
ldr r1, _02061830 ; =0x00005556
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r4, r0, #0x10
cmp r4, #0x3
@@ -58119,7 +58119,7 @@ FUN_02061834: ; 0x02061834
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl FUN_02024DA0
@@ -58147,7 +58147,7 @@ FUN_02061868: ; 0x02061868
add r6, r2, #0x0
add r0, r6, #0x0
add r5, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
bl FUN_02023924
ldr r1, [r4, #0x0]
@@ -58261,7 +58261,7 @@ FUN_0206193C: ; 0x0206193C
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -58301,7 +58301,7 @@ FUN_02061990: ; 0x02061990
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl FUN_02024DA0
@@ -58351,7 +58351,7 @@ FUN_020619F0: ; 0x020619F0
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -58371,13 +58371,13 @@ FUN_020619F0: ; 0x020619F0
lsl r0, r0, #0x2
mul r0, r1
mov r1, #0xfe
- blx _u32_div_f
+ bl _u32_div_f
add r0, r0, #0x5
mov r1, #0xa
- blx _u32_div_f
+ bl _u32_div_f
mov r1, #0xa
add r4, r0, #0x0
- blx _u32_div_f
+ bl _u32_div_f
add r2, r0, #0x0
mov r0, #0x0
str r0, [sp, #0x0]
@@ -58389,7 +58389,7 @@ FUN_020619F0: ; 0x020619F0
bl FUN_0200AD38
add r0, r4, #0x0
mov r1, #0xa
- blx _u32_div_f
+ bl _u32_div_f
mov r0, #0x0
add r2, r1, #0x0
str r0, [sp, #0x0]
@@ -58407,7 +58407,7 @@ FUN_02061A70: ; 0x02061A70
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl FUN_02024DA0
@@ -58444,7 +58444,7 @@ FUN_02061AB0: ; 0x02061AB0
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -58502,7 +58502,7 @@ FUN_02061B24: ; 0x02061B24
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -58550,7 +58550,7 @@ FUN_02061B80: ; 0x02061B80
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -58615,7 +58615,7 @@ FUN_02061C00: ; 0x02061C00
add r6, r2, #0x0
add r0, r6, #0x0
add r5, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
mov r1, #0x0
add r4, r0, #0x0
str r1, [sp, #0x0]
@@ -58698,7 +58698,7 @@ FUN_02061CA8: ; 0x02061CA8
add r6, r2, #0x0
add r0, r6, #0x0
add r5, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
ldrb r0, [r4, #0x5]
cmp r0, #0x0
@@ -58760,7 +58760,7 @@ FUN_02061D30: ; 0x02061D30
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl FUN_02024DA0
@@ -58777,7 +58777,7 @@ FUN_02061D4C: ; 0x02061D4C
ldr r0, [r5, #0x4]
add r4, r1, #0x0
ldr r0, [r0, #0x14]
- bl FUN_02252538
+ bl MOD20_02252538
str r0, [sp, #0x0]
add r0, sp, #0x0
strh r4, [r0, #0x4]
@@ -58796,7 +58796,7 @@ FUN_02061D74: ; 0x02061D74
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -58852,7 +58852,7 @@ FUN_02061DE4: ; 0x02061DE4
add r6, r2, #0x0
add r0, r6, #0x0
add r5, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
ldrb r0, [r4, #0x5]
mov r1, #0x0
@@ -58907,7 +58907,7 @@ FUN_02061E60: ; 0x02061E60
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl FUN_02024DA0
@@ -58945,7 +58945,7 @@ FUN_02061EAC: ; 0x02061EAC
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -58967,7 +58967,7 @@ FUN_02061EDC: ; 0x02061EDC
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl FUN_02024DA0
@@ -58994,7 +58994,7 @@ FUN_02061F0C: ; 0x02061F0C
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -59037,7 +59037,7 @@ FUN_02061F60: ; 0x02061F60
add r7, r2, #0x0
add r0, r7, #0x0
add r5, r1, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r6, r0, #0x0
ldrb r4, [r6, #0x1]
add r0, r5, #0x0
@@ -59120,7 +59120,7 @@ FUN_02061FF8: ; 0x02061FF8
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
- bl FUN_02248B60
+ bl MOD06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@@ -59220,7 +59220,7 @@ _020620BE:
ble _020620D0
bl FUN_0201BA60
add r1, r4, #0x0
- blx _u32_div_f
+ bl _u32_div_f
add r5, r1, #0x0
b _020620D2
_020620D0:
@@ -59255,7 +59255,7 @@ _02062100:
bl FUN_0201B9EC
mov r1, #0xf1
lsl r1, r1, #0x4
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r4, r0, #0x10
cmp r4, #0x11
@@ -59313,7 +59313,7 @@ FUN_02062170: ; 0x02062170
add r7, r1, #0x0
bl FUN_0201B9EC
ldr r1, _02062234 ; =0x00003334
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r4, r0, #0x10
cmp r4, #0x5
@@ -59436,7 +59436,7 @@ FUN_02062240: ; 0x02062240
add r1, sp, #0x0
add r1, #0x2
add r2, sp, #0x0
- bl FUN_02245910
+ bl MOD06_02245910
add r0, sp, #0x0
ldrh r0, [r0, #0x2]
bl FUN_02034824
@@ -59499,7 +59499,7 @@ FUN_020622C4: ; 0x020622C4
bl FUN_0201B9EC
mov r1, #0xf1
lsl r1, r1, #0x4
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r5, r0, #0x10
cmp r5, #0x11
@@ -59513,7 +59513,7 @@ _020622E6:
bl FUN_0201B9EC
mov r1, #0xf1
lsl r1, r1, #0x4
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r4, r0, #0x10
cmp r4, #0x11
@@ -59625,13 +59625,13 @@ _020623B0:
lsl r1, r4, #0x10
ldr r0, _020623F0 ; =0x0000FFFF
lsr r1, r1, #0x10
- blx _s32_div_f
+ bl _s32_div_f
add r1, r0, #0x0
add r1, r1, #0x1
lsl r1, r1, #0x10
add r0, r5, #0x0
lsr r1, r1, #0x10
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r5, r0, #0x10
lsl r0, r4, #0x10
@@ -59745,13 +59745,13 @@ _0206249E:
add r5, r0, #0x0
ldr r0, _02062504 ; =0x0000FFFF
add r1, r4, #0x0
- blx _s32_div_f
+ bl _s32_div_f
add r1, r0, #0x0
add r1, r1, #0x1
lsl r1, r1, #0x10
add r0, r5, #0x0
lsr r1, r1, #0x10
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r5, r0, #0x10
cmp r5, r4
@@ -59827,7 +59827,7 @@ FUN_0206252C: ; 0x0206252C
ble _02062552
bl FUN_0201BA60
add r1, r4, #0x0
- blx _u32_div_f
+ bl _u32_div_f
add r5, r1, #0x0
b _02062554
_02062552:
@@ -59925,16 +59925,16 @@ FUN_020625EC: ; 0x020625EC
mov r1, #0x0
lsl r2, r2, #0x4
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x50
str r0, [r4, #0x0]
ldr r0, [sp, #0x0]
mov r1, #0x3
- blx _s32_div_f
+ bl _s32_div_f
strb r1, [r4, #0x16]
ldr r0, [sp, #0x0]
mov r1, #0x3
- blx _s32_div_f
+ bl _s32_div_f
strb r0, [r4, #0x17]
ldrb r0, [r4, #0x16]
bl FUN_0202B870
@@ -60047,7 +60047,7 @@ _020626FE:
add r0, r4, #0x0
mov r1, #0x0
lsl r2, r2, #0x4
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r5, #0x0
bl FUN_020168D0
mov r0, #0xc
@@ -60511,7 +60511,7 @@ FUN_02062A70: ; 0x02062A70
mov r2, #0x3c
mov r1, #0x0
mul r2, r3
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldrb r1, [r4, #0x16]
ldr r2, [r4, #0x0]
add r0, r5, #0x0
@@ -61110,7 +61110,7 @@ FUN_02062F3C: ; 0x02062F3C
ldr r3, [r6, #0x0]
add r0, r6, r0
mov r2, #0x2
- bl FUN_021D959C
+ bl MOD05_021D959C
mov r0, #0x3
str r0, [sp, #0x0]
mov r0, #0x1
@@ -61123,7 +61123,7 @@ FUN_02062F3C: ; 0x02062F3C
add r0, r6, r0
mov r1, #0x82
add r3, r2, #0x0
- bl FUN_021D967C
+ bl MOD05_021D967C
ldr r0, _02062FF4 ; =0x000034D8
mov r1, #0x82
str r0, [sp, #0x0]
@@ -61132,7 +61132,7 @@ FUN_02062F3C: ; 0x02062F3C
add r0, r6, r0
mov r2, #0x2
mov r3, #0x0
- bl FUN_021D96F4
+ bl MOD05_021D96F4
ldr r0, _02062FF4 ; =0x000034D8
mov r1, #0x82
str r0, [sp, #0x0]
@@ -61141,7 +61141,7 @@ FUN_02062F3C: ; 0x02062F3C
add r0, r6, r0
mov r2, #0x3
mov r3, #0x0
- bl FUN_021D9708
+ bl MOD05_021D9708
mov r2, #0x1
ldr r0, _02062FF4 ; =0x000034D8
str r2, [sp, #0x0]
@@ -61151,7 +61151,7 @@ FUN_02062F3C: ; 0x02062F3C
add r0, r6, r0
mov r1, #0x82
mov r3, #0x0
- bl FUN_021D971C
+ bl MOD05_021D971C
ldr r4, _02062FF8 ; =0x020F7C7C
mov r7, #0x0
add r5, r6, #0x0
@@ -61160,7 +61160,7 @@ _02062FC4:
lsl r0, r0, #0x2
add r0, r6, r0
add r1, r4, #0x0
- bl FUN_021D9820
+ bl MOD05_021D9820
mov r1, #0xa6
lsl r1, r1, #0x2
str r0, [r5, r1]
@@ -61201,7 +61201,7 @@ _02063012:
mov r0, #0x4d
lsl r0, r0, #0x2
add r0, r7, r0
- bl FUN_021D99F8
+ bl MOD05_021D99F8
pop {r3-r7, pc}
.balign 4
@@ -61269,7 +61269,7 @@ _02063094:
ldr r0, _02063164 ; =0x020F7C2C
add r1, #0xa0
mov r2, #0x20
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r1, r5, #0x0
add r0, r5, #0x0
add r1, #0xd4
@@ -62277,7 +62277,7 @@ _020638DA:
ldr r0, [r4, #0x0]
ldr r2, [r4, #0x10]
mov r1, #0x1
- bl FUN_0224666C
+ bl MOD06_0224666C
str r0, [r4, #0x14]
ldr r0, [r4, #0x4]
add r0, r0, #0x1
@@ -62285,11 +62285,11 @@ _020638DA:
b _02063942
_020638F8:
ldr r0, [r4, #0x14]
- bl FUN_022466A0
+ bl MOD06_022466A0
cmp r0, #0x0
beq _02063942
ldr r0, [r4, #0x14]
- bl FUN_022466AC
+ bl MOD06_022466AC
mov r1, #0xa
mov r2, #0xc
ldrh r0, [r4, #0x8]
@@ -62405,7 +62405,7 @@ _020639B6:
ldr r0, [r5, #0x38]
add r1, r7, #0x0
add r2, r6, #0x0
- bl FUN_021E643C
+ bl MOD05_021E643C
cmp r0, #0x0
beq _020639FE
ldrh r1, [r4, #0xc]
@@ -62417,7 +62417,7 @@ _020639FE:
bl FUN_020552F8
add r1, r0, #0x0
add r0, r6, #0x0
- bl FUN_021E69BC
+ bl MOD05_021E69BC
cmp r0, #0x0
beq _02063A18
ldrh r1, [r4, #0xc]
@@ -63398,7 +63398,7 @@ FUN_02064174: ; 0x02064174
ldr r1, [r4, #0x0]
add r0, r6, #0x0
mov r2, #0x4
- bl FUN_0224CB30
+ bl MOD06_0224CB30
add r6, r0, #0x0
add r0, r4, #0x0
bl FUN_02016A18
@@ -63490,7 +63490,7 @@ FUN_02064230: ; 0x02064230
ldr r1, [r6, #0x0]
add r0, r4, #0x0
mov r2, #0xb
- bl FUN_0224CA88
+ bl MOD06_0224CA88
ldr r1, [r4, #0x1c]
add r7, r0, #0x0
ldr r1, [r1, #0x0]
@@ -63987,7 +63987,7 @@ _02064622:
add r0, r4, #0x0
mov r1, #0x0
add r2, r5, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
pop {r3-r5, pc}
@@ -64007,7 +64007,7 @@ FUN_02064640: ; 0x02064640
mov r1, #0x0
mov r2, #0xc8
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r1, _02064680 ; =FUN_0206478C
add r0, r4, #0x0
bl FUN_020646B8
@@ -64166,7 +64166,7 @@ FUN_0206473C: ; 0x0206473C
bl FUN_02064738
mov r1, #0x0
add r2, r4, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
pop {r4, pc}
.balign 4
@@ -64297,12 +64297,12 @@ FUN_020647A4: ; 0x020647A4
ldr r0, [r0, #0x0]
ldr r1, [r4, #0x2c]
mov r3, r12
- bl FUN_021E7FBC
+ bl MOD05_021E7FBC
add r0, r4, #0x0
add r0, #0xa0
ldr r0, [r0, #0x0]
ldr r1, _02064864 ; =0x00000102
- bl FUN_021E7ED8
+ bl MOD05_021E7ED8
str r0, [sp, #0x14]
b _0206482C
_0206480A:
@@ -64324,11 +64324,11 @@ _0206480A:
_0206482C:
ldr r1, [sp, #0x14]
add r0, sp, #0x18
- bl FUN_021E7EA0
+ bl MOD05_021E7EA0
ldr r0, [sp, #0x14]
add r1, sp, #0x18
str r5, [sp, #0x1c]
- bl FUN_021E7EB0
+ bl MOD05_021E7EB0
mov r0, #0x2
str r0, [sp, #0x0]
str r5, [sp, #0x4]
@@ -64339,7 +64339,7 @@ _0206482C:
ldr r1, [r6, #0x8]
ldr r2, [r6, #0xc]
mov r0, #0x0
- bl FUN_021F44D8
+ bl MOD05_021F44D8
add sp, #0x30
pop {r3-r7, pc}
nop
@@ -64671,7 +64671,7 @@ _02064AB4:
add r0, #0xa0
ldr r0, [r0, #0x0]
ldr r1, _02064B64 ; =0x00000102
- bl FUN_021E7ED8
+ bl MOD05_021E7ED8
str r0, [sp, #0xc]
b _02064AEC
_02064ACA:
@@ -64693,7 +64693,7 @@ _02064ACA:
_02064AEC:
ldr r1, [sp, #0xc]
add r0, sp, #0x10
- bl FUN_021E7EA0
+ bl MOD05_021E7EA0
ldr r0, [r4, #0xc]
cmp r0, #0x0
bne _02064AFE
@@ -64721,7 +64721,7 @@ _02064B1C:
bl FUN_02055540
ldr r0, [sp, #0xc]
add r1, sp, #0x10
- bl FUN_021E7EB0
+ bl MOD05_021E7EB0
b _02064B5C
_02064B2E:
add r2, r5, #0x0
@@ -64729,7 +64729,7 @@ _02064B2E:
ldr r1, [r4, #0x4]
ldr r2, [r2, #0x0]
mov r0, #0x0
- bl FUN_021F4594
+ bl MOD05_021F4594
ldr r0, [r5, #0x38]
mov r1, #0x1
bl FUN_0205557C
@@ -64795,7 +64795,7 @@ _02064BB4:
add r0, #0xa0
ldr r0, [r0, #0x0]
ldr r1, _02064C58 ; =0x00000102
- bl FUN_021E7ED8
+ bl MOD05_021E7ED8
str r0, [sp, #0xc]
b _02064BEC
_02064BCA:
@@ -64817,7 +64817,7 @@ _02064BCA:
_02064BEC:
ldr r1, [sp, #0xc]
add r0, sp, #0x10
- bl FUN_021E7EA0
+ bl MOD05_021E7EA0
mov r0, #0x1
ldr r1, [sp, #0x14]
lsl r0, r0, #0xc
@@ -64838,7 +64838,7 @@ _02064C12:
bl FUN_02055540
ldr r0, [sp, #0xc]
add r1, sp, #0x10
- bl FUN_021E7EB0
+ bl MOD05_021E7EB0
b _02064C52
_02064C24:
add r2, r5, #0x0
@@ -64846,7 +64846,7 @@ _02064C24:
ldr r1, [r4, #0x4]
ldr r2, [r2, #0x0]
mov r0, #0x0
- bl FUN_021F4594
+ bl MOD05_021F4594
ldr r0, [r5, #0x38]
mov r1, #0x1
bl FUN_0205557C
@@ -65347,7 +65347,7 @@ FUN_02065054: ; 0x02065054
ldr r2, _0206506C ; =0x0000066C
mov r1, #0x0
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
pop {r4, pc}
nop
@@ -65640,7 +65640,7 @@ _02065290:
ldr r0, [sp, #0x10]
add r1, r4, #0x0
lsl r2, r2, #0x8
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
pop {r3-r5, pc}
.balign 4
_020652A0: .word 0x000F423F
@@ -65828,7 +65828,7 @@ FUN_020653EC: ; 0x020653EC
mov r1, #0x0
lsl r2, r2, #0x2
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r5, #0x0
str r6, [r4, #0x4]
bl FUN_020377AC
@@ -66796,7 +66796,7 @@ _02065B9E:
ldr r0, _02065CE4 ; =0x020F7E8C
add r1, r5, r1
mov r2, #0x20
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
mov r1, #0x5d
lsl r1, r1, #0x2
add r0, r1, #0x0
@@ -67096,7 +67096,7 @@ _02065E14:
ldr r0, _02065ED0 ; =0x020F7E8C
add r1, r5, r1
mov r2, #0x20
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
mov r0, #0x5d
lsl r0, r0, #0x2
add r1, r0, #0x0
@@ -67807,7 +67807,7 @@ FUN_020663D4: ; 0x020663D4
add r0, r4, r0
mov r1, #0x0
mov r2, #0x10
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x17
mov r1, #0x0
lsl r0, r0, #0x4
@@ -68077,12 +68077,12 @@ _020665E6:
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x5a
- bl FUN_0224C678
+ bl MOD06_0224C678
mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x5a
- bl FUN_0224C6E8
+ bl MOD06_0224C6E8
ldrh r0, [r4, #0x12]
add r0, r0, #0x1
strh r0, [r4, #0x12]
@@ -68093,7 +68093,7 @@ _02066614:
ldr r0, [r4, r0]
mov r1, #0x5a
ldr r0, [r0, #0x50]
- bl FUN_021DA58C
+ bl MOD05_021DA58C
cmp r0, #0x0
beq _0206662E
mov r0, #0x0
@@ -68114,7 +68114,7 @@ FUN_02066634: ; 0x02066634
add r4, r1, #0x0
ldr r0, [r5, r0]
mov r1, #0x5a
- bl FUN_021DAF98
+ bl MOD05_021DAF98
cmp r4, #0x0
bne _02066652
add r0, r5, #0x0
@@ -68148,7 +68148,7 @@ _02066676:
mov r1, #0x0
mov r2, #0x40
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r5, r0]
@@ -68387,13 +68387,13 @@ FUN_02066840: ; 0x02066840
add r0, r7, #0x0
mov r1, #0x0
mov r2, #0xe4
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r4, #0x0
bl FUN_0202398C
add r1, r7, #0x0
add r1, #0xa8
mov r2, #0x10
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r0, r4, #0x0
bl FUN_020239BC
add r1, r7, #0x0
@@ -68460,7 +68460,7 @@ _020668FC:
ldr r1, [sp, #0x8]
mov r2, #0x8
add r1, r1, r5
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r4, r4, #0x1
add r5, #0x8
cmp r4, #0x3
@@ -68471,7 +68471,7 @@ _020668FC:
add r1, r7, #0x0
add r1, #0xc0
mov r2, #0x8
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r0, [sp, #0x0]
cmp r0, #0x0
bne _02066956
@@ -68517,7 +68517,7 @@ FUN_02066978: ; 0x02066978
mov r0, #0x0
add r1, r4, #0x0
mov r2, #0xec
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r0, r4, #0x0
ldrh r2, [r4, #0x6]
add r0, #0x8
@@ -68537,7 +68537,7 @@ FUN_020669A0: ; 0x020669A0
mov r0, #0x0
add r1, r4, #0x0
mov r2, #0x88
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r0, r4, #0x0
ldrh r2, [r4, #0x6]
add r0, #0x8
@@ -68747,7 +68747,7 @@ FUN_02066ACC: ; 0x02066ACC
mov r0, #0x0
add r1, sp, #0x14
mov r2, #0x18
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r0, r5, #0x0
mov r1, #0xaa
add r2, sp, #0x14
@@ -69083,7 +69083,7 @@ _02066DF4:
orr r0, r1
orr r0, r2
mov r1, #0x1c
- blx _u32_div_f
+ bl _u32_div_f
lsl r0, r1, #0x10
lsr r5, r0, #0x10
add r0, r4, #0x0
@@ -69137,7 +69137,7 @@ FUN_02066E74: ; 0x02066E74
cmp r5, #0x0
bne _02066EA0
mov r1, #0x19
- blx _s32_div_f
+ bl _s32_div_f
add r1, r0, #0x1
mov r0, #0x19
mul r0, r1
@@ -69312,7 +69312,7 @@ _02066FFC:
add r0, r0, r1
mul r0, r4
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
add r0, r4, r0
add r0, #0xa
_0206701E:
@@ -69334,7 +69334,7 @@ _0206701E:
add r0, r0, r1
mul r0, r4
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
add r0, r0, #0x5
str r0, [sp, #0x4c]
add r0, r5, #0x0
@@ -69362,7 +69362,7 @@ _0206701E:
add r0, r0, r1
mul r0, r4
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
add r0, r0, #0x5
str r0, [sp, #0x48]
add r0, r5, #0x0
@@ -69390,7 +69390,7 @@ _0206701E:
add r0, r0, r1
mul r0, r4
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
add r0, r0, #0x5
str r0, [sp, #0x44]
add r0, r5, #0x0
@@ -69418,7 +69418,7 @@ _0206701E:
add r0, r0, r1
mul r0, r4
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
add r0, r0, #0x5
str r0, [sp, #0x40]
add r0, r5, #0x0
@@ -69446,7 +69446,7 @@ _0206701E:
add r0, r0, r1
mul r0, r4
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
add r0, r0, #0x5
str r0, [sp, #0x3c]
add r0, r5, #0x0
@@ -70060,7 +70060,7 @@ _020675AA:
sub r2, #0x19
add r1, r4, #0x0
str r2, [sp, #0x4]
- blx _ll_shl
+ bl _ll_shl
ldr r2, [r5, #0x1c]
add r3, r4, #0x0
and r3, r1
@@ -70156,7 +70156,7 @@ _02067654:
sub r2, #0x4e
add r1, r4, #0x0
str r2, [sp, #0x4]
- blx _ll_shl
+ bl _ll_shl
ldr r2, [r6, #0x14]
add r3, r4, #0x0
and r3, r1
@@ -70255,7 +70255,7 @@ _02067706:
sub r2, #0x7a
add r1, r4, #0x0
str r2, [sp, #0x4]
- blx _ll_shl
+ bl _ll_shl
ldr r3, [r7, #0x18]
ldr r2, [r7, #0x1c]
and r3, r0
@@ -71020,7 +71020,7 @@ _02067C98:
sub r2, #0x19
add r0, r4, #0x0
str r2, [sp, #0x4]
- blx _ll_shl
+ bl _ll_shl
cmp r4, #0x0
beq _02067CB6
ldr r1, [r7, #0x1c]
@@ -71158,7 +71158,7 @@ _02067D94:
sub r2, #0x4e
add r0, r4, #0x0
str r2, [sp, #0x4]
- blx _ll_shl
+ bl _ll_shl
cmp r4, #0x0
beq _02067DB2
ldr r1, [r5, #0x14]
@@ -71288,7 +71288,7 @@ _02067E8A:
sub r2, #0x7a
add r0, r4, #0x0
str r2, [sp, #0x4]
- blx _ll_shl
+ bl _ll_shl
cmp r4, #0x0
beq _02067EB2
add r4, r6, #0x0
@@ -72436,7 +72436,7 @@ FUN_02068698: ; 0x02068698
mov r0, #0x64
mul r0, r1
sub r1, r6, r4
- blx _u32_div_f
+ bl _u32_div_f
lsl r0, r0, #0x18
lsr r0, r0, #0x18
pop {r3-r7, pc}
@@ -72652,7 +72652,7 @@ FUN_0206885C: ; 0x0206885C
FUN_02068884: ; 0x02068884
push {r3, lr}
mov r1, #0x19
- blx _u32_div_f
+ bl _u32_div_f
lsl r0, r1, #0x18
lsr r0, r0, #0x18
pop {r3, pc}
@@ -72686,7 +72686,7 @@ _020688A2:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r1, r0, #0x10
b _020688E0
@@ -72696,7 +72696,7 @@ _020688CE:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r1, r0, #0x10
_020688E0:
@@ -72798,7 +72798,7 @@ _02068994:
mov r0, #0x96
mul r0, r4
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x18
asr r4, r0, #0x18
_020689AA:
@@ -73726,7 +73726,7 @@ FUN_02069010: ; 0x02069010
add r0, sp, #0xc
add r1, r4, #0x0
mov r2, #0x14
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add sp, #0x20
pop {r3-r5, pc}
.balign 4
@@ -74006,7 +74006,7 @@ _02069216:
ldr r0, [sp, #0x1c]
mov r1, #0xa
ldr r4, [sp, #0x18]
- blx _s32_div_f
+ bl _s32_div_f
str r1, [sp, #0x8]
_02069246:
ldrh r0, [r4, #0x0]
@@ -74438,20 +74438,20 @@ FUN_02069558: ; 0x02069558
bl ErrorHandling
_0206956E:
add r0, sp, #0x4
- blx FS_InitFile
+ bl FS_InitFile
ldr r1, _020695A4 ; =0x02105FC8
add r0, sp, #0x4
- blx FS_OpenFile
+ bl FS_OpenFile
add r0, sp, #0x4
lsl r1, r4, #0x1
mov r2, #0x0
- blx FS_SeekFile
+ bl FS_SeekFile
add r0, sp, #0x4
add r1, sp, #0x0
mov r2, #0x2
- blx FS_ReadFile
+ bl FS_ReadFile
add r0, sp, #0x4
- blx FS_CloseFile
+ bl FS_CloseFile
add r0, sp, #0x0
ldrh r0, [r0, #0x0]
add sp, #0x4c
@@ -75115,7 +75115,7 @@ _02069A8E:
mov r0, #0x0
add r1, sp, #0x4
mov r2, #0x18
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r0, r4, #0x0
mov r1, #0xaa
add r2, sp, #0x4
@@ -75347,7 +75347,7 @@ FUN_02069C4C: ; 0x02069C4C
_02069C70:
bl FUN_0201B9EC
add r1, r6, #0x0
- blx _s32_div_f
+ bl _s32_div_f
add r0, r5, #0x0
add r7, r1, #0x0
bl FUN_0206B9B0
@@ -75529,7 +75529,7 @@ FUN_02069DC8: ; 0x02069DC8
add r7, r0, #0x0
bl FUN_0201B9EC
mov r1, #0x3
- blx _s32_div_f
+ bl _s32_div_f
cmp r1, #0x0
bne _02069E70
mov r4, #0x0
@@ -75917,7 +75917,7 @@ FUN_0206A094: ; 0x0206A094
bne _0206A12E
bl FUN_0201B9EC
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
add r4, r1, #0x0
add r0, r5, #0x0
mov r1, #0x5
@@ -77385,7 +77385,7 @@ FUN_0206AA84: ; 0x0206AA84
add r1, sp, #0x0
add r1, #0x1
mov r2, #0x18
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r0, r4, #0x0
mov r1, #0xa1
add r2, sp, #0x0
@@ -77479,7 +77479,7 @@ _0206AB3A:
mul r0, r4
mul r0, r5
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
add r0, r4, r0
lsl r0, r0, #0x18
lsr r0, r0, #0x18
@@ -77970,7 +77970,7 @@ _0206AECE:
mov r0, #0x1f
mul r0, r1
mov r1, #0xff
- blx _s32_div_f
+ bl _s32_div_f
add r3, r0, #0x0
mov r0, #0x1
str r0, [sp, #0x0]
@@ -78054,7 +78054,7 @@ _0206AF76:
mov r0, #0x1f
mul r0, r1
mov r1, #0xff
- blx _s32_div_f
+ bl _s32_div_f
add r3, r0, #0x0
mov r0, #0x1
str r0, [sp, #0x0]
@@ -78147,7 +78147,7 @@ _0206B030:
mov r0, #0x1f
mul r0, r1
mov r1, #0xff
- blx _s32_div_f
+ bl _s32_div_f
add r3, r0, #0x0
mov r0, #0x1
str r0, [sp, #0x0]
@@ -78231,7 +78231,7 @@ _0206B0DA:
mov r0, #0x1f
mul r0, r1
mov r1, #0xff
- blx _s32_div_f
+ bl _s32_div_f
add r3, r0, #0x0
mov r0, #0x1
str r0, [sp, #0x0]
@@ -79377,7 +79377,7 @@ _0206B8DA:
add r0, r5, #0x0
mov r1, #0x0
lsl r2, r2, #0x4
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
mov r4, #0x0
str r4, [r5, #0x4]
str r6, [r5, #0x0]
@@ -80144,7 +80144,7 @@ FUN_0206BE48: ; 0x0206BE48
add r0, sp, #0x30
mov r1, #0x0
mov r2, #0xc
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, [sp, #0x20]
mov r7, #0x0
cmp r0, #0x0
@@ -80325,10 +80325,10 @@ FUN_0206BF90: ; 0x0206BF90
strb r0, [r6, #0x4]
add r0, r5, #0x0
add r1, r4, #0x4
- bl FUN_02231344
+ bl MOD11_02231344
add r0, r5, #0x0
add r1, r6, #0x4
- bl FUN_02231350
+ bl MOD11_02231350
ldr r0, _0206BFE8 ; =FUN_0206C550
add r1, r4, #0x0
mov r2, #0x0
@@ -80511,13 +80511,13 @@ FUN_0206C0C8: ; 0x0206C0C8
bl FUN_02016998
add r6, r0, #0x0
ldr r0, [sp, #0x0]
- bl FUN_022300D4
+ bl MOD11_022300D4
add r5, r0, #0x0
ldr r0, [sp, #0x0]
- bl FUN_022300F4
+ bl MOD11_022300F4
add r4, r0, #0x0
ldr r0, [sp, #0x0]
- bl FUN_02230100
+ bl MOD11_02230100
mov r12, r0
add r0, sp, #0x10
ldrh r3, [r4, #0x0]
@@ -80577,13 +80577,13 @@ FUN_0206C154: ; 0x0206C154
add r0, r3, #0x0
add r5, r1, #0x0
add r6, r2, #0x0
- bl FUN_022300DC
+ bl MOD11_022300DC
add r7, r0, #0x0
ldr r0, [sp, #0x0]
- bl FUN_02230118
+ bl MOD11_02230118
add r4, r0, #0x0
ldr r0, [sp, #0x0]
- bl FUN_02230124
+ bl MOD11_02230124
ldrh r1, [r4, #0x0]
add r2, r1, r5
add r3, r2, #0x1
@@ -81135,16 +81135,16 @@ FUN_0206C550: ; 0x0206C550
add r5, r1, #0x0
str r0, [sp, #0x0]
ldr r0, [r5, #0x0]
- bl FUN_022300D4
+ bl MOD11_022300D4
add r6, r0, #0x0
ldr r0, [r5, #0x0]
- bl FUN_022300E8
+ bl MOD11_022300E8
add r4, r0, #0x0
ldr r0, [r5, #0x0]
- bl FUN_022300F4
+ bl MOD11_022300F4
str r0, [sp, #0x4]
ldr r0, [r5, #0x0]
- bl FUN_02230100
+ bl MOD11_02230100
add r7, r0, #0x0
ldrb r0, [r5, #0x4]
cmp r0, #0x0
@@ -81203,16 +81203,16 @@ FUN_0206C5DC: ; 0x0206C5DC
add r5, r1, #0x0
str r0, [sp, #0x0]
ldr r0, [r5, #0x0]
- bl FUN_022300DC
+ bl MOD11_022300DC
add r6, r0, #0x0
ldr r0, [r5, #0x0]
- bl FUN_0223010C
+ bl MOD11_0223010C
add r4, r0, #0x0
ldr r0, [r5, #0x0]
- bl FUN_02230118
+ bl MOD11_02230118
add r7, r0, #0x0
ldr r0, [r5, #0x0]
- bl FUN_02230124
+ bl MOD11_02230124
ldrb r1, [r5, #0x4]
cmp r1, #0x0
beq _0206C60A
@@ -81233,7 +81233,7 @@ _0206C61E:
ldrh r1, [r4, #0x0]
ldr r0, [r5, #0x0]
add r1, r6, r1
- bl FUN_022567E0
+ bl MOD11_022567E0
ldrh r0, [r4, #0x0]
add r1, r0, #0x2
ldrb r2, [r6, r1]
@@ -81259,13 +81259,13 @@ FUN_0206C64C: ; 0x0206C64C
add r4, r3, #0x0
add r0, r4, #0x0
mov r1, #0xff
- bl FUN_0223135C
+ bl MOD11_0223135C
add r0, r4, #0x0
mov r1, #0xff
- bl FUN_02231368
+ bl MOD11_02231368
add r0, r4, #0x0
mov r1, #0x1
- bl FUN_02231374
+ bl MOD11_02231374
pop {r4, pc}
.balign 4
@@ -81362,21 +81362,21 @@ FUN_0206C700: ; 0x0206C700
mov r0, #0x0
add r1, r4, #0x0
mov r2, #0x80
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
bl FUN_020222F0
str r0, [sp, #0x1c]
bl FUN_020222E8
add r1, r0, #0x0
ldr r2, [sp, #0x1c]
mov r0, #0x0
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
bl FUN_02022300
str r0, [sp, #0x20]
bl FUN_020222F8
add r1, r0, #0x0
ldr r2, [sp, #0x20]
mov r0, #0x0
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
ldr r0, [sp, #0x14]
str r6, [r4, #0x24]
mov r1, #0x5
@@ -81497,7 +81497,7 @@ FUN_0206C700: ; 0x0206C700
ldr r1, [r4, #0x3c]
mov r0, #0x0
mov r2, #0x30
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
ldr r1, [sp, #0x38]
ldr r0, [r4, #0x3c]
str r1, [r0, #0x2c]
@@ -83490,7 +83490,7 @@ _0206D8EA:
mov r0, #0x0
add r1, sp, #0x8
mov r2, #0x18
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r0, r5, #0x0
mov r1, #0xaa
add r2, sp, #0x8
@@ -83559,25 +83559,25 @@ _0206D9C6:
mov r0, #0x0
lsl r1, r1, #0x18
lsl r2, r2, #0x12
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
mov r1, #0x62
mov r2, #0x2
mov r0, #0x0
lsl r1, r1, #0x14
lsl r2, r2, #0x10
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
mov r1, #0x19
mov r2, #0x1
mov r0, #0x0
lsl r1, r1, #0x16
lsl r2, r2, #0x12
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
mov r1, #0x66
mov r2, #0x2
mov r0, #0x0
lsl r1, r1, #0x14
lsl r2, r2, #0x10
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
ldr r6, _0206DC2C ; =0x020F8328
add r3, sp, #0x2c
add r2, r3, #0x0
@@ -84084,14 +84084,14 @@ FUN_0206DE4C: ; 0x0206DE4C
mov r1, #0x0
mov r2, #0xe
mov r3, #0xb
- blx G2x_SetBlendAlpha_
+ bl G2x_SetBlendAlpha_
mov r0, #0x8
str r0, [sp, #0x0]
ldr r0, _0206DE74 ; =0x04001050
mov r1, #0x0
mov r2, #0xe
mov r3, #0x7
- blx G2x_SetBlendAlpha_
+ bl G2x_SetBlendAlpha_
pop {r3, pc}
.balign 4
_0206DE70: .word 0x04000050
@@ -84155,13 +84155,13 @@ FUN_0206DE94: ; 0x0206DE94
add r1, r0, #0x0
add r2, r0, #0x0
add r3, r0, #0x0
- blx G3X_SetFog
+ bl G3X_SetFog
mov r0, #0x0
ldr r2, _0206DF0C ; =0x00007FFF
add r1, r0, #0x0
mov r3, #0x3f
str r0, [sp, #0x0]
- blx G3X_SetClearColor
+ bl G3X_SetClearColor
ldr r1, _0206DF10 ; =0xBFFF0000
ldr r0, _0206DF14 ; =0x04000580
str r1, [r0, #0x0]
@@ -84214,7 +84214,7 @@ FUN_0206DF58: ; 0x0206DF58
cmp r0, #0x0
ble _0206DF6E
bl FUN_020222AC
- blx FUN_020B02C8
+ bl FUN_020B02C8
_0206DF6E:
bl FUN_02013388
mov r0, #0x1
@@ -84720,7 +84720,7 @@ FUN_0206E2F0: ; 0x0206E2F0
mov r1, #0x0
mov r2, #0x78
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
pop {r4, pc}
.balign 4
@@ -86830,7 +86830,7 @@ FUN_0206F164: ; 0x0206F164
mov r0, #0x0
add r1, r4, #0x0
mov r2, #0x24
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
add r0, r4, #0x0
pop {r4, pc}
@@ -87124,9 +87124,9 @@ _0206F34A:
bl FUN_0201681C
bl FUN_02088878
mov r0, #0x36
- bl FUN_02211E60
+ bl MOD07_02211E60
mov r0, #0x0
- blx OS_ResetSystem
+ bl OS_ResetSystem
b _0206F380
_0206F366:
ldr r0, [r4, #0x0]
@@ -87157,14 +87157,14 @@ FUN_0206F38C: ; 0x0206F38C
mov r1, #0x0
mov r2, #0x10
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0xb
mov r1, #0xc
bl FUN_020169D8
mov r1, #0x0
mov r2, #0xc
str r0, [r4, #0x0]
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r4, #0x0
pop {r4, pc}
.balign 4
@@ -88362,7 +88362,7 @@ FUN_0206FD24: ; 0x0206FD24
bl LoadFromNarc_2
add r1, sp, #0x10
add r4, r0, #0x0
- blx FUN_020B0138
+ bl FUN_020B0138
ldr r2, [sp, #0x10]
mov r0, #0x3
ldr r1, [r2, #0xc]
@@ -88378,7 +88378,7 @@ FUN_0206FD24: ; 0x0206FD24
add r0, r5, r0
add r1, #0x60
lsl r2, r2, #0x8
- blx memcpy
+ bl memcpy
mov r0, #0xc
add r1, r4, #0x0
bl FUN_02016A8C
@@ -88490,7 +88490,7 @@ FUN_0206FE74: ; 0x0206FE74
ldr r2, _0206FF50 ; =0x00000B38
mov r1, #0x0
add r6, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
bl FUN_0200628C
ldr r1, _0206FF54 ; =0x000005A4
@@ -93292,7 +93292,7 @@ FUN_020724D4: ; 0x020724D4
bl LoadFromNarc_2
add r1, sp, #0xc
str r0, [sp, #0x8]
- blx FUN_020B0180
+ bl FUN_020B0180
ldr r0, [sp, #0xc]
mov r4, #0x0
str r0, [sp, #0x4]
@@ -93303,14 +93303,14 @@ _020724FE:
ldr r1, [sp, #0x0]
add r0, r5, #0x0
mov r2, #0x20
- blx memcpy
+ bl memcpy
add r1, r4, #0x6
lsl r2, r1, #0x6
ldr r1, [sp, #0x4]
add r0, r6, #0x0
add r1, r1, r2
mov r2, #0x20
- blx memcpy
+ bl memcpy
add r1, r4, #0x0
add r1, #0xc
lsl r2, r1, #0x6
@@ -93318,7 +93318,7 @@ _020724FE:
add r0, r7, #0x0
add r1, r1, r2
mov r2, #0x20
- blx memcpy
+ bl memcpy
ldr r0, [sp, #0x0]
add r4, r4, #0x1
add r0, #0x40
@@ -97348,13 +97348,13 @@ _02074638:
ldr r1, [sp, #0x14]
add r0, r0, r5
add r1, r1, r7
- blx memcpy
+ bl memcpy
ldr r0, [sp, #0x1c]
ldr r1, [sp, #0x10]
add r0, r0, r5
add r1, r1, r7
mov r2, #0x20
- blx memcpy
+ bl memcpy
ldr r0, [sp, #0x4]
mov r2, #0x20
add r0, r0, r4
@@ -97366,13 +97366,13 @@ _02074638:
ldr r1, [sp, #0x14]
add r0, r0, r5
add r1, r1, r7
- blx memcpy
+ bl memcpy
ldr r0, [sp, #0x24]
ldr r1, [sp, #0x10]
add r0, r0, r5
add r1, r1, r7
mov r2, #0x20
- blx memcpy
+ bl memcpy
add r0, r4, #0x1
lsl r0, r0, #0x10
lsr r4, r0, #0x10
@@ -99044,7 +99044,7 @@ FUN_020753B4: ; 0x020753B4
ldr r0, _020754AC ; =0x00000708
ldrh r0, [r1, r0]
mov r1, #0x5
- blx _s32_div_f
+ bl _s32_div_f
ldr r1, _020754B0 ; =0x00000B28
strh r0, [r4, r1]
sub r0, r1, #0x3
@@ -102727,7 +102727,7 @@ _020772FE:
mov r1, #0x0
lsl r2, r2, #0x4
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
mov r0, #0x12
bl FUN_02016B94
mov r1, #0x16
@@ -102890,7 +102890,7 @@ FUN_020774B8: ; 0x020774B8
ldr r1, _020774E8 ; =0x000057E0
add r6, r3, #0x0
lsl r2, r2, #0x8
- blx GX_LoadOBJ
+ bl GX_LoadOBJ
ldr r4, [r4, #0xc]
add r0, r5, #0x0
add r1, r6, #0x0
@@ -102900,7 +102900,7 @@ FUN_020774B8: ; 0x020774B8
add r0, r4, r0
mov r1, #0xc0
mov r2, #0x20
- blx GX_LoadOBJPltt
+ bl GX_LoadOBJPltt
pop {r4-r6, pc}
nop
_020774E8: .word 0x000057E0
@@ -103279,7 +103279,7 @@ FUN_020777D4: ; 0x020777D4
bne _020777FE
bl FUN_0201B9EC
mov r1, #0x12
- blx _s32_div_f
+ bl _s32_div_f
mov r0, #0x17
lsl r0, r0, #0x4
ldr r0, [r5, r0]
@@ -103291,7 +103291,7 @@ _020777FE:
bne _0207781A
bl FUN_0201B9EC
mov r1, #0x12
- blx _s32_div_f
+ bl _s32_div_f
mov r0, #0x17
lsl r0, r0, #0x4
ldr r0, [r5, r0]
@@ -103949,7 +103949,7 @@ _02077D88:
mov r0, #0x1
add r1, #0xd8
mov r2, #0x40
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
ldr r0, [r4, #0x0]
cmp r0, #0x1
bne _02077DCE
@@ -104394,7 +104394,7 @@ FUN_02078140: ; 0x02078140
push {r4-r7, lr}
sub sp, #0x14
add r5, r0, #0x0
- blx FUN_020B0FC0
+ bl FUN_020B0FC0
mov r0, #0x0
str r0, [sp, #0x0]
mov r1, #0x80
@@ -104516,7 +104516,7 @@ _0207818C:
mov r1, #0x2
ldr r0, [r5, r0]
lsl r1, r1, #0x8
- blx DC_FlushRange
+ bl DC_FlushRange
bl FUN_0206B888
add r1, r0, #0x0
mov r0, #0x13
@@ -104529,7 +104529,7 @@ _0207818C:
add r0, r1, #0x4
ldr r0, [r5, r0]
mov r1, #0x80
- blx DC_FlushRange
+ bl DC_FlushRange
_02078272:
mov r3, #0x1
str r3, [sp, #0x0]
@@ -106027,7 +106027,7 @@ _02078E52:
add r0, sp, #0x0
mov r1, #0x3a
mov r2, #0x2
- blx GX_LoadOBJPltt
+ bl GX_LoadOBJPltt
pop {r3, pc}
thumb_func_start FUN_02078E7C
@@ -106197,7 +106197,7 @@ FUN_02078FA0: ; 0x02078FA0
bl FUN_02078F7C
mov r1, #0x2
lsl r1, r1, #0xa
- blx DC_FlushRange
+ bl DC_FlushRange
add r7, r6, #0x0
mov r4, #0x0
add r7, #0x30
@@ -106213,14 +106213,14 @@ _02078FD0:
mov r1, #0x1
add r0, r5, #0x0
lsl r1, r1, #0x8
- blx DC_FlushRange
+ bl DC_FlushRange
ldr r1, _02079070 ; =0x020F9D28
mov r2, #0x1
ldrb r1, [r1, r4]
add r0, r5, #0x0
lsl r2, r2, #0x8
lsl r1, r1, #0x5
- blx GXS_LoadOBJ
+ bl GXS_LoadOBJ
add r0, r4, #0x1
lsl r0, r0, #0x10
lsr r4, r0, #0x10
@@ -106253,14 +106253,14 @@ _02079012:
bl FUN_02078F7C
mov r1, #0x80
add r7, r0, #0x0
- blx DC_FlushRange
+ bl DC_FlushRange
ldr r1, _02079078 ; =0x020F9D40
lsl r2, r5, #0x2
ldr r1, [r1, r2]
add r0, r7, #0x0
lsl r1, r1, #0x5
mov r2, #0x80
- blx GXS_LoadOBJ
+ bl GXS_LoadOBJ
add r0, r5, #0x1
lsl r0, r0, #0x10
lsr r5, r0, #0x10
@@ -106854,7 +106854,7 @@ _02079470:
mov r1, #0x0
mov r2, #0x7
str r3, [sp, #0x0]
- blx G2x_SetBlendAlpha_
+ bl G2x_SetBlendAlpha_
mov r0, #0xd3
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@@ -107543,7 +107543,7 @@ FUN_02079A0C: ; 0x02079A0C
push {r4, lr}
add r4, r0, #0x0
mul r0, r2
- blx _u32_div_f
+ bl _u32_div_f
lsl r0, r0, #0x18
lsr r0, r0, #0x18
bne _02079A22
@@ -107566,7 +107566,7 @@ FUN_02079A24: ; 0x02079A24
pop {r4, pc}
_02079A36:
mov r1, #0x5
- blx _u32_div_f
+ bl _u32_div_f
cmp r4, r0
bls _02079A44
mov r0, #0x2
@@ -107767,7 +107767,7 @@ FUN_02079B60: ; 0x02079B60
_02079B9A:
add r0, r7, #0x0
add r1, sp, #0x10
- blx FUN_020B0088
+ bl FUN_020B0088
cmp r4, #0x0
bne _02079BAE
ldr r0, [sp, #0x10]
@@ -107789,7 +107789,7 @@ _02079BAE:
_02079BC6:
add r0, r7, #0x0
add r1, sp, #0xc
- blx FUN_020B0180
+ bl FUN_020B0180
cmp r4, #0x0
bne _02079BDA
ldr r0, [sp, #0xc]
@@ -107825,7 +107825,7 @@ _02079BF8:
_02079C10:
add r0, r7, #0x0
add r1, sp, #0x8
- blx FUN_020B0138
+ bl FUN_020B0138
cmp r4, #0x0
bne _02079C24
ldr r0, [sp, #0x8]
@@ -107866,7 +107866,7 @@ FUN_02079C40: ; 0x02079C40
bl FUN_02006774
add r0, r4, #0x0
add r1, r7, #0x0
- blx FUN_020B0180
+ bl FUN_020B0180
add r0, r4, #0x0
pop {r3-r7, pc}
@@ -107924,7 +107924,7 @@ FUN_02079C7C: ; 0x02079C7C
ldr r2, _02079DAC ; =0x0000069C
mov r1, #0x0
add r5, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
bl FUN_0200628C
mov r1, #0x93
@@ -108459,7 +108459,7 @@ FUN_0207A188: ; 0x0207A188
mov r1, #0x1
mov r2, #0x1e
mov r3, #0x17
- blx G2x_SetBlendAlpha_
+ bl G2x_SetBlendAlpha_
pop {r3, pc}
.balign 4
_0207A19C: .word 0x04000050
@@ -110574,7 +110574,7 @@ _0207B256:
bl LoadFromNarc_2
add r1, sp, #0xc
add r4, r0, #0x0
- blx FUN_020B0180
+ bl FUN_020B0180
mov r3, #0x0
str r3, [sp, #0x0]
mov r0, #0x20
@@ -111980,7 +111980,7 @@ FUN_0207BD84: ; 0x0207BD84
bl FUN_0206AB18
bl FUN_02083114
mov r1, #0xa
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x18
asr r6, r0, #0x18
mov r4, #0x0
@@ -113920,7 +113920,7 @@ _0207CD3E:
mov r1, #0xa
ldrb r0, [r4, r0]
add r0, r0, #0x1
- blx _s32_div_f
+ bl _s32_div_f
ldr r0, _0207CE44 ; =0x00000693
strb r1, [r4, r0]
b _0207CDE8
@@ -114375,7 +114375,7 @@ FUN_0207D0C8: ; 0x0207D0C8
lsl r0, r1, #0x10
mov r1, #0x4b
lsl r1, r1, #0x2
- blx _u32_div_f
+ bl _u32_div_f
lsr r0, r0, #0x10
lsl r0, r0, #0x10
asr r0, r0, #0x10
@@ -114390,7 +114390,7 @@ _0207D0EE:
lsl r0, r1, #0x10
mov r1, #0x4b
lsl r1, r1, #0x2
- blx _u32_div_f
+ bl _u32_div_f
lsr r0, r0, #0x10
lsl r0, r0, #0x10
asr r0, r0, #0x10
@@ -118028,9 +118028,9 @@ _0207EF68: .word 0x0001020F
FUN_0207EF6C: ; 0x0207EF6C
push {r3-r4, lr}
sub sp, #0x4
- blx FUN_020BB7F4
- blx G3X_Init
- blx G3X_InitMtxStack
+ bl FUN_020BB7F4
+ bl G3X_Init
+ bl G3X_InitMtxStack
ldr r0, _0207EFEC ; =0x04000060
ldr r1, _0207EFF0 ; =0xFFFFCFFD
ldrh r2, [r0, #0x0]
@@ -118060,13 +118060,13 @@ FUN_0207EF6C: ; 0x0207EF6C
add r1, r0, #0x0
add r2, r0, #0x0
add r3, r0, #0x0
- blx G3X_SetFog
+ bl G3X_SetFog
mov r0, #0x0
ldr r2, _0207EFF8 ; =0x00007FFF
add r1, r0, #0x0
mov r3, #0x3f
str r0, [sp, #0x0]
- blx G3X_SetClearColor
+ bl G3X_SetClearColor
ldr r1, _0207EFFC ; =0x04000540
mov r0, #0x0
str r0, [r1, #0x0]
@@ -118112,16 +118112,16 @@ FUN_0207F008: ; 0x0207F008
mov r0, #0x2
str r0, [r2, #0x0]
str r3, [r1, #0x0]
- blx FUN_020B849C
+ bl FUN_020B849C
mov r0, #0xb7
lsl r0, r0, #0x2
add r0, r4, r0
bl FUN_0207F108
- blx FUN_020B849C
+ bl FUN_020B849C
add r0, r4, #0x0
bl FUN_0207F1A4
_0207F046:
- blx FUN_020B02C8
+ bl FUN_020B02C8
mov r0, #0xae
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@@ -118682,43 +118682,43 @@ FUN_0207F48C: ; 0x0207F48C
add r6, r2, #0x0
sub r7, r1, r0
add r0, r7, #0x0
- blx _fflt
+ bl _fflt
ldr r1, _0207F600 ; =0x45800000
- blx _fdiv
+ bl _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx _fdiv
+ bl _fdiv
mov r1, #0x0
- blx _fgr
+ bl _fgr
bls _0207F4E0
add r0, r7, #0x0
- blx _fflt
+ bl _fflt
ldr r1, _0207F600 ; =0x45800000
- blx _fdiv
+ bl _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx _fdiv
+ bl _fdiv
add r1, r0, #0x0
ldr r0, _0207F600 ; =0x45800000
- blx _fmul
+ bl _fmul
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
- blx _ffix
+ bl _fadd
+ bl _ffix
b _0207F506
_0207F4E0:
add r0, r7, #0x0
- blx _fflt
+ bl _fflt
ldr r1, _0207F600 ; =0x45800000
- blx _fdiv
+ bl _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx _fdiv
+ bl _fdiv
add r1, r0, #0x0
ldr r0, _0207F600 ; =0x45800000
- blx _fmul
+ bl _fmul
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
- blx _ffix
+ bl _fsub
+ bl _ffix
_0207F506:
lsl r0, r0, #0x10
asr r0, r0, #0x10
@@ -118728,43 +118728,43 @@ _0207F506:
ldrsh r0, [r5, r0]
sub r7, r1, r0
add r0, r7, #0x0
- blx _fflt
+ bl _fflt
ldr r1, _0207F600 ; =0x45800000
- blx _fdiv
+ bl _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx _fdiv
+ bl _fdiv
mov r1, #0x0
- blx _fgr
+ bl _fgr
bls _0207F558
add r0, r7, #0x0
- blx _fflt
+ bl _fflt
ldr r1, _0207F600 ; =0x45800000
- blx _fdiv
+ bl _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx _fdiv
+ bl _fdiv
add r1, r0, #0x0
ldr r0, _0207F600 ; =0x45800000
- blx _fmul
+ bl _fmul
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
- blx _ffix
+ bl _fadd
+ bl _ffix
b _0207F57E
_0207F558:
add r0, r7, #0x0
- blx _fflt
+ bl _fflt
ldr r1, _0207F600 ; =0x45800000
- blx _fdiv
+ bl _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx _fdiv
+ bl _fdiv
add r1, r0, #0x0
ldr r0, _0207F600 ; =0x45800000
- blx _fmul
+ bl _fmul
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
- blx _ffix
+ bl _fsub
+ bl _ffix
_0207F57E:
lsl r0, r0, #0x10
asr r0, r0, #0x10
@@ -118774,43 +118774,43 @@ _0207F57E:
ldrsh r0, [r5, r0]
sub r4, r1, r0
add r0, r4, #0x0
- blx _fflt
+ bl _fflt
ldr r1, _0207F600 ; =0x45800000
- blx _fdiv
+ bl _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx _fdiv
+ bl _fdiv
mov r1, #0x0
- blx _fgr
+ bl _fgr
bls _0207F5D0
add r0, r4, #0x0
- blx _fflt
+ bl _fflt
ldr r1, _0207F600 ; =0x45800000
- blx _fdiv
+ bl _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx _fdiv
+ bl _fdiv
add r1, r0, #0x0
ldr r0, _0207F600 ; =0x45800000
- blx _fmul
+ bl _fmul
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
- blx _ffix
+ bl _fadd
+ bl _ffix
b _0207F5F6
_0207F5D0:
add r0, r4, #0x0
- blx _fflt
+ bl _fflt
ldr r1, _0207F600 ; =0x45800000
- blx _fdiv
+ bl _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx _fdiv
+ bl _fdiv
add r1, r0, #0x0
ldr r0, _0207F600 ; =0x45800000
- blx _fmul
+ bl _fmul
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
- blx _ffix
+ bl _fsub
+ bl _ffix
_0207F5F6:
lsl r0, r0, #0x10
asr r0, r0, #0x10
@@ -120608,7 +120608,7 @@ FUN_0208048C: ; 0x0208048C
add r2, r1, #0x0
bl FUN_020671BC
mov r1, #0x6
- blx _u32_div_f
+ bl _u32_div_f
cmp r1, #0x5
bhi _02080510
add r0, r1, r1
@@ -120819,7 +120819,7 @@ _0208064C:
add r0, r7, #0x0
_02080654:
mov r1, #0x5
- blx _s32_div_f
+ bl _s32_div_f
mov r2, #0xa
add r6, r5, #0x0
mul r6, r2
@@ -121550,7 +121550,7 @@ FUN_02080C38: ; 0x02080C38
mov r1, #0x0
mov r2, #0x8
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r1, _02080C5C ; =FUN_02080C60
add r0, r5, #0x0
add r2, r4, #0x0
@@ -121774,7 +121774,7 @@ FUN_02080E0C: ; 0x02080E0C
mov r1, #0x0
mov r2, #0x8
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _02080E50 ; =0x00000121
str r6, [r4, #0x0]
ldrb r0, [r6, r0]
@@ -122275,7 +122275,7 @@ FUN_020811D8: ; 0x020811D8
ldr r2, _02081204 ; =0x000019C4
mov r1, #0x0
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _02081208 ; =0x00000123
mov r1, #0x0
strb r1, [r4, r0]
@@ -122790,7 +122790,7 @@ FUN_020815D0: ; 0x020815D0
mov r1, #0x0
mov r2, #0x28
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _02081658 ; =0x00000123
ldrb r1, [r5, r0]
lsl r1, r1, #0x2
@@ -123406,7 +123406,7 @@ _02081A8A:
ldr r1, _02081D30 ; =0x00000585
ldr r0, [r4, r0]
add r1, r4, r1
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
mov r0, #0xc
bl FUN_02031588
ldr r0, _02081D2C ; =0x00000584
@@ -124765,7 +124765,7 @@ _02082456:
mov r1, #0x0
mov r2, #0x10
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r6, #0x0
bl FUN_020832E4
strb r0, [r4, #0xc]
@@ -125393,7 +125393,7 @@ _0208292A:
mov r1, #0x0
bl LoadFromNARC_7
mov r1, #0x30
- blx _u32_div_f
+ bl _u32_div_f
str r0, [sp, #0x24]
ldr r1, [sp, #0x24]
add r0, r5, #0x0
@@ -125553,7 +125553,7 @@ _02082A5A:
ldr r0, [sp, #0x4]
bl FUN_02082878
ldr r1, [sp, #0x10]
- blx _s32_div_f
+ bl _s32_div_f
mov r3, #0x0
cmp r6, #0x0
ble _02082AA2
@@ -125597,7 +125597,7 @@ _02082AB0:
ldr r0, [sp, #0x4]
bl FUN_02082878
add r1, r6, #0x0
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r1, #0x10
lsr r2, r0, #0x10
ldrb r3, [r5, r2]
@@ -125658,7 +125658,7 @@ _02082B16:
ldr r0, [sp, #0x4]
bl FUN_02082878
ldr r1, [sp, #0x8]
- blx _s32_div_f
+ bl _s32_div_f
add r0, r4, r1
lsl r0, r0, #0x10
lsr r2, r0, #0x10
@@ -126341,7 +126341,7 @@ _02083058:
ldr r0, [sp, #0x4]
bl FUN_02082878
add r1, r4, #0x0
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r1, #0x10
lsr r1, r0, #0x10
ldr r0, [sp, #0x10]
@@ -126929,7 +126929,7 @@ FUN_02083454: ; 0x02083454
_02083464:
bl FUN_0201B9EC
mov r1, #0xc
- blx _s32_div_f
+ bl _s32_div_f
add sp, #0xc
add r0, r1, #0x0
pop {r4-r5, pc}
@@ -126937,7 +126937,7 @@ _02083474:
add r0, sp, #0x0
add r1, r4, #0x0
mov r2, #0xc
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r1, #0x2
add r0, sp, #0x0
strb r1, [r0, #0x0]
@@ -126974,7 +126974,7 @@ _020834A6:
_020834BE:
bl FUN_0201B9EC
add r1, r4, #0x0
- blx _s32_div_f
+ bl _s32_div_f
add r0, sp, #0x0
ldrb r0, [r0, r1]
add sp, #0xc
@@ -127090,7 +127090,7 @@ _02083578:
add r1, r2, r1
ldr r0, [sp, #0x0]
add r2, r6, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
mov r0, #0x1
strb r0, [r7, r5]
pop {r3-r7, pc}
@@ -127105,11 +127105,11 @@ FUN_020835A0: ; 0x020835A0
mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r3, r0]
- ldr r3, _020835AC ; =0x0223D1CD
+ ldr r3, _020835AC ; =MOD12_0223D1CC
add r1, r2, #0x0
bx r3
.balign 4
-_020835AC: .word 0x0223D1CD
+_020835AC: .word MOD12_0223D1CC
thumb_func_start FUN_020835B0
FUN_020835B0: ; 0x020835B0
@@ -127125,7 +127125,7 @@ FUN_020835B0: ; 0x020835B0
lsl r1, r6, #0x8
add r1, r2, r1
add r2, r5, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r2, _02083628 ; =0x00000584
ldrb r0, [r4, r2]
add r0, r0, #0x1
@@ -127247,7 +127247,7 @@ FUN_02083694: ; 0x02083694
add r0, r5, #0x0
lsl r1, r1, #0x2
ldr r1, [r4, r1]
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r0, _020836B8 ; =0x00000584
ldrb r1, [r4, r0]
add r1, r1, #0x1
@@ -127270,7 +127270,7 @@ FUN_020836BC: ; 0x020836BC
add r0, r7, #0x0
add r1, r5, #0x0
add r2, r4, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
mov r0, #0x1b
add r1, r5, #0x0
add r2, r4, #0x1
@@ -127304,7 +127304,7 @@ _02083710:
ldr r1, [r4, #0x0]
add r0, r0, r5
add r2, r6, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r7, r7, #0x1
add r4, r4, #0x4
add r5, r5, r6
@@ -127341,7 +127341,7 @@ _02083758:
ldr r0, [r5, #0x0]
add r1, r1, r4
add r2, r6, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r7, r7, #0x1
add r4, r4, r6
add r5, r5, #0x4
@@ -127376,7 +127376,7 @@ FUN_0208378C: ; 0x0208378C
add r5, #0x10
mul r3, r2
add r1, r5, r3
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r0, _020837B0 ; =0x00000584
ldrb r1, [r4, r0]
add r1, r1, #0x1
@@ -127397,7 +127397,7 @@ FUN_020837B4: ; 0x020837B4
add r0, r6, #0x0
add r1, r4, #0x0
mov r2, #0x30
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r0, r4, #0x0
add r0, #0x30
strb r5, [r0, #0x0]
@@ -127432,7 +127432,7 @@ _02083802:
add r0, r6, r0
add r1, r5, #0x0
add r2, r7, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r4, r4, #0x1
add r5, #0x8
cmp r4, #0x3
@@ -127467,7 +127467,7 @@ _02083848:
add r0, r5, #0x0
add r1, r6, r1
add r2, r7, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r4, r4, #0x1
add r5, #0x8
cmp r4, #0x3
@@ -127532,7 +127532,7 @@ FUN_020838B4: ; 0x020838B4
add r0, sp, #0x0
add r1, r4, #0x4
mov r2, #0x10
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
strb r5, [r4, #0x0]
mov r0, #0x10
strb r0, [r4, #0x1]
@@ -127569,7 +127569,7 @@ FUN_02083904: ; 0x02083904
add r1, r4, r1
add r1, #0xf8
ldr r1, [r1, #0x0]
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r0, _0208392C ; =0x00000584
ldrb r1, [r4, r0]
add r1, r1, #0x1
@@ -127592,7 +127592,7 @@ FUN_02083930: ; 0x02083930
add r0, r7, #0x0
add r1, r5, #0x0
add r2, r4, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
mov r0, #0x20
add r1, r5, #0x0
add r2, r4, #0x1
@@ -127635,7 +127635,7 @@ _02083992:
ldr r1, [r1, #0x0]
add r0, r0, r5
add r2, r6, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r7, r7, #0x1
add r4, r4, #0x4
add r5, r5, r6
@@ -127678,7 +127678,7 @@ _020839E8:
ldr r0, [r5, #0x0]
add r1, r1, r4
add r2, r6, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r7, r7, #0x1
add r4, r4, r6
add r5, r5, #0x4
@@ -127708,7 +127708,7 @@ FUN_02083A1C: ; 0x02083A1C
add r0, r2, #0x0
add r1, r3, r1
add r2, r4, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
pop {r4, pc}
nop
_02083A30: .word 0x000019A0
@@ -127796,7 +127796,7 @@ FUN_02083AA8: ; 0x02083AA8
mov r1, #0x57
lsl r1, r1, #0x2
ldr r1, [r3, r1]
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r0, _02083AD0 ; =0x00000584
ldrb r1, [r4, r0]
add r1, r1, #0x1
@@ -127820,7 +127820,7 @@ FUN_02083AD4: ; 0x02083AD4
add r0, r6, #0x0
add r1, r4, #0x0
add r2, r5, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
_02083AF4:
mov r0, #0x24
add r1, r4, #0x0
@@ -127879,7 +127879,7 @@ FUN_02083B48: ; 0x02083B48
add r0, r6, #0x0
add r1, r4, #0x0
mov r2, #0x6
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
mov r0, #0x25
add r1, r4, #0x0
mov r2, #0x7
@@ -127939,7 +127939,7 @@ FUN_02083BAC: ; 0x02083BAC
ldr r0, [r4, r0]
add r1, r6, #0x0
lsl r2, r2, #0x4
- blx memcpy
+ bl memcpy
ldr r0, [r4, #0x58]
add r0, r0, #0x1
str r0, [r4, #0x58]
@@ -127956,21 +127956,21 @@ FUN_02083BAC: ; 0x02083BAC
add r0, r4, #0x0
mov r1, #0x1b
mov r2, #0x0
- bl FUN_0222F440
+ bl MOD70_0222F440
b _02083C14
_02083BF6:
bl FUN_02031190
ldr r1, _02083C20 ; =0x00002218
ldr r2, [r4, #0x50]
ldr r1, [r4, r1]
- bl FUN_0222F480
+ bl MOD70_0222F480
b _02083C14
_02083C06:
bl FUN_02031190
ldr r1, _02083C20 ; =0x00002218
ldr r2, [r4, #0x50]
ldr r1, [r4, r1]
- bl FUN_0222F480
+ bl MOD70_0222F480
_02083C14:
ldr r0, [r4, #0x50]
add r0, r0, #0x1
@@ -128115,7 +128115,7 @@ FUN_02083CD8: ; 0x02083CD8
add r0, r6, #0x0
add r1, r3, r1
sub r2, r2, #0x4
- blx MIi_CpuCopyFast
+ bl MIi_CpuCopyFast
mov r0, #0x4
str r0, [r4, #0x54]
mov r0, #0x0
@@ -128205,14 +128205,14 @@ FUN_02083D5C: ; 0x02083D5C
mov r2, #0x19
add r0, r5, #0x0
lsl r2, r2, #0x4
- blx MIi_CpuCopyFast
+ bl MIi_CpuCopyFast
b _02083D9C
_02083D90:
add r2, r4, r2
add r1, r2, r1
add r0, r5, #0x0
sub r2, r3, #0x4
- blx MIi_CpuCopyFast
+ bl MIi_CpuCopyFast
_02083D9C:
mov r1, #0xb5
ldr r0, _02083DE8 ; =0x000043D0
@@ -128221,7 +128221,7 @@ _02083D9C:
ldr r1, [r4, r1]
add r0, r4, r0
lsl r2, r2, #0x6
- blx MIi_CpuCopyFast
+ bl MIi_CpuCopyFast
mov r0, #0xb2
lsl r0, r0, #0x2
add r0, r4, r0
@@ -128316,13 +128316,13 @@ FUN_02083E4C: ; 0x02083E4C
add r0, r4, #0x0
mov r1, #0x3
mov r2, #0x0
- bl FUN_021D8B64
+ bl MOD53_021D8B64
ldr r1, _02083E8C ; =0x000043D0
mov r2, #0xe1
mov r0, #0x0
add r1, r4, r1
lsl r2, r2, #0x6
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
bl FUN_02031190
cmp r0, #0x0
bne _02083E8A
@@ -128381,14 +128381,14 @@ _02083ED0:
ldr r1, [r4, r1]
cmp r1, r0
bne _02083EFE
- bl FUN_021D917C
+ bl MOD53_021D917C
mov r1, #0xc6
lsl r1, r1, #0x2
ldr r1, [r4, r1]
cmp r1, r0
bne _02083EFE
bl FUN_0202CB8C
- blx MATH_CountPopulation
+ bl MATH_CountPopulation
mov r1, #0xc6
lsl r1, r1, #0x2
ldr r1, [r4, r1]
@@ -128437,7 +128437,7 @@ _02083F3C:
add r0, r4, #0x0
mov r1, #0x9
add r2, r6, #0x0
- bl FUN_021D8B64
+ bl MOD53_021D8B64
add sp, #0x4
pop {r3-r6, pc}
_02083F5A:
@@ -128447,14 +128447,14 @@ _02083F5A:
ldrb r2, [r5, #0x0]
add r0, r4, #0x0
mov r1, #0x8
- bl FUN_021D8B64
+ bl MOD53_021D8B64
add sp, #0x4
pop {r3-r6, pc}
_02083F6E:
ldrb r2, [r5, #0x0]
add r0, r4, #0x0
mov r1, #0x15
- bl FUN_021D8B64
+ bl MOD53_021D8B64
_02083F78:
add sp, #0x4
pop {r3-r6, pc}
@@ -128474,7 +128474,7 @@ FUN_02083F88: ; 0x02083F88
add r4, r3, #0x0
add r0, r4, #0x0
mov r1, #0x1
- bl FUN_021D8B64
+ bl MOD53_021D8B64
bl FUN_02031190
cmp r0, #0x0
bne _02083FB6
@@ -128514,7 +128514,7 @@ FUN_02083FC4: ; 0x02083FC4
add r0, r4, #0x0
mov r1, #0xf
mov r2, #0x0
- bl FUN_021D8B64
+ bl MOD53_021D8B64
_02083FDA:
pop {r4, pc}
@@ -128577,7 +128577,7 @@ FUN_0208402C: ; 0x0208402C
add r0, r1, r0
ldr r1, _02084078 ; =0x00007C10
add r1, r5, r1
- blx MIi_CpuCopyFast
+ bl MIi_CpuCopyFast
ldr r0, _02084078 ; =0x00007C10
mov r2, #0x0
add r1, r2, #0x0
@@ -128674,12 +128674,12 @@ FUN_020840CC: ; 0x020840CC
add r0, r4, #0x0
bl FUN_02084270
add r0, r4, #0x0
- bl FUN_021D844C
+ bl MOD54_021D844C
lsl r2, r5, #0x18
add r0, r4, #0x0
mov r1, #0x19
lsr r2, r2, #0x18
- bl FUN_021D88E4
+ bl MOD54_021D88E4
mov r0, #0x1
add r1, r0, #0x0
bl FUN_020334E8
@@ -128693,12 +128693,12 @@ _02084110: .word 0x00000658
thumb_func_start FUN_02084114
FUN_02084114: ; 0x02084114
add r0, r3, #0x0
- ldr r3, _02084120 ; =FUN_021D88E4
+ ldr r3, _02084120 ; =MOD54_021D88E4
mov r1, #0x2
mov r2, #0x0
bx r3
nop
-_02084120: .word FUN_021D88E4 + 1
+_02084120: .word MOD54_021D88E4
thumb_func_start FUN_02084124
FUN_02084124: ; 0x02084124
@@ -128736,13 +128736,13 @@ _0208415E:
ldr r1, [r4, r1]
cmp r1, r0
bne _02084186
- bl FUN_021D8C24
+ bl MOD54_021D8C24
ldr r1, _02084208 ; =0x00004A48
ldr r1, [r4, r1]
cmp r1, r0
bne _02084186
bl FUN_0202CB8C
- blx MATH_CountPopulation
+ bl MATH_CountPopulation
ldr r1, _02084208 ; =0x00004A48
ldr r2, [r4, r1]
cmp r2, r0
@@ -128792,7 +128792,7 @@ _020841C8:
add r0, r4, #0x0
mov r1, #0x8
add r2, r6, #0x0
- bl FUN_021D88E4
+ bl MOD54_021D88E4
add sp, #0x4
pop {r3-r6, pc}
_020841E6:
@@ -128802,14 +128802,14 @@ _020841E6:
ldrb r2, [r5, #0x0]
add r0, r4, #0x0
mov r1, #0x7
- bl FUN_021D88E4
+ bl MOD54_021D88E4
add sp, #0x4
pop {r3-r6, pc}
_020841FA:
ldrb r2, [r5, #0x0]
add r0, r4, #0x0
mov r1, #0x13
- bl FUN_021D88E4
+ bl MOD54_021D88E4
_02084204:
add sp, #0x4
pop {r3-r6, pc}
@@ -128824,7 +128824,7 @@ FUN_02084210: ; 0x02084210
add r4, r3, #0x0
add r0, r4, #0x0
mov r1, #0x1
- bl FUN_021D89CC
+ bl MOD54_021D89CC
bl FUN_02031190
cmp r0, #0x0
bne _0208422E
@@ -128855,7 +128855,7 @@ FUN_02084238: ; 0x02084238
add r0, r4, #0x0
mov r1, #0xd
mov r2, #0x0
- bl FUN_021D88E4
+ bl MOD54_021D88E4
_0208424E:
pop {r4, pc}
@@ -130682,7 +130682,7 @@ _020850BE:
mov r0, #0x96
mul r0, r1
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
str r0, [sp, #0x18]
_020850EC:
add r0, r5, #0x0
@@ -131327,7 +131327,7 @@ FUN_020854E0: ; 0x020854E0
mov r1, #0x0
mov r2, #0x1c
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, [sp, #0x0]
strb r0, [r4, #0xf]
ldr r0, [sp, #0x4]
@@ -131365,7 +131365,7 @@ FUN_02085538: ; 0x02085538
mov r1, #0x0
mov r2, #0x1c
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x0
strh r0, [r4, #0x0]
str r5, [r4, #0x8]
@@ -131395,7 +131395,7 @@ FUN_02085578: ; 0x02085578
mov r1, #0x0
mov r2, #0x1c
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x0
strh r0, [r4, #0x0]
str r5, [r4, #0x10]
@@ -131422,7 +131422,7 @@ FUN_020855B0: ; 0x020855B0
mov r1, #0x0
mov r2, #0x1c
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x0
strh r0, [r4, #0x0]
add r0, r7, #0x0
@@ -131582,7 +131582,7 @@ FUN_020856F0: ; 0x020856F0
mov r1, #0x0
mov r2, #0x34
add r6, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x0
strh r0, [r6, #0x0]
add r0, r4, #0x0
@@ -131720,7 +131720,7 @@ FUN_020857F8: ; 0x020857F8
mov r1, #0x0
mov r2, #0x1c
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r1, #0x28
str r1, [r4, #0x0]
ldr r0, [r5, #0x14]
@@ -131937,8 +131937,8 @@ FUN_020859C0: ; 0x020859C0
lsl r2, r2, #0x12
bl FUN_0201681C
mov r0, #0x35
- bl FUN_02230F3C
- bl FUN_0222F7E0
+ bl MOD62_02230F3C
+ bl MOD62_0222F7E0
ldr r1, _02085BA0 ; =0x0000042C
add r0, r5, #0x0
mov r2, #0x35
@@ -131946,8 +131946,8 @@ FUN_020859C0: ; 0x020859C0
ldr r2, _02085BA0 ; =0x0000042C
mov r1, #0x0
add r4, r0, #0x0
- blx Call_FillMemWithValue
- bl FUN_0222E2BC
+ bl Call_FillMemWithValue
+ bl MOD62_0222E2BC
mov r1, #0x23
lsl r1, r1, #0x4
str r0, [r4, r1]
@@ -132083,8 +132083,8 @@ _02085A9A:
add r0, r4, #0x0
add r0, #0xe4
ldr r0, [r0, #0x0]
- bl FUN_02230F80
- bl FUN_0222E360
+ bl MOD62_02230F80
+ bl MOD62_0222E360
mov r0, #0x35
bl FUN_02006D98
mov r1, #0x69
@@ -132108,7 +132108,7 @@ _02085A9A:
ldr r0, [r0, #0x0]
ldr r1, [r1, #0x0]
add r2, r5, #0x0
- bl FUN_0222ED34
+ bl MOD62_0222ED34
add r0, r4, #0x0
add r1, r4, #0x0
add r0, #0xe4
@@ -132116,20 +132116,20 @@ _02085A9A:
ldr r0, [r0, #0x0]
ldr r1, [r1, #0x0]
add r2, r5, #0x0
- bl FUN_0222EDBC
+ bl MOD62_0222EDBC
add r0, r4, #0x0
add r0, #0xd4
- bl FUN_0222E7E8
+ bl MOD62_0222E7E8
bl FUN_0201CC08
mov r0, #0x4
bl FUN_0201CC24
add r0, r4, #0x0
- bl FUN_022300E4
+ bl MOD62_022300E4
ldr r0, _02085BAC ; =0x022310CD
add r1, r4, #0x0
bl FUN_02015F10
add r0, r4, #0x0
- bl FUN_0222DD1C
+ bl MOD62_0222DD1C
mov r1, #0x0
mov r0, #0x3b
add r2, r1, #0x0
@@ -132164,7 +132164,7 @@ _02085BCA:
str r0, [r5, #0x0]
b _02085C02
_02085BD8:
- bl FUN_0222F990
+ bl MOD12_0222F990
cmp r0, #0x0
bne _02085BE6
mov r0, #0x2
@@ -132175,7 +132175,7 @@ _02085BE6:
lsl r0, r0, #0x2
ldr r0, [r4, r0]
bl FUN_02006ED4
- bl FUN_0222E3A0
+ bl MOD62_0222E3A0
b _02085C02
_02085BF6:
bl FUN_0200E308
@@ -132292,7 +132292,7 @@ FUN_02085C08: ; 0x02085C08
ldr r0, [r4, r0]
bl FUN_02016A18
add r0, r4, #0x0
- bl FUN_0222DAEC
+ bl MOD62_0222DAEC
mov r0, #0x73
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@@ -132306,29 +132306,29 @@ FUN_02085C08: ; 0x02085C08
ldr r0, [r4, r0]
bl FUN_02014C28
add r0, r4, #0x0
- bl FUN_0222DD38
+ bl MOD62_0222DD38
add r0, r4, #0x0
add r0, #0xd4
- bl FUN_0222E874
+ bl MOD62_0222E874
bl FUN_0201C29C
mov r0, #0x23
lsl r0, r0, #0x4
ldr r0, [r4, r0]
bl FUN_020223BC
mov r0, #0x35
- bl FUN_02230F70
+ bl MOD62_02230F70
add r0, r5, #0x0
bl FUN_0200627C
bl FUN_0201CD04
mov r0, #0x35
bl FUN_020168D0
- ldr r0, _02085D68 ; =0x00000008
+ ldr r0, _02085D68 ; =SDK_OVERLAY_MODULE_08_ID
bl UnloadOverlayByID
mov r0, #0x1
pop {r3-r5, pc}
nop
_02085D64: .word 0x00000428
-_02085D68: .word 0x00000008
+_02085D68: .word SDK_OVERLAY_MODULE_08_ID
thumb_func_start FUN_02085D6C
FUN_02085D6C: ; 0x02085D6C
@@ -132596,7 +132596,7 @@ _02085F5E:
mov r1, #0x0
mov r2, #0x30
str r0, [r4, #0x8]
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r5, #0x0
bl LoadPlayerDataAddress
ldr r1, [r4, #0x8]
@@ -132609,7 +132609,7 @@ _02085F5E:
mov r1, #0x0
mov r2, #0x40
str r0, [r4, #0xc]
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r1, _02085FA8 ; =FUN_02085DA4
add r0, r6, #0x0
add r2, r4, #0x0
@@ -132752,7 +132752,7 @@ FUN_02086084: ; 0x02086084
mov r1, #0x0
mov r2, #0x80
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r5, #0x0
bl FUN_0200628C
str r0, [r4, #0x0]
@@ -132974,7 +132974,7 @@ _020862A0: ; jump table (using 16-bit offset)
_020862AE:
ldr r0, [r4, #0xc]
mov r1, #0xb
- bl FUN_021ED940
+ bl MOD05_021ED940
add r0, r5, #0x0
bl FUN_0204AF3C
ldr r0, [r4, #0x0]
@@ -133167,14 +133167,14 @@ FUN_0208643C: ; 0x0208643C
mov r1, #0x0
mov r2, #0xe
mov r3, #0xb
- blx G2x_SetBlendAlpha_
+ bl G2x_SetBlendAlpha_
mov r0, #0x8
str r0, [sp, #0x0]
ldr r0, _02086464 ; =0x04001050
mov r1, #0x0
mov r2, #0xe
mov r3, #0x7
- blx G2x_SetBlendAlpha_
+ bl G2x_SetBlendAlpha_
pop {r3, pc}
.balign 4
_02086460: .word 0x04000050
@@ -133239,13 +133239,13 @@ FUN_02086488: ; 0x02086488
add r1, r0, #0x0
add r2, r0, #0x0
add r3, r0, #0x0
- blx G3X_SetFog
+ bl G3X_SetFog
mov r0, #0x0
ldr r2, _02086500 ; =0x00007FFF
add r1, r0, #0x0
mov r3, #0x3f
str r0, [sp, #0x0]
- blx G3X_SetClearColor
+ bl G3X_SetClearColor
ldr r1, _02086504 ; =0xBFFF0000
ldr r0, _02086508 ; =0x04000580
str r1, [r0, #0x0]
@@ -133311,25 +133311,25 @@ _0208655C:
mov r0, #0x0
lsl r1, r1, #0x18
lsl r2, r2, #0x12
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
mov r1, #0x62
mov r2, #0x2
mov r0, #0x0
lsl r1, r1, #0x14
lsl r2, r2, #0x10
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
mov r1, #0x19
mov r2, #0x1
mov r0, #0x0
lsl r1, r1, #0x16
lsl r2, r2, #0x12
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
mov r1, #0x66
mov r2, #0x2
mov r0, #0x0
lsl r1, r1, #0x14
lsl r2, r2, #0x10
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
ldr r5, _02086654 ; =0x020FCE24
add r3, sp, #0x1c
add r2, r3, #0x0
@@ -133444,7 +133444,7 @@ FUN_02086698: ; 0x02086698
cmp r0, #0x0
ble _020866AE
bl FUN_020222AC
- blx FUN_020B02C8
+ bl FUN_020B02C8
_020866AE:
bl FUN_02013388
mov r0, #0x1
@@ -134325,7 +134325,7 @@ _02086DB4:
bl FUN_0200C82C
mov r0, #0x0
add r1, r7, #0x0
- blx _feq
+ bl _feq
beq _02086DD2
ldr r0, [r6, #0x6c]
ldr r2, [sp, #0x0]
@@ -136295,7 +136295,7 @@ FUN_02087D00: ; 0x02087D00
mov r1, #0x0
lsl r2, r2, #0x2
add r7, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r4, #0x0
bl FUN_02028048
str r0, [r7, #0x8]
@@ -136454,7 +136454,7 @@ FUN_02087E40: ; 0x02087E40
mov r1, #0x0
mov r2, #0x18
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x2c
str r0, [r4, #0x0]
str r5, [r4, #0xc]
@@ -136620,7 +136620,7 @@ _02087F86:
mov r1, #0x0
mov r2, #0x40
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, [r5, #0xc]
mov r1, #0x0
ldr r0, [r0, #0x10]
@@ -136761,7 +136761,7 @@ FUN_020880A0: ; 0x020880A0
mov r1, #0x0
mov r2, #0xc
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r1, [r5, #0xc]
ldrb r0, [r1, #0x1]
lsl r0, r0, #0x3
@@ -136992,22 +136992,22 @@ _0208826A:
cmp r0, #0x5
beq _020882B8
ldrb r0, [r4, r0]
- blx _ffltu
+ bl _ffltu
add r1, r0, #0x0
ldr r0, _02088318 ; =0x3F8CCCCD
- blx _fmul
- blx _ffixu
+ bl _fmul
+ bl _ffixu
ldr r1, [sp, #0x4]
strb r0, [r4, r1]
add r4, sp, #0x8
ldr r0, [sp, #0x0]
add r4, #0x1
ldrb r0, [r4, r0]
- blx _ffltu
+ bl _ffltu
add r1, r0, #0x0
ldr r0, _0208831C ; =0x3F666666
- blx _fmul
- blx _ffixu
+ bl _fmul
+ bl _ffixu
ldr r1, [sp, #0x0]
strb r0, [r4, r1]
_020882B8:
@@ -137075,7 +137075,7 @@ FUN_02088320: ; 0x02088320
mov r1, #0x0
lsl r2, r2, #0x2
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
str r6, [r4, #0x0]
cmp r5, #0x10
bls _0208834A
@@ -137104,7 +137104,7 @@ FUN_02088360: ; 0x02088360
add r0, r4, #0x0
mov r1, #0x0
lsl r2, r2, #0x2
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r4, #0x0
bl FUN_02016A18
pop {r4, pc}
@@ -137199,7 +137199,7 @@ _02088402:
ldr r0, [r0, r2]
mov r1, #0x0
mov r2, #0x4
- blx MI_CpuFill8
+ bl MI_CpuFill8
add sp, #0xc
pop {r4-r7, pc}
.balign 4
@@ -137272,7 +137272,7 @@ _020884B4:
str r0, [sp, #0x38]
mov r1, #0x0
mov r2, #0x8
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r1, [sp, #0x3c]
ldr r0, [sp, #0x38]
strh r1, [r0, #0x0]
@@ -137365,59 +137365,59 @@ _020884D8:
str r0, [sp, #0x44]
beq _02088596
lsl r0, r7, #0xc
- blx _fflt
+ bl _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
+ bl _fadd
b _020885A4
_02088596:
lsl r0, r7, #0xc
- blx _fflt
+ bl _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
+ bl _fsub
_020885A4:
- blx _ffix
+ bl _ffix
str r0, [sp, #0x48]
ldr r0, [sp, #0x30]
cmp r0, #0x0
beq _020885C2
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
+ bl _fadd
b _020885D0
_020885C2:
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
+ bl _fsub
_020885D0:
- blx _ffix
+ bl _ffix
str r0, [sp, #0x4c]
add r0, sp, #0x78
ldrh r0, [r0, #0x10]
cmp r0, #0x0
beq _020885F0
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
+ bl _fadd
b _020885FE
_020885F0:
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
+ bl _fsub
_020885FE:
- blx _ffix
+ bl _ffix
str r0, [sp, #0x50]
cmp r6, #0x2
bne _02088612
@@ -137758,40 +137758,40 @@ FUN_02088854: ; 0x02088854
thumb_func_start FUN_02088858
FUN_02088858: ; 0x02088858
ldr r3, _02088860 ; =HandleLoadOverlay
- ldr r0, _02088864 ; =0x00000004
+ ldr r0, _02088864 ; =SDK_OVERLAY_MODULE_04_ID
mov r1, #0x2
bx r3
.balign 4
_02088860: .word HandleLoadOverlay
-_02088864: .word 0x00000004
+_02088864: .word SDK_OVERLAY_MODULE_04_ID
thumb_func_start FUN_02088868
FUN_02088868: ; 0x02088868
ldr r3, _02088870 ; =UnloadOverlayByID
- ldr r0, _02088874 ; =0x00000004
+ ldr r0, _02088874 ; =SDK_OVERLAY_MODULE_04_ID
bx r3
nop
_02088870: .word UnloadOverlayByID
-_02088874: .word 0x00000004
+_02088874: .word SDK_OVERLAY_MODULE_04_ID
thumb_func_start FUN_02088878
FUN_02088878: ; 0x02088878
ldr r3, _02088880 ; =HandleLoadOverlay
- ldr r0, _02088884 ; =0x0000000D
+ ldr r0, _02088884 ; =SDK_OVERLAY_MODULE_13_ID
mov r1, #0x2
bx r3
.balign 4
_02088880: .word HandleLoadOverlay
-_02088884: .word 0x0000000D
+_02088884: .word SDK_OVERLAY_MODULE_13_ID
thumb_func_start FUN_02088888
FUN_02088888: ; 0x02088888
ldr r3, _02088890 ; =UnloadOverlayByID
- ldr r0, _02088894 ; =0x0000000D
+ ldr r0, _02088894 ; =SDK_OVERLAY_MODULE_13_ID
bx r3
nop
_02088890: .word UnloadOverlayByID
-_02088894: .word 0x0000000D
+_02088894: .word SDK_OVERLAY_MODULE_13_ID
thumb_func_start FUN_02088898
FUN_02088898: ; 0x02088898
@@ -137800,32 +137800,32 @@ FUN_02088898: ; 0x02088898
bl FUN_02088858
bl FUN_02088878
add r0, r4, #0x0
- bl FUN_02211E60
+ bl MOD07_02211E60
bl FUN_02088888
bl FUN_02088868
mov r0, #0x0
- blx OS_ResetSystem
+ bl OS_ResetSystem
pop {r4, pc}
.balign 4
thumb_func_start FUN_020888BC
FUN_020888BC: ; 0x020888BC
ldr r3, _020888C4 ; =HandleLoadOverlay
- ldr r0, _020888C8 ; =0x0000004F
+ ldr r0, _020888C8 ; =SDK_OVERLAY_MODULE_79_ID
mov r1, #0x2
bx r3
.balign 4
_020888C4: .word HandleLoadOverlay
-_020888C8: .word 0x0000004F
+_020888C8: .word SDK_OVERLAY_MODULE_79_ID
thumb_func_start FUN_020888CC
FUN_020888CC: ; 0x020888CC
ldr r3, _020888D4 ; =UnloadOverlayByID
- ldr r0, _020888D8 ; =0x0000004F
+ ldr r0, _020888D8 ; =SDK_OVERLAY_MODULE_79_ID
bx r3
nop
_020888D4: .word UnloadOverlayByID
-_020888D8: .word 0x0000004F
+_020888D8: .word SDK_OVERLAY_MODULE_79_ID
thumb_func_start FUN_020888DC
FUN_020888DC: ; 0x020888DC
@@ -137844,7 +137844,7 @@ FUN_020888DC: ; 0x020888DC
mov r0, #0x31
bl FUN_020168D0
mov r0, #0x0
- blx OS_ResetSystem
+ bl OS_ResetSystem
mov r0, #0x1
pop {r4, pc}
.balign 4
@@ -137861,7 +137861,7 @@ FUN_0208890C: ; 0x0208890C
add r4, r0, #0x0
mov r1, #0x0
mov r2, #0x20
- blx MI_CpuFill8
+ bl MI_CpuFill8
str r5, [r4, #0xc]
add r0, r5, #0x0
bl FUN_02028048
@@ -137950,7 +137950,7 @@ FUN_020889B0: ; 0x020889B0
mov r1, #0x0
mov r2, #0x24
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x37
str r0, [r4, #0x0]
str r5, [r4, #0x10]
@@ -138050,7 +138050,7 @@ FUN_02088A78: ; 0x02088A78
add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x24
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r5, #0x0
bl FUN_0200627C
add r0, r6, #0x0
@@ -138221,7 +138221,7 @@ _02088BBA:
add r2, r0, #0x0
ldr r1, [r4, #0x18]
add r0, r5, #0x0
- blx memcpy
+ bl memcpy
ldr r0, [r4, #0x18]
bl FUN_02016A18
mov r0, #0x0
@@ -139359,7 +139359,7 @@ FUN_020893F0: ; 0x020893F0
bhs _0208940A
add r0, r1, #0x0
ldr r1, _02089410 ; =0x021C5C58
- blx MIi_CpuCopy32
+ bl MIi_CpuCopy32
ldr r0, _02089414 ; =0x02106154
str r4, [r0, #0x0]
pop {r4, pc}
@@ -139382,7 +139382,7 @@ FUN_02089418: ; 0x02089418
cmp r0, r3
bne _02089438
ldr r0, _02089440 ; =0x021C5C58
- blx MIi_CpuCopy32
+ bl MIi_CpuCopy32
mov r0, #0x1
pop {r3, pc}
_02089434:
@@ -139404,7 +139404,7 @@ FUN_02089444: ; 0x02089444
bhs _0208945E
add r0, r1, #0x0
ldr r1, _02089464 ; =0x021C5C58
- blx MIi_CpuCopyFast
+ bl MIi_CpuCopyFast
ldr r0, _02089468 ; =0x02106154
str r4, [r0, #0x0]
pop {r4, pc}
@@ -139427,7 +139427,7 @@ FUN_0208946C: ; 0x0208946C
cmp r0, r3
bne _0208948C
ldr r0, _02089494 ; =0x021C5C58
- blx MIi_CpuCopyFast
+ bl MIi_CpuCopyFast
mov r0, #0x1
pop {r3, pc}
_02089488:
@@ -139455,7 +139455,7 @@ FUN_02089498: ; 0x02089498
mov r1, #0x0
mov r2, #0x38
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
mov r0, #0x58
str r0, [r4, #0x0]
mov r0, #0x0
@@ -139604,7 +139604,7 @@ FUN_020895F0: ; 0x020895F0
add r0, r4, #0x0
bl FUN_020168D0
mov r0, #0x0
- blx OS_ResetSystem
+ bl OS_ResetSystem
mov r0, #0x1
pop {r3-r5, pc}
@@ -140031,7 +140031,7 @@ FUN_02089960: ; 0x02089960
mov r1, #0x0
mov r2, #0x3c
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
mov r0, #0x58
str r0, [r4, #0x0]
mov r0, #0x0
@@ -140127,13 +140127,13 @@ FUN_02089A40: ; 0x02089A40
bl FUN_0200627C
add r0, r4, #0x0
bl FUN_020168D0
- ldr r0, _02089A64 ; =0x00000053
+ ldr r0, _02089A64 ; =SDK_OVERLAY_MODULE_83_ID
ldr r1, _02089A68 ; =0x0223A360
bl FUN_02000E7C
mov r0, #0x1
pop {r3-r5, pc}
nop
-_02089A64: .word 0x00000053
+_02089A64: .word SDK_OVERLAY_MODULE_83_ID
_02089A68: .word 0x0223A360
thumb_func_start FUN_02089A6C
@@ -140667,7 +140667,7 @@ _02089EE4:
bl FUN_02000FE8
add r0, r4, #0x0
add r1, r4, #0x0
- blx OS_WaitIrq
+ bl OS_WaitIrq
b _02089EE4
nop
_02089EF4: .word 0xFFFFE0FF
@@ -140828,7 +140828,7 @@ _0208A078:
bl FUN_02000FE8
add r0, r4, #0x0
add r1, r4, #0x0
- blx OS_WaitIrq
+ bl OS_WaitIrq
b _0208A078
nop
_0208A088: .word 0xFFFFE0FF
@@ -140997,7 +140997,7 @@ _0208A21A:
bl FUN_02000FE8
add r0, r4, #0x0
add r1, r4, #0x0
- blx OS_WaitIrq
+ bl OS_WaitIrq
b _0208A21A
.balign 4
_0208A228: .word 0xFFFFE0FF
@@ -141083,7 +141083,7 @@ FUN_0208A2C4: ; 0x0208A2C4
cmp r0, #0x0
beq _0208A2F6
mov r0, #0x1
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
ldr r1, _0208A2F8 ; =0x0223D4AD
add r0, r5, #0x0
add r2, r4, #0x0
@@ -141406,7 +141406,7 @@ _0208A566:
cmp r0, #0x0
beq _0208A5B0
mov r0, #0x0
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
mov r0, #0x5
str r0, [r4, #0x54]
b _0208A6C8
@@ -141447,7 +141447,7 @@ _0208A5BE:
cmp r0, #0x0
beq _0208A6C8
mov r0, #0x1
- bl FUN_021D7CA4
+ bl MOD05_021D7CA4
mov r0, #0x8
str r0, [r4, #0x54]
b _0208A6C8
@@ -141956,15 +141956,15 @@ _0208A9C6:
mov r1, #0x1
str r1, [r0, #0x0]
mov r0, #0x0
- blx OS_GetInitArenaHi
+ bl OS_GetInitArenaHi
add r1, r0, #0x0
mov r0, #0x0
- blx OS_SetArenaHi
+ bl OS_SetArenaHi
mov r0, #0x0
- blx OS_GetInitArenaLo
+ bl OS_GetInitArenaLo
add r1, r0, #0x0
mov r0, #0x0
- blx OS_SetArenaLo
+ bl OS_SetArenaLo
mov r1, #0x1
ldr r0, _0208ABCC ; =0x020FF4A4
add r2, r1, #0x0
@@ -141977,12 +141977,12 @@ _0208A9C6:
mov r1, #0x0
bl FUN_0200E3A0
mov r0, #0x1
- blx OS_DisableIrqMask
+ bl OS_DisableIrqMask
ldr r1, _0208ABD0 ; =FUN_0208A998
mov r0, #0x1
- blx OS_SetIrqFunction
+ bl OS_SetIrqFunction
mov r0, #0x1
- blx OS_EnableIrqMask
+ bl OS_EnableIrqMask
mov r0, #0x0
add r1, r0, #0x0
bl FUN_02015F10
@@ -142122,7 +142122,7 @@ _0208AB58:
bne _0208AB72
add r0, r4, #0x0
add r1, r4, #0x0
- blx OS_WaitIrq
+ bl OS_WaitIrq
b _0208AB58
_0208AB72:
ldr r5, _0208AC04 ; =0x04000130
@@ -142143,7 +142143,7 @@ _0208AB7A:
bne _0208AB9C
mov r0, #0x1
add r1, r0, #0x0
- blx OS_WaitIrq
+ bl OS_WaitIrq
b _0208AB7A
_0208AB9C:
ldr r1, _0208AC10 ; =0x00007FFF
@@ -142159,7 +142159,7 @@ _0208AB9C:
ldr r0, [sp, #0x10]
bl FUN_02016A18
mov r0, #0x0
- blx OS_ResetSystem
+ bl OS_ResetSystem
_0208ABC4:
add sp, #0x24
pop {r4-r7, pc}
diff --git a/arm9/asm/unk_0208AC14.s b/arm9/asm/unk_0208AC14.s
index e2ac3396..38ad538a 100644
--- a/arm9/asm/unk_0208AC14.s
+++ b/arm9/asm/unk_0208AC14.s
@@ -1950,7 +1950,7 @@ _0208C778:
_0208C79C:
add r0, sp, #0x60
mov r3, r2
- blx MTX_Scale43_
+ bl MTX_Scale43_
add r0, sp, #0x30
add r1, sp, #0x60
add r2, sp, #0x0
@@ -2253,7 +2253,7 @@ _0208CBF4:
_0208CC18:
add r0, sp, #0x60
mov r3, r2
- blx MTX_Scale43_
+ bl MTX_Scale43_
add r0, sp, #0x60
add r1, sp, #0x30
add r2, sp, #0x0
@@ -2479,7 +2479,7 @@ _0208CF4C:
_0208CF70:
add r0, sp, #0x60
mov r3, r2
- blx MTX_Scale43_
+ bl MTX_Scale43_
add r0, sp, #0x30
add r1, sp, #0x60
add r2, sp, #0x0
@@ -2703,7 +2703,7 @@ _0208D29C:
_0208D2C0:
add r0, sp, #0x60
mov r3, r2
- blx MTX_Scale43_
+ bl MTX_Scale43_
add r0, sp, #0x60
add r1, sp, #0x30
add r2, sp, #0x0
@@ -6273,7 +6273,7 @@ _020907AC:
mov r2, r1, lsl #0x1
ldrsh r1, [r3, r12]
ldrsh r2, [r3, r2]
- blx MTX_RotX33_
+ bl MTX_RotX33_
b _02090838
_020907DC:
ldrh r1, [r0, #0x0]
@@ -6286,7 +6286,7 @@ _020907DC:
mov r2, r1, lsl #0x1
ldrsh r1, [r3, r12]
ldrsh r2, [r3, r2]
- blx MTX_RotY33_
+ bl MTX_RotY33_
b _02090838
_0209080C:
ldrh r1, [r0, #0x0]
@@ -6299,7 +6299,7 @@ _0209080C:
mov r2, r1, lsl #0x1
ldrsh r1, [r3, r12]
ldrsh r2, [r3, r2]
- blx MTX_RotZ33_
+ bl MTX_RotZ33_
_02090838:
add r0, r4, #0x8
add r1, sp, #0x0
@@ -6894,37 +6894,3 @@ _02091030: .word 0x04000243
_02091034: .word FUN_02090BBC
_02091038: .word FUN_02090BB8
_0209103C: .word 0x021C8C68
-
- arm_func_start FUN_02091040
-FUN_02091040: ; 0x02091040
- ldr r3, _02091054 ; =0x021C8C70
- ldr r2, _02091058 ; =0x021C8C74
- str r0, [r3, #0x0]
- str r1, [r2, #0x0]
- bx lr
- .balign 4
-_02091054: .word 0x021C8C70
-_02091058: .word 0x021C8C74
-
- arm_func_start FUN_0209105C
-FUN_0209105C: ; 0x0209105C
- stmdb sp!, {lr}
- sub sp, sp, #0x4
- ldr r1, _020910A0 ; =0x021C8C74
- mov r2, r0
- ldr r1, [r1, #0x0]
- cmp r1, #0x0
- beq _02091088
- blx r1
- add sp, sp, #0x4
- ldmia sp!, {lr}
- bx lr
-_02091088:
- mov r0, #0x0
- mvn r1, #0x0
- bl OS_FreeToHeap
- add sp, sp, #0x4
- ldmia sp!, {lr}
- bx lr
- .balign 4
-_020910A0: .word 0x021C8C74
diff --git a/arm9/asm/unk_020910EC.s b/arm9/asm/unk_020910EC.s
index 2108f3de..88bd5a14 100644
--- a/arm9/asm/unk_020910EC.s
+++ b/arm9/asm/unk_020910EC.s
@@ -4877,7 +4877,7 @@ _02095460:
cmp r0, #0x1
beq _02095488
mov r0, r4
- blx SVC_WaitByLoop
+ bl SVC_WaitByLoop
b _02095460
_02095488:
mov r0, #0x1
@@ -4943,7 +4943,7 @@ _0209552C:
ldmeqia sp!, {r4-r8,pc}
_02095548: ; 0x02095548
mov r0, r4
- blx SVC_WaitByLoop
+ bl SVC_WaitByLoop
b _0209552C
_02095554: ; 0x02095554
ldmia sp!, {r4-r8,pc}
@@ -4984,7 +4984,7 @@ _020955B0:
cmp r0, #0x1
beq _020955D8
mov r0, r7
- blx SVC_WaitByLoop
+ bl SVC_WaitByLoop
b _020955B0
_020955D8:
mov r0, r4
@@ -5341,7 +5341,7 @@ _02095A74:
b _0209574C
_02095A7C:
ldr r0, [sp, #0xbc]
- blx SVC_WaitByLoop
+ bl SVC_WaitByLoop
b _0209574C
_02095A88:
add sp, sp, #0xc4
@@ -29496,7 +29496,7 @@ _020AA144:
ldr r2, [r6, #0x0]
str r3, [r7, #0x8cc]
and r0, r0, #0xff
- bl FUN_021EAE90
+ bl MOD04_021EAE90
ldr r0, [r7, #0x8cc]
cmp r0, #0x0
bne _020AA1A0
@@ -32194,7 +32194,7 @@ FUN_020AC554:
_020AC57C:
ldrb r0, [r0, #0x4]
mov r2, #0x10
- bl FUN_021EB044
+ bl MOD04_021EB044
_020AC588: ; 0x020AC588
cmp r0, #0x0
addeq sp, sp, #0x4
@@ -32274,7 +32274,7 @@ _020AC654:
mov r1, r10
mov r2, r6
strb r8, [r10, #0x9]
- bl FUN_021EB044
+ bl MOD04_021EB044
_020AC68C: ; 0x020AC68C
cmp r0, #0x0
addne r9, r9, #0x1
diff --git a/arm9/asm/unk_020AF030.s b/arm9/asm/unk_020AF030.s
index 3851b8c7..a107adc3 100644
--- a/arm9/asm/unk_020AF030.s
+++ b/arm9/asm/unk_020AF030.s
@@ -13216,7 +13216,7 @@ _020BA188:
str r1, [sp, #0x0]
ldrsh r1, [r5, #0x2]
str r1, [sp, #0x4]
- blx MI_Zero36B
+ bl MI_Zero36B
ldrh r0, [r4, #0x0]
add r1, r6, r11, lsl #0x2
add r5, r5, #0x4
@@ -17209,7 +17209,7 @@ FUN_020BD850: ; 0x020BD850
mov r5, r2, asr #0x4
ldrsh r7, [r1, #0x0]
ldrsh r6, [r1, #0x2]
- blx MI_Zero36B
+ bl MI_Zero36B
ldrh r0, [r4, #0x0]
add r1, r8, r5, lsl #0x2
ands r0, r0, #0x100