reimplement "no bios" error screen

Author: celerizer

Makefile

@@ -35,6 +35,7 @@ MKFONT_FLAGS ?= --range all
 
 src = \
 	$(SRC_DIR)/emu.c \
+	$(SRC_DIR)/error.c \
 	$(SRC_DIR)/main.c \
 	$(SRC_DIR)/menu.c
 

src/emu.c

@@ -114,3 +114,8 @@ void pfu_emu_run(void)
   else
     pfu_video_render_4_3();
 }
+
+void pfu_emu_switch(void)
+{
+  emu.state = PFU_STATE_EMU;
+}

src/emu.h

@@ -3,4 +3,6 @@
 
 void pfu_emu_run(void);
 
+void pfu_emu_switch(void);
+
 #endif

src/error.c

@@ -0,0 +1,31 @@
+#include <libdragon.h>
+
+#include "main.h"
+
+void pfu_error_switch(const char *error, ...)
+{
+  surface_t *disp = display_get();
+  char message[1024];
+
+  va_list args;
+  va_start(args, error);
+  vsnprintf(message, sizeof(message), error, args);
+  va_end(args);
+
+  rdpq_attach_clear(disp, NULL);
+  rdpq_set_mode_fill(RGBA32(0x22, 0x22, 0x22, 1));
+  rdpq_fill_rectangle(0, 0, display_get_width(), display_get_height());
+
+  rdpq_set_mode_copy(false);
+  rdpq_sprite_blit(emu.icon, 48, 32, NULL);
+  rdpq_text_printf(
+    &(rdpq_textparms_t){
+      .width = 640 - 64*2,
+      .height = 480 - 64*2,
+		  .align = ALIGN_CENTER
+	  }, 1, 64, 128, message);
+
+  rdpq_detach_show();
+
+  exit(1);
+}

src/error.h

@@ -0,0 +1,6 @@
+#ifndef PRESS_F_ULTRA_ERROR_H
+#define PRESS_F_ULTRA_ERROR_H
+
+void pfu_error_switch(const char *error, ...);
+
+#endif

src/main.c

@@ -14,36 +14,6 @@
 
 pfu_emu_ctx_t emu;
 
-void pfu_error_no_rom(void)
-{
-  console_clear();
-  printf("Press F requires ROM data\n"
-         "to be stored on the SD Card\n"
-         "in the \"press-f\" directory.\n\n"
-         "Please include the sl31253.bin\n"
-         "and sl31254.bin BIOS images.\n\n"
-         "Alternatively, it can be\n"
-         "compiled in statically.\n\n"
-         "See GitHub for instructions.");
-  console_render();
-  exit(1);
-}
-
-void pfu_state_set(pfu_state_type state)
-{
-  switch (emu.state)
-  {
-  case PFU_STATE_MENU:
-    console_close();
-    break;
-  case PFU_STATE_EMU:
-    break;
-  default:
-    break;
-  }
-  emu.state = state;
-}
-
 /**
  * Returns the memory location of a stamped ROM when loading as a plugin, or
  * 0 if doing so is not supported.
@@ -130,6 +100,8 @@ int main(void)
   rdpq_font_style(font2, 0, &(rdpq_fontstyle_t){
 	                .color = RGBA32(0, 0, 0, 127),
 	                .outline_color = RGBA32(0, 0, 0, 127)});
+  rdpq_font_t *font3 = rdpq_font_load_builtin(FONT_BUILTIN_DEBUG_VAR);
+  rdpq_text_register_font(3, font3);
 
   emu.icon = sprite_load("rom:/icon.sprite");
   debug_init_sdfs("sd:/", -1);
@@ -144,7 +116,7 @@ int main(void)
 
   /* If loaded as plugin, jump to loaded ROM, otherwise load ROM menu */
   if (pfu_plugin_read_rom())
-    pfu_state_set(PFU_STATE_EMU);
+    pfu_emu_switch();
   else
     pfu_menu_switch_roms();
 

src/main.h

@@ -41,6 +41,4 @@ typedef struct
 
 extern pfu_emu_ctx_t emu;
 
-void pfu_state_set(pfu_state_type state);
-
 #endif

src/menu.c

@@ -3,6 +3,8 @@
 #include "libpressf/src/emu.h"
 #include "libpressf/src/font.h"
 
+#include "emu.h"
+#include "error.h"
 #include "main.h"
 #include "menu.h"
 
@@ -57,7 +59,7 @@ static void pfu_menu_entry_back(void)
   unsigned dummy = 0;
 
   f8_write(&emu.system, 0x0800, &dummy, sizeof(dummy));
-  pfu_state_set(PFU_STATE_EMU);
+  pfu_emu_switch();
   pressf_reset(&emu.system);
 }
 
@@ -125,7 +127,7 @@ static void pfu_menu_entry_file(pfu_menu_entry_t *entry)
   if (entry)
   {
     pfu_load_rom(0x0800, entry->title, entry->current_value);
-    pfu_state_set(PFU_STATE_EMU);
+    pfu_emu_switch();
     pressf_reset(&emu.system);
   }
 }
@@ -176,7 +178,7 @@ static void pfu_menu_init_roms_source(pfu_menu_ctx_t *menu, const char *src_path
   {
     if (dir.d_type == DT_REG)
     {
-      /* Load BIOS if found on SD Card */
+      /* Load BIOS if found */
       if (!strncmp(dir.d_name, "sl31253.bin", 8))
       {
         if (!emu.bios_a_loaded)
@@ -222,6 +224,12 @@ static void pfu_menu_init_roms(void)
     snprintf(menu.menu_subtitle, sizeof(menu.menu_subtitle), "%s", "Select a ROM to load.");
     emu.menu_roms = menu;
   }
+  else
+    pfu_error_switch("Press F Ultra requires Channel F BIOS data to be stored on\n"
+                     "the SD Card in the \"press-f\" directory.\n\n"
+                     "Please include both the $03sl31253.bin$01 and $03sl31254.bin$01 BIOS images.\n\n"
+                     "Alternatively, this data can be compiled in statically.\n\n"
+                     "See https://github.com/celerizer/Press-F-Ultra for details.");
 }
 
 static uint8_t sine_color;
@@ -293,7 +301,7 @@ static void pfu_menu_input(void)
     }
   }
   else if (buttons.b)
-    pfu_state_set(PFU_STATE_EMU);
+    pfu_emu_switch();
 
   if (menu->cursor < 0)
     menu->cursor = 0;