1 files changed, 29 insertions, 6 deletions

diff --git a/src/main.c b/src/main.c
index 88f4f4e..fd5d21a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,5 @@
 #include "shorthand.h"
+#include "bd-font.c"
 
 //
 // Memory sections.
@@ -40,7 +41,7 @@
 
 static inline void
 set_display_mode(u16 value) {
-    *((volatile u32*)(MEM_IO + 0x0000)) = value;
+    *((vu32*)(MEM_IO + 0x0000)) = value;
 }
 
 //
@@ -58,7 +59,28 @@ rgb15(u32 red, u32 green, u32 blue ) {
 
 static inline void
 put_pixel(int x, int y, Color clr) {
-    ((volatile u16*)MEM_VRAM)[x + y * SCREEN_WIDTH] = clr;
+    ((vu16*)MEM_VRAM)[x + y * SCREEN_WIDTH] = clr;
+}
+
+// Using bd-font, an 8x8 bitmap font.
+static inline 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) {
+                put_pixel(x + j, y + i, clr);
+            }
+        }
+    }
+}
+
+static inline void
+put_line(int x, int y, Color clr, char *msg) {
+    int count = 0;
+    while (*msg) {
+        put_char(x + count, y, clr, *msg++);
+        count += 8;
+    }
 }
 
 //
@@ -68,11 +90,12 @@ put_pixel(int x, int y, Color clr) {
 int main(void) {
     set_display_mode(DISP_MODE_3 | DISP_BG2);
 
-    put_pixel(120 , 80, rgb15(31, 0, 0));
-    put_pixel(136 , 80, rgb15(0, 31, 0));
-    put_pixel(120 , 96, rgb15(0, 0, 31));
 
-    while(true);
+    while(true) {
+        put_line(16,  20 + 16, rgb15(28, 0, 0), "Hello world from the GBA!");
+        put_line(16,  20 + 32, rgb15(0, 28, 28), "Using my little 8x8 bd-font");
+        put_line(16,  20 + 64, rgb15(16, 0, 28), "Isn't that neat? :D");
+    };
 
     return 0;
 }