summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-25 13:40:10 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-25 14:23:16 -0500
commite34e68095df1f91dc5357669c187623d7cba39c6 (patch)
tree5a452f39d9c44012df90a12f1524042c6dbcd062 /macros
parentda2b01a36c6855230ec36c42bd49e7cf2ca2d348 (diff)
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
Diffstat (limited to 'macros')
-rw-r--r--macros/data.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/macros/data.asm b/macros/data.asm
index cf4af0338..ee812d43a 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -95,7 +95,7 @@ dsprite: MACRO
; conditional segment is there because not every instance of
; this macro is directly OAM
if _NARG >= 7 ; y tile, y pxl, x tile, x pxl, vtile offset, flags, palette
- db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, (\6 << 3) + (\7 & 7)
+ db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, (\6 << 3) + (\7 & PALETTE_MASK)
else
db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, \6
endc