summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-05 16:15:01 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-05 16:15:01 -0400
commita77999f7f151567a47dd69affe9a29378f298ff4 (patch)
treec8816365bfae97dfdd9250e6ca8bfe13dbb58dd5 /macros
parent6137f5accb77db2d5d07df2f058e85115caf073c (diff)
Logical spacing in data/sgb/sgb_palettes.asm
Diffstat (limited to 'macros')
-rwxr-xr-xmacros/data.asm4
-rw-r--r--macros/gfx.asm17
2 files changed, 17 insertions, 4 deletions
diff --git a/macros/data.asm b/macros/data.asm
index 54d1d561..46fb866d 100755
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -16,10 +16,6 @@ ENDM
coins equs "bcd2"
money equs "bcd3"
-RGB: MACRO
- dw (\3 << 10 | \2 << 5 | \1)
-ENDM
-
tmlearn: MACRO
x = 0
REPT _NARG
diff --git a/macros/gfx.asm b/macros/gfx.asm
new file mode 100644
index 00000000..bad051ad
--- /dev/null
+++ b/macros/gfx.asm
@@ -0,0 +1,17 @@
+RGB: MACRO
+rept _NARG / 3
+ dw palred (\1) + palgreen (\2) + palblue (\3)
+ shift 3
+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 *"