diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-28 18:01:26 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-28 18:01:26 -0400 |
| commit | 7409f8908ec914664c29686a11e2eef40f087594 (patch) | |
| tree | ea398adcdd1ebcf7e0bfd4b91a40263dfb4b0681 /arm9/asm/OS_context.s | |
| parent | 3d7ea9dfb8deb95709f0a4441950a3c7ca486e5b (diff) | |
| parent | 44da9faaaaf845b068bb4d843ab3c2e84d45822e (diff) | |
Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work
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 |