diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-12 19:13:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 19:13:53 -0500 |
| commit | 6cf7c0790f3424a4cb472b274a88d04d449d5231 (patch) | |
| tree | 7d3c49aaaa6d50f6ea698e95e7204e6d0b76bcca /engine/player_object.asm | |
| parent | f6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff) | |
| parent | f0ab09125493f91d66af836e0abb977459a0d801 (diff) | |
Merge pull request #414 from roukaour/master
Improve sprite constants and documentation
Diffstat (limited to 'engine/player_object.asm')
| -rwxr-xr-x | engine/player_object.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/player_object.asm b/engine/player_object.asm index a4796043b..232d31bc2 100755 --- a/engine/player_object.asm +++ b/engine/player_object.asm @@ -193,7 +193,7 @@ CopyMapObjectToObjectStruct: ; 8116 and $f0 jr z, .skip_color_override swap a - and $7 ; OAM_PALETTE + and PALETTE_MASK ld [wTempObjectCopyPalette], a .skip_color_override |