diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-25 19:01:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-25 19:01:36 -0500 |
| commit | 73db02d3cdaf81a214ec6faa5462195618a80a48 (patch) | |
| tree | b4d1a5187fda9da6186c52c03e836a5ff8f4dd90 /macros/data.asm | |
| parent | ec8c9688ce970b9c3b63a5b287a99542f0bc9984 (diff) | |
| parent | 29b41068cb0644956494dd2b7b75331a336b8d26 (diff) | |
Merge pull request #433 from roukaour/master
More code cleanup
Diffstat (limited to 'macros/data.asm')
| -rw-r--r-- | macros/data.asm | 2 |
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 |