diff --git a/src/game_graphics.c b/src/game_graphics.c index 8fe311a..2c1d188 100644 --- a/src/game_graphics.c +++ b/src/game_graphics.c @@ -10,7 +10,7 @@ #include "tiles.h" #define SCREEN_WIDTH_B 40 -#define TILE_SIDE 35 +#define GRID_CELL_SIDE 35 #define TOP_OFFSET 7 #define LEFT_OFFSET_B 1 // Left is offset by 1 bytes (7 pixels) @@ -29,15 +29,15 @@ void draw_game_background(void) { uint8_t* buf = (uint8_t*)DISPLAY_PAGE_1; // Horizontal borders - for(uint8_t col = 0; col < (GRID_SIDE * (TILE_SIDE/7)) + 1; col++) { + for(uint8_t col = 0; col < (GRID_SIDE * (GRID_CELL_SIDE/7)) + 1; col++) { buf[line_offset_map[TOP_OFFSET - 1] + col + LEFT_OFFSET_B] = 0x7F; - buf[line_offset_map[TOP_OFFSET + (TILE_SIDE * GRID_SIDE) + 7] + col + LEFT_OFFSET_B] = 0x7F; + buf[line_offset_map[TOP_OFFSET + (GRID_CELL_SIDE * GRID_SIDE) + 7] + col + LEFT_OFFSET_B] = 0x7F; } // Vertical borders - for(uint8_t row = 0; row < (TILE_SIDE * GRID_SIDE) + 7; row++) { + for(uint8_t row = 0; row < (GRID_CELL_SIDE * GRID_SIDE) + 7; row++) { buf[line_offset_map[row + TOP_OFFSET] + LEFT_OFFSET_B - 1] = 0x40; - buf[line_offset_map[row + TOP_OFFSET] + LEFT_OFFSET_B + (GRID_SIDE * (TILE_SIDE/7)) + 1] = 0x01; + buf[line_offset_map[row + TOP_OFFSET] + LEFT_OFFSET_B + (GRID_SIDE * (GRID_CELL_SIDE/7)) + 1] = 0x01; } // Copy the data from display page 1 to 2 @@ -49,7 +49,7 @@ void draw_tiles(void) { uint8_t* grid = get_front_grid(); // Clear the grid so we'll be able to draw the boxes on - clear_box(GRID_SIDE * (TILE_SIDE/7) + 1, (GRID_SIDE * TILE_SIDE) + 6, LEFT_OFFSET_B, TOP_OFFSET + 1, back_buf); + clear_box(GRID_SIDE * (GRID_CELL_SIDE/7) + 1, (GRID_SIDE * GRID_CELL_SIDE) + 6, LEFT_OFFSET_B, TOP_OFFSET + 1, back_buf); for (uint8_t tile = 0; tile < GRID_SIDE * GRID_SIDE; tile++) { @@ -59,7 +59,7 @@ void draw_tiles(void) { uint8_t row = tile / GRID_SIDE; for(uint8_t h = 0; h < TILE_HEIGHT; h++) { - memcpy(back_buf + line_offset_map[TOP_OFFSET + 7 + (row * TILE_SIDE) + h] + LEFT_OFFSET_B + 1 + (col * TILE_SIDE/7), + memcpy(back_buf + line_offset_map[TOP_OFFSET + 7 + (row * GRID_CELL_SIDE) + h] + LEFT_OFFSET_B + 1 + (col * GRID_CELL_SIDE/7), tile_data + (TILE_WIDTH_BYTES * h), TILE_WIDTH_BYTES); } }