diff options
Diffstat (limited to 'berry_fix')
| -rw-r--r-- | berry_fix/asm/loader.s | 12 | ||||
| -rw-r--r-- | berry_fix/payload/asm/crt0.s | 8 | ||||
| -rw-r--r-- | berry_fix/payload/asm/libagbsyscall.s | 12 |
3 files changed, 16 insertions, 16 deletions
diff --git a/berry_fix/asm/loader.s b/berry_fix/asm/loader.s index 39e0b768a..a78014078 100644 --- a/berry_fix/asm/loader.s +++ b/berry_fix/asm/loader.s @@ -75,21 +75,21 @@ _send: @ 14c _150: bl _recv bne _150 - mov r2, 0 + mov r2, #0 strh r2, [r0, 0xa] @ SIOMLT_SEND - cmp r1, 0 + cmp r1, #0 bne _150 mov r2, 0x8000 _16c: - mov r1, 0 + mov r1, #0 _170: strh r1, [r0, 0xa] @ SIOMLT_SEND bl _recv bne _150 cmp r1, r2 bne _16c - lsr r2, 5 - cmp r1, 0 + lsr r2, #5 + cmp r1, #0 bne _170 ldr r3, =BerryFixMBHeaderGameCode ldrh r2, [r3] @@ -105,7 +105,7 @@ _1a0: bne _1a0 cmp r1, r2 bne _1a0 - mov r1, 0 + mov r1, #0 strh r1, [r0, 0xa] @ SIOMLT_SEND ldr r0, =_data_2f0 ldr r1, =gCode 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 diff --git a/berry_fix/payload/asm/libagbsyscall.s b/berry_fix/payload/asm/libagbsyscall.s index ea8ef3e89..9548e80d2 100644 --- a/berry_fix/payload/asm/libagbsyscall.s +++ b/berry_fix/payload/asm/libagbsyscall.s @@ -7,39 +7,39 @@ thumb_func_start CpuSet CpuSet: @ 81E3B64 - swi 0xB + svc 0xB bx lr thumb_func_end CpuSet thumb_func_start Div Div: @ 81E3B68 - swi 0x6 + svc 0x6 bx lr thumb_func_end Div thumb_func_start Mod Mod: - swi 0x6 + svc 0x6 adds r0, r1, 0 bx lr thumb_func_end Mod thumb_func_start LZ77UnCompVram LZ77UnCompVram: @ 81E3B6C - swi 0x12 + svc 0x12 bx lr thumb_func_end LZ77UnCompVram thumb_func_start RegisterRamReset RegisterRamReset: @ 81E3B80 - swi 0x1 + svc 0x1 bx lr thumb_func_end RegisterRamReset thumb_func_start VBlankIntrWait VBlankIntrWait: @ 81E3BA0 movs r2, 0 - swi 0x5 + svc 0x5 bx lr thumb_func_end VBlankIntrWait |