Reflect the changed name in menus

diff --git a/Makefile b/Makefile
index 63a9b7ceaf87ded4f21192a6349cf2e27bc13f90..b7e539b7968376b646ba549cedbee5f510ad22c7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ REL ?= master
 CHAINLOADER ?= 1
 
 CROSS_ASFLAGS := -mlittle-endian -mcpu=arm946e-s -march=armv5te
-CROSS_CFLAGS  := -MMD -MP -Wall -Wextra -Werror -fomit-frame-pointer -Os $(ASFLAGS) -fshort-wchar -fno-builtin -std=gnu11 -DVERSION=\"$(REVISION)\" -DREL=\"$(REL)\" -DCHAINLOADER=$(CHAINLOADER) -DPATH_CFW=\"/$(fw_folder)\"
+CROSS_CFLAGS  := -MMD -MP -Wall -Wextra -Werror -fomit-frame-pointer -Os $(ASFLAGS) -fshort-wchar -fno-builtin -std=gnu11 -DVERSION=\"$(REVISION)\" -DREL=\"$(REL)\" -DCHAINLOADER=$(CHAINLOADER) -DPATH_CFW=\"/$(fw_folder)\" -DFW_NAME=\"$(fw_name)\"
 CROSS_FLAGS   := dir_out=$(abspath $(dir_out)) --no-print-directory
 CROSS_LDFLAGS := -nostdlib -Wl,-z,defs -lgcc -Wl,-Map,$(dir_build)/link.map
 

diff --git a/host/copy.sh b/host/copy.sh
index 1b1960d99e91aa3aa10f4cc4cb26a5214ab249a6..18d88444c51e93609b7e8813555d6eadeaa8a390 100755 (executable)
--- a/host/copy.sh
+++ b/host/copy.sh
@@ -9,10 +9,9 @@ dev=/dev/sdb
 mnt=/mnt/ext1
 
 mount -t vfat ${dev}1 $mnt || exit 0
-cp out/arm9loaderhax.bin $mnt/arm9loaderhax.bin || exit 0
-rm -rf $mnt/corbenik
-cp -r out/corbenik $mnt/ || exit 0
-cp -r input/corbenik $mnt/ || exit 0
+rm -rf $mnt/{corbenik,skeith}
+cp -r out/* $mnt/ || exit 0
+cp -r input/* $mnt/ || exit 0
 cp out/arm9loaderhax.bin $mnt/corbenik/chain/Corbenik || exit 0
 umount $mnt || exit 0
 sync || exit 0

diff --git a/source/menu.c b/source/menu.c
index 6f47c32b9154c50671247a07d221096743028706..03e18063929667302f27f41b963112af82fdac0f 100644 (file)
--- a/source/menu.c
+++ b/source/menu.c
@@ -105,7 +105,7 @@ header(char *append)
 {
     set_cursor(TOP_SCREEN, 0, 0);
     fill_line(stdout, 0, 0x2);
-    fprintf(stdout, "\x1b[30;42m .Corbenik // %s\x1b[0m\n\n", append);
+    fprintf(stdout, "\x1b[30;42m ." FW_NAME " // %s\x1b[0m\n\n", append);
 }
 
 static int current_menu_index_patches = 0;
@@ -225,7 +225,7 @@ static struct options_s info_d[] = {
     { 0, "  Native FIRM: ", "The version of NATIVE_FIRM in use.", not_option, 0, 0},
     { 0, "  AGB FIRM:    ", "The version of AGB_FIRM in use. This is used to run GBA games.", not_option, 0, 0},
     { 0, "  TWL FIRM:    ", "The version of TWL_FIRM in use. This is used to run DS games and DSiWare.", not_option, 0, 0},
-    { 0, "  Corbenik:    " VERSION " (" REL ")", "Corbenik's version.", not_option, 0, 0},
+    { 0, "  " FW_NAME ":    " VERSION " (" REL ")", FW_NAME "'s version.", not_option, 0, 0},
     { -1, "", "", not_option, 0, 0 }
 };
 static int is_setup_info = 0;
@@ -254,7 +254,7 @@ menu_info()
 #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(FW_NAME " 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"),
@@ -309,7 +309,7 @@ void chainload_menu();
 #endif
 
 static struct options_s main_s[] = {
-    { 0, "Options",            "Internal options for the CFW. These are part of Corbenik itself.", call_fun, (uint32_t)menu_options, 0 },
+    { 0, "Options",            "Internal options for the CFW. These are part of " FW_NAME " itself.", call_fun, (uint32_t)menu_options, 0 },
     { 0, "Patches",            "External bytecode patches found in `" PATH_PATCHES "`. You can choose which to enable.", call_fun, (uint32_t)menu_patches, 0 },
     { 0, "Info",               "Shows the current FIRM versions (and loads them, if needed)", call_fun, (uint32_t)menu_info,    0 },
     { 0, "Help/Readme",        "Displays info. Why are you opening help on help? That's kind of silly.", call_fun, (uint32_t)menu_help,    0 },