1 files changed, 18 insertions, 46 deletions

diff --git a/src/bitmap.h b/src/bitmap.h
index bae9b40..c839900 100644
--- a/src/bitmap.h
+++ b/src/bitmap.h
@@ -1,30 +1,8 @@
 #ifndef GBAEXP_BITMAP_H
 #define GBAEXP_BITMAP_H
 
-// #include "bd-font.c"
 #include "common.h"
 
-// Using bd-font, an 8x8 bitmap font.
-// static void
-// put_char(int x, int y, Color clr, u8 chr) {
-//     for (size_t i = 0; i < 8; ++i) {
-//         for (size_t j = 0; j < 8; ++j) {
-//             if ((font[chr][i] >> (7 - j)) & 0x1) {
-//                 FRAMEBUFFER[y + i][x + j] = clr;
-//             }
-//         }
-//     }
-// }
-
-// static void
-// put_text(int x, int y, Color clr, char *msg) {
-//     int count = 0;
-//     while (*msg) {
-//         put_char(x + count, y, clr, *msg++);
-//         count += 8;
-//     }
-// }
-
 // Draws a line with the given color between (x0,y0) and (x1,y1) using the
 // Bresenham's line drawing algorithm using exclusively integer arithmetic.
 static void
@@ -146,17 +124,31 @@ draw_fill_rect(int x0, int y0, int x1, int y1, Color clr) {
 // GBA needs to meet memory alignment requirements, we can't write a u8 into
 // memory, instead we need to read a u16 word, mask and or the corresponding
 // bits and wave the updated u16.
-static void
-put_pixel_m4(int x, int y, u8 col_index, vu16 *buffer) {
+static inline void
+put_pixel_m4(int x, int y, u8 clr_idx, vu16 *buffer) {
     int buffer_index = (y * SCREEN_WIDTH + x) / 2;
     vu16 *destination = &buffer[buffer_index];
     // Odd pixels will go to the top 8 bits of the destination. Even pixels to
     // the lower 8 bits.
     int odd = x & 0x1;
     if(odd) {
-        *destination= (*destination & 0xFF) | (col_index << 8);
+        *destination= (*destination & 0xFF) | (clr_idx << 8);
     } else {
-        *destination= (*destination & ~0xFF) |  col_index;
+        *destination= (*destination & ~0xFF) |  clr_idx;
+    }
+}
+
+static inline void
+put_pixel_m3(int x, int y, u16 color, Scanline *buffer) {
+    buffer[y][x] = color;
+}
+
+static inline void
+clear_screen_m4() {
+    size_t size = SCREEN_WIDTH * SCREEN_HEIGHT / 8;
+    u32 *buf = backbuffer;
+    for (size_t i = 0; i < size; ++i) {
+        buf[i] = 0;
     }
 }
 
@@ -205,24 +197,4 @@ draw_logo(void) {
     draw_line(x + height, y + 1, x + height + line, y + 1, COLOR_WHITE);
 }
 
-// void
-// copy_font_to_tile_memory(Tile *tile) {
-//     // Hex to bits translation table.
-//     const u32 conversion_u32[16] = {
-//         0x00000000, 0x00001000, 0x00000100, 0x00001100,
-//         0x00000010, 0x00001010, 0x00000110, 0x00001110,
-//         0x00000001, 0x00001001, 0x00000101, 0x00001101,
-//         0x00000011, 0x00001011, 0x00000111, 0x00001111,
-//     };
-//     for (size_t i = 0; i < 250; ++i) {
-//         for (size_t j = 0; j < 8; ++j) {
-//             u8 row = font[i][j];
-//             u32 tile_idx = 0x00000000;
-//             tile_idx = conversion_u32[row & 0xF] << 16;
-//             tile_idx |= conversion_u32[(row >> 4) & 0xF];
-//             (tile + i)->data[j] = tile_idx;
-//         }
-//     }
-// }
-
 #endif // GBAEXP_BITMAP_H