diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-02 18:06:56 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-02 18:06:56 -0500 |
| commit | 01d994b8a30df12c0353bc912bcb046edf6a61b6 (patch) | |
| tree | d44d49581347fca98be225005215c74479d3a46b /macros/data.asm | |
| parent | a7fb9e124c21b2f07853319096ec6abda0d47c1a (diff) | |
dsprite always has 6 arguments
Diffstat (limited to 'macros/data.asm')
| -rw-r--r-- | macros/data.asm | 9 |
1 files 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 |