1 files changed, 23 insertions, 6 deletions

diff --git a/src/uxn/devices/ppu.c b/src/uxn/devices/ppu.c
index 02267f0..64f3fb4 100644
--- a/src/uxn/devices/ppu.c
+++ b/src/uxn/devices/ppu.c
@@ -1,4 +1,5 @@
 #include "ppu.h"
+#include "bd-font.c"
 
 /*
 Copyright (c) 2021 Devine Lu Linvega
@@ -14,11 +15,12 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 WITH REGARD TO THIS SOFTWARE.
 */
 
-#define FG_FRONT ((u32*)(MEM_VRAM))
-#define BG_FRONT ((u32*)(MEM_VRAM + KB(20)))
-#define FG_BACK  ((u32*)(MEM_VRAM + KB(44)))
-#define BG_BACK  ((u32*)(MEM_VRAM + KB(64)))
-#define TILE_MAP ((u32*)(MEM_VRAM + KB(40)))
+#define FG_FRONT  ((u32*)(MEM_VRAM))
+#define BG_FRONT  ((u32*)(MEM_VRAM + KB(20)))
+#define FG_BACK   ((u32*)(MEM_VRAM + KB(44)))
+#define BG_BACK   ((u32*)(MEM_VRAM + KB(64)))
+#define TILE_MAP  ((u32*)(MEM_VRAM + KB(40)))
+#define FONT_DATA ((u32*)(MEM_VRAM + KB(84)))
 
 static u32 unpack_icon_lut[256] = {
     0x00000000, 0x00000001, 0x00000010, 0x00000011, 0x00000100,
@@ -213,6 +215,18 @@ puticn(u32 *layer, u16 x, u16 y, u8 *sprite, u8 color, u8 flipx, u8 flipy) {
 
 IWRAM_CODE
 void
+putfontchar(u32 *layer, u16 tile_x, u16 tile_y, u8 ch, u8 color) {
+        u32 pos = (tile_x + tile_y * 32) * 8;
+        u32 *tile_data = &layer[pos];
+        u32 *font_data = &FONT_DATA[8 * ch];
+        for (size_t i = 0; i < 8; ++i) {
+            tile_data[i] = font_data[i] * color;
+        }
+    dirty_tiles[tile_y] |= 1 << tile_x;
+}
+
+IWRAM_CODE
+void
 putchr(u32 *layer, u16 x, u16 y, u8 *sprite, u8 color,
         u8 flipx, u8 flipy) {
         u8 sprline1, sprline2;
@@ -316,7 +330,7 @@ initppu(Ppu *p, u8 hor, u8 ver, u8 pad) {
     PAL_BUFFER_BG[2] = COLOR_RED;
     PAL_BUFFER_BG[3] = COLOR_BLUE;
 
-    // Initialize memory map.
+    // Initialize background memory map.
     u16 *mem_map_fg = SCREENBLOCK_MEM[sb_fg];
     u16 *mem_map_bg = SCREENBLOCK_MEM[sb_bg];
     size_t k = 0;
@@ -325,5 +339,8 @@ initppu(Ppu *p, u8 hor, u8 ver, u8 pad) {
         mem_map_bg[i] = k + 32 * 4;
     }
 
+    // Load font data into VRAM.
+    unpack_tiles(&bd_font, FONT_DATA, 256);
+
     return 1;
 }