diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
| commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
| tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /macros/data.asm | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
| parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) | |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'macros/data.asm')
| -rw-r--r-- | macros/data.asm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/macros/data.asm b/macros/data.asm index 55f41a204..8345a2523 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -85,20 +85,24 @@ 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 + + +menu_coords: MACRO +; x1, y1, x2, y2 + db \2, \1 ; start coords + db \4, \3 ; end coords ENDM |