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/var.s | |
parent | 7dad2846f83f892cdb4ffd7a757d0858b02fc96e (diff) | |
parent | d708372ea9fc91d8931892425aa786edbdf5a463 (diff) |
Merge remote-tracking branch 'refs/remotes/pret/master'
# Conflicts:
# asm/libagbbackup.s
Diffstat (limited to 'asm/var.s')
-rw-r--r-- | asm/var.s | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -31,7 +31,7 @@ _0809D660: b _0809D688 .pool _0809D67C: - ldr r0, =0x03005d8c + ldr r0, =gUnknown_03005D8C lsls r1, r2, 1 ldr r2, =0xffff939c adds r1, r2 |