From cfc60ba401b9ca46c981f902512eb1f2cc07995f Mon Sep 17 00:00:00 2001 From: Bad Diode Date: Thu, 31 Aug 2023 12:58:08 +0200 Subject: Make sure keyboard is consistently colored --- src/ppu.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/ppu.c') diff --git a/src/ppu.c b/src/ppu.c index d871514..d22b3fd 100644 --- a/src/ppu.c +++ b/src/ppu.c @@ -225,9 +225,6 @@ putcolors(u8 *addr) { (g << 1) | (g >> 3), (b << 1) | (b >> 3)); PAL_BUFFER_BG[i] = color; - for (size_t j = 0; j < 16; ++j) { - PAL_BUFFER_SPRITES[i * 16 + j] = color; - } } } @@ -824,9 +821,9 @@ video_init() { PAL_BUFFER_BG[3] = COLOR_BLUE; for (size_t i = 0; i < 16; ++i) { PAL_BUFFER_SPRITES[i] = COLOR_BLACK; - PAL_BUFFER_SPRITES[1 * 16] = COLOR_WHITE; - PAL_BUFFER_SPRITES[2 * 16] = COLOR_RED; - PAL_BUFFER_SPRITES[3 * 16] = COLOR_BLUE; + PAL_BUFFER_SPRITES[i + 1 * 16] = COLOR_WHITE; + PAL_BUFFER_SPRITES[i + 2 * 16] = COLOR_RED; + PAL_BUFFER_SPRITES[i + 3 * 16] = COLOR_BLUE; } // Initialize background memory map. @@ -849,7 +846,7 @@ video_init() { keyboard[i].y = tile_y * 8; OBJ_ATTR_0(i) = OBJ_SHAPE_SQUARE | OBJ_Y_COORD(keyboard[i].y) | OBJ_HIDDEN; OBJ_ATTR_1(i) = OBJ_SIZE_SMALL | OBJ_X_COORD(keyboard[i].x); - OBJ_ATTR_2(i) = (SPRITE_START_IDX + keyboard[i].symbol) | OBJ_PAL_BANK(0); + OBJ_ATTR_2(i) = (SPRITE_START_IDX + keyboard[i].symbol) | OBJ_PAL_BANK(2); tile_x++; if (tile_x - KEYBOARD_START_TILE_X >= KEYBOARD_ROW_SIZE) { tile_x = KEYBOARD_START_TILE_X; -- cgit v1.2.1