Get rid of all the legacy menu code. Still a few issues (zero-selectable menus)

diff --git a/source/firm/version.c b/source/firm/version.c
index e2df3d729c1d02bdb61e56179ce011598302a648..04845356f33fb4089176b45765c72333eaf2b48b 100644 (file)
--- a/source/firm/version.c
+++ b/source/firm/version.c
@@ -57,19 +57,19 @@ struct firm_signature firm_signatures[] = {
      .console = console_n3ds },
     {.sig = { 0xE8, 0xB8, 0x82, 0xF5, 0x8C, 0xC4, 0x1B, 0x24, 0x05, 0x60, 0x6D, 0xB8, 0x74, 0xF5, 0xE5, 0xDD },
      .version = 0x16,
-     .version_string = "6.2.0_TWL",
+     .version_string = "6.2.0",
      .console = console_o3ds },
     {.sig = { 0x0F, 0x05, 0xC5, 0xF3, 0x60, 0x83, 0x8B, 0x9D, 0xC8, 0x44, 0x3F, 0xB3, 0x06, 0x4D, 0x30, 0xC7 },
      .version = 0x00,
-     .version_string = "9.0.0_TWL",
+     .version_string = "9.0.0",
      .console = console_n3ds },
     {.sig = { 0x65, 0xB7, 0x55, 0x78, 0x97, 0xE6, 0x5C, 0xD6, 0x11, 0x74, 0x95, 0xDD, 0x61, 0xE8, 0x08, 0x40 },
      .version = 0x0B,
-     .version_string = "6.0.0_AGB",
+     .version_string = "6.0.0",
      .console = console_o3ds },
     {.sig = { 0xAF, 0x81, 0xA1, 0xAB, 0xBA, 0xAC, 0xAC, 0xA7, 0x30, 0xE8, 0xD8, 0x74, 0x7C, 0x47, 0x1C, 0x5D },
      .version = 0x00,
-     .version_string = "9.0.0_AGB",
+     .version_string = "9.0.0",
      .console = console_n3ds },
     {.version = 0xFF, .version_string = "Not found" } // Terminate list
 };

diff --git a/source/menu.c b/source/menu.c
index a2cadb655b7d8250229ed602e5d0871de774b0c7..87e9994fe16b644b46a0691c75367dd665b66c02 100644 (file)
--- a/source/menu.c
+++ b/source/menu.c
@@ -55,8 +55,6 @@ static struct options_s options[] = {
     { -1, "", "", 0, -1, -1 }, // cursor_min and cursor_max are stored in the last two.
 };
 
-static int need_redraw = 1;
-
 extern void waitcycles(uint32_t cycles);
 
 uint32_t
@@ -251,34 +249,31 @@ menu_info()
     show_menu(info_d, NULL);
 }
 
+#define ln(s) { 0, s, "", not_option, 0, 0 }
+
+static struct options_s help_d[] = {
+       ln("Corbenik is another 3DS CFW for power users."),
+       ln("  It seeks to address some faults in other"),
+       ln("  CFWs and is generally just another choice"),
+       ln("  for users - but primarily is intended for"),
+       ln("  developers and is not for the faint of heart."),
+       ln(""),
+       ln("Credits to people who've helped me put this"),
+       ln("  together by code, documentation, or help:"),
+       ln("  @mid-kid, @Wolfvak, @Reisyukaku, @AuroraWright"),
+       ln("  @d0k3, @TuxSH, @Steveice10, @delebile,"),
+       ln("  @Normmatt, @b1l1s, @dark-samus, @TiniVi, etc"),
+       ln(""),
+       ln("  <https://github.com/chaoskagami/corbenik>"),
+       ln(""),
+       { 0, "[OK]", "", break_menu, 0, 0 }, // Temporary
+       { -1, "", "", not_option, 0, 0 }
+};
+
 void
 menu_help()
 {
-    clear_screen(TOP_SCREEN);
-
-    set_cursor(TOP_SCREEN, 0, 0);
-
-    header("Any:Back");
-
-    fprintf(stdout, "Corbenik is another 3DS CFW for power users.\n"
-                    "  It seeks to address some faults in other\n"
-                    "  CFWs and is generally just another choice\n"
-                    "  for users - but primarily is intended for\n"
-                    "  developers.\n"
-                    "\n"
-                    "Credits to people who've helped me put this\n"
-                    "  together either by code or documentation:\n"
-                    "  @mid-kid, @Wolfvak, @Reisyukaku, @AuroraWright\n"
-                    "  @d0k3, @TuxSH, @Steveice10, @delebile,\n"
-                    "  @Normmatt, @b1l1s, @dark-samus, @TiniVi, etc\n"
-                    "\n"
-                    " <https://github.com/chaoskagami/corbenik>\n"
-                    "\n");
-
-    wait_key(1);
-
-    need_redraw = 1;
-    clear_screen(TOP_SCREEN);
+    show_menu(help_d, NULL);
 }
 
 void