aboutsummaryrefslogtreecommitdiffstats
path: root/macros/gfx.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2025-07-02 21:15:13 -0500
committerdannye <33dannye@gmail.com>2025-07-02 21:15:13 -0500
commitca019eac8fd96559f4d4e712f0b53e95492e5dcb (patch)
tree209a500e3bda6c2109e5acec60448e9e52f8c2af /macros/gfx.asm
parentUse more ldpikacry (diff)
parentRequire RGBDS 0.9.3 for its DMG palette specs (#513) (diff)
downloadpokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.gz
pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.xz
pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'macros/gfx.asm')
-rw-r--r--macros/gfx.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/macros/gfx.asm b/macros/gfx.asm
index 944e6dd5..7b8fcf5d 100644
--- a/macros/gfx.asm
+++ b/macros/gfx.asm
@@ -5,16 +5,16 @@ MACRO RGB
ENDR
ENDM
-DEF palred EQUS "(1 << 0) *"
-DEF palgreen EQUS "(1 << 5) *"
-DEF palblue EQUS "(1 << 10) *"
+DEF palred EQUS "(1 << B_COLOR_RED) *"
+DEF palgreen EQUS "(1 << B_COLOR_GREEN) *"
+DEF palblue EQUS "(1 << B_COLOR_BLUE) *"
DEF palettes EQUS "* PALETTE_SIZE"
DEF palette EQUS "+ PALETTE_SIZE *"
DEF color EQUS "+ PAL_COLOR_SIZE *"
-DEF tiles EQUS "* LEN_2BPP_TILE"
-DEF tile EQUS "+ LEN_2BPP_TILE *"
+DEF tiles EQUS "* TILE_SIZE"
+DEF tile EQUS "+ TILE_SIZE *"
MACRO dbsprite
; x tile, y tile, x pixel, y pixel, vtile offset, attributes