diff options
| author | Rangi <remy.oukaour+rangi@gmail.com> | 2018-05-31 16:37:26 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi@gmail.com> | 2018-05-31 16:37:26 -0400 |
| commit | ff0e1a9f35849555658c92e2b55126d1d641c1a9 (patch) | |
| tree | df37763a8a196862aff1d091c77daf85a6dc7255 /macros | |
| parent | e02be1af0a1180fcaeac51601486aa6a3017383a (diff) | |
Use newer RGB macro; add comments
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/data.asm | 4 | ||||
| -rw-r--r-- | macros/gfx.asm | 17 | ||||
| -rw-r--r-- | macros/wram.asm | 1 |
3 files changed, 17 insertions, 5 deletions
diff --git a/macros/data.asm b/macros/data.asm index aa7233d..241e52a 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -127,7 +127,3 @@ rept \1 x = x + DIV(32768, \1) ; a circle has 65536 "degrees" endr ENDM - -RGB: MACRO - dw (\3 << 10 | \2 << 5 | \1) -ENDM diff --git a/macros/gfx.asm b/macros/gfx.asm index 16c7d9b..ff07ba4 100644 --- a/macros/gfx.asm +++ b/macros/gfx.asm @@ -1,2 +1,19 @@ +RGB: MACRO +rept _NARG / 3 + dw palred (\1) + palgreen (\2) + palblue (\3) + shift + shift + shift +endr +ENDM + +palred EQUS "(1 << 0) *" +palgreen EQUS "(1 << 5) *" +palblue EQUS "(1 << 10) *" + +palettes EQUS "* PALETTE_SIZE" +palette EQUS "+ PALETTE_SIZE *" +color EQUS "+ PAL_COLOR_SIZE *" + tiles EQUS "* LEN_2BPP_TILE" tile EQUS "+ LEN_2BPP_TILE *" diff --git a/macros/wram.asm b/macros/wram.asm index 7e7505f..dd9b76b 100644 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -1,4 +1,3 @@ - flag_array: MACRO ds ((\1) + 7) / 8 ENDM |