diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-11 18:07:52 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-11 18:07:52 -0400 |
commit | d104a46ce13665a41a4ba4b7bab4239fffe1ef06 (patch) | |
tree | 8c060fa46e5d8c29b991b420e1a03c7bbe6e3b30 /arm9/modules | |
parent | 17d5ec76a021218e0bf9741d6fc199fa0c540aa1 (diff) |
blx IMM --> bl IMM
Diffstat (limited to 'arm9/modules')
-rw-r--r-- | arm9/modules/13/asm/module_13_arm2.s | 14 | ||||
-rw-r--r-- | arm9/modules/29/asm/module_29.s | 10 | ||||
-rw-r--r-- | arm9/modules/36/asm/module_36.s | 6 | ||||
-rw-r--r-- | arm9/modules/39/asm/module_39.s | 6 | ||||
-rw-r--r-- | arm9/modules/40/asm/module_40.s | 4 |
5 files changed, 20 insertions, 20 deletions
diff --git a/arm9/modules/13/asm/module_13_arm2.s b/arm9/modules/13/asm/module_13_arm2.s index 2e9dd8b5..ad4626d6 100644 --- a/arm9/modules/13/asm/module_13_arm2.s +++ b/arm9/modules/13/asm/module_13_arm2.s @@ -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 diff --git a/arm9/modules/29/asm/module_29.s b/arm9/modules/29/asm/module_29.s index db3f5ab8..65873dcc 100644 --- a/arm9/modules/29/asm/module_29.s +++ b/arm9/modules/29/asm/module_29.s @@ -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 diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s index d15b1d72..47ccf2cc 100644 --- a/arm9/modules/36/asm/module_36.s +++ b/arm9/modules/36/asm/module_36.s @@ -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 diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s index 92d51179..c5946d62 100644 --- a/arm9/modules/39/asm/module_39.s +++ b/arm9/modules/39/asm/module_39.s @@ -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] diff --git a/arm9/modules/40/asm/module_40.s b/arm9/modules/40/asm/module_40.s index af31d92c..bc8e79f1 100644 --- a/arm9/modules/40/asm/module_40.s +++ b/arm9/modules/40/asm/module_40.s @@ -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] |