diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-18 20:24:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-18 20:24:09 -0400 |
| commit | af09e73d6733245ea61189f339b81ab68f645c17 (patch) | |
| tree | d425cff00e4c7dd8a564dbf17091d0d5d5f563fe /berry_fix/payload/asm/crt0.s | |
| parent | e129d04b931a4fc0e6584b4340dc57b9162264d5 (diff) | |
| parent | 8e6dd3bafeab105f079e120d3b2cd7e61cf10477 (diff) | |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'berry_fix/payload/asm/crt0.s')
| -rw-r--r-- | berry_fix/payload/asm/crt0.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/berry_fix/payload/asm/crt0.s b/berry_fix/payload/asm/crt0.s index 872a63018..2bca00636 100644 --- a/berry_fix/payload/asm/crt0.s +++ b/berry_fix/payload/asm/crt0.s @@ -9,10 +9,10 @@ .align 2, 0 .global Init Init: - mov r0, PSR_IRQ_MODE + mov r0, #PSR_IRQ_MODE msr cpsr_cf, r0 ldr sp, sp_irq - mov r0, PSR_SYS_MODE + mov r0, #PSR_SYS_MODE msr cpsr_cf, r0 ldr sp, sp_sys ldr r1, =INTR_VECTOR @@ -34,8 +34,8 @@ sp_irq: .word IWRAM_END - 0x60 .align 2, 0 .global IntrMain IntrMain: @ 0x2010048 - mov ip, REG_BASE - add r3, ip, OFFSET_REG_IE + mov ip, #REG_BASE + add r3, ip, #OFFSET_REG_IE ldr r2, [r3] and r1, r2, r2, lsr #16 mov r2, #0 |