Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-09-12 19:16:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

blx IMM --> bl IMM

Browse Source
This commit is contained in:
PikalaxALT
2020-05-11 18:07:52 -04:00
parent 17d5ec76a0
commit d104a46ce1
18 changed files with 708 additions and 708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arm9/asm/OS_spinLock.s
View File

@@ -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

140
arm9/asm/filesystem.s
View File

@@ -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

2
arm9/asm/libcard.s
View File

@@ -1637,7 +1637,7 @@ _020D7BEC: ; 0x020D7BEC
mov r4, #0x0
_020D7C04:
mov r0, r6
blx SVC_WaitByLoop
bl SVC_WaitByLoop
mov r0, r5
mov r1, r7
mov r2, r4

8
arm9/asm/libctrdg.s
View File

@@ -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

66
arm9/asm/scrcmd.s
View File

@@ -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
@@ -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]
@@ -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}
@@ -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]
@@ -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
@@ -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
@@ -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
@@ -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]
@@ -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
@@ -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:

10
arm9/asm/unk_02000E0C.s
View File

@@ -1962,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]
@@ -1994,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]
@@ -2064,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
@@ -2234,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
@@ -2243,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]

250
arm9/asm/unk_020023C0.s
View File

@@ -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

2
arm9/asm/unk_020061E8.s
View File

@@ -19,7 +19,7 @@ FUN_020061E8: ; 0x020061E8
_02006202:
mov r1, #0x0
add r2, r5, #0x0
blx Call_FillMemWithValue
bl Call_FillMemWithValue
b _0200620E
_0200620C:
mov r4, #0x0

8
arm9/asm/unk_02038C78.s
View File

@@ -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

860
arm9/asm/unk_02046030.s
View File

File diff suppressed because it is too large Load Diff

14
arm9/asm/unk_0208AC14.s
View File

@@ -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

8
arm9/asm/unk_020910EC.s
View File

@@ -4877,7 +4877,7 @@ _02095460:
cmp r0, #0x1
beq _02095488
mov r0, r4
blx SVC_WaitByLoop
bl SVC_WaitByLoop
b _02095460
_02095488:
mov r0, #0x1
@@ -4943,7 +4943,7 @@ _0209552C:
ldmeqia sp!, {r4-r8,pc}
_02095548: ; 0x02095548
mov r0, r4
blx SVC_WaitByLoop
bl SVC_WaitByLoop
b _0209552C
_02095554: ; 0x02095554
ldmia sp!, {r4-r8,pc}
@@ -4984,7 +4984,7 @@ _020955B0:
cmp r0, #0x1
beq _020955D8
mov r0, r7
blx SVC_WaitByLoop
bl SVC_WaitByLoop
b _020955B0
_020955D8:
mov r0, r4
@@ -5341,7 +5341,7 @@ _02095A74:
b _0209574C
_02095A7C:
ldr r0, [sp, #0xbc]
blx SVC_WaitByLoop
bl SVC_WaitByLoop
b _0209574C
_02095A88:
add sp, sp, #0xc4

4
arm9/asm/unk_020AF030.s
View File

@@ -13216,7 +13216,7 @@ _020BA188:
str r1, [sp, #0x0]
ldrsh r1, [r5, #0x2]
str r1, [sp, #0x4]
blx MI_Zero36B
bl MI_Zero36B
ldrh r0, [r4, #0x0]
add r1, r6, r11, lsl #0x2
add r5, r5, #0x4
@@ -17209,7 +17209,7 @@ FUN_020BD850: ; 0x020BD850
mov r5, r2, asr #0x4
ldrsh r7, [r1, #0x0]
ldrsh r6, [r1, #0x2]
blx MI_Zero36B
bl MI_Zero36B
ldrh r0, [r4, #0x0]
add r1, r8, r5, lsl #0x2
ands r0, r0, #0x100

14
arm9/modules/13/asm/module_13_arm2.s
View File

@@ -5214,7 +5214,7 @@ MOD13_02222D0C: ; 0x02222D0C
sub sp, sp, #4
ldr r0, _02222D74 ; =0x02243048
ldr r0, [r0]
blx MOD13_02219798
bl MOD13_02219798
cmp r0, #0
ldreq r1, _02222D78 ; =0x02243044
moveq r0, #1
@@ -5246,7 +5246,7 @@ _02222D78: .word 0x02243044
MOD13_02222D7C: ; 0x02222D7C
stmdb sp!, {r4, lr}
mov r4, r0
blx MOD13_02219C9C
bl MOD13_02219C9C
cmp r4, #0
beq _02222DC0
ldr r0, _02222DCC ; =0x02243048
@@ -5329,7 +5329,7 @@ _02222E48:
bl OS_GetMacAddress
ldr r0, _02222EE0 ; =MOD13_02222CFC
ldr r1, _02222EE4 ; =MOD13_02222CF0
blx MOD13_02219D58
bl MOD13_02219D58
cmp r0, #0
addeq sp, sp, #0x104
ldmeqia sp!, {pc}
@@ -6270,7 +6270,7 @@ MOD13_02223AF8: ; 0x02223AF8
stmdb sp!, {lr}
sub sp, sp, #0xec
add r0, sp, #0
blx MOD13_0221A794
bl MOD13_0221A794
cmp r0, #1
beq _02223B14
bl OS_Terminate
@@ -6313,7 +6313,7 @@ _02223B7C:
ldmia sp!, {pc}
_02223B88:
add r0, sp, #0
blx MOD13_0221A794
bl MOD13_0221A794
cmp r0, #1
beq _02223B9C
bl OS_Terminate
@@ -6344,7 +6344,7 @@ _02223BDC: .word 0x02243078
MOD13_02223BE0: ; 0x02223BE0
stmdb sp!, {lr}
sub sp, sp, #4
blx MOD13_0221A7EC
bl MOD13_0221A7EC
cmp r0, #1
beq _02223BF8
bl OS_Terminate
@@ -6373,7 +6373,7 @@ MOD13_02223C0C: ; 0x02223C0C
mov r0, #0xf
mov r1, #0x40
str ip, [sp, #4]
blx MOD13_0221A8A4
bl MOD13_0221A8A4
cmp r0, #1
beq _02223C58
bl OS_Terminate

10
arm9/modules/29/asm/module_29.s
View File

@@ -383,7 +383,7 @@ _02254AE0:
mul r1, r0
add r0, r2, r1
lsl r0, r0, #0xc
blx FX_Sqrt
bl FX_Sqrt
ldrb r1, [r5, #4]
lsl r2, r1, #2
ldr r1, _02254B6C ; =0x022550A8
@@ -724,13 +724,13 @@ MOD29_02254D10: ; 0x02254D10
add r0, r4, #0
add r0, #0x70
mov r1, #0x20
blx DC_FlushRange
bl DC_FlushRange
add r0, r4, #0
mov r1, #0x1a
add r0, #0x70
lsl r1, r1, #4
mov r2, #0x20
blx GXS_LoadOBJPltt
bl GXS_LoadOBJPltt
add r0, r4, #0
add r0, #0x8e
ldrh r1, [r0]
@@ -740,13 +740,13 @@ MOD29_02254D10: ; 0x02254D10
add r0, r4, #0
add r0, #0x70
mov r1, #0x20
blx DC_FlushRange
bl DC_FlushRange
add r0, r4, #0
mov r1, #7
add r0, #0x70
lsl r1, r1, #6
mov r2, #0x20
blx GXS_LoadOBJPltt
bl GXS_LoadOBJPltt
ldr r0, [r4, #4]
mov r1, #6
bl FUN_02017CD0

6
arm9/modules/36/asm/module_36.s
View File

@@ -632,7 +632,7 @@ _02254CDA:
ldr r0, [sp, #0x28]
sub r0, r0, r4
lsl r0, r0, #0xc
blx _s32_div_f
bl _s32_div_f
str r0, [sp, #0x10]
b _02254CF0
_02254CEC:
@@ -699,7 +699,7 @@ _02254D54:
add r1, r2, #0
sub r0, r0, r5
lsl r0, r0, #0xc
blx _s32_div_f
bl _s32_div_f
str r0, [sp, #8]
b _02254D6C
_02254D68:
@@ -1225,7 +1225,7 @@ MOD36_0225510C: ; 0x0225510C
mov r2, #0x20
add r1, r1, r5
lsl r1, r1, #5
blx GXS_LoadBG3Char
bl GXS_LoadBG3Char
add r0, r6, #0
bl MOD36_02254F48
add sp, #8

6
arm9/modules/39/asm/module_39.s
View File

@@ -600,7 +600,7 @@ MOD39_02254C6C: ; 0x02254C6C
mov r1, #0x4a
bl FUN_02006A34
mov r1, #0x14
blx _u32_div_f
bl _u32_div_f
ldr r1, [sp, #0xc]
str r0, [r5, #0x64]
add r2, r1, #0
@@ -1272,7 +1272,7 @@ _0225517A:
add r1, #0x84
ldr r0, [r6]
ldr r1, [r1]
blx _u32_div_f
bl _u32_div_f
str r0, [r6]
str r7, [r4, #0x70]
b _02255276
@@ -1311,7 +1311,7 @@ _022551C2:
add r1, #0x84
ldr r0, [r6]
ldr r1, [r1]
blx _u32_div_f
bl _u32_div_f
str r0, [r6]
mov r0, #1
str r0, [r4, #0x70]

4
arm9/modules/40/asm/module_40.s
View File

@@ -138,7 +138,7 @@ MOD40_02254940: ; 0x02254940
cmp r0, #0x18
blo _0225495A
mov r1, #0x18
blx _u32_div_f
bl _u32_div_f
str r1, [sp]
_0225495A:
ldr r0, [sp, #4]
@@ -146,7 +146,7 @@ _0225495A:
blo _0225496A
ldr r0, [sp]
mov r1, #0x3c
blx _u32_div_f
bl _u32_div_f
str r1, [sp]
_0225496A:
ldr r0, [sp]