diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-05-28 18:01:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 18:01:07 -0400 |
| commit | 44da9faaaaf845b068bb4d843ab3c2e84d45822e (patch) | |
| tree | 172c0a5c8a7ddae1d26a6bd414344b04796c96ad /arm9/asm/OS_context.s | |
| parent | 3543d7e3d66951e96f4d1bd34f54597f881983fc (diff) | |
| parent | 29ef3ee6e435bb77a882c4a1f68786163aac4b01 (diff) | |
Merge pull request #122 from red031000/master
OS_irqHandler itcm
Diffstat (limited to 'arm9/asm/OS_context.s')
| -rw-r--r-- | arm9/asm/OS_context.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/asm/OS_context.s b/arm9/asm/OS_context.s index 1b7db498..2c8feeb8 100644 --- a/arm9/asm/OS_context.s +++ b/arm9/asm/OS_context.s @@ -60,7 +60,7 @@ _020CBB78: .word CP_SaveContext OS_LoadContext: ; 0x020CBB7C stmdb sp!, {r0,lr} add r0, r0, #0x48 - ldr r1, _020CBBBC ; =CP_RestoreContext + ldr r1, _020CBBBC ; =CPi_RestoreContext blx r1 ldmia sp!, {r0,lr} mrs r1, cpsr @@ -75,4 +75,4 @@ OS_LoadContext: ; 0x020CBB7C mov r0, r0 subs pc, lr, #0x4 .balign 4 -_020CBBBC: .word CP_RestoreContext +_020CBBBC: .word CPi_RestoreContext |