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/multiboot.s | |
| parent | 7dad2846f83f892cdb4ffd7a757d0858b02fc96e (diff) | |
| parent | d708372ea9fc91d8931892425aa786edbdf5a463 (diff) | |
Merge remote-tracking branch 'refs/remotes/pret/master'
# Conflicts:
# asm/libagbbackup.s
Diffstat (limited to 'asm/multiboot.s')
| -rw-r--r-- | asm/multiboot.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/multiboot.s b/asm/multiboot.s index 6af71ca8e..e0e3055c2 100644 --- a/asm/multiboot.s +++ b/asm/multiboot.s @@ -242,7 +242,7 @@ _081BA892: strb r0, [r1] movs r5, 0x3 mov r12, r1 - ldr r3, =0x0300129c + ldr r3, =gUnknown_0300129C _081BA8A0: lsls r0, r5, 1 ldr r2, =0x04000120 @@ -289,7 +289,7 @@ _081BA8F0: mov r12, r0 mov r4, r12 movs r6, 0x1 - ldr r1, =0x0300129c + ldr r1, =gUnknown_0300129C mov r9, r1 ldr r2, =0x04000120 mov r8, r2 @@ -327,7 +327,7 @@ _081BA93C: mov r12, r0 adds r6, r7, 0 adds r6, 0x19 - ldr r1, =0x0300129c + ldr r1, =gUnknown_0300129C mov r8, r1 _081BA94E: lsls r0, r5, 1 |