diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-04 16:31:47 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-04 16:31:47 -0500 |
| commit | abaf9fee7c73e708ef8c3e7a1ed710bfc9ec6f6e (patch) | |
| tree | 0654ffaa697b4678f9ffd4d8f9cf25e1db0fefdb | |
| parent | 6d56d10e15186039e80f992749d1c526ba5d24e1 (diff) | |
Port some formatting from pokeyellow
| -rw-r--r-- | constants/gfx_constants.asm | 8 | ||||
| -rw-r--r-- | engine/menus/draw_badges.asm | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 912e5835..2567e253 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -2,7 +2,13 @@ TILE_WIDTH EQU 8 ; pixels LEN_1BPP_TILE EQU 1 * TILE_WIDTH ; bytes LEN_2BPP_TILE EQU 2 * TILE_WIDTH ; bytes -NUM_PAL_COLORS EQU 4 + 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 diff --git a/engine/menus/draw_badges.asm b/engine/menus/draw_badges.asm index 0bb433cc..5e00a34e 100644 --- a/engine/menus/draw_badges.asm +++ b/engine/menus/draw_badges.asm @@ -49,8 +49,7 @@ DrawBadges: hlcoord 2, 14 ld de, wTempObtainedBadgesBooleans + 4 -; call .DrawBadgeRow -; ret + ; fallthrough .DrawBadgeRow ; Draw 4 badges. |