diff options
Diffstat (limited to 'arm9/asm')
30 files changed, 3894 insertions, 8618 deletions
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_emulator.s b/arm9/asm/OS_emulator.s deleted file mode 100644 index 69207a5e..00000000 --- a/arm9/asm/OS_emulator.s +++ /dev/null @@ -1,19 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - arm_func_start OS_GetConsoleType -OS_GetConsoleType: ; 0x020CBBC0 - ldr r0, _020CBBD0 ; =0x82000001 - ldr r1, _020CBBD4 ; =0x02106828 - str r0, [r1, #0x0] - bx lr - .balign 4 -_020CBBD0: .word 0x82000001 -_020CBBD4: .word 0x02106828 - - arm_func_start OS_IsRunOnEmulator -OS_IsRunOnEmulator: - mov r0, #0x0 - bx lr diff --git a/arm9/asm/OS_interrupt.s b/arm9/asm/OS_interrupt.s deleted file mode 100644 index b2ba8e4e..00000000 --- a/arm9/asm/OS_interrupt.s +++ /dev/null @@ -1,239 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - arm_func_start OS_SetIrqStackChecker -OS_SetIrqStackChecker: ; 0x020C9DAC - ldr ip, _020C9DD0 ; =0x027E0000 - ldr r3, _020C9DD4 ; =0xFDDB597D - add r0, r12, #0x3000 - ldr r2, _020C9DD8 ; =0x7BF9DD5B - ldr r1, _020C9DDC ; =0x00000400 - str r3, [r0, #0xf7c] - add r0, r12, #0x3f80 - str r2, [r0, -r1] - bx lr - .balign 4 -_020C9DD0: .word 0x027E0000 -_020C9DD4: .word 0xFDDB597D -_020C9DD8: .word 0x7BF9DD5B -_020C9DDC: .word 0x00000400 - - arm_func_start OS_ResetRequestIrqMask -OS_ResetRequestIrqMask: ; 0x020C9DE0 - ldr ip, _020C9E0C ; =0x04000208 - mov r1, #0x0 - ldrh r3, [r12, #0x0] - ldr r2, _020C9E10 ; =0x04000214 - strh r1, [r12, #0x0] - ldr r1, [r2, #0x0] - str r0, [r2, #0x0] - ldrh r0, [r12, #0x0] - mov r0, r1 - strh r3, [r12, #0x0] - bx lr - .balign 4 -_020C9E0C: .word 0x04000208 -_020C9E10: .word 0x04000214 - - arm_func_start OS_DisableIrqMask -OS_DisableIrqMask: ; 0x020C9E14 - stmdb sp!, {lr} - sub sp, sp, #0x4 - ldr lr, _020C9E54 ; =0x04000208 - mov r3, #0x0 - ldrh r12, [lr, #0x0] - ldr r2, _020C9E58 ; =0x04000210 - mvn r1, r0 - strh r3, [lr, #0x0] - ldr r0, [r2, #0x0] - and r1, r0, r1 - str r1, [r2, #0x0] - ldrh r1, [lr, #0x0] - strh r12, [lr, #0x0] - add sp, sp, #0x4 - ldmia sp!, {lr} - bx lr - .balign 4 -_020C9E54: .word 0x04000208 -_020C9E58: .word 0x04000210 - - arm_func_start OS_EnableIrqMask -OS_EnableIrqMask: ; 0x020C9E5C - ldr ip, _020C9E8C ; =0x04000208 - mov r1, #0x0 - ldrh r3, [r12, #0x0] - ldr r2, _020C9E90 ; =0x04000210 - strh r1, [r12, #0x0] - ldr r1, [r2, #0x0] - orr r0, r1, r0 - str r0, [r2, #0x0] - ldrh r0, [r12, #0x0] - mov r0, r1 - strh r3, [r12, #0x0] - bx lr - .balign 4 -_020C9E8C: .word 0x04000208 -_020C9E90: .word 0x04000210 - - arm_func_start OS_SetIrqMask -OS_SetIrqMask: ; 0x020C9E94 - ldr ip, _020C9EC0 ; =0x04000208 - mov r1, #0x0 - ldrh r3, [r12, #0x0] - ldr r2, _020C9EC4 ; =0x04000210 - strh r1, [r12, #0x0] - ldr r1, [r2, #0x0] - str r0, [r2, #0x0] - ldrh r0, [r12, #0x0] - mov r0, r1 - strh r3, [r12, #0x0] - bx lr - .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 - - arm_func_start OSi_EnterDmaCallback -OSi_EnterDmaCallback: ; 0x020C9F14 - stmdb sp!, {r4-r6,lr} - mov r3, #0xc - mul r6, r0, r3 - ldr ip, _020C9F54 ; =OSi_IrqCallbackInfo - add r4, r0, #0x8 - mov r5, #0x1 - mov r0, r5, lsl r4 - ldr r3, _020C9F58 ; =0x021D3424 - str r1, [r12, r6] - str r2, [r3, r6] - bl OS_EnableIrqMask - and r1, r0, r5, lsl r4 - ldr r0, _020C9F5C ; =0x021D3420 - str r1, [r0, r6] - ldmia sp!, {r4-r6,lr} - bx lr - .balign 4 -_020C9F54: .word OSi_IrqCallbackInfo -_020C9F58: .word OSi_IrqCallbackInfo + 8 -_020C9F5C: .word OSi_IrqCallbackInfo + 4 - - arm_func_start OS_GetIrqFunction -OS_GetIrqFunction: ; 0x020C9F60 - ldr r2, _020C9FE4 ; =0x027E0000 - mov r3, #0x0 -_020C9F68: - ands r1, r0, #0x1 - beq _020C9FC8 - cmp r3, #0x8 - blt _020C9F98 - cmp r3, #0xb - bgt _020C9F98 - sub r1, r3, #0x8 - mov r0, #0xc - mul r2, r1, r0 - ldr r0, _020C9FE8 ; =OSi_IrqCallbackInfo - ldr r0, [r0, r2] - bx lr -_020C9F98: - cmp r3, #0x3 - blt _020C9FC0 - cmp r3, #0x6 - bgt _020C9FC0 - add r1, r3, #0x1 - mov r0, #0xc - mul r2, r1, r0 - ldr r0, _020C9FE8 ; =OSi_IrqCallbackInfo - ldr r0, [r0, r2] - bx lr -_020C9FC0: - ldr r0, [r2, #0x0] - bx lr -_020C9FC8: - add r3, r3, #0x1 - cmp r3, #0x16 - mov r0, r0, lsr #0x1 - add r2, r2, #0x4 - blt _020C9F68 - mov r0, #0x0 - bx lr - .balign 4 -_020C9FE4: .word 0x027E0000 -_020C9FE8: .word OSi_IrqCallbackInfo - - arm_func_start OS_SetIrqFunction -OS_SetIrqFunction: ; 0x020C9FEC - stmdb sp!, {r4-r8,lr} - mov r8, #0x0 - ldr lr, _020CA074 ; =0x027E0000 - ldr r5, _020CA078 ; =OSi_IrqCallbackInfo - mov r6, r8 - mov r12, r8 - mov r3, #0x1 - mov r2, #0xc -_020CA00C: - ands r4, r0, #0x1 - beq _020CA05C - mov r7, r6 - cmp r8, #0x8 - blt _020CA030 - cmp r8, #0xb - suble r4, r8, #0x8 - mlale r7, r4, r2, r5 - ble _020CA04C -_020CA030: - cmp r8, #0x3 - blt _020CA048 - cmp r8, #0x6 - addle r4, r8, #0x1 - mlale r7, r4, r2, r5 - ble _020CA04C -_020CA048: - str r1, [lr, r8, lsl #0x2] -_020CA04C: - cmp r7, #0x0 - strne r1, [r7, #0x0] - strne r12, [r7, #0x8] - strne r3, [r7, #0x4] -_020CA05C: - add r8, r8, #0x1 - cmp r8, #0x16 - mov r0, r0, lsr #0x1 - blt _020CA00C - ldmia sp!, {r4-r8,lr} - bx lr - .balign 4 -_020CA074: .word 0x027E0000 -_020CA078: .word OSi_IrqCallbackInfo - - arm_func_start OS_InitIrqTable -OS_InitIrqTable: ; 0x020CA07C - ldr r0, _020CA090 ; =0x027E0060 - mov r1, #0x0 - str r1, [r0, #0x4] - str r1, [r0, #0x0] - bx lr - .balign 4 -_020CA090: .word 0x027E0060 diff --git a/arm9/asm/OS_interrupt_asm.s b/arm9/asm/OS_interrupt_asm.s new file mode 100644 index 00000000..7fdc1ccc --- /dev/null +++ b/arm9/asm/OS_interrupt_asm.s @@ -0,0 +1,95 @@ + .include "asm/macros.inc" + .include "global.inc" + + .text + + arm_func_start OS_SetIrqStackChecker +OS_SetIrqStackChecker: ; 0x020C9DAC + ldr ip, _020C9DD0 ; =0x027E0000 + ldr r3, _020C9DD4 ; =0xFDDB597D + add r0, r12, #0x3000 + ldr r2, _020C9DD8 ; =0x7BF9DD5B + ldr r1, _020C9DDC ; =0x00000400 + str r3, [r0, #0xf7c] + add r0, r12, #0x3f80 + str r2, [r0, -r1] + bx lr + .balign 4 +_020C9DD0: .word 0x027E0000 +_020C9DD4: .word 0xFDDB597D +_020C9DD8: .word 0x7BF9DD5B +_020C9DDC: .word 0x00000400 + + arm_func_start OS_ResetRequestIrqMask +OS_ResetRequestIrqMask: ; 0x020C9DE0 + ldr ip, _020C9E0C ; =0x04000208 + mov r1, #0x0 + ldrh r3, [r12, #0x0] + ldr r2, _020C9E10 ; =0x04000214 + strh r1, [r12, #0x0] + ldr r1, [r2, #0x0] + str r0, [r2, #0x0] + ldrh r0, [r12, #0x0] + mov r0, r1 + strh r3, [r12, #0x0] + bx lr + .balign 4 +_020C9E0C: .word 0x04000208 +_020C9E10: .word 0x04000214 + + arm_func_start OS_DisableIrqMask +OS_DisableIrqMask: ; 0x020C9E14 + stmdb sp!, {lr} + sub sp, sp, #0x4 + ldr lr, _020C9E54 ; =0x04000208 + mov r3, #0x0 + ldrh r12, [lr, #0x0] + ldr r2, _020C9E58 ; =0x04000210 + mvn r1, r0 + strh r3, [lr, #0x0] + ldr r0, [r2, #0x0] + and r1, r0, r1 + str r1, [r2, #0x0] + ldrh r1, [lr, #0x0] + strh r12, [lr, #0x0] + add sp, sp, #0x4 + ldmia sp!, {lr} + bx lr + .balign 4 +_020C9E54: .word 0x04000208 +_020C9E58: .word 0x04000210 + + arm_func_start OS_EnableIrqMask +OS_EnableIrqMask: ; 0x020C9E5C + ldr ip, _020C9E8C ; =0x04000208 + mov r1, #0x0 + ldrh r3, [r12, #0x0] + ldr r2, _020C9E90 ; =0x04000210 + strh r1, [r12, #0x0] + ldr r1, [r2, #0x0] + orr r0, r1, r0 + str r0, [r2, #0x0] + ldrh r0, [r12, #0x0] + mov r0, r1 + strh r3, [r12, #0x0] + bx lr + .balign 4 +_020C9E8C: .word 0x04000208 +_020C9E90: .word 0x04000210 + + arm_func_start OS_SetIrqMask +OS_SetIrqMask: ; 0x020C9E94 + ldr ip, _020C9EC0 ; =0x04000208 + mov r1, #0x0 + ldrh r3, [r12, #0x0] + ldr r2, _020C9EC4 ; =0x04000210 + strh r1, [r12, #0x0] + ldr r1, [r2, #0x0] + str r0, [r2, #0x0] + ldrh r0, [r12, #0x0] + mov r0, r1 + strh r3, [r12, #0x0] + bx lr + .balign 4 +_020C9EC0: .word 0x04000208 +_020C9EC4: .word 0x04000210 diff --git a/arm9/asm/OS_irqTable.s b/arm9/asm/OS_irqTable.s index 9a484063..593946ba 100644 --- a/arm9/asm/OS_irqTable.s +++ b/arm9/asm/OS_irqTable.s @@ -28,6 +28,9 @@ OS_IRQTable: ; 027E0000 ;10b6a0 .word OS_IrqDummy .word OS_IrqDummy + .section .bss + .space 0x20 + .section .text arm_func_start OSi_IrqTimer3 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_reset.s b/arm9/asm/OS_reset.s deleted file mode 100644 index bdcc0f88..00000000 --- a/arm9/asm/OS_reset.s +++ /dev/null @@ -1,110 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - arm_func_start OS_ResetSystem -OS_ResetSystem: ; 0x020CD3B4 - stmdb sp!, {r4,lr} - ldr r1, _020CD42C ; =0x027FFC40 - mov r4, r0 - ldrh r0, [r1, #0x0] - cmp r0, #0x2 - bne _020CD3D0 - bl OS_Terminate -_020CD3D0: - bl OS_GetLockID - mov r0, r0, lsl #0x10 - mov r0, r0, lsr #0x10 - bl CARD_LockRom -_020CD3E0: - mov r0, #0x0 - bl MI_StopDma - mov r0, #0x1 - bl MI_StopDma - mov r0, #0x2 - bl MI_StopDma - mov r0, #0x3 - bl MI_StopDma - mov r0, #0x40000 - bl OS_SetIrqMask - mvn r0, #0x0 - bl OS_ResetRequestIrqMask - ldr r1, _020CD430 - mov r0, #0x10 - str r4, [r1] - bl OSi_SendToPxi - bl OSi_DoResetSystem - ldmia sp!, {r4, lr} - bx lr -_020CD42C: .word 0x027FFC40 -_020CD430: .word 0x027FFC20 - - arm_func_start OSi_SendToPxi -OSi_SendToPxi: ; 0x020CD434 - stmdb sp!, {r4-r6,lr} - mov r6, r0, lsl #0x8 - mov r5, #0xc - mov r4, #0x0 -_020CD444: - mov r0, r5 - mov r1, r6 - mov r2, r4 - bl PXI_SendWordByFifo -_020CD454: - cmp r0, #0x0 - bne _020CD444 - ldmia sp!, {r4-r6, lr} - bx lr - - arm_func_start OSi_CommonCallback -OSi_CommonCallback: ; OSi_CommonCallback - stmdb sp!, {lr} - sub sp, sp, #0x4 - and r0, r1, #0x7f00 - mov r0, r0, lsl #0x8 - mov r0, r0, lsr #0x10 - cmp r0, #0x10 - ldreq r0, _020CD4A4 ; =OSi_IsResetOccurred - moveq r1, #0x1 - streqh r1, [r0, #0x0] - addeq sp, sp, #0x4 - ldmeqia sp!, {lr} - bxeq lr - bl OS_Terminate - add sp, sp, #0x4 - ldmia sp!, {lr} - bx lr - .balign 4 -_020CD4A4: .word OSi_IsResetOccurred - - arm_func_start OS_InitReset -OS_InitReset: ; 0x020CD4A8 - stmdb sp!, {r4-r5,lr} - sub sp, sp, #0x4 - ldr r0, _020CD508 ; =0x021D37DC - ldrh r1, [r0, #0x0] - cmp r1, #0x0 - addne sp, sp, #0x4 - ldmneia sp!, {r4-r5,lr} - bxne lr - mov r1, #0x1 - strh r1, [r0, #0x0] - bl PXI_Init - mov r5, #0xc - mov r4, #0x1 -_020CD4DC: - mov r0, r5 - mov r1, r4 - bl PXI_IsCallbackReady -_020CD4E8: - cmp r0, #0x0 - beq _020CD4DC - ldr r1, _020CD50C - mov r0, #0xC - bl PXI_SetFifoRecvCallback - add sp, sp, #0x4 - ldmia sp!, {r4-r5, lr} - bx lr -_020CD508: .word OSi_IsInitReset -_020CD50C: .word OSi_CommonCallback 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/OS_tcm.s b/arm9/asm/OS_tcm.s deleted file mode 100644 index 9c7196ae..00000000 --- a/arm9/asm/OS_tcm.s +++ /dev/null @@ -1,13 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - arm_func_start OS_GetDTCMAddress -OS_GetDTCMAddress: ; 0x020CC9A4 - mrc p15, 0x0, r0, c9, c1, 0x0 - ldr r1, _020CC9B4 ; =0xFFFFF000 - and r0, r0, r1 - bx lr - .balign 4 -_020CC9B4: .word 0xFFFFF000 diff --git a/arm9/asm/OS_terminate_proc.s b/arm9/asm/OS_terminate_proc.s deleted file mode 100644 index 30940914..00000000 --- a/arm9/asm/OS_terminate_proc.s +++ /dev/null @@ -1,19 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - arm_func_start OS_Halt -OS_Halt: ; 0x020CD844 - mov r0, #0x0 - mcr p15, 0x0, r0, c7, c0, 0x4 - bx lr - - arm_func_start OS_Terminate -OS_Terminate: ; 0x020CD850 - stmdb sp!, {lr} - sub sp, sp, #0x4 -_020CD858: - bl OS_DisableInterrupts - bl OS_Halt - b _020CD858 diff --git a/arm9/asm/crt0.s b/arm9/asm/crt0.s index aaf2d22f..05a91b28 100644 --- a/arm9/asm/crt0.s +++ b/arm9/asm/crt0.s @@ -255,32 +255,43 @@ OSi_ReferSymbol: ; 0x02000B60 NitroStartUp: ; 0x02000B64 bx lr + .section .rodata .global _start_ModuleParams -_start_ModuleParams: +_start_ModuleParams: ; 0x02000B68 .word SDK_AUTOLOAD_LIST .word SDK_AUTOLOAD_LIST_END .word SDK_AUTOLOAD_START .word SDK_STATIC_BSS_START .word SDK_STATIC_BSS_END - - .balign 16, 0 - - .section .version + .word 0 ; Compressed static init end ; NITRO SDK 3.2.30001 .word (3 << 24) | (2 << 16) | 30001 .word 0xdec00621 ; Nitro code BE .word 0x2106c0de ; Nitro code LE - + # strings + # .section .version .balign 4 + .global _SDK_NintendoDWC +_SDK_NintendoDWC: ; 0x02000b8c .asciz "[SDK+NINTENDO:DWC1.2.30006.061019.2254_DWC_1_2_PLUS6]" .balign 4 + .global _SDK_NintendoWiFi +_SDK_NintendoWiFi: ; 0x02000bc4 .asciz "[SDK+NINTENDO:WiFi1.2.30000.0609050341]" .balign 4 + .global _SDK_UbiquitousCPS +_SDK_UbiquitousCPS: ; 0x02000bec .asciz "[SDK+UBIQUITOUS:CPS]" .balign 4 + .global _SDK_UbiquitousSSL +_SDK_UbiquitousSSL: ; 0x02000c04 .asciz "[SDK+UBIQUITOUS:SSL]" .balign 4 + .global _SDK_AbiossolibVCT +_SDK_AbiossolibVCT: ; 0x02000c1c .asciz "[SDK+Abiosso:libVCT 1.0.1_ec]" .balign 4 + .global _SDK_NintendoBackup +_SDK_NintendoBackup: ; 0x02000c3c .asciz "[SDK+NINTENDO:BACKUP]" 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 664e85f5..1eb74e0d 100644 --- a/arm9/asm/libcard.s +++ b/arm9/asm/libcard.s @@ -558,12 +558,14 @@ CARD_WaitBackupAsync: ; 0x020D6DB8 .balign 4 _020D6DC0: .word CARDi_WaitAsync + .extern _SDK_NintendoBackup + arm_func_start CARD_IdentifyBackup CARD_IdentifyBackup: ; 0x020D6DC4 stmdb sp!, {r4-r7,lr} sub sp, sp, #0x4 mov r5, r0 - ldr r0, _020D6F00 ; =0x02000C3C + ldr r0, _020D6F00 ; =_SDK_NintendoBackup ldr r7, _020D6F04 ; =0x021D55C0 bl OSi_ReferSymbol _020D6DDC: ; 0x020D6DDC @@ -648,7 +650,7 @@ _020D6EE0: ldmia sp!, {r4-r7,lr} bx lr .balign 4 -_020D6F00: .word 0x02000C3C +_020D6F00: .word _SDK_NintendoBackup _020D6F04: .word 0x021D55C0 _020D6F08: .word 0x021D3498 @@ -666,7 +668,7 @@ CARDi_RequestStreamCommand: ; 0x020D6F20 stmdb sp!, {r4-r10,lr} mov r10, r0 ldr r6, _020D7004 ; =0x021D55C0 - ldr r0, _020D7008 ; =0x02000C3C + ldr r0, _020D7008 ; =_SDK_NintendoBackup mov r9, r1 mov r8, r2 mov r7, r3 @@ -726,7 +728,7 @@ _020D6FE8: ; 0x020D6FE8 bx lr .balign 4 _020D7004: .word 0x021D55C0 -_020D7008: .word 0x02000C3C +_020D7008: .word _SDK_NintendoBackup _020D700C: .word CARDi_RequestStreamCommandCore _020D7010: .word 0x021D3498 @@ -736,7 +738,7 @@ CARDi_RequestStreamCommandCore: sub sp, sp, #0x4 mov r9, r0 ldr r8, [r9, #0x2c] - ldr r0, _020D720C ; =0x02000C3C + ldr r0, _020D720C ; =_SDK_NintendoBackup ldr r7, [r9, #0x34] ldr r10, [r9, #0x30] mov r6, #0x100 @@ -878,7 +880,7 @@ _020D71E8: ; 0x020D71E8 ldmia sp!, {r4-r11,lr} bx lr .balign 4 -_020D720C: .word 0x02000C3C +_020D720C: .word _SDK_NintendoBackup arm_func_start CARDi_GetRomAccessor CARDi_GetRomAccessor: ; 0x020D7210 @@ -1635,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 d5ef358d..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 MATH_CalcHMACSHA1 -MATH_CalcHMACSHA1: ; 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/libfs.s b/arm9/asm/libfs.s deleted file mode 100644 index d9b791b8..00000000 --- a/arm9/asm/libfs.s +++ /dev/null @@ -1,3011 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - .section .text - - arm_func_start FSi_TranslateCommand -FSi_TranslateCommand: - stmdb sp!, {r4-r8,lr} - mov r8, r0 - ldr r0, [r8, #0xc] - mov r7, r1 - mov r1, #0x1 - ldr r5, [r8, #0x8] - mov r4, r1, lsl r7 - ands r0, r0, #0x4 - moveq r1, #0x0 - cmp r1, #0x0 - ldrne r0, [r5, #0x1c] - orrne r0, r0, #0x200 - strne r0, [r5, #0x1c] - ldreq r0, [r5, #0x1c] - orreq r0, r0, #0x100 - streq r0, [r5, #0x1c] - ldr r0, [r5, #0x58] - ands r0, r0, r4 - beq _020CFFE4 - ldr r2, [r5, #0x54] - mov r0, r8 - mov r1, r7 - blx r2 - mov r6, r0 - cmp r6, #0x8 - addls pc, pc, r6, lsl #0x2 - b _020CFFE8 -_020CFFA0: - b _020CFFC4 - b _020CFFC4 - b _020CFFE8 - b _020CFFE8 - b _020CFFC4 - b _020CFFE8 - b _020CFFE8 - b _020CFFE8 - b _020CFFCC -_020CFFC4: - str r6, [r8, #0x14] - b _020CFFE8 -_020CFFCC: - ldr r1, [r5, #0x58] - mvn r0, r4 - and r0, r1, r0 - str r0, [r5, #0x58] - mov r6, #0x7 - b _020CFFE8 -_020CFFE4: - mov r6, #0x7 -_020CFFE8: - cmp r6, #0x7 - bne _020D0004 - ldr r1, _020D00AC ; =0x02103F80 - mov r0, r8 - ldr r1, [r1, r7, lsl #0x2] - blx r1 - mov r6, r0 -_020D0004: - cmp r6, #0x6 - bne _020D0060 - ldr r0, [r8, #0xc] - ands r0, r0, #0x4 - movne r0, #0x1 - moveq r0, #0x0 - cmp r0, #0x0 - beq _020D00A0 - bl OS_DisableInterrupts - ldr r1, [r5, #0x1c] - mov r4, r0 - ands r0, r1, #0x200 - beq _020D0050 - add r6, r5, #0xc -_020D003C: - mov r0, r6 - bl OS_SleepThread - ldr r0, [r5, #0x1c] - ands r0, r0, #0x200 - bne _020D003C -_020D0050: - mov r0, r4 - ldr r6, [r8, #0x14] - bl OS_RestoreInterrupts - b _020D00A0 -_020D0060: - ldr r0, [r8, #0xc] - ands r0, r0, #0x4 - movne r0, #0x1 - moveq r0, #0x0 - cmp r0, #0x0 - ldrne r0, [r5, #0x1c] - bicne r0, r0, #0x200 - strne r0, [r5, #0x1c] - strne r6, [r8, #0x14] - bne _020D00A0 - ldr r1, [r5, #0x1c] - mov r0, r8 - bic r2, r1, #0x100 - mov r1, r6 - str r2, [r5, #0x1c] - bl FSi_ReleaseCommand -_020D00A0: - mov r0, r6 - ldmia sp!, {r4-r8,lr} - bx lr - .balign 4 -_020D00AC: .word 0x02103F80 - - arm_func_start FSi_ReleaseCommand -FSi_ReleaseCommand: - stmdb sp!, {r4-r6,lr} - mov r6, r0 - mov r5, r1 - bl OS_DisableInterrupts - ldr r1, [r6, #0x0] - mov r4, r0 - ldr r0, [r6, #0x4] - cmp r1, #0x0 - strne r0, [r1, #0x4] - cmp r0, #0x0 - strne r1, [r0, #0x0] - mov r0, #0x0 - str r0, [r6, #0x0] - ldr r1, [r6, #0x0] - add r0, r6, #0x18 - str r1, [r6, #0x4] - ldr r1, [r6, #0xc] - bic r1, r1, #0x4f - str r1, [r6, #0xc] - str r5, [r6, #0x14] - bl OS_WakeupThread - mov r0, r4 - bl OS_RestoreInterrupts - ldmia sp!, {r4-r6,lr} - bx lr - - arm_func_start FSi_CloseFileCommand -FSi_CloseFileCommand: ; 0x020D0114 - mov r0, #0x0 - bx lr - - arm_func_start FSi_OpenFileDirectCommand -FSi_OpenFileDirectCommand: ; 0x020D011C - ldr r1, [r0, #0x30] - str r1, [r0, #0x24] - ldr r1, [r0, #0x30] - str r1, [r0, #0x2c] - ldr r1, [r0, #0x34] - str r1, [r0, #0x28] - ldr r1, [r0, #0x38] - str r1, [r0, #0x20] - mov r0, #0x0 - bx lr - - arm_func_start FSi_OpenFileFastCommand -FSi_OpenFileFastCommand: ; 0x020D0144 - stmdb sp!, {r4-r5,lr} - sub sp, sp, #0x14 - mov r5, r0 - ldr r1, [r5, #0x8] - ldr r4, [r5, #0x34] - ldr r0, [r1, #0x30] - mov r2, r4, lsl #0x3 - cmp r2, r0 - addcs sp, sp, #0x14 - movcs r0, #0x1 - ldmcsia sp!, {r4-r5,lr} - bxcs lr - str r1, [sp, #0x8] - ldr r1, [r1, #0x2c] - add r0, sp, #0x8 - add r3, r1, r2 - add r1, sp, #0x0 - mov r2, #0x8 - str r3, [sp, #0xc] - bl FSi_ReadTable -_020D0194: - cmp r0, #0 - addne sp, sp, #0x14 - ldmneia sp!, {r4-r5,lr} - bxne lr - ldr r1, [sp] - mov r0, r5 - str r1, [r5, #0x30] - ldr r2, [sp, #0x4] - mov r1, #7 - str r2, [r5, #0x34] - str r4, [r5, #0x38] - bl FSi_TranslateCommand - add sp, sp, #0x14 - ldmia sp!, {r4-r5,lr} - bx lr - - arm_func_start FSi_GetPathCommand -FSi_GetPathCommand: ; 0x020D01D0 - stmdb sp!, {r4-r11,lr} - sub sp, sp, #0xe4 - mov r4, r0 - ldr r1, [r4, #0x8] - add r0, sp, #0x98 - add r11, r4, #0x30 - str r1, [sp, #0x0] - bl FS_InitFile - ldr r0, [r4, #0x8] - str r0, [sp, #0xa0] - ldr r0, [r4, #0xc] - ands r0, r0, #0x20 - movne r0, #0x1 - moveq r0, #0x0 - cmp r0, #0x0 - ldrneh r5, [r4, #0x24] - movne r4, #0x10000 - bne _020D02BC - ldrh r0, [r11, #0x8] - ldr r4, [r4, #0x20] - cmp r0, #0x0 - ldrneh r5, [r11, #0xa] - bne _020D02BC - mov r10, #0x0 - mov r9, r10 - mov r5, #0x10000 - add r8, sp, #0x98 - mov r6, #0x3 - mov r7, #0x1 -_020D0244: - mov r0, r8 - mov r1, r10 - bl FSi_SeekDirDirect - add r2, sp, #0x4 - cmp r10, #0x0 - mov r0, r8 - mov r1, r6 - ldreq r9, [sp, #0xc4] - str r2, [sp, #0xc8] - str r7, [sp, #0xcc] - bl FSi_TranslateCommand -_020D0270: - cmp r0, #0x0 - bne _020D02A8 -_020D0278: - ldr r0, [sp, #0x10] - cmp r0, #0x0 - bne _020D0294 - ldr r0, [sp, #0x8] - cmp r0, r4 - ldreqh r5, [sp, #0xbc] - beq _020D02A8 -_020D0294: - mov r0, r8 - mov r1, r6 - bl FSi_TranslateCommand - cmp r0, #0x0 - beq _020D0278 -_020D02A8: - cmp r5, #0x10000 - bne _020D02BC - add sl, sl, #0x1 - cmp sl, r9 - bcc _020D0244 -_020D02BC: - cmp r5, #0x10000 - moveq r0, #0x0 - streqh r0, [r11, #0x8] - addeq sp, sp, #0xe4 - moveq r0, #0x1 - ldmeqia sp!, {r4-r11,lr} - bxeq lr - ldrh r0, [r11, #0x8] - cmp r0, #0x0 - bne _020D03B8 - ldr r0, [sp, #0x0] - mov r1, #0x0 - ldr r0, [r0, #0x0] - cmp r0, #0xff - addls r9, r1, #0x1 - bls _020D0308 - cmp r0, #0xff00 - addls r9, r1, #0x2 - addhi r9, r1, #0x3 -_020D0308: - cmp r4, #0x10000 - ldrne r0, [sp, #0x14] - add r9, r9, #0x2 - addne r9, r9, r0 - mov r10, r5 - cmp r5, #0x0 - beq _020D03AC - add r0, sp, #0x98 - mov r1, r5 - bl FSi_SeekDirDirect - add r8, sp, #0x98 - mov r6, #0x3 - mov r7, #0x1 -_020D033C: - ldr r1, [sp, #0xc4] - mov r0, r8 - bl FSi_SeekDirDirect - add r2, sp, #0x4 - mov r0, r8 - mov r1, r6 - str r2, [sp, #0xc8] - str r7, [sp, #0xcc] - bl FSi_TranslateCommand -_020D0360: - cmp r0, #0x0 - bne _020D03A0 -_020D0368: - ldr r0, [sp, #0x10] - cmp r0, #0x0 - beq _020D038C - ldrh r0, [sp, #0x8] - cmp r0, sl - ldreq r0, [sp, #0x14] - addeq r0, r0, #0x1 - addeq r9, r9, r0 - beq _020D03A0 -_020D038C: - mov r0, r8 - mov r1, r6 - bl FSi_TranslateCommand - cmp r0, #0x0 - beq _020D0368 -_020D03A0: - ldrh sl, [sp, #0xbc] - cmp sl, #0x0 - bne _020D033C -_020D03AC: - add r0, r9, #0x1 - strh r0, [r11, #0x8] - strh r5, [r11, #0xa] -_020D03B8: - ldr r7, [r11, #0x0] - cmp r7, #0x0 - addeq sp, sp, #0xe4 - moveq r0, #0x0 - ldmeqia sp!, {r4-r11,lr} - bxeq lr - ldrh r6, [r11, #0x8] - ldr r0, [r11, #0x4] - cmp r0, r6 - addcc sp, sp, #0xe4 - movcc r0, #0x1 - ldmccia sp!, {r4-r11,lr} - bxcc lr - ldr r0, [sp, #0x0] - mov r9, #0x0 - ldr r0, [r0, #0x0] - cmp r0, #0xff - movls r8, #0x1 - bls _020D0410 - cmp r0, #0xff00 - movls r8, #0x2 - movhi r8, #0x3 -_020D0410: - ldr r0, [sp, #0x0] - mov r1, r7 - mov r2, r8 - bl MI_CpuCopy8 - add r1, r9, r8 - ldr r0, _020D058C ; =0x0210682C - add r1, r7, r1 - mov r2, #0x2 - bl MI_CpuCopy8 - add r0, sp, #0x98 - mov r1, r5 - bl FSi_SeekDirDirect - cmp r4, #0x10000 - beq _020D04C4 - add r3, sp, #0x4 - mov r2, #0x0 - add r0, sp, #0x98 - mov r1, #0x3 - str r3, [sp, #0xc8] - str r2, [sp, #0xcc] - bl FSi_TranslateCommand -_020D0464: - cmp r0, #0x0 - bne _020D04A0 - add r9, sp, #0x98 - mov r8, #0x3 -_020D0474: - ldr r0, [sp, #0x10] - cmp r0, #0x0 - bne _020D048C - ldr r0, [sp, #0x8] - cmp r0, r4 - beq _020D04A0 -_020D048C: - mov r0, r9 - mov r1, r8 - bl FSi_TranslateCommand - cmp r0, #0x0 - beq _020D0474 -_020D04A0: - ldr r0, [sp, #0x14] - add r1, r7, r6 - add r4, r0, #0x1 - add r0, sp, #0x18 - mov r2, r4 - sub r1, r1, r4 - bl MI_CpuCopy8 - sub r6, r6, r4 - b _020D04D4 -_020D04C4: - add r0, r7, r6 - mov r1, #0x0 - strb r1, [r0, #-0x1] - sub r6, r6, #0x1 -_020D04D4: - cmp r5, #0x0 - beq _020D057C - add r10, sp, #0x98 - add r11, sp, #0x4 - mov r4, #0x3 - mov r9, #0x0 - mov r8, #0x2f -_020D04F0: - ldr r1, [sp, #0xc4] - mov r0, r10 - bl FSi_SeekDirDirect - add r2, r7, r6 - mov r0, r10 - mov r1, r4 - str r11, [sp, #0xc8] - str r9, [sp, #0xcc] - strb r8, [r2, #-0x1] - sub r6, r6, #0x1 - bl FSi_TranslateCommand -_020D051C: - cmp r0, #0x0 - bne _020D0570 -_020D0524: - ldr r0, [sp, #0x10] - cmp r0, #0x0 - beq _020D055C - ldrh r0, [sp, #0x8] - cmp r0, r5 - bne _020D055C - ldr r5, [sp, #0x14] - add r1, r7, r6 - add r0, sp, #0x18 - mov r2, r5 - sub r1, r1, r5 - bl MI_CpuCopy8 - sub r6, r6, r5 - b _020D0570 -_020D055C: - mov r0, sl - mov r1, r4 - bl FSi_TranslateCommand - cmp r0, #0x0 - beq _020D0524 -_020D0570: - ldrh r5, [sp, #0xbc] - cmp r5, #0x0 - bne _020D04F0 -_020D057C: - mov r0, #0x0 - add sp, sp, #0xe4 - ldmia sp!, {r4-r11,lr} - bx lr - .balign 4 -_020D058C: .word 0x0210682C - - arm_func_start FSi_FindPathCommand -FSi_FindPathCommand: ; 0x020D0590 - stmdb sp!, {r4-r11,lr} - sub sp, sp, #0x9c - mov r10, r0 - ldr r2, [r10, #0x40] - ldr r9, [r10, #0x3c] - mov r1, #0x2 - str r2, [sp, #0x0] - bl FSi_TranslateCommand - ldrb r1, [r9, #0x0] - cmp r1, #0x0 - beq _020D0780 - mov r0, #0x2 - add r11, sp, #0x1c - mov r4, #0x3 - mov r5, #0x1 - mov r6, #0x0 - str r0, [sp, #0x4] -_020D05D4: - mov r7, r6 - b _020D05E0 -_020D05DC: - add r7, r7, #0x1 -_020D05E0: - ldrb r8, [r9, r7] - mov r0, r6 - cmp r8, #0x0 - beq _020D0600 - cmp r8, #0x2f - beq _020D0600 - cmp r8, #0x5c - movne r0, r5 -_020D0600: - cmp r0, #0x0 - bne _020D05DC - cmp r8, #0x0 - bne _020D061C - ldr r0, [sp, #0x0] - cmp r0, #0x0 - beq _020D0620 -_020D061C: - mov r8, r5 -_020D0620: - cmp r7, #0x0 - addeq sp, sp, #0x9c - moveq r0, #0x1 - ldmeqia sp!, {r4-r11,lr} - bxeq lr - cmp r1, #0x2e - bne _020D068C - cmp r7, #0x1 - addeq r9, r9, #0x1 - beq _020D0764 - ldrb r0, [r9, #0x1] - cmp r7, #0x2 - moveq r1, r5 - movne r1, r6 - cmp r0, #0x2e - moveq r0, r5 - movne r0, r6 - ands r0, r1, r0 - beq _020D068C - ldrh r0, [r10, #0x24] - cmp r0, #0x0 - beq _020D0684 - ldr r1, [r10, #0x2c] - mov r0, r10 - bl FSi_SeekDirDirect -_020D0684: - add r9, r9, #0x2 - b _020D0764 -_020D068C: - cmp r7, #0x7f - addgt sp, sp, #0x9c - movgt r0, #0x1 - ldmgtia sp!, {r4-r11,lr} - bxgt lr - add r0, sp, #0x8 - str r0, [r10, #0x30] - str r6, [r10, #0x34] -_020D06AC: - mov r0, r10 - mov r1, r4 - bl FSi_TranslateCommand -_020D06B8: - cmp r0, #0x0 - addne sp, sp, #0x9c - movne r0, #0x1 - ldmneia sp!, {r4-r11,lr} - bxne lr - ldr r0, [sp, #0x14] - cmp r8, r0 - bne _020D06AC - ldr r0, [sp, #0x18] - cmp r7, r0 - bne _020D06AC - mov r0, r9 - mov r1, fp - mov r2, r7 - bl FSi_StrNICmp - cmp r0, #0x0 - bne _020D06AC - cmp r8, #0x0 - beq _020D0728 - add r0, sp, #0x8 - add r3, sl, #0x30 - ldmia r0, {r0, r1, r2} - stmia r3, {r0, r1, r2} - ldr r1, [sp, #0x4] - mov r0, sl - add r9, r9, r7 - bl FSi_TranslateCommand - b _020D0764 -_020D0728: - ldr r0, [sp] - cmp r0, #0x0 - addne sp, sp, #0x9c - movne r0, #0x1 - ldmneia sp!, {r4-r11,lr} - bxne lr - ldr r3, [sl, #0x44] - ldr r2, [sp, #0x8] - ldr r1, [sp, #0xC] - add sp, sp, #0x9c - str r2, [r3] - str r1, [r3, #0x4] - mov r0, #0x0 - ldmia sp!, {r4-r11,lr} - bx lr -_020D0764: - ldrb r0, [r9, #0x0] - cmp r0, #0x0 - movne r0, r5 - moveq r0, r6 - ldrb r1, [r9, r0]! - cmp r1, #0x0 - bne _020D05D4 -_020D0780: - ldr r0, [sp, #0x0] - cmp r0, #0x0 - moveq r0, #0x1 - addne r0, r10, #0x20 - ldrne r3, [r10, #0x44] - ldmneia r0, {r0-r2} - stmneia r3, {r0-r2} - movne r0, #0x0 - add sp, sp, #0x9c - ldmia sp!, {r4-r11,lr} - bx lr - - arm_func_start FSi_ReadDirCommand -FSi_ReadDirCommand: ; 0x020D07AC - stmdb sp!, {r4-r5,lr} - sub sp, sp, #0xc - mov r5, r0 - ldr r4, [r5, #0x30] - ldr r1, [r5, #0x8] - add r0, sp, #0x4 - str r1, [sp, #0x4] - ldr r3, [r5, #0x28] - add r1, sp, #0x0 - mov r2, #0x1 - str r3, [sp, #0x8] - bl FSi_ReadTable -_020D07DC: - cmp r0, #0x0 - addne sp, sp, #0xC - ldmneia sp!, {r4-r5,lr} - bxne lr - ldrb r1, [sp] - and r2, r1, #0x7F - mov r1, r1, asr #0x7 - str r2, [r4, #0x10] - and r1, r1, #0x1 - str r1, [r4, #0xC] - ldr r2, [r4, #0x10] - cmp r2, #0x0 - addeq sp, sp, #0xC - moveq r0, #0x1 - ldmeqia sp!, {r4-r5,lr} - bxeq lr - ldr r1, [r5, #0x34] - cmp r1, #0x0 - bne _020D0858 - add r0, sp, #0x4 - add r1, r4, #0x14 - bl FSi_ReadTable - cmp r0, #0x0 - addne sp, sp, #0xC - ldmneia sp!, {r4-r5,lr} - bxne lr - ldr r1, [r4, #0x10] - mov r2, #0x0 - add r1, r4, r1 - strb r2, [r1, #0x14] - b _020D0864 -_020D0858: - ldr r1, [sp, #0x8] - add r1, r1, r2 - str r1, [sp, #0x8] -_020D0864: - ldr r1, [r4, #0xC] - cmp r1, #0x0 - beq _020D08B8 - add r0, sp, #0x4 - add r1, sp, #0x2 - mov r2, #0x2 - bl FSi_ReadTable - cmp r0, #0x0 - addne sp, sp, #0xC - ldmneia sp!, {r4-r5,lr} - bxne lr - ldr r2, [r5, #0x8] - ldr r1, _020D08E8 - str r2, [r4] - ldrh r3, [sp, #0x2] - mov r2, #0x0 - and r1, r3, r1 - strh r1, [r4, #0x4] - strh r2, [r4, #0x6] - str r2, [r4, #0x8] - b _020D08D4 -_020D08B8: - ldr r1, [r5, #0x8] - str r1, [r4] - ldrh r1, [r5, #0x26] - str r1, [r4, #0x4] - ldrh r1, [r5, #0x26] - add r1, r1, #0x1 - strh r1, [r5, #0x26] -_020D08D4: - ldr r1, [sp, #0x8] - str r1, [r5, #0x28] - add sp, sp, #0xC - ldmia sp!, {r4-r5,lr} - bx lr -_020D08E8: .word 0x00000FFF - - arm_func_start FSi_SeekDirCommand -FSi_SeekDirCommand: ; 0x020D08EC - stmdb sp!, {r4-r6,lr} - sub sp, sp, #0x10 - mov r6, r0 - ldr r5, [r6, #0x8] - add r4, r6, #0x30 - str r5, [sp, #0x8] - ldrh r1, [r4, #0x4] - ldr r2, [r5, #0x34] - add r0, sp, #0x8 - add r3, r2, r1, lsl #0x3 - add r1, sp, #0x0 - mov r2, #0x8 - str r3, [sp, #0xc] - bl FSi_ReadTable - movs r3, r0 - bne _020D0978 - add r12, r6, #0x20 - ldmia r4, {r0-r2} - stmia r12, {r0-r2} - ldrh r0, [r4, #0x6] - cmp r0, #0x0 - bne _020D0968 - ldr r0, [r4, #0x8] - cmp r0, #0x0 - bne _020D0968 - ldrh r0, [sp, #0x4] - strh r0, [r6, #0x26] - ldr r1, [r5, #0x34] - ldr r0, [sp, #0x0] - add r0, r1, r0 - str r0, [r6, #0x28] -_020D0968: - ldrh r1, [sp, #0x6] - ldr r0, _020D0988 ; =0x00000FFF - and r0, r1, r0 - str r0, [r6, #0x2c] -_020D0978: - mov r0, r3 - add sp, sp, #0x10 - ldmia sp!, {r4-r6,lr} - bx lr - .balign 4 -_020D0988: .word 0x00000FFF - - arm_func_start FSi_WriteFileCommand -FSi_WriteFileCommand: ; 0x020D098C - stmdb sp!, {lr} - sub sp, sp, #0x4 - ldr r2, [r0, #0x2c] - ldr r3, [r0, #0x38] - ldr lr, [r0, #0x8] - ldr r1, [r0, #0x30] - add r12, r2, r3 - str r12, [r0, #0x2c] - ldr r12, [lr, #0x4c] - mov r0, lr - blx r12 - add sp, sp, #0x4 - ldmia sp!, {lr} - bx lr - - arm_func_start FSi_ReadFileCommand -FSi_ReadFileCommand: ; 0x020D09C4 - stmdb sp!, {lr} - sub sp, sp, #0x4 - ldr r2, [r0, #0x2c] - ldr r3, [r0, #0x38] - ldr lr, [r0, #0x8] - ldr r1, [r0, #0x30] - add r12, r2, r3 - str r12, [r0, #0x2c] - ldr r12, [lr, #0x48] - mov r0, lr - blx r12 - add sp, sp, #0x4 - ldmia sp!, {lr} - bx lr - - arm_func_start FSi_SeekDirDirect -FSi_SeekDirDirect: ; 0x020D09FC - ldr r3, [r0, #0xc] - mov r2, #0x0 - orr r3, r3, #0x4 - str r3, [r0, #0xc] - ldr r3, [r0, #0x8] - ldr ip, _020D0A2C ; =FSi_TranslateCommand - str r3, [r0, #0x30] - str r2, [r0, #0x38] - strh r2, [r0, #0x36] - strh r1, [r0, #0x34] - mov r1, #0x2 - bx r12 - .balign 4 -_020D0A2C: .word FSi_TranslateCommand - - arm_func_start FSi_ReadTable -FSi_ReadTable: - stmdb sp!, {r4-r8,lr} - mov r7, r0 - ldr r5, [r7, #0x0] - mov r6, r2 - ldr r2, [r5, #0x1c] - mov r0, r5 - orr r2, r2, #0x200 - str r2, [r5, #0x1c] - ldr r2, [r7, #0x4] - ldr r4, [r5, #0x50] - mov r3, r6 - blx r4 - cmp r0, #0x0 - beq _020D0A7C - cmp r0, #0x1 - beq _020D0A7C - cmp r0, #0x6 - beq _020D0A8C - b _020D0AC8 -_020D0A7C: - ldr r1, [r5, #0x1c] - bic r1, r1, #0x200 - str r1, [r5, #0x1c] - b _020D0AC8 -_020D0A8C: - bl OS_DisableInterrupts - ldr r1, [r5, #0x1c] - mov r4, r0 - ands r0, r1, #0x200 - beq _020D0AB8 - add r8, r5, #0xc -_020D0AA4: - mov r0, r8 - bl OS_SleepThread - ldr r0, [r5, #0x1c] - ands r0, r0, #0x200 - bne _020D0AA4 -_020D0AB8: - mov r0, r4 - bl OS_RestoreInterrupts - ldr r0, [r5, #0x24] - ldr r0, [r0, #0x14] -_020D0AC8: - ldr r1, [r7, #0x4] - add r1, r1, r6 - str r1, [r7, #0x4] - ldmia sp!, {r4-r8,lr} - bx lr - - arm_func_start FSi_StrNICmp -FSi_StrNICmp: ; 0x020D0ADC - stmdb sp!, {lr} - sub sp, sp, #0x4 - cmp r2, #0x0 - mov lr, #0x0 - bls _020D0B30 -_020D0AF0: - ldrb r12, [r0, lr] - ldrb r3, [r1, lr] - sub r12, r12, #0x41 - cmp r12, #0x19 - sub r3, r3, #0x41 - addls r12, r12, #0x20 - cmp r3, #0x19 - addls r3, r3, #0x20 - cmp r12, r3 - addne sp, sp, #0x4 - subne r0, r12, r3 - ldmneia sp!, {lr} - bxne lr - add lr, lr, #0x1 - cmp lr, r2 - blo _020D0AF0 -_020D0B30: - mov r0, #0x0 - add sp, sp, #0x4 - ldmia sp!, {lr} - bx lr - - arm_func_start FS_NotifyArchiveAsyncEnd -FS_NotifyArchiveAsyncEnd: ; 0x020D0B40 - stmdb sp!, {r4-r6,lr} - mov r4, r0 - ldr r0, [r4, #0x1c] - mov r6, r1 - ands r0, r0, #0x100 - beq _020D0B8C - ldr r2, [r4, #0x1c] - ldr r0, [r4, #0x24] - bic r2, r2, #0x100 - str r2, [r4, #0x1c] - bl FSi_ReleaseCommand - mov r0, r4 - bl FSi_NextCommand -_020D0B74: - cmp r0, #0x0 - ldmeqia sp!, {r4-r6,lr} - bxeq lr - bl FSi_ExecuteAsyncCommand - ldmia sp!, {r4-r6,lr} - bx lr -_020D0B8C: - ldr r5, [r4, #0x24] - bl OS_DisableInterrupts - str r6, [r5, #0x14] - ldr r1, [r4, #0x1c] - mov r5, r0 - bic r1, r1, #0x200 - add r0, r4, #0xc - str r1, [r4, #0x1c] - bl OS_WakeupThread - mov r0, r5 - bl OS_RestoreInterrupts - ldmia sp!, {r4-r6,lr} - bx lr - - arm_func_start FS_SetArchiveProc -FS_SetArchiveProc: ; 0x020D0BC0 - cmp r2, #0x0 - moveq r1, #0x0 - beq _020D0BD4 - cmp r1, #0x0 - moveq r2, #0x0 -_020D0BD4: - str r1, [r0, #0x54] - str r2, [r0, #0x58] - bx lr - - arm_func_start FS_ResumeArchive -FS_ResumeArchive: - stmdb sp!, {r4-r7,lr} - sub sp, sp, #0x4 - mov r4, r0 - mov r6, #0x0 - bl OS_DisableInterrupts - ldr r1, [r4, #0x1c] - mov r5, r0 - ands r0, r1, #0x8 - movne r0, #0x1 - moveq r0, r6 - cmp r0, #0x0 - moveq r7, #0x1 - movne r7, #0x0 - cmp r7, #0x0 - bne _020D0C34 - ldr r1, [r4, #0x1c] - mov r0, r4 - bic r1, r1, #0x8 - str r1, [r4, #0x1c] - bl FSi_NextCommand - mov r6, r0 -_020D0C34: - mov r0, r5 - bl OS_RestoreInterrupts -_020D0C3C: - cmp r6, #0x0 - beq _020D0C4C - mov r0, r6 - bl FSi_ExecuteAsyncCommand -_020D0C4C: - mov r0, r7 - add sp, sp, #0x4 - ldmia sp!, {r4-r7, lr} - bx lr - - arm_func_start FS_SuspendArchive -FS_SuspendArchive: ; 0x020D0C5C - stmdb sp!, {r4-r7,lr} - sub sp, sp, #0x4 - mov r6, r0 - bl OS_DisableInterrupts - ldr r1, [r6, #0x1c] - mov r4, r0 - ands r0, r1, #0x8 - movne r0, #0x1 - moveq r0, #0x0 - cmp r0, #0x0 - moveq r5, #0x1 - movne r5, #0x0 - cmp r5, #0x0 - beq _020D0CD4 - ldr r0, [r6, #0x1c] - ands r0, r0, #0x10 - beq _020D0CC8 - ldr r0, [r6, #0x1c] - orr r0, r0, #0x40 - str r0, [r6, #0x1c] - add r7, r6, #0x14 -_020D0CB0: - mov r0, r7 - bl OS_SleepThread - ldr r0, [r6, #0x1c] - ands r0, r0, #0x40 - bne _020D0CB0 - b _020D0CD4 -_020D0CC8: - ldr r0, [r6, #0x1c] - orr r0, r0, #0x8 - str r0, [r6, #0x1c] -_020D0CD4: - mov r0, r4 - bl OS_RestoreInterrupts - mov r0, r5 - add sp, sp, #0x4 - ldmia sp!, {r4-r7,lr} - bx lr - - arm_func_start FS_UnloadArchiveTables -FS_UnloadArchiveTables: ; 0x020D0CEC - stmdb sp!, {r4-r5,lr} - sub sp, sp, #0x4 - mov r5, r0 - ldr r0, [r5, #0x1c] - mov r4, #0x0 - ands r0, r0, #0x2 - movne r0, #0x1 - moveq r0, r4 - cmp r0, #0x0 - beq _020D0D74 - mov r0, r5 - bl FS_SuspendArchive - ldr r1, [r5, #0x1c] - ands r1, r1, #0x4 - movne r1, #0x1 - moveq r1, #0x0 - cmp r1, #0x0 - beq _020D0D64 - ldr r2, [r5, #0x1c] - mov r1, #0x0 - bic r2, r2, #0x4 - str r2, [r5, #0x1c] - ldr r4, [r5, #0x44] - str r1, [r5, #0x44] - ldr r1, [r5, #0x3c] - str r1, [r5, #0x2c] - ldr r1, [r5, #0x40] - str r1, [r5, #0x34] - ldr r1, [r5, #0x48] - str r1, [r5, #0x50] -_020D0D64: - cmp r0, #0x0 - beq _020D0D74 - mov r0, r5 - bl FS_ResumeArchive -_020D0D74: - mov r0, r4 - add sp, sp, #0x4 - ldmia sp!, {r4-r5,lr} - bx lr - - arm_func_start FUN_020D0D84 -FUN_020D0D84: ; 0x020D0D84 - stmdb sp!, {r4-r7,lr} - sub sp, sp, #0x4c - mov r7, r0 - ldr r3, [r7, #0x30] - ldr r0, [r7, #0x38] - mov r6, r1 - add r0, r3, r0 - add r0, r0, #0x20 - add r0, r0, #0x1f - bic r5, r0, #0x1f - cmp r5, r2 - bhi _020D0E9C - add r1, r6, #0x1f - add r0, sp, #0x4 - bic r4, r1, #0x1f - bl FS_InitFile - ldr r2, [r7, #0x2c] - mvn r0, #0x0 - str r0, [sp, #0x0] - ldr r3, [r7, #0x30] - add r0, sp, #0x4 - mov r1, r7 - add r3, r2, r3 - bl FS_OpenFileDirect -_020D0DE4: - cmp r0, #0x0 - beq _020D0E1C - ldr r2, [r7, #0x30] - add r0, sp, #0x4 - mov r1, r4 - bl FS_ReadFile - cmp r0, #0x0 - bge _020D0E14 - ldr r2, [r7, #0x30] - mov r0, r4 - mov r1, #0x0 - bl MI_CpuFill8 -_020D0E14: - add r0, sp, #0x4 - bl FS_CloseFile -_020D0E1C: - str r4, [r7, #0x2C] - ldr ip, [r7, #0x30] - ldr r2, [r7, #0x34] - mvn r0, #0x0 - str r0, [sp] - ldr r3, [r7, #0x38] - add r0, sp, #0x4 - mov r1, r7 - add r3, r2, r3 - add r4, r4, ip - bl FS_OpenFileDirect - cmp r0, #0x0 - beq _020D0E80 - ldr r2, [r7, #0x38] - add r0, sp, #0x4 - mov r1, r4 - bl FS_ReadFile - cmp r0, #0x0 - bge _020D0E78 - ldr r2, [r7, #0x38] - mov r0, r4 - mov r1, #0x0 - bl MI_CpuFill8 -_020D0E78: - add r0, sp, #0x4 - bl FS_CloseFile -_020D0E80: - str r4, [r7, #0x34] - ldr r0, _020D0EAC - str r6, [r7, #0x44] - str r0, [r7, #0x50] - ldr r0, [r7, #0x1C] - orr r0, r0, #0x4 - str r0, [r7, #0x1C] -_020D0E9C: - mov r0, r5 - add sp, sp, #0x4C - ldmia sp!, {r4-r7,lr} - bx lr -_020D0EAC: - .word FSi_ReadMemoryCore - - arm_func_start FUN_020D0EB0 -FUN_020D0EB0: ; 0x020D0EB0 - stmdb sp!, {r4-r8,lr} - mov r5, r0 - bl OS_DisableInterrupts - ldr r1, [r5, #0x1c] - mov r4, r0 - ands r0, r1, #0x2 - movne r0, #0x1 - moveq r0, #0x0 - cmp r0, #0x0 - beq _020D0F64 - mov r0, r5 - ldr r1, [r5, #0x1c] - bl FS_SuspendArchive - ldr r1, [r5, #0x1c] - mov r7, r0 - orr r0, r1, #0x80 - str r0, [r5, #0x1c] - ldr r0, [r5, #0x24] - cmp r0, #0x0 - beq _020D0F1C - mov r6, #0x3 -_020D0F04: - ldr r8, [r0, #0x4] - mov r1, r6 - bl FSi_ReleaseCommand - mov r0, r8 - cmp r8, #0x0 - bne _020D0F04 -_020D0F1C: - mov r0, #0x0 - str r0, [r5, #0x24] - cmp r7, #0x0 - beq _020D0F34 - mov r0, r5 - bl FS_ResumeArchive -_020D0F34: - mov r0, #0x0 - str r0, [r5, #0x28] - str r0, [r5, #0x2c] - str r0, [r5, #0x30] - str r0, [r5, #0x34] - str r0, [r5, #0x38] - str r0, [r5, #0x40] - ldr r0, [r5, #0x40] - str r0, [r5, #0x3c] - ldr r0, [r5, #0x1c] - bic r0, r0, #0xa2 - str r0, [r5, #0x1c] -_020D0F64: - mov r0, r4 - bl OS_RestoreInterrupts - mov r0, #0x1 - ldmia sp!, {r4-r8,lr} - bx lr - - arm_func_start FS_LoadArchive -FS_LoadArchive: ; 0x020D0F78 - str r1, [r0, #0x28] - str r3, [r0, #0x30] - str r2, [r0, #0x3c] - ldr r1, [r0, #0x3c] - ldr r2, [sp, #0x4] - str r1, [r0, #0x2c] - str r2, [r0, #0x38] - ldr r1, [sp, #0x0] - ldr r2, [sp, #0x8] - str r1, [r0, #0x40] - ldr r1, [r0, #0x40] - cmp r2, #0x0 - str r1, [r0, #0x34] - ldreq r2, _020D0FE8 ; =FSi_ReadMemCallback - ldr r1, [sp, #0xc] - str r2, [r0, #0x48] - cmp r1, #0x0 - ldreq r1, _020D0FEC ; =FSi_WriteMemCallback - str r1, [r0, #0x4c] - ldr r2, [r0, #0x48] - mov r1, #0x0 - str r2, [r0, #0x50] - str r1, [r0, #0x44] - ldr r1, [r0, #0x1c] - orr r1, r1, #0x2 - str r1, [r0, #0x1c] - mov r0, #0x1 - bx lr - .balign 4 -_020D0FE8: .word FSi_ReadMemCallback -_020D0FEC: .word FSi_WriteMemCallback - - arm_func_start FUN_020D0FF0 -FUN_020D0FF0: ; 0x020D0FF0 - stmdb sp!, {r4,lr} - mov r4, r0 - ldr r0, [r4, #0x0] - cmp r0, #0x0 - ldmeqia sp!, {r4,lr} - bxeq lr - bl OS_DisableInterrupts - ldr r2, [r4, #0x4] - mov r3, #0x0 - cmp r2, #0x0 - ldrne r1, [r4, #0x8] - strne r1, [r2, #0x8] - ldr r2, [r4, #0x8] - cmp r2, #0x0 - ldrne r1, [r4, #0x4] - strne r1, [r2, #0x4] - str r3, [r4, #0x0] - str r3, [r4, #0x8] - ldr r1, [r4, #0x8] - ldr r2, _020D1080 ; =0x021D53EC - str r1, [r4, #0x4] - ldr r1, [r4, #0x1c] - bic r1, r1, #0x1 - str r1, [r4, #0x1c] - ldr r1, [r2, #0x0] - cmp r1, r4 - bne _020D1074 - ldr r1, _020D1084 ; =0x021D53E8 - str r3, [r2, #0x8] - ldr r1, [r1, #0x0] - strh r3, [r2, #0x6] - str r1, [r2, #0x0] - strh r3, [r2, #0x4] -_020D1074: - bl OS_RestoreInterrupts - ldmia sp!, {r4,lr} - bx lr - .balign 4 -_020D1080: .word 0x021D53EC -_020D1084: .word 0x021D53E8 - - arm_func_start FS_RegisterArchiveName -FS_RegisterArchiveName: ; 0x020D1088 - stmdb sp!, {r4-r8,lr} - mov r6, r1 - mov r5, r2 - mov r7, r0 - mov r8, #0x0 - bl OS_DisableInterrupts - mov r4, r0 - mov r0, r6 - mov r1, r5 - bl FS_FindArchive -_020D10B0: - cmp r0, #0x0 - bne _020D112C - ldr r1, _020D1140 - ldr r2, [r1] - cmp r2, #0x0 - bne _020D10E8 - ldr r0, _020D1144 - mov r2, r8 - str r7, [r1] - str r7, [r0] - str r2, [r0, #0x8] - strh r2, [r0, #0x6] - strh r2, [r0, #0x4] - b _020D110C -_020D10E8: - ldr r0, [r2, #0x4] - cmp r0, #0x0 - beq _020D1104 -_020D10F4: - mov r2, r0 - ldr r0, [r0, #0x4] - cmp r0, #0x0 - bne _020D10F4 -_020D1104: - str r7, [r2, #0x4] - str r2, [r7, #0x8] -_020D110C: - mov r0, r6 - mov r1, r5 - bl FSi_GetPackedName - str r0, [r7] - ldr r0, [r7, #0x1C] - mov r8, #0x1 - orr r0, r0, #0x1 - str r0, [r7, #0x1C] -_020D112C: - mov r0, r4 - bl OS_RestoreInterrupts - mov r0, r8 - ldmia sp!, {r4-r8,lr} - bx lr -_020D1140: .word 0x021D53E8 -_020D1144: .word 0x021D53EC - - arm_func_start FS_FindArchive -FS_FindArchive: - stmdb sp!, {r4-r5,lr} - sub sp, sp, #0x4 - bl FSi_GetPackedName - mov r5, r0 - bl OS_DisableInterrupts - ldr r1, _020D1194 ; =0x021D53E8 - ldr r4, [r1, #0x0] - b _020D116C -_020D1168: - ldr r4, [r4, #0x4] -_020D116C: - cmp r4, #0x0 - beq _020D1180 - ldr r1, [r4, #0x0] - cmp r1, r5 - bne _020D1168 -_020D1180: - bl OS_RestoreInterrupts - mov r0, r4 - add sp, sp, #0x4 - ldmia sp!, {r4-r5,lr} - bx lr - .balign 4 -_020D1194: .word 0x021D53E8 - - arm_func_start FS_InitArchive -FS_InitArchive: ; 0x020D1198 - stmdb sp!, {r4,lr} - mov r1, #0x0 - mov r2, #0x5c - mov r4, r0 - bl MI_CpuFill8 - mov r1, #0x0 - str r1, [r4, #0x10] - ldr r0, [r4, #0x10] - str r0, [r4, #0xc] - str r1, [r4, #0x18] - ldr r0, [r4, #0x18] - str r0, [r4, #0x14] - ldmia sp!, {r4,lr} - bx lr - - arm_func_start FSi_SendCommand -FSi_SendCommand: - stmdb sp!, {r4-r7,lr} - sub sp, sp, #0x4 - mov r7, r0 - ldr r6, [r7, #0x8] - mov r2, #0x1 - str r1, [r7, #0x10] - mov r0, #0x2 - str r0, [r7, #0x14] - ldr r0, [r7, #0xc] - mov r5, r2, lsl r1 - orr r0, r0, #0x1 - str r0, [r7, #0xc] - bl OS_DisableInterrupts - ldr r1, [r6, #0x1c] - mov r4, r0 - ands r0, r1, #0x80 - beq _020D1238 - mov r0, r7 - mov r1, #0x3 - bl FSi_ReleaseCommand - mov r0, r4 - bl OS_RestoreInterrupts - add sp, sp, #0x4 - mov r0, #0x0 - ldmia sp!, {r4-r7,lr} - bx lr -_020D1238: - ands r0, r5, #0x1fc - ldrne r0, [r7, #0xc] - add r2, r6, #0x20 - orrne r0, r0, #0x4 - strne r0, [r7, #0xc] - ldr r1, [r7, #0x0] - ldr r0, [r7, #0x4] - cmp r1, #0x0 - strne r0, [r1, #0x4] - cmp r0, #0x0 - strne r1, [r0, #0x0] - ldr r0, [r2, #0x4] - cmp r0, #0x0 - beq _020D1280 -_020D1270: - mov r2, r0 - ldr r0, [r0, #0x4] - cmp r0, #0x0 - bne _020D1270 -_020D1280: - str r7, [r2, #0x4] - str r2, [r7, #0x0] - mov r1, #0x0 - str r1, [r7, #0x4] - ldr r0, [r6, #0x1c] - ands r0, r0, #0x8 - movne r1, #0x1 - cmp r1, #0x0 - bne _020D132C - ldr r0, [r6, #0x1c] - ands r0, r0, #0x10 - bne _020D132C - ldr r1, [r6, #0x1c] - mov r0, r4 - orr r1, r1, #0x10 - str r1, [r6, #0x1c] - bl OS_RestoreInterrupts - ldr r0, [r6, #0x58] - ands r0, r0, #0x200 - beq _020D12E0 - ldr r2, [r6, #0x54] - mov r0, r7 - mov r1, #0x9 - blx r2 -_020D12E0: - bl OS_DisableInterrupts - ldr r1, [r7, #0xc] - orr r1, r1, #0x40 - str r1, [r7, #0xc] - ldr r1, [r7, #0xc] - ands r1, r1, #0x4 - movne r1, #0x1 - moveq r1, #0x0 - cmp r1, #0x0 - bne _020D1324 - bl OS_RestoreInterrupts - mov r0, r7 - bl FSi_ExecuteAsyncCommand - add sp, sp, #0x4 - mov r0, #0x1 - ldmia sp!, {r4-r7,lr} - bx lr -_020D1324: - bl OS_RestoreInterrupts - b _020D1378 -_020D132C: - ldr r0, [r7, #0xc] - ands r0, r0, #0x4 - movne r0, #0x1 - moveq r0, #0x0 - cmp r0, #0x0 - bne _020D135C - mov r0, r4 - bl OS_RestoreInterrupts - add sp, sp, #0x4 - mov r0, #0x1 - ldmia sp!, {r4-r7,lr} - bx lr -_020D135C: - add r0, r7, #0x18 - bl OS_SleepThread - ldr r0, [r7, #0xc] - ands r0, r0, #0x40 - beq _020D135C - mov r0, r4 - bl OS_RestoreInterrupts -_020D1378: - mov r0, r7 - bl FSi_ExecuteSyncCommand - add sp, sp, #0x4 - ldmia sp!, {r4-r7,lr} - bx lr - - arm_func_start FSi_ExecuteSyncCommand -FSi_ExecuteSyncCommand: ; 0x020D138C - stmdb sp!, {r4,lr} - mov r4, r0 - ldr r1, [r4, #0x10] - bl FSi_TranslateCommand - mov r1, r0 - mov r0, r4 - bl FSi_ReleaseCommand - ldr r0, [r4, #0x8] - bl FSi_NextCommand -_020D13B0: - cmp r0, #0x0 - beq _020D13BC - bl FSi_ExecuteAsyncCommand -_020D13BC: - ldr r0, [r4, #0x14] - cmp r0, #0x0 - moveq r0, #0x1 - movne r0, #0x0 - ldmia sp!, {r4,lr} - bx lr - - arm_func_start FSi_ExecuteAsyncCommand -FSi_ExecuteAsyncCommand: ; 0x020D13D4 - stmdb sp!, {r4-r8,lr} - movs r6, r0 - ldr r5, [r6, #0x8] - ldmeqia sp!, {r4-r8,lr} - bxeq lr - mov r7, #0x0 - mov r8, #0x1 -_020D13F0: - bl OS_DisableInterrupts - ldr r1, [r6, #0xc] - mov r4, r0 - orr r0, r1, #0x40 - str r0, [r6, #0xc] - ldr r0, [r6, #0xc] - ands r0, r0, #0x4 - movne r0, r8 - moveq r0, r7 - cmp r0, #0x0 - beq _020D1434 - add r0, r6, #0x18 - bl OS_WakeupThread - mov r0, r4 - bl OS_RestoreInterrupts - ldmia sp!, {r4-r8,lr} - bx lr -_020D1434: - ldr r1, [r6, #0xc] - mov r0, r4 - orr r1, r1, #0x8 - str r1, [r6, #0xc] - bl OS_RestoreInterrupts - ldr r1, [r6, #0x10] - mov r0, r6 - bl FSi_TranslateCommand - cmp r0, #0x6 - ldmeqia sp!, {r4-r8,lr} - bxeq lr - mov r0, r5 - bl FSi_NextCommand - movs r6, r0 - bne _020D13F0 - ldmia sp!, {r4-r8,lr} - bx lr - - arm_func_start FSi_NextCommand -FSi_NextCommand: - stmdb sp!, {r4-r9,lr} - sub sp, sp, #0x4c - mov r6, r0 - bl OS_DisableInterrupts - ldr r1, [r6, #0x1c] - mov r5, r0 - ands r0, r1, #0x20 - beq _020D1500 - ldr r0, [r6, #0x1c] - bic r0, r0, #0x20 - str r0, [r6, #0x1c] - ldr r0, [r6, #0x24] - cmp r0, #0x0 - beq _020D1500 - mov r8, #0x0 - mov r9, #0x1 - mov r7, #0x3 -_020D14BC: - ldr r1, [r0, #0xc] - ldr r4, [r0, #0x4] - ands r1, r1, #0x2 - movne r1, r9 - moveq r1, r8 - cmp r1, #0x0 - beq _020D14F4 - ldr r1, [r6, #0x24] - cmp r1, r0 - mov r1, r7 - streq r4, [r6, #0x24] - bl FSi_ReleaseCommand -_020D14EC: - cmp r4, #0x0 - ldreq r4, [r6, #0x24] -_020D14F4: - mov r0, r4 - cmp r4, #0x0 - bne _020D14BC -_020D1500: - ldr r0, [r6, #0x1c] - ands r0, r0, #0x40 - bne _020D15EC - ldr r0, [r6, #0x1c] - ands r0, r0, #0x8 - movne r0, #0x1 - moveq r0, #0x0 - cmp r0, #0x0 - bne _020D15EC - ldr r4, [r6, #0x24] - cmp r4, #0x0 - beq _020D15EC - ldr r0, [r6, #0x1c] - ands r0, r0, #0x10 - movne r0, #0x1 - moveq r0, #0x0 - cmp r0, #0x0 - moveq r7, #0x1 - movne r7, #0x0 - cmp r7, #0x0 - ldrne r0, [r6, #0x1c] - orrne r0, r0, #0x10 - strne r0, [r6, #0x1c] - mov r0, r5 - bl OS_RestoreInterrupts -_020D1564: - cmp r7, #0x0 - beq _020D1588 - ldr r0, [r6, #0x58] - ands r0, r0, #0x200 - beq _020D1588 - ldr r2, [r6, #0x54] - mov r0, r4 - mov r1, #0x9 - blx r2 -_020D1588: - bl OS_DisableInterrupts - ldr r1, [r4, #0xC] - mov r5, r0 - orr r0, r1, #0x40 - str r0, [r4, #0xC] - ldr r0, [r4, #0xC] - ands r0, r0, #0x4 - movne r0, #0x1 - moveq r0, #0x0 - cmp r0, #0x0 - beq _020D15D4 - add r0, r4, #0x18 - bl OS_WakeupThread - mov r0, r5 - bl OS_RestoreInterrupts - add sp, sp, #0x4c - mov r0, #0x0 - ldmia sp!, {r4-r9, lr} - bx lr -_020D15D4: - mov r0, r5 - bl OS_RestoreInterrupts - add sp, sp, #0x4c - mov r0, r4 - ldmia sp!, {r4-r9, lr} - bx lr -_020D15EC: - ldr r0, [r6, #0x1c] - ands r0, r0, #0x10 - beq _020D162C - ldr r0, [r6, #0x1c] - bic r0, r0, #0x10 - str r0, [r6, #0x1c] - ldr r0, [r6, #0x58] - ands r0, r0, #0x400 - beq _020D162C - add r0, sp, #0x0 - bl FS_InitFile - str r6, [sp, #0x8] - ldr r2, [r6, #0x54] - add r0, sp, #0x0 - mov r1, #0xa - blx r2 -_020D162C: - ldr r0, [r6, #0x1c] - ands r0, r0, #0x40 - beq _020D1658 - ldr r1, [r6, #0x1c] - add r0, r6, #0x14 - bic r1, r1, #0x40 - str r1, [r6, #0x1c] - ldr r1, [r6, #0x1c] - orr r1, r1, #0x8 - str r1, [r6, #0x1c] - bl OS_WakeupThread -_020D1658: - mov r0, r5 - bl OS_RestoreInterrupts -_020D1660: - mov r0, #0x0 - add sp, sp, #0x4c - ldmia sp!, {r4-r9, lr} - bx lr - - arm_func_start FSi_ReadMemoryCore -FSi_ReadMemoryCore: ; 0x020D1670 - stmdb sp!, {lr} - sub sp, sp, #0x4 - mov r0, r2 - mov r2, r3 - bl MI_CpuCopy8 -_020D1684: - mov r0, #0x0 - add sp, sp, #0x4 - ldmfd sp!, {lr} - bx lr - - arm_func_start FSi_WriteMemCallback -FSi_WriteMemCallback: ; 0x020D1694 - stmdb sp!, {lr} - sub sp, sp, #0x4 - ldr r12, [r0, #0x28] - mov r0, r1 - add r1, r12, r2 - mov r2, r3 - bl MI_CpuCopy8 -_020D16B0: - mov r0, #0x0 - add sp, sp, #0x4 - ldmfd sp!, {lr} - bx lr - - arm_func_start FSi_ReadMemCallback -FSi_ReadMemCallback: ; 0x020D16C0 - stmdb sp!, {lr} - sub sp, sp, #0x4 - ldr r0, [r0, #0x28] - add r0, r0, r2 - mov r2, r3 - bl MI_CpuCopy8 -_020D16D8: - mov r0, #0x0 - add sp, sp, #0x4 - ldmfd sp!, {lr} - bx lr - - arm_func_start FSi_GetPackedName -FSi_GetPackedName: ; 0x020D16E8 - stmdb sp!, {lr} - sub sp, sp, #0x4 - cmp r1, #0x3 - mov lr, #0x0 - bgt _020D173C - mov r12, lr - cmp r1, #0x0 - ble _020D173C - mov r3, lr -_020D170C: - ldrb r2, [r0, r12] - cmp r2, #0x0 - beq _020D173C - sub r2, r2, #0x41 - cmp r2, #0x19 - addls r2, r2, #0x61 - addhi r2, r2, #0x41 - add r12, r12, #0x1 - orr lr, lr, r2, lsl r3 - cmp r12, r1 - add r3, r3, #0x8 - blt _020D170C -_020D173C: - mov r0, lr - add sp, sp, #0x4 - ldmia sp!, {lr} - bx lr - - arm_func_start FS_ChangeDir -FS_ChangeDir: ; 0x020D174C - stmdb sp!, {r4,lr} - sub sp, sp, #0x58 - mov r4, r0 - add r0, sp, #0xc - bl FS_InitFile - add r0, sp, #0xc - add r3, sp, #0x0 - mov r1, r4 - mov r2, #0x0 - bl FSi_FindPath -_020D1774: - cmp r0, #0x0 - moveq r0, #0x0 - addne r0, sp, #0x0 - ldrne r3, _020D179C - ldmneia r0, {r0, r1, r2} - stmneia r3, {r0, r1, r2} - movne r0, #0x1 - add sp, sp, #0x58 - ldmia sp!, {r4, lr} - bx lr -_020D179C: .word 0x021D53EC - - arm_func_start FS_SeekFile -FS_SeekFile: ; 0x020D17A0 - cmp r2, #0x0 - beq _020D17BC - cmp r2, #0x1 - beq _020D17C8 - cmp r2, #0x2 - beq _020D17D4 - b _020D17E0 -_020D17BC: - ldr r2, [r0, #0x24] - add r1, r1, r2 - b _020D17E8 -_020D17C8: - ldr r2, [r0, #0x2c] - add r1, r1, r2 - b _020D17E8 -_020D17D4: - ldr r2, [r0, #0x28] - add r1, r1, r2 - b _020D17E8 -_020D17E0: - mov r0, #0x0 - bx lr -_020D17E8: - ldr r2, [r0, #0x24] - cmp r1, r2 - movlt r1, r2 - ldr r2, [r0, #0x28] - cmp r1, r2 - movgt r1, r2 - str r1, [r0, #0x2c] - mov r0, #0x1 - bx lr - - arm_func_start FS_ReadFile -FS_ReadFile: ; 0x020D180C - ldr ip, _020D1818 ; =FUN_020D1AAC - mov r3, #0x0 - bx r12 - .balign 4 -_020D1818: .word FUN_020D1AAC - - arm_func_start FS_ReadFileAsync -FS_ReadFileAsync: ; 0x020D181C - ldr ip, _020D1828 ; =FUN_020D1AAC - mov r3, #0x1 - bx r12 - .balign 4 -_020D1828: .word FUN_020D1AAC - - arm_func_start FS_WaitAsync -FS_WaitAsync: ; 0x020D182C - stmdb sp!, {r4-r7,lr} - sub sp, sp, #0x4 - mov r6, r0 - mov r5, #0x0 - bl OS_DisableInterrupts - ldr r1, [r6, #0xc] - mov r4, r0 - ands r0, r1, #0x1 - movne r0, #0x1 - moveq r0, r5 - cmp r0, #0x0 - beq _020D18BC - ldr r0, [r6, #0xc] - ands r0, r0, #0x44 - moveq r5, #0x1 - movne r5, #0x0 - cmp r5, #0x0 - beq _020D189C - ldr r0, [r6, #0xc] - orr r0, r0, #0x4 - str r0, [r6, #0xc] - add r7, r6, #0x18 -_020D1884: - mov r0, r7 - bl OS_SleepThread - ldr r0, [r6, #0xc] - ands r0, r0, #0x40 - beq _020D1884 - b _020D18BC -_020D189C: - add r0, r6, #0x18 - bl OS_SleepThread - ldr r0, [r6, #0xc] - ands r0, r0, #0x1 - movne r0, #0x1 - moveq r0, #0x0 - cmp r0, #0x0 - bne _020D189C -_020D18BC: - mov r0, r4 - bl OS_RestoreInterrupts -_020D18C4: - cmp r5, #0x0 - beq _020D18E0 - mov r0, r6 - bl FSi_ExecuteSyncCommand - add sp, sp, #4 - ldmia sp!, {r4-r7,lr} - bx lr -_020D18E0: - ldr r0, [r6, #0x14] - cmp r0, #0x0 - moveq r0, #0x1 - movne r0, #0x0 - add sp, sp, #0x4 - ldmia sp!, {r4-r7,lr} - bx lr - - arm_func_start FS_CloseFile -FS_CloseFile: ; 0x020D18FC - stmdb sp!, {r4,lr} - mov r1, #0x8 - mov r4, r0 - bl FSi_SendCommand -_020D190C: - cmp r0, #0x0 - moveq r0, #0x0 - ldmeqia sp!, {r4,lr} - bxeq lr - mov r0, #0x0 - str r0, [r4, #0x8] - mov r0, #0xE - str r0, [r4, #0x10] - ldr r1, [r4, #0xC] - mov r0, #0x1 - bic r1, r1, #0x30 - str r1, [r4, #0xC] - ldmia sp!, {r4,lr} - bx lr - - arm_func_start FS_OpenFile -FS_OpenFile: ; 0x020D1944 - stmdb sp!, {r4,lr} - sub sp, sp, #0x8 - mov r4, r0 - add r0, sp, #0x0 - bl FS_ConvertPathToFileID -_020D1958: - cmp r0, #0x0 - beq _020D1984 - add r1, sp, #0x0 - mov r0, r4 - ldmia r1, {r1, r2} - bl FS_OpenFileFast - cmp r0, #0x0 - addne sp, sp, #0x8 - movne r0, #0x1 - ldmneia sp!, {r4, lr} - bxne lr -_020D1984: - mov r0, #0x0 - add sp, sp, #0x8 - ldmia sp!, {r4, lr} - bx lr - - arm_func_start FS_OpenFileFast -FS_OpenFileFast: - stmdb sp!, {r0-r3} - stmdb sp!, {r4,lr} - ldr r1, [sp, #0xc] - mov r4, r0 - cmp r1, #0x0 - moveq r0, #0x0 - ldmeqia sp!, {r4,lr} - addeq sp, sp, #0x10 - bxeq lr - str r1, [r4, #0x8] - ldr r3, [sp, #0xc] - ldr r2, [sp, #0x10] - mov r1, #0x6 - str r3, [r4, #0x30] - str r2, [r4, #0x34] - bl FSi_SendCommand -_020D19D4: - cmp r0, #0x0 - moveq r0, #0x0 - ldmeqia sp!, {r4, lr} - addeq sp, sp, #0x10 - bxeq lr - ldr r1, [r4, #0xC] - mov r0, #0x1 - orr r1, r1, #0x10 - str r1, [r4, #0xC] - ldr r1, [r4, #0xC] - bic r1, r1, #0x20 - str r1, [r4, #0xC] - ldmia sp!, {r4, lr} - add sp, sp, #0x10 - bx lr - - arm_func_start FS_OpenFileDirect -FS_OpenFileDirect: - stmdb sp!, {r4,lr} - mov r4, r0 - str r1, [r4, #0x8] - ldr r12, [sp, #0x8] - mov r1, #0x7 - str r12, [r4, #0x38] - str r2, [r4, #0x30] - str r3, [r4, #0x34] - bl FSi_SendCommand -_020D1A34: - cmp r0, #0x0 - moveq r0, #0x0 - ldmeqia sp!, {r4, lr} - bxeq lr - ldr r1, [r4, #0xC] - mov r0, #0x1 - orr r1, r1, #0x10 - str r1, [r4, #0xC] - ldr r1, [r4, #0xC] - bic r1, r1, #0x20 - str r1, [r4, #0xC] - ldmia sp!, {r4, lr} - bx lr - - arm_func_start FS_ConvertPathToFileID -FS_ConvertPathToFileID: - stmdb sp!, {r4-r5,lr} - sub sp, sp, #0x4c - mov r5, r0 - add r0, sp, #0x0 - mov r4, r1 - bl FS_InitFile -_020D1A80: - add r0, sp, #0x0 - mov r1, r4 - mov r2, r5 - mov r3, #0x0 - bl FSi_FindPath - cmp r0, #0x0 - movne r0, #0x1 - moveq r0, #0x0 - add sp, sp, #0x4C - ldmia sp!, {r4-r5, lr} - bx lr - - arm_func_start FUN_020D1AAC -FUN_020D1AAC: ; 0x020D1AAC - stmdb sp!, {r4-r7,lr} - sub sp, sp, #0x4 - mov r7, r0 - ldr r4, [r7, #0x2c] - ldr r0, [r7, #0x28] - mov r6, r2 - str r1, [r7, #0x30] - sub r0, r0, r4 - cmp r6, r0 - movgt r6, r0 - cmp r6, #0x0 - movlt r6, #0x0 - str r2, [r7, #0x34] - mov r5, r3 - str r6, [r7, #0x38] - cmp r5, #0x0 - ldreq r0, [r7, #0xc] - mov r1, #0x0 - orreq r0, r0, #0x4 - streq r0, [r7, #0xc] - mov r0, r7 - bl FSi_SendCommand -_020D1B04: - cmp r5, #0x0 - bne _020D1B24 - mov r0, r7 - bl FS_WaitAsync - cmp r0, #0x0 - ldrne r0, [r7, #0x2C] - subne r6, r0, r4 - mvneq r6, #0x0 -_020D1B24: - mov r0, r6 - add sp, sp, #0x4 - ldmia sp!, {r4-r7, lr} - bx lr - - arm_func_start FSi_FindPath -FSi_FindPath: - stmdb sp!, {r4-r8,lr} - sub sp, sp, #0x10 - mov r7, r1 - ldrb r1, [r7, #0x0] - mov r8, r0 - mov r6, r2 - mov r5, r3 - cmp r1, #0x2f - beq _020D1B60 - cmp r1, #0x5c - bne _020D1B84 -_020D1B60: - ldr r0, _020D1C90 ; =0x021D53EC - mov r1, #0x0 - ldr r0, [r0, #0x0] - strh r1, [sp, #0x4] - str r0, [sp, #0x0] - str r1, [sp, #0x8] - strh r1, [sp, #0x6] - add r7, r7, #0x1 - b _020D1C40 -_020D1B84: - ldr r0, _020D1C90 ; =0x021D53EC - add r3, sp, #0x0 - ldmia r0, {r0-r2} - stmia r3, {r0-r2} - mov r4, #0x0 -_020D1B98: - ldrb r0, [r7, r4] - cmp r0, #0x0 - beq _020D1C40 - cmp r0, #0x2f - beq _020D1C40 - cmp r0, #0x5c - beq _020D1C40 - cmp r0, #0x3a - bne _020D1C34 - mov r0, r7 - mov r1, r4 - bl FS_FindArchive -_020D1BC8: - cmp r0, #0x0 - addeq sp, sp, #0x10 - moveq r0, #0x0 - ldmeqia sp!, {r4-r8,lr} - bxeq lr - ldr r1, [r0, #0x1C] - ands r1, r1, #0x2 - movne r1, #0x1 - moveq r1, #0x0 - cmp r1, #0x0 - addeq sp, sp, #0x10 - moveq r0, #0x0 - ldmeqia sp!, {r4-r8,lr} - bxeq lr - mov r1, #0x0 - str r0, [sp] - str r1, [sp, #0x8] - strh r1, [sp, #0x6] - strh r1, [sp, #0x4] - add r0, r4, #0x1 - ldrb r0, [r7, r0]! - cmp r0, #0x2f - beq _020D1C2C - cmp r0, #0x5c - bne _020D1C40 -_020D1C2C: - add r7, r7, #0x1 - b _020D1C40 -_020D1C34: - add r4, r4, #0x1 - cmp r4, #0x3 - ble _020D1B98 -_020D1C40: - ldr r1, [sp, #0x0] - add r0, sp, #0x0 - str r1, [r8, #0x8] - str r7, [r8, #0x3c] - add r3, r8, #0x30 - ldmia r0, {r0-r2} - stmia r3, {r0-r2} - cmp r5, #0x0 - movne r0, #0x1 - strne r0, [r8, #0x40] - strne r5, [r8, #0x44] - moveq r0, #0x0 - streq r0, [r8, #0x40] - mov r0, r8 - mov r1, #0x4 - streq r6, [r8, #0x44] - bl FSi_SendCommand - add sp, sp, #0x10 - ldmia sp!, {r4-r8,lr} - bx lr - .balign 4 -_020D1C90: .word 0x021D53EC - - arm_func_start FS_InitFile -FS_InitFile: - mov r3, #0x0 - str r3, [r0, #0x0] - ldr r2, [r0, #0x0] - mov r1, #0xe - str r2, [r0, #0x4] - str r3, [r0, #0x1c] - ldr r2, [r0, #0x1c] - str r2, [r0, #0x18] - str r3, [r0, #0x8] - str r1, [r0, #0x10] - str r3, [r0, #0xc] - bx lr - - arm_func_start FS_IsAvailable -FS_IsAvailable: ; 0x020D1CC4 - ldr r0, _020D1CD0 ; =0x021D53F8 - ldr r0, [r0, #0x0] - bx lr - .balign 4 -_020D1CD0: .word 0x021D53F8 - - arm_func_start FS_Init -FS_Init: ; 0x020D1CD4 - stmdb sp!, {lr} - sub sp, sp, #0x4 - ldr r1, _020D1D0C ; =0x021D53F8 - ldr r2, [r1, #0x0] - cmp r2, #0x0 - addne sp, sp, #0x4 - ldmneia sp!, {lr} - bxne lr - mov r2, #0x1 - str r2, [r1, #0x0] - bl FSi_InitRom - add sp, sp, #0x4 - ldmia sp!, {lr} - bx lr - .balign 4 -_020D1D0C: .word 0x021D53F8 - - arm_func_start FS_TryLoadTable -FS_TryLoadTable: ; 0x020D1D10 - ldr ip, _020D1D28 ; =FUN_020D0D84 - mov r3, r0 - mov r2, r1 - ldr r0, _020D1D2C ; =0x021D5414 - mov r1, r3 - bx r12 - .balign 4 -_020D1D28: .word FUN_020D0D84 -_020D1D2C: .word 0x021D5414 - - arm_func_start FS_SetDefaultDMA -FS_SetDefaultDMA: ; 0x020D1D30 - stmdb sp!, {r4-r6,lr} - mov r6, r0 - bl OS_DisableInterrupts - mov r5, r0 - ldr r1, _020D1D7C ; =0x021D5400 - ldr r0, _020D1D80 ; =0x021D5414 - ldr r4, [r1, #0x0] - bl FS_SuspendArchive - ldr r1, _020D1D7C ; =0x021D5400 - cmp r0, #0x0 - str r6, [r1, #0x0] - beq _020D1D68 - ldr r0, _020D1D80 ; =0x021D5414 - bl FS_ResumeArchive -_020D1D68: - mov r0, r5 - bl OS_RestoreInterrupts - mov r0, r4 - ldmia sp!, {r4-r6,lr} - bx lr - .balign 4 -_020D1D7C: .word 0x021D5400 -_020D1D80: .word 0x021D5414 - - arm_func_start FSi_InitRom -FSi_InitRom: ; 0x020D1D84 - stmdb sp!, {r4-r5,lr} - sub sp, sp, #0x14 - ldr r1, _020D1EE8 ; =0x021D5400 - str r0, [r1, #0x0] - bl OS_GetLockID - ldr r3, _020D1EEC ; =0x021D53FC - ldr r2, _020D1EF0 ; =0x021D5404 - mov r12, #0x0 - ldr r1, _020D1EF4 ; =0x021D540C - str r0, [r3, #0x0] - str r12, [r2, #0x0] - str r12, [r2, #0x4] - str r12, [r1, #0x0] - str r12, [r1, #0x4] - bl CARD_Init - ldr r0, _020D1EF8 ; =0x021D5414 - bl FS_InitArchive - ldr r0, _020D1EF8 ; =0x021D5414 - ldr r1, _020D1EFC ; =0x02106830 - mov r2, #0x3 - bl FS_RegisterArchiveName - ldr r0, _020D1F00 ; =0x027FFC40 - ldrh r0, [r0, #0x0] - cmp r0, #0x2 - bne _020D1E4C - ldr ip, _020D1EF0 ; =0x021D5404 - mvn r2, #0x0 - ldr r3, _020D1EF4 ; =0x021D540C - mov lr, #0x0 - ldr r0, _020D1EF8 ; =0x021D5414 - ldr r1, _020D1F04 ; =FSi_EmptyArchiveProc - str r2, [r12, #0x0] - str lr, [r12, #0x4] - str r2, [r3, #0x0] - str lr, [r3, #0x4] - bl FS_SetArchiveProc - mov r1, #0x0 - str r1, [sp, #0x0] - ldr r0, _020D1F08 ; =FSi_ReadDummyCallback - str r1, [sp, #0x4] - str r0, [sp, #0x8] - ldr ip, _020D1F0C ; =FSi_WriteDummyCallback - ldr r0, _020D1EF8 ; =0x021D5414 - mov r2, r1 - mov r3, r1 - str r12, [sp, #0xc] - bl FS_LoadArchive - add sp, sp, #0x14 - ldmia sp!, {r4-r5,lr} - bx lr -_020D1E4C: - ldr r5, _020D1F10 ; =0x027FFE40 - ldr r0, _020D1EF8 ; =0x021D5414 - ldr r1, _020D1F14 ; =FSi_RomArchiveProc - ldr r2, _020D1F18 ; =0x00000602 - ldr r4, _020D1F1C ; =0x027FFE48 - bl FS_SetArchiveProc - ldr r1, [r5, #0x0] - mvn r0, #0x0 - cmp r1, r0 - addeq sp, sp, #0x14 - ldmeqia sp!, {r4-r5,lr} - bxeq lr - cmp r1, #0x0 - addeq sp, sp, #0x14 - ldmeqia sp!, {r4-r5,lr} - bxeq lr - ldr r2, [r4, #0x0] - cmp r2, r0 - addeq sp, sp, #0x14 - ldmeqia sp!, {r4-r5,lr} - bxeq lr - cmp r2, #0x0 - addeq sp, sp, #0x14 - ldmeqia sp!, {r4-r5,lr} - bxeq lr - str r1, [sp, #0x0] - ldr r0, [r5, #0x4] - ldr r1, _020D1F20 ; =FSi_ReadRomCallback - str r0, [sp, #0x4] - ldr r0, _020D1F0C ; =FSi_WriteDummyCallback - str r1, [sp, #0x8] - str r0, [sp, #0xc] - ldr r3, [r4, #0x4] - ldr r0, _020D1EF8 ; =0x021D5414 - mov r1, #0x0 - bl FS_LoadArchive - add sp, sp, #0x14 - ldmia sp!, {r4-r5,lr} - bx lr - .balign 4 -_020D1EE8: .word 0x021D5400 -_020D1EEC: .word 0x021D53FC -_020D1EF0: .word 0x021D5404 -_020D1EF4: .word 0x021D540C -_020D1EF8: .word 0x021D5414 -_020D1EFC: .word 0x02106830 -_020D1F00: .word 0x027FFC40 -_020D1F04: .word FSi_EmptyArchiveProc -_020D1F08: .word FSi_ReadDummyCallback -_020D1F0C: .word FSi_WriteDummyCallback -_020D1F10: .word 0x027FFE40 -_020D1F14: .word FSi_RomArchiveProc -_020D1F18: .word 0x00000602 -_020D1F1C: .word 0x027FFE48 -_020D1F20: .word FSi_ReadRomCallback - - arm_func_start FSi_EmptyArchiveProc -FSi_EmptyArchiveProc: ; 0x020D1F24 - mov r0, #0x4 - bx lr - - arm_func_start FSi_ReadDummyCallback -FSi_ReadDummyCallback: ; 0x020D1F2C - mov r0, #0x1 - bx lr - - arm_func_start FSi_RomArchiveProc -FSi_RomArchiveProc: ; 0x020D1F34 - stmdb sp!, {lr} - sub sp, sp, #0x4 - cmp r1, #0x1 - beq _020D1FA0 - cmp r1, #0x9 - beq _020D1F58 - cmp r1, #0xa - beq _020D1F7C - b _020D1FB0 -_020D1F58: - ldr r0, _020D1FC0 ; =0x021D53FC - ldr r0, [r0, #0x0] - mov r0, r0, lsl #0x10 - mov r0, r0, lsr #0x10 - bl CARD_LockRom - add sp, sp, #0x4 - mov r0, #0x0 - ldmia sp!, {lr} - bx lr -_020D1F7C: - ldr r0, _020D1FC0 ; =0x021D53FC - ldr r0, [r0, #0x0] - mov r0, r0, lsl #0x10 - mov r0, r0, lsr #0x10 - bl CARD_UnlockRom - add sp, sp, #0x4 - mov r0, #0x0 - ldmia sp!, {lr} - bx lr -_020D1FA0: - add sp, sp, #0x4 - mov r0, #0x4 - ldmia sp!, {lr} - bx lr -_020D1FB0: - mov r0, #0x8 - add sp, sp, #0x4 - ldmia sp!, {lr} - bx lr - .balign 4 -_020D1FC0: .word 0x021D53FC - - arm_func_start FSi_WriteDummyCallback -FSi_WriteDummyCallback: ; 0x020D1FC4 - mov r0, #0x1 - bx lr - - arm_func_start FSi_ReadRomCallback -FSi_ReadRomCallback: ; 0x020D1FCC - stmdb sp!, {lr} - sub sp, sp, #0xc - ldr ip, _020D2010 ; =FSi_OnRomReadDone - mov lr, r1 - str r12, [sp, #0x0] - str r0, [sp, #0x4] - mov r1, #0x1 - ldr r0, _020D2014 ; =0x021D5400 - str r1, [sp, #0x8] - mov r1, r2 - ldr r0, [r0, #0x0] - mov r2, lr - bl CARDi_ReadRom - mov r0, #0x6 - add sp, sp, #0xc - ldmia sp!, {lr} - bx lr - .balign 4 -_020D2010: .word FSi_OnRomReadDone -_020D2014: .word 0x021D5400 - - arm_func_start FSi_OnRomReadDone -FSi_OnRomReadDone: ; 0x020D2018 - stmdb sp!, {r4,lr} - mov r4, r0 - bl CARD_IsPulledOut -_020D2024: - cmp r0, #0x0 - movne r1, #0x5 - moveq r1, #0x0 - mov r0, r4 - bl FS_NotifyArchiveAsyncEnd - ldmia sp!, {r4,lr} - bx lr - - - arm_func_start FS_UnloadOverlay -FS_UnloadOverlay: ; 0x020D2040 - stmdb sp!, {lr} - sub sp, sp, #0x2c - mov r3, r0 - mov r2, r1 - add r0, sp, #0x0 - mov r1, r3 - bl FS_LoadOverlayInfo -_020D205C: - cmp r0, #0x0 - beq _020D2074 - add r0, sp, #0x0 - bl FS_UnloadOverlayImage - cmp r0, #0x0 - bne _020D2084 -_020D2074: - add sp, sp, #0x2c - mov r0, #0x0 - ldmfd sp!, {lr} - bx lr -_020D2084: - mov r0, #0x1 - add sp, sp, #0x2c - ldmfd sp!, {lr} - bx lr - - arm_func_start FS_LoadOverlay -FS_LoadOverlay: ; 0x020D2094 - stmdb sp!, {lr} - sub sp, sp, #0x2c - mov r3, r0 - mov r2, r1 - add r0, sp, #0x0 - mov r1, r3 - bl FS_LoadOverlayInfo -_020D20B0: - cmp r0, #0x0 - beq _020D20C8 - add r0, sp, #0x0 - bl FS_LoadOverlayImage - cmp r0, #0x0 - bne _020D20D8 -_020D20C8: - add sp, sp, #0x2c - mov r0, #0x0 - ldmfd sp!, {lr} - bx lr -_020D20D8: - add r0, sp, #0x0 - bl FS_StartOverlay - mov r0, #0x1 - add sp, sp, #0x2c - ldmfd sp!, {lr} - bx lr - - arm_func_start FS_UnloadOverlayImage -FS_UnloadOverlayImage: ; 0x020D20F0 - stmdb sp!, {lr} - sub sp, sp, #0x4 - bl FS_EndOverlay - mov r0, #0x1 - add sp, sp, #0x4 - ldmia sp!, {lr} - bx lr - - arm_func_start FS_EndOverlay -FS_EndOverlay: ; 0x020D210C - stmdb sp!, {r4-r11,lr} - sub sp, sp, #0x4 - ldr r8, _020D220C ; =0x021D74C8 - mov r11, r0 - mov r9, #0x0 -_020D2120: - ldr r1, [r11, #0x8] - ldr r0, [r11, #0xc] - ldr r5, [r11, #0x4] - add r0, r1, r0 - mov r7, r9 - mov r6, r9 - add r4, r5, r0 - bl OS_DisableInterrupts - ldr lr, [r8, #0x0] - mov r10, r9 - mov r12, lr - cmp lr, #0x0 - beq _020D21C4 -_020D2154: - ldr r2, [r12, #0x8] - ldr r3, [r12, #0x0] - cmp r2, #0x0 - ldr r1, [r12, #0x4] - bne _020D2178 - cmp r1, r5 - blo _020D2178 - cmp r1, r4 - blo _020D2188 -_020D2178: - cmp r2, r5 - blo _020D21B4 - cmp r2, r4 - bhs _020D21B4 -_020D2188: - cmp r6, #0x0 - strne r12, [r6, #0x0] - moveq r7, r12 - cmp lr, r12 - streq r3, [r8, #0x0] - moveq lr, r3 - str r9, [r12, #0x0] - cmp r10, #0x0 - mov r6, r12 - strne r3, [r10, #0x0] - b _020D21B8 -_020D21B4: - mov r10, r12 -_020D21B8: - mov r12, r3 - cmp r3, #0x0 - bne _020D2154 -_020D21C4: - bl OS_RestoreInterrupts -_020D21C8: - cmp r7, #0x0 - addeq sp, sp, #0x4 - ldmeqia sp!, {r4-r11, lr} - bxeq lr -_020D21D8: - ldr r1, [r7, #0x4] - ldr r4, [r7] - cmp r1, #0x0 - beq _020D21F0 - ldr r0, [r7, #0x8] - blx r1 -_020D21F0: - mov r7, r4 - cmp r4, #0x0 - bne _020D21D8 - b _020D2120 - add sp, sp, #0x4 - ldmia sp!, {r4-r11, lr} - bx lr -_020D220C: .word 0x021D74C8 - - arm_func_start FS_StartOverlay -FS_StartOverlay: ; 0x020D2210 - stmdb sp!, {r4-r6,lr} - mov r5, r0 - bl FSi_GetOverlayBinarySize - ldr r1, _020D2300 ; =0x027FFC40 - mov r4, r0 - ldrh r0, [r1, #0x0] - cmp r0, #0x2 - bne _020D22A4 - ldrb r1, [r5, #0x1f] - mov r0, #0x0 - ands r1, r1, #0x2 - beq _020D2280 - ldr r1, _020D2304 ; =0x02106F84 - ldr r3, _020D2308 ; =0x02106F84 - ldr r2, _020D230C ; =0x66666667 - sub r12, r1, r3 - smull r1, lr, r2, r12 - mov lr, lr, asr #0x3 - mov r1, r12, lsr #0x1f - ldr r2, [r5, #0x0] - add lr, r1, lr - cmp r2, lr - bhs _020D2280 - mov r0, #0x14 - mla r0, r2, r0, r3 - ldr r1, [r5, #0x4] - mov r2, r4 - bl FSi_CompareDigest -_020D2280: - cmp r0, #0x0 - bne _020D22A4 - ldr r0, [r5, #0x4] - mov r2, r4 - mov r1, #0x0 - bl MI_CpuFill8 - bl OS_Terminate - ldmia sp!, {r4-r6,lr} - bx lr -_020D22A4: - ldrb r0, [r5, #0x1f] - ands r0, r0, #0x1 - beq _020D22BC - ldr r0, [r5, #0x4] - add r0, r0, r4 - bl MIi_UncompressBackward -_020D22BC: - ldr r0, [r5, #0x4] - ldr r1, [r5, #0x8] - bl DC_FlushRange - ldr r6, [r5, #0x10] - ldr r4, [r5, #0x14] - cmp r6, r4 - ldmcsia sp!, {r4-r6,lr} - bxcs lr -_020D22DC: - ldr r0, [r6, #0x0] - cmp r0, #0x0 - beq _020D22EC - blx r0 -_020D22EC: - add r6, r6, #0x4 - cmp r6, r4 - blo _020D22DC - ldmia sp!, {r4-r6,lr} - bx lr - .balign 4 -_020D2300: .word 0x027FFC40 -_020D2304: .word 0x02106F84 -_020D2308: .word 0x02106F84 -_020D230C: .word 0x66666667 - - arm_func_start FSi_CompareDigest -FSi_CompareDigest: - stmdb sp!, {r4-r6,lr} - sub sp, sp, #0x58 - mov r4, r0 - mov r6, r1 - mov r5, r2 - add r0, sp, #0x4 - mov r1, #0x0 - mov r2, #0x14 - bl MI_CpuFill8 - ldr r0, _020D23AC ; =0x02106834 - ldr r1, _020D23B0 ; =0x02106838 - ldr r0, [r0, #0x0] - ldr r2, [r1, #0x0] - add r1, sp, #0x18 - bl MI_CpuCopy8 - ldr r3, _020D23B0 ; =0x02106838 - mov r1, r6 - ldr r12, [r3, #0x0] - mov r2, r5 - add r0, sp, #0x4 - add r3, sp, #0x18 - str r12, [sp, #0x0] - bl MATH_CalcHMACSHA1 - add r2, sp, #0x4 - mov r3, #0x0 -_020D2374: - ldr r1, [r2, #0x0] - ldr r0, [r4, r3] - cmp r1, r0 - bne _020D2394 - add r3, r3, #0x4 - cmp r3, #0x14 - add r2, r2, #0x4 - blo _020D2374 -_020D2394: - cmp r3, #0x14 - moveq r0, #0x1 - movne r0, #0x0 - add sp, sp, #0x58 - ldmia sp!, {r4-r6,lr} - bx lr - .balign 4 -_020D23AC: .word 0x02106834 -_020D23B0: .word 0x02106838 - - arm_func_start FS_LoadOverlayImage -FS_LoadOverlayImage: ; 0x020D23B4 - stmdb sp!, {r4-r5,lr} - sub sp, sp, #0x54 - mov r5, r0 - add r0, sp, #0x8 - bl FS_InitFile -_020D23C8: - add r0, sp, #0x0 - mov r1, r5 - bl FS_GetOverlayFileID - add r1, sp, #0x0 - add r0, sp, #0x8 - ldmia r1, {r1, r2} - bl FS_OpenFileFast - cmp r0, #0x0 - addeq sp, sp, #0x54 - moveq r0, #0x0 - ldmeqia sp!, {r4-r5, lr} - bxeq lr - mov r0, r5 - bl FSi_GetOverlayBinarySize - mov r4, r0 - mov r0, r5 - bl FS_ClearOverlayImage - ldr r1, [r5, #0x4] - add r0, sp, #0x8 - mov r2, r4 - bl FS_ReadFile - cmp r4, r0 - beq _020D243C - add r0, sp, #0x8 - bl FS_CloseFile - add sp, sp, #0x54 - mov r0, #0x0 - ldmia sp!, {r4-r5, lr} - bx lr -_020D243C: - add r0, sp, #0x8 - bl FS_CloseFile - mov r0, #0x1 - add sp, sp, #0x54 - ldmia sp!, {r4-r5, lr} - bx lr - - arm_func_start FS_LoadOverlayImageAsync -FS_LoadOverlayImageAsync: ; 0x020D2454 - stmdb sp!, {r4-r6,lr} - sub sp, sp, #0x8 - mov r5, r1 - mov r6, r0 - mov r0, r5 - bl FS_InitFile -_020D246C: - add r0, sp, #0x0 - mov r1, r6 - bl FS_GetOverlayFileID - add r1, sp, #0x0 - mov r0, r5 - ldmia r1, {r1, r2} - bl FS_OpenFileFast - cmp r0, #0x0 - addeq sp, sp, #0x8 - moveq r0, #0x0 - ldmeqia sp!, {r4-r6, lr} - bxeq lr - mov r0, r6 - bl FSi_GetOverlayBinarySize - mov r4, r0 - mov r0, r6 - bl FS_ClearOverlayImage - ldr r1, [r6, #0x4] - mov r0, r5 - mov r2, r4 - bl FS_ReadFileAsync - cmp r4, r0 - addeq sp, sp, #0x8 - moveq r0, #0x1 - ldmeqia sp!, {r4-r6, lr} - bxeq lr - mov r0, r5 - bl FS_CloseFile - mov r0, #0x0 - add sp, sp, #0x8 - ldmia sp!, {r4-r6, lr} - bx lr - - arm_func_start FS_LoadOverlayInfo -FS_LoadOverlayInfo: - stmdb sp!, {r4-r5,lr} - sub sp, sp, #0x64 - movs r4, r1 - mov r5, r0 - ldreq r0, _020D25EC ; =0x021D5404 - ldrne r0, _020D25F0 ; =0x021D540C - ldr r3, [r0, #0x0] - cmp r3, #0x0 - beq _020D25A8 - ldr r0, [r0, #0x4] - mov r2, r2, lsl #0x5 - cmp r2, r0 - addcs sp, sp, #0x64 - movcs r0, #0x0 - ldmcsia sp!, {r4-r5,lr} - bxcs lr - add r0, r3, r2 - mov r1, r5 - mov r2, #0x20 - bl MI_CpuCopy8 - add r0, sp, #0x18 - str r4, [r5, #0x20] - bl FS_InitFile - add r0, sp, #0x10 - mov r1, r5 - bl FS_GetOverlayFileID - add r1, sp, #0x10 - add r0, sp, #0x18 - ldmia r1, {r1-r2} - bl FS_OpenFileFast -_020D2564: - cmp r0, #0x0 - addeq sp, sp, #0x64 - moveq r0, #0x0 - ldmeqia sp!, {r4-r5,lr} - bxeq lr - ldr r1, [sp, #0x3c] - add r0, sp, #0x18 - str r1, [r5, #0x24] - ldr r2, [sp, #0x40] - ldr r1, [sp, #0x3c] - sub r1, r2, r1 - str r1, [r5, #0x28] - bl FS_CloseFile - add sp, sp, #0x64 - mov r0, #0x1 - ldmia sp!, {r4-r5,lr} - bx lr -_020D25A8: - ldr r1, _020D25F4 ; =0x027FFE50 - ldr ip, _020D25F8 ; =0x027FFE58 - ldr r0, [r1, #0x0] - ldr r3, _020D25FC ; =0x021D5414 - str r0, [sp, #0x0] - ldr r1, [r1, #0x4] - mov r0, r5 - str r1, [sp, #0x4] - ldr r5, [r12, #0x0] - mov r1, r4 - str r5, [sp, #0x8] - ldr r4, [r12, #0x4] - str r4, [sp, #0xc] - bl FSi_LoadOverlayInfoCore - add sp, sp, #0x64 - ldmia sp!, {r4-r5,lr} - bx lr - .balign 4 -_020D25EC: .word 0x021D5404 -_020D25F0: .word 0x021D540C -_020D25F4: .word 0x027FFE50 -_020D25F8: .word 0x027FFE58 -_020D25FC: .word 0x021D5414 - - arm_func_start FSi_LoadOverlayInfoCore -FSi_LoadOverlayInfoCore: ; 0x020D2600 - stmdb sp!, {r4-r9,lr} - sub sp, sp, #0x54 - movs r9, r1 - ldreq r5, [sp, #0x74] - ldreq r6, [sp, #0x70] - ldrne r5, [sp, #0x7c] - ldrne r6, [sp, #0x78] - mov r7, r2, lsl #0x5 - cmp r7, r5 - mov r4, r0 - mov r8, r3 - addcs sp, sp, #0x54 - movcs r0, #0x0 - ldmcsia sp!, {r4-r9,lr} - bxcs lr - add r0, sp, #0xc - bl FS_InitFile - mvn r12, #0x0 - add r0, sp, #0xc - mov r1, r8 - add r2, r6, r7 - add r3, r6, r5 - str r12, [sp, #0x0] - bl FS_OpenFileDirect -_020D2660: - cmp r0, #0 - addeq sp, sp, #0x54 - moveq r0, #0 - ldmeqia sp!, {r4-r9, lr} - bxeq lr - add r0, sp, #12 - mov r1, r4 - mov r2, #32 - bl FS_ReadFile - cmp r0, #32 - beq _020D26A4 - add r0, sp, #12 - bl FS_CloseFile - add sp, sp, #0x54 - mov r0, #0x0 - ldmia sp!, {r4-r9, lr} - bx lr -_020D26A4: - add r0, sp, #0xC - bl FS_CloseFile - add r0, sp, #0x4 - mov r1, r4 - str r9, [r4, #0x20] - bl FS_GetOverlayFileID - add r1, sp, #0x4 - add r0, sp, #0xC - ldmia r1, {r1, r2} - bl FS_OpenFileFast - cmp r0, #0x0 - addeq sp, sp, #0x54 - moveq r0, #0x0 - ldmeqia sp!, {r4-r9, lr} - bxeq lr - ldr r1, [sp, #0x30] - add r0, sp, #0xC - str r1, [r4, #0x24] - ldr r2, [sp, #0x34] - ldr r1, [sp, #0x30] - sub r1, r2, r1 - str r1, [r4, #0x28] - bl FS_CloseFile - mov r0, #0x1 - add sp, sp, #0x54 - ldmia sp!, {r4-r9, lr} - bx lr - - arm_func_start FS_GetOverlayFileID -FS_GetOverlayFileID: ; 0x020D2710 - sub sp, sp, #0x8 - ldr r2, _020D2734 ; =0x021D5414 - str r2, [sp, #0x0] - ldr r1, [r1, #0x18] - str r1, [sp, #0x4] - str r2, [r0, #0x0] - str r1, [r0, #0x4] - add sp, sp, #0x8 - bx lr - .balign 4 -_020D2734: .word 0x021D5414 - - arm_func_start FS_ClearOverlayImage -FS_ClearOverlayImage: ; 0x020D2738 - stmdb sp!, {r4-r6,lr} - ldr r5, [r0, #0x8] - ldr r1, [r0, #0xc] - ldr r6, [r0, #0x4] - add r4, r5, r1 - mov r0, r6 - mov r1, r4 - bl IC_InvalidateRange - mov r0, r6 - mov r1, r4 - bl DC_InvalidateRange - add r0, r6, r5 - sub r2, r4, r5 - mov r1, #0x0 - bl MI_CpuFill8 - ldmia sp!, {r4-r6,lr} - bx lr - - arm_func_start FSi_GetOverlayBinarySize -FSi_GetOverlayBinarySize: ; 0x020D277C - ldrb r1, [r0, #0x1f] - ands r1, r1, #0x1 - ldrne r0, [r0, #0x1c] - movne r0, r0, lsl #0x8 - movne r0, r0, lsr #0x8 - ldreq r0, [r0, #0x8] - bx lr 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/libmwcc.s b/arm9/asm/libmwcc.s index fcabec42..a6013179 100644 --- a/arm9/asm/libmwcc.s +++ b/arm9/asm/libmwcc.s @@ -3100,10 +3100,15 @@ __close_console: ; 0x020EC68C mov r0, #0x0 bx lr + .section .rodata +__static_initializers: + .word 0 + + .section .text arm_func_start __call_static_initializers __call_static_initializers: ; 0x020EC694 stmdb sp!, {r4,lr} - ldr r4, _020EC6BC ; =0x02104774 + ldr r4, _020EC6BC ; =__static_initializers b _020EC6A8 _020EC6A0: blx r0 @@ -3115,12 +3120,12 @@ _020EC6A8: bne _020EC6A0 ldmia sp!, {r4,pc} .balign 4 -_020EC6BC: .word 0x02104774 +_020EC6BC: .word __static_initializers arm_func_start __destroy_global_chain __destroy_global_chain: ; 0x020EC6C0 stmdb sp!, {r3-r5,lr} - ldr r4, _020EC700 ; =0x021D74C8 + ldr r4, _020EC700 ; =__global_destructor_chain ldr r2, [r4, #0x0] cmp r2, #0x0 ldmeqia sp!, {r3-r5,pc} @@ -3138,7 +3143,7 @@ _020EC6D8: bne _020EC6D8 ldmia sp!, {r3-r5,pc} .balign 4 -_020EC700: .word 0x021D74C8 +_020EC700: .word __global_destructor_chain arm_func_start _ExitProcess _ExitProcess: ; 0x020EC704 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/unk_02000E0C.s b/arm9/asm/unk_02000E0C.s index 50b0dace..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 FUN_02005FDC -_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 FUN_02005F60 -_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 2024d9d7..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 @@ -7792,549 +7792,3 @@ _02005F36: mov r0, #0x0 bx lr .balign 4 - - thumb_func_start FUN_02005F3C -FUN_02005F3C: ; 0x02005F3C - push {r4, lr} - add r4, r0, #0x0 - ldr r0, [r4, #0x4] - cmp r0, #0x1 - beq _02005F4A - bl ErrorHandling -_02005F4A: - ldr r1, [r4, #0x0] - mov r0, #0x0 - blx FS_UnloadOverlay - cmp r0, #0x1 - beq _02005F5A - bl ErrorHandling -_02005F5A: - mov r0, #0x0 - str r0, [r4, #0x4] - pop {r4, pc} - - thumb_func_start FUN_02005F60 -FUN_02005F60: ; 0x02005F60 - push {r4, lr} - add r4, r0, #0x0 - bl FUN_02005F90 - bl FUN_0200610C - mov r2, #0x0 - add r3, r0, #0x0 -_02005F70: - ldr r1, [r3, #0x4] - cmp r1, #0x1 - bne _02005F86 - ldr r1, [r3, #0x0] - cmp r4, r1 - bne _02005F86 - lsl r1, r2, #0x3 - add r0, r0, r1 - bl FUN_02005F3C - pop {r4, pc} -_02005F86: - add r2, r2, #0x1 - add r3, #0x8 - cmp r2, #0x8 - blt _02005F70 - pop {r4, pc} - - thumb_func_start FUN_02005F90 -FUN_02005F90: ; 0x02005F90 - push {lr} - sub sp, #0x2c - add r2, r0, #0x0 - add r0, sp, #0x0 - mov r1, #0x0 - blx FS_LoadOverlayInfo - cmp r0, #0x1 - beq _02005FA6 - bl ErrorHandling -_02005FA6: - mov r0, #0x2 - ldr r2, [sp, #0x4] - lsl r0, r0, #0x18 - cmp r2, r0 - bhi _02005FBC - lsr r0, r0, #0x1 - cmp r2, r0 - blo _02005FBC - add sp, #0x2c - mov r0, #0x1 - pop {pc} -_02005FBC: - mov r0, #0x1 - ldr r1, _02005FD8 ; =0x027E0000 - lsl r0, r0, #0xe - add r0, r1, r0 - cmp r2, r0 - bhi _02005FD2 - cmp r2, r1 - blo _02005FD2 - add sp, #0x2c - mov r0, #0x2 - pop {pc} -_02005FD2: - mov r0, #0x0 - add sp, #0x2c - pop {pc} - .balign 4 -_02005FD8: .word 0x027E0000 - - thumb_func_start FUN_02005FDC -FUN_02005FDC: ; 0x02005FDC - push {r3-r7, lr} - add r4, r1, #0x0 - mov r1, #0x0 - mvn r1, r1 - add r5, r0, #0x0 - str r1, [sp, #0x0] - bl FUN_02006090 - cmp r0, #0x0 - bne _02005FF4 - mov r0, #0x0 - pop {r3-r7, pc} -_02005FF4: - add r0, r5, #0x0 - bl FUN_02005F90 - add r7, r0, #0x0 - bl FUN_0200610C - add r3, r0, #0x0 - mov r6, #0x0 - add r1, r3, #0x0 -_02006006: - ldr r0, [r1, #0x4] - cmp r0, #0x0 - bne _02006018 - lsl r1, r6, #0x3 - add r2, r3, r1 - mov r0, #0x1 - str r0, [r2, #0x4] - str r5, [r3, r1] - b _02006020 -_02006018: - add r6, r6, #0x1 - add r1, #0x8 - cmp r6, #0x8 - blt _02006006 -_02006020: - cmp r6, #0x8 - blt _0200602C - bl ErrorHandling - mov r0, #0x0 - pop {r3-r7, pc} -_0200602C: - sub r6, r7, #0x1 - cmp r6, #0x1 - bhi _0200603C - mov r0, #0x0 - mvn r0, r0 - blx FS_SetDefaultDMA - str r0, [sp, #0x0] -_0200603C: - cmp r4, #0x0 - beq _0200604A - cmp r4, #0x1 - beq _02006056 - cmp r4, #0x2 - beq _02006062 - b _0200606E -_0200604A: - mov r0, #0x0 - add r1, r5, #0x0 - bl FUN_02006168 - add r4, r0, #0x0 - b _02006076 -_02006056: - mov r0, #0x0 - add r1, r5, #0x0 - bl FUN_02006170 - add r4, r0, #0x0 - b _02006076 -_02006062: - mov r0, #0x0 - add r1, r5, #0x0 - bl FUN_020061A8 - add r4, r0, #0x0 - b _02006076 -_0200606E: - bl ErrorHandling - mov r0, #0x0 - pop {r3-r7, pc} -_02006076: - cmp r6, #0x1 - bhi _02006080 - ldr r0, [sp, #0x0] - blx FS_SetDefaultDMA -_02006080: - cmp r4, #0x0 - bne _0200608C - bl ErrorHandling - mov r0, #0x0 - pop {r3-r7, pc} -_0200608C: - mov r0, #0x1 - pop {r3-r7, pc} - - thumb_func_start FUN_02006090 -FUN_02006090: ; 0x02006090 - push {r3-r7, lr} - sub sp, #0x10 - add r1, sp, #0xc - add r2, sp, #0x8 - add r4, r0, #0x0 - bl FUN_02006130 - cmp r0, #0x0 - bne _020060A8 - add sp, #0x10 - mov r0, #0x0 - pop {r3-r7, pc} -_020060A8: - add r0, r4, #0x0 - bl FUN_02005F90 - bl FUN_0200610C - add r5, r0, #0x0 - mov r4, #0x0 - add r6, sp, #0x4 - add r7, sp, #0x0 -_020060BA: - ldr r0, [r5, #0x4] - cmp r0, #0x1 - bne _020060FC - ldr r0, [r5, #0x0] - add r1, r6, #0x0 - add r2, r7, #0x0 - bl FUN_02006130 - cmp r0, #0x1 - bne _020060FC - ldr r1, [sp, #0x4] - ldr r2, [sp, #0xc] - cmp r2, r1 - blo _020060DC - ldr r0, [sp, #0x0] - cmp r2, r0 - blo _020060F2 -_020060DC: - ldr r3, [sp, #0x8] - cmp r3, r1 - bls _020060E8 - ldr r0, [sp, #0x0] - cmp r3, r0 - bls _020060F2 -_020060E8: - cmp r2, r1 - bhi _020060FC - ldr r0, [sp, #0x0] - cmp r3, r0 - blo _020060FC -_020060F2: - bl ErrorHandling - add sp, #0x10 - mov r0, #0x0 - pop {r3-r7, pc} -_020060FC: - add r4, r4, #0x1 - add r5, #0x8 - cmp r4, #0x8 - blt _020060BA - mov r0, #0x1 - add sp, #0x10 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200610C -FUN_0200610C: ; 0x0200610C - cmp r0, #0x0 - beq _02006118 - cmp r0, #0x1 - beq _0200611C - cmp r0, #0x2 - beq _02006120 -_02006118: - ldr r0, _02006124 ; =0x021C45B0 - bx lr -_0200611C: - ldr r0, _02006128 ; =0x021C45F0 - bx lr -_02006120: - ldr r0, _0200612C ; =0x021C4630 - bx lr - .balign 4 -_02006124: .word 0x021C45B0 -_02006128: .word 0x021C45F0 -_0200612C: .word 0x021C4630 - - thumb_func_start FUN_02006130 -FUN_02006130: ; 0x02006130 - push {r4-r5, lr} - sub sp, #0x2c - add r3, r0, #0x0 - add r5, r1, #0x0 - add r4, r2, #0x0 - add r0, sp, #0x0 - mov r1, #0x0 - add r2, r3, #0x0 - blx FS_LoadOverlayInfo - cmp r0, #0x0 - bne _02006152 - bl ErrorHandling - add sp, #0x2c - mov r0, #0x0 - pop {r4-r5, pc} -_02006152: - ldr r2, [sp, #0x4] - str r2, [r5, #0x0] - ldr r1, [sp, #0x8] - ldr r0, [sp, #0xc] - add r0, r1, r0 - add r0, r2, r0 - str r0, [r4, #0x0] - mov r0, #0x1 - add sp, #0x2c - pop {r4-r5, pc} - .balign 4 - - thumb_func_start FUN_02006168 -FUN_02006168: ; 0x02006168 - ldr r3, _0200616C ; =FS_LoadOverlay - bx r3 - .balign 4 -_0200616C: .word FS_LoadOverlay - - thumb_func_start FUN_02006170 -FUN_02006170: ; 0x02006170 - push {lr} - sub sp, #0x2c - add r3, r0, #0x0 - add r2, r1, #0x0 - add r0, sp, #0x0 - add r1, r3, #0x0 - blx FS_LoadOverlayInfo - cmp r0, #0x0 - bne _0200618A - add sp, #0x2c - mov r0, #0x0 - pop {pc} -_0200618A: - add r0, sp, #0x0 - blx FS_LoadOverlayImage - cmp r0, #0x0 - bne _0200619A - add sp, #0x2c - mov r0, #0x0 - pop {pc} -_0200619A: - add r0, sp, #0x0 - blx FS_StartOverlay - mov r0, #0x1 - add sp, #0x2c - pop {pc} - .balign 4 - - thumb_func_start FUN_020061A8 -FUN_020061A8: ; 0x020061A8 - push {lr} - sub sp, #0x74 - add r3, r0, #0x0 - add r2, r1, #0x0 - add r0, sp, #0x0 - add r1, r3, #0x0 - blx FS_LoadOverlayInfo - cmp r0, #0x0 - bne _020061C2 - add sp, #0x74 - mov r0, #0x0 - pop {pc} -_020061C2: - add r0, sp, #0x2c - blx FS_InitFile - add r0, sp, #0x0 - add r1, sp, #0x2c - blx FS_LoadOverlayImageAsync - add r0, sp, #0x2c - blx FS_WaitAsync - add r0, sp, #0x2c - blx FS_CloseFile - add r0, sp, #0x0 - blx FS_StartOverlay - mov r0, #0x1 - add sp, #0x74 - pop {pc} - - thumb_func_start FUN_020061E8 -FUN_020061E8: ; 0x020061E8 - push {r3-r7, lr} - add r5, r1, #0x0 - add r6, r0, #0x0 - add r7, r2, #0x0 - cmp r5, #0x0 - beq _0200620C - add r0, r3, #0x0 - bl FUN_02016998 - add r4, r0, #0x0 - bne _02006202 - mov r0, #0x0 - pop {r3-r7, pc} -_02006202: - mov r1, #0x0 - add r2, r5, #0x0 - blx Call_FillMemWithValue - b _0200620E -_0200620C: - mov r4, #0x0 -_0200620E: - add r0, r6, #0x0 - add r1, r4, #0x0 - add r2, r7, #0x0 - bl FUN_0200CA44 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200621C -FUN_0200621C: ; 0x0200621C - push {r4, lr} - add r4, r0, #0x0 - bl FUN_0201B6C8 - cmp r0, #0x0 - beq _0200622C - bl FUN_02016A18 -_0200622C: - add r0, r4, #0x0 - bl FUN_0200CAB4 - pop {r4, pc} - - thumb_func_start FUN_02006234 -FUN_02006234: ; 0x02006234 - push {r3-r5, lr} - add r5, r0, #0x0 - add r4, r1, #0x0 - add r0, r2, #0x0 - mov r1, #0x28 - bl FUN_02016998 - add r3, r0, #0x0 - add r2, r3, #0x0 - ldmia r5!, {r0-r1} - stmia r2!, {r0-r1} - ldmia r5!, {r0-r1} - stmia r2!, {r0-r1} - mov r0, #0x0 - str r0, [r3, #0x10] - str r0, [r3, #0x14] - str r4, [r3, #0x18] - str r0, [r3, #0x1c] - str r0, [r3, #0x20] - str r0, [r3, #0x24] - add r0, r3, #0x0 - pop {r3-r5, pc} - - thumb_func_start FUN_02006260 -FUN_02006260: ; 0x02006260 - ldr r3, _02006264 ; =FUN_02016A18 - bx r3 - .balign 4 -_02006264: .word FUN_02016A18 - - thumb_func_start FUN_02006268 -FUN_02006268: ; 0x02006268 - push {r4, lr} - add r4, r0, #0x0 - add r0, r2, #0x0 - bl FUN_02016998 - str r0, [r4, #0x1c] - pop {r4, pc} - .balign 4 - - thumb_func_start FUN_02006278 -FUN_02006278: ; 0x02006278 - ldr r0, [r0, #0x1c] - bx lr - - thumb_func_start FUN_0200627C -FUN_0200627C: ; 0x0200627C - push {r4, lr} - add r4, r0, #0x0 - ldr r0, [r4, #0x1c] - bl FUN_02016A18 - mov r0, #0x0 - str r0, [r4, #0x1c] - pop {r4, pc} - - thumb_func_start FUN_0200628C -FUN_0200628C: ; 0x0200628C - ldr r0, [r0, #0x18] - bx lr - - thumb_func_start FUN_02006290 -FUN_02006290: ; 0x02006290 - push {r4, lr} - add r4, r0, #0x0 - ldr r1, [r4, #0x10] - cmp r1, #0x3 - bhi _0200630E - add r1, r1, r1 - add r1, pc - ldrh r1, [r1, #0x6] - lsl r1, r1, #0x10 - asr r1, r1, #0x10 - add pc, r1 -_020062A6: ; jump table (using 16-bit offset) - .short _020062AE - _020062A6 - 2; case 0 - .short _020062C2 - _020062A6 - 2; case 1 - .short _020062DA - _020062A6 - 2; case 2 - .short _020062F0 - _020062A6 - 2; case 3 -_020062AE: - mov r1, #0x0 - ldr r0, [r4, #0xc] - mvn r1, r1 - cmp r0, r1 - beq _020062BE - mov r1, #0x2 - bl FUN_02005FDC -_020062BE: - mov r0, #0x1 - str r0, [r4, #0x10] -_020062C2: - add r1, r4, #0x0 - ldr r2, [r4, #0x0] - add r0, r4, #0x0 - add r1, #0x14 - blx r2 - cmp r0, #0x1 - bne _0200630E - mov r0, #0x2 - str r0, [r4, #0x10] - mov r0, #0x0 - str r0, [r4, #0x14] - b _0200630E -_020062DA: - add r1, r4, #0x0 - ldr r2, [r4, #0x4] - add r1, #0x14 - blx r2 - cmp r0, #0x1 - bne _0200630E - mov r0, #0x3 - str r0, [r4, #0x10] - mov r0, #0x0 - str r0, [r4, #0x14] - b _0200630E -_020062F0: - add r1, r4, #0x0 - ldr r2, [r4, #0x8] - add r1, #0x14 - blx r2 - cmp r0, #0x1 - bne _0200630E - mov r1, #0x0 - ldr r0, [r4, #0xc] - mvn r1, r1 - cmp r0, r1 - beq _0200630A - bl FUN_02005F60 -_0200630A: - mov r0, #0x1 - pop {r4, pc} -_0200630E: - mov r0, #0x0 - pop {r4, pc} - .balign 4 diff --git a/arm9/asm/unk_020061E8.s b/arm9/asm/unk_020061E8.s new file mode 100644 index 00000000..a3c6d702 --- /dev/null +++ b/arm9/asm/unk_020061E8.s @@ -0,0 +1,181 @@ + .include "asm/macros.inc" + .include "global.inc" + .section .text + + thumb_func_start FUN_020061E8 +FUN_020061E8: ; 0x020061E8 + push {r3-r7, lr} + add r5, r1, #0x0 + add r6, r0, #0x0 + add r7, r2, #0x0 + cmp r5, #0x0 + beq _0200620C + add r0, r3, #0x0 + bl FUN_02016998 + add r4, r0, #0x0 + bne _02006202 + mov r0, #0x0 + pop {r3-r7, pc} +_02006202: + mov r1, #0x0 + add r2, r5, #0x0 + bl Call_FillMemWithValue + b _0200620E +_0200620C: + mov r4, #0x0 +_0200620E: + add r0, r6, #0x0 + add r1, r4, #0x0 + add r2, r7, #0x0 + bl FUN_0200CA44 + pop {r3-r7, pc} + .balign 4 + + thumb_func_start FUN_0200621C +FUN_0200621C: ; 0x0200621C + push {r4, lr} + add r4, r0, #0x0 + bl FUN_0201B6C8 + cmp r0, #0x0 + beq _0200622C + bl FUN_02016A18 +_0200622C: + add r0, r4, #0x0 + bl FUN_0200CAB4 + pop {r4, pc} + + thumb_func_start FUN_02006234 +FUN_02006234: ; 0x02006234 + push {r3-r5, lr} + add r5, r0, #0x0 + add r4, r1, #0x0 + add r0, r2, #0x0 + mov r1, #0x28 + bl FUN_02016998 + add r3, r0, #0x0 + add r2, r3, #0x0 + ldmia r5!, {r0-r1} + stmia r2!, {r0-r1} + ldmia r5!, {r0-r1} + stmia r2!, {r0-r1} + mov r0, #0x0 + str r0, [r3, #0x10] + str r0, [r3, #0x14] + str r4, [r3, #0x18] + str r0, [r3, #0x1c] + str r0, [r3, #0x20] + str r0, [r3, #0x24] + add r0, r3, #0x0 + pop {r3-r5, pc} + + thumb_func_start FUN_02006260 +FUN_02006260: ; 0x02006260 + ldr r3, _02006264 ; =FUN_02016A18 + bx r3 + .balign 4 +_02006264: .word FUN_02016A18 + + thumb_func_start FUN_02006268 +FUN_02006268: ; 0x02006268 + push {r4, lr} + add r4, r0, #0x0 + add r0, r2, #0x0 + bl FUN_02016998 + str r0, [r4, #0x1c] + pop {r4, pc} + .balign 4 + + thumb_func_start FUN_02006278 +FUN_02006278: ; 0x02006278 + ldr r0, [r0, #0x1c] + bx lr + + thumb_func_start FUN_0200627C +FUN_0200627C: ; 0x0200627C + push {r4, lr} + add r4, r0, #0x0 + ldr r0, [r4, #0x1c] + bl FUN_02016A18 + mov r0, #0x0 + str r0, [r4, #0x1c] + pop {r4, pc} + + thumb_func_start FUN_0200628C +FUN_0200628C: ; 0x0200628C + ldr r0, [r0, #0x18] + bx lr + + thumb_func_start FUN_02006290 +FUN_02006290: ; 0x02006290 + push {r4, lr} + add r4, r0, #0x0 + ldr r1, [r4, #0x10] + cmp r1, #0x3 + bhi _0200630E + add r1, r1, r1 + add r1, pc + ldrh r1, [r1, #0x6] + lsl r1, r1, #0x10 + asr r1, r1, #0x10 + add pc, r1 +_020062A6: ; jump table (using 16-bit offset) + .short _020062AE - _020062A6 - 2; case 0 + .short _020062C2 - _020062A6 - 2; case 1 + .short _020062DA - _020062A6 - 2; case 2 + .short _020062F0 - _020062A6 - 2; case 3 +_020062AE: + mov r1, #0x0 + ldr r0, [r4, #0xc] + mvn r1, r1 + cmp r0, r1 + beq _020062BE + mov r1, #0x2 + bl HandleLoadOverlay +_020062BE: + mov r0, #0x1 + str r0, [r4, #0x10] +_020062C2: + add r1, r4, #0x0 + ldr r2, [r4, #0x0] + add r0, r4, #0x0 + add r1, #0x14 + blx r2 + cmp r0, #0x1 + bne _0200630E + mov r0, #0x2 + str r0, [r4, #0x10] + mov r0, #0x0 + str r0, [r4, #0x14] + b _0200630E +_020062DA: + add r1, r4, #0x0 + ldr r2, [r4, #0x4] + add r1, #0x14 + blx r2 + cmp r0, #0x1 + bne _0200630E + mov r0, #0x3 + str r0, [r4, #0x10] + mov r0, #0x0 + str r0, [r4, #0x14] + b _0200630E +_020062F0: + add r1, r4, #0x0 + ldr r2, [r4, #0x8] + add r1, #0x14 + blx r2 + cmp r0, #0x1 + bne _0200630E + mov r1, #0x0 + ldr r0, [r4, #0xc] + mvn r1, r1 + cmp r0, r1 + beq _0200630A + bl UnloadOverlayByID +_0200630A: + mov r0, #0x1 + pop {r4, pc} +_0200630E: + mov r0, #0x0 + pop {r4, pc} + .balign 4 diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s index fbfb90df..d45448fb 100644 --- a/arm9/asm/unk_02006864.s +++ b/arm9/asm/unk_02006864.s @@ -35,7 +35,7 @@ FUN_0200687C: ; 0x0200687C add r7, r0, #0x0
beq _020068C2
add r1, sp, #0x4
- blx FUN_020B0030
+ bl FUN_020B0030
cmp r0, #0x0
beq _020068BC
cmp r4, #0x0
@@ -75,7 +75,7 @@ FUN_020068C8: ; 0x020068C8 add r7, r0, #0x0
beq _0200692C
add r1, sp, #0x4
- blx FUN_020B0180
+ bl FUN_020B0180
cmp r0, #0x0
beq _02006926
cmp r4, #0x0
@@ -144,7 +144,7 @@ FUN_02006948: ; 0x02006948 cmp r0, #0x0
beq _02006A2A
add r1, sp, #0x8
- blx FUN_020B0138
+ bl FUN_020B0138
cmp r0, #0x0
beq _02006A24
ldr r0, [sp, #0x8]
@@ -160,7 +160,7 @@ _02006982: ldr r0, [sp, #0x8]
add r1, r5, #0x0
ldr r0, [r0, #0xc]
- blx DC_FlushRange
+ bl DC_FlushRange
cmp r4, #0x7
bhi _02006A14
add r0, r4, r4
@@ -179,7 +179,7 @@ _0200699C: ; jump table (using 16-bit offset) .short _020069C6 - _0200699C - 2; case 6
.short _020069FA - _0200699C - 2; case 7
_020069AC:
- blx GX_BeginLoadBGExtPltt
+ bl GX_BeginLoadBGExtPltt
ldr r0, [sp, #0x8]
ldr r3, _02006A30 ; =0x020ECBB0
lsl r4, r4, #0x2
@@ -188,10 +188,10 @@ _020069AC: add r1, r6, #0x0
add r2, r5, #0x0
blx r3
- blx GX_EndLoadBGExtPltt
+ bl GX_EndLoadBGExtPltt
b _02006A24
_020069C6:
- blx GXS_BeginLoadBGExtPltt
+ bl GXS_BeginLoadBGExtPltt
ldr r0, [sp, #0x8]
ldr r3, _02006A30 ; =0x020ECBB0
lsl r4, r4, #0x2
@@ -200,10 +200,10 @@ _020069C6: add r1, r6, #0x0
add r2, r5, #0x0
blx r3
- blx GXS_EndLoadBGExtPltt
+ bl GXS_EndLoadBGExtPltt
b _02006A24
_020069E0:
- blx GX_BeginLoadOBJExtPltt
+ bl GX_BeginLoadOBJExtPltt
ldr r0, [sp, #0x8]
ldr r3, _02006A30 ; =0x020ECBB0
lsl r4, r4, #0x2
@@ -212,10 +212,10 @@ _020069E0: add r1, r6, #0x0
add r2, r5, #0x0
blx r3
- blx GX_EndLoadOBJExtPltt
+ bl GX_EndLoadOBJExtPltt
b _02006A24
_020069FA:
- blx GXS_BeginLoadOBJExtPltt
+ bl GXS_BeginLoadOBJExtPltt
ldr r0, [sp, #0x8]
ldr r3, _02006A30 ; =0x020ECBB0
lsl r4, r4, #0x2
@@ -224,7 +224,7 @@ _020069FA: add r1, r6, #0x0
add r2, r5, #0x0
blx r3
- blx GXS_EndLoadOBJExtPltt
+ bl GXS_EndLoadOBJExtPltt
b _02006A24
_02006A14:
ldr r0, [sp, #0x8]
@@ -259,7 +259,7 @@ FUN_02006A34: ; 0x02006A34 add r7, r0, #0x0
beq _02006A80
add r1, sp, #0x4
- blx FUN_020B0088
+ bl FUN_020B0088
cmp r0, #0x0
beq _02006A7A
cmp r4, #0x0
@@ -270,7 +270,7 @@ _02006A60: ldr r0, [sp, #0x4]
add r1, r4, #0x0
ldr r0, [r0, #0x14]
- blx DC_FlushRange
+ bl DC_FlushRange
ldr r0, [sp, #0x4]
ldr r3, _02006A88 ; =0x020ECBA0
lsl r5, r5, #0x2
@@ -303,11 +303,11 @@ FUN_02006A8C: ; 0x02006A8C add r6, r0, #0x0
beq _02006AE0
add r1, sp, #0x4
- blx FUN_020B00F0
+ bl FUN_020B00F0
add r7, r0, #0x0
add r0, r6, #0x0
add r1, sp, #0x8
- blx FUN_020B0138
+ bl FUN_020B0138
cmp r0, #0x0
beq _02006ADA
cmp r7, #0x0
@@ -318,14 +318,14 @@ FUN_02006A8C: ; 0x02006A8C ldr r0, [sp, #0x8]
ldr r1, [sp, #0x4]
add r3, r5, #0x0
- blx FUN_020B10E8
+ bl FUN_020B10E8
b _02006ADA
_02006ACE:
ldr r0, [sp, #0x8]
ldr r3, [sp, #0x24]
add r1, r4, #0x0
add r2, r5, #0x0
- blx FUN_020B1240
+ bl FUN_020B1240
_02006ADA:
add r0, r6, #0x0
bl FUN_02016A18
@@ -346,7 +346,7 @@ FUN_02006AE4: ; 0x02006AE4 ldr r4, _02006B30 ; =0x00000000
beq _02006B28
add r1, sp, #0x4
- blx FUN_020B0088
+ bl FUN_020B0088
cmp r0, #0x0
beq _02006B22
ldr r1, [sp, #0x18]
@@ -388,7 +388,7 @@ FUN_02006B38: ; 0x02006B38 add r4, r0, #0x0
beq _02006B9E
add r1, sp, #0x4
- blx FUN_020B0088
+ bl FUN_020B0088
cmp r0, #0x0
beq _02006B98
ldr r1, [sp, #0x18]
@@ -450,7 +450,7 @@ FUN_02006BB0: ; 0x02006BB0 add r5, r0, #0x0
beq _02006BD6
add r1, r4, #0x0
- blx FUN_020B0030
+ bl FUN_020B0030
cmp r0, #0x0
bne _02006BD6
add r0, r5, #0x0
@@ -473,7 +473,7 @@ FUN_02006BDC: ; 0x02006BDC add r5, r0, #0x0
beq _02006C02
add r1, r4, #0x0
- blx FUN_020B0180
+ bl FUN_020B0180
cmp r0, #0x0
bne _02006C02
add r0, r5, #0x0
@@ -495,7 +495,7 @@ FUN_02006C08: ; 0x02006C08 add r4, r0, #0x0
beq _02006C2C
add r1, r5, #0x0
- blx FUN_020B0138
+ bl FUN_020B0138
cmp r0, #0x0
bne _02006C2C
add r0, r4, #0x0
@@ -517,7 +517,7 @@ FUN_02006C30: ; 0x02006C30 add r5, r0, #0x0
beq _02006C56
add r1, r4, #0x0
- blx FUN_020AFEB8
+ bl FUN_020AFEB8
cmp r0, #0x0
bne _02006C56
add r0, r5, #0x0
@@ -540,7 +540,7 @@ FUN_02006C5C: ; 0x02006C5C add r5, r0, #0x0
beq _02006C82
add r1, r4, #0x0
- blx thunk_FUN_020afda0_2
+ bl thunk_FUN_020afda0_2
cmp r0, #0x0
bne _02006C82
add r0, r5, #0x0
@@ -617,7 +617,7 @@ _02006CFC: beq _02006D10
add r0, r4, #0x0
add r1, r5, #0x0
- blx MI_UncompressLZ8
+ bl MI_UncompressLZ8
add r0, r4, #0x0
bl FUN_02016A18
_02006D10:
@@ -683,7 +683,7 @@ _02006D7C: beq _02006D90
add r0, r4, #0x0
add r1, r5, #0x0
- blx MI_UncompressLZ8
+ bl MI_UncompressLZ8
add r0, r4, #0x0
bl FUN_02016A18
_02006D90:
@@ -736,7 +736,7 @@ FUN_02006D98: ; 0x02006D98 ldr r1, [r4, r1]
mov r0, #0x0
mov r2, #0x4
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r0, r5, #0x0
mov r1, #0xc0
bl FUN_02016998
@@ -746,7 +746,7 @@ FUN_02006D98: ; 0x02006D98 ldr r1, [r4, r1]
mov r0, #0x0
mov r2, #0x4
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
mov r6, #0x0
add r5, r4, #0x0
add r7, r6, #0x0
@@ -754,12 +754,12 @@ _02006E12: add r0, r7, #0x0
add r1, r5, #0x0
mov r2, #0x98
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r6, r6, #0x1
add r5, #0x98
cmp r6, #0x4
blt _02006E12
- blx FUN_020B02C8
+ bl FUN_020B02C8
ldr r2, _02006EC8 ; =0x000002E3
mov r0, #0x0
strb r0, [r4, r2]
@@ -770,7 +770,7 @@ _02006E12: bl LoadFromNarc_2
add r1, sp, #0xc
str r0, [sp, #0x4]
- blx FUN_020B0088
+ bl FUN_020B0088
ldr r0, [sp, #0xc]
mov r1, #0xaf
ldr r0, [r0, #0x4]
@@ -795,7 +795,7 @@ _02006E12: ldrb r1, [r1, #0x0]
ldr r0, [r4, r0]
lsl r2, r2, #0xe
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x0
mov r7, #0xab
ldr r6, _02006ECC ; =0x00005050
@@ -850,7 +850,7 @@ FUN_02006ED4: ; 0x02006ED4 bl FUN_020082A8
add r0, r5, #0x0
bl FUN_020086F4
- blx FUN_020BB394
+ bl FUN_020BB394
mov r6, #0x9f
mov r0, #0x0
ldr r4, _02007250 ; =0x04000444
@@ -910,7 +910,7 @@ _02006F48: add r1, #0x24
blx r2
_02006F56:
- blx FUN_020BB394
+ bl FUN_020BB394
ldr r0, _02007258 ; =0x000002E3
ldrb r0, [r5, r0]
cmp r0, #0x1
@@ -969,7 +969,7 @@ _02006F7E: ldrsh r0, [r0, r1]
mov r1, #0x2
ldrsh r1, [r2, r1]
- blx G3_RotX
+ bl G3_RotX
ldrh r0, [r4, #0x3a]
asr r0, r0, #0x4
lsl r1, r0, #0x2
@@ -978,7 +978,7 @@ _02006F7E: ldrsh r0, [r0, r1]
mov r1, #0x2
ldrsh r1, [r2, r1]
- blx G3_RotY
+ bl G3_RotY
ldrh r0, [r4, #0x3c]
asr r0, r0, #0x4
lsl r1, r0, #0x2
@@ -987,7 +987,7 @@ _02006F7E: ldrsh r0, [r0, r1]
mov r1, #0x2
ldrsh r1, [r2, r1]
- blx G3_RotZ
+ bl G3_RotZ
ldr r0, [r4, #0x28]
lsl r0, r0, #0xc
neg r1, r0
@@ -1120,7 +1120,7 @@ _02006F7E: add r2, r3, r2
asr r1, r1, #0x10
mov r3, r12
- blx FUN_020B0250
+ bl FUN_020B0250
b _02007174
_02007104:
mov r0, #0x34
@@ -1177,7 +1177,7 @@ _02007104: lsl r1, r1, #0x10
asr r1, r1, #0x10
add r2, r6, r2
- blx FUN_020B0250
+ bl FUN_020B0250
_02007174:
add r0, r4, #0x0
add r0, #0x6c
@@ -1340,7 +1340,7 @@ _0200727C: lsl r1, r1, #0x10
ldr r2, _020072E0 ; =0xFFFFFC18
asr r1, r1, #0x10
- blx FUN_020B0250
+ bl FUN_020B0250
_020072BC:
ldr r0, [sp, #0x14]
add r4, #0x98
@@ -1529,7 +1529,7 @@ _02007408: mov r0, #0x0
add r1, r5, #0x0
mov r2, #0x98
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
ldr r1, [r4, r6]
mov r0, #0x1
bic r1, r0
@@ -1658,7 +1658,7 @@ _02007408: add r1, r4, r6
add r1, #0x84
mov r2, #0x14
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
_02007518:
add r0, r4, r6
add sp, #0xc
@@ -3499,7 +3499,7 @@ FUN_020081C4: ; 0x020081C4 strb r1, [r4, r0]
sub r0, #0x81
add r0, r4, r0
- blx FUN_020B1A24
+ bl FUN_020B1A24
mov r3, #0xae
lsl r3, r3, #0x2
mov r1, #0x20
@@ -3525,7 +3525,7 @@ FUN_020081C4: ; 0x020081C4 ldr r1, [r4, r1]
mov r2, #0x0
add r3, r4, r3
- blx FUN_020B1528
+ bl FUN_020B1528
_02008212:
ldr r0, _02008258 ; =0x000002E2
ldrb r1, [r4, r0]
@@ -3535,7 +3535,7 @@ _02008212: strb r1, [r4, r0]
sub r0, #0x5e
add r0, r4, r0
- blx FUN_020B19DC
+ bl FUN_020B19DC
mov r3, #0xaa
lsl r3, r3, #0x2
add r0, r3, #0x0
@@ -3556,7 +3556,7 @@ _02008212: add r0, r4, r0
mov r2, #0x0
add r3, r4, r3
- blx FUN_020B1240
+ bl FUN_020B1240
_02008252:
pop {r4, pc}
.balign 4
@@ -3652,7 +3652,7 @@ _020082CC: bl LoadFromNarc_2
add r1, sp, #0x58
str r0, [sp, #0x4c]
- blx FUN_020B0088
+ bl FUN_020B0088
ldr r0, [sp, #0x58]
mov r1, #0xaf
ldr r0, [r0, #0x4]
@@ -3767,7 +3767,7 @@ _020083C4: ldr r1, [sp, #0xc]
ldr r0, [sp, #0x14]
lsl r1, r1, #0x1
- blx _u32_div_f
+ bl _u32_div_f
cmp r1, #0x0
beq _020083F4
mov r0, #0xab
@@ -3786,7 +3786,7 @@ _020083C4: _020083F4:
ldr r1, [sp, #0xc]
add r0, r4, #0x0
- blx _u32_div_f
+ bl _u32_div_f
cmp r1, #0x0
beq _02008416
mov r0, #0xab
@@ -3890,7 +3890,7 @@ _020084B4: ldr r1, [sp, #0x8]
ldr r0, [sp, #0x14]
lsl r1, r1, #0x1
- blx _u32_div_f
+ bl _u32_div_f
cmp r1, #0x0
beq _020084E4
mov r0, #0xab
@@ -3909,7 +3909,7 @@ _020084B4: _020084E4:
ldr r1, [sp, #0x8]
add r0, r4, #0x0
- blx _u32_div_f
+ bl _u32_div_f
cmp r1, #0x0
beq _02008504
mov r0, #0xab
@@ -4086,7 +4086,7 @@ _0200862C: ldr r1, [sp, #0x4]
ldr r0, [sp, #0x0]
lsl r1, r1, #0x1
- blx _u32_div_f
+ bl _u32_div_f
cmp r1, #0x0
beq _02008654
mov r0, #0xab
@@ -4101,7 +4101,7 @@ _0200862C: _02008654:
ldr r1, [sp, #0x4]
add r0, r4, #0x0
- blx _u32_div_f
+ bl _u32_div_f
cmp r1, #0x0
beq _02008672
mov r0, #0xab
@@ -4215,7 +4215,7 @@ _02008706: bl LoadFromNarc_2
add r1, sp, #0x18
str r0, [sp, #0x10]
- blx FUN_020B0138
+ bl FUN_020B0138
ldr r0, [sp, #0x18]
mov r7, #0x0
ldr r1, [r0, #0x0]
@@ -4261,7 +4261,7 @@ _0200874A: bl LoadFromNarc_2
add r1, sp, #0x18
str r0, [sp, #0x4]
- blx FUN_020B0138
+ bl FUN_020B0138
ldr r0, [sp, #0x18]
mov r7, #0xad
ldr r0, [r0, #0xc]
@@ -5035,10 +5035,10 @@ FUN_02008D44: ; 0x02008D44 beq _02008D98
b _02008DC4
_02008D5A:
- blx GX_GetBankForOBJ
+ bl GX_GetBankForOBJ
cmp r0, #0x40
beq _02008D6A
- blx GX_GetBankForOBJ
+ bl GX_GetBankForOBJ
cmp r0, #0x20
bne _02008D7A
_02008D6A:
@@ -5065,10 +5065,10 @@ _02008D8A: bl FUN_0201D194
pop {r4, pc}
_02008D98:
- blx GX_GetBankForOBJ
+ bl GX_GetBankForOBJ
cmp r0, #0x30
beq _02008DA8
- blx GX_GetBankForOBJ
+ bl GX_GetBankForOBJ
cmp r0, #0x50
bne _02008DB6
_02008DA8:
@@ -5127,7 +5127,7 @@ FUN_02008DEC: ; 0x02008DEC mov r1, #0x0
add r2, r7, #0x0
str r0, [r4, #0x4]
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
str r5, [r4, #0x8]
mov r0, #0x0
str r0, [r4, #0xc]
@@ -6286,7 +6286,7 @@ _0200969C: mov r2, #0x18
add r1, r5, #0x4
mul r2, r3
- blx memcpy
+ bl memcpy
_020096B0:
pop {r4-r6, pc}
.balign 4
@@ -6558,7 +6558,7 @@ FUN_0200986C: ; 0x0200986C add r4, r0, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
- blx FUN_020B0088
+ bl FUN_020B0088
str r5, [r4, #0x4]
add r0, r4, #0x0
pop {r4-r6, pc}
@@ -6576,7 +6576,7 @@ FUN_0200988C: ; 0x0200988C add r4, r0, #0x0
add r0, r7, #0x0
add r1, r4, #0x0
- blx FUN_020B0138
+ bl FUN_020B0138
str r5, [r4, #0x4]
str r6, [r4, #0x8]
add r0, r4, #0x0
@@ -6593,7 +6593,7 @@ FUN_020098B0: ; 0x020098B0 add r4, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
- blx FUN_020AFEB8
+ bl FUN_020AFEB8
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -6608,7 +6608,7 @@ FUN_020098CC: ; 0x020098CC add r4, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
- blx thunk_FUN_020afda0_2
+ bl thunk_FUN_020afda0_2
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -6623,7 +6623,7 @@ FUN_020098E8: ; 0x020098E8 add r4, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
- blx FUN_020AFFD8
+ bl FUN_020AFFD8
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -6638,7 +6638,7 @@ FUN_02009904: ; 0x02009904 add r4, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
- blx thunk_FUN_020afda0
+ bl thunk_FUN_020afda0
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -6799,7 +6799,7 @@ _02009A34: beq _02009A48
add r0, r4, #0x0
add r1, r5, #0x0
- blx MI_UncompressLZ8
+ bl MI_UncompressLZ8
add r0, r4, #0x0
bl FUN_02016A18
_02009A48:
@@ -7367,7 +7367,7 @@ FUN_02009E88: ; 0x02009E88 mov r1, #0x0
bl FUN_02009E54
add r1, r4, #0x0
- blx FUN_020B19C4
+ bl FUN_020B19C4
mov r1, #0x0
mvn r1, r1
cmp r0, r1
@@ -7458,7 +7458,7 @@ _02009F1C: lsl r2, r4, #0x10
lsr r1, r1, #0x10
lsr r2, r2, #0x10
- blx FUN_020B0E34
+ bl FUN_020B0E34
cmp r0, #0x0
bne _02009F48
bl ErrorHandling
@@ -7481,7 +7481,7 @@ _02009F48: lsr r1, r1, #0x10
lsr r2, r2, #0x10
lsr r3, r3, #0x10
- blx FUN_020B0E34
+ bl FUN_020B0E34
cmp r0, #0x0
bne _02009F78
bl ErrorHandling
@@ -7498,11 +7498,11 @@ FUN_02009F80: ; 0x02009F80 ldr r0, [r0, #0x0]
cmp r0, #0x0
beq _02009F98
- blx FUN_020B0870
+ bl FUN_020B0870
ldr r0, _02009F9C ; =0x021C4670
ldr r0, [r0, #0x0]
add r0, #0x1c
- blx FUN_020B0870
+ bl FUN_020B0870
_02009F98:
pop {r3, pc}
nop
@@ -7627,7 +7627,7 @@ FUN_0200A074: ; 0x0200A074 add r2, r1, #0x0
ldr r0, [r0, #0x0]
add r1, r3, #0x0
- blx FUN_020B0C7C
+ bl FUN_020B0C7C
add r4, r0, #0x0
bne _0200A08C
bl ErrorHandling
@@ -7646,7 +7646,7 @@ FUN_0200A094: ; 0x0200A094 ldr r0, [r0, #0x0]
add r1, r3, #0x0
add r0, #0x1c
- blx FUN_020B0C7C
+ bl FUN_020B0C7C
add r4, r0, #0x0
bne _0200A0AE
bl ErrorHandling
@@ -7662,7 +7662,7 @@ FUN_0200A0B8: ; 0x0200A0B8 add r1, r0, #0x0
ldr r0, _0200A0D4 ; =0x021C4670
ldr r0, [r0, #0x0]
- blx FUN_020B0BB0
+ bl FUN_020B0BB0
add r4, r0, #0x0
ldr r0, _0200A0D8 ; =0x0000FFFE
cmp r4, r0
@@ -7682,7 +7682,7 @@ FUN_0200A0DC: ; 0x0200A0DC ldr r0, _0200A0FC ; =0x021C4670
ldr r0, [r0, #0x0]
add r0, #0x1c
- blx FUN_020B0BB0
+ bl FUN_020B0BB0
add r4, r0, #0x0
ldr r0, _0200A100 ; =0x0000FFFE
cmp r4, r0
@@ -7757,7 +7757,7 @@ _0200A166: ldrsh r2, [r5, r2]
ldr r0, _0200A198 ; =0x04000050
ldr r1, [r5, #0x0]
- blx G2x_SetBlendBrightness_
+ bl G2x_SetBlendBrightness_
b _0200A18E
_0200A17C:
mov r0, #0x2
@@ -7767,7 +7767,7 @@ _0200A17C: ldrsh r2, [r5, r2]
ldr r0, _0200A19C ; =0x04001050
ldr r1, [r5, #0x0]
- blx G2x_SetBlendBrightness_
+ bl G2x_SetBlendBrightness_
_0200A18E:
cmp r4, #0x1
bne _0200A196
@@ -7823,12 +7823,12 @@ _0200A1EA: mov r0, #0x12
ldrsh r0, [r5, r0]
add r1, r4, #0x0
- blx _s32_div_f
+ bl _s32_div_f
strh r0, [r5, #0x14]
mov r0, #0x12
ldrsh r0, [r5, r0]
add r1, r4, #0x0
- blx _s32_div_f
+ bl _s32_div_f
strh r1, [r5, #0x16]
mov r0, #0x0
strh r0, [r5, #0x18]
@@ -7850,7 +7850,7 @@ FUN_0200A208: ; 0x0200A208 beq _0200A23A
ldr r0, _0200A264 ; =0x04000050
add r1, r4, #0x0
- blx G2x_SetBlendBrightness_
+ bl G2x_SetBlendBrightness_
str r4, [sp, #0x0]
mov r0, #0x1
str r0, [sp, #0x4]
@@ -7867,7 +7867,7 @@ _0200A23A: ldr r0, _0200A26C ; =0x04001050
add r1, r4, #0x0
add r2, r6, #0x0
- blx G2x_SetBlendBrightness_
+ bl G2x_SetBlendBrightness_
str r4, [sp, #0x0]
mov r0, #0x2
str r0, [sp, #0x4]
@@ -7896,7 +7896,7 @@ FUN_0200A274: ; 0x0200A274 beq _0200A28A
ldr r0, _0200A2A4 ; =0x04000050
add r2, r5, #0x0
- blx G2x_SetBlendBrightness_
+ bl G2x_SetBlendBrightness_
_0200A28A:
mov r0, #0x2
tst r0, r4
@@ -7904,7 +7904,7 @@ _0200A28A: ldr r0, _0200A2A8 ; =0x04001050
add r1, r6, #0x0
add r2, r5, #0x0
- blx G2x_SetBlendBrightness_
+ bl G2x_SetBlendBrightness_
_0200A29A:
add r0, r4, #0x0
bl FUN_0200A2D8
@@ -7919,11 +7919,11 @@ FUN_0200A2AC: ; 0x0200A2AC ldr r0, _0200A2CC ; =0x021C4694
mov r1, #0x0
mov r2, #0x20
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _0200A2D0 ; =0x021C4674
mov r1, #0x0
mov r2, #0x20
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _0200A2D4 ; =0x021C4674
mov r1, #0x0
str r1, [r0, #0x3c]
@@ -7944,7 +7944,7 @@ FUN_0200A2D8: ; 0x0200A2D8 ldr r0, _0200A30C ; =0x021C4694
mov r1, #0x0
mov r2, #0x20
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _0200A310 ; =0x021C4674
mov r1, #0x0
str r1, [r0, #0x3c]
@@ -7955,7 +7955,7 @@ _0200A2F2: ldr r0, _0200A314 ; =0x021C4674
mov r1, #0x0
mov r2, #0x20
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _0200A310 ; =0x021C4674
mov r1, #0x0
str r1, [r0, #0x1c]
@@ -8245,7 +8245,7 @@ FUN_0200A4D4: ; 0x0200A4D4 ldr r2, [sp, #0x4]
add r0, r5, r0
add r1, r7, #0x0
- blx MIi_CpuCopy16
+ bl MIi_CpuCopy16
ldr r1, _0200A57C ; =0x00091BD3
add r2, r4, #0x1
mul r1, r2
@@ -8332,7 +8332,7 @@ FUN_0200A584: ; 0x0200A584 ldr r2, [sp, #0x4]
add r0, r5, r0
add r1, r7, #0x0
- blx MIi_CpuCopy16
+ bl MIi_CpuCopy16
ldr r1, _0200A640 ; =0x00091BD3
add r2, r4, #0x1
mul r1, r2
@@ -11083,13 +11083,13 @@ _0200BAD8: add r0, r1, r0
add r1, r6, r5
mov r2, #0x20
- blx MIi_CpuCopy32
+ bl MIi_CpuCopy32
b _0200BB00
_0200BAF6:
ldr r1, [sp, #0x0]
add r0, r6, r5
mov r2, #0x20
- blx MI_CpuFill8
+ bl MI_CpuFill8
_0200BB00:
add r4, r4, #0x2
ldrh r1, [r4, #0x8]
@@ -11189,7 +11189,7 @@ _0200BB8A: ldr r1, [r5, #0x0]
add r0, r7, #0x0
bl FUN_0201E00C
- blx FUN_020B0FC0
+ bl FUN_020B0FC0
ldr r0, [r5, #0x8]
cmp r0, #0x1
bne _0200BBD6
@@ -11577,20 +11577,20 @@ FUN_0200BE74: ; 0x0200BE74 cmp r3, #0x0
ble _0200BEA0
lsl r0, r3, #0xc
- blx _fflt
+ bl _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
+ bl _fadd
b _0200BEAE
_0200BEA0:
lsl r0, r3, #0xc
- blx _fflt
+ bl _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
+ bl _fsub
_0200BEAE:
- blx _ffix
+ bl _ffix
str r0, [sp, #0x8]
add r1, sp, #0x28
mov r0, #0x10
@@ -11598,20 +11598,20 @@ _0200BEAE: cmp r0, #0x0
ble _0200BED0
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
+ bl _fadd
b _0200BEDE
_0200BED0:
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
+ bl _fsub
_0200BEDE:
- blx _ffix
+ bl _ffix
str r0, [sp, #0xc]
add r1, sp, #0x28
mov r0, #0x14
@@ -11619,20 +11619,20 @@ _0200BEDE: cmp r0, #0x0
ble _0200BF00
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
+ bl _fadd
b _0200BF0E
_0200BF00:
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
+ bl _fsub
_0200BF0E:
- blx _ffix
+ bl _ffix
str r0, [sp, #0x10]
ldr r0, [sp, #0x4c]
cmp r0, #0x2
@@ -12069,60 +12069,60 @@ _0200C206: cmp r0, #0x0
ble _0200C260
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
+ bl _fadd
b _0200C26E
_0200C260:
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
+ bl _fsub
_0200C26E:
- blx _ffix
+ bl _ffix
str r0, [sp, #0x4c]
mov r0, #0x2
ldrsh r0, [r5, r0]
cmp r0, #0x0
ble _0200C28E
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
+ bl _fadd
b _0200C29C
_0200C28E:
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
+ bl _fsub
_0200C29C:
- blx _ffix
+ bl _ffix
str r0, [sp, #0x50]
mov r0, #0x4
ldrsh r0, [r5, r0]
cmp r0, #0x0
ble _0200C2BC
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx _fadd
+ bl _fadd
b _0200C2CA
_0200C2BC:
lsl r0, r0, #0xc
- blx _fflt
+ bl _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx _fsub
+ bl _fsub
_0200C2CA:
- blx _ffix
+ bl _ffix
str r0, [sp, #0x54]
ldr r0, [r5, #0x10]
cmp r0, #0x2
@@ -12965,13 +12965,13 @@ FUN_0200C84C: ; 0x0200C84C add r4, r0, #0x0
ldr r0, _0200C880 ; =0x45800000
add r1, r6, #0x0
- blx _fmul
- blx _ffix
+ bl _fmul
+ bl _ffix
str r0, [r4, #0x0]
ldr r0, _0200C880 ; =0x45800000
add r1, r7, #0x0
- blx _fmul
- blx _ffix
+ bl _fmul
+ bl _ffix
str r0, [r4, #0x4]
add r0, r5, #0x0
add r1, r4, #0x0
@@ -14203,27 +14203,27 @@ _0200D1E0: add r0, r5, r6
add r1, r4, r1
mov r2, #0x20
- blx memcpy
+ bl memcpy
add r0, r6, #0x0
ldr r1, [sp, #0x38]
add r0, #0x20
add r0, r5, r0
add r1, r4, r1
mov r2, #0x20
- blx memcpy
+ bl memcpy
add r0, r6, #0x0
ldr r1, [sp, #0x34]
add r0, #0x40
add r0, r5, r0
add r1, r4, r1
mov r2, #0x20
- blx memcpy
+ bl memcpy
ldr r1, [sp, #0x38]
add r6, #0x60
add r0, r5, r6
add r1, r4, r1
mov r2, #0x20
- blx memcpy
+ bl memcpy
add r0, r7, #0x1
lsl r0, r0, #0x18
lsr r7, r0, #0x18
@@ -14292,7 +14292,7 @@ FUN_0200D274: ; 0x0200D274 ldr r1, [r1, #0x14]
lsl r2, r2, #0x6
add r4, r0, #0x0
- blx memcpy
+ bl memcpy
mov r0, #0x9
mov r3, #0x0
lsl r0, r0, #0x6
@@ -14359,7 +14359,7 @@ FUN_0200D300: ; 0x0200D300 bl LoadFromNarc_2
add r1, sp, #0x18
str r0, [sp, #0x14]
- blx FUN_020B0138
+ bl FUN_020B0138
add r2, sp, #0x20
ldr r1, [sp, #0x18]
ldrb r2, [r2, #0x10]
@@ -15015,7 +15015,7 @@ FUN_0200D858: ; 0x0200D858 add r0, r4, r0
add r1, r5, r1
mov r2, #0x80
- blx memcpy
+ bl memcpy
ldr r0, [sp, #0x28]
mov r1, #0x80
bl FUN_02016998
@@ -15026,7 +15026,7 @@ FUN_0200D858: ; 0x0200D858 str r1, [sp, #0x2c]
add r1, r5, r1
add r6, r0, #0x0
- blx memcpy
+ bl memcpy
ldr r0, [sp, #0x24]
mov r2, #0x20
add r0, #0xb
@@ -15034,18 +15034,18 @@ FUN_0200D858: ; 0x0200D858 add r0, r6, #0x0
add r0, #0x20
add r1, r5, r7
- blx memcpy
+ bl memcpy
ldr r1, [sp, #0x2c]
add r0, r6, #0x0
add r0, #0x40
add r1, r5, r1
mov r2, #0x20
- blx memcpy
+ bl memcpy
add r0, r6, #0x0
add r0, #0x60
add r1, r5, r7
mov r2, #0x20
- blx memcpy
+ bl memcpy
mov r5, #0x0
add r7, r4, #0x4
_0200D8DA:
@@ -15053,7 +15053,7 @@ _0200D8DA: add r0, r7, r0
add r1, r6, #0x0
mov r2, #0x80
- blx memcpy
+ bl memcpy
add r0, r5, #0x1
lsl r0, r0, #0x18
lsr r5, r0, #0x18
@@ -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]
@@ -15849,17 +15849,17 @@ FUN_0200DEF4: ; 0x0200DEF4 bl FUN_02009C5C
mov r1, #0x1
str r0, [sp, #0x4]
- blx FUN_020B1A14
+ bl FUN_020B1A14
mov r1, #0x19
add r7, r0, #0x0
add r0, r4, #0x0
lsl r1, r1, #0x8
- blx DC_FlushRange
+ bl DC_FlushRange
mov r2, #0x19
add r0, r4, #0x0
add r1, r7, #0x0
lsl r2, r2, #0x8
- blx GX_LoadOBJ
+ bl GX_LoadOBJ
add r0, r4, #0x0
bl FUN_02016A18
ldr r2, _0200DFC8 ; =0x00000162
@@ -15876,15 +15876,15 @@ FUN_0200DEF4: ; 0x0200DEF4 ldr r1, [sp, #0x4]
bl FUN_02009E54
mov r1, #0x1
- blx FUN_020B19C4
+ bl FUN_020B19C4
add r5, r0, #0x0
add r0, r4, #0x0
mov r1, #0x20
- blx DC_FlushRange
+ bl DC_FlushRange
add r0, r4, #0x0
add r1, r5, #0x0
mov r2, #0x20
- blx GX_LoadOBJPltt
+ bl GX_LoadOBJPltt
add r0, r4, #0x0
bl FUN_02016A18
add sp, #0x28
@@ -16385,12 +16385,12 @@ FUN_0200E3BC: ; 0x0200E3BC bne _0200E3D2
mov r1, #0x0
mov r2, #0x2
- blx GX_LoadBGPltt
+ bl GX_LoadBGPltt
b _0200E3DA
_0200E3D2:
mov r1, #0x0
mov r2, #0x2
- blx GXS_LoadBGPltt
+ bl GXS_LoadBGPltt
_0200E3DA:
ldr r0, _0200E41C ; =0x021C4740
mov r1, #0x1
@@ -16430,11 +16430,11 @@ FUN_0200E420: ; 0x0200E420 add r0, sp, #0x8
mov r1, #0x0
mov r2, #0x2
- blx GX_LoadBGPltt
+ bl GX_LoadBGPltt
add r0, sp, #0x8
mov r1, #0x0
mov r2, #0x2
- blx GXS_LoadBGPltt
+ bl GXS_LoadBGPltt
pop {r3}
pop {r3}
add sp, #0x10
@@ -16446,11 +16446,11 @@ FUN_0200E440: ; 0x0200E440 cmp r0, #0x0
bne _0200E44E
ldr r0, _0200E458 ; =0x0400006C
- blx GXx_SetMasterBrightness_
+ bl GXx_SetMasterBrightness_
pop {r3, pc}
_0200E44E:
ldr r0, _0200E45C ; =0x0400106C
- blx GXx_SetMasterBrightness_
+ bl GXx_SetMasterBrightness_
pop {r3, pc}
nop
_0200E458: .word 0x0400006C
@@ -16994,12 +16994,12 @@ _0200E812: add r0, #0x14
mov r1, #0x0
mov r2, #0x30
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
add r0, #0x44
mov r1, #0x0
mov r2, #0x30
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r2, r4, #0x0
add r2, #0x74
mov r1, #0x18
@@ -17013,7 +17013,7 @@ _0200E83A: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0xc0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
pop {r4, pc}
thumb_func_start FUN_0200E850
@@ -18111,7 +18111,7 @@ FUN_0200F0D0: ; 0x0200F0D0 lsl r2, r4, #0xc
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -18145,7 +18145,7 @@ _0200F116: ldr r1, [sp, #0x4]
asr r3, r4, #0x1f
add r2, r4, #0x0
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
lsl r2, r2, #0xa
add r0, r0, r2
@@ -18178,7 +18178,7 @@ FUN_0200F14C: ; 0x0200F14C add r0, r4, r0
asr r0, r0, #0x1
lsl r0, r0, #0xc
- blx FX_Div
+ bl FX_Div
pop {r4, pc}
thumb_func_start FUN_0200F164
@@ -18829,7 +18829,7 @@ _0200F60C: bl FUN_0200F5D8
add r1, r0, r6
add r2, r7, #0x0
- blx memcpy
+ bl memcpy
ldr r0, [r5, #0x4]
add r4, r4, #0x1
cmp r4, r0
@@ -18952,7 +18952,7 @@ FUN_0200F6FC: ; 0x0200F6FC lsl r2, r2, #0x2
add r5, r0, #0x0
add r7, r3, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
cmp r4, #0x1
bne _0200F726
mov r0, #0x6
@@ -19028,7 +19028,7 @@ _0200F78E: add r0, #0xc0
add r1, r5, #0x0
add r2, r7, #0x0
- blx memcpy
+ bl memcpy
add r4, r4, #0x1
add r5, r5, r6
cmp r4, #0x2
@@ -20289,14 +20289,14 @@ _020100FA: asr r1, r0, #0x1f
add r2, r0, #0x0
add r3, r1, #0x0
- blx _ll_mul
+ bl _ll_mul
str r0, [sp, #0x8]
ldr r0, [sp, #0x4]
add r6, r1, #0x0
add r1, r7, #0x0
add r2, r0, #0x0
add r3, r7, #0x0
- blx _ll_mul
+ bl _ll_mul
add r2, r0, #0x0
add r3, r1, #0x0
mov r0, #0x2
@@ -20316,7 +20316,7 @@ _020100FA: lsr r2, r2, #0xc
orr r2, r1
sub r0, r0, r2
- blx FX_Sqrt
+ bl FX_Sqrt
asr r2, r0, #0xc
ldr r0, [sp, #0x0]
sub r0, r0, r2
@@ -20752,7 +20752,7 @@ FUN_0201047C: ; 0x0201047C str r3, [sp, #0x1c]
ldr r6, [sp, #0x38]
ldr r7, [sp, #0x3c]
- blx _s32_div_f
+ bl _s32_div_f
str r0, [sp, #0x20]
ldrb r1, [r4, #0x8]
ldr r3, [sp, #0x44]
@@ -20896,7 +20896,7 @@ FUN_020105A0: ; 0x020105A0 asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -20908,7 +20908,7 @@ FUN_020105A0: ; 0x020105A0 asr r7, r1, #0xc
lsl r0, r7, #0x1
mov r1, #0x15
- blx _s32_div_f
+ bl _s32_div_f
add r0, r0, #0x1
lsl r0, r0, #0x1
mov r1, #0xb4
@@ -20916,7 +20916,7 @@ FUN_020105A0: ; 0x020105A0 ldr r0, _02010684 ; =0x0000FFFF
add r1, #0xb4
mul r0, r2
- blx _s32_div_f
+ bl _s32_div_f
lsr r1, r0, #0x1f
add r1, r0, r1
asr r4, r1, #0x1
@@ -21261,7 +21261,7 @@ FUN_02010894: ; 0x02010894 lsl r2, r2, #0x8
add r0, r0, r2
mov r1, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [r6, #0x10]
sub r4, r0, #0x1
bmi _020108C6
@@ -21363,7 +21363,7 @@ FUN_02010948: ; 0x02010948 str r0, [r5, #0x14]
mov r1, #0x0
mov r2, #0x38
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [r5, #0x10]
add r1, r4, #0x0
str r0, [sp, #0x0]
@@ -21605,7 +21605,7 @@ FUN_02010B40: ; 0x02010B40 str r0, [sp, #0x0]
ldr r0, [r0, #0xc]
ldr r1, _02010C60 ; =0x00003FFF
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r1, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x4]
@@ -21758,7 +21758,7 @@ FUN_02010C64: ; 0x02010C64 add r0, r3, #0x0
mul r0, r1
add r1, r2, #0x0
- blx _s32_div_f
+ bl _s32_div_f
ldr r1, [r4, #0x4]
add r0, r0, r1
str r0, [r4, #0x0]
@@ -21776,7 +21776,7 @@ FUN_02010C7C: ; 0x02010C7C str r0, [r5, #0x14]
mov r1, #0x0
mov r2, #0x38
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [r5, #0x10]
add r1, r4, #0x0
str r0, [sp, #0x0]
@@ -22101,7 +22101,7 @@ FUN_02010F14: ; 0x02010F14 add r0, r3, #0x0
mul r0, r1
add r1, r2, #0x0
- blx _s32_div_f
+ bl _s32_div_f
ldr r1, [r4, #0x4]
add r0, r0, r1
str r0, [r4, #0x0]
@@ -22121,7 +22121,7 @@ FUN_02010F2C: ; 0x02010F2C str r0, [r5, #0x14]
mov r1, #0x0
lsl r2, r2, #0x2
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [r5, #0x10]
add r1, r4, #0x0
str r0, [sp, #0x0]
@@ -22213,23 +22213,23 @@ FUN_02010FD0: ; 0x02010FD0 add r0, r5, #0x0
mov r1, #0x1
mov r2, #0xc0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r5, #0x0
add r0, #0xc0
mov r1, #0x1
mov r2, #0xc0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
b _02011020
_0201100A:
add r0, r5, #0x0
mov r1, #0x0
mov r2, #0xc0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r5, #0x0
add r0, #0xc0
mov r1, #0x0
mov r2, #0xc0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
_02011020:
mov r1, #0xc3
lsl r1, r1, #0x2
@@ -22407,7 +22407,7 @@ FUN_0201115C: ; 0x0201115C add r1, r3, #0x0
sub r0, r4, r6
mul r0, r2
- blx _s32_div_f
+ bl _s32_div_f
add r0, r0, r6
cmp r6, r4
bhi _0201117C
@@ -22460,7 +22460,7 @@ FUN_020111AC: ; 0x020111AC mov r1, #0x0
lsl r2, r2, #0x2
str r0, [r5, #0x14]
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r1, r4, #0x0
add r1, #0x23
ldrb r1, [r1, #0x0]
@@ -22567,7 +22567,7 @@ FUN_0201127C: ; 0x0201127C add r7, r3, #0x0
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
add r2, r0, #0x0
mov r0, #0x2
mov r3, #0x0
@@ -22699,7 +22699,7 @@ FUN_0201137C: ; 0x0201137C add r7, r3, #0x0
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
add r2, r0, #0x0
mov r0, #0x2
mov r3, #0x0
@@ -23257,7 +23257,7 @@ _020117A4: str r1, [r0, #0x64]
ldr r0, [r0, #0x60]
mov r1, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [sp, #0x8]
add sp, #0xc
pop {r4-r7, pc}
@@ -23780,7 +23780,7 @@ _02011B60: ldr r1, [r6, #0xc]
add r1, r1, r2
ldr r2, [sp, #0x8]
- blx memcpy
+ bl memcpy
ldr r0, [sp, #0x0]
add r4, r4, #0x1
add r5, r5, r7
@@ -24051,7 +24051,7 @@ _02011D52: beq _02011D92
_02011D68:
add r0, r5, #0x0
- blx FUN_020B1A24
+ bl FUN_020B1A24
str r7, [sp, #0x0]
ldr r0, [sp, #0x30]
str r6, [sp, #0x4]
@@ -24113,7 +24113,7 @@ _02011DC6: bl FUN_02011B20
add r0, r7, #0x0
add r1, r4, #0x0
- blx DC_FlushRange
+ bl DC_FlushRange
ldr r0, [sp, #0x30]
cmp r0, #0x1
bne _02011E08
@@ -24121,7 +24121,7 @@ _02011DC6: add r0, r7, #0x0
add r1, r6, #0x0
add r2, r4, #0x0
- blx GX_LoadOBJ
+ bl GX_LoadOBJ
mov r0, #0x1
str r6, [r5, #0x4]
lsl r0, r0, #0x1a
@@ -24132,7 +24132,7 @@ _02011E08: add r0, r7, #0x0
add r1, r6, #0x0
add r2, r4, #0x0
- blx GXS_LoadOBJ
+ bl GXS_LoadOBJ
ldr r0, _02011E4C ; =0x04001000
str r6, [r5, #0x8]
ldr r1, [r0, #0x0]
@@ -24423,7 +24423,7 @@ _02012018: ldr r1, [sp, #0x0]
add r1, r1, r2
add r2, r6, #0x0
- blx memcpy
+ bl memcpy
ldr r1, [r5, #0x0]
ldr r0, [sp, #0x24]
add r7, r7, #0x1
@@ -24449,7 +24449,7 @@ FUN_02012044: ; 0x02012044 _02012054:
add r0, r4, #0x0
add r1, r5, #0x0
- blx FUN_020B0088
+ bl FUN_020B0088
add r6, r0, #0x0
cmp r5, #0x0
bne _02012066
@@ -24676,7 +24676,7 @@ FUN_020121E8: ; 0x020121E8 _02012204:
ldr r0, [sp, #0x20]
add r1, sp, #0x2c
- blx FUN_020B0088
+ bl FUN_020B0088
cmp r0, #0x0
bne _02012214
bl ErrorHandling
@@ -24842,7 +24842,7 @@ _0201233C: add r0, r0, r1
ldr r1, [sp, #0x18]
add r1, r1, r4
- blx memcpy
+ bl memcpy
ldr r0, [r5, #0x0]
add r6, r6, #0x1
add r0, #0x20
@@ -25016,7 +25016,7 @@ FUN_02012470: ; 0x02012470 bl LoadFromNarc_2
add r1, sp, #0x0
add r5, r0, #0x0
- blx FUN_020B0138
+ bl FUN_020B0138
cmp r0, #0x1
beq _0201249C
bl ErrorHandling
@@ -25025,7 +25025,7 @@ _0201249C: add r1, r4, #0x0
ldr r0, [r0, #0xc]
mov r2, #0x20
- blx MIi_CpuCopy16
+ bl MIi_CpuCopy16
add r0, r5, #0x0
bl FUN_02016A18
add r0, r4, #0x0
@@ -25156,7 +25156,7 @@ _02012598: .word 0x020ED3C8 thumb_func_start FUN_0201259C
FUN_0201259C: ; 0x0201259C
push {r3, lr}
- blx RTC_Init
+ bl RTC_Init
ldr r3, _020125CC ; =0x021C4808
mov r0, #0x0
add r2, r3, #0x0
@@ -25246,7 +25246,7 @@ FUN_02012634: ; 0x02012634 add r0, #0x2c
add r1, #0x3c
add r3, r4, #0x0
- blx RTC_GetDateTimeAsync
+ bl RTC_GetDateTimeAsync
str r0, [r4, #0xc]
cmp r0, #0x0
beq _02012656
@@ -25377,14 +25377,14 @@ FUN_02012710: ; 0x02012710 bne _02012742
add r0, r6, #0x0
mov r1, #0x64
- blx _s32_div_f
+ bl _s32_div_f
cmp r1, #0x0
bne _02012750
_02012742:
mov r1, #0x19
add r0, r6, #0x0
lsl r1, r1, #0x4
- blx _s32_div_f
+ bl _s32_div_f
cmp r1, #0x0
bne _02012752
_02012750:
@@ -25401,9 +25401,9 @@ _02012752: str r0, [sp, #0x4]
str r0, [sp, #0x8]
add r0, r2, #0x0
- blx RTC_ConvertDateToDay
+ bl RTC_ConvertDateToDay
add r0, r5, #0x0
- blx RTC_ConvertDateToDay
+ bl RTC_ConvertDateToDay
add r0, r4, #0x0
add sp, #0x10
pop {r4-r6, pc}
@@ -25477,7 +25477,7 @@ FUN_020127C0: ; 0x020127C0 ldr r1, [sp, #0x4]
str r0, [r2, #0x0]
ldr r0, [sp, #0x0]
- blx RTC_ConvertDateTimeToSecond
+ bl RTC_ConvertDateTimeToSecond
add r2, r1, #0x0
add r3, r0, #0x0
mov r1, #0x0
@@ -25755,9 +25755,9 @@ _020129C6: FUN_020129C8: ; 0x020129C8
push {r3, lr}
mov r0, #0x0
- blx MI_StopDma
+ bl MI_StopDma
mov r0, #0x0
- blx MI_WaitDma
+ bl MI_WaitDma
pop {r3, pc}
thumb_func_start FUN_020129D8
@@ -25772,14 +25772,14 @@ FUN_020129D8: ; 0x020129D8 add r1, r6, #0x0
add r2, r5, #0x0
add r3, r4, #0x0
- blx MI_HBlankDmaCopy32
+ bl MI_HBlankDmaCopy32
pop {r4-r6, pc}
_020129F2:
mov r0, #0x0
add r1, r6, #0x0
add r2, r5, #0x0
add r3, r4, #0x0
- blx MI_HBlankDmaCopy16
+ bl MI_HBlankDmaCopy16
pop {r4-r6, pc}
thumb_func_start FUN_02012A00
@@ -25791,7 +25791,7 @@ FUN_02012A00: ; 0x02012A00 ldr r2, _02012A2C ; =0x0000079C
mov r1, #0x0
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
mov r2, #0x3
lsl r2, r2, #0x8
add r0, r5, #0x0
@@ -25860,13 +25860,13 @@ _02012A4E: add r1, r5, #0x0
ldr r0, [r5, r0]
lsl r2, r2, #0x8
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
ldr r0, _02012AC0 ; =0x00000794
mov r2, #0x3
lsl r2, r2, #0x8
ldr r0, [r5, r0]
add r1, r5, r2
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
pop {r3-r7, pc}
.balign 4
_02012AB0: .word 0x00000604
@@ -25897,7 +25897,7 @@ _02012ACE: mov r2, #0x3
ldr r1, [r4, r1]
lsl r2, r2, #0x8
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
_02012AF4:
pop {r4, pc}
nop
@@ -25950,7 +25950,7 @@ FUN_02012B30: ; 0x02012B30 mov r2, #0x3
ldr r0, [r4, r0]
lsl r2, r2, #0x8
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
_02012B5E:
pop {r4, pc}
.balign 4
@@ -25996,7 +25996,7 @@ _02012BA0: ldrsh r0, [r0, r1]
ldr r3, [sp, #0x8]
asr r1, r0, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
lsl r2, r2, #0xa
add r0, r0, r2
@@ -26034,7 +26034,7 @@ FUN_02012BE4: ; 0x02012BE4 ldr r0, _02012C80 ; =0x00000798
mov r1, #0x64
ldrsh r0, [r6, r0]
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x18
lsr r3, r0, #0x18
ldr r0, _02012C84 ; =0x0000078C
@@ -26066,7 +26066,7 @@ _02012C12: stmia r5!, {r0}
add r0, r3, #0x1
mov r1, #0xc0
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r1, #0x18
lsr r3, r0, #0x18
ldr r0, _02012C8C ; =0x0000078D
@@ -26089,7 +26089,7 @@ _02012C4C: blt _02012C70
mov r0, #0x0
ldrsh r0, [r4, r0]
- blx _s32_div_f
+ bl _s32_div_f
strh r1, [r4, #0x0]
pop {r3-r7, pc}
_02012C70:
@@ -26128,7 +26128,7 @@ _02012CA2: mov r1, #0x3
lsl r1, r1, #0x8
add r5, r0, #0x0
- blx DC_FlushRange
+ bl DC_FlushRange
mov r1, #0x79
lsl r1, r1, #0x4
ldr r1, [r4, r1]
@@ -26187,7 +26187,7 @@ _02012D14: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0xdc
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r2, r4, #0x0
ldr r0, [sp, #0x8]
str r7, [r4, #0x18]
@@ -26215,7 +26215,7 @@ _02012D14: str r0, [r2, #0x0]
ldr r2, [sp, #0xc]
add r0, r6, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [sp, #0xc]
str r6, [r4, #0xc]
str r6, [r4, #0x10]
@@ -26263,7 +26263,7 @@ _02012DA8: ldr r0, [r0, r5]
mov r2, #0xc8
mov r3, #0x5
- blx FUN_0208B4A0
+ bl FUN_0208B4A0
str r0, [r4, #0x0]
ldr r1, _02012DD8 ; =0x020ED4E4
add r0, r4, #0x0
@@ -26291,7 +26291,7 @@ FUN_02012DE4: ; 0x02012DE4 beq _02012E02
add r0, r5, #0x0
add r0, #0x58
- blx FUN_020AE8CC
+ bl FUN_020AE8CC
b _02012E22
_02012E02:
mov r0, #0x2
@@ -26304,7 +26304,7 @@ _02012E0E: ldr r0, [r4, #0x58]
cmp r0, #0x0
beq _02012E1A
- blx FUN_020AF894
+ bl FUN_020AF894
str r7, [r4, #0x58]
_02012E1A:
add r6, r6, #0x1
@@ -26320,7 +26320,7 @@ _02012E22: beq _02012E38
add r0, r5, #0x0
add r0, #0x98
- blx FUN_020AEC7C
+ bl FUN_020AEC7C
b _02012E60
_02012E38:
mov r0, #0x8
@@ -26335,7 +26335,7 @@ _02012E44: ldr r0, [r0, #0x0]
cmp r0, #0x0
beq _02012E58
- blx FUN_020AFA80
+ bl FUN_020AFA80
add r0, r4, #0x0
add r0, #0x98
str r7, [r0, #0x0]
@@ -26852,7 +26852,7 @@ _020131B2: beq _020131C8
add r0, r5, #0x0
add r0, #0x58
- blx FUN_020AE918
+ bl FUN_020AE918
b _020131DE
_020131C8:
mov r0, #0x2
@@ -26873,7 +26873,7 @@ _020131DE: beq _020131EE
add r0, r5, #0x0
add r0, #0x98
- blx FUN_020AEC98
+ bl FUN_020AEC98
b _02013208
_020131EE:
mov r0, #0x8
@@ -26912,26 +26912,26 @@ FUN_02013228: ; 0x02013228 add r4, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, [r4, #0x4]
- blx FUN_0208B128
+ bl FUN_0208B128
ldr r0, _02013264 ; =0x021C4850
str r4, [r0, #0x0]
ldr r1, [r4, #0x18]
ldr r0, [r4, #0x0]
cmp r1, #0x0
bne _02013246
- blx FUN_0208AF94
+ bl FUN_0208AF94
b _0201324A
_02013246:
- blx FUN_0208B05C
+ bl FUN_0208B05C
_0201324A:
ldr r1, [r4, #0x1c]
ldr r0, [r4, #0x0]
cmp r1, #0x0
bne _02013258
- blx FUN_0208AF80
+ bl FUN_0208AF80
b _0201325C
_02013258:
- blx FUN_0208AFA8
+ bl FUN_0208AFA8
_0201325C:
ldr r0, _02013264 ; =0x021C4850
mov r1, #0x0
@@ -27038,16 +27038,16 @@ FUN_02013300: ; 0x02013300 bl FUN_0201EB8C
bl FUN_0201EBA4
_0201331C:
- blx FUN_020B849C
+ bl FUN_020B849C
ldr r0, [r4, #0x0]
ldr r1, _02013338 ; =0x021CED64
- blx FUN_0208AD80
+ bl FUN_0208AD80
ldr r0, [r4, #0x20]
cmp r0, #0x0
beq _02013332
bl FUN_0201EB98
_02013332:
- blx FUN_020B849C
+ bl FUN_020B849C
pop {r4, pc}
.balign 4
_02013338: .word 0x021CED64
@@ -27130,7 +27130,7 @@ FUN_020133AC: ; 0x020133AC ldr r0, _020133C4 ; =0x021C4850
str r3, [r0, #0x4]
ldr r0, [r4, #0x0]
- blx FUN_0208ACEC
+ bl FUN_0208ACEC
ldr r1, _020133C4 ; =0x021C4850
mov r2, #0x0
str r2, [r1, #0x4]
@@ -28294,7 +28294,7 @@ _02013B8A: beq _02013BC4
bl FUN_0201B9EC
add r1, r4, #0x0
- blx _u32_div_f
+ bl _u32_div_f
ldr r4, [r5, #0x4]
mov r0, #0x0
mov r2, #0x1
@@ -28859,7 +28859,7 @@ FUN_02013F30: ; 0x02013F30 add r4, r0, #0x0
mov r1, #0x0
mov r2, #0x40
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
mov r1, #0x1f
add r0, #0x3e
@@ -29086,7 +29086,7 @@ FUN_020140A4: ; 0x020140A4 add r3, r2, #0x0
lsr r1, r1, #0xd
mov r2, #0x0
- blx FUN_020B1528
+ bl FUN_020B1528
pop {r3, pc}
thumb_func_start FUN_020140B4
@@ -29103,7 +29103,7 @@ FUN_020140B4: ; 0x020140B4 str r2, [r5, #0x8]
lsr r1, r1, #0xd
mov r2, #0x0
- blx FUN_020B1240
+ bl FUN_020B1240
str r4, [r5, #0x8]
pop {r3-r5, pc}
.balign 4
@@ -29220,7 +29220,7 @@ _02014172: lsl r2, r2, #0x1
ldrsh r0, [r1, r0]
ldrsh r1, [r1, r2]
- blx G3_RotZ
+ bl G3_RotZ
ldr r2, [r5, #0x10]
ldr r0, [r5, #0xc]
ldr r1, _02014210 ; =0x0400046C
@@ -29252,7 +29252,7 @@ _02014172: str r4, [sp, #0x10]
ldrsh r3, [r5, r3]
add r1, r0, #0x0
- blx FUN_020B0250
+ bl FUN_020B0250
ldr r0, _02014214 ; =0x04000448
mov r1, #0x1
str r1, [r0, #0x0]
@@ -29339,14 +29339,14 @@ _0201424C: ldr r0, [r5, #0x4]
mov r1, #0x0
add r0, r0, #0x4
- blx FUN_020B1A14
+ bl FUN_020B1A14
add r1, r0, #0x0
add r0, r7, #0x0
bl FUN_02013F14
ldr r0, [r5, #0x8]
mov r1, #0x0
add r0, r0, #0x4
- blx FUN_020B19C4
+ bl FUN_020B19C4
add r1, r0, #0x0
add r0, r7, #0x0
bl FUN_02013F18
@@ -29421,14 +29421,14 @@ _0201434A: add r1, r4, #0x0
add r1, #0xc
mov r2, #0x20
- blx MIi_CpuCopy16
+ bl MIi_CpuCopy16
ldr r1, [sp, #0x0]
ldr r0, [sp, #0x8]
mov r2, #0x20
add r0, r1, r0
add r1, r4, #0x0
add r1, #0x2c
- blx MIi_CpuCopy16
+ bl MIi_CpuCopy16
ldr r0, [sp, #0x4]
mov r1, #0x1
str r0, [r4, #0x0]
@@ -29681,7 +29681,7 @@ FUN_02014518: ; 0x02014518 mov r1, #0x0
mov r2, #0x78
add r6, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r2, _02014560 ; =0x0000019E
mov r0, #0x0
mov r1, #0x1a
@@ -29929,7 +29929,7 @@ FUN_020146F0: ; 0x020146F0 add r5, r0, #0x0
mov r1, #0x0
mov r2, #0x9c
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r5, #0x0
add r0, #0x9b
ldrb r1, [r0, #0x0]
@@ -30306,7 +30306,7 @@ _020149B4: add r0, r6, #0x0
mov r1, #0x0
mov r2, #0x38
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add sp, #0x10
pop {r4-r6, pc}
@@ -30463,7 +30463,7 @@ FUN_02014AD4: ; 0x02014AD4 add r5, r0, #0x0
ldr r0, [r1, #0x14]
ldr r1, [r1, #0x10]
- blx DC_FlushRange
+ bl DC_FlushRange
ldr r3, [r4, #0x4]
ldr r0, [r4, #0x10]
str r0, [sp, #0x0]
@@ -30491,7 +30491,7 @@ FUN_02014B10: ; 0x02014B10 ldr r0, [r4, #0x0]
ldr r1, [r4, #0x10]
ldr r0, [r0, #0xc]
- blx DC_FlushRange
+ bl DC_FlushRange
ldr r0, [r4, #0x8]
cmp r0, #0x0
bne _02014B34
@@ -30499,7 +30499,7 @@ FUN_02014B10: ; 0x02014B10 ldr r1, [r4, #0xc]
ldr r0, [r0, #0xc]
ldr r2, [r4, #0x10]
- blx GX_LoadBGPltt
+ bl GX_LoadBGPltt
b _02014B44
_02014B34:
cmp r0, #0x4
@@ -30508,7 +30508,7 @@ _02014B34: ldr r1, [r4, #0xc]
ldr r0, [r0, #0xc]
ldr r2, [r4, #0x10]
- blx GXS_LoadBGPltt
+ bl GXS_LoadBGPltt
_02014B44:
add r0, r5, #0x0
bl FUN_0200CAB4
@@ -30628,7 +30628,7 @@ FUN_02014BF4: ; 0x02014BF4 mov r1, #0x0
add r2, r6, #0x0
str r0, [r4, #0x0]
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r4, #0x0
pop {r3-r7, pc}
@@ -30692,7 +30692,7 @@ _02014C8C: add r0, r0, r4
mov r1, #0x0
lsl r2, r2, #0x4
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, [r5, #0x0]
mov r1, #0x1
add r0, r0, r4
@@ -31062,7 +31062,7 @@ _02014F3E: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x54
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x1
str r0, [r4, #0x0]
mov r0, #0xc
@@ -31526,7 +31526,7 @@ FUN_020152B0: ; 0x020152B0 bl FUN_02015050
ldr r0, [sp, #0x8]
ldr r1, [sp, #0x4]
- blx _s32_div_f
+ bl _s32_div_f
add r1, sp, #0x0
ldrb r1, [r1, #0x0]
lsl r1, r1, #0x2
@@ -31547,7 +31547,7 @@ FUN_020152D8: ; 0x020152D8 bl FUN_02015050
ldr r0, [sp, #0x8]
ldr r1, [sp, #0x4]
- blx _s32_div_f
+ bl _s32_div_f
add r0, sp, #0x0
ldrb r0, [r0, #0x0]
lsl r0, r0, #0x2
@@ -32645,7 +32645,7 @@ FUN_02015AEC: ; 0x02015AEC add r0, r0, #0x1
mul r0, r1
ldr r1, [r4, #0x18]
- blx _s32_div_f
+ bl _s32_div_f
ldr r1, [r4, #0x14]
add r0, r1, r0
lsl r0, r0, #0x10
@@ -32781,7 +32781,7 @@ FUN_02015BE8: ; 0x02015BE8 ldr r0, [r4, #0x8]
mul r0, r1
ldr r1, [r4, #0xc]
- blx _s32_div_f
+ bl _s32_div_f
ldr r1, [r4, #0x24]
str r0, [r1, #0x0]
add r0, r4, #0x0
@@ -33178,7 +33178,7 @@ FUN_02015EA0: ; 0x02015EA0 orr r0, r2
str r0, [r3, r1]
mov r0, #0x3
- blx MI_WaitDma
+ bl MI_WaitDma
ldr r0, _02015ED0 ; =0x021C48B8
ldr r0, [r0, #0x1c]
bl FUN_0201B5CC
@@ -33212,12 +33212,12 @@ _02015EF0: .word MI_WaitDma FUN_02015EF4: ; 0x02015EF4
push {r3, lr}
mov r0, #0x1
- blx OS_DisableIrqMask
+ bl OS_DisableIrqMask
ldr r1, _02015F0C ; =FUN_02015ED4
mov r0, #0x1
- blx OS_SetIrqFunction
+ bl OS_SetIrqFunction
mov r0, #0x1
- blx OS_EnableIrqMask
+ bl OS_EnableIrqMask
pop {r3, pc}
.balign 4
_02015F0C: .word FUN_02015ED4
@@ -33299,19 +33299,19 @@ FUN_02015F80: ; 0x02015F80 bne _02015F9E
ldr r0, [r2, #0x8]
mov r0, #0x2
- blx OS_DisableIrqMask
+ bl OS_DisableIrqMask
mov r0, #0x0
- blx GX_HBlankIntr
+ bl GX_HBlankIntr
b _02015FB4
_02015F9E:
ldr r0, [r2, #0x8]
ldr r1, _02015FC4 ; =FUN_02015F6C
mov r0, #0x2
- blx OS_SetIrqFunction
+ bl OS_SetIrqFunction
mov r0, #0x2
- blx OS_EnableIrqMask
+ bl OS_EnableIrqMask
mov r0, #0x1
- blx GX_HBlankIntr
+ bl GX_HBlankIntr
_02015FB4:
ldr r1, _02015FC0 ; =0x04000208
ldrh r0, [r1, #0x0]
@@ -33327,11 +33327,11 @@ FUN_02015FC8: ; 0x02015FC8 push {r3, lr}
sub sp, #0x30
add r0, sp, #0x10
- blx OS_GetLowEntropyData
+ bl OS_GetLowEntropyData
add r0, sp, #0x0
add r1, sp, #0x10
mov r2, #0x20
- blx MATH_CalcMD5
+ bl MATH_CalcMD5
mov r3, #0x0
add r1, r3, #0x0
add r2, sp, #0x0
@@ -33366,8 +33366,8 @@ _02016010: .word 0x020EDB10 thumb_func_start InitSystemForTheGame
InitSystemForTheGame: ; 0x02016014
push {r3-r5, lr}
- blx OS_Init
- blx FX_Init
+ bl OS_Init
+ bl FX_Init
ldr r2, _02016124 ; =0x04000304
ldr r0, _02016128 ; =0xFFFFFDF1
ldrh r1, [r2, #0x0]
@@ -33375,15 +33375,15 @@ InitSystemForTheGame: ; 0x02016014 ldr r0, _0201612C ; =0x0000020E
orr r0, r1
strh r0, [r2, #0x0]
- blx GX_Init
- blx OS_InitTick
+ bl GX_Init
+ bl OS_InitTick
bl FUN_02015FC8
mov r0, #0xa0
bl FUN_0201B578
add r1, r0, #0x0
mov r0, #0x0
mov r2, #0x4
- blx OS_AllocFromArenaLo
+ bl OS_AllocFromArenaLo
add r1, r0, #0x0
mov r0, #0xa0
bl FUN_0201B580
@@ -33394,7 +33394,7 @@ InitSystemForTheGame: ; 0x02016014 add r1, r0, #0x0
mov r0, #0x0
mov r2, #0x4
- blx OS_AllocFromArenaLo
+ bl OS_AllocFromArenaLo
add r1, r0, #0x0
mov r0, #0x10
bl FUN_0201B580
@@ -33405,7 +33405,7 @@ InitSystemForTheGame: ; 0x02016014 add r1, r0, #0x0
mov r0, #0x0
mov r2, #0x4
- blx OS_AllocFromArenaLo
+ bl OS_AllocFromArenaLo
add r1, r0, #0x0
mov r0, #0x20
bl FUN_0201B580
@@ -33416,13 +33416,13 @@ InitSystemForTheGame: ; 0x02016014 add r1, r0, #0x0
mov r0, #0x0
mov r2, #0x4
- blx OS_AllocFromArenaLo
+ bl OS_AllocFromArenaLo
add r1, r0, #0x0
mov r0, #0x4
bl FUN_0201B580
ldr r1, _02016130 ; =0x021C48B8
str r0, [r1, #0x24]
- blx GX_DispOff
+ bl GX_DispOff
ldr r2, _02016134 ; =0x04001000
ldr r0, _02016138 ; =0xFFFEFFFF
ldr r1, [r2, #0x0]
@@ -33435,35 +33435,35 @@ InitSystemForTheGame: ; 0x02016014 strh r0, [r2, #0x0]
ldr r1, _0201613C ; =FUN_02015EA0
mov r0, #0x1
- blx OS_SetIrqFunction
+ bl OS_SetIrqFunction
mov r0, #0x1
- blx OS_EnableIrqMask
+ bl OS_EnableIrqMask
mov r0, #0x1
lsl r0, r0, #0x12
- blx OS_EnableIrqMask
+ bl OS_EnableIrqMask
ldr r1, _02016140 ; =0x04000208
ldrh r0, [r1, #0x0]
mov r0, #0x1
strh r0, [r1, #0x0]
- blx GX_VBlankIntr
+ bl GX_VBlankIntr
mov r0, #0x1
- blx FS_Init
+ bl FS_Init
bl FUN_02022450
mov r0, #0x0
add r1, r0, #0x0
- blx FS_TryLoadTable
+ bl FS_TryLoadTable
add r4, r0, #0x0
mov r0, #0x0
add r1, r4, #0x0
mov r2, #0x4
- blx OS_AllocFromArenaLo
+ bl OS_AllocFromArenaLo
add r5, r0, #0x0
bne _02016108
bl ErrorHandling
_02016108:
add r0, r5, #0x0
add r1, r4, #0x0
- blx FS_TryLoadTable
+ bl FS_TryLoadTable
ldr r0, _02016130 ; =0x021C48B8
mov r1, #0x0
str r1, [r0, #0x0]
@@ -33489,36 +33489,36 @@ _02016144: .word 0x021C4918 InitGraphicMemory: ; 0x02016148
push {r3, lr}
ldr r0, _02016198 ; =0x000001FF
- blx GX_SetBankForLCDC
+ bl GX_SetBankForLCDC
mov r1, #0x1a
mov r2, #0x29
mov r0, #0x0
lsl r1, r1, #0x16
lsl r2, r2, #0xe
- blx MIi_CpuClearFast
- blx GX_DisableBankForLCDC
+ bl MIi_CpuClearFast
+ bl GX_DisableBankForLCDC
mov r1, #0x7
mov r2, #0x1
mov r0, #0xc0
lsl r1, r1, #0x18
lsl r2, r2, #0xa
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
mov r2, #0x1
ldr r1, _0201619C ; =0x07000400
mov r0, #0xc0
lsl r2, r2, #0xa
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
mov r1, #0x5
mov r2, #0x1
mov r0, #0x0
lsl r1, r1, #0x18
lsl r2, r2, #0xa
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
mov r2, #0x1
ldr r1, _020161A0 ; =0x05000400
mov r0, #0x0
lsl r2, r2, #0xa
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
pop {r3, pc}
.balign 4
_02016198: .word 0x000001FF
@@ -33532,10 +33532,10 @@ FUN_020161A4: ; 0x020161A4 add r6, r0, #0x0
add r4, r1, #0x0
add r0, sp, #0x0
- blx FS_InitFile
+ bl FS_InitFile
add r0, sp, #0x0
add r1, r4, #0x0
- blx FS_OpenFile
+ bl FS_OpenFile
cmp r0, #0x0
beq _020161F0
ldr r1, [sp, #0x28]
@@ -33549,7 +33549,7 @@ FUN_020161A4: ; 0x020161A4 add r0, sp, #0x0
add r1, r4, #0x0
add r2, r5, #0x0
- blx FS_ReadFile
+ bl FS_ReadFile
cmp r5, r0
beq _020161E8
add r0, r6, #0x0
@@ -33558,7 +33558,7 @@ FUN_020161A4: ; 0x020161A4 mov r4, #0x0
_020161E8:
add r0, sp, #0x0
- blx FS_CloseFile
+ bl FS_CloseFile
b _020161F2
_020161F0:
mov r4, #0x0
@@ -33574,10 +33574,10 @@ FUN_020161F8: ; 0x020161F8 add r5, r0, #0x0
add r0, sp, #0x0
add r4, r1, #0x0
- blx FS_InitFile
+ bl FS_InitFile
add r0, sp, #0x0
add r1, r5, #0x0
- blx FS_OpenFile
+ bl FS_OpenFile
cmp r0, #0x0
beq _0201622A
ldr r1, [sp, #0x28]
@@ -33587,10 +33587,10 @@ FUN_020161F8: ; 0x020161F8 cmp r1, #0x0
beq _02016224
add r0, sp, #0x0
- blx FS_ReadFile
+ bl FS_ReadFile
_02016224:
add r0, sp, #0x0
- blx FS_CloseFile
+ bl FS_CloseFile
_0201622A:
add sp, #0x48
pop {r3-r5, pc}
@@ -33601,7 +33601,7 @@ FUN_02016230: ; 0x02016230 push {r3-r7, lr}
sub sp, #0x8
str r0, [sp, #0x0]
- blx strlen
+ bl strlen
lsl r0, r0, #0x10
lsr r3, r0, #0x10
lsr r2, r3, #0x1f
@@ -33749,12 +33749,12 @@ FUN_02016324: ; 0x02016324 add r0, sp, #0x0
bne _02016340
add r1, r2, #0x1
- blx strcpy
+ bl strcpy
mov r5, #0x1
b _02016346
_02016340:
add r1, r2, #0x0
- blx strcpy
+ bl strcpy
_02016346:
add r0, sp, #0x0
bl FUN_02016230
@@ -33770,10 +33770,10 @@ _02016346: b _020163B2
_02016362:
add r0, sp, #0x20
- blx FS_InitFile
+ bl FS_InitFile
add r0, sp, #0x20
add r1, sp, #0x0
- blx FS_OpenFile
+ bl FS_OpenFile
cmp r0, #0x0
beq _020163B0
ldr r1, [sp, #0x48]
@@ -33787,7 +33787,7 @@ _02016362: add r0, sp, #0x20
add r1, r4, #0x0
add r2, r6, #0x0
- blx FS_ReadFile
+ bl FS_ReadFile
cmp r6, r0
beq _0201639C
add r0, r4, #0x0
@@ -33795,7 +33795,7 @@ _02016362: mov r4, #0x0
_0201639C:
add r0, sp, #0x20
- blx FS_CloseFile
+ bl FS_CloseFile
cmp r5, #0x0
bne _020163B2
add r0, r4, #0x0
@@ -33836,13 +33836,13 @@ FUN_020163BC: ; 0x020163BC strh r2, [r0, #0x22]
ldr r0, _02016424 ; =0x021C4918
strb r2, [r0, #0x4]
- blx TP_Init
+ bl TP_Init
add r0, sp, #0x0
- blx TP_GetUserInfo
+ bl TP_GetUserInfo
cmp r0, #0x1
add r0, sp, #0x0
bne _02016402
- blx TP_SetCalibrateParam
+ bl TP_SetCalibrateParam
add sp, #0x8
pop {r3, pc}
_02016402:
@@ -33855,7 +33855,7 @@ _02016402: ldr r1, _02016434 ; =0x00001208
strh r1, [r0, #0x6]
add r0, sp, #0x0
- blx TP_SetCalibrateParam
+ bl TP_SetCalibrateParam
add sp, #0x8
pop {r3, pc}
.balign 4
@@ -33965,19 +33965,19 @@ _020164C8: bne _020164F4
add r4, sp, #0x8
_020164E4:
- blx TP_RequestSamplingAsync
+ bl TP_RequestSamplingAsync
add r0, r4, #0x0
- blx TP_WaitRawResult
+ bl TP_WaitRawResult
cmp r0, #0x0
bne _020164E4
b _020164FA
_020164F4:
add r0, sp, #0x8
- blx TP_GetLatestRawPointInAuto
+ bl TP_GetLatestRawPointInAuto
_020164FA:
add r0, sp, #0x0
add r1, sp, #0x8
- blx TP_GetCalibratedPoint
+ bl TP_GetCalibratedPoint
add r1, sp, #0x0
ldrh r3, [r1, #0x6]
cmp r3, #0x0
@@ -34260,7 +34260,7 @@ _020166F4: mov r0, #0x0
add r1, r3, #0x0
mov r2, #0x4
- blx OS_AllocFromArenaLo
+ bl OS_AllocFromArenaLo
_020166FE:
ldr r1, [sp, #0x4]
lsl r7, r6, #0x1
@@ -34272,7 +34272,7 @@ _020166FE: mov r0, #0x0
add r1, r6, r1
mov r2, #0x4
- blx OS_AllocFromArenaLo
+ bl OS_AllocFromArenaLo
ldr r1, _020167F0 ; =0x021C4D28
str r0, [r1, #0x0]
ldr r1, [sp, #0x4]
@@ -34313,19 +34313,19 @@ _0201675C: ldr r1, [r5, #0x0]
mov r0, #0x0
mov r2, #0x4
- blx OS_AllocFromArenaLo
+ bl OS_AllocFromArenaLo
b _02016772
_02016768:
ldr r1, [r5, #0x0]
mov r0, #0x2
mov r2, #0x4
- blx OS_AllocFromArenaHi
+ bl OS_AllocFromArenaHi
_02016772:
cmp r0, #0x0
beq _0201678E
ldr r1, [r5, #0x0]
mov r2, #0x0
- blx tempName_NNS_FndCreateExpHeapEx
+ bl tempName_NNS_FndCreateExpHeapEx
ldr r1, _020167F0 ; =0x021C4D28
ldr r2, [r1, #0x0]
ldr r1, [sp, #0x0]
@@ -34443,7 +34443,7 @@ FUN_02016834: ; 0x02016834 add r5, r1, #0x0
str r2, [sp, #0x0]
add r7, r3, #0x0
- blx OS_GetProcMode
+ bl OS_GetProcMode
cmp r0, #0x12
bne _0201684C
bl ErrorHandling
@@ -34463,7 +34463,7 @@ _0201684C: ldr r1, [sp, #0x0]
add r0, r6, #0x0
add r2, r7, #0x0
- blx tempName_NNS_FndAllocFromExpHeapEx
+ bl tempName_NNS_FndAllocFromExpHeapEx
str r0, [sp, #0x4]
cmp r0, #0x0
beq _020168B6
@@ -34474,7 +34474,7 @@ _0201684C: ldr r1, [sp, #0x0]
mov r2, #0x0
lsl r4, r7, #0x2
- blx tempName_NNS_FndCreateExpHeapEx
+ bl tempName_NNS_FndCreateExpHeapEx
ldr r1, _020168CC ; =0x021C4D28
ldr r2, [r1, #0x0]
str r0, [r2, r4]
@@ -34517,7 +34517,7 @@ _020168CC: .word 0x021C4D28 FUN_020168D0: ; 0x020168D0
push {r4, lr}
add r4, r0, #0x0
- blx OS_GetProcMode
+ bl OS_GetProcMode
cmp r0, #0x12
bne _020168E0
bl ErrorHandling
@@ -34530,7 +34530,7 @@ _020168E0: ldr r0, [r1, r0]
cmp r0, #0x0
beq _0201693E
- blx thunk_FUN_020adc8c
+ bl thunk_FUN_020adc8c
ldr r1, _02016940 ; =0x021C4D28
ldr r0, [r1, #0x10]
ldrb r0, [r0, r4]
@@ -34543,7 +34543,7 @@ _020168E0: beq _02016912
cmp r1, #0x0
beq _02016912
- blx FUN_020ADDF0
+ bl FUN_020ADDF0
b _02016916
_02016912:
bl ErrorHandling
@@ -34584,16 +34584,16 @@ FUN_02016944: ; 0x02016944 bne _02016956
bl ErrorHandling
_02016956:
- blx OS_DisableInterrupts
+ bl OS_DisableInterrupts
add r4, #0x10
str r0, [sp, #0x0]
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r7, #0x0
- blx tempName_NNS_FndAllocFromExpHeapEx
+ bl tempName_NNS_FndAllocFromExpHeapEx
add r4, r0, #0x0
ldr r0, [sp, #0x0]
- blx OS_RestoreInterrupts
+ bl OS_RestoreInterrupts
cmp r4, #0x0
beq _02016984
ldr r1, [r4, #0xc]
@@ -34732,14 +34732,14 @@ _02016A5E: ldrh r0, [r1, r5]
sub r0, r0, #0x1
strh r0, [r1, r5]
- blx OS_DisableInterrupts
+ bl OS_DisableInterrupts
sub r6, #0x10
add r4, r0, #0x0
add r0, r7, #0x0
add r1, r6, #0x0
- blx FUN_020ADDF0
+ bl FUN_020ADDF0
add r0, r4, #0x0
- blx OS_RestoreInterrupts
+ bl OS_RestoreInterrupts
pop {r3-r7, pc}
_02016A80:
bl ErrorHandling
@@ -34752,7 +34752,7 @@ FUN_02016A8C: ; 0x02016A8C push {r4-r6, lr}
add r5, r0, #0x0
add r4, r1, #0x0
- blx OS_GetProcMode
+ bl OS_GetProcMode
cmp r0, #0x12
bne _02016A9E
bl ErrorHandling
@@ -34781,7 +34781,7 @@ _02016AC8: sub r4, #0x10
add r0, r6, #0x0
add r1, r4, #0x0
- blx FUN_020ADDF0
+ bl FUN_020ADDF0
ldr r0, _02016AF4 ; =0x021C4D28
lsl r4, r5, #0x1
ldr r0, [r0, #0xc]
@@ -34814,7 +34814,7 @@ FUN_02016AF8: ; 0x02016AF8 ldrb r0, [r1, r0]
lsl r0, r0, #0x2
ldr r0, [r2, r0]
- blx FUN_020ADDC8
+ bl FUN_020ADDC8
pop {r3, pc}
_02016B12:
bl ErrorHandling
@@ -34835,7 +34835,7 @@ FUN_02016B20: ; 0x02016B20 ldrb r1, [r4, r1]
lsl r1, r1, #0x2
ldr r1, [r3, r1]
- blx FUN_020AE82C
+ bl FUN_020AE82C
pop {r4, pc}
_02016B3A:
bl ErrorHandling
@@ -34848,14 +34848,14 @@ FUN_02016B44: ; 0x02016B44 push {r3-r5, lr}
add r5, r0, #0x0
add r4, r1, #0x0
- blx OS_GetProcMode
+ bl OS_GetProcMode
cmp r0, #0x12
bne _02016B56
bl ErrorHandling
_02016B56:
add r0, r5, #0x0
sub r0, #0x10
- blx FUN_020ADDC0
+ bl FUN_020ADDC0
add r4, #0x10
cmp r0, r4
blo _02016B84
@@ -34872,7 +34872,7 @@ _02016B56: lsl r0, r0, #0x2
ldr r0, [r1, r0]
add r1, r5, #0x0
- blx FUN_020ADE2C
+ bl FUN_020ADE2C
pop {r3-r5, pc}
_02016B84:
bl ErrorHandling
@@ -34896,7 +34896,7 @@ FUN_02016B94: ; 0x02016B94 mov r1, #0x0
lsl r2, r2, #0x2
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
str r5, [r4, #0x0]
mov r0, #0x0
strh r0, [r4, #0x4]
@@ -34916,9 +34916,9 @@ FUN_02016BBC: ; 0x02016BBC ldr r0, [r4, #0x0]
ldr r1, [r4, #0x4]
ldr r2, [r4, #0xc]
- blx GX_SetGraphicsMode
+ bl GX_SetGraphicsMode
ldr r0, [r4, #0x8]
- blx GXS_SetGraphicsMode
+ bl GXS_SetGraphicsMode
mov r2, #0x1
lsl r2, r2, #0x1a
ldr r1, [r2, #0x0]
@@ -34944,12 +34944,12 @@ FUN_02016BF4: ; 0x02016BF4 ldr r0, [r2, #0x0]
ldr r1, [r2, #0x4]
ldr r2, [r2, #0xc]
- blx GX_SetGraphicsMode
+ bl GX_SetGraphicsMode
bl FUN_0201E6D8
pop {r3, pc}
_02016C0C:
ldr r0, [r2, #0x8]
- blx GXS_SetGraphicsMode
+ bl GXS_SetGraphicsMode
bl FUN_0201E740
pop {r3, pc}
@@ -35546,7 +35546,7 @@ _0201705A: ldr r1, [r6, r5]
ldr r2, [r4, #0x8]
mov r0, #0x0
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
ldr r0, [sp, #0x0]
ldr r2, [r4, #0x8]
add r1, r0, r5
@@ -37134,7 +37134,7 @@ _02017BFC: ldr r0, [r4, #0x18]
str r0, [sp, #0x4]
ldr r0, _02017C5C ; =0x04000020
- blx G2x_SetBGyAffine_
+ bl G2x_SetBGyAffine_
add sp, #0x8
pop {r3-r5, pc}
_02017C14:
@@ -37146,7 +37146,7 @@ _02017C14: ldr r0, [r4, #0x18]
str r0, [sp, #0x4]
ldr r0, _02017C60 ; =0x04000030
- blx G2x_SetBGyAffine_
+ bl G2x_SetBGyAffine_
add sp, #0x8
pop {r3-r5, pc}
_02017C2C:
@@ -37158,7 +37158,7 @@ _02017C2C: ldr r0, [r4, #0x18]
str r0, [sp, #0x4]
ldr r0, _02017C64 ; =0x04001020
- blx G2x_SetBGyAffine_
+ bl G2x_SetBGyAffine_
add sp, #0x8
pop {r3-r5, pc}
_02017C44:
@@ -37170,7 +37170,7 @@ _02017C44: ldr r0, [r4, #0x18]
str r0, [sp, #0x4]
ldr r0, _02017C68 ; =0x04001030
- blx G2x_SetBGyAffine_
+ bl G2x_SetBGyAffine_
_02017C58:
add sp, #0x8
pop {r3-r5, pc}
@@ -37208,7 +37208,7 @@ FUN_02017C98: ; 0x02017C98 push {r3-r5, lr}
cmp r2, #0x0
bne _02017CA4
- blx MI_UncompressLZ8
+ bl MI_UncompressLZ8
pop {r3-r5, pc}
_02017CA4:
mov r4, #0x3
@@ -37227,10 +37227,10 @@ _02017CA4: ror r5, r3
add r3, r4, r5
bne _02017CCA
- blx MIi_CpuCopy32
+ bl MIi_CpuCopy32
pop {r3-r5, pc}
_02017CCA:
- blx MIi_CpuCopy16
+ bl MIi_CpuCopy16
pop {r3-r5, pc}
thumb_func_start FUN_02017CD0
@@ -37318,7 +37318,7 @@ FUN_02017D68: ; 0x02017D68 add r0, r4, #0x0
add r1, r6, #0x0
add r5, r2, #0x0
- blx DC_FlushRange
+ bl DC_FlushRange
cmp r7, #0x7
bhi _02017DF8
add r0, r7, r7
@@ -37340,49 +37340,49 @@ _02017D9A: add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GX_LoadBG0Scr
+ bl GX_LoadBG0Scr
pop {r3-r7, pc}
_02017DA6:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GX_LoadBG1Scr
+ bl GX_LoadBG1Scr
pop {r3-r7, pc}
_02017DB2:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GX_LoadBG2Scr
+ bl GX_LoadBG2Scr
pop {r3-r7, pc}
_02017DBE:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GX_LoadBG3Scr
+ bl GX_LoadBG3Scr
pop {r3-r7, pc}
_02017DCA:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GXS_LoadBG0Scr
+ bl GXS_LoadBG0Scr
pop {r3-r7, pc}
_02017DD6:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GXS_LoadBG1Scr
+ bl GXS_LoadBG1Scr
pop {r3-r7, pc}
_02017DE2:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GXS_LoadBG2Scr
+ bl GXS_LoadBG2Scr
pop {r3-r7, pc}
_02017DEE:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GXS_LoadBG3Scr
+ bl GXS_LoadBG3Scr
_02017DF8:
pop {r3-r7, pc}
.balign 4
@@ -37467,7 +37467,7 @@ FUN_02017E84: ; 0x02017E84 add r0, r4, #0x0
add r1, r6, #0x0
add r5, r2, #0x0
- blx DC_FlushRange
+ bl DC_FlushRange
cmp r7, #0x7
bhi _02017F14
add r0, r7, r7
@@ -37489,49 +37489,49 @@ _02017EB6: add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GX_LoadBG0Char
+ bl GX_LoadBG0Char
pop {r3-r7, pc}
_02017EC2:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GX_LoadBG1Char
+ bl GX_LoadBG1Char
pop {r3-r7, pc}
_02017ECE:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GX_LoadBG2Char
+ bl GX_LoadBG2Char
pop {r3-r7, pc}
_02017EDA:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GX_LoadBG3Char
+ bl GX_LoadBG3Char
pop {r3-r7, pc}
_02017EE6:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GXS_LoadBG0Char
+ bl GXS_LoadBG0Char
pop {r3-r7, pc}
_02017EF2:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GXS_LoadBG1Char
+ bl GXS_LoadBG1Char
pop {r3-r7, pc}
_02017EFE:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GXS_LoadBG2Char
+ bl GXS_LoadBG2Char
pop {r3-r7, pc}
_02017F0A:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx GXS_LoadBG3Char
+ bl GXS_LoadBG3Char
_02017F14:
pop {r3-r7, pc}
.balign 4
@@ -37548,7 +37548,7 @@ FUN_02017F18: ; 0x02017F18 add r4, r0, #0x0
mov r1, #0x0
add r2, r5, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r6, #0x0
add r1, r4, #0x0
add r2, r7, #0x0
@@ -37600,7 +37600,7 @@ _02017F8C: ldr r1, [sp, #0x4]
ldr r2, [sp, #0x0]
add r0, r5, #0x0
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
lsl r0, r7, #0x18
ldrb r2, [r4, r6]
ldr r3, [sp, #0x20]
@@ -37623,19 +37623,19 @@ FUN_02017FB4: ; 0x02017FB4 add r0, r5, #0x0
add r1, r4, #0x0
add r7, r3, #0x0
- blx DC_FlushRange
+ bl DC_FlushRange
cmp r6, #0x4
bhs _02017FD6
add r0, r5, #0x0
add r1, r7, #0x0
add r2, r4, #0x0
- blx GX_LoadBGPltt
+ bl GX_LoadBGPltt
pop {r3-r7, pc}
_02017FD6:
add r0, r5, #0x0
add r1, r7, #0x0
add r2, r4, #0x0
- blx GXS_LoadBGPltt
+ bl GXS_LoadBGPltt
pop {r3-r7, pc}
.balign 4
@@ -38668,7 +38668,7 @@ FUN_02018744: ; 0x02018744 beq _02018766
ldr r2, [r2, #0xc]
mov r0, #0x0
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
add r0, r5, #0x0
add r1, r4, #0x0
bl FUN_02017CD0
@@ -38688,7 +38688,7 @@ FUN_02018768: ; 0x02018768 beq _0201878A
add r0, r2, #0x0
ldr r2, [r3, #0xc]
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
add r0, r5, #0x0
add r1, r4, #0x0
bl FUN_02017CD0
@@ -38708,7 +38708,7 @@ FUN_0201878C: ; 0x0201878C beq _020187AE
add r0, r2, #0x0
ldr r2, [r3, #0xc]
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
add r0, r5, #0x0
add r1, r4, #0x0
bl FUN_0201AC68
@@ -38736,28 +38736,28 @@ _020187C2: ; jump table (using 16-bit offset) .short _020187F6 - _020187C2 - 2; case 6
.short _020187FC - _020187C2 - 2; case 7
_020187D2:
- blx G2_GetBG0CharPtr
+ bl G2_GetBG0CharPtr
pop {r3, pc}
_020187D8:
- blx G2_GetBG1CharPtr
+ bl G2_GetBG1CharPtr
pop {r3, pc}
_020187DE:
- blx G2_GetBG2CharPtr
+ bl G2_GetBG2CharPtr
pop {r3, pc}
_020187E4:
- blx G2_GetBG3CharPtr
+ bl G2_GetBG3CharPtr
pop {r3, pc}
_020187EA:
- blx G2S_GetBG0CharPtr
+ bl G2S_GetBG0CharPtr
pop {r3, pc}
_020187F0:
- blx G2S_GetBG1CharPtr
+ bl G2S_GetBG1CharPtr
pop {r3, pc}
_020187F6:
- blx G2S_GetBG2CharPtr
+ bl G2S_GetBG2CharPtr
pop {r3, pc}
_020187FC:
- blx G2S_GetBG3CharPtr
+ bl G2S_GetBG3CharPtr
pop {r3, pc}
_02018802:
mov r0, #0x0
@@ -40023,7 +40023,7 @@ FUN_020190EC: ; 0x020190EC lsl r1, r1, #0x18
ldr r2, [sp, #0x4]
lsr r1, r1, #0x18
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
cmp r7, #0x0
beq _02019148
str r5, [r4, #0x0]
@@ -40754,7 +40754,7 @@ _0201963C: ldrb r4, [r4, #0x7]
mul r2, r4
mul r2, r3
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
pop {r3-r5, pc}
thumb_func_start FUN_02019658
@@ -43637,7 +43637,7 @@ FUN_0201AB28: ; 0x0201AB28 bl FUN_020161A4
add r1, sp, #0x0
str r0, [r4, #0x0]
- blx FUN_020B0030
+ bl FUN_020B0030
ldr r0, [sp, #0x0]
add sp, #0x4
pop {r3-r4, pc}
@@ -43652,7 +43652,7 @@ FUN_0201AB44: ; 0x0201AB44 bl FUN_020161A4
add r1, sp, #0x0
str r0, [r4, #0x0]
- blx FUN_020B0138
+ bl FUN_020B0138
ldr r0, [sp, #0x0]
add sp, #0x4
pop {r3-r4, pc}
@@ -43889,7 +43889,7 @@ _0201ACEA: ldr r2, [r2, #0x0]
ldr r3, [r3, #0x0]
add r1, sp, #0x38
- blx G2x_SetBGyAffine_
+ bl G2x_SetBGyAffine_
_0201AD1E:
ldrh r1, [r4, #0x4]
mov r0, #0x8
@@ -43945,7 +43945,7 @@ _0201AD4E: ldr r2, [r2, #0x0]
ldr r3, [r3, #0x0]
add r1, sp, #0x28
- blx G2x_SetBGyAffine_
+ bl G2x_SetBGyAffine_
_0201AD8E:
ldrh r1, [r4, #0x4]
mov r0, #0x10
@@ -44035,7 +44035,7 @@ _0201AE04: ldr r2, [r4, r2]
ldr r3, [r4, r3]
add r1, sp, #0x18
- blx G2x_SetBGyAffine_
+ bl G2x_SetBGyAffine_
_0201AE3E:
ldrh r0, [r4, #0x4]
mov r3, #0x80
@@ -44090,7 +44090,7 @@ _0201AE72: ldr r2, [r4, r2]
ldr r3, [r4, r3]
add r1, sp, #0x8
- blx G2x_SetBGyAffine_
+ bl G2x_SetBGyAffine_
_0201AEAC:
add sp, #0x48
pop {r4, pc}
@@ -44364,7 +44364,7 @@ _0201B096: ldr r1, [sp, #0x18]
add r1, r1, r2
mov r2, #0x40
- blx memcpy
+ bl memcpy
ldrh r1, [r4, r6]
add r0, r7, #0x0
asr r2, r1, #0xa
@@ -44454,7 +44454,7 @@ _0201B142: add r0, r7, #0x0
add r1, r4, #0x0
mov r2, #0x40
- blx memcpy
+ bl memcpy
_0201B166:
ldr r0, [sp, #0x0]
mov r1, #0x2
@@ -44484,7 +44484,7 @@ _0201B17E: add r0, r7, #0x0
add r1, r4, #0x0
mov r2, #0x40
- blx memcpy
+ bl memcpy
_0201B19E:
add r0, r4, #0x0
bl FUN_02016A18
@@ -44499,7 +44499,7 @@ FUN_0201B1A8: ; 0x0201B1A8 add r4, r2, #0x0
bl FUN_020161A4
str r0, [r5, #0x0]
- blx FUN_020BC0FC
+ bl FUN_020BC0FC
cmp r0, #0x0
beq _0201B1D2
bl FUN_0201B254
@@ -44507,12 +44507,12 @@ FUN_0201B1A8: ; 0x0201B1A8 bne _0201B1D2
ldr r0, [r5, #0x0]
ldr r1, [r0, #0x8]
- blx DC_FlushRange
+ bl DC_FlushRange
ldr r0, [r5, #0x0]
- blx FUN_020BB59C
+ bl FUN_020BB59C
_0201B1D2:
ldr r0, [r5, #0x0]
- blx FUN_020BC13C
+ bl FUN_020BC13C
ldrh r1, [r0, #0xe]
add r1, r0, r1
ldr r1, [r1, #0xc]
@@ -44526,7 +44526,7 @@ FUN_0201B1E4: ; 0x0201B1E4 add r5, r1, #0x0
add r4, r0, #0x0
ldr r0, [r5, #0x0]
- blx FUN_020BC0FC
+ bl FUN_020BC0FC
cmp r0, #0x0
beq _0201B20A
bl FUN_0201B254
@@ -44534,12 +44534,12 @@ FUN_0201B1E4: ; 0x0201B1E4 bne _0201B20A
ldr r0, [r5, #0x0]
ldr r1, [r0, #0x8]
- blx DC_FlushRange
+ bl DC_FlushRange
ldr r0, [r5, #0x0]
- blx FUN_020BB59C
+ bl FUN_020BB59C
_0201B20A:
ldr r0, [r5, #0x0]
- blx FUN_020BC13C
+ bl FUN_020BC13C
ldrh r1, [r0, #0xe]
add r1, r0, r1
ldr r1, [r1, #0xc]
@@ -44557,7 +44557,7 @@ FUN_0201B21C: ; 0x0201B21C bl FUN_0201B1A8
ldr r1, [r4, #0x0]
add r0, r5, #0x0
- blx FUN_020B80B4
+ bl FUN_020B80B4
pop {r3-r5, pc}
thumb_func_start FUN_0201B234
@@ -44574,7 +44574,7 @@ FUN_0201B234: ; 0x0201B234 _0201B24A:
ldr r1, [r4, #0x0]
add r0, r5, #0x0
- blx FUN_020B80B4
+ bl FUN_020B80B4
pop {r3-r5, pc}
thumb_func_start FUN_0201B254
@@ -44601,20 +44601,20 @@ FUN_0201B26C: ; 0x0201B26C add r0, r1, #0x0
add r4, r2, #0x0
add r6, r3, #0x0
- blx FUN_020B8474
+ bl FUN_020B8474
ldr r1, _0201B2A0 ; =0x021CEDD4
add r0, r4, #0x0
- blx MI_Copy36B
+ bl MI_Copy36B
ldr r1, _0201B2A4 ; =0x021CED98
mov r0, #0xa4
ldr r2, [r1, #0x7c]
bic r2, r0
add r0, r6, #0x0
str r2, [r1, #0x7c]
- blx FUN_020B844C
- blx FUN_020B849C
+ bl FUN_020B844C
+ bl FUN_020B849C
add r0, r5, #0x0
- blx FUN_020BAC98
+ bl FUN_020BAC98
pop {r4-r6, pc}
nop
_0201B2A0: .word 0x021CEDD4
@@ -44627,24 +44627,24 @@ FUN_0201B2A8: ; 0x0201B2A8 add r0, r1, #0x0
add r4, r2, #0x0
add r6, r3, #0x0
- blx FUN_020B8474
+ bl FUN_020B8474
ldr r1, _0201B2E4 ; =0x021CEDD4
add r0, r4, #0x0
- blx MI_Copy36B
+ bl MI_Copy36B
ldr r1, _0201B2E8 ; =0x021CED98
mov r0, #0xa4
ldr r2, [r1, #0x7c]
bic r2, r0
str r2, [r1, #0x7c]
add r0, r6, #0x0
- blx FUN_020B844C
- blx FUN_020B849C
+ bl FUN_020B844C
+ bl FUN_020B849C
mov r1, #0x0
ldr r0, [r5, #0x4]
add r2, r1, #0x0
mov r3, #0x1
- blx FUN_020BAFB8
- blx FUN_020BB394
+ bl FUN_020BAFB8
+ bl FUN_020BB394
pop {r4-r6, pc}
.balign 4
_0201B2E4: .word 0x021CEDD4
@@ -44712,13 +44712,13 @@ FUN_0201B314: ; 0x0201B314 add r1, r0, #0x0
add r2, r0, #0x0
add r3, r0, #0x0
- blx G3X_SetFog
+ bl G3X_SetFog
mov r0, #0x0
ldr r2, _0201B38C ; =0x00007FFF
add r1, r0, #0x0
mov r3, #0x3f
str r0, [sp, #0x0]
- blx G3X_SetClearColor
+ bl G3X_SetClearColor
ldr r1, _0201B390 ; =0xBFFF0000
ldr r0, _0201B394 ; =0x04000580
str r1, [r0, #0x0]
@@ -44745,11 +44745,11 @@ _0201B3A4: .word FUN_020223BC FUN_0201B3A8: ; 0x0201B3A8
push {r4, lr}
add r4, r1, #0x0
- blx FUN_020BC13C
+ bl FUN_020BC13C
cmp r4, #0x0
beq _0201B3BE
add r1, r4, #0x0
- blx FUN_020B7790
+ bl FUN_020B7790
mov r0, #0x1
pop {r4, pc}
_0201B3BE:
@@ -44775,13 +44775,13 @@ _0201B3D2: str r1, [sp, #0x0]
cmp r5, #0x0
beq _0201B4D0
- blx FUN_020B7E1C
+ bl FUN_020B7E1C
add r6, r0, #0x0
add r0, r5, #0x0
- blx FUN_020B7E10
+ bl FUN_020B7E10
add r4, r0, #0x0
add r0, r5, #0x0
- blx FUN_020B7CE4
+ bl FUN_020B7CE4
str r0, [sp, #0xc]
cmp r6, #0x0
beq _0201B412
@@ -44882,19 +44882,19 @@ _0201B4A6: add r0, r5, #0x0
add r1, r7, #0x0
add r2, r6, #0x0
- blx FUN_020B7DFC
+ bl FUN_020B7DFC
add r0, r5, #0x0
add r1, r4, #0x0
- blx FUN_020B7CDC
+ bl FUN_020B7CDC
ldr r1, [r5, #0x4]
add r0, r5, #0x0
- blx DC_FlushRange
+ bl DC_FlushRange
add r0, r5, #0x0
mov r1, #0x1
- blx FUN_020B7D28
+ bl FUN_020B7D28
add r0, r5, #0x0
mov r1, #0x1
- blx FUN_020B7C78
+ bl FUN_020B7C78
_0201B4D0:
mov r0, #0x1
add sp, #0x10
@@ -45237,22 +45237,22 @@ FUN_0201B6D0: ; 0x0201B6D0 ldrsh r3, [r4, r3]
bl FUN_0201B808
add r0, sp, #0x1c
- blx FUN_020B8474
+ bl FUN_020B8474
ldr r1, _0201B764 ; =0x021CEDD4
add r0, r5, #0x0
- blx MI_Copy36B
+ bl MI_Copy36B
ldr r1, _0201B768 ; =0x021CED98
mov r0, #0xa4
ldr r2, [r1, #0x7c]
bic r2, r0
add r0, r7, #0x0
str r2, [r1, #0x7c]
- blx FUN_020B844C
- blx FUN_020B849C
+ bl FUN_020B844C
+ bl FUN_020B849C
mov r1, #0x0
mov r0, #0x11
add r2, r1, #0x0
- blx FUN_020BB1C0
+ bl FUN_020BB1C0
ldr r0, [r4, #0x24]
add r1, sp, #0x10
str r0, [sp, #0x10]
@@ -45260,7 +45260,7 @@ FUN_0201B6D0: ; 0x0201B6D0 str r0, [sp, #0x18]
mov r0, #0x1b
mov r2, #0x3
- blx FUN_020BB1C0
+ bl FUN_020BB1C0
add r0, sp, #0x28
bl FUN_0201B82C
add r4, r0, #0x0
@@ -45268,7 +45268,7 @@ FUN_0201B6D0: ; 0x0201B6D0 mov r0, #0x12
add r1, sp, #0xc
str r2, [sp, #0xc]
- blx FUN_020BB1C0
+ bl FUN_020BB1C0
add r0, r4, #0x0
add sp, #0x34
pop {r4-r7, pc}
@@ -45296,12 +45296,12 @@ FUN_0201B76C: ; 0x0201B76C add r2, r0, #0x0
bl FUN_0201B808
add r0, r5, #0x0
- blx FUN_020B8474
- blx FUN_020B849C
+ bl FUN_020B8474
+ bl FUN_020B849C
mov r1, #0x0
mov r0, #0x11
add r2, r1, #0x0
- blx FUN_020BB1C0
+ bl FUN_020BB1C0
ldr r0, [r4, #0x10]
lsl r2, r0, #0xc
ldr r0, [r4, #0xc]
@@ -45314,7 +45314,7 @@ FUN_0201B76C: ; 0x0201B76C mov r0, #0x1b
add r1, sp, #0x10
mov r2, #0x3
- blx FUN_020BB1C0
+ bl FUN_020BB1C0
add r0, sp, #0x1c
bl FUN_0201B82C
add r4, r0, #0x0
@@ -45322,7 +45322,7 @@ FUN_0201B76C: ; 0x0201B76C mov r0, #0x12
add r1, sp, #0xc
str r2, [sp, #0xc]
- blx FUN_020BB1C0
+ bl FUN_020BB1C0
add r0, r4, #0x0
add sp, #0x28
pop {r3-r5, pc}
@@ -45382,26 +45382,26 @@ FUN_0201B82C: ; 0x0201B82C mov r0, #0x29
add r1, sp, #0x4
str r2, [sp, #0x8]
- blx FUN_020BB1C0
+ bl FUN_020BB1C0
mov r0, #0x0
str r0, [sp, #0x0]
mov r0, #0x40
add r1, sp, #0x0
mov r2, #0x1
- blx FUN_020BB1C0
+ bl FUN_020BB1C0
mov r1, #0x0
mov r0, #0x41
add r2, r1, #0x0
- blx FUN_020BB1C0
+ bl FUN_020BB1C0
mov r0, #0x70
add r1, r4, #0x0
mov r2, #0x3
- blx FUN_020BB1C0
- blx FUN_020BB394
+ bl FUN_020BB1C0
+ bl FUN_020BB394
add r4, sp, #0x8
_0201B86A:
add r0, r4, #0x0
- blx G3X_GetBoxTestResult
+ bl G3X_GetBoxTestResult
cmp r0, #0x0
bne _0201B86A
ldr r0, [sp, #0x8]
@@ -45561,7 +45561,7 @@ FUN_0201B970: ; 0x0201B970 push {r3, lr}
mov r1, #0x5a
lsl r1, r1, #0x2
- blx _s32_div_f
+ bl _s32_div_f
ldr r0, _0201B984 ; =0x020EDF50
lsl r1, r1, #0x2
ldr r0, [r0, r1]
@@ -45574,7 +45574,7 @@ FUN_0201B988: ; 0x0201B988 push {r3, lr}
mov r1, #0x5a
lsl r1, r1, #0x2
- blx _s32_div_f
+ bl _s32_div_f
add r1, #0x5a
ldr r0, _0201B99C ; =0x020EDF50
lsl r1, r1, #0x2
@@ -45588,7 +45588,7 @@ FUN_0201B9A0: ; 0x0201B9A0 push {r3, lr}
mov r1, #0x5a
lsl r1, r1, #0x2
- blx _s32_div_f
+ bl _s32_div_f
ldr r0, _0201B9B4 ; =0x020EDC7E
lsl r1, r1, #0x1
ldrh r0, [r0, r1]
@@ -45603,7 +45603,7 @@ FUN_0201B9B8: ; 0x0201B9B8 mov r1, #0x5a
lsr r0, r0, #0x10
lsl r1, r1, #0x2
- blx _s32_div_f
+ bl _s32_div_f
ldr r0, _0201B9D0 ; =0x020EDF50
lsl r1, r1, #0x2
ldr r0, [r0, r1]
@@ -45845,7 +45845,7 @@ _0201BB8E: mul r0, r1
mov r1, #0x5a
lsl r1, r1, #0x2
- blx _u32_div_f
+ bl _u32_div_f
lsl r0, r0, #0x10
lsr r1, r0, #0x10
_0201BBA2:
@@ -45863,7 +45863,7 @@ _0201BBA2: add r1, r5, #0x0
add r2, r4, #0x0
add r3, r6, #0x0
- blx MTX_ScaleApply22
+ bl MTX_ScaleApply22
pop {r4-r6, pc}
nop
_0201BBC8: .word 0x0000FFFF
@@ -45891,14 +45891,14 @@ FUN_0201BBD0: ; 0x0201BBD0 str r5, [sp, #0x2c]
str r4, [sp, #0x30]
str r6, [sp, #0x24]
- blx _ll_mul
+ bl _ll_mul
str r0, [sp, #0x4]
add r2, r4, #0x0
ldr r0, [sp, #0x20]
add r7, r1, #0x0
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
ldr r3, [sp, #0x4]
lsl r2, r2, #0xa
@@ -45928,7 +45928,7 @@ FUN_0201BBD0: ; 0x0201BBD0 str r0, [sp, #0x34]
add r0, sp, #0x2c
add r1, sp, #0x14
- blx VEC_Normalize
+ bl VEC_Normalize
mov r1, #0x0
ldr r0, [sp, #0x0]
str r1, [sp, #0x34]
@@ -45940,10 +45940,10 @@ FUN_0201BBD0: ; 0x0201BBD0 str r5, [sp, #0x2c]
str r4, [sp, #0x30]
str r6, [sp, #0x24]
- blx VEC_Subtract
+ bl VEC_Subtract
add r0, sp, #0x14
add r1, sp, #0x8
- blx VEC_DotProduct
+ bl VEC_DotProduct
asr r0, r0, #0xc
bpl _0201BC72
neg r0, r0
@@ -45967,7 +45967,7 @@ FUN_0201BC84: ; 0x0201BC84 ldr r2, _0201BCB4 ; =0x0000323D
asr r1, r0, #0x1f
mov r3, #0x0
- blx _ll_mul
+ bl _ll_mul
add r5, r0, #0x0
ldr r0, _0201BCB8 ; =0x0000FFFF
mov r2, #0x2
@@ -45980,7 +45980,7 @@ FUN_0201BC84: ; 0x0201BC84 lsr r2, r2, #0xc
orr r2, r1
asr r1, r2, #0xc
- blx _s32_div_f
+ bl _s32_div_f
pop {r3-r5, pc}
nop
_0201BCB4: .word 0x0000323D
@@ -46678,7 +46678,7 @@ FUN_0201C1B0: ; 0x0201C1B0 ldr r0, [r0, #0x14]
add r1, r5, #0x0
lsl r2, r2, #0x8
- blx MIi_CpuCopy32
+ bl MIi_CpuCopy32
add r0, r4, #0x0
bl FUN_02016A18
add r0, r5, #0x0
@@ -46772,7 +46772,7 @@ _0201C272: ldr r1, [r1, #0x0]
ldr r0, [r1, #0x8]
ldr r1, [r1, #0x0]
- blx FUN_020AEF1C
+ bl FUN_020AEF1C
pop {r3-r5, pc}
nop
_0201C298: .word 0x021C5934
@@ -46831,7 +46831,7 @@ _0201C2FA: add r1, r4, #0x0
add r2, r6, #0x0
add r3, r7, #0x0
- blx FUN_020AEE40
+ bl FUN_020AEE40
pop {r3-r7, pc}
.balign 4
_0201C308: .word 0x021C5934
@@ -46843,7 +46843,7 @@ FUN_0201C30C: ; 0x0201C30C ldr r0, [r0, #0x0]
cmp r0, #0x0
beq _0201C322
- blx FUN_020AEEB8
+ bl FUN_020AEEB8
ldr r0, _0201C324 ; =0x021C5934
mov r1, #0x0
ldr r0, [r0, #0x0]
@@ -46864,7 +46864,7 @@ FUN_0201C328: ; 0x0201C328 ldr r2, _0201C344 ; =FUN_0201C358
add r1, r4, #0x0
add r5, r0, #0x0
- blx FUN_020B4568
+ bl FUN_020B4568
add r0, r5, #0x0
pop {r3-r5, pc}
.balign 4
@@ -47208,7 +47208,7 @@ FUN_0201C578: ; 0x0201C578 add r0, r4, #0x0
add r0, #0x3c
add r1, sp, #0x0
- blx FUN_020BC2A0
+ bl FUN_020BC2A0
add r1, r0, #0x0
bne _0201C598
add sp, #0x10
@@ -47270,7 +47270,7 @@ _0201C5DE: lsl r2, r2, #0x4
lsl r0, r0, #0x4
mul r0, r2
- blx _u32_div_f
+ bl _u32_div_f
pop {r3, pc}
.balign 4
@@ -47284,7 +47284,7 @@ FUN_0201C5FC: ; 0x0201C5FC add r0, r4, #0x0
add r0, #0x3c
add r1, sp, #0x0
- blx FUN_020BC2A0
+ bl FUN_020BC2A0
add r1, r0, #0x0
add r0, r4, #0x0
bl FUN_0201C5A4
@@ -47550,10 +47550,10 @@ FUN_0201C7B0: ; 0x0201C7B0 sub sp, #0x30
add r4, r1, #0x0
add r1, sp, #0x24
- blx VEC_Normalize
+ bl VEC_Normalize
add r0, r4, #0x0
add r1, sp, #0x18
- blx VEC_Normalize
+ bl VEC_Normalize
ldr r0, [sp, #0x24]
ldr r4, [sp, #0x18]
str r0, [sp, #0x0]
@@ -47570,14 +47570,14 @@ FUN_0201C7B0: ; 0x0201C7B0 ldr r3, [sp, #0xc]
add r1, r7, #0x0
str r0, [sp, #0x10]
- blx _ll_mul
+ bl _ll_mul
str r0, [sp, #0x14]
add r5, r1, #0x0
ldr r0, [sp, #0x0]
ldr r1, [sp, #0x4]
add r2, r4, #0x0
add r3, r6, #0x0
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
ldr r3, [sp, #0x14]
lsl r2, r2, #0xa
@@ -47600,14 +47600,14 @@ FUN_0201C7B0: ; 0x0201C7B0 add r1, r7, #0x0
add r2, r4, #0x0
add r3, r6, #0x0
- blx _ll_mul
+ bl _ll_mul
add r6, r0, #0x0
add r4, r1, #0x0
ldr r0, [sp, #0x0]
ldr r1, [sp, #0x4]
ldr r2, [sp, #0x8]
ldr r3, [sp, #0xc]
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -47636,7 +47636,7 @@ _0201C862: pop {r3-r7, pc}
_0201C86A:
add r1, r5, #0x0
- blx FX_Atan2
+ bl FX_Atan2
add sp, #0x30
pop {r3-r7, pc}
.balign 4
@@ -47685,7 +47685,7 @@ FUN_0201C878: ; 0x0201C878 ldr r0, [sp, #0x8]
ldr r1, [sp, #0x1c]
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
add r7, r0, #0x0
add r6, r1, #0x0
ldr r3, [sp, #0x68]
@@ -47694,14 +47694,14 @@ FUN_0201C878: ; 0x0201C878 sub r2, r3, r2
ldr r1, [sp, #0x34]
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
add r5, r1, #0x0
str r0, [sp, #0x3c]
ldr r1, [sp, #0x38]
ldr r2, [sp, #0x20]
ldr r3, [sp, #0x24]
add r0, r4, #0x0
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
str r0, [sp, #0x4c]
add r0, r1, #0x0
@@ -47737,7 +47737,7 @@ FUN_0201C878: ; 0x0201C878 sub r2, r3, r2
ldr r1, [sp, #0x34]
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
add r7, r0, #0x0
add r6, r1, #0x0
ldr r3, [sp, #0x68]
@@ -47746,14 +47746,14 @@ FUN_0201C878: ; 0x0201C878 sub r2, r3, r2
ldr r1, [sp, #0x28]
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
str r0, [sp, #0x40]
add r5, r1, #0x0
ldr r1, [sp, #0x38]
ldr r2, [sp, #0x14]
ldr r3, [sp, #0x18]
add r0, r4, #0x0
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
str r0, [sp, #0x50]
add r0, r1, #0x0
@@ -47789,7 +47789,7 @@ FUN_0201C878: ; 0x0201C878 sub r2, r3, r2
ldr r1, [sp, #0x28]
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
add r7, r0, #0x0
add r6, r1, #0x0
ldr r3, [sp, #0x68]
@@ -47798,14 +47798,14 @@ FUN_0201C878: ; 0x0201C878 sub r2, r3, r2
ldr r1, [sp, #0x1c]
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
add r5, r1, #0x0
str r0, [sp, #0x44]
ldr r1, [sp, #0x38]
ldr r2, [sp, #0x2c]
ldr r3, [sp, #0x30]
add r0, r4, #0x0
- blx _ll_mul
+ bl _ll_mul
mov r3, #0x2
mov r2, #0x0
lsl r3, r3, #0xa
@@ -47835,21 +47835,21 @@ FUN_0201C878: ; 0x0201C878 ldr r1, [sp, #0x34]
ldr r2, [sp, #0x2c]
ldr r3, [sp, #0x30]
- blx _ll_mul
+ bl _ll_mul
add r7, r0, #0x0
add r5, r1, #0x0
ldr r0, [sp, #0xc]
ldr r1, [sp, #0x28]
ldr r2, [sp, #0x20]
ldr r3, [sp, #0x24]
- blx _ll_mul
+ bl _ll_mul
str r0, [sp, #0x48]
add r4, r1, #0x0
ldr r0, [sp, #0x8]
ldr r1, [sp, #0x1c]
ldr r2, [sp, #0x14]
ldr r3, [sp, #0x18]
- blx _ll_mul
+ bl _ll_mul
mov r12, r0
mov r0, #0x2
add r2, r1, #0x0
@@ -47951,7 +47951,7 @@ FUN_0201CAA8: ; 0x0201CAA8 add r0, r5, #0x0
add r1, sp, #0x0
add r2, r5, #0x0
- blx MTX_Concat33
+ bl MTX_Concat33
ldr r0, [r4, #0x8]
ldr r3, _0201CB1C ; =0x020FFA38
lsl r0, r0, #0x10
@@ -47968,7 +47968,7 @@ FUN_0201CAA8: ; 0x0201CAA8 add r0, r5, #0x0
add r1, sp, #0x0
add r2, r5, #0x0
- blx MTX_Concat33
+ bl MTX_Concat33
add sp, #0x24
pop {r4-r5, pc}
nop
@@ -48000,7 +48000,7 @@ FUN_0201CB20: ; 0x0201CB20 add r0, r7, #0x0
add r1, sp, #0x0
add r2, r7, #0x0
- blx MTX_Concat33
+ bl MTX_Concat33
lsl r1, r4, #0x2
ldr r3, _0201CB78 ; =0x020EDF50
add r4, #0x5a
@@ -48012,7 +48012,7 @@ FUN_0201CB20: ; 0x0201CB20 add r0, r7, #0x0
add r1, sp, #0x0
add r2, r7, #0x0
- blx MTX_Concat33
+ bl MTX_Concat33
add sp, #0x24
pop {r4-r7, pc}
.balign 4
@@ -48033,12 +48033,12 @@ FUN_0201CB7C: ; 0x0201CB7C ldrsh r1, [r1, r2]
add r5, r3, #0x0
ldr r4, [sp, #0x18]
- blx FX_Div
+ bl FX_Div
add r2, r0, #0x0
asr r1, r6, #0x1f
add r0, r6, #0x0
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r6, #0x2
mov r2, #0x0
lsl r6, r6, #0xa
@@ -48061,7 +48061,7 @@ FUN_0201CB7C: ; 0x0201CB7C asr r3, r7, #0x1f
add r2, r7, #0x0
str r0, [r4, #0x0]
- blx _ll_mul
+ bl _ll_mul
mov r3, #0x0
add r2, r6, #0x0
add r2, r0, r2
@@ -48085,7 +48085,7 @@ FUN_0201CBEC: ; 0x0201CBEC mul r0, r2
add r0, r1, r0
lsl r0, r0, #0xc
- blx FX_Sqrt
+ bl FX_Sqrt
asr r0, r0, #0xc
pop {r3, pc}
.balign 4
@@ -48207,11 +48207,11 @@ _0201CCD0: mov r4, #0x4
add r6, r4, #0x0
_0201CCD4:
- blx TP_RequestAutoSamplingStopAsync
+ bl TP_RequestAutoSamplingStopAsync
add r0, r4, #0x0
- blx TP_WaitBusy
+ bl TP_WaitBusy
add r0, r6, #0x0
- blx TP_CheckError
+ bl TP_CheckError
cmp r0, #0x0
beq _0201CCEA
add r5, r5, #0x1
@@ -48276,7 +48276,7 @@ _0201CD4E: ldrh r0, [r0, #0x18]
cmp r0, #0x0
beq _0201CD88
- blx TP_GetLatestIndexInAuto
+ bl TP_GetLatestIndexInAuto
add r5, r0, #0x0
ldr r0, _0201CD90 ; =0x021C5944
mov r1, #0x9
@@ -48320,7 +48320,7 @@ FUN_0201CD94: ; 0x0201CD94 _0201CDA6:
add r0, sp, #0x4
add r1, r5, #0x0
- blx TP_GetCalibratedPoint
+ bl TP_GetCalibratedPoint
ldrh r0, [r6, #0x0]
add r7, r7, #0x1
add r5, #0x8
@@ -48403,11 +48403,11 @@ _0201CE38: add r1, r4, #0x0
add r2, r7, #0x0
mov r3, #0x9
- blx TP_RequestAutoSamplingStartAsync
+ bl TP_RequestAutoSamplingStartAsync
mov r0, #0x2
- blx TP_WaitBusy
+ bl TP_WaitBusy
mov r0, #0x2
- blx TP_CheckError
+ bl TP_CheckError
cmp r0, #0x0
beq _0201CE56
add r5, r5, #0x1
@@ -48536,7 +48536,7 @@ _0201CF0C: ldr r2, [sp, #0x0]
cmp r2, #0x1
bne _0201CF36
- blx _u32_div_f
+ bl _u32_div_f
str r1, [r5, #0x54]
b _0201CF3E
_0201CF36:
@@ -48603,7 +48603,7 @@ _0201CF7C: blo _0201CFB8
cmp r7, #0x4
bne _0201CFB2
- blx _u32_div_f
+ bl _u32_div_f
str r1, [r5, #0x54]
b _0201CFB8
_0201CFB2:
@@ -48721,7 +48721,7 @@ FUN_0201D060: ; 0x0201D060 mov r2, #0x3c
str r1, [r0, #0x0]
mov r0, #0x0
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
ldr r1, _0201D120 ; =0x021C5994
ldr r2, [r5, #0x0]
ldr r0, [r1, #0x0]
@@ -49954,7 +49954,7 @@ FUN_0201D9B0: ; 0x0201D9B0 push {r4, lr}
add r4, r0, #0x0
add r0, #0x10
- blx FUN_020B1A24
+ bl FUN_020B1A24
ldr r1, [r4, #0x4]
cmp r1, #0x3
beq _0201D9C8
@@ -50002,13 +50002,13 @@ _0201DA04: add r5, #0x10
add r2, r4, #0x0
add r3, r5, #0x0
- blx FUN_020B1528
+ bl FUN_020B1528
b _0201DA20
_0201DA16:
add r5, #0x10
add r2, r4, #0x0
add r3, r5, #0x0
- blx FUN_020B1768
+ bl FUN_020B1768
_0201DA20:
cmp r4, #0x1
bne _0201DA2C
@@ -50028,7 +50028,7 @@ FUN_0201DA38: ; 0x0201DA38 push {r4, lr}
add r4, r0, #0x0
add r0, #0x10
- blx FUN_020B1A24
+ bl FUN_020B1A24
ldr r1, [r4, #0x4]
cmp r1, #0x3
beq _0201DA50
@@ -50071,7 +50071,7 @@ _0201DA88: add r5, #0x10
add r2, r4, #0x0
add r3, r5, #0x0
- blx FUN_020B1340
+ bl FUN_020B1340
cmp r4, #0x1
bne _0201DAA0
mov r0, #0x1
@@ -50123,7 +50123,7 @@ _0201DAE4: .word 0x021C5994 thumb_func_start FUN_0201DAE8
FUN_0201DAE8: ; 0x0201DAE8
push {r3, lr}
- blx GX_GetBankForOBJ
+ bl GX_GetBankForOBJ
cmp r0, #0x30
bgt _0201DB18
bge _0201DB60
@@ -50224,7 +50224,7 @@ _0201DB90: ldr r0, [r0, #0x0]
str r1, [r0, #0x14]
_0201DB98:
- blx GX_GetBankForSubOBJ
+ bl GX_GetBankForSubOBJ
cmp r0, #0x0
beq _0201DBAE
cmp r0, #0x8
@@ -50427,7 +50427,7 @@ FUN_0201DD00: ; 0x0201DD00 add r0, r4, #0x0
mov r1, #0x0
lsr r2, r2, #0x3
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
_0201DD16:
pop {r4, pc}
@@ -50609,7 +50609,7 @@ FUN_0201DE4C: ; 0x0201DE4C beq _0201DE8A
add r0, r4, #0x0
add r0, #0x10
- blx FUN_020B1A14
+ bl FUN_020B1A14
ldr r1, _0201DECC ; =0x021C5994
ldr r2, [r1, #0x0]
ldr r1, [r2, #0x1c]
@@ -50635,7 +50635,7 @@ _0201DE8A: beq _0201DEC4
add r0, r4, #0x0
add r0, #0x10
- blx FUN_020B1A14
+ bl FUN_020B1A14
ldr r1, _0201DECC ; =0x021C5994
ldr r2, [r1, #0x0]
ldr r1, [r2, #0x20]
@@ -50707,7 +50707,7 @@ FUN_0201DF10: ; 0x0201DF10 add r5, r0, #0x0
add r4, r1, #0x0
add r6, r2, #0x0
- blx _s32_div_f
+ bl _s32_div_f
cmp r1, #0x0
beq _0201DF28
sub r5, r5, r1
@@ -50867,7 +50867,7 @@ FUN_0201E00C: ; 0x0201E00C mov r2, #0x28
str r1, [r0, #0x0]
mov r0, #0x0
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
ldr r0, _0201E064 ; =0x021C5998
mov r1, #0x30
ldr r0, [r0, #0x0]
@@ -51219,9 +51219,9 @@ _0201E2A4: _0201E2A6:
cmp r4, #0x0
beq _0201E2B6
- blx FUN_020B19C4
+ bl FUN_020B19C4
add r1, r4, #0x0
- blx _u32_div_f
+ bl _u32_div_f
pop {r4, pc}
_0201E2B6:
mov r0, #0x0
@@ -51269,13 +51269,13 @@ FUN_0201E2F8: ; 0x0201E2F8 mov r1, #0x0
mov r2, #0x30
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
mov r0, #0x0
mvn r0, r0
str r0, [r4, #0xc]
add r4, #0x10
add r0, r4, #0x0
- blx FUN_020B19DC
+ bl FUN_020B19DC
pop {r4, pc}
thumb_func_start FUN_0201E314
@@ -51463,7 +51463,7 @@ _0201E460: .word 0x021C5998 thumb_func_start FUN_0201E464
FUN_0201E464: ; 0x0201E464
push {r3, lr}
- blx GX_GetBankForOBJExtPltt
+ bl GX_GetBankForOBJExtPltt
cmp r0, #0x20
beq _0201E472
cmp r0, #0x40
@@ -51481,7 +51481,7 @@ _0201E47E: ldr r0, [r0, #0x0]
str r1, [r0, #0x1c]
_0201E486:
- blx GX_GetBankForSubOBJExtPltt
+ bl GX_GetBankForSubOBJExtPltt
mov r1, #0x1
lsl r1, r1, #0x8
cmp r0, r1
@@ -51516,7 +51516,7 @@ FUN_0201E4BC: ; 0x0201E4BC push {r4, lr}
add r4, r0, #0x0
add r0, #0x10
- blx FUN_020B19DC
+ bl FUN_020B19DC
ldr r0, [r4, #0x4]
mov r2, #0x1
tst r0, r2
@@ -51525,7 +51525,7 @@ FUN_0201E4BC: ; 0x0201E4BC ldr r0, [r4, #0x0]
ldr r1, [r4, #0x24]
add r3, #0x10
- blx FUN_020B1240
+ bl FUN_020B1240
_0201E4DA:
ldr r0, [r4, #0x4]
mov r2, #0x2
@@ -51535,7 +51535,7 @@ _0201E4DA: ldr r1, [r4, #0x28]
add r4, #0x10
add r3, r4, #0x0
- blx FUN_020B1240
+ bl FUN_020B1240
_0201E4EE:
pop {r4, pc}
@@ -51767,36 +51767,36 @@ _0201E666: FUN_0201E66C: ; 0x0201E66C
push {r4, lr}
add r4, r0, #0x0
- blx GX_ResetBankForBG
- blx GX_ResetBankForBGExtPltt
- blx GX_ResetBankForSubBG
- blx FUN_020C6034
- blx GX_ResetBankForOBJ
- blx GX_ResetBankForOBJExtPltt
- blx FUN_020C605C
- blx GX_ResetBankForSubOBJ
- blx GX_ResetBankForTex
- blx GX_ResetBankForTexPltt
+ bl GX_ResetBankForBG
+ bl GX_ResetBankForBGExtPltt
+ bl GX_ResetBankForSubBG
+ bl FUN_020C6034
+ bl GX_ResetBankForOBJ
+ bl GX_ResetBankForOBJExtPltt
+ bl FUN_020C605C
+ bl GX_ResetBankForSubOBJ
+ bl GX_ResetBankForTex
+ bl GX_ResetBankForTexPltt
ldr r0, [r4, #0x0]
- blx GX_SetBankForBG
+ bl GX_SetBankForBG
ldr r0, [r4, #0x4]
- blx GX_SetBankForBGExtPltt
+ bl GX_SetBankForBGExtPltt
ldr r0, [r4, #0x8]
- blx GX_SetBankForSubBG
+ bl GX_SetBankForSubBG
ldr r0, [r4, #0xc]
- blx GX_SetBankForSubBGExtPltt
+ bl GX_SetBankForSubBGExtPltt
ldr r0, [r4, #0x10]
- blx GX_SetBankForOBJ
+ bl GX_SetBankForOBJ
ldr r0, [r4, #0x14]
- blx GX_SetBankForOBJExtPltt
+ bl GX_SetBankForOBJExtPltt
ldr r0, [r4, #0x18]
- blx GX_SetBankForSubOBJ
+ bl GX_SetBankForSubOBJ
ldr r0, [r4, #0x1c]
- blx GX_SetBankForSubOBJExtPltt
+ bl GX_SetBankForSubOBJExtPltt
ldr r0, [r4, #0x20]
- blx GX_SetBankForTex
+ bl GX_SetBankForTex
ldr r0, [r4, #0x24]
- blx GX_SetBankForTexPltt
+ bl GX_SetBankForTexPltt
pop {r4, pc}
.balign 4
@@ -51906,7 +51906,7 @@ _0201E784: .word 0xFFFFE0FF thumb_func_start FUN_0201E788
FUN_0201E788: ; 0x0201E788
push {r3, lr}
- blx GX_DispOn
+ bl GX_DispOn
ldr r2, _0201E79C ; =0x04001000
mov r0, #0x1
ldr r1, [r2, #0x0]
@@ -51961,7 +51961,7 @@ FUN_0201E7D8: ; 0x0201E7D8 asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -51978,7 +51978,7 @@ FUN_0201E7D8: ; 0x0201E7D8 orr r0, r1
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -51998,7 +51998,7 @@ FUN_0201E7D8: ; 0x0201E7D8 asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
lsl r2, r2, #0xa
mov r3, #0x0
@@ -52016,7 +52016,7 @@ FUN_0201E7D8: ; 0x0201E7D8 ldrsh r2, [r2, r3]
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -52036,7 +52036,7 @@ FUN_0201E7D8: ; 0x0201E7D8 ldrsh r0, [r0, r1]
asr r3, r2, #0x1f
asr r1, r0, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -52051,7 +52051,7 @@ FUN_0201E7D8: ; 0x0201E7D8 add r5, #0x20
add r1, r5, #0x0
add r2, r0, #0x0
- blx VEC_Add
+ bl VEC_Add
pop {r3-r5, pc}
nop
_0201E8B4: .word 0x020FFA38
@@ -52069,7 +52069,7 @@ FUN_0201E8B8: ; 0x0201E8B8 asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -52086,7 +52086,7 @@ FUN_0201E8B8: ; 0x0201E8B8 orr r0, r1
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -52107,7 +52107,7 @@ FUN_0201E8B8: ; 0x0201E8B8 asr r3, r2, #0x1f
ldrsh r0, [r0, r1]
asr r1, r0, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
lsl r2, r2, #0xa
mov r3, #0x0
@@ -52125,7 +52125,7 @@ FUN_0201E8B8: ; 0x0201E8B8 ldrsh r2, [r2, r3]
asr r1, r0, #0x1f
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -52146,7 +52146,7 @@ FUN_0201E8B8: ; 0x0201E8B8 ldrsh r0, [r0, r1]
asr r3, r2, #0x1f
asr r1, r0, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -52162,7 +52162,7 @@ FUN_0201E8B8: ; 0x0201E8B8 add r5, #0x14
add r1, r5, #0x0
add r2, r0, #0x0
- blx VEC_Add
+ bl VEC_Add
pop {r3-r5, pc}
.balign 4
_0201E998: .word 0x020FFA38
@@ -52279,7 +52279,7 @@ _0201EA5C: ldr r0, [r7, #0x4]
ldr r1, [r1, #0x0]
add r0, r0, #0x1
- blx _s32_div_f
+ bl _s32_div_f
str r1, [r7, #0x4]
ldr r1, [sp, #0x0]
ldr r0, [r5, #0x64]
@@ -52298,7 +52298,7 @@ _0201EA5C: ldr r0, [r0, #0x0]
ldr r1, [r1, #0x0]
add r0, r0, #0x1
- blx _s32_div_f
+ bl _s32_div_f
ldr r0, [sp, #0x0]
str r1, [r0, #0x0]
ldr r0, [r5, #0x64]
@@ -52477,7 +52477,7 @@ FUN_0201EBA4: ; 0x0201EBA4 beq _0201EBEE
add r1, #0x48
add r2, sp, #0x10
- blx VEC_Subtract
+ bl VEC_Subtract
ldr r0, _0201EC40 ; =0x021C59A4
add r1, sp, #0x10
ldr r0, [r0, #0x0]
@@ -52531,7 +52531,7 @@ _0201EBEE: str r0, [sp, #0x0]
add r0, r4, #0x0
mov r3, #0x0
- blx G3i_LookAt_
+ bl G3i_LookAt_
ldr r1, _0201EC54 ; =0x021CED98
mov r0, #0xe8
ldr r2, [r1, #0x7c]
@@ -52719,9 +52719,9 @@ FUN_0201ED5C: ; 0x0201ED5C str r0, [r2, #0x0]
add r0, r6, #0x0
add r2, sp, #0x30
- blx VEC_Subtract
+ bl VEC_Subtract
add r0, sp, #0x30
- blx VEC_Mag
+ bl VEC_Mag
str r0, [r4, #0x38]
mov r6, #0x0
add r0, sp, #0x24
@@ -52813,7 +52813,7 @@ FUN_0201EE2C: ; 0x0201EE2C ldr r1, [r5, #0x4]
ldr r2, [r5, #0x8]
ldr r3, [r5, #0xc]
- blx G3i_PerspectiveW_
+ bl G3i_PerspectiveW_
ldr r1, _0201EEE8 ; =0x021CED98
mov r0, #0x50
ldr r2, [r1, #0x7c]
@@ -52830,11 +52830,11 @@ _0201EE6C: ldr r4, [r5, #0x38]
ldr r0, [r5, #0x0]
ldr r1, [r5, #0x4]
- blx FX_Div
+ bl FX_Div
asr r1, r0, #0x1f
asr r3, r4, #0x1f
add r2, r4, #0x0
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
mov r3, #0x0
lsl r2, r2, #0xa
@@ -52847,7 +52847,7 @@ _0201EE6C: asr r1, r4, #0x1f
add r0, r4, #0x0
asr r3, r2, #0x1f
- blx _ll_mul
+ bl _ll_mul
mov r6, #0x2
mov r2, #0x0
lsl r6, r6, #0xa
@@ -52868,7 +52868,7 @@ _0201EE6C: neg r2, r3
str r0, [sp, #0x10]
add r0, r4, #0x0
- blx G3i_OrthoW_
+ bl G3i_OrthoW_
ldr r1, _0201EEE8 ; =0x021CED98
mov r0, #0x50
ldr r2, [r1, #0x7c]
@@ -52962,12 +52962,12 @@ FUN_0201EF70: ; 0x0201EF70 add r0, #0x14
add r1, r5, #0x0
add r2, r0, #0x0
- blx VEC_Add
+ bl VEC_Add
add r4, #0x20
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r4, #0x0
- blx VEC_Add
+ bl VEC_Add
pop {r3-r5, pc}
thumb_func_start FUN_0201EF90
@@ -53489,7 +53489,7 @@ FUN_0201F318: ; 0x0201F318 bl ErrorHandling
_0201F324:
add r0, sp, #0x0
- blx MTX_Identity33_
+ bl MTX_Identity33_
add r0, r5, #0x0
add r0, #0xbc
ldr r4, [r0, #0x0]
@@ -53648,13 +53648,13 @@ FUN_0201F454: ; 0x0201F454 add r4, r1, #0x0
add r6, r2, #0x0
add r7, r3, #0x0
- blx FUN_020B7E1C
+ bl FUN_020B7E1C
str r0, [sp, #0x8]
add r0, r5, #0x0
- blx FUN_020B7E10
+ bl FUN_020B7E10
str r0, [sp, #0x4]
add r0, r5, #0x0
- blx FUN_020B7CE4
+ bl FUN_020B7CE4
str r0, [sp, #0x0]
ldr r0, [sp, #0x8]
cmp r0, #0x0
@@ -53722,9 +53722,9 @@ FUN_0201F4EC: ; 0x0201F4EC push {r3-r5, lr}
add r5, r0, #0x0
add r4, r3, #0x0
- blx FUN_020B7CF0
+ bl FUN_020B7CF0
add r0, r5, #0x0
- blx FUN_020B7C58
+ bl FUN_020B7C58
str r0, [r4, #0x0]
pop {r3-r5, pc}
@@ -53735,14 +53735,14 @@ FUN_0201F500: ; 0x0201F500 ldr r1, [r2, #0x0]
ldr r2, [r3, #0x0]
add r5, r0, #0x0
- blx FUN_020B7DFC
+ bl FUN_020B7DFC
ldr r1, [sp, #0x10]
add r0, r5, #0x0
ldr r1, [r1, #0x0]
- blx FUN_020B7CDC
+ bl FUN_020B7CDC
add r0, r4, #0x0
add r1, r5, #0x0
- blx FUN_020B7790
+ bl FUN_020B7790
pop {r3-r5, pc}
.balign 4
@@ -53792,22 +53792,22 @@ _0201F568: mov r0, #0x0
pop {r3-r7, pc}
_0201F56E:
- blx FUN_020B7E1C
+ bl FUN_020B7E1C
str r0, [sp, #0x0]
add r0, r4, #0x0
- blx FUN_020B7E10
+ bl FUN_020B7E10
str r0, [sp, #0x4]
add r0, r4, #0x0
- blx FUN_020B7CE4
+ bl FUN_020B7CE4
add r4, r0, #0x0
add r0, r5, #0x0
- blx FUN_020B7E1C
+ bl FUN_020B7E1C
add r6, r0, #0x0
add r0, r5, #0x0
- blx FUN_020B7E10
+ bl FUN_020B7E10
add r7, r0, #0x0
add r0, r5, #0x0
- blx FUN_020B7CE4
+ bl FUN_020B7CE4
ldr r1, [sp, #0x0]
cmp r1, r6
bne _0201F5AA
@@ -53859,7 +53859,7 @@ FUN_0201F5D4: ; 0x0201F5D4 add r0, r5, #0x0
ldr r1, [r5, #0x7c]
add r0, #0x24
- blx FUN_020B80B4
+ bl FUN_020B80B4
add r0, r5, #0x0
add r0, #0xa8
ldrb r0, [r0, #0x0]
@@ -53961,7 +53961,7 @@ FUN_0201F69C: ; 0x0201F69C add r0, r5, #0x0
ldr r1, [r5, #0x7c]
add r0, #0x24
- blx FUN_020B80B4
+ bl FUN_020B80B4
add r0, r4, #0x0
bl FUN_0201FBCC
add r5, #0x84
@@ -54681,7 +54681,7 @@ FUN_0201FB9C: ; 0x0201FB9C add r5, r2, #0x0
bl FUN_0201FC90
add r7, r0, #0x0
- blx FUN_020BC13C
+ bl FUN_020BC13C
add r4, r0, #0x0
ldrh r0, [r4, #0xe]
add r0, r4, r0
@@ -54691,7 +54691,7 @@ FUN_0201FB9C: ; 0x0201FB9C cmp r5, #0x0
beq _0201FBC6
add r0, r7, #0x0
- blx FUN_020BC0FC
+ bl FUN_020BC0FC
str r0, [r5, #0x0]
_0201FBC6:
add r0, r4, #0x0
@@ -54803,7 +54803,7 @@ FUN_0201FC70: ; 0x0201FC70 sub sp, #0xc
add r4, r0, #0x0
ldr r0, [r4, #0x78]
- blx FUN_020B772C
+ bl FUN_020B772C
add r4, #0x80
ldr r0, [r4, #0x0]
add r1, sp, #0x4
@@ -54907,7 +54907,7 @@ _0201FD0C: ldr r0, [r4, r1]
add r1, r1, #0x4
add r1, r4, r1
- blx thunk_FUN_020afda0_2
+ bl thunk_FUN_020afda0_2
mov r0, #0x12
mov r1, #0x1
lsl r0, r0, #0x4
@@ -55078,13 +55078,13 @@ FUN_0201FE6C: ; 0x0201FE6C mov r1, #0x0
lsl r2, r2, #0x2
str r1, [r4, #0x3c]
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
add r0, #0xb4
- blx FUN_020B1A24
+ bl FUN_020B1A24
add r0, r4, #0x0
add r0, #0xd8
- blx FUN_020B19DC
+ bl FUN_020B19DC
mov r0, #0x0
str r0, [r4, #0x30]
pop {r4, pc}
@@ -55151,7 +55151,7 @@ _0201FEA6: add r1, r4, #0x0
add r1, #0x26
ldrb r1, [r1, #0x0]
- blx FUN_020B502C
+ bl FUN_020B502C
add r0, r4, #0x0
add r0, #0x27
ldrb r2, [r0, #0x0]
@@ -55163,7 +55163,7 @@ _0201FEA6: mov r3, #0x2
and r1, r2
and r2, r3
- blx FUN_020B4F38
+ bl FUN_020B4F38
add r0, r4, #0x0
mov r2, #0x1
add r0, #0x34
@@ -55272,13 +55272,13 @@ _0201FFE4: ldr r1, [r1, #0x0]
add r0, #0xb4
add r4, #0x40
- blx FUN_020B1A14
+ bl FUN_020B1A14
mov r1, #0x0
mvn r1, r1
cmp r0, r1
beq _0202000E
ldr r0, [r4, #0x5c]
- blx FUN_020B4358
+ bl FUN_020B4358
_0202000E:
add r0, r5, #0x0
add r0, #0xec
@@ -55488,11 +55488,11 @@ _0202014A: lsl r1, r1, #0x10
ldr r0, [r4, #0x4]
lsr r1, r1, #0x10
- blx FUN_020AFC04
+ bl FUN_020AFC04
add r1, r0, #0x0
add r0, r4, #0x0
add r0, #0x8
- blx FUN_020B1EE4
+ bl FUN_020B1EE4
mov r0, #0x1
str r0, [r4, #0x10]
pop {r4, pc}
@@ -55501,11 +55501,11 @@ _02020168: add r4, #0x40
ldr r0, [r4, #0x6c]
add r1, r3, #0x0
- blx FUN_020AFC04
+ bl FUN_020AFC04
add r1, r0, #0x0
add r0, r4, #0x0
add r0, #0x8
- blx FUN_020B242C
+ bl FUN_020B242C
mov r0, #0x1
str r0, [r4, #0x10]
pop {r4, pc}
@@ -55538,7 +55538,7 @@ _020201A8: add r5, #0x40
add r0, r5, #0x0
add r0, #0x8
- blx FUN_020B0448
+ bl FUN_020B0448
mov r0, #0x1
str r0, [r5, #0x10]
add r0, r4, #0x0
@@ -55550,7 +55550,7 @@ _020201C2: add r5, #0x40
add r0, r5, #0x0
add r0, #0x8
- blx FUN_020B0448
+ bl FUN_020B0448
mov r0, #0x1
str r0, [r5, #0x10]
add r0, r4, #0x0
@@ -55578,12 +55578,12 @@ FUN_020201E4: ; 0x020201E4 _020201F4:
add r0, #0x40
add r0, #0x8
- blx FUN_020B1EC4
+ bl FUN_020B1EC4
pop {r3, pc}
_020201FE:
add r0, #0x40
add r0, #0x8
- blx FUN_020B224C
+ bl FUN_020B224C
pop {r3, pc}
thumb_func_start FUN_02020208
@@ -55599,12 +55599,12 @@ FUN_02020208: ; 0x02020208 _02020218:
add r0, #0x40
add r0, #0x8
- blx FUN_020B1EA4
+ bl FUN_020B1EA4
pop {r3, pc}
_02020222:
add r0, #0x40
add r0, #0x8
- blx FUN_020B2194
+ bl FUN_020B2194
pop {r3, pc}
thumb_func_start FUN_0202022C
@@ -55878,16 +55878,16 @@ FUN_020203CC: ; 0x020203CC lsl r0, r0, #0x6
add r1, r4, #0x0
lsl r2, r2, #0xa
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
mov r1, #0x1
add r0, r4, #0x0
lsl r1, r1, #0xa
- blx DC_FlushRange
+ bl DC_FlushRange
mov r2, #0x1
add r0, r4, #0x0
mov r1, #0x0
lsl r2, r2, #0xa
- blx GX_LoadOAM
+ bl GX_LoadOAM
add r0, r4, #0x0
bl FUN_02016A18
pop {r4, pc}
@@ -55904,12 +55904,12 @@ FUN_02020404: ; 0x02020404 lsl r0, r0, #0x6
add r1, r4, #0x0
lsl r2, r2, #0xa
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
mov r2, #0x1
add r0, r4, #0x0
mov r1, #0x0
lsl r2, r2, #0xa
- blx GXS_LoadOAM
+ bl GXS_LoadOAM
add r0, r4, #0x0
bl FUN_02016A18
pop {r4, pc}
@@ -56048,12 +56048,12 @@ FUN_0202050C: ; 0x0202050C add r4, #0x40
ldr r0, [r4, #0x4]
mov r1, #0x0
- blx FUN_020AFC04
+ bl FUN_020AFC04
add r4, #0x8
add r1, r0, #0x0
ldr r2, [r5, #0x40]
add r0, r4, #0x0
- blx FUN_020B1F80
+ bl FUN_020B1F80
pop {r3-r5, pc}
.balign 4
@@ -56065,22 +56065,22 @@ FUN_0202052C: ; 0x0202052C add r4, r6, #0x0
add r4, #0x40
add r5, r0, #0x0
- blx FUN_020B43A4
+ bl FUN_020B43A4
str r0, [r4, #0x5c]
ldr r0, [r4, #0x4]
mov r1, #0x0
ldr r5, [r5, #0x4]
- blx FUN_020AFC04
+ bl FUN_020AFC04
str r0, [sp, #0x18]
add r0, r6, #0x0
add r0, #0xb4
mov r1, #0x1
- blx FUN_020B1A14
+ bl FUN_020B1A14
add r7, r0, #0x0
add r0, r6, #0x0
add r0, #0xb4
mov r1, #0x2
- blx FUN_020B1A14
+ bl FUN_020B1A14
mov r1, #0x0
mvn r1, r1
str r1, [sp, #0x0]
@@ -56097,7 +56097,7 @@ FUN_0202052C: ; 0x0202052C ldr r2, [r6, #0x40]
ldr r3, [r4, #0x5c]
add r0, #0x8
- blx FUN_020B1EFC
+ bl FUN_020B1EFC
add sp, #0x1c
pop {r4-r7, pc}
@@ -56111,10 +56111,10 @@ FUN_02020588: ; 0x02020588 ldr r0, [r4, #0x6c]
add r7, r1, #0x0
mov r1, #0x0
- blx FUN_020AFC04
+ bl FUN_020AFC04
str r0, [sp, #0xc]
ldr r0, [r4, #0x68]
- blx FUN_020B23D8
+ bl FUN_020B23D8
add r6, r0, #0x0
mov r1, #0x28
add r0, r7, #0x0
@@ -56137,11 +56137,11 @@ FUN_02020588: ; 0x02020588 ldr r1, [r4, #0x70]
ldr r2, [r4, #0x74]
add r0, #0x8
- blx FUN_020B20C8
+ bl FUN_020B20C8
add r4, #0x8
ldr r1, [sp, #0xc]
add r0, r4, #0x0
- blx FUN_020B242C
+ bl FUN_020B242C
add sp, #0x10
pop {r3-r7, pc}
.balign 4
@@ -56166,9 +56166,9 @@ _02020600: _02020602:
cmp r4, #0x0
beq _02020612
- blx FUN_020B19C4
+ bl FUN_020B19C4
add r1, r4, #0x0
- blx _u32_div_f
+ bl _u32_div_f
pop {r4, pc}
_02020612:
mov r0, #0x0
@@ -56194,19 +56194,19 @@ FUN_02020618: ; 0x02020618 ldr r0, [r5, r0]
add r1, #0xb4
add r2, #0xd8
- blx thunk_FUN_020b5040
+ bl thunk_FUN_020b5040
mov r0, #0x45
lsl r0, r0, #0x2
ldr r0, [r5, r0]
- blx FUN_020B326C
- blx FUN_020B2B58
+ bl FUN_020B326C
+ bl FUN_020B2B58
add r1, r4, #0x0
mov r0, #0x45
add r1, #0x26
lsl r0, r0, #0x2
ldrb r1, [r1, #0x0]
ldr r0, [r5, r0]
- blx FUN_020B502C
+ bl FUN_020B502C
add r0, r4, #0x0
add r0, #0x26
ldrb r0, [r0, #0x0]
@@ -56222,7 +56222,7 @@ FUN_02020618: ; 0x02020618 mov r3, #0x2
and r1, r2
and r2, r3
- blx FUN_020B4F38
+ bl FUN_020B4F38
b _0202068E
_02020680:
mov r0, #0x45
@@ -56230,12 +56230,12 @@ _02020680: mov r1, #0x0
ldr r0, [r5, r0]
add r2, r1, #0x0
- blx FUN_020B4F38
+ bl FUN_020B4F38
_0202068E:
ldr r0, [sp, #0x0]
ldr r1, [sp, #0x4]
ldr r2, [sp, #0x8]
- blx FUN_020B2A08
+ bl FUN_020B2A08
add r0, r4, #0x0
add r0, #0x26
ldrb r0, [r0, #0x0]
@@ -56244,11 +56244,11 @@ _0202068E: ldr r0, [r4, #0xc]
ldr r1, [r4, #0x10]
ldr r2, [r4, #0x14]
- blx FUN_020B2A08
+ bl FUN_020B2A08
ldr r0, [r4, #0x18]
ldr r1, [r4, #0x1c]
ldr r2, [r4, #0x20]
- blx FUN_020B28B4
+ bl FUN_020B28B4
ldrh r0, [r4, #0x24]
ldr r2, _02020770 ; =0x020FFA38
asr r0, r0, #0x4
@@ -56258,14 +56258,14 @@ _0202068E: lsl r1, r1, #0x1
ldrsh r0, [r2, r0]
ldrsh r1, [r2, r1]
- blx FUN_020B2794
+ bl FUN_020B2794
ldr r0, [r4, #0xc]
ldr r1, [r4, #0x10]
ldr r2, [r4, #0x14]
neg r0, r0
neg r1, r1
neg r2, r2
- blx FUN_020B2A08
+ bl FUN_020B2A08
_020206DC:
add r0, r4, #0x0
add r0, #0x28
@@ -56328,16 +56328,16 @@ _0202074E: add r4, #0x40
add r4, #0x8
add r0, r4, #0x0
- blx FUN_020B317C
+ bl FUN_020B317C
b _02020764
_0202075A:
add r4, #0x40
add r4, #0x8
add r0, r4, #0x0
- blx FUN_020B2D9C
+ bl FUN_020B2D9C
_02020764:
- blx FUN_020B2B08
- blx FUN_020B31F0
+ bl FUN_020B2B08
+ bl FUN_020B31F0
add sp, #0xc
pop {r3-r6, pc}
.balign 4
@@ -56895,9 +56895,9 @@ FUN_02020AFC: ; 0x02020AFC strh r0, [r1, #0x0]
ldr r1, _02020B2C ; =FUN_02020B30
mov r0, #0x40
- blx OS_SetIrqFunction
+ bl OS_SetIrqFunction
mov r0, #0x40
- blx OS_EnableIrqMask
+ bl OS_EnableIrqMask
pop {r3, pc}
.balign 4
_02020B24: .word 0x021C59B0
@@ -56946,7 +56946,7 @@ _02020B7C: .word FUN_02020B30 FUN_02020B80: ; 0x02020B80
push {r4-r5, lr}
sub sp, #0xc
- blx OS_DisableInterrupts
+ bl OS_DisableInterrupts
ldr r1, _02020BE4 ; =0x0400010C
add r3, sp, #0x0
ldrh r1, [r1, #0x0]
@@ -56978,7 +56978,7 @@ FUN_02020B80: ; 0x02020B80 str r2, [sp, #0x4]
str r3, [sp, #0x8]
_02020BC4:
- blx OS_RestoreInterrupts
+ bl OS_RestoreInterrupts
ldr r2, [sp, #0x4]
ldr r1, [sp, #0x8]
lsr r0, r2, #0x10
@@ -57015,7 +57015,7 @@ FUN_02020BFC: ; 0x02020BFC ldr r2, _02020C10 ; =0x000082EA
lsl r0, r0, #0x6
mov r3, #0x0
- blx _ll_udiv
+ bl _ll_udiv
pop {r3, pc}
.balign 4
_02020C10: .word 0x000082EA
@@ -57029,7 +57029,7 @@ FUN_02020C14: ; 0x02020C14 ldr r2, _02020C28 ; =0x01FF6210
lsl r0, r0, #0x6
mov r3, #0x0
- blx _ll_udiv
+ bl _ll_udiv
pop {r3, pc}
.balign 4
_02020C28: .word 0x01FF6210
@@ -57040,7 +57040,7 @@ ErrorHandling: ; 0x02020C2C bl FUN_02031810
cmp r0, #0x0
beq _02020C42
- blx OS_GetProcMode
+ bl OS_GetProcMode
cmp r0, #0x12
beq _02020C42
bl FUN_0208A9B8
@@ -57881,7 +57881,7 @@ FUN_02021220: ; 0x02021220 push {r3, lr}
ldr r0, [r0, #0x0]
bl FUN_02020E0C
- blx FUN_020BC0FC
+ bl FUN_020BC0FC
pop {r3, pc}
.balign 4
@@ -57897,7 +57897,7 @@ FUN_02021230: ; 0x02021230 _02021240:
ldr r0, [r0, #0x10]
_02021242:
- blx FUN_020BC0FC
+ bl FUN_020BC0FC
pop {r3, pc}
thumb_func_start FUN_02021248
@@ -57908,13 +57908,13 @@ FUN_02021248: ; 0x02021248 str r1, [sp, #0x0]
str r2, [sp, #0x4]
str r3, [sp, #0x8]
- blx FUN_020B7E1C
+ bl FUN_020B7E1C
add r7, r0, #0x0
add r0, r5, #0x0
- blx FUN_020B7E10
+ bl FUN_020B7E10
add r6, r0, #0x0
add r0, r5, #0x0
- blx FUN_020B7CE4
+ bl FUN_020B7CE4
add r4, r0, #0x0
cmp r7, #0x0
beq _0202127E
@@ -57969,13 +57969,13 @@ FUN_020212B8: ; 0x020212B8 bl FUN_020212E4
ldr r1, [r4, #0x4]
add r0, r4, #0x0
- blx DC_FlushRange
+ bl DC_FlushRange
add r0, r4, #0x0
mov r1, #0x1
- blx FUN_020B7D28
+ bl FUN_020B7D28
add r0, r4, #0x0
mov r1, #0x1
- blx FUN_020B7C78
+ bl FUN_020B7C78
pop {r4, pc}
.balign 4
@@ -57984,10 +57984,10 @@ FUN_020212E4: ; 0x020212E4 push {r3-r5, lr}
add r5, r0, #0x0
add r4, r3, #0x0
- blx FUN_020B7DFC
+ bl FUN_020B7DFC
add r0, r5, #0x0
add r1, r4, #0x0
- blx FUN_020B7CDC
+ bl FUN_020B7CDC
pop {r3-r5, pc}
thumb_func_start FUN_020212F8
@@ -57997,9 +57997,9 @@ FUN_020212F8: ; 0x020212F8 add r4, r0, #0x0
add r1, sp, #0x4
add r2, sp, #0x0
- blx FUN_020B7CF0
+ bl FUN_020B7CF0
add r0, r4, #0x0
- blx FUN_020B7C58
+ bl FUN_020B7C58
add sp, #0x8
pop {r4, pc}
@@ -58016,7 +58016,7 @@ FUN_02021310: ; 0x02021310 add r1, r6, #0x0
add r2, r5, #0x0
add r4, r0, #0x0
- blx memcpy
+ bl memcpy
add r0, r4, #0x0
pop {r4-r6, pc}
.balign 4
@@ -58025,7 +58025,7 @@ FUN_02021310: ; 0x02021310 FUN_02021334: ; 0x02021334
push {r3-r5, lr}
add r5, r0, #0x0
- blx FUN_020BC0FC
+ bl FUN_020BC0FC
add r4, r0, #0x0
bne _02021344
bl ErrorHandling
@@ -58040,7 +58040,7 @@ FUN_0202134C: ; 0x0202134C push {r3-r5, lr}
add r5, r0, #0x0
add r4, r1, #0x0
- blx FUN_020B33A0
+ bl FUN_020B33A0
add r5, #0x80
str r4, [r5, #0x0]
pop {r3-r5, pc}
@@ -58052,7 +58052,7 @@ FUN_0202135C: ; 0x0202135C add r4, r1, #0x0
add r6, r2, #0x0
add r7, r3, #0x0
- blx FUN_020B3334
+ bl FUN_020B3334
add r2, r5, #0x0
ldmia r4!, {r0-r1}
stmia r2!, {r0-r1}
@@ -58068,7 +58068,7 @@ FUN_0202135C: ; 0x0202135C cmp r0, #0x0
beq _0202138C
add r1, r5, #0x0
- blx FUN_020B3390
+ bl FUN_020B3390
_0202138C:
pop {r3-r7, pc}
.balign 4
@@ -58150,14 +58150,14 @@ _02021400: ldr r2, [sp, #0x28]
ldr r3, [sp, #0x2c]
add r0, r4, #0x0
- blx _ll_mul
+ bl _ll_mul
add r7, r1, #0x0
str r0, [sp, #0x30]
ldr r1, [sp, #0x24]
ldr r2, [sp, #0x1c]
ldr r3, [sp, #0x20]
add r0, r4, #0x0
- blx _ll_mul
+ bl _ll_mul
add r2, r0, #0x0
add r3, r1, #0x0
mov r0, #0x2
@@ -58187,14 +58187,14 @@ _02021400: str r0, [sp, #0x34]
ldr r0, [sp, #0x10]
ldr r1, [sp, #0x34]
- blx _ll_mul
+ bl _ll_mul
str r0, [sp, #0x38]
add r4, r1, #0x0
ldr r0, [sp, #0x10]
ldr r1, [sp, #0x34]
ldr r2, [sp, #0x1c]
ldr r3, [sp, #0x20]
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
ldr r3, [sp, #0x38]
lsl r2, r2, #0xa
@@ -58230,14 +58230,14 @@ _02021400: ldr r0, [sp, #0xc]
ldr r2, [sp, #0x48]
ldr r3, [sp, #0x4c]
- blx _ll_mul
+ bl _ll_mul
str r0, [sp, #0x50]
add r5, r1, #0x0
ldr r0, [sp, #0xc]
ldr r1, [sp, #0x44]
ldr r2, [sp, #0x3c]
ldr r3, [sp, #0x40]
- blx _ll_mul
+ bl _ll_mul
mov r2, #0x2
ldr r3, [sp, #0x50]
lsl r2, r2, #0xa
@@ -58265,14 +58265,14 @@ _02021400: ldr r1, [sp, #0x54]
ldr r2, [sp, #0x48]
ldr r3, [sp, #0x4c]
- blx _ll_mul
+ bl _ll_mul
str r0, [sp, #0x58]
str r1, [sp, #0x4]
ldr r0, [sp, #0x8]
ldr r1, [sp, #0x54]
ldr r2, [sp, #0x3c]
ldr r3, [sp, #0x40]
- blx _ll_mul
+ bl _ll_mul
mov r12, r0
add r2, r1, #0x0
mov r0, #0x2
@@ -59038,7 +59038,7 @@ _02021AA2: add r0, #0x8
add r1, #0x8
lsl r2, r2, #0x1
- blx memcpy
+ bl memcpy
ldrh r0, [r4, #0x2]
strh r0, [r5, #0x2]
pop {r3-r5, pc}
@@ -59150,7 +59150,7 @@ _02021B74: _02021B80:
add r0, r6, #0x0
add r1, r4, #0x0
- blx _u32_div_f
+ bl _u32_div_f
lsl r0, r0, #0x10
lsr r1, r0, #0x10
add r0, r4, #0x0
@@ -59220,7 +59220,7 @@ _02021BEC: _02021BFA:
add r0, r4, #0x0
mov r1, #0xa
- blx _u32_div_f
+ bl _u32_div_f
add r4, r0, #0x0
bne _02021B80
_02021C06:
@@ -59301,7 +59301,7 @@ _02021C98: add r1, r2, #0x0
add r2, r7, #0x0
add r3, r5, #0x0
- blx _ll_mul
+ bl _ll_mul
add r2, r1, #0x0
ldr r1, [sp, #0x8]
add r0, r1, r0
@@ -59313,7 +59313,7 @@ _02021C98: add r1, r5, #0x0
mov r2, #0xa
mov r3, #0x0
- blx _ll_mul
+ bl _ll_mul
add r7, r0, #0x0
ldr r0, [sp, #0x4]
add r5, r1, #0x0
@@ -59589,7 +59589,7 @@ _02021EA8: add r0, #0x8
add r1, r7, #0x0
add r2, r6, #0x0
- blx memcpy
+ bl memcpy
mov r2, #0x0
cmp r4, #0x0
bls _02021ED4
@@ -59643,7 +59643,7 @@ _02021F0C: add r0, r6, #0x0
add r1, r5, #0x0
lsl r2, r2, #0x1
- blx memcpy
+ bl memcpy
pop {r4-r6, pc}
_02021F22:
bl ErrorHandling
@@ -59710,7 +59710,7 @@ _02021F7A: add r2, r2, #0x1
add r1, #0x8
lsl r2, r2, #0x1
- blx memcpy
+ bl memcpy
ldrh r1, [r5, #0x2]
ldrh r0, [r4, #0x2]
add r0, r1, r0
@@ -60242,15 +60242,15 @@ FUN_02022318: ; 0x02022318 bl FUN_02016998
add r4, r0, #0x0
str r6, [r4, #0x0]
- blx FUN_020BB7F4
- blx G3X_InitMtxStack
+ bl FUN_020BB7F4
+ bl G3X_InitMtxStack
mov r1, #0x2
ldr r0, _020223B8 ; =0x04000540
cmp r7, #0x0
str r1, [r0, #0x0]
bne _02022364
lsl r0, r5, #0x7
- blx FUN_020AFA28
+ bl FUN_020AFA28
add r6, r0, #0x0
ldr r0, [r4, #0x0]
add r1, r6, #0x0
@@ -60262,20 +60262,20 @@ FUN_02022318: ; 0x02022318 lsl r0, r5, #0x11
mov r1, #0x0
add r3, r6, #0x0
- blx FUN_020AF9C4
+ bl FUN_020AF9C4
b _0202236E
_02022364:
lsl r0, r5, #0x10
lsr r0, r0, #0x10
mov r1, #0x1
- blx FUN_020AEB70
+ bl FUN_020AEB70
_0202236E:
ldr r0, [sp, #0x4]
cmp r0, #0x0
bne _02022398
ldr r0, [sp, #0x20]
lsl r0, r0, #0x8
- blx FUN_020AFBFC
+ bl FUN_020AFBFC
add r5, r0, #0x0
ldr r0, [r4, #0x0]
add r1, r5, #0x0
@@ -60286,14 +60286,14 @@ _0202236E: lsl r0, r0, #0xd
add r2, r5, #0x0
mov r3, #0x1
- blx FUN_020AFBA8
+ bl FUN_020AFBA8
b _020223A4
_02022398:
ldr r0, [sp, #0x20]
mov r1, #0x1
lsl r0, r0, #0x1d
lsr r0, r0, #0x10
- blx FUN_020AEB70
+ bl FUN_020AEB70
_020223A4:
ldr r0, [sp, #0x24]
cmp r0, #0x0
@@ -60359,13 +60359,13 @@ FUN_020223D4: ; 0x020223D4 add r1, r0, #0x0
add r2, r0, #0x0
add r3, r0, #0x0
- blx G3X_SetFog
+ bl G3X_SetFog
mov r0, #0x0
ldr r2, _02022444 ; =0x00007FFF
add r1, r0, #0x0
mov r3, #0x3f
str r0, [sp, #0x0]
- blx G3X_SetClearColor
+ bl G3X_SetClearColor
ldr r1, _02022448 ; =0xBFFF0000
ldr r0, _0202244C ; =0x04000580
str r1, [r0, #0x0]
@@ -60381,34 +60381,34 @@ _0202244C: .word 0x04000580 thumb_func_start FUN_02022450
FUN_02022450: ; 0x02022450
push {r3, lr}
- blx FS_IsAvailable
+ bl FS_IsAvailable
cmp r0, #0x0
bne _02022460
- blx OS_Terminate
+ bl OS_Terminate
pop {r3, pc}
_02022460:
ldr r0, _020224BC ; =0x027FF00C
ldr r0, [r0, #0x0]
cmp r0, #0x0
bne _0202248A
- blx CARD_Init
+ bl CARD_Init
mov r2, #0x16
ldr r0, _020224C0 ; =0x027FFE00
ldr r1, _020224C4 ; =0x027FF000
lsl r2, r2, #0x4
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
mov r2, #0x16
ldr r0, _020224C0 ; =0x027FFE00
ldr r1, _020224C8 ; =0x027FFA80
lsl r2, r2, #0x4
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r1, _020224CC ; =0x4A414441
ldr r0, _020224BC ; =0x027FF00C
str r1, [r0, #0x0]
_0202248A:
ldr r0, _020224D0 ; =0x020EE6D4
mov r1, #0x3
- blx FS_FindArchive
+ bl FS_FindArchive
ldr r1, _020224C4 ; =0x027FF000
ldr r2, [r1, #0x48]
str r2, [r0, #0x2c]
@@ -60427,7 +60427,7 @@ _0202248A: cmp r1, r0
beq _020224B8
_020224B4:
- blx OS_Terminate
+ bl OS_Terminate
_020224B8:
pop {r3, pc}
nop
@@ -60445,17 +60445,17 @@ FUN_020224D8: ; 0x020224D8 sub sp, #0x48
add r4, r0, #0x0
add r0, sp, #0x0
- blx FS_InitFile
+ bl FS_InitFile
add r0, sp, #0x0
add r1, r4, #0x0
- blx FS_OpenFile
+ bl FS_OpenFile
cmp r0, #0x0
beq _020224FC
ldr r1, [sp, #0x24]
ldr r0, _02022500 ; =0x027FFC2C
str r1, [r0, #0x0]
mov r0, #0x0
- blx OS_ResetSystem
+ bl OS_ResetSystem
_020224FC:
add sp, #0x48
pop {r4, pc}
@@ -60521,7 +60521,7 @@ FUN_0202254C: ; 0x0202254C ldr r2, _020225E0 ; =0x000204A8
mov r0, #0x0
add r1, r4, #0x0
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
ldr r0, _020225E4 ; =0x021C59C8
str r4, [r0, #0x0]
bl FUN_02023570
@@ -60534,7 +60534,7 @@ FUN_0202254C: ; 0x0202254C add r0, r4, #0x0
ldr r1, _020225E8 ; =0x00001021
add r0, #0x14
- blx MATHi_CRC16InitTable
+ bl MATHi_CRC16InitTable
ldr r0, _020225EC ; =0x00020224
add r0, r4, r0
bl FUN_020230E4
@@ -60547,7 +60547,7 @@ FUN_0202254C: ; 0x0202254C mov r0, #0x0
add r1, r4, r1
mov r2, #0x8
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r0, r4, #0x0
bl FUN_02022AD8
str r0, [r4, #0x10]
@@ -60686,7 +60686,7 @@ _0202267A: mvn r0, r0
add r1, r6, #0x0
lsl r2, r2, #0xc
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
mov r4, #0x0
mov r7, #0x1
add r5, r4, #0x0
@@ -61984,18 +61984,18 @@ _02023006: add r0, r0, #0x4
cmp r3, #0x2
blt _02023006
- blx CARD_TryWaitBackupAsync
+ bl CARD_TryWaitBackupAsync
cmp r0, #0x0
bne _02023034
- blx CARD_CancelBackupAsync
+ bl CARD_CancelBackupAsync
ldr r0, [r4, #0x10]
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- blx CARD_UnlockBackup
+ bl CARD_UnlockBackup
ldr r0, [r4, #0x10]
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- blx OS_ReleaseLockID
+ bl OS_ReleaseLockID
_02023034:
mov r0, #0x1
bl FUN_02016454
@@ -62042,7 +62042,7 @@ FUN_02023074: ; 0x02023074 add r0, sp, #0x0
mov r1, #0xff
mov r2, #0x14
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r4, #0x0
add r1, r5, #0x0
bl FUN_020228A4
@@ -62243,7 +62243,7 @@ FUN_020231F4: ; 0x020231F4 add r1, r6, #0x0
lsl r2, r2, #0x10
ldr r4, _02023240 ; =0x020EE700
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
ldr r0, _02023244 ; =0x020EE6DC
mov r7, #0x0
ldr r0, [r0, #0x0]
@@ -62257,7 +62257,7 @@ _02023216: ldr r1, [sp, #0x4]
mov r0, #0x0
add r1, r6, r1
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
ldr r0, [sp, #0x4]
ldr r1, [r4, #0xc]
add r0, r6, r0
@@ -62290,7 +62290,7 @@ FUN_02023248: ; 0x02023248 add r3, #0xe
strh r2, [r4, #0xc]
add r2, r3, #0x0
- blx MATH_CalcCRC16CCITT
+ bl MATH_CalcCRC16CCITT
strh r0, [r4, #0xe]
pop {r3-r5, pc}
nop
@@ -62323,7 +62323,7 @@ _02023298: add r3, #0xe
add r0, #0x14
add r2, r3, #0x0
- blx MATH_CalcCRC16CCITT
+ bl MATH_CalcCRC16CCITT
ldrh r1, [r4, #0xe]
cmp r1, r0
bne _020232AC
@@ -62670,7 +62670,7 @@ _0202356C: .word 0x000204A0 thumb_func_start FUN_02023570
FUN_02023570: ; 0x02023570
push {r3-r5, lr}
- blx OS_GetLockID
+ bl OS_GetLockID
add r4, r0, #0x0
mov r0, #0x2
mvn r0, r0
@@ -62680,16 +62680,16 @@ FUN_02023570: ; 0x02023570 _02023584:
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- blx CARD_LockBackup
+ bl CARD_LockBackup
ldr r0, _020235C8 ; =0x00001302
- blx CARD_IdentifyBackup
+ bl CARD_IdentifyBackup
cmp r0, #0x0
beq _0202359A
ldr r5, _020235C8 ; =0x00001302
b _020235AA
_0202359A:
ldr r0, _020235CC ; =0x00001202
- blx CARD_IdentifyBackup
+ bl CARD_IdentifyBackup
cmp r0, #0x0
beq _020235A8
ldr r5, _020235CC ; =0x00001202
@@ -62699,10 +62699,10 @@ _020235A8: _020235AA:
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- blx CARD_UnlockBackup
+ bl CARD_UnlockBackup
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- blx OS_ReleaseLockID
+ bl OS_ReleaseLockID
cmp r5, #0x0
beq _020235C2
mov r0, #0x1
@@ -62737,7 +62737,7 @@ FUN_020235EC: ; 0x020235EC add r5, r0, #0x0
add r6, r1, #0x0
add r7, r2, #0x0
- blx OS_GetLockID
+ bl OS_GetLockID
add r4, r0, #0x0
mov r0, #0x2
mvn r0, r0
@@ -62747,7 +62747,7 @@ FUN_020235EC: ; 0x020235EC _02023608:
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- blx CARD_LockBackup
+ bl CARD_LockBackup
mov r3, #0x0
str r3, [sp, #0x0]
mov r1, #0x1
@@ -62759,15 +62759,15 @@ _02023608: add r1, r6, #0x0
add r2, r7, #0x0
str r3, [sp, #0x10]
- blx CARDi_RequestStreamCommand
- blx CARD_WaitBackupAsync
+ bl CARDi_RequestStreamCommand
+ bl CARD_WaitBackupAsync
add r5, r0, #0x0
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- blx CARD_UnlockBackup
+ bl CARD_UnlockBackup
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- blx OS_ReleaseLockID
+ bl OS_ReleaseLockID
cmp r5, #0x0
bne _02023652
ldr r0, _02023658 ; =0x021C59C8
@@ -62798,7 +62798,7 @@ FUN_02023668: ; 0x02023668 add r5, r0, #0x0
add r6, r1, #0x0
add r7, r2, #0x0
- blx OS_GetLockID
+ bl OS_GetLockID
add r4, r0, #0x0
mov r0, #0x2
mvn r0, r0
@@ -62808,7 +62808,7 @@ FUN_02023668: ; 0x02023668 _02023684:
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- blx CARD_LockBackup
+ bl CARD_LockBackup
mov r0, #0x0
str r0, [sp, #0x0]
str r0, [sp, #0x4]
@@ -62820,7 +62820,7 @@ _02023684: mov r2, #0x4
add r3, r0, #0x0
str r0, [sp, #0x10]
- blx CARDi_RequestStreamCommand
+ bl CARDi_RequestStreamCommand
cmp r0, #0x0
bne _020236B2
add r0, r4, #0x0
@@ -62843,7 +62843,7 @@ _020236B2: add r0, r6, #0x0
add r1, r5, #0x0
add r2, r7, #0x0
- blx CARDi_RequestStreamCommand
+ bl CARDi_RequestStreamCommand
add r0, r4, #0x0
add sp, #0x18
pop {r3-r7, pc}
@@ -62862,11 +62862,11 @@ FUN_020236E4: ; 0x020236E4 bne _02023738
lsl r0, r5, #0x10
lsr r0, r0, #0x10
- blx CARD_UnlockBackup
+ bl CARD_UnlockBackup
lsl r0, r5, #0x10
lsr r0, r0, #0x10
- blx OS_ReleaseLockID
- blx CARD_GetResultCode
+ bl OS_ReleaseLockID
+ bl CARD_GetResultCode
cmp r0, #0x0
beq _02023714
cmp r0, #0x4
@@ -62907,10 +62907,10 @@ FUN_02023740: ; 0x02023740 lsl r0, r5, #0x10
lsr r0, r0, #0x10
add r4, r1, #0x0
- blx CARD_UnlockBackup
+ bl CARD_UnlockBackup
lsl r0, r5, #0x10
lsr r0, r0, #0x10
- blx OS_ReleaseLockID
+ bl OS_ReleaseLockID
ldr r0, _02023768 ; =0x021C59C8
ldr r0, [r0, #0x0]
bl FUN_02016A18
@@ -62933,7 +62933,7 @@ FUN_02023770: ; 0x02023770 mov r0, #0x0
add r1, r4, #0x0
mov r2, #0x5c
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r4, #0x10
add r0, r4, #0x0
bl FUN_02023840
@@ -62960,14 +62960,14 @@ FUN_020237A0: ; 0x020237A0 push {r4, lr}
sub sp, #0x50
add r4, r0, #0x0
- blx OS_GetOwnerRtcOffset
+ bl OS_GetOwnerRtcOffset
str r0, [r4, #0x0]
add r0, r4, #0x0
add r0, #0x8
str r1, [r4, #0x4]
- blx OS_GetMacAddress
+ bl OS_GetMacAddress
add r0, sp, #0x0
- blx OS_GetOwnerInfo
+ bl OS_GetOwnerInfo
add r0, sp, #0x0
ldrb r1, [r0, #0x2]
strb r1, [r4, #0xe]
@@ -62983,7 +62983,7 @@ FUN_020237CC: ; 0x020237CC sub sp, #0x8
add r4, r0, #0x0
add r0, sp, #0x0
- blx OS_GetMacAddress
+ bl OS_GetMacAddress
mov r2, #0x0
add r3, sp, #0x0
_020237DC:
@@ -63009,7 +63009,7 @@ _020237EC: FUN_020237FC: ; 0x020237FC
push {r4, lr}
add r4, r0, #0x0
- blx OS_GetOwnerRtcOffset
+ bl OS_GetOwnerRtcOffset
ldr r3, [r4, #0x0]
ldr r2, [r4, #0x4]
eor r0, r3
@@ -63072,12 +63072,12 @@ FUN_02023840: ; 0x02023840 add r1, #0x14
bl FUN_0201265C
add r0, r4, #0x4
- blx RTC_ConvertDateToDay
+ bl RTC_ConvertDateToDay
add r1, r4, #0x0
str r0, [r4, #0x20]
add r0, r4, #0x4
add r1, #0x14
- blx RTC_ConvertDateTimeToSecond
+ bl RTC_ConvertDateTimeToSecond
str r0, [r4, #0x24]
str r1, [r4, #0x28]
mov r0, #0x0
@@ -63132,7 +63132,7 @@ FUN_020238A4: ; 0x020238A4 add r1, #0x14
bl FUN_0201265C
add r0, r4, #0x4
- blx RTC_ConvertDateToDay
+ bl RTC_ConvertDateToDay
str r0, [r4, #0x20]
pop {r4, pc}
.balign 4
@@ -63149,7 +63149,7 @@ FUN_020238C8: ; 0x020238C8 mov r0, #0x0
add r1, r4, #0x0
mov r2, #0x2c
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r0, r4, #0x0
bl FUN_02024F50
add r0, r4, #0x4
@@ -63224,7 +63224,7 @@ FUN_02023948: ; 0x02023948 mov r1, #0x0
mov r2, #0x20
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
mov r0, #0x2
strb r0, [r4, #0x19]
pop {r4, pc}
@@ -63738,7 +63738,7 @@ FUN_02023C48: ; 0x02023C48 add r4, r0, #0x0
mov r1, #0x0
lsl r2, r2, #0x4
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
bl FUN_020669A0
add r0, r4, #0x0
@@ -64792,7 +64792,7 @@ FUN_02024378: ; 0x02024378 mov r1, #0x0
lsl r2, r2, #0x2
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, _020243C0 ; =0xBEEFCAFE
mov r1, #0x0
str r0, [r4, #0x0]
@@ -64802,7 +64802,7 @@ FUN_02024378: ; 0x02024378 sub r0, #0x2d
add r0, r4, r0
mov r1, #0xff
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
mov r1, #0xff
add r0, r1, #0x0
add r0, #0x9
@@ -66285,7 +66285,7 @@ FUN_02024E6C: ; 0x02024E6C ldr r2, _02024EA4 ; =0x0000074C
mov r0, #0x0
add r1, r4, #0x0
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r0, r4, #0x0
bl FUN_020250A4
mov r0, #0x7
@@ -66296,12 +66296,12 @@ FUN_02024E6C: ; 0x02024E6C ldr r0, _02024EAC ; =0x0000FFFF
add r1, r4, r1
mov r2, #0x8
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
ldr r1, _02024EB0 ; =0x00000734
ldr r0, _02024EAC ; =0x0000FFFF
add r1, r4, r1
mov r2, #0xb
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
pop {r4, pc}
.balign 4
_02024EA4: .word 0x0000074C
@@ -66410,7 +66410,7 @@ FUN_02024F50: ; 0x02024F50 add r4, r0, #0x0
mov r1, #0x0
mov r2, #0x2
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldrh r1, [r4, #0x0]
mov r0, #0xf
bic r1, r0
@@ -66625,7 +66625,7 @@ FUN_020250A4: ; 0x020250A4 mov r1, #0x0
lsl r2, r2, #0x8
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r1, #0x0
add r0, r1, #0x0
_020250B6:
@@ -67062,12 +67062,12 @@ FUN_02025374: ; 0x02025374 mov r1, #0x3c
str r0, [sp, #0x0]
add r0, r7, r0
- blx _s32_div_f
+ bl _s32_div_f
add r4, r0, #0x0
ldr r0, [sp, #0x0]
mov r1, #0x3c
add r0, r7, r0
- blx _s32_div_f
+ bl _s32_div_f
strh r1, [r5, #0x4]
cmp r4, #0x0
beq _020253DE
@@ -67085,7 +67085,7 @@ _020253BA: sub r0, r6, #0x1
add r0, r1, r0
add r1, r6, #0x0
- blx _s32_div_f
+ bl _s32_div_f
sub r4, r4, r0
mov r0, #0x0
strb r0, [r5, #0xa]
@@ -67248,7 +67248,7 @@ _020254D6: add r0, r5, #0x0
add r1, r7, #0x0
mov r2, #0x88
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
strh r6, [r5, #0x0]
add r4, r4, #0x1
add r5, #0x88
@@ -67414,7 +67414,7 @@ _020255F8: ldr r0, [sp, #0x0]
ldr r1, [sp, #0x10]
lsl r2, r2, #0x6
- blx memcpy
+ bl memcpy
ldr r0, [sp, #0x10]
bl FUN_02016A18
add sp, #0x2c
@@ -67936,7 +67936,7 @@ FUN_02025964: ; 0x02025964 mov r1, #0x0
mov r2, #0x3c
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r4, #0x0
pop {r4, pc}
.balign 4
@@ -67972,7 +67972,7 @@ FUN_0202597C: ; 0x0202597C ldr r2, _020259DC ; =0x000009B4
add r0, r4, #0x0
add r1, r7, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r4, #0x0
add r0, #0x94
mov r1, #0x9b
@@ -68380,7 +68380,7 @@ _02025C72: lsl r1, r1, #0x4
add r1, r2, r1
mov r2, #0x10
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r0, r6, #0x0
bl FUN_020239BC
ldr r1, [sp, #0x0]
@@ -68620,7 +68620,7 @@ FUN_02025E20: ; 0x02025E20 add r0, r5, r0
add r1, sp, #0xc
mov r2, #0xc8
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r2, [sp, #0x8]
add r1, sp, #0xc
add r0, r4, #0x0
@@ -68897,7 +68897,7 @@ FUN_02025FFC: ; 0x02025FFC add r1, sp, #0x8
mov r2, #0x28
mov r4, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r2, [sp, #0x4]
add r1, sp, #0x8
add r0, r4, #0x0
@@ -69039,12 +69039,12 @@ FUN_020260EC: ; 0x020260EC add r1, sp, #0x34
mov r2, #0x28
mov r4, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r0, _02026168 ; =0x00000978
add r1, sp, #0xc
add r0, r7, r0
mov r2, #0x28
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r3, [sp, #0x0]
add r1, sp, #0x34
add r3, r1, r3
@@ -69182,7 +69182,7 @@ FUN_020261EC: ; 0x020261EC add r1, sp, #0x8
mov r2, #0x28
mov r4, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r2, [sp, #0x4]
add r1, sp, #0x8
add r0, r4, #0x0
@@ -69304,7 +69304,7 @@ FUN_020262BC: ; 0x020262BC add r1, sp, #0x8
mov r2, #0x28
mov r4, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r2, [sp, #0x4]
add r1, sp, #0x8
add r0, r4, #0x0
@@ -69460,7 +69460,7 @@ _020263D6: add r0, r4, r0
add r0, r2, r0
mov r2, #0x3
- blx MI_CpuFill8
+ bl MI_CpuFill8
pop {r3-r5, pc}
.balign 4
_020263F0: .word 0x0000010F
@@ -69737,7 +69737,7 @@ _020265C6: add r0, r4, r0
add r0, r1, r0
mov r1, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
pop {r3-r5, pc}
nop
_020265DC: .word 0x0000020F
@@ -69910,12 +69910,12 @@ FUN_020266E0: ; 0x020266E0 add r4, r0, #0x0
mov r1, #0x0
mov r2, #0x2d
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r4, #0x0
add r0, #0x2d
mov r1, #0x0
mov r2, #0x20
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r4, #0x0
mov r1, #0x0
add r0, #0x8c
@@ -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]
@@ -71169,7 +71169,7 @@ _02026F6A: add r0, r5, #0x0
mov r1, #0x0
mov r2, #0x74
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
str r6, [r5, #0x0]
add r4, r4, #0x1
add r5, #0x74
@@ -71183,7 +71183,7 @@ _02026F86: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x98
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r1, _02026FC8 ; =0x00001234
ldr r0, _02026FCC ; =0x000004FC
add r6, r6, #0x1
@@ -71196,7 +71196,7 @@ _02026F86: mov r1, #0x0
add r0, r7, r0
mov r2, #0x40
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r5, _02026FD4 ; =0x0000081C
mov r4, #0x0
mov r6, #0x12
@@ -71241,7 +71241,7 @@ FUN_02026FE8: ; 0x02026FE8 mov r1, #0x0
mov r2, #0x98
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, _02027004 ; =0x00001234
str r0, [r4, #0x0]
add r0, r4, #0x0
@@ -71708,7 +71708,7 @@ _02027330: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x74
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, _02027340 ; =0x00001234
str r0, [r4, #0x0]
pop {r4, pc}
@@ -71938,7 +71938,7 @@ _020274DA: add r0, r5, #0x0
add r1, r4, #0x0
mov r2, #0x74
- blx memcpy
+ bl memcpy
pop {r3-r5, pc}
nop
_020274E8: .word 0x00001234
@@ -72316,7 +72316,7 @@ _02027760: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x98
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, _02027770 ; =0x00001234
str r0, [r4, #0x0]
pop {r4, pc}
@@ -72540,7 +72540,7 @@ _020278FE: add r0, r5, #0x0
add r1, r4, #0x0
mov r2, #0x98
- blx memcpy
+ bl memcpy
pop {r3-r5, pc}
nop
_0202790C: .word 0x00001234
@@ -73145,11 +73145,11 @@ FUN_02027D0C: ; 0x02027D0C bne _02027D6A
ldr r1, _02027D78 ; =0xEDB88320
add r0, sp, #0x4
- blx MATHi_CRC32InitTableRev
+ bl MATHi_CRC32InitTableRev
add r0, sp, #0x4
add r1, r4, #0x0
mov r2, #0x74
- blx MATH_CalcCRC32
+ bl MATH_CalcCRC32
add r6, r0, #0x0
mov r5, #0x0
_02027D3C:
@@ -73159,11 +73159,11 @@ _02027D3C: add r4, r0, #0x0
ldr r1, _02027D78 ; =0xEDB88320
add r0, sp, #0x4
- blx MATHi_CRC32InitTableRev
+ bl MATHi_CRC32InitTableRev
add r0, sp, #0x4
add r1, r4, #0x0
mov r2, #0x74
- blx MATH_CalcCRC32
+ bl MATH_CalcCRC32
cmp r0, r6
bne _02027D62
mov r0, #0x0
@@ -73398,7 +73398,7 @@ FUN_02027ED0: ; 0x02027ED0 _02027EDC:
bl FUN_0201B9EC
add r1, r7, #0x0
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r1, #0x18
lsr r0, r0, #0x18
add r1, r5, r0
@@ -73548,7 +73548,7 @@ FUN_02027FDC: ; 0x02027FDC add r4, r0, #0x0
ldrb r0, [r4, #0x0]
mov r1, #0x5
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x18
lsr r0, r0, #0x18
cmp r0, #0x5
@@ -73863,7 +73863,7 @@ FUN_020281E8: ; 0x020281E8 mov r0, #0x0
add r1, r7, #0x0
lsl r2, r2, #0x6
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
mov r0, #0x1d
lsl r0, r0, #0x4
add r1, r0, #0x0
@@ -74192,7 +74192,7 @@ _0202843A: add r5, #0x40
mul r0, r4
add r0, r5, r0
- blx FUN_0209700C
+ bl FUN_0209700C
pop {r3-r5, pc}
thumb_func_start FUN_02028448
@@ -74255,7 +74255,7 @@ _020284A2: mov r2, #0x30
add r0, r0, r1
add r1, r6, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
mov r0, #0xc
add r1, r7, #0x0
mul r1, r0
@@ -74263,7 +74263,7 @@ _020284A2: mov r2, #0xc
add r0, r0, r1
add r1, r4, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r5, r5, #0x1
add r6, #0x30
add r4, #0xc
@@ -74279,7 +74279,7 @@ _020284D2: add r1, r2, r1
mov r0, #0x0
mov r2, #0x30
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
ldr r2, [sp, #0x0]
mov r1, #0x5d
add r2, #0x40
@@ -74287,7 +74287,7 @@ _020284D2: add r1, r2, r1
mov r0, #0x0
mov r2, #0xc
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
mov r2, #0x7a
lsl r2, r2, #0x4
add r1, r2, #0x0
@@ -74322,7 +74322,7 @@ FUN_02028518: ; 0x02028518 str r1, [sp, #0x0]
add r0, r4, r5
add r1, r4, r3
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r0, [sp, #0x4]
add r6, r7, #0x0
mov r3, #0xc
@@ -74336,16 +74336,16 @@ FUN_02028518: ; 0x02028518 mul r2, r3
add r1, r6, r2
add r2, r3, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
mov r0, #0x0
add r1, r4, r5
mov r2, #0x30
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
ldr r1, [sp, #0x8]
mov r0, #0x0
add r1, r6, r1
mov r2, #0xc
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
mov r0, #0x1d
ldr r1, _02028588 ; =0x0000FFFF
add r2, r7, r5
@@ -74531,7 +74531,7 @@ _020286BC: mov r0, #0x0
add r1, r6, r4
mov r2, #0x30
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
mov r0, #0x1d
ldr r1, _020286E8 ; =0x0000FFFF
add r2, r5, r4
@@ -74592,7 +74592,7 @@ FUN_02028724: ; 0x02028724 mov r0, #0x0
add r1, r4, #0x0
lsl r2, r2, #0x2
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
ldr r0, _0202874C ; =0x0000FFFF
mov r1, #0x0
add r2, r4, #0x0
@@ -75445,12 +75445,12 @@ _02028CC0: add r0, #0x1c
add r1, #0x46
mov r2, #0x2a
- blx memcpy
+ bl memcpy
add r4, #0x46
add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x2a
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
pop {r4, pc}
.balign 4
@@ -76175,7 +76175,7 @@ FUN_0202918C: ; 0x0202918C ldr r0, [sp, #0x0]
bl FUN_02029EC0
mov r1, #0xa
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x18
lsr r0, r0, #0x18
beq _020291DA
@@ -76244,7 +76244,7 @@ FUN_0202920C: ; 0x0202920C ldr r0, [sp, #0x0]
bl FUN_02029EC0
mov r1, #0xa
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x18
lsr r0, r0, #0x18
cmp r0, #0x1
@@ -76317,7 +76317,7 @@ FUN_020292BC: ; 0x020292BC mov r1, #0x0
mov r2, #0x3a
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
pop {r4, pc}
.balign 4
@@ -76866,7 +76866,7 @@ _020296B4: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x3a
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldrb r0, [r6, #0x1c]
cmp r0, #0x10
bhi _02029722
@@ -77396,7 +77396,7 @@ FUN_02029A8C: ; 0x02029A8C add r4, r0, #0x0
mov r1, #0x0
lsl r2, r2, #0x4
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
bl FUN_02029ACC
add r5, r0, #0x0
@@ -77682,7 +77682,7 @@ FUN_02029C60: ; 0x02029C60 add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
pop {r4, pc}
thumb_func_start FUN_02029C74
@@ -78013,21 +78013,21 @@ _02029E6C: bls _02029EAE
add r0, r7, #0x0
mov r1, #0x3c
- blx _u32_div_f
+ bl _u32_div_f
add r4, r4, r0
add r0, r7, #0x0
mov r1, #0x3c
- blx _u32_div_f
+ bl _u32_div_f
add r7, r1, #0x0
cmp r4, #0x3b
bls _02029EAE
add r0, r4, #0x0
mov r1, #0x3c
- blx _u32_div_f
+ bl _u32_div_f
add r6, r6, r0
add r0, r4, #0x0
mov r1, #0x3c
- blx _u32_div_f
+ bl _u32_div_f
ldr r0, _02029EB8 ; =0x000003E7
add r4, r1, #0x0
cmp r6, r0
@@ -78069,7 +78069,7 @@ FUN_02029ECC: ; 0x02029ECC mov r0, #0x0
add r1, r4, #0x0
lsl r2, r2, #0x2
- blx MIi_CpuClear32
+ bl MIi_CpuClear32
mov r0, #0x0
str r0, [r4, #0x0]
pop {r4, pc}
@@ -78527,7 +78527,7 @@ FUN_0202A1F0: ; 0x0202A1F0 mov r1, #0x0
lsl r2, r2, #0x2
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x1
strb r0, [r4, #0x3]
pop {r4, pc}
@@ -78607,14 +78607,14 @@ _0202A280: add r1, r2, #0x0
add r0, #0x8
mov r2, #0x4
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
mov r0, #0x0
pop {r3, pc}
_0202A28E:
add r1, r2, #0x0
add r0, #0x2c
mov r2, #0x10
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
mov r0, #0x0
pop {r3, pc}
_0202A29C:
@@ -78626,7 +78626,7 @@ _0202A2A4: add r1, r2, #0x0
add r0, #0xc
mov r2, #0x1c
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
mov r0, #0x0
pop {r3, pc}
_0202A2B2:
@@ -78697,14 +78697,14 @@ _0202A318: add r0, r2, #0x0
add r1, r3, #0x0
mov r2, #0x4
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
pop {r4, pc}
_0202A326:
add r3, #0x2c
add r0, r2, #0x0
add r1, r3, #0x0
mov r2, #0x10
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
pop {r4, pc}
_0202A334:
ldrb r4, [r3, #0x0]
@@ -78721,7 +78721,7 @@ _0202A346: add r0, r2, #0x0
add r1, r3, #0x0
mov r2, #0x1c
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
pop {r4, pc}
_0202A354:
ldr r0, [r2, #0x0]
@@ -78917,14 +78917,14 @@ FUN_0202A474: ; 0x0202A474 add r0, r2, #0x0
add r1, r3, #0x0
mov r2, #0xa8
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
pop {r3, pc}
_0202A48A:
add r3, #0x18
add r0, r2, #0x0
add r1, r3, #0x0
mov r2, #0xa8
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
pop {r3, pc}
thumb_func_start FUN_0202A498
@@ -78935,13 +78935,13 @@ FUN_0202A498: ; 0x0202A498 add r1, r2, #0x0
add r0, #0xc0
mov r2, #0xa8
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
pop {r3, pc}
_0202A4AA:
add r1, r2, #0x0
add r0, #0x18
mov r2, #0xa8
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
pop {r3, pc}
.balign 4
@@ -78990,7 +78990,7 @@ _0202A502: add r0, #0x1e
sub r0, r0, r1
mov r1, #0x1e
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x10
lsr r1, r0, #0x10
_0202A510:
@@ -79014,7 +79014,7 @@ FUN_0202A524: ; 0x0202A524 ldrh r0, [r0, #0x16]
mov r1, #0xfa
lsl r1, r1, #0x2
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r0, #0x18
lsr r0, r0, #0x18
pop {r3, pc}
@@ -79211,11 +79211,11 @@ FUN_0202A670: ; 0x0202A670 add r0, r4, #0x4
mov r1, #0x0
mov r2, #0xfa
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x4
- blx MI_CpuFill8
+ bl MI_CpuFill8
pop {r4, pc}
.balign 4
@@ -79347,7 +79347,7 @@ FUN_0202A754: ; 0x0202A754 ldr r2, _0202A77C ; =0x0000063C
add r1, r5, r1
add r6, r3, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r0, _0202A780 ; =0x00000101
strb r4, [r5, r0]
sub r0, r0, #0x1
@@ -79420,30 +79420,30 @@ _0202A7EE: add r0, #0xa8
add r1, #0x8
mov r2, #0x10
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
_0202A7FC:
add r0, r5, r4
add r1, r6, #0x0
add r0, #0xca
add r1, #0x18
mov r2, #0x8
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r0, r5, r4
add r1, r6, #0x0
add r0, #0xd2
add r1, #0x20
mov r2, #0x8
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r0, r5, r4
add r6, #0x28
add r0, #0xda
add r1, r6, #0x0
mov r2, #0x8
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r0, r5, r4
add r1, r7, #0x0
mov r2, #0xa8
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
pop {r3-r7, pc}
nop
_0202A834: .word 0x00002710
@@ -79460,7 +79460,7 @@ FUN_0202A838: ; 0x0202A838 add r1, r5, r1
lsl r2, r2, #0x2
add r6, r3, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r0, _0202A860 ; =0x00000103
strb r4, [r5, r0]
sub r0, r0, #0x1
@@ -79499,7 +79499,7 @@ FUN_0202A878: ; 0x0202A878 add r0, r5, r0
add r1, r4, #0x0
lsl r2, r2, #0x2
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r0, r4, #0x0
pop {r3-r5, pc}
@@ -79601,7 +79601,7 @@ FUN_0202A92C: ; 0x0202A92C add r4, r0, #0x0
mov r1, #0x0
lsl r2, r2, #0x2
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
bl FUN_0201BA60
str r0, [r4, #0x0]
bl FUN_0201BA60
@@ -80197,7 +80197,7 @@ _0202ACB4: ldr r0, [sp, #0x0]
add r1, r1, r6
sub r2, #0x28
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
lsl r0, r4, #0x2
add r1, r5, r0
mov r0, #0x1
@@ -80267,7 +80267,7 @@ _0202AD3C: mul r1, r2
add r0, r6, #0x0
add r1, r3, r1
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
lsl r0, r4, #0x2
add r1, r5, r0
mov r0, #0x12
@@ -80763,7 +80763,7 @@ _0202B07E: ldr r1, [sp, #0x14]
mov r0, #0x0
lsl r2, r2, #0x2
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
ldr r0, [sp, #0x10]
mov r7, #0x0
cmp r0, #0x0
@@ -81145,18 +81145,18 @@ FUN_0202B390: ; 0x0202B390 mov r0, #0x0
add r1, #0xc
mov r2, #0xc0
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r1, r4, #0x0
mov r0, #0x0
add r1, #0xcc
mov r2, #0xc0
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
mov r1, #0x63
lsl r1, r1, #0x2
mov r0, #0x0
add r1, r4, r1
mov r2, #0xc0
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
add r0, r4, #0x0
bl FUN_0202B3F8
pop {r4, pc}
@@ -81175,7 +81175,7 @@ FUN_0202B3C4: ; 0x0202B3C4 _0202B3D4:
add r0, r2, #0x0
mov r1, #0xf
- blx _s32_div_f
+ bl _s32_div_f
mov r0, #0xf
sub r1, r0, r1
str r1, [r4, #0x4]
@@ -81307,7 +81307,7 @@ FUN_0202B470: ; 0x0202B470 add r0, r6, #0x0
add r1, r5, #0x0
mov r2, #0x28
- blx MIi_CpuCopyFast
+ bl MIi_CpuCopyFast
add sp, #0x10
pop {r4-r6, pc}
@@ -81686,7 +81686,7 @@ FUN_0202B710: ; 0x0202B710 add r0, sp, #0x8
mov r1, #0x0
mov r2, #0x4
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x0
str r0, [sp, #0x0]
add r0, sp, #0x8
@@ -81939,7 +81939,7 @@ FUN_0202B8B8: ; 0x0202B8B8 mov r1, #0x0
lsl r2, r2, #0x4
add r6, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r7, #0x0
_0202B8C8:
mov r4, #0x0
@@ -82044,7 +82044,7 @@ _0202B968: mov r1, #0x1d
bl FUN_0202A150
add r1, r7, #0x0
- blx _u32_div_f
+ bl _u32_div_f
add r7, r0, #0x0
_0202B984:
str r7, [r5, #0x0]
@@ -82074,7 +82074,7 @@ _0202B9A0: ldr r2, [r0, #0x28]
mov r0, #0x64
mul r0, r2
- blx _u32_div_f
+ bl _u32_div_f
add r1, r0, #0x0
_0202B9C4:
str r1, [r5, #0x0]
@@ -82115,7 +82115,7 @@ FUN_0202B9EC: ; 0x0202B9EC mov r1, #0x0
lsl r2, r2, #0x2
str r0, [sp, #0x4]
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r5, #0x0
bl FUN_0202881C
mov r1, #0x1
@@ -82232,7 +82232,7 @@ FUN_0202BAD4: ; 0x0202BAD4 mov r1, #0x0
mov r2, #0xe0
add r4, r3, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, sp, #0x10
ldrb r0, [r0, #0x10]
cmp r0, #0x0
@@ -82244,7 +82244,7 @@ FUN_0202BAD4: ; 0x0202BAD4 add r0, r5, r0
add r1, #0x50
str r0, [sp, #0x8]
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r1, sp, #0x10
ldrb r3, [r1, #0x18]
mov r0, #0x0
@@ -82305,7 +82305,7 @@ _0202BB64: add r1, r6, #0x0
add r1, #0x50
str r0, [sp, #0x8]
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r0, sp, #0x10
ldrb r2, [r0, #0x18]
mov r3, #0x0
@@ -82588,7 +82588,7 @@ FUN_0202BD6C: ; 0x0202BD6C mov r1, #0x0
mov r2, #0x4c
add r7, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r4, #0x0
bl FUN_0202881C
mov r1, #0x1
@@ -82646,7 +82646,7 @@ FUN_0202BDF0: ; 0x0202BDF0 mov r1, #0x0
mov r2, #0x4c
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, [sp, #0x0]
mov r1, #0x90
mul r1, r0
@@ -82715,7 +82715,7 @@ _0202BE7E: add r0, r6, #0x0
mov r1, #0x0
mov r2, #0x4c
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r0, r6, #0x0
bl FUN_02016A18
pop {r4-r6, pc}
@@ -82734,7 +82734,7 @@ FUN_0202BEA0: ; 0x0202BEA0 ldr r2, _0202BED8 ; =0x00000688
mov r0, #0x0
add r1, r5, #0x0
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
mov r4, #0x0
mov r6, #0xab
add r7, r4, #0x0
@@ -82764,7 +82764,7 @@ FUN_0202BEDC: ; 0x0202BEDC ldr r2, _0202BF14 ; =0x00000588
mov r0, #0x0
add r1, r5, #0x0
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
mov r4, #0x0
mov r6, #0xab
add r7, r4, #0x0
@@ -82873,14 +82873,14 @@ FUN_0202BF90: ; 0x0202BF90 str r0, [r3, r2]
add r0, r2, #0x4
str r1, [r3, r0]
- blx OS_GetOwnerRtcOffset
+ bl OS_GetOwnerRtcOffset
ldr r2, _0202BFD4 ; =0x00000678
str r0, [r5, r2]
add r0, r2, #0x4
add r2, #0x8
str r1, [r5, r0]
add r0, r5, r2
- blx OS_GetMacAddress
+ bl OS_GetMacAddress
pop {r4-r6, pc}
nop
_0202BFCC: .word 0x00000588
@@ -82971,7 +82971,7 @@ FUN_0202C060: ; 0x0202C060 sub sp, #0x8
add r4, r0, #0x0
add r0, sp, #0x0
- blx OS_GetMacAddress
+ bl OS_GetMacAddress
mov r0, #0x1a
mov r3, #0x0
add r5, sp, #0x0
@@ -82999,7 +82999,7 @@ _0202C084: FUN_0202C094: ; 0x0202C094
push {r4, lr}
add r4, r0, #0x0
- blx OS_GetOwnerRtcOffset
+ bl OS_GetOwnerRtcOffset
ldr r2, _0202C0B4 ; =0x00000678
ldr r3, [r4, r2]
add r2, r2, #0x4
@@ -83178,7 +83178,7 @@ FUN_0202C1C8: ; 0x0202C1C8 ldr r1, _0202C1F0 ; =0x021C59D8
ldr r0, _0202C1F4 ; =FUN_0202C1F8
ldr r1, [r1, #0x4]
- blx WM_SetParentParameter
+ bl WM_SetParentParameter
cmp r0, #0x2
beq _0202C1EC
bl FUN_0202C1AC
@@ -83225,22 +83225,22 @@ FUN_0202C21C: ; 0x0202C21C mov r0, #0x1
pop {r4, pc}
_0202C230:
- blx WMi_GetStatusAddress
+ bl WMi_GetStatusAddress
add r4, r0, #0x0
mov r0, #0x66
lsl r0, r0, #0x2
add r0, r4, r0
mov r1, #0x4
- blx DC_InvalidateRange
+ bl DC_InvalidateRange
mov r0, #0x66
mov r1, #0x0
lsl r0, r0, #0x2
str r1, [r4, r0]
add r0, r4, r0
mov r1, #0x4
- blx DC_FlushRange
+ bl DC_FlushRange
ldr r0, _0202C280 ; =FUN_0202C288
- blx WM_StartParent
+ bl WM_StartParent
cmp r0, #0x2
beq _0202C264
bl FUN_0202C1AC
@@ -83334,13 +83334,13 @@ _0202C2DA: ldr r0, _0202C38C ; =0x02105D54
add r1, #0x15
mov r2, #0x3
- blx memcmp
+ bl memcmp
cmp r0, #0x0
beq _0202C330
_0202C318:
ldrh r1, [r5, #0x10]
mov r0, #0x0
- blx WM_Disconnect
+ bl WM_Disconnect
cmp r0, #0x2
beq _0202C378
bl FUN_0202C1AC
@@ -83429,7 +83429,7 @@ _0202C3AC: ldr r0, _0202C400 ; =FUN_0202C404
lsr r2, r2, #0x10
add r3, r4, r3
- blx WM_StartMP
+ bl WM_StartMP
cmp r0, #0x2
beq _0202C3E8
bl FUN_0202C1AC
@@ -83502,7 +83502,7 @@ FUN_0202C460: ; 0x0202C460 mov r0, #0x3
bl FUN_0202C198
ldr r0, _0202C480 ; =FUN_0202C484
- blx WM_EndMP
+ bl WM_EndMP
cmp r0, #0x2
beq _0202C47A
bl FUN_0202C1AC
@@ -83535,7 +83535,7 @@ _0202C4A2: FUN_0202C4A4: ; 0x0202C4A4
push {r3, lr}
ldr r0, _0202C4BC ; =FUN_0202C4C0
- blx WM_EndParent
+ bl WM_EndParent
cmp r0, #0x2
beq _0202C4B8
bl FUN_0202C1AC
@@ -83691,7 +83691,7 @@ _0202C5D4: .word 0x021C59D8 thumb_func_start FUN_0202C5D8
FUN_0202C5D8: ; 0x0202C5D8
push {r3-r7, lr}
- blx WM_GetAllowedChannel
+ bl WM_GetAllowedChannel
add r5, r0, #0x0
mov r0, #0x2
lsl r0, r0, #0xe
@@ -83751,7 +83751,7 @@ _0202C64C: sub r0, #0x28
strh r2, [r3, r0]
_0202C650:
- blx WM_GetDispersionScanPeriod
+ bl WM_GetDispersionScanPeriod
ldr r2, _0202C684 ; =0x021C59D8
ldr r1, _0202C690 ; =0x000012E6
ldr r3, [r2, #0x4]
@@ -83766,7 +83766,7 @@ _0202C650: sub r1, r1, #0x6
ldr r0, _0202C694 ; =FUN_0202C698
add r1, r2, r1
- blx WM_StartScan
+ bl WM_StartScan
cmp r0, #0x2
beq _0202C680
bl FUN_0202C1AC
@@ -83820,7 +83820,7 @@ _0202C6D0: sub r0, #0xf0
add r0, r2, r0
mov r1, #0xc0
- blx DC_InvalidateRange
+ bl DC_InvalidateRange
ldr r0, _0202C760 ; =0x021C59D8
ldr r1, [r0, #0x4]
ldr r0, _0202C768 ; =0x00001320
@@ -83910,7 +83910,7 @@ _0202C790: .word 0x00001310 FUN_0202C794: ; 0x0202C794
push {r3, lr}
ldr r0, _0202C7AC ; =FUN_0202C7B0
- blx WM_EndScan
+ bl WM_EndScan
cmp r0, #0x2
beq _0202C7A8
bl FUN_0202C1AC
@@ -83971,7 +83971,7 @@ _0202C800: ldr r0, _0202C84C ; =0x02105D54
add r1, #0x1
mov r2, #0x3
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
bl FUN_02033534
add r1, sp, #0x4
strb r0, [r1, #0x0]
@@ -83984,7 +83984,7 @@ _0202C800: mov r3, #0x1
add r1, r2, r1
add r2, sp, #0x4
- blx WM_StartConnectEx
+ bl WM_StartConnectEx
cmp r0, #0x2
beq _0202C83E
bl FUN_0202C1AC
@@ -84109,7 +84109,7 @@ FUN_0202C908: ; 0x0202C908 ldr r0, _0202C954 ; =FUN_0202C958
lsr r2, r2, #0x10
add r3, r4, r3
- blx WM_StartMP
+ bl WM_StartMP
cmp r0, #0x2
beq _0202C942
bl FUN_0202C1AC
@@ -84185,7 +84185,7 @@ FUN_0202C9BC: ; 0x0202C9BC mov r0, #0x3
bl FUN_0202C198
ldr r0, _0202C9DC ; =FUN_0202C9E0
- blx WM_EndMP
+ bl WM_EndMP
cmp r0, #0x2
beq _0202C9D6
bl FUN_0202C1AC
@@ -84223,7 +84223,7 @@ FUN_0202CA04: ; 0x0202CA04 bl FUN_0202C198
ldr r0, _0202CA28 ; =FUN_0202CA2C
mov r1, #0x0
- blx WM_Disconnect
+ bl WM_Disconnect
cmp r0, #0x2
beq _0202CA24
bl FUN_0202C1AC
@@ -84256,7 +84256,7 @@ FUN_0202CA44: ; 0x0202CA44 mov r0, #0x3
bl FUN_0202C198
ldr r0, _0202CA64 ; =FUN_0202CA68
- blx WM_Reset
+ bl WM_Reset
cmp r0, #0x2
beq _0202CA5E
bl FUN_0202C1AC
@@ -84300,7 +84300,7 @@ FUN_0202CA88: ; 0x0202CA88 add r0, r1, r0
ldr r1, [r1, r2]
add r7, r3, #0x0
- blx DC_FlushRange
+ bl DC_FlushRange
ldr r0, _0202CAD8 ; =0x0000FFFF
add r1, r7, #0x0
str r0, [sp, #0x0]
@@ -84312,7 +84312,7 @@ FUN_0202CA88: ; 0x0202CA88 ldr r0, _0202CADC ; =FUN_0202CAE0
add r2, r5, #0x0
add r3, r6, #0x0
- blx WM_SetMPDataToPortEx
+ bl WM_SetMPDataToPortEx
cmp r0, #0x2
bne _0202CACA
add sp, #0xc
@@ -84405,7 +84405,7 @@ FUN_0202CB50: ; 0x0202CB50 _0202CB60:
mov r0, #0x0
add r1, r0, #0x0
- blx FUN_02090CC8
+ bl FUN_02090CC8
mov r0, #0x0
bl FUN_0202C198
pop {r3, pc}
@@ -84497,7 +84497,7 @@ FUN_0202CBFC: ; 0x0202CBFC push {r3-r5, lr}
sub sp, #0x8
add r0, sp, #0x0
- blx OS_GetMacAddress
+ bl OS_GetMacAddress
ldr r0, _0202CC84 ; =0x027FFC3C
ldr r3, [r0, #0x0]
add r0, sp, #0x0
@@ -84566,7 +84566,7 @@ _0202CC94: .word 0x00003039 FUN_0202CC98: ; 0x0202CC98
push {r4, lr}
add r4, r0, #0x0
- blx WM_GetAllowedChannel
+ bl WM_GetAllowedChannel
mov r1, #0x2
lsl r1, r1, #0xe
cmp r0, r1
@@ -84693,7 +84693,7 @@ FUN_0202CD90: ; 0x0202CD90 str r1, [sp, #0x0]
mov r1, #0x3
mov r2, #0x11
- blx WM_MeasureChannel
+ bl WM_MeasureChannel
pop {r3, pc}
.balign 4
@@ -84900,7 +84900,7 @@ FUN_0202CF0C: ; 0x0202CF0C ldr r0, [r0, #0x4]
mov r2, #0x2
add r0, #0x40
- blx WM_Initialize
+ bl WM_Initialize
cmp r0, #0x2
beq _0202CF34
bl FUN_0202C1AC
@@ -84929,7 +84929,7 @@ FUN_0202CF40: ; 0x0202CF40 pop {r3, pc}
_0202CF5A:
ldr r0, _0202CF80 ; =FUN_0202CEF4
- blx WM_SetIndCallback
+ bl WM_SetIndCallback
cmp r0, #0x0
beq _0202CF76
bl FUN_0202C1AC
@@ -85073,14 +85073,14 @@ _0202D066: ldr r1, _0202D09C ; =0x00001220
add r1, r2, r1
mov r2, #0xc0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r0, _0202D094 ; =0x021C59D8
ldr r1, [r0, #0x4]
ldr r0, _0202D09C ; =0x00001220
add r0, r1, r0
mov r1, #0xc0
- blx DC_FlushRange
- blx DC_WaitWriteBufferEmpty
+ bl DC_FlushRange
+ bl DC_WaitWriteBufferEmpty
bl FUN_0202C7E8
pop {r4-r6, pc}
_0202D08E:
@@ -85102,7 +85102,7 @@ FUN_0202D0A0: ; 0x0202D0A0 ldr r1, _0202D0CC ; =FUN_0202CB08
lsr r0, r0, #0x10
mov r2, #0x0
- blx WM_SetPortCallback
+ bl WM_SetPortCallback
cmp r0, #0x0
beq _0202D0C2
mov r0, #0x9
@@ -85210,7 +85210,7 @@ FUN_0202D178: ; 0x0202D178 mov r0, #0x3
bl FUN_0202C198
ldr r0, _0202D198 ; =FUN_0202CB50
- blx WM_End
+ bl WM_End
cmp r0, #0x2
beq _0202D194
mov r0, #0x9
@@ -85344,7 +85344,7 @@ FUN_0202D240: ; 0x0202D240 add r1, r6, #0x0
lsr r2, r2, #0x10
add r3, r4, #0x0
- blx WM_SetGameInfo
+ bl WM_SetGameInfo
_0202D26E:
add sp, #0x8
pop {r4-r6, pc}
@@ -85383,7 +85383,7 @@ FUN_0202D298: ; 0x0202D298 cmp r0, #0x4
bne _0202D2BE
ldr r0, _0202D2CC ; =FUN_0202D27C
- blx WM_SetEntry
+ bl WM_SetEntry
cmp r0, #0x2
bne _0202D2BE
mov r0, #0x1
@@ -85670,7 +85670,7 @@ FUN_0202D4A8: ; 0x0202D4A8 add r0, r1, #0x0
mov r1, #0xa
ldrsh r1, [r2, r1]
- blx _s32_div_f
+ bl _s32_div_f
add r0, r1, #0x0
pop {r3, pc}
.balign 4
@@ -85922,7 +85922,7 @@ _0202D660: ldr r0, [r5, #0x0]
ldr r1, [r4, #0x0]
add r2, r3, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
_0202D66A:
ldrh r0, [r5, #0xc]
ldr r1, [r4, #0x0]
@@ -86096,7 +86096,7 @@ _0202D7A4: add r0, r6, #0x0
mov r1, #0x0
mov r2, #0x10
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, [r4, #0x4]
ldr r7, [sp, #0x0]
cmp r0, #0x0
@@ -86130,7 +86130,7 @@ FUN_0202D7D8: ; 0x0202D7D8 mov r1, #0x0
mov r2, #0x20
add r5, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
lsl r7, r4, #0x4
mov r0, #0xf
add r1, r7, #0x0
@@ -86138,7 +86138,7 @@ FUN_0202D7D8: ; 0x0202D7D8 mov r1, #0x0
add r2, r7, #0x0
str r0, [r5, #0x18]
- blx MI_CpuFill8
+ bl MI_CpuFill8
str r4, [r5, #0x1c]
str r6, [r5, #0x14]
pop {r3-r7, pc}
@@ -86152,7 +86152,7 @@ FUN_0202D804: ; 0x0202D804 ldr r0, [r4, #0x18]
mov r1, #0x0
lsl r2, r2, #0x4
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0x0
str r0, [r4, #0x0]
str r0, [r4, #0x4]
@@ -86623,7 +86623,7 @@ FUN_0202DB14: ; 0x0202DB14 str r0, [r1, #0x0]
mov r1, #0x0
lsl r2, r2, #0x2
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r6, #0x0
ldr r7, _0202DBA0 ; =0x021C59E4
add r4, r6, #0x0
@@ -86746,7 +86746,7 @@ FUN_0202DBE0: ; 0x0202DBE0 ldr r0, [r0, #0x0]
add r0, #0x64
add r0, r0, r5
- blx OS_GetMacAddress
+ bl OS_GetMacAddress
add r0, r7, #0x0
mov r1, #0x1
mov r2, #0x0
@@ -86756,7 +86756,7 @@ FUN_0202DBE0: ; 0x0202DBE0 ldr r1, [r1, #0x0]
add r1, #0x54
add r1, r1, r5
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r0, r6, #0x0
bl FUN_02029B38
ldr r1, _0202DCD8 ; =0x021C59E4
@@ -86791,14 +86791,14 @@ FUN_0202DBE0: ; 0x0202DBE0 ldr r1, [r1, #0x0]
add r1, #0x48
add r1, r1, r5
- blx FUN_02096CCC
+ bl FUN_02096CCC
ldr r0, _0202DCD8 ; =0x021C59E4
mov r1, #0x0
ldr r0, [r0, #0x0]
mov r2, #0x20
add r0, #0x8
add r0, r0, r5
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _0202DCD8 ; =0x021C59E4
ldr r1, [r0, #0x0]
ldr r0, [r1, #0x0]
@@ -86874,7 +86874,7 @@ FUN_0202DD08: ; 0x0202DD08 add r3, r1, #0x0
mul r3, r2
add r1, r5, r3
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r4, #0x62
ldr r2, _0202DD78 ; =0x021C59E4
ldrb r3, [r4, #0x0]
@@ -86924,7 +86924,7 @@ FUN_0202DD80: ; 0x0202DD80 add r1, #0x8
add r1, r1, r4
add r2, r3, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r0, _0202DDE0 ; =0x021C59E4
add r1, r5, #0x0
ldr r0, [r0, #0x0]
@@ -87002,7 +87002,7 @@ _0202DE0A: ldr r0, [r1, r0]
add r6, #0x28
add r1, r6, r5
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r1, _0202DE70 ; =0x021C59E4
mov r0, #0x4
ldr r1, [r1, #0x0]
@@ -87639,7 +87639,7 @@ FUN_0202E29C: ; 0x0202E29C str r0, [r1, #0x8]
mov r1, #0x0
lsl r2, r2, #0x4
- blx MI_CpuFill8
+ bl MI_CpuFill8
bl FUN_0202CEEC
add r1, r0, #0x0
mov r0, #0xf
@@ -87655,7 +87655,7 @@ FUN_0202E29C: ; 0x0202E29C ldr r0, _0202E338 ; =0x00000CA4
ldr r0, [r1, r0]
mov r1, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
bl FUN_02023AC4
add r1, r0, #0x0
mov r0, #0xf
@@ -87671,7 +87671,7 @@ FUN_0202E29C: ; 0x0202E29C ldr r0, _0202E33C ; =0x00000CBC
ldr r0, [r1, r0]
mov r1, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r2, _0202E334 ; =0x021C59E8
mov r1, #0x33
ldr r3, _0202E340 ; =0x00000333
@@ -87807,7 +87807,7 @@ _0202E3D2: mul r1, r2
add r0, r7, #0x0
add r1, r3, r1
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
pop {r3-r7, pc}
_0202E412:
add r6, r6, #0x1
@@ -87844,7 +87844,7 @@ _0202E434: mul r3, r2
add r0, r7, #0x0
add r1, r4, r3
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r0, _0202E464 ; =0x021C59E8
mov r2, #0x1
ldr r1, [r0, #0x8]
@@ -87862,7 +87862,7 @@ FUN_0202E470: ; 0x0202E470 push {r3, lr}
cmp r1, #0x0
beq _0202E47A
- blx OS_Terminate
+ bl OS_Terminate
_0202E47A:
ldr r0, _0202E484 ; =0x021C59E8
mov r1, #0x2
@@ -87894,10 +87894,10 @@ FUN_0202E49C: ; 0x0202E49C ldr r1, _0202E4C4 ; =FUN_0202E470
mov r0, #0x8
mov r2, #0x0
- blx FUN_02090DB8
+ bl FUN_02090DB8
cmp r0, #0x1
beq _0202E4BC
- blx OS_Terminate
+ bl OS_Terminate
_0202E4BC:
pop {r3, pc}
nop
@@ -87992,7 +87992,7 @@ _0202E544: ldr r0, [r0, #0x8]
lsl r2, r2, #0xa
add r0, #0x54
- blx MI_CpuFill8
+ bl MI_CpuFill8
pop {r3-r5, pc}
nop
_0202E564: .word 0x021C59E8
@@ -88709,7 +88709,7 @@ _0202EACE: add r2, r0, #0x0
add r0, r4, #0x0
add r1, #0x10
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
bl FUN_02023AC4
add r2, r0, #0x0
ldr r0, _0202EB6C ; =0x021C59E8
@@ -88718,7 +88718,7 @@ _0202EACE: ldr r0, [r1, r0]
add r1, r5, #0x0
add r1, #0x30
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r0, r4, #0x0
bl FUN_020239BC
str r0, [r5, #0x0]
@@ -88733,7 +88733,7 @@ _0202EACE: add r0, r1, r0
add r1, r5, #0x0
add r1, #0x8
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
bl FUN_0202D358
add r5, #0x54
strb r0, [r5, #0x0]
@@ -88755,14 +88755,14 @@ _0202EB24: ldr r0, [r0, #0x8]
add r1, r5, #0x0
mov r2, #0x54
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
_0202EB4E:
ldr r0, _0202EB6C ; =0x021C59E8
ldr r1, [r0, #0x8]
ldr r0, _0202EB70 ; =0x00000CC4
add r0, r1, r0
mov r1, #0x5c
- blx DC_FlushRange
+ bl DC_FlushRange
ldr r0, _0202EB6C ; =0x021C59E8
ldr r1, [r0, #0x8]
ldr r0, _0202EB70 ; =0x00000CC4
@@ -88794,7 +88794,7 @@ FUN_0202EB7C: ; 0x0202EB7C ldr r0, _0202EBCC ; =0x00000CC4
add r0, r1, r0
mov r1, #0x5c
- blx DC_FlushRange
+ bl DC_FlushRange
ldr r0, _0202EBC8 ; =0x021C59E8
ldr r1, [r0, #0x8]
ldr r0, _0202EBCC ; =0x00000CC4
@@ -89240,7 +89240,7 @@ _0202EEE4: .word 0x0000FFFF FUN_0202EEE8: ; 0x0202EEE8
push {r3-r5, lr}
add r5, r0, #0x0
- blx WM_GetDispersionBeaconPeriod
+ bl WM_GetDispersionBeaconPeriod
add r4, r0, #0x0
cmp r5, #0x1a
blo _0202EEFA
@@ -89369,7 +89369,7 @@ _0202EFC2: add r1, r4, #0x0
mul r1, r2
add r1, r3, r1
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
_0202EFD8:
pop {r3-r5, pc}
nop
@@ -89484,7 +89484,7 @@ FUN_0202F094: ; 0x0202F094 ldr r1, _0202F0B4 ; =0x00000CBC
add r0, r4, #0x0
ldr r1, [r3, r1]
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
pop {r4, pc}
nop
_0202F0B0: .word 0x021C59E8
@@ -89545,7 +89545,7 @@ FUN_0202F10C: ; 0x0202F10C ldr r1, _0202F120 ; =0x021C59E8
mov r2, #0x54
ldr r1, [r1, #0x8]
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
bl FUN_0202F0B8
pop {r3, pc}
nop
@@ -89606,7 +89606,7 @@ _0202F178: ldr r2, _0202F2C0 ; =0x0000068C
str r0, [r1, #0x4]
add r1, r4, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r2, _0202F2BC ; =0x021C59F4
ldr r1, _0202F2C4 ; =0x00000658
ldr r0, [r2, #0x4]
@@ -89795,7 +89795,7 @@ FUN_0202F2F0: ; 0x0202F2F0 ldr r3, [r3, r2]
add r2, r3, #0x0
mul r2, r6
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r4, #0x0
cmp r6, #0x0
ble _0202F360
@@ -89828,7 +89828,7 @@ _0202F360: ldr r3, [r3, r2]
add r2, r3, #0x0
mul r2, r6
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r5, #0x0
cmp r6, #0x0
ble _0202F3A2
@@ -89860,7 +89860,7 @@ _0202F3A2: add r0, r1, r0
mov r1, #0x0
lsl r2, r2, #0x6
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _0202F54C ; =0x021C59F4
mov r1, #0xb5
ldr r2, [r0, #0x4]
@@ -89894,7 +89894,7 @@ _0202F3DA: mov r1, #0x0
add r0, #0x4c
lsl r2, r2, #0x2
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _0202F54C ; =0x021C59F4
mov r2, #0x42
ldr r1, [r0, #0x4]
@@ -89930,7 +89930,7 @@ _0202F420: ldr r0, [r3, r0]
mov r1, #0x0
lsl r2, r2, #0x1
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _0202F54C ; =0x021C59F4
mov r1, #0x47
ldr r3, [r0, #0x4]
@@ -90109,7 +90109,7 @@ FUN_0202F5A4: ; 0x0202F5A4 ldr r3, [r3, r2]
add r2, r3, #0x0
mul r2, r6
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r4, #0x0
cmp r6, #0x0
ble _0202F606
@@ -90142,7 +90142,7 @@ _0202F606: ldr r3, [r3, r2]
add r2, r3, #0x0
mul r2, r6
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r5, #0x0
cmp r6, #0x0
ble _0202F648
@@ -90174,7 +90174,7 @@ _0202F648: add r0, r1, r0
mov r1, #0x0
lsl r2, r2, #0x6
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _0202F7D4 ; =0x021C59F4
mov r1, #0xb5
ldr r2, [r0, #0x4]
@@ -90208,7 +90208,7 @@ _0202F680: mov r1, #0x0
add r0, #0x4c
lsl r2, r2, #0x2
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _0202F7D4 ; =0x021C59F4
mov r2, #0x42
ldr r1, [r0, #0x4]
@@ -90244,7 +90244,7 @@ _0202F6C6: ldr r0, [r3, r0]
mov r1, #0x0
lsl r2, r2, #0x1
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _0202F7D4 ; =0x021C59F4
mov r1, #0x47
ldr r3, [r0, #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
@@ -92269,7 +92269,7 @@ _020306F2: ldr r1, [r6, #0xc]
ldr r2, [r5, r2]
ldr r3, [r6, #0x4]
- blx _ll_mul
+ bl _ll_mul
add r3, r0, #0x0
add r2, r1, #0x0
ldr r0, [r6, #0x10]
@@ -92316,7 +92316,7 @@ _02030746: ldr r1, [r6, #0xc]
ldr r2, [r6, #0x0]
ldr r3, [r6, #0x4]
- blx _ll_mul
+ bl _ll_mul
ldr r3, [r6, #0x10]
ldr r2, [r6, #0x14]
add r0, r3, r0
@@ -93084,7 +93084,7 @@ _02030D22: ldr r0, [sp, #0x8]
add r1, r2, r1
ldr r2, [sp, #0xc]
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
_02030D42:
ldr r1, [r5, #0x0]
ldr r0, [sp, #0xc]
@@ -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
@@ -94087,7 +94087,7 @@ FUN_02031480: ; 0x02031480 ldr r2, _020314CC ; =0x00000253
str r0, [r1, #0x0]
mov r1, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
_0203149C:
ldr r1, _020314C8 ; =0x021C59FC
mov r3, #0x0
@@ -94363,7 +94363,7 @@ _02031672: add r1, r7, #0x0
add r0, r0, r5
mov r2, #0x2
- blx MI_CpuFill8
+ bl MI_CpuFill8
add r4, r4, #0x1
add r5, r5, #0x2
cmp r4, #0x8
@@ -94405,7 +94405,7 @@ FUN_020316AC: ; 0x020316AC add r3, #0x18
add r0, r1, #0x0
add r1, r3, r4
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r1, _020316DC ; =0x021C59FC
mov r0, #0x14
ldr r1, [r1, #0x0]
@@ -94459,7 +94459,7 @@ FUN_02031704: ; 0x02031704 add r4, #0x18
mul r3, r2
add r1, r4, r3
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
pop {r3-r5, pc}
nop
_0203172C: .word 0x021C59FC
@@ -94486,7 +94486,7 @@ FUN_02031734: ; 0x02031734 mov r2, #0x50
str r0, [r1, #0x0]
mov r1, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _020317BC ; =0x021C5A00
mov r2, #0x32
ldr r1, [r0, #0x0]
@@ -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
@@ -95249,7 +95249,7 @@ _02031D04: bl FUN_0202EDF8
cmp r0, #0x0
beq _02031D18
- blx WM_GetLinkLevel
+ bl WM_GetLinkLevel
mov r1, #0x3
sub r0, r1, r0
bl FUN_02033EEC
@@ -95320,7 +95320,7 @@ _02031D42: ldr r1, [r4, #0xc]
ldr r2, [r5, #0xc]
ldr r3, [r4, #0x4]
- blx _ll_mul
+ bl _ll_mul
ldr r2, [r4, #0x10]
ldr r3, [r4, #0x14]
add r0, r2, r0
@@ -95331,7 +95331,7 @@ _02031D42: mov r1, #0x0
mov r2, #0x14
mov r3, #0x0
- blx _ll_mul
+ bl _ll_mul
mov r0, #0x0
add r5, #0x43
strb r0, [r5, #0x0]
@@ -95404,7 +95404,7 @@ _02031E32: ldr r1, [r4, #0xc]
ldr r2, [r5, #0xc]
ldr r3, [r4, #0x4]
- blx _ll_mul
+ bl _ll_mul
ldr r2, [r4, #0x10]
ldr r3, [r4, #0x14]
add r0, r2, r0
@@ -95452,7 +95452,7 @@ FUN_02031E8C: ; 0x02031E8C ldr r1, [r5, #0xc]
ldr r2, [r4, #0xc]
ldr r3, [r5, #0x4]
- blx _ll_mul
+ bl _ll_mul
ldr r2, [r5, #0x10]
ldr r3, [r5, #0x14]
add r0, r2, r0
@@ -95680,7 +95680,7 @@ FUN_02032058: ; 0x02032058 ldr r1, [r4, #0xc]
ldr r2, [r5, #0xc]
ldr r3, [r4, #0x4]
- blx _ll_mul
+ bl _ll_mul
ldr r2, [r4, #0x10]
ldr r3, [r4, #0x14]
add r0, r2, r0
@@ -95691,7 +95691,7 @@ FUN_02032058: ; 0x02032058 mov r1, #0x0
mov r2, #0x14
mov r3, #0x0
- blx _ll_mul
+ bl _ll_mul
mov r0, #0x0
add r5, #0x43
strb r0, [r5, #0x0]
@@ -96289,7 +96289,7 @@ FUN_02032510: ; 0x02032510 ldr r1, [r5, #0xc]
ldr r2, [r4, #0xc]
ldr r3, [r5, #0x4]
- blx _ll_mul
+ bl _ll_mul
ldr r2, [r5, #0x10]
ldr r3, [r5, #0x14]
add r0, r2, r0
@@ -96376,7 +96376,7 @@ FUN_020325D0: ; 0x020325D0 ldr r1, [r5, #0xc]
ldr r2, [r4, #0xc]
ldr r3, [r5, #0x4]
- blx _ll_mul
+ bl _ll_mul
ldr r2, [r5, #0x10]
ldr r3, [r5, #0x14]
add r0, r2, r0
@@ -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
@@ -98019,7 +98019,7 @@ FUN_02033288: ; 0x02033288 mov r2, #0x50
str r0, [r1, #0x0]
mov r1, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _020332D8 ; =0x021C5A00
mov r2, #0x18
ldr r1, [r0, #0x0]
@@ -98085,7 +98085,7 @@ FUN_02033310: ; 0x02033310 mov r2, #0x50
str r0, [r1, #0x0]
mov r1, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _02033360 ; =0x021C5A00
mov r2, #0x19
ldr r1, [r0, #0x0]
@@ -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
@@ -98220,9 +98220,9 @@ FUN_0203341C: ; 0x0203341C mov r1, #0x31
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x28]
- bl FUN_021D74E0
+ 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
@@ -98265,7 +98265,7 @@ _02033482: mov r1, #0x0
ldr r0, [r0, #0x0]
add r2, r4, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
ldr r0, _020334D4 ; =0x021C5A00
mov r1, #0x0
ldr r2, [r0, #0x0]
@@ -98730,7 +98730,7 @@ FUN_020337E8: ; 0x020337E8 add r0, #0x1f
mov r1, #0x1f
bic r0, r1
- blx FUN_02096B14
+ bl FUN_02096B14
add r5, r0, #0x0
add r0, r4, #0x0
bl FUN_02016A18
@@ -98743,14 +98743,14 @@ FUN_0203380C: ; 0x0203380C push {r4, lr}
bl FUN_02028228
add r4, r0, #0x0
- blx FUN_02096FB0
+ bl FUN_02096FB0
cmp r0, #0x0
bne _0203382A
ldr r1, _0203382C ; =0x4144414A
add r0, r4, #0x0
- blx thunk_FUN_02097190
+ bl thunk_FUN_02097190
add r0, r4, #0x0
- blx thunk_FUN_02096e4c
+ bl thunk_FUN_02096e4c
_0203382A:
pop {r4, pc}
.balign 4
@@ -98763,10 +98763,10 @@ FUN_02033830: ; 0x02033830 bl FUN_02028228
add r4, r0, #0x0
add r1, sp, #0x0
- blx FUN_02096CCC
+ bl FUN_02096CCC
add r0, r4, #0x0
add r1, sp, #0x0
- blx FUN_02096DA0
+ bl FUN_02096DA0
add sp, #0xc
pop {r3-r4, pc}
@@ -98776,11 +98776,11 @@ FUN_0203384C: ; 0x0203384C bl FUN_020286EC
bl FUN_02028228
add r4, r0, #0x0
- blx FUN_02096F80
+ bl FUN_02096F80
cmp r0, #0x0
beq _0203386E
add r0, r4, #0x0
- blx FUN_02096F18
+ bl FUN_02096F18
cmp r0, #0x0
beq _0203386E
mov r0, #0x1
@@ -98810,7 +98810,7 @@ FUN_02033874: ; 0x02033874 mvn r1, r1
str r1, [r0, #0x0]
add r0, r5, #0x0
- blx FUN_0209700C
+ bl FUN_0209700C
cmp r0, #0x0
bne _020338AE
add sp, #0x8
@@ -98821,7 +98821,7 @@ _020338AE: _020338B0:
add r0, r5, #0x0
add r1, r4, #0x0
- blx FUN_02096B78
+ bl FUN_02096B78
cmp r0, #0x0
beq _020338C6
ldr r0, [sp, #0x0]
@@ -98832,16 +98832,16 @@ _020338B0: _020338C6:
add r0, r6, #0x0
add r1, r5, #0x0
- blx FUN_02096DA0
+ bl FUN_02096DA0
cmp r0, #0x0
ble _020338F4
add r0, r6, #0x0
add r1, r5, #0x0
- blx FUN_02096DA0
+ bl FUN_02096DA0
str r0, [sp, #0x4]
add r0, r6, #0x0
add r1, r4, #0x0
- blx FUN_02096DA0
+ bl FUN_02096DA0
ldr r1, [sp, #0x4]
cmp r1, r0
bne _020338F4
@@ -98856,7 +98856,7 @@ _020338F4: cmp r0, #0x0
bge _0203390A
add r0, r4, #0x0
- blx FUN_0209700C
+ bl FUN_0209700C
cmp r0, #0x0
bne _0203390A
ldr r0, [sp, #0x0]
@@ -98889,7 +98889,7 @@ FUN_02033918: ; 0x02033918 ldr r1, [sp, #0x0]
ldr r2, [sp, #0x4]
add r0, r7, #0x0
- blx FUN_020973B4
+ bl FUN_020973B4
cmp r0, #0x0
bne _02033950
add sp, #0x18
@@ -98899,10 +98899,10 @@ _02033950: ldr r1, [sp, #0x0]
ldr r2, [sp, #0x4]
add r0, sp, #0xc
- blx FUN_02096D2C
+ bl FUN_02096D2C
add r0, r7, #0x0
add r1, sp, #0xc
- blx FUN_02096DA0
+ bl FUN_02096DA0
cmp r0, #0x0
bgt _0203396C
add sp, #0x18
@@ -98916,11 +98916,11 @@ _0203396C: _02033974:
add r0, r7, #0x0
add r1, sp, #0xc
- blx FUN_02096DA0
+ bl FUN_02096DA0
str r0, [sp, #0x8]
add r0, r7, #0x0
add r1, r5, #0x0
- blx FUN_02096DA0
+ bl FUN_02096DA0
ldr r1, [sp, #0x8]
cmp r1, r0
bne _02033994
@@ -98933,7 +98933,7 @@ _02033994: cmp r0, #0x0
bge _020339A6
add r0, r5, #0x0
- blx FUN_0209700C
+ bl FUN_0209700C
cmp r0, #0x0
bne _020339A6
str r4, [r6, #0x0]
@@ -99014,7 +99014,7 @@ _02033A1C: add r0, r7, #0x0
add r1, r1, r3
mov r2, #0xc
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r0, r5, #0x0
bl FUN_0202E1BC
b _02033A5C
@@ -99058,7 +99058,7 @@ FUN_02033A70: ; 0x02033A70 bl FUN_0202DFD8
ldr r1, [sp, #0x8]
mov r2, #0xc
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
_02033AA6:
ldr r0, [sp, #0x28]
cmp r0, #0x0
@@ -99234,7 +99234,7 @@ _02033C06: ldr r0, _02033CB4 ; =0x00300010
add r7, r1, #0x0
and r7, r0
- blx GX_GetBankForOBJ
+ bl GX_GetBankForOBJ
b _02033C2C
_02033C1E:
ldr r0, _02033CB8 ; =0x04001000
@@ -99242,7 +99242,7 @@ _02033C1E: ldr r0, _02033CB4 ; =0x00300010
add r7, r1, #0x0
and r7, r0
- blx GX_GetBankForSubOBJ
+ bl GX_GetBankForSubOBJ
_02033C2C:
cmp r7, #0x10
beq _02033C38
@@ -99413,24 +99413,24 @@ FUN_02033D3C: ; 0x02033D3C mov r1, #0x96
ldr r0, [sp, #0x4]
lsl r1, r1, #0x2
- blx DC_FlushRange
+ bl DC_FlushRange
ldr r0, [sp, #0x4]
add r1, sp, #0x0
- blx FUN_020B0138
+ bl FUN_020B0138
cmp r5, #0x1
bne _02033D80
ldr r0, [sp, #0x0]
add r1, r4, #0x0
ldr r0, [r0, #0xc]
mov r2, #0x20
- blx GX_LoadOBJPltt
+ bl GX_LoadOBJPltt
b _02033D8C
_02033D80:
ldr r0, [sp, #0x0]
add r1, r4, #0x0
ldr r0, [r0, #0xc]
mov r2, #0x20
- blx GXS_LoadOBJPltt
+ bl GXS_LoadOBJPltt
_02033D8C:
ldr r0, [sp, #0x4]
bl FUN_02016A18
@@ -99466,10 +99466,10 @@ _02033DC8: mov r1, #0x96
ldr r0, [sp, #0x4]
lsl r1, r1, #0x2
- blx DC_FlushRange
+ bl DC_FlushRange
ldr r0, [sp, #0x4]
add r1, sp, #0x0
- blx FUN_020B0088
+ bl FUN_020B0088
cmp r5, #0x1
bne _02033DF0
mov r0, #0x1
@@ -99478,7 +99478,7 @@ _02033DC8: ldr r0, _02033E64 ; =0x00300010
add r4, r1, #0x0
and r4, r0
- blx GX_GetBankForOBJ
+ bl GX_GetBankForOBJ
b _02033E00
_02033DF0:
mov r0, #0x1
@@ -99487,7 +99487,7 @@ _02033DF0: ldr r0, _02033E64 ; =0x00300010
add r4, r1, #0x0
and r4, r0
- blx GX_GetBankForOBJ
+ bl GX_GetBankForOBJ
_02033E00:
cmp r4, #0x10
beq _02033E0C
@@ -99529,14 +99529,14 @@ _02033E34: mov r2, #0x2
ldr r0, [r0, #0x14]
lsl r2, r2, #0x8
- blx GX_LoadOBJ
+ bl GX_LoadOBJ
b _02033E52
_02033E46:
ldr r0, [sp, #0x0]
mov r2, #0x2
ldr r0, [r0, #0x14]
lsl r2, r2, #0x8
- blx GXS_LoadOBJ
+ bl GXS_LoadOBJ
_02033E52:
ldr r0, [sp, #0x4]
bl FUN_02016A18
@@ -99728,12 +99728,12 @@ _02033FA4: mov r1, #0x0
bl FUN_0200E3A0
mov r0, #0x1
- blx OS_DisableIrqMask
+ bl OS_DisableIrqMask
ldr r1, _02034154 ; =FUN_02033F50
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
@@ -100068,7 +100068,7 @@ _020342E4: bne _02034308
mov r0, #0x1
add r1, r0, #0x0
- blx OS_WaitIrq
+ bl OS_WaitIrq
b _020342E4
_02034308:
add r0, sp, #0x14
@@ -100180,7 +100180,7 @@ _0203440A: add r0, r5, #0x0
add r1, r4, r1
add r2, r7, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldr r0, [sp, #0x8]
add r5, r5, r7
cmp r0, #0x0
@@ -100191,7 +100191,7 @@ _0203440A: add r1, r4, #0x2
mul r2, r3
lsl r2, r2, #0x1
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldrb r1, [r4, #0x1]
ldrb r0, [r4, #0x0]
mul r0, r1
@@ -100207,7 +100207,7 @@ _0203443A: mul r2, r3
lsr r0, r0, #0x10
lsl r2, r2, #0x1
- blx MIi_CpuClear16
+ bl MIi_CpuClear16
_0203444E:
ldr r0, [sp, #0x4]
cmp r0, #0x0
@@ -100218,7 +100218,7 @@ _0203444E: add r0, r5, #0x0
add r1, r4, r1
mul r2, r3
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
ldrb r1, [r4, #0x1]
ldrb r0, [r4, #0x0]
mul r0, r1
@@ -100231,7 +100231,7 @@ _0203446C: mul r2, r3
add r1, r4, r1
lsl r2, r2, #0x1
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r0, r6, #0x0
bl FUN_02016A18
add sp, #0xc
@@ -100425,7 +100425,7 @@ FUN_020345A8: ; 0x020345A8 ldr r2, _020345D8 ; =0x00000708
add r0, r0, r1
add r1, r5, #0x0
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
add r0, r4, #0x0
bl FUN_02016A18
add r0, r5, #0x0
@@ -101482,7 +101482,7 @@ FUN_02034CB4: ; 0x02034CB4 mov r1, #0x0
lsl r2, r2, #0x2
add r5, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
bl FUN_020347D8
cmp r0, #0x0
@@ -101518,7 +101518,7 @@ FUN_02034CEC: ; 0x02034CEC mov r0, #0x0
add r1, r5, r1
lsl r2, r2, #0x8
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
mov r0, #0xa
add r1, r4, #0x0
bl LoadFromNARC_7
@@ -101614,7 +101614,7 @@ FUN_02034D98: ; 0x02034D98 add r4, r0, #0x0
mov r1, #0x0
mov r2, #0xa0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r4, #0x0
add r0, #0x6c
bl FUN_0204ADE0
@@ -102016,14 +102016,14 @@ _02035010: bne _0203502A
add r0, r6, #0x0
mov r1, #0x64
- blx _u32_div_f
+ bl _u32_div_f
cmp r1, #0x0
bne _02035038
_0203502A:
mov r1, #0x19
add r0, r6, #0x0
lsl r1, r1, #0x4
- blx _u32_div_f
+ bl _u32_div_f
cmp r1, #0x0
bne _0203503C
_02035038:
@@ -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
@@ -103505,7 +103505,7 @@ FUN_02035C18: ; 0x02035C18 add r6, r2, #0x0
bl FUN_020201DC
mov r1, #0x3
- blx _u32_div_f
+ bl _u32_div_f
add r2, r0, #0x0
lsl r1, r2, #0x1
add r1, r2, r1
@@ -103551,7 +103551,7 @@ FUN_02035C78: ; 0x02035C78 add r4, r0, #0x0
bl FUN_020201DC
mov r1, #0x3
- blx _u32_div_f
+ bl _u32_div_f
cmp r1, #0x1
bne _02035C9E
add r0, r4, #0x0
@@ -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
@@ -103792,7 +103792,7 @@ FUN_02035E50: ; 0x02035E50 ldr r1, [r4, r1]
mov r2, #0x40
add r6, r0, #0x0
- blx memcpy
+ bl memcpy
mov r0, #0x7e
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@@ -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
@@ -104326,7 +104326,7 @@ FUN_020362E4: ; 0x020362E4 add r2, r0, #0x0
ldr r0, [sp, #0x8]
ldr r1, [r4, r1]
- blx memcpy
+ bl memcpy
mov r0, #0x7e
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@@ -104390,7 +104390,7 @@ _0203638A: mov r1, #0x0
mov r2, #0x40
add r5, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [r6, #0xc]
bl FUN_0206BB1C
str r0, [r5, #0x0]
@@ -104490,7 +104490,7 @@ _02036474: mov r1, #0x0
mov r2, #0x40
add r5, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [sp, #0x4]
str r0, [r5, #0x0]
ldr r0, [r6, #0xc]
@@ -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
@@ -104964,7 +104964,7 @@ FUN_0203684C: ; 0x0203684C ldr r1, [r4, r1]
mov r2, #0x30
add r7, r0, #0x0
- blx memcpy
+ bl memcpy
mov r0, #0x7e
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@@ -104982,7 +104982,7 @@ FUN_0203684C: ; 0x0203684C str r1, [sp, #0x0]
mov r1, #0x0
add r5, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [r6, #0xc]
bl FUN_0206BB1C
str r0, [r5, #0x0]
@@ -105511,7 +105511,7 @@ FUN_02036CEC: ; 0x02036CEC 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]
@@ -106317,8 +106317,8 @@ FUN_02037334: ; 0x02037334 _02037348: .word 0x0000003F
_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,9 +106333,9 @@ _02037360: beq _0203736C
bl ErrorHandling
_0203736C:
- ldr r0, _0203738C ; =0x00000005
+ ldr r0, _0203738C ; =SDK_OVERLAY_MODULE_05_ID
mov r1, #0x2
- bl FUN_02005FDC
+ bl HandleLoadOverlay
mov r1, #0x0
str r1, [r4, #0x64]
ldr r0, [r4, #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
@@ -106446,7 +106446,7 @@ FUN_02037400: ; 0x02037400 mov r1, #0x0
mov r2, #0xb8
add r4, r0, #0x0
- blx MI_CpuFill8
+ bl MI_CpuFill8
mov r0, #0xb
mov r1, #0x10
bl FUN_02016998
@@ -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,8 +106575,8 @@ _02037546: ldr r0, [r0, #0x0]
cmp r0, #0x0
bne _0203756E
- ldr r0, _02037590 ; =0x00000005
- bl FUN_02005F60
+ ldr r0, _02037590 ; =SDK_OVERLAY_MODULE_05_ID
+ bl UnloadOverlayByID
b _0203756E
_02037562:
ldr r1, [r0, #0x4]
@@ -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
@@ -107138,7 +107138,7 @@ FUN_0203797C: ; 0x0203797C mov r0, #0x0
add r1, r4, #0x0
mov r2, #0x40
- blx MIi_CpuClearFast
+ bl MIi_CpuClearFast
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
str r0, [r4, #0x0]
@@ -107520,7 +107520,7 @@ FUN_02037C7C: ; 0x02037C7C 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]
@@ -107569,7 +107569,7 @@ FUN_02037CF0: ; 0x02037CF0 mov r1, #0x0
mov r2, #0x30
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
str r0, [r4, #0x0]
@@ -107970,7 +107970,7 @@ FUN_0203800C: ; 0x0203800C mov r1, #0x0
mov r2, #0x20
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
add r0, r5, #0x0
bl FUN_0206BB1C
add r1, r7, #0x0
@@ -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
@@ -109131,7 +109131,7 @@ _02038956: bl FUN_020127C0
mov r2, #0x3c
mov r3, #0x0
- blx _ll_sdiv
+ bl _ll_sdiv
add r3, r0, #0x0
ldr r1, [sp, #0x8]
ldr r2, [r5, #0x0]
@@ -109223,7 +109223,7 @@ FUN_02038A3C: ; 0x02038A3C ldr r0, _02038AAC ; =0x020F2BE8
add r1, sp, #0x8
mov r2, #0xc
- blx MI_CpuCopy8
+ bl MI_CpuCopy8
mov r4, #0x0
mov r7, #0xc
add r6, sp, #0x8
@@ -109236,7 +109236,7 @@ _02038A68: _02038A72:
bl FUN_0201B9EC
add r1, r7, #0x0
- blx _s32_div_f
+ bl _s32_div_f
lsl r0, r1, #0x18
lsr r2, r0, #0x18
ldrb r1, [r6, r4]
@@ -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 b70ef94e..4b46da9e 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,9 +7225,9 @@ _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 FUN_02005FDC
+ bl HandleLoadOverlay
add r0, r5, #0x0
bl FUN_0204FC5C
ldr r0, [r4, #0x14]
@@ -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,8 +7386,8 @@ _02049B68: _02049B76:
mov r0, #0x0
str r0, [r5, #0x6c]
- ldr r0, _02049BE4 ; =0x00000012
- bl FUN_02005F60
+ ldr r0, _02049BE4 ; =SDK_OVERLAY_MODULE_18_ID
+ bl UnloadOverlayByID
ldr r0, [r4, #0x14]
mov r2, #0x1
str r0, [sp, #0x0]
@@ -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
@@ -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
@@ -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}
@@ -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]
@@ -21243,7 +21243,7 @@ _02050590: .word 0x02247831 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}
@@ -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]
@@ -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]
@@ -131946,7 +131946,7 @@ FUN_020859C0: ; 0x020859C0 ldr r2, _02085BA0 ; =0x0000042C
mov r1, #0x0
add r4, r0, #0x0
- blx Call_FillMemWithValue
+ bl Call_FillMemWithValue
bl FUN_0222E2BC
mov r1, #0x23
lsl r1, r1, #0x4
@@ -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
@@ -132323,7 +132323,7 @@ FUN_02085C08: ; 0x02085C08 mov r0, #0x35
bl FUN_020168D0
ldr r0, _02085D68 ; =0x00000008
- bl FUN_02005F60
+ bl UnloadOverlayByID
mov r0, #0x1
pop {r3-r5, pc}
nop
@@ -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
@@ -137757,41 +137757,41 @@ FUN_02088854: ; 0x02088854 thumb_func_start FUN_02088858
FUN_02088858: ; 0x02088858
- ldr r3, _02088860 ; =FUN_02005FDC
- ldr r0, _02088864 ; =0x00000004
+ ldr r3, _02088860 ; =HandleLoadOverlay
+ ldr r0, _02088864 ; =SDK_OVERLAY_MODULE_04_ID
mov r1, #0x2
bx r3
.balign 4
-_02088860: .word FUN_02005FDC
-_02088864: .word 0x00000004
+_02088860: .word HandleLoadOverlay
+_02088864: .word SDK_OVERLAY_MODULE_04_ID
thumb_func_start FUN_02088868
FUN_02088868: ; 0x02088868
- ldr r3, _02088870 ; =FUN_02005F60
- ldr r0, _02088874 ; =0x00000004
+ ldr r3, _02088870 ; =UnloadOverlayByID
+ ldr r0, _02088874 ; =SDK_OVERLAY_MODULE_04_ID
bx r3
nop
-_02088870: .word FUN_02005F60
-_02088874: .word 0x00000004
+_02088870: .word UnloadOverlayByID
+_02088874: .word SDK_OVERLAY_MODULE_04_ID
thumb_func_start FUN_02088878
FUN_02088878: ; 0x02088878
- ldr r3, _02088880 ; =FUN_02005FDC
- ldr r0, _02088884 ; =0x0000000D
+ ldr r3, _02088880 ; =HandleLoadOverlay
+ ldr r0, _02088884 ; =SDK_OVERLAY_MODULE_13_ID
mov r1, #0x2
bx r3
.balign 4
-_02088880: .word FUN_02005FDC
-_02088884: .word 0x0000000D
+_02088880: .word HandleLoadOverlay
+_02088884: .word SDK_OVERLAY_MODULE_13_ID
thumb_func_start FUN_02088888
FUN_02088888: ; 0x02088888
- ldr r3, _02088890 ; =FUN_02005F60
- ldr r0, _02088894 ; =0x0000000D
+ ldr r3, _02088890 ; =UnloadOverlayByID
+ ldr r0, _02088894 ; =SDK_OVERLAY_MODULE_13_ID
bx r3
nop
-_02088890: .word FUN_02005F60
-_02088894: .word 0x0000000D
+_02088890: .word UnloadOverlayByID
+_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 ; =FUN_02005FDC
- ldr r0, _020888C8 ; =0x0000004F
+ ldr r3, _020888C4 ; =HandleLoadOverlay
+ ldr r0, _020888C8 ; =SDK_OVERLAY_MODULE_79_ID
mov r1, #0x2
bx r3
.balign 4
-_020888C4: .word FUN_02005FDC
-_020888C8: .word 0x0000004F
+_020888C4: .word HandleLoadOverlay
+_020888C8: .word SDK_OVERLAY_MODULE_79_ID
thumb_func_start FUN_020888CC
FUN_020888CC: ; 0x020888CC
- ldr r3, _020888D4 ; =FUN_02005F60
- ldr r0, _020888D8 ; =0x0000004F
+ ldr r3, _020888D4 ; =UnloadOverlayByID
+ ldr r0, _020888D8 ; =SDK_OVERLAY_MODULE_79_ID
bx r3
nop
-_020888D4: .word FUN_02005F60
-_020888D8: .word 0x0000004F
+_020888D4: .word UnloadOverlayByID
+_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
@@ -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..3c9e95d4 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 diff --git a/arm9/asm/unk_020910EC.s b/arm9/asm/unk_020910EC.s index e5d80405..88bd5a14 100644 --- a/arm9/asm/unk_020910EC.s +++ b/arm9/asm/unk_020910EC.s @@ -3,6 +3,8 @@ .text + ; Nintendo DWC + arm_func_start FUN_020910EC FUN_020910EC: ; 0x020910EC stmdb sp!, {r4-r5,lr} @@ -4770,7 +4772,9 @@ _0209530C: strb r7, [r0, #-0x4] strb r6, [r0, #-0x3] ldmia sp!, {r4-r9,pc} -_02095324: ; 0x02095324 + + arm_func_start FUN_02095324 +FUN_02095324: ; 0x02095324 ldr r0, _0209532C ; =0x021C8C84 bx lr .balign 4 @@ -4873,7 +4877,7 @@ _02095460: cmp r0, #0x1 beq _02095488 mov r0, r4 - blx SVC_WaitByLoop + bl SVC_WaitByLoop b _02095460 _02095488: mov r0, #0x1 @@ -4939,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} @@ -4980,7 +4984,7 @@ _020955B0: cmp r0, #0x1 beq _020955D8 mov r0, r7 - blx SVC_WaitByLoop + bl SVC_WaitByLoop b _020955B0 _020955D8: mov r0, r4 @@ -5337,7 +5341,7 @@ _02095A74: b _0209574C _02095A7C: ldr r0, [sp, #0xbc] - blx SVC_WaitByLoop + bl SVC_WaitByLoop b _0209574C _02095A88: add sp, sp, #0xc4 @@ -6589,11 +6593,13 @@ _02096B08: .word 0x0000FFFF _02096B0C: .word 0x020FF580 _02096B10: .word 0x020FF578 + .extern _SDK_NintendoDWC + arm_func_start FUN_02096B14 FUN_02096B14: ; 0x02096B14 stmdb sp!, {r4-r6,lr} mov r6, r0 - ldr r0, _02096B74 ; =0x02000B8C + ldr r0, _02096B74 ; =_SDK_NintendoDWC mov r4, #0x0 bl OSi_ReferSymbol mov r0, r6 @@ -6619,7 +6625,9 @@ _02096B64: moveq r0, #0x0 ldmia sp!, {r4-r6,pc} .balign 4 -_02096B74: .word 0x02000B8C +_02096B74: .word _SDK_NintendoDWC + + ; Nintendo Wifi (?) arm_func_start FUN_02096B78 FUN_02096B78: ; 0x02096B78 @@ -7655,11 +7663,13 @@ _02097828: .word 0x021C8CC0 _0209782C: .word 0x021061F4 _02097830: .word 0x021C8CD0 + .extern _SDK_NintendoWiFi + arm_func_start FUN_02097834 FUN_02097834: ; 0x02097834 stmdb sp!, {r4,lr} mov r4, r0 - ldr r0, _02097870 ; =0x02000BC4 + ldr r0, _02097870 ; =_SDK_NintendoWiFi bl OSi_ReferSymbol ldr r0, _02097874 ; =0x021C8CC0 ldr r1, [r0, #0x0] @@ -7673,9 +7683,11 @@ FUN_02097834: ; 0x02097834 ldmia sp!, {r4,lr} bx lr .balign 4 -_02097870: .word 0x02000BC4 +_02097870: .word _SDK_NintendoWiFi _02097874: .word 0x021C8CC0 + ; Ubiquitous CPS (?) + arm_func_start FUN_02097878 FUN_02097878: ; 0x02097878 stmdb sp!, {r4-r9,lr} @@ -17526,12 +17538,14 @@ _0209FD74: _0209FD8C: .word 0x021C90A0 _0209FD90: .word 0x021C8EF8 + .extern _SDK_UbiquitousCPS + arm_func_start FUN_0209FD94 FUN_0209FD94: ; 0x0209FD94 stmdb sp!, {r4-r6,lr} sub sp, sp, #0x8 mov r4, r0 - ldr r0, _0209FFD4 ; =0x02000BEC + ldr r0, _0209FFD4 ; =_SDK_UbiquitousCPS bl OSi_ReferSymbol ldr r12, [r4, #0x14] ldr r6, [r4, #0x18] @@ -17677,7 +17691,7 @@ _0209FE60: ldmia sp!, {r4-r6,lr} bx lr .balign 4 -_0209FFD4: .word 0x02000BEC +_0209FFD4: .word _SDK_UbiquitousCPS _0209FFD8: .word 0x021C8F24 _0209FFDC: .word 0x6C078965 _0209FFE0: .word 0x5D588B65 @@ -17709,6 +17723,8 @@ _020A0044: .word 0x021C90A0 _020A0048: .word FUN_0209BA80 _020A004C: .word 0x021C9EE0 + ; Ubiquitous SSL (?) + arm_func_start FUN_020A0050 FUN_020A0050: ; 0x020A0050 mov r0, #0x1 @@ -17909,11 +17925,13 @@ _020A02E0: .word 0x021CA6FC _020A02E4: .word 0x000003BD _020A02E8: .word 0x021D3498 + .extern _SDK_UbiquitousSSL + arm_func_start FUN_020A02EC FUN_020A02EC: stmdb sp!, {r4,lr} mov r4, r0 - ldr r0, _020A0318 ; =0x02000C04 + ldr r0, _020A0318 ; =_SDK_UbiquitousSSL bl OSi_ReferSymbol ldr r0, _020A031C ; =0x021D3498 ldr r0, [r0, #0x4] @@ -17923,9 +17941,11 @@ FUN_020A02EC: ldmia sp!, {r4,lr} bx lr .balign 4 -_020A0318: .word 0x02000C04 +_020A0318: .word _SDK_UbiquitousSSL _020A031C: .word 0x021D3498 + ; Abiosso libVCT (?) + arm_func_start FUN_020A0320 FUN_020A0320: ; 0x020A0320 stmdb sp!, {r4,lr} @@ -29476,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 @@ -32174,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 @@ -32254,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 @@ -33680,23 +33700,22 @@ FUN_020AD904: ; 0x020AD904 _020AD934: .word 0x021CCD20 _020AD938: .word 0x021CCD1C + .extern _SDK_AbiossolibVCT + arm_func_start FUN_020AD93C FUN_020AD93C: ; 0x020AD93C stmdb sp!, {r4,lr} mov r4, r0 - ldr r0, _020ADA78 ; =0x02000C1C + ldr r0, _020ADA78 ; =_SDK_AbiossolibVCT bl OSi_ReferSymbol -_020AD94C: ; 0x020AD94C cmp r4, #0x0 moveq r0, #0x0 ldmeqia sp!, {r4,pc} -_020AD958: ; 0x020AD958 ldr r0, _020ADA7C ; =0x021CCD1C ldr r0, [r0, #0x0] cmp r0, #0x0 movne r0, #0x1 ldmneia sp!, {r4,pc} -_020AD96C: ; 0x020AD96C ldr r0, [r4, #0x8] cmp r0, #0x1 beq _020AD98C @@ -33710,7 +33729,6 @@ _020AD98C: cmp r0, #0x0 moveq r0, #0x0 ldmeqia sp!, {r4,pc} -_020AD99C: ; 0x020AD99C ldr r2, [r4, #0x10] cmp r2, #0x0 beq _020AD9B4 @@ -33726,7 +33744,6 @@ _020AD9BC: adds r0, r1, r0, ror #0x1b movne r0, #0x0 ldmneia sp!, {r4,pc} -_020AD9D0: ; 0x020AD9D0 ldr r0, _020ADA80 ; =0x021CCD20 mov r1, #0x0 mov r2, #0x18 @@ -33743,47 +33760,41 @@ _020AD9D0: ; 0x020AD9D0 ldrb r2, [r4, #0xc] cmp r2, #0x20 ldmcsia sp!, {r4,pc} -_020ADA10: ; 0x020ADA10 strb r2, [r1, #0x0] ldr r0, [r4, #0x10] ldr r1, [r4, #0x14] bl FUN_020ACE30 -_020ADA20: ; 0x020ADA20 cmp r0, #0x0 bne _020ADA34 bl FUN_020ACE10 -_020ADA2C: ; 0x020ADA2C mov r0, #0x0 ldmia sp!, {r4,pc} _020ADA34: mov r0, r4 bl FUN_020AC97C -_020ADA3C: ; 0x020ADA3C cmp r0, #0x0 bne _020ADA50 bl FUN_020ACE10 -_020ADA48: ; 0x020ADA48 mov r0, #0x0 ldmia sp!, {r4,pc} _020ADA50: bl FUN_020AAF58 -_020ADA54: ; 0x020ADA54 cmp r0, #0x0 ldrne r1, _020ADA7C ; =0x021CCD1C movne r0, #0x1 strne r0, [r1, #0x0] ldmneia sp!, {r4,pc} -_020ADA68: ; 0x020ADA68 bl FUN_020AC964 bl FUN_020ACE10 -_020ADA70: ; 0x020ADA70 mov r0, #0x0 ldmia sp!, {r4,pc} .balign 4 -_020ADA78: .word 0x02000C1C +_020ADA78: .word _SDK_AbiossolibVCT _020ADA7C: .word 0x021CCD1C _020ADA80: .word 0x021CCD20 + ; unknown + arm_func_start FUN_020ADA84 FUN_020ADA84: ; 0x020ADA84 cmp r1, #0x0 diff --git a/arm9/asm/unk_020AF030.s b/arm9/asm/unk_020AF030.s index ec33e3fa..a107adc3 100644 --- a/arm9/asm/unk_020AF030.s +++ b/arm9/asm/unk_020AF030.s @@ -1960,7 +1960,9 @@ _020B0824: ; 0x020B0824 cmp r2, r1 strcc r1, [r4, #0x0] ldmia sp!, {r4,pc} -_020B0830: ; 0x020B0830 + + arm_func_start FUN_020B0830 +FUN_020B0830: ; 0x020B0830 ldrh r3, [r0, #0x6] ldrh r2, [r0, #0x8] mov r12, #0x0 @@ -13214,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 @@ -17207,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 |