summaryrefslogtreecommitdiff
path: root/arm9/asm/OS_spinLock.s
diff options
context:
space:
mode:
authorred031000 <rubenru09@aol.com>2020-05-12 23:12:35 +0100
committerred031000 <rubenru09@aol.com>2020-05-12 23:12:35 +0100
commit59171916421e659bcb35b1b47eaf748fac2fea6d (patch)
treefd5886b4a76002766c94a5d33a1a42fd14335e0e /arm9/asm/OS_spinLock.s
parent26b7a78d02b261256e420f149bb7bae66e392ee7 (diff)
parentf4ea052ed0b4e3b0d6a3c12bce46ee53228a9bc0 (diff)
Merge branch 'master' of https://github.com/martmists/pokediamond into overlay69
Diffstat (limited to 'arm9/asm/OS_spinLock.s')
-rw-r--r--arm9/asm/OS_spinLock.s4
1 files changed, 2 insertions, 2 deletions
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