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/dma3_manager.s | |
| parent | 7dad2846f83f892cdb4ffd7a757d0858b02fc96e (diff) | |
| parent | d708372ea9fc91d8931892425aa786edbdf5a463 (diff) | |
Merge remote-tracking branch 'refs/remotes/pret/master'
# Conflicts:
# asm/libagbbackup.s
Diffstat (limited to 'asm/dma3_manager.s')
| -rw-r--r-- | asm/dma3_manager.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/dma3_manager.s b/asm/dma3_manager.s index 1c6beda2f..74832b527 100644 --- a/asm/dma3_manager.s +++ b/asm/dma3_manager.s @@ -260,7 +260,7 @@ _08000DB2: mov r5, r12 ldrb r0, [r5] lsls r0, 4 - ldr r3, =0x0300001c + ldr r3, =gUnknown_0300001C adds r0, r3 ldr r0, [r0] strh r0, [r1] @@ -276,7 +276,7 @@ _08000DB2: bhi _08000DB2 ldrb r0, [r5] lsls r0, 4 - ldr r5, =0x0300001c + ldr r5, =gUnknown_0300001C adds r0, r5 ldr r0, [r0] strh r0, [r1] |