diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-06-06 19:14:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-06 19:14:41 +0300 |
| commit | 465ca61e67cb2b04cbe316fedab513f0b0b4e10f (patch) | |
| tree | a2329b091d524c0d389e9d0b4750bde02cf75ede /arm7/asm/OS_thread.s | |
| parent | 3229f51b696bb1f7af7a9286f4f196c55eb7c21f (diff) | |
| parent | ce2b89342f6277cf881d6a03194ef43b2a310fe4 (diff) | |
Merge branch 'master' into pikalax_work
Diffstat (limited to 'arm7/asm/OS_thread.s')
| -rw-r--r-- | arm7/asm/OS_thread.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arm7/asm/OS_thread.s b/arm7/asm/OS_thread.s index 832e6606..64aebb04 100644 --- a/arm7/asm/OS_thread.s +++ b/arm7/asm/OS_thread.s @@ -322,7 +322,7 @@ _037F9138: bl OS_WakeupThread bl OS_EnableScheduler bl OS_RescheduleThread - bl FUN_037FB1F0 + bl OS_Terminate ldmia sp!, {r4, lr} bx lr _037F9164: .word OSi_CurrentThreadPtr |