Set up backgrounds 0 and 1 for fg/bg drawing

1 files changed, 59 insertions, 28 deletions

diff --git a/src/main.c b/src/main.c
index 9866f19..a2962bf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3,7 +3,8 @@
 #include "common.h"
 #include "bitmap.h"
 #include "text.h"
-#include "small-font.c"
+// #include "small-font.c"
+#include "bd-font.c"
 
 #include "uxn/uxn.h"
 #include "uxn/uxn.c"
@@ -61,7 +62,7 @@ screen_talk(Device *d, Uint8 b0, Uint8 w) {
         Uint8 *layer = d->dat[0xe] >> 4 & 0x1 ? ppu.fg : ppu.bg;
         Uint8 mode = d->dat[0xe] >> 5;
         if(!mode) {
-            putpixel(&ppu, layer, x, y, d->dat[0xe] & 0x3);
+            // putpixel(&ppu, layer, x, y, d->dat[0xe] & 0x3);
         } else if(mode-- & 0x1) {
             puticn(&ppu, layer, x, y, addr, d->dat[0xe] & 0xf, mode & 0x2, mode & 0x4);
         } else {
@@ -110,45 +111,75 @@ init_uxn(Uxn *u) {
 
 int main(void) {
     // Initialize display mode and bg palette.
-    DISP_CTRL = DISP_MODE_3 | DISP_BG_2;
+    DISP_CTRL = DISP_MODE_0 | DISP_BG_0 | DISP_BG_1;
+
+    // WORKS
+    u8 cb_fg = 0;
+    u8 sb_fg = 10;
+    u8 cb_bg = 2;
+    u8 sb_bg = 26;
+    BG_CTRL(0) = BG_CHARBLOCK(cb_fg) | BG_SCREENBLOCK(sb_fg) | BG_PRIORITY(1);
+    BG_CTRL(1) = BG_CHARBLOCK(cb_bg) | BG_SCREENBLOCK(sb_bg) | BG_PRIORITY(2);
+    Tile *fg = &TILE_MEM[cb_fg];
+    Tile *bg = &TILE_MEM[cb_bg];
+    for (size_t i = 0; i < 30 * 20; ++i) {
+        fg[i] = (Tile){0};
+        bg[i] = (Tile){0};
+    }
+
+    // Initialize memory map.
+    u16 *fg_mem = SCREENBLOCK_MEM[sb_fg];
+    u16 *bg_mem = SCREENBLOCK_MEM[sb_bg];
+    size_t k = 0;
+    for (size_t j = 0; j < 20; ++j) {
+        for (size_t i = 0; i < 30; ++i, ++k) {
+            fg_mem[i + j * 32] = k;
+            bg_mem[i + j * 32] = k;
+        }
+    }
 
     // Initialize text engine.
-    txt_init_bitmap(
-            TXT_MODE_MODE3,
-            (Font){
-                .data = small_font,
-                .char_width = 4,
-                .char_height = 8,
-                .color = COLOR_WHITE,
-                .char_map = small_font_map,
-            });
+    // txt_init_tile(
+    //         2,
+    //         (Font){
+    //             .data = bd_font,
+    //             .color = COLOR_WHITE,
+    //         }, 3);
+    // txt_printf("testing");
+
+    PAL_BUFFER_BG[0] = COLOR_RED;
+    PAL_BUFFER_BG[1] = COLOR_BLUE;
+    PAL_BUFFER_BG[2] = COLOR_CYAN;
+    PAL_BUFFER_BG[3] = COLOR_WHITE;
+    PAL_BUFFER_BG[4] = COLOR_GREY;
+
 
     // Register interrupts.
     irq_init();
     irs_set(IRQ_VBLANK, irs_stub);
 
-    // Initialize VM.
-    Uxn u = {0};
-    init_uxn(&u);
-    evaluxn(&u, 0x0100);
+//     // Initialize VM.
+//     Uxn u = {0};
+//     init_uxn(&u);
+//     evaluxn(&u, 0x0100);
 
     // Main loop.
     int frame_counter = 0;
     while(true) {
         bios_vblank_wait();
         poll_keys();
-        profile_start();
-        evaluxn(&u, mempeek16(devscreen->dat, 0));
-        int eval_cycles = profile_stop();
-        profile_start();
-        if(reqdraw) {
-            redraw(ppu.output, &u);
-        }
-        int redraw_cycles = profile_stop();
-        txt_position(0, 0);
-        txt_printf("EVAL: %d\n", eval_cycles);
-        txt_printf("REDRAW: %d\n", redraw_cycles);
-        frame_counter++;
+        // profile_start();
+        // evaluxn(&u, mempeek16(devscreen->dat, 0));
+        // int eval_cycles = profile_stop();
+        // profile_start();
+        // // if(reqdraw) {
+        // //     redraw(ppu.output, &u);
+        // // }
+        // int redraw_cycles = profile_stop();
+        // txt_position(0, 0);
+        // txt_printf("EVAL: %d\n", eval_cycles);
+        // txt_printf("REDRAW: %d\n", redraw_cycles);
+        // frame_counter++;
     };
 
     return 0;