diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
| commit | 4b36a9d2e1d6b6ac823fbb14e8f0ba750b0eecc2 (patch) | |
| tree | fcbbd0247503a200c4c1d8df690a676b49a09efd /engine/player_object.asm | |
| parent | e3ee39f3344107f666099448401d28b04c983cd6 (diff) | |
| parent | a6656a986bf9dde51561cab090648e0117b173ad (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
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 |