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/flag.s | |
| parent | 7dad2846f83f892cdb4ffd7a757d0858b02fc96e (diff) | |
| parent | d708372ea9fc91d8931892425aa786edbdf5a463 (diff) | |
Merge remote-tracking branch 'refs/remotes/pret/master'
# Conflicts:
# asm/libagbbackup.s
Diffstat (limited to 'asm/flag.s')
| -rw-r--r-- | asm/flag.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/flag.s b/asm/flag.s index b4ef7bfa4..24b70f5e1 100644 --- a/asm/flag.s +++ b/asm/flag.s @@ -20,7 +20,7 @@ _0809D6FC: ldr r0, =0x00003fff cmp r2, r0 bhi _0809D71C - ldr r0, =0x03005d8c + ldr r0, =gUnknown_03005D8C lsrs r1, 19 ldr r2, =0x00001270 adds r1, r2 @@ -36,7 +36,7 @@ _0809D71C: adds r0, r3, r2 _0809D728: asrs r0, 3 - ldr r1, =0x020375fc + ldr r1, =gUnknown_020375FC _0809D72C: adds r0, r1 _0809D72E: |