diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2016-11-01 14:18:05 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2016-11-01 14:18:05 -0500 |
| commit | 265e1b712f6a5b7dedc84f8c98af820ab3539fb1 (patch) | |
| tree | 1dd278216f2633af80a5513cfb08519457dc3f8d /asm/crt0.s | |
| parent | 7dad2846f83f892cdb4ffd7a757d0858b02fc96e (diff) | |
| parent | d708372ea9fc91d8931892425aa786edbdf5a463 (diff) | |
Merge remote-tracking branch 'refs/remotes/pret/master'
# Conflicts:
# asm/libagbbackup.s
Diffstat (limited to 'asm/crt0.s')
| -rw-r--r-- | asm/crt0.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/crt0.s b/asm/crt0.s index 7b2f38bb7..65aa8ed4b 100644 --- a/asm/crt0.s +++ b/asm/crt0.s @@ -116,7 +116,7 @@ InterruptMain_Loop: InterruptMain_FoundIntr: strh r0, [r3, OFFSET_REG_IF - 0x200] bic r2, r2, r0 - ldr r0, =0x03007868 + ldr r0, =gUnknown_03007868 ldr r0, [r0] ldrb r0, [r0, 0xA] mov r1, 0x8 @@ -129,7 +129,7 @@ InterruptMain_FoundIntr: bic r3, r3, PSR_I_BIT | PSR_F_BIT | PSR_MODE_MASK orr r3, r3, PSR_SYS_MODE msr cpsr_cf, r3 - ldr r1, =0x03002710 + ldr r1, =gUnknown_03002710 add r1, r1, r12 ldr r0, [r1] stmdb sp!, {lr} |