From 01d994b8a30df12c0353bc912bcb046edf6a61b6 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Tue, 2 Jan 2018 18:06:56 -0500
Subject: [PATCH] dsprite always has 6 arguments

---
 macros/data.asm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/macros/data.asm b/macros/data.asm
index 55f41a204..d01abb8ea 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -85,20 +85,17 @@ ENDM
 
 dbpixel: MACRO
 if _NARG >= 4
+; x tile, x pxl, y tile, y pxl
 	db \1 * 8 + \3, \2 * 8 + \4
 else
+; x, y
 	db \1 * 8, \2 * 8
 endc
 ENDM
 
 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 & PALETTE_MASK)
-else
+; y tile, y pxl, x tile, x pxl, vtile offset, flags, attributes
 	db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, \6
-endc
 ENDM