diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2021-03-08 07:01:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-08 07:01:30 -0800 |
| commit | f9431c6aab479601ee0229a109154fa4f8b8b889 (patch) | |
| tree | 39a5c61fd37951b562c35db534d16146d531a7e5 /constants/gfx_constants.asm | |
| parent | fb3e541e86ac6c95ad027d9c5dac055f00643aa7 (diff) | |
| parent | e950809640f81c5d621c39becc4dcce15a82c064 (diff) | |
Merge pull request #69 from Rangi42/tables
Verify data table sizes with table_width and assert_table_length macros
Diffstat (limited to 'constants/gfx_constants.asm')
| -rw-r--r-- | constants/gfx_constants.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index cd03d860..fe042b15 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 12 ; see wUsedSprites |