summaryrefslogtreecommitdiff
path: root/engine/player_object.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-12 01:34:46 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-12 02:31:14 -0500
commit48e40a7f09fb026bdf2f49b7f8ffc812268b2695 (patch)
tree9c9ff78428348d6460aa9750d89951dbcb4bf2a8 /engine/player_object.asm
parent065de03646831b81b041d4ba7b479f2d8ec36bee (diff)
Identify some SPRITE_ANIM_FRAME_IDX_* constants
Diffstat (limited to 'engine/player_object.asm')
-rwxr-xr-xengine/player_object.asm2
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