summaryrefslogtreecommitdiff
path: root/constants/gfx_constants.asm
diff options
context:
space:
mode:
Diffstat (limited to 'constants/gfx_constants.asm')
-rw-r--r--constants/gfx_constants.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm
index 5e7391458..09d2d4868 100644
--- a/constants/gfx_constants.asm
+++ b/constants/gfx_constants.asm
@@ -6,7 +6,7 @@ NUM_PAL_COLORS EQU 4
PAL_COLOR_SIZE EQU 2
PALETTE_SIZE EQU NUM_PAL_COLORS * PAL_COLOR_SIZE
-PALRGB_WHITE EQUS "palred 31 + palgreen 31 + palblue 31" ; $7fff
+PALRGB_WHITE EQU palred 31 + palgreen 31 + palblue 31 ; $7fff
SCREEN_WIDTH EQU 20 ; tiles
SCREEN_HEIGHT EQU 18 ; tiles
@@ -34,12 +34,12 @@ HP_YELLOW EQU 1
HP_RED EQU 2
; sprite_oam_struct members (see macros/wram.asm)
- const_def
- const SPRITEOAMSTRUCT_YCOORD ; 0
- const SPRITEOAMSTRUCT_XCOORD ; 1
- const SPRITEOAMSTRUCT_TILE_ID ; 2
- const SPRITEOAMSTRUCT_ATTRIBUTES ; 3
-SPRITEOAMSTRUCT_LENGTH EQU const_value
+rsreset
+SPRITEOAMSTRUCT_YCOORD rb ; 0
+SPRITEOAMSTRUCT_XCOORD rb ; 1
+SPRITEOAMSTRUCT_TILE_ID rb ; 2
+SPRITEOAMSTRUCT_ATTRIBUTES rb ; 3
+SPRITEOAMSTRUCT_LENGTH EQU _RS
NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM
SPRITE_GFX_LIST_CAPACITY EQU 32 ; see wUsedSprites