diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-11-05 23:50:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 23:50:03 -0500 |
| commit | d3f13528754b985e892385dbd88c3c9a95681f1b (patch) | |
| tree | 4a18885606996ff59bb714afb5db9a548e2f94a7 /constants | |
| parent | abaf9fee7c73e708ef8c3e7a1ed710bfc9ec6f6e (diff) | |
| parent | e16dec874a239c162680b169391d3c0c7ee1fc70 (diff) | |
Merge pull request #301 from Rangi42/master
Sync home and macro code with pokeyellow
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/gfx_constants.asm | 10 | ||||
| -rwxr-xr-x | constants/palette_constants.asm | 12 |
2 files changed, 8 insertions, 14 deletions
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 2567e253..dd9de6b6 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -2,16 +2,6 @@ TILE_WIDTH EQU 8 ; pixels LEN_1BPP_TILE EQU 1 * TILE_WIDTH ; bytes LEN_2BPP_TILE EQU 2 * TILE_WIDTH ; bytes - const_def - const SHADE_WHITE ; %00 - const SHADE_LIGHT ; %01 - const SHADE_DARK ; %10 - const SHADE_BLACK ; %11 -NUM_PAL_COLORS EQU const_value - -PAL_COLOR_SIZE EQU 2 -PALETTE_SIZE EQU NUM_PAL_COLORS * PAL_COLOR_SIZE - SCREEN_WIDTH EQU 20 SCREEN_HEIGHT EQU 18 SCREEN_WIDTH_PX EQU SCREEN_WIDTH * TILE_WIDTH ; pixels diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index fd5dd24b..177f8b81 100755 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -1,9 +1,13 @@ ; monochrome palette color ids const_def - const WHITE - const LIGHT_GRAY - const DARK_GRAY - const BLACK + const SHADE_WHITE ; %00 + const SHADE_LIGHT ; %01 + const SHADE_DARK ; %10 + const SHADE_BLACK ; %11 +NUM_PAL_COLORS EQU const_value + +PAL_COLOR_SIZE EQU 2 +PALETTE_SIZE EQU NUM_PAL_COLORS * PAL_COLOR_SIZE ; pal/blk packets ; SetPalFunctions indexes (see engine/gfx/palettes.asm) |