Make sure keyboard is consistently colored

4 files changed, 31 insertions, 10 deletions

diff --git a/src/config.c b/src/config.c
index 9879ef1..278cf66 100644
--- a/src/config.c
+++ b/src/config.c
@@ -9,5 +9,5 @@
 #endif
 
 #define PROF_ENABLE 0
-#define TEXT_DISABLE 0
+#define TEXT_DISABLE 1
 #define SOUND_DISABLE 0
diff --git a/src/main.c b/src/main.c
index 62d133e..6c7e5a5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -88,7 +88,7 @@ main(void) {
     video_init();
 
     // Initialize text engine.
-#if !defined(TEXT_DISABLE) ||  TEXT_DISABLE == 0
+#if !defined(TEXT_DISABLE) ||  TEXT_DISABLE == 0 || PROF_ENABLE > 0
     txt_init(1, TEXT_LAYER);
     txt_position(0,0);
 #endif
@@ -109,7 +109,9 @@ main(void) {
         FRAME_START();
         PROF(handle_input(), input_cycles);
         PROF(uxn_eval_asm(PEEK2(&device_data[0x20])), eval_cycles);
+#if !defined(SOUND_DISABLE) ||  SOUND_DISABLE == 0
         PROF(sound_mix(), mix_cycles);
+#endif
         // TODO: allow configuration to do VSYNC at 15 or 30 fps to avoid too
         // much memory copying on demanding uxn roms.
         PROF_SHOW();
diff --git a/src/ppu.c b/src/ppu.c
index d871514..d22b3fd 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -225,9 +225,6 @@ putcolors(u8 *addr) {
                 (g << 1) | (g >> 3),
                 (b << 1) | (b >> 3));
         PAL_BUFFER_BG[i] = color;
-        for (size_t j = 0; j < 16; ++j) {
-            PAL_BUFFER_SPRITES[i * 16 + j] = color;
-        }
     }
 }
 
@@ -824,9 +821,9 @@ video_init() {
     PAL_BUFFER_BG[3] = COLOR_BLUE;
     for (size_t i = 0; i < 16; ++i) {
         PAL_BUFFER_SPRITES[i] = COLOR_BLACK;
-        PAL_BUFFER_SPRITES[1 * 16] = COLOR_WHITE;
-        PAL_BUFFER_SPRITES[2 * 16] = COLOR_RED;
-        PAL_BUFFER_SPRITES[3 * 16] = COLOR_BLUE;
+        PAL_BUFFER_SPRITES[i + 1 * 16] = COLOR_WHITE;
+        PAL_BUFFER_SPRITES[i + 2 * 16] = COLOR_RED;
+        PAL_BUFFER_SPRITES[i + 3 * 16] = COLOR_BLUE;
     }
 
     // Initialize background memory map.
@@ -849,7 +846,7 @@ video_init() {
         keyboard[i].y = tile_y * 8;
         OBJ_ATTR_0(i) = OBJ_SHAPE_SQUARE | OBJ_Y_COORD(keyboard[i].y) | OBJ_HIDDEN;
         OBJ_ATTR_1(i) = OBJ_SIZE_SMALL | OBJ_X_COORD(keyboard[i].x);
-        OBJ_ATTR_2(i) = (SPRITE_START_IDX + keyboard[i].symbol) | OBJ_PAL_BANK(0);
+        OBJ_ATTR_2(i) = (SPRITE_START_IDX + keyboard[i].symbol) | OBJ_PAL_BANK(2);
         tile_x++;
         if (tile_x - KEYBOARD_START_TILE_X >= KEYBOARD_ROW_SIZE) {
             tile_x = KEYBOARD_START_TILE_X;
diff --git a/src/profiling.c b/src/profiling.c
index 9817eb1..2d230df 100644
--- a/src/profiling.c
+++ b/src/profiling.c
@@ -39,7 +39,29 @@
 #define PROF_SHOW() \
     do { \
         txt_position((PROF_SHOW_X), (PROF_SHOW_Y));\
-        txt_printf("N CYCLES:  %.8lu\n", eval_cycles);\
+        txt_printf("INPUT  %.8lu\n", avg_input_cycles);\
+        txt_printf("EVAL   %.8lu\n", avg_eval_cycles);\
+        txt_printf("VIDEO\n");\
+        txt_printf(">PIX   %.8lu\n", avg_ppu_pixel_cycles);\
+        txt_printf(">FILL  %.8lu\n", avg_ppu_fill_cycles);\
+        txt_printf(">1BPP  %.8lu\n", avg_ppu_icn_cycles);\
+        txt_printf(">2BPP  %.8lu\n", avg_ppu_chr_cycles);\
+        txt_printf(">FLIP  %.8lu\n", avg_flip_cycles);\
+        txt_printf("AUDIO  %.8lu\n", avg_mix_cycles);\
+        txt_printf("TOTAL  %.8lu\n", avg_frame_cycles);\
+        u32 frame_time =\
+            FP_DIV(\
+                FP_NUM(avg_frame_cycles + 1, 2),\
+                FP_NUM(2809, 2),\
+                2) * 166;\
+        u32 fps =\
+            FP_DIV(\
+                FP_NUM(280896 * 60, 2),\
+                FP_NUM(avg_frame_cycles + 1, 2),\
+                2);\
+        txt_printf("TIME   %.8lu\n", frame_time >> 2);\
+        txt_printf("FPS    %.8lu\n", (fps >> 2) + 1);\
+        screen_fill(BG_BACK, 0, 0, 8 * 16, 8 * 12, 2);\
     } while (0)
 
 static u32 prof_frame_counter = 0;