From e34e68095df1f91dc5357669c187623d7cba39c6 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Mon, 25 Dec 2017 13:40:10 -0500
Subject: Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X
 % $100` or `X >> 8` and `X & $ff`

---
 macros/data.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'macros/data.asm')

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
-- 
cgit v1.2.3