diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-11 11:56:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 11:56:24 -0500 |
| commit | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (patch) | |
| tree | d45390654cd3f80ffccd4af95760133ef77366bd /asm/field_effect.s | |
| parent | 10fff9c6f2d29899952d1751d3de827e7e98bb60 (diff) | |
| parent | 05d03f7f3256b143a01506421c19964bcceaea5c (diff) | |
Merge pull request #18 from ProjectRevoTPP/pokemon
almost finish decompiling pokemon.c
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 |