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/blend_palette.s | |
| parent | 7dad2846f83f892cdb4ffd7a757d0858b02fc96e (diff) | |
| parent | d708372ea9fc91d8931892425aa786edbdf5a463 (diff) | |
Merge remote-tracking branch 'refs/remotes/pret/master'
# Conflicts:
# asm/libagbbackup.s
Diffstat (limited to 'asm/blend_palette.s')
| -rw-r--r-- | asm/blend_palette.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/blend_palette.s b/asm/blend_palette.s index dab119a92..9fa7ee4c3 100644 --- a/asm/blend_palette.s +++ b/asm/blend_palette.s @@ -26,9 +26,9 @@ pal_fade_1: @ 806F98C movs r6, 0 cmp r6, r12 bcs _0806FA12 - ldr r0, =0x02037714 + ldr r0, =gUnknown_02037714 mov r10, r0 - ldr r1, =0x02037b14 + ldr r1, =gUnknown_02037B14 mov r9, r1 _0806F9BA: mov r0, r8 |