diff options
Diffstat (limited to 'src/ppu.c')
-rw-r--r-- | src/ppu.c | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -225,9 +225,6 @@ putcolors(u8 *addr) { | |||
225 | (g << 1) | (g >> 3), | 225 | (g << 1) | (g >> 3), |
226 | (b << 1) | (b >> 3)); | 226 | (b << 1) | (b >> 3)); |
227 | PAL_BUFFER_BG[i] = color; | 227 | PAL_BUFFER_BG[i] = color; |
228 | for (size_t j = 0; j < 16; ++j) { | ||
229 | PAL_BUFFER_SPRITES[i * 16 + j] = color; | ||
230 | } | ||
231 | } | 228 | } |
232 | } | 229 | } |
233 | 230 | ||
@@ -824,9 +821,9 @@ video_init() { | |||
824 | PAL_BUFFER_BG[3] = COLOR_BLUE; | 821 | PAL_BUFFER_BG[3] = COLOR_BLUE; |
825 | for (size_t i = 0; i < 16; ++i) { | 822 | for (size_t i = 0; i < 16; ++i) { |
826 | PAL_BUFFER_SPRITES[i] = COLOR_BLACK; | 823 | PAL_BUFFER_SPRITES[i] = COLOR_BLACK; |
827 | PAL_BUFFER_SPRITES[1 * 16] = COLOR_WHITE; | 824 | PAL_BUFFER_SPRITES[i + 1 * 16] = COLOR_WHITE; |
828 | PAL_BUFFER_SPRITES[2 * 16] = COLOR_RED; | 825 | PAL_BUFFER_SPRITES[i + 2 * 16] = COLOR_RED; |
829 | PAL_BUFFER_SPRITES[3 * 16] = COLOR_BLUE; | 826 | PAL_BUFFER_SPRITES[i + 3 * 16] = COLOR_BLUE; |
830 | } | 827 | } |
831 | 828 | ||
832 | // Initialize background memory map. | 829 | // Initialize background memory map. |
@@ -849,7 +846,7 @@ video_init() { | |||
849 | keyboard[i].y = tile_y * 8; | 846 | keyboard[i].y = tile_y * 8; |
850 | OBJ_ATTR_0(i) = OBJ_SHAPE_SQUARE | OBJ_Y_COORD(keyboard[i].y) | OBJ_HIDDEN; | 847 | OBJ_ATTR_0(i) = OBJ_SHAPE_SQUARE | OBJ_Y_COORD(keyboard[i].y) | OBJ_HIDDEN; |
851 | OBJ_ATTR_1(i) = OBJ_SIZE_SMALL | OBJ_X_COORD(keyboard[i].x); | 848 | OBJ_ATTR_1(i) = OBJ_SIZE_SMALL | OBJ_X_COORD(keyboard[i].x); |
852 | OBJ_ATTR_2(i) = (SPRITE_START_IDX + keyboard[i].symbol) | OBJ_PAL_BANK(0); | 849 | OBJ_ATTR_2(i) = (SPRITE_START_IDX + keyboard[i].symbol) | OBJ_PAL_BANK(2); |
853 | tile_x++; | 850 | tile_x++; |
854 | if (tile_x - KEYBOARD_START_TILE_X >= KEYBOARD_ROW_SIZE) { | 851 | if (tile_x - KEYBOARD_START_TILE_X >= KEYBOARD_ROW_SIZE) { |
855 | tile_x = KEYBOARD_START_TILE_X; | 852 | tile_x = KEYBOARD_START_TILE_X; |