Bump version

This has been replaced by a script: https://github.com/suchmememanyskill/TegraScript/blob/master/scripts/savedumper.te

.github/workflows/builder.yml

@@ -0,0 +1,36 @@
+name: TegraExplorer builder
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install devkitpro
+      run: |
+        wget https://github.com/devkitPro/pacman/releases/download/devkitpro-pacman-1.0.1/devkitpro-pacman.deb
+        sudo dpkg -i devkitpro-pacman.deb
+        sudo dkp-pacman -S switch-dev --noconfirm
+        sudo dkp-pacman -S devkitARM --noconfirm
+        
+    - name: Build TegraExplorer
+      run: |
+        echo #     SETTING PATH       #
+        export DEVKITPRO=/opt/devkitpro
+        export DEVKITARM=${DEVKITPRO}/devkitARM
+        export DEVKITPPC=${DEVKITPRO}/devkitPPC
+        export PATH=${DEVKITPRO}/tools/bin:$PATH
+        echo #          MAKE          #
+        make -j$(nproc)
+        
+    - uses: actions/upload-artifact@master
+      with:
+        name: TegraExplorer
+        path: output/TegraExplorer.bin 

Makefile

@@ -11,7 +11,7 @@ include $(DEVKITARM)/base_rules
 IPL_LOAD_ADDR := 0x40008000
 LPVERSION_MAJOR := 3
 LPVERSION_MINOR := 0
-LPVERSION_BUGFX := 1
+LPVERSION_BUGFX := 2
 
 ################################################################################
 

README.md

@@ -1,33 +1,62 @@
 # TegraExplorer
 A payload-based file explorer for your switch!
 
+![TegraExplorer builder](https://github.com/suchmememanyskill/TegraExplorer/workflows/TegraExplorer%20builder/badge.svg)
+
 ## Usage
 1. Get your favorite payload injector
 2. Inject TegraExplorer as a payload
 
-Navigate around the menus using the vol+, vol- and power buttons
+Navigate around the menus using the joycons.
+A: Select
+B: Back
+Left Joystick up/down (Dpad or joystick): navigate menus up/down
+Right Joystick up/down: fast menu navigation up/down
+Capture (Minerva only): Take a screenshot
+L3/R3 (Press joysticks in): Recalibrate centerpoint
+
+If you do not have your joycons connected:
+Power -> A
+Vol+ -> Left Joystick up
+Vol- -> Left Joystick down
 
 ## Functions
 - Navigate the SD card
-- Navigate the System partition of your sysnand/sysmmc
+- Navigate the System partition of your sysmmc and emummc
 - Interact with files
-	- Deleting, copying or moving files
+	- Deleting, copying, renaming and moving files
 	- Launching payloads files
 	- Viewing the hex data of a file
+	- Launching special [TegraScript](https://github.com/suchmememanyskill/TegraScript) files
+	- Renaming files
 - Interacting with folders
-	- Deleting or copying folders
+	- Deleting, copying or renaming folders
+	- Creating folders
 - Dumping your current firmware to sd
 - Formatting the sd card
 
+*and more*
+
 ## Support
 
 For general CFW support, go to the [Nintendo Homebrew](https://discord.gg/C29hYvh) discord
 
 For question specifically for TegraExplorer, go to [my discord](https://discord.gg/aH9rsuP)
 
-# Credits
+## Credits
 Based on [Lockpick_RCM](https://github.com/shchmue/Lockpick_RCM), and thus also based on [Hekate](https://github.com/CTCaer/hekate)
 
-Lots of help from:
+Awesome people who helped with this project:
 - shchmue
-- Denn
+- Dennthecafebabe
+
+Other awesome people:
+- PhazonicRidley
+- Dax
+- Huhen
+- Bleck9999
+- Exelix
+
+## Screenshots
+
+![Preview](/preview.png)

source/config/ini.c

@@ -64,7 +64,7 @@ ini_sec_t *_ini_create_section(link_t *dst, ini_sec_t *csec, char *name, u8 type
 	return csec;
 }
 
-int ini_parse(link_t *dst, char *ini_path, bool is_dir)
+int ini_parse(link_t *dst, const char *ini_path, bool is_dir)
 {
 	u32 lblen;
 	u32 pathlen = strlen(ini_path);
@@ -73,6 +73,7 @@ int ini_parse(link_t *dst, char *ini_path, bool is_dir)
 	char *filelist = NULL;
 	FIL fp;
 	ini_sec_t *csec = NULL;
+	bool firstIniRun = true;
 
 	char *filename = (char *)malloc(256);
 
@@ -116,10 +117,17 @@ int ini_parse(link_t *dst, char *ini_path, bool is_dir)
 
 		do
 		{
+			if (firstIniRun){
+				firstIniRun = false;
+				strcpy(lbuf, "[Unknown]");
+				lblen = 9;
+			}
+			else {
 			// Fetch one line.
 			lbuf[0] = 0;
 			f_gets(lbuf, 512, &fp);
 			lblen = strlen(lbuf);
+			}
 
 			// Remove trailing newline. Depends on 'FF_USE_STRFUNC 2' that removes \r.
 			if (lblen && lbuf[lblen - 1] == '\n')

source/config/ini.h

@@ -43,7 +43,7 @@ typedef struct _ini_sec_t
 	u32 color;
 } ini_sec_t;
 
-int ini_parse(link_t *dst, char *ini_path, bool is_dir);
+int ini_parse(link_t *dst, const char *ini_path, bool is_dir);
 char *ini_check_payload_section(ini_sec_t *cfg);
 
 #endif

source/gfx/gfx.c

@@ -20,6 +20,9 @@
 #include <string.h>
 #include "gfx.h"
 
+gfx_ctxt_t gfx_ctxt;
+gfx_con_t gfx_con;
+
 static const u8 _gfx_font[] = {
 	0x00, 0x0C, 0x12, 0x7E, 0x42, 0x42, 0x7E, 0x00, // Char 030 (folder)
 	0x00, 0x0E, 0x12, 0x22, 0x22, 0x22, 0x3E, 0x00, // Char 031 (file)

source/gfx/gfx.h

@@ -61,7 +61,7 @@ void gfx_boxGrey(int x0, int y0, int x1, int y1, u8 shade);
 */
 
 // Global gfx console and context.
-gfx_ctxt_t gfx_ctxt;
-gfx_con_t gfx_con;
+extern gfx_ctxt_t gfx_ctxt;
+extern gfx_con_t gfx_con;
 
 #endif

source/hos/pkg2.c

@@ -31,6 +31,10 @@
 #define DEBUG_PRINTING*/
 #define DPRINTF(...)
 
+u32 pkg2_newkern_ini1_val;
+u32 pkg2_newkern_ini1_start;
+u32 pkg2_newkern_ini1_end;
+
 static u32 _pkg2_calc_kip1_size(pkg2_kip1_t *kip1)
 {
 	u32 size = sizeof(pkg2_kip1_t);

source/hos/pkg2.h

@@ -28,9 +28,9 @@
 
 #define PKG2_NEWKERN_GET_INI1_HEURISTIC 0xD2800015 // Offset of OP + 12 is the INI1 offset.
 
-u32 pkg2_newkern_ini1_val;
-u32 pkg2_newkern_ini1_start;
-u32 pkg2_newkern_ini1_end;
+extern u32 pkg2_newkern_ini1_val;
+extern u32 pkg2_newkern_ini1_start;
+extern u32 pkg2_newkern_ini1_end;
 
 typedef struct _pkg2_hdr_t
 {

source/libs/fatfs/diskio.c

@@ -108,7 +108,7 @@ static inline int _emmc_xts(u32 ks1, u32 ks2, u32 enc, u8 *tweak, bool regen_twe
         pdst += 0x10;
     }
 
-    se_aes_crypt_ecb(ks2, enc, dst, secsize, src, secsize);
+    se_aes_crypt_ecb(ks2, enc, dst, secsize, dst, secsize);
 
     pdst = (u8 *)dst;
 

source/libs/fatfs/ff.c

@@ -6114,9 +6114,6 @@ FRESULT f_fdisk (
 	DWORD sz_disk, p_sect, b_cyl, b_sect;
 	FRESULT res;
 
-	BYTE *empty_buff;
-	empty_buff = ff_memcalloc(sizeof(BYTE), 16384);
-
 	stat = disk_initialize(pdrv);
 	if (stat & STA_NOINIT) return FR_NOT_READY;
 	if (stat & STA_PROTECT) return FR_WRITE_PROTECTED;
@@ -6169,14 +6166,14 @@ FRESULT f_fdisk (
 		st_dword(p + 8, b_sect);			/* Start sector in LBA */
 		st_dword(p + 12, p_sect);			/* Number of sectors */
 		/* Next partition */
-		b_sect += p_sect;
 
-		for (int cursect = 0; cursect < 1024; cursect++){
-			disk_write(pdrv, empty_buff, b_sect + (32 * cursect), 32);
+		for (u32 cursect = 0; cursect < 512; cursect++){
+			disk_write(pdrv, buf + 0x4000, b_sect + (64 * cursect), 64);
 		}
+
+		b_sect += p_sect;
 	}
 	st_word(p, 0xAA55);		/* MBR signature (always at offset 510) */
-	ff_memfree(empty_buff);
 
 	/* Write it to the MBR */
 	res = (disk_write(pdrv, buf, 0, 1) == RES_OK && disk_ioctl(pdrv, CTRL_SYNC, 0) == RES_OK) ? FR_OK : FR_DISK_ERR;

source/main.c

@@ -44,10 +44,10 @@
 
 //#include "keys/keys.h"
 
-sdmmc_t sd_sdmmc;
-sdmmc_storage_t sd_storage;
-__attribute__ ((aligned (16))) FATFS sd_fs;
-bool sd_mounted, sd_inited;
+//sdmmc_t sd_sdmmc;
+//sdmmc_storage_t sd_storage;
+//__attribute__ ((aligned (16))) FATFS sd_fs;
+//bool sd_mounted, sd_inited;
 volatile nyx_storage_t *nyx_str = (nyx_storage_t *)NYX_STORAGE_ADDR;
 hekate_config h_cfg;
 boot_cfg_t __attribute__((section ("._boot_cfg"))) b_cfg;

source/mem/minerva.c

@@ -27,6 +27,7 @@
 #include "../soc/t210.h"
 
 extern volatile nyx_storage_t *nyx_str;
+void (*minerva_cfg)(mtc_config_t *mtc_cfg, void *);
 
 u32 minerva_init()
 {

source/mem/minerva.h

@@ -57,7 +57,7 @@ typedef enum
 	FREQ_1600 = 1600000
 } minerva_freq_t;
 
-void (*minerva_cfg)(mtc_config_t *mtc_cfg, void *);
+extern void (*minerva_cfg)(mtc_config_t *mtc_cfg, void *);
 u32  minerva_init();
 void minerva_change_freq(minerva_freq_t freq);
 void minerva_periodic_training();

source/storage/emummc.c

@@ -32,6 +32,7 @@ extern sdmmc_storage_t sd_storage;
 extern FATFS sd_fs;
 
 extern hekate_config h_cfg;
+emummc_cfg_t emu_cfg;
 
 extern bool sd_mount();
 extern void sd_unmount();

source/storage/emummc.h

@@ -47,7 +47,7 @@ typedef struct _emummc_cfg_t
 	int fs_ver;
 } emummc_cfg_t;
 
-emummc_cfg_t emu_cfg;
+extern emummc_cfg_t emu_cfg;
 
 bool emummc_load_cfg();
 int emummc_storage_init_mmc(sdmmc_storage_t *storage, sdmmc_t *sdmmc);

source/storage/nx_sd.c

@@ -25,6 +25,10 @@
 bool sd_mounted = false, sd_inited = false;
 static u32  sd_mode = SD_UHS_SDR82;
 
+sdmmc_t sd_sdmmc;
+sdmmc_storage_t sd_storage;
+FATFS sd_fs;
+
 u32 sd_get_mode()
 {
 	return sd_mode;

source/storage/nx_sd.h

@@ -30,9 +30,9 @@ enum
 	SD_UHS_SDR82  = 3,
 };
 
-sdmmc_t sd_sdmmc;
-sdmmc_storage_t sd_storage;
-FATFS sd_fs;
+extern sdmmc_t sd_sdmmc;
+extern sdmmc_storage_t sd_storage;
+extern FATFS sd_fs;
 
 u32  sd_get_mode();
 int  sd_init_retry(bool power_cycle);

source/storage/sdmmc.h

@@ -21,7 +21,7 @@
 #include "../utils/types.h"
 #include "sdmmc_driver.h"
 
-u32 sd_power_cycle_time_start;
+extern u32 sd_power_cycle_time_start;
 
 typedef enum _sdmmc_type
 {

source/storage/sdmmc_driver.c

@@ -29,6 +29,11 @@
 #include "../soc/t210.h"
 #include "../utils/util.h"
 
+#pragma GCC push_options
+#pragma GCC optimize ("Os")
+
+u32 sd_power_cycle_time_start;
+
 //#define DPRINTF(...) gfx_printf(__VA_ARGS__)
 #define DPRINTF(...)
 
@@ -1158,6 +1163,8 @@ int sdmmc_init(sdmmc_t *sdmmc, u32 id, u32 power, u32 bus_width, u32 type, int a
 	return 0;
 }
 
+#pragma GCC pop_options
+
 void sdmmc_end(sdmmc_t *sdmmc)
 {
 	if (!sdmmc->clock_stopped)

source/tegraexplorer/common/common.h

@@ -23,7 +23,8 @@ enum utils_err_codes_te_call {
     ERR_SD_EJECTED,
     ERR_PARSE_FAIL,
     ERR_CANNOT_COPY_FILE_TO_FS_PART,
-    ERR_NO_DESTINATION
+    ERR_NO_DESTINATION,
+    ERR_INI_PARSE_FAIL
 };
 
 extern const char *utils_err_codes_te[];
@@ -58,8 +59,7 @@ extern menu_entry mainmenu_shutdown[];
 enum mainmenu_tools_return {
     TOOLS_DISPLAY_INFO = 1,
     TOOLS_DISPLAY_GPIO,
-    TOOLS_DUMPFIRMWARE,
-    TOOLS_DUMPUSERSAVE
+    TOOLS_DUMPFIRMWARE
 };
 
 extern menu_entry mainmenu_tools[];
@@ -86,7 +86,8 @@ enum fs_menu_file_return {
     FILE_PAYLOAD,
     FILE_SCRIPT,
     FILE_HEXVIEW,
-    FILE_DUMPBIS
+    FILE_DUMPBIS,
+    FILE_SIGN
 };
 
 extern menu_entry fs_menu_file[];

source/tegraexplorer/common/strings.c

@@ -52,7 +52,8 @@ const char *utils_err_codes_te[] = { // these start at 50
     "SD EJECTED",
     "PARSING FAILED",
     "CANNOT COPY FILE TO FS PART",
-    "NO DESTINATION"
+    "NO DESTINATION",
+    "INI PARSE FAIL"
 };
 /*
 const char *pkg2names[] = {

source/tegraexplorer/common/structs.c

@@ -25,8 +25,7 @@ menu_entry mainmenu_tools[] = {
     {"Back", COLOR_WHITE, {ISMENU}},
     {"\nDisplay Console Info", COLOR_GREEN, {ISMENU}},
     {"Display GPIO pins", COLOR_VIOLET, {ISMENU}},
-    {"Dump Firmware", COLOR_BLUE, {ISMENU}},
-    {"Dump User Saves", COLOR_YELLOW, {ISMENU}}
+    {"Dump Firmware", COLOR_BLUE, {ISMENU}}
 };
 
 menu_entry mainmenu_format[] = {
@@ -53,7 +52,8 @@ menu_entry fs_menu_file[] = {
     {"Launch Payload", COLOR_ORANGE, {ISMENU}},
     {"Launch Script", COLOR_YELLOW, {ISMENU}},
     {"View Hex", COLOR_GREEN, {ISMENU}},
-    {"\nExtract BIS", COLOR_YELLOW, {ISMENU}}
+    {"\nExtract BIS", COLOR_YELLOW, {ISMENU}},
+    {"Sign Save", COLOR_ORANGE, {ISMENU}}
 };
 
 menu_entry fs_menu_folder[] = {

source/tegraexplorer/emmc/emmcmenu.c

@@ -159,7 +159,7 @@ int makeMmcMenu(short mmcType){
             case 2:
                 if (!(clipboardhelper & ISDIR) && (clipboardhelper & OPERATIONCOPY)){
                     gfx_clearscreen();
-                    if (!mmcFlashFile(clipboard, mmcType)){
+                    if (!mmcFlashFile(clipboard, mmcType, true)){
                         gfx_printf("\nDone!");
                         hidWait();
                     }   

source/tegraexplorer/emmc/emmcoperations.h

@@ -4,7 +4,7 @@
 
 int emmcDumpSpecific(char *part, char *path);
 int emmcDumpBoot(char *basePath);
-int mmcFlashFile(char *path, short mmcType);
+int mmcFlashFile(char *path, short mmcType, bool warnings);
 
 int emmcDumpPart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part);
-int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part);
+int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part, bool warnings);

source/tegraexplorer/emmc/emmcrestorepart.c

@@ -17,7 +17,7 @@
 extern sdmmc_storage_t storage;
 extern emmc_part_t *system_part;
 
-int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part){
+int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part, bool warnings){
     FIL fp;
     FILINFO fno;
     u8 *buf;
@@ -54,10 +54,10 @@ int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part){
 
     gfx_printf("Flashing %s\n", part->name);
 
-    if (totalSize < totalSizeDest){
+    if (totalSize < totalSizeDest && warnings){
         SWAPCOLOR(COLOR_ORANGE);
         gfx_printf("File is too small for destination.\nDo you want to flash it anyway?\n\nB to Cancel\n");
-        u8 btnres = gfx_makewaitmenu(
+        u32 btnres = gfx_makewaitmenu(
             "A to Confirm",
             3
         );
@@ -214,13 +214,13 @@ emmc_part_t *mmcFindPart(char *path, short mmcType){
     return NULL;
 }
 
-int mmcFlashFile(char *path, short mmcType){
+int mmcFlashFile(char *path, short mmcType, bool warnings){
     emmc_part_t *part;
     int res;
 
     part = mmcFindPart(path, mmcType);
     if (part != NULL){
-        res = emmcRestorePart(path, &storage, part);
+        res = emmcRestorePart(path, &storage, part, warnings);
         emummc_storage_set_mmc_partition(&storage, 0);
         return res;
     }

source/tegraexplorer/fs/filemenu.c

@@ -16,6 +16,7 @@
 #include "../emmc/emmcoperations.h"
 #include "../../hid/hid.h"
 #include "../utils/menuUtils.h"
+#include "savesign.h"
 
 extern char *currentpath;
 extern char *clipboard;
@@ -150,6 +151,7 @@ int filemenu(menu_entry file){
     fs_menu_file[8].isHide = (!(strstr(file.name, ".bin") != NULL && file.size == 1) && strstr(file.name, ".rom") == NULL);
     fs_menu_file[9].isHide = (strstr(file.name, ".te") == NULL);
     fs_menu_file[11].isHide = (strstr(file.name, ".bis") == NULL);
+    fs_menu_file[12].isHide = (!!strcmp(currentpath, "emmc:/save"));
 
     /*
     SETBIT(fs_menu_file[6].property, ISHIDE, !hidConnected());
@@ -158,7 +160,7 @@ int filemenu(menu_entry file){
     SETBIT(fs_menu_file[11].property, ISHIDE, strstr(file.name, ".bis") == NULL);
     */
 
-    temp = menu_make(fs_menu_file, 12, "-- File Menu --");
+    temp = menu_make(fs_menu_file, 13, "-- File Menu --");
     switch (temp){
         case FILE_COPY:
             fsreader_writeclipboard(fsutil_getnextloc(currentpath, file.name), OPERATIONCOPY);
@@ -213,6 +215,17 @@ int filemenu(menu_entry file){
             extract_bis_file(fsutil_getnextloc(currentpath, file.name), currentpath);
             fsreader_readfolder(currentpath);
             hidWait();
+            break;
+        case FILE_SIGN:
+            if (gfx_defaultWaitMenu("WARNING!\n\nThis should only be used if you know what signing and a save is\nDo not do this if you don't know what this does\n\nRequires you to have a prod.keys located in the switch folder\n", 5)){
+                gfx_clearscreen();
+                gfx_printf("Signing save...\n");
+                if (save_sign("sd:/switch/prod.keys", fsutil_getnextloc(currentpath, file.name))){
+                    gfx_printf("Done!\nPress any key to exit");
+                    hidWait();
+                }
+            }
+
             break;
         case -1:
             return -1;

source/tegraexplorer/fs/fsactions.c

@@ -92,6 +92,7 @@ int fsact_copy(const char *locin, const char *locout, u8 options){
     }
 
     RESETCOLOR;
+    gfx_con_setpos(x - 16, y);
 
     f_close(&in);
     f_close(&out);

source/tegraexplorer/fs/savesign.c

@@ -0,0 +1,123 @@
+#include "savesign.h"
+#include "../../utils/types.h"
+#include "../../libs/fatfs/ff.h"
+#include "../../sec/se.h"
+#include "../../mem/heap.h"
+#include "../gfx/gfxutils.h"
+#include "../../config/ini.h"
+#include "../common/common.h"
+#include <string.h>
+
+bool save_commit(const char *path, u8 *save_mac_key){
+    FIL file;
+    int res;
+    u8 *buf, hash[0x20], *cmac_data, cmac[0x10];
+    const u32 hashed_data_size = 0x3D00, cmac_data_size = 0x200;
+    bool success = false;
+    
+    buf = malloc(hashed_data_size);
+    cmac_data = malloc(cmac_data_size);
+
+    if ((res = f_open(&file, path, FA_OPEN_EXISTING | FA_READ | FA_WRITE))){
+        gfx_errDisplay("save_commit", res, 1);
+        goto out_free;
+    }
+
+    f_lseek(&file, 0x300);
+    if ((res = f_read(&file, buf, hashed_data_size, NULL))){
+        gfx_errDisplay("save_commit", res, 2);
+        goto out_free;
+    }
+
+    se_calc_sha256(hash, buf, hashed_data_size);
+
+    f_lseek(&file, 0x108);
+    if ((res = f_write(&file, hash, sizeof(hash), NULL))){
+        gfx_errDisplay("save_commit", res, 3);
+        goto out_free;
+    }
+
+    f_lseek(&file, 0x100);
+    if ((res = f_read(&file, cmac_data, cmac_data_size, NULL))){
+        gfx_errDisplay("save_commit", res, 4);
+        goto out_free;
+    }
+
+    se_aes_key_set(3, save_mac_key, 0x10);
+    se_aes_cmac(3, cmac, 0x10, cmac_data, cmac_data_size);
+
+    f_lseek(&file, 0);
+
+    if ((res = f_write(&file, cmac, sizeof(cmac), NULL))){
+        gfx_errDisplay("save_commit", res, 5);
+        goto out_free;
+    }
+
+    success = true;
+
+out_free:;
+    free(buf);
+    free(cmac_data);
+    f_close(&file);
+    return success;
+}
+
+
+char *getKey(const char *search, link_t *inilist){
+    LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, inilist, link){
+        if (ini_sec->type == INI_CHOICE){
+            LIST_FOREACH_ENTRY(ini_kv_t, kv, &ini_sec->kvs, link)
+	    	{
+                if (!strcmp(search, kv->key))
+                    return kv->val;
+	    	}
+        }   
+    }
+    return NULL;
+}
+
+u8 getHexSingle(const char c) {
+    if (c >= '0' && c <= '9')
+        return c - '0';
+    if (c >= 'a' && c <= 'f')
+        return c - 'a' + 10;
+}
+
+u8 *getHex(const char *in){
+    u32 len = strlen(in), count = 0;
+    u8 *out = calloc(len / 2, sizeof(u8));
+
+    for (u32 i = 0; i < len; i += 2){
+        out[count++] = (u8)(getHexSingle(in[i]) << 4) | (getHexSingle(in[i + 1]));
+    }
+
+    return out;
+}
+
+bool save_sign(const char *keypath, const char *savepath){
+    LIST_INIT(inilist);
+    char *key;
+    u8 *hex;
+    bool success = false;
+
+    if (!ini_parse(&inilist, keypath, false)){
+        gfx_errDisplay("save_sign", ERR_INI_PARSE_FAIL, 1);
+        goto out_free;
+    }
+
+    if ((key = getKey("save_mac_key", &inilist)) == NULL){
+        gfx_errDisplay("save_sign", ERR_INI_PARSE_FAIL, 2);
+        goto out_free;
+    }
+
+    hex = getHex(key);
+
+    if (!save_commit(savepath, hex))
+        goto out_free;
+
+    success = true;
+
+out_free:;
+    list_empty(&inilist);
+    return success;
+}

source/tegraexplorer/fs/savesign.h

@@ -0,0 +1,4 @@
+#pragma once
+#include "../../utils/types.h"
+
+bool save_sign(const char *keypath, const char *savepath);

source/tegraexplorer/gfx/gfxutils.c

@@ -23,7 +23,7 @@ void gfx_clearscreen(){
     gfx_boxGrey(0, 703, 1279, 719, 0xFF);
     gfx_boxGrey(0, 0, 1279, 15, 0xFF);
     gfx_con_setpos(0, 0);
-    gfx_printf("Tegraexplorer v2.0.1 | Battery: %3d%%\n", battery >> 8);
+    gfx_printf("Tegraexplorer v2.0.2 | Battery: %3d%%\n", battery >> 8);
 
     RESETCOLOR;
 }
@@ -52,7 +52,7 @@ u32 gfx_errDisplay(const char *src_func, int err, int loc){
     
     if (err < 15)
         gfx_printf("Desc: %s\n", utils_err_codes[err]);
-    else if (err >= ERR_SAME_LOC && err <= ERR_NO_DESTINATION)
+    else if (err >= ERR_SAME_LOC && err <= ERR_INI_PARSE_FAIL)
         gfx_printf("Desc: %s\n", utils_err_codes_te[err - 50]);
 
     if (loc)

source/tegraexplorer/gfx/menu.c

@@ -167,8 +167,8 @@ int menu_make(menu_entry *entries, int amount, const char *toptext){
 
         while (hidRead()->buttons & (KEY_B | KEY_A));
 
-        input->buttons = 0;
-        while (!(input->buttons & (KEY_A | KEY_LDOWN | KEY_LUP | KEY_B | KEY_RUP | KEY_RDOWN))){
+        scrolltimer = get_tmr_ms();
+        while (1){
             if (sd_inited && !!gpio_read(GPIO_PORT_Z, GPIO_PIN_1)){
                 gfx_errDisplay("menu", ERR_SD_EJECTED, 0);
                 sd_unmount();
@@ -177,33 +177,39 @@ int menu_make(menu_entry *entries, int amount, const char *toptext){
 
             input = hidRead();
 
-            if (!(input->buttons & (KEY_A | KEY_LDOWN | KEY_LUP | KEY_B | KEY_RUP | KEY_RDOWN)))
+            if (!(input->buttons & (KEY_A | KEY_LDOWN | KEY_LUP | KEY_B | KEY_RUP | KEY_RDOWN))){
                 delay = 300;
-            
-            if (delay < 300){
-                scrolltimer = get_tmr_ms();
-                while (input->buttons & (KEY_A | KEY_LDOWN | KEY_LUP | KEY_B | KEY_RUP | KEY_RDOWN)){
-                    if (scrolltimer + delay <= get_tmr_ms())
-                        break;
-
-                    input = hidRead();       
-                }
+                continue;
             }
 
-            if (delay > 46 && input->buttons & (KEY_A | KEY_LDOWN | KEY_LUP | KEY_B | KEY_RUP | KEY_RDOWN))
-                delay -= 45;
-
-            if (input->buttons & (KEY_RUP | KEY_RDOWN))
+            
+            if (input->buttons & (KEY_RDOWN | KEY_RUP)){
                 delay = 1;
+                input->Lup = input->Rup;
+                input->Ldown = input->Rdown;
+            }
+            
+
+            if (delay < 300){
+                if (scrolltimer + delay < get_tmr_ms()){
+                    break;
+                }
+            }
+            else {
+                break;
+            }
         }
 
-        if (input->buttons & (KEY_LUP | KEY_RUP) && currentpos >= 1){
+        if (delay > 46)
+            delay -= 45;
+
+        if (input->Lup && currentpos >= 1){
             currentpos--;
             while(entries[currentpos].property & (ISSKIP | ISHIDE) && currentpos >= 1)
                 currentpos--;
         }
             
-        else if (input->buttons & (KEY_LDOWN | KEY_RDOWN) && currentpos < amount - 1){
+        else if (input->Ldown && currentpos < amount - 1){
             currentpos++;
             while(entries[currentpos].property & (ISSKIP | ISHIDE) && currentpos < amount - 1)
                 currentpos++;

source/tegraexplorer/mainmenu.c

@@ -37,24 +37,12 @@ void MainMenu_SDCard(){
 
 void MainMenu_EMMC(){
     if (gfx_defaultWaitMenu("You're about to enter EMMC\nModifying anything here can result in a BRICK!\n\nPlease only continue if you know what you're doing", 4)){
-        /*
-        connect_mmc(SYSMMC);
-
-        if (!mount_mmc(emmc_fs_entries[res - 2], res - 1))
-            fileexplorer("emmc:/", 1);
-        */
        makeMmcMenu(SYSMMC);
     }
 }
 
 void MainMenu_EMUMMC(){
-    /*
-    connect_mmc(EMUMMC);
-
-    if (!mount_mmc(emmc_fs_entries[res - 5], res - 4))
-        fileexplorer("emmc:/", 1);
-    */
-   makeMmcMenu(EMUMMC);
+    makeMmcMenu(EMUMMC);
 }
 
 void MainMenu_MountSD(){
@@ -62,8 +50,7 @@ void MainMenu_MountSD(){
 }
 
 void MainMenu_Tools(){
-    //res = makemenu(toolsmenu, 8);
-    res = menu_make(mainmenu_tools, 5, "-- Tools Menu --");
+    res = menu_make(mainmenu_tools, 4, "-- Tools Menu --");
 
     switch(res){
         case TOOLS_DISPLAY_INFO:
@@ -71,21 +58,14 @@ void MainMenu_Tools(){
             break;
         case TOOLS_DISPLAY_GPIO:
             displaygpio();
-            //makeMmcMenu(SYSMMC);
             break;
         case TOOLS_DUMPFIRMWARE:
             dumpfirmware(SYSMMC);
             break;
-        case TOOLS_DUMPUSERSAVE:
-            if ((res = utils_mmcMenu()) > 0)
-                dumpusersaves(res);
-
-            break;
     }
 }
 
 void MainMenu_SDFormat(){
-    //res = makemenu(formatmenu, 4);
     res = menu_make(mainmenu_format, 3, "-- Format Menu --");
 
     if (res > 0){

source/tegraexplorer/script/functions.c

@@ -524,7 +524,7 @@ int part_mmc_restorePart(){
     if (currentlyMounted < 0)
         return -1;
 
-    return mmcFlashFile(path, currentlyMounted);   
+    return mmcFlashFile(path, currentlyMounted, false);   
 }
 
 int part_fs_extractBisFile(){

source/tegraexplorer/utils/tools.c

@@ -159,7 +159,7 @@ int dumpfirmware(int mmc){
 
     return fail;
 }
-
+/*
 void dumpusersaves(int mmc){
     connect_mmc(mmc);
     mount_mmc("USER", 2);
@@ -180,6 +180,7 @@ void dumpusersaves(int mmc){
     gfx_printf("Press any key to continue");
     hidWait();
 }
+*/
 
 int format(int mode){
     gfx_clearscreen();

source/tegraexplorer/utils/tools.h

@@ -3,5 +3,4 @@
 void displayinfo();
 void displaygpio();
 int format(int mode);
-int dumpfirmware(int mmc);
-void dumpusersaves(int mmc);
+int dumpfirmware(int mmc);