diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
| commit | 50fcc3a1e96a1e35576d2d0769aec251a40805dd (patch) | |
| tree | f100b156dfa1eb6fe773d90004d79bb246e9dcbf /asm/field_effect.s | |
| parent | acdd8cab26671a975b4f155b84b24388df9d84bc (diff) | |
| parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/field_effect.s')
| -rw-r--r-- | asm/field_effect.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/field_effect.s b/asm/field_effect.s index 1382a6dae..df8562b04 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -734,7 +734,7 @@ sub_8083970: @ 8083970 str r2, [sp, 0x4] movs r1, 0 str r1, [sp, 0x8] - ldr r1, _080839C0 @ =gUnknown_823730C + ldr r1, _080839C0 @ =gMonPaletteTable lsls r4, r0, 3 adds r4, r1 ldrh r1, [r4, 0x4] @@ -758,7 +758,7 @@ sub_8083970: @ 8083970 lsrs r0, 24 b _080839CA .align 2, 0 -_080839C0: .4byte gUnknown_823730C +_080839C0: .4byte gMonPaletteTable _080839C4: .4byte 0x0000ffff _080839C8: movs r0, 0x40 |