Actually screw the useSaveFolder config. "/3ds/open_agb_firm/saves" is the new location for savegames and future per-game configs.

Added code for savegame slots. Currently not configurable.

Author: profi200

README.md

@@ -47,9 +47,6 @@ General settings.
 `bool useGbaDb` - Use `gba_db.bin` to get save types
 * Default: `true`
 
-`bool useSaveFolder` - Store savegames and config files in `/3ds/open_agb_firm/saves`
-* Default: `false`
-
 ### Video
 Video-related settings.
 

libn3ds/include/error_codes.h

@@ -37,28 +37,29 @@ enum
 	RES_OUT_OF_MEM             =  4u,
 	RES_OUT_OF_RANGE           =  5u,
 	RES_NOT_FOUND              =  6u,
+	RES_PATH_TOO_LONG          =  7u,
 
 	// fatfs errors.
 	// Caution: Update fres2Res() in fs.c on ARM9 if this changes!
-	RES_FR_DISK_ERR            =  7u, /* (1) A hard error occurred in the low level disk I/O layer */
-	RES_FR_INT_ERR             =  8u, /* (2) Assertion failed */
-	RES_FR_NOT_READY           =  9u, /* (3) The physical drive cannot work */
-	RES_FR_NO_FILE             = 10u, /* (4) Could not find the file */
-	RES_FR_NO_PATH             = 11u, /* (5) Could not find the path */
-	RES_FR_INVALID_NAME        = 12u, /* (6) The path name format is invalid */
-	RES_FR_DENIED              = 13u, /* (7) Access denied due to prohibited access or directory full */
-	RES_FR_EXIST               = 14u, /* (8) Access denied due to prohibited access */
-	RES_FR_INVALID_OBJECT      = 15u, /* (9) The file/directory object is invalid */
-	RES_FR_WRITE_PROTECTED     = 16u, /* (10) The physical drive is write protected */
-	RES_FR_INVALID_DRIVE       = 17u, /* (11) The logical drive number is invalid */
-	RES_FR_NOT_ENABLED         = 18u, /* (12) The volume has no work area */
-	RES_FR_NO_FILESYSTEM       = 19u, /* (13) There is no valid FAT volume */
-	RES_FR_MKFS_ABORTED        = 20u, /* (14) The f_mkfs() aborted due to any problem */
-	RES_FR_TIMEOUT             = 21u, /* (15) Could not get a grant to access the volume within defined period */
-	RES_FR_LOCKED              = 22u, /* (16) The operation is rejected according to the file sharing policy */
-	RES_FR_NOT_ENOUGH_CORE     = 23u, /* (17) LFN working buffer could not be allocated */
-	RES_FR_TOO_MANY_OPEN_FILES = 24u, /* (18) Number of open files > FF_FS_LOCK */
-	RES_FR_INVALID_PARAMETER   = 25u, /* (19) Given parameter is invalid */
+	RES_FR_DISK_ERR            =  8u, /* (1) A hard error occurred in the low level disk I/O layer */
+	RES_FR_INT_ERR             =  9u, /* (2) Assertion failed */
+	RES_FR_NOT_READY           = 10u, /* (3) The physical drive cannot work */
+	RES_FR_NO_FILE             = 11u, /* (4) Could not find the file */
+	RES_FR_NO_PATH             = 12u, /* (5) Could not find the path */
+	RES_FR_INVALID_NAME        = 13u, /* (6) The path name format is invalid */
+	RES_FR_DENIED              = 14u, /* (7) Access denied due to prohibited access or directory full */
+	RES_FR_EXIST               = 15u, /* (8) Access denied due to prohibited access */
+	RES_FR_INVALID_OBJECT      = 16u, /* (9) The file/directory object is invalid */
+	RES_FR_WRITE_PROTECTED     = 17u, /* (10) The physical drive is write protected */
+	RES_FR_INVALID_DRIVE       = 18u, /* (11) The logical drive number is invalid */
+	RES_FR_NOT_ENABLED         = 19u, /* (12) The volume has no work area */
+	RES_FR_NO_FILESYSTEM       = 20u, /* (13) There is no valid FAT volume */
+	RES_FR_MKFS_ABORTED        = 21u, /* (14) The f_mkfs() aborted due to any problem */
+	RES_FR_TIMEOUT             = 22u, /* (15) Could not get a grant to access the volume within defined period */
+	RES_FR_LOCKED              = 23u, /* (16) The operation is rejected according to the file sharing policy */
+	RES_FR_NOT_ENOUGH_CORE     = 24u, /* (17) LFN working buffer could not be allocated */
+	RES_FR_TOO_MANY_OPEN_FILES = 25u, /* (18) Number of open files > FF_FS_LOCK */
+	RES_FR_INVALID_PARAMETER   = 26u, /* (19) Given parameter is invalid */
 
 	// Custom errors.
 	RES_ROM_TOO_BIG            = MAKE_CUSTOM_ERR(0),

libn3ds/source/error_codes.c

@@ -29,8 +29,6 @@
 #ifdef ARM11
 void printError(Result res)
 {
-	GFX_setBrightness(15, 15);
-
 	static const char *const common[] =
 	{
 		"OK",
@@ -40,6 +38,7 @@ void printError(Result res)
 		"Out of memory",
 		"Out of range",
 		"Not found",
+		"Path too long",
 
 		// fatfs errors.
 		"fatfs disk error",

source/arm11/open_agb_firm.c

@@ -41,19 +41,19 @@
 
 
 #define OAF_WORK_DIR    "sdmc:/3ds/open_agb_firm"
+#define OAF_SAVE_DIR    "saves"                   // Relative to work dir.
 #define INI_BUF_SIZE    (1024u)
-#define DEFAULT_CONFIG  "[general]\n"             \
-                        "backlight=64\n"          \
-                        "directBoot=false\n"      \
-                        "useGbaDb=true\n"         \
-                        "useSaveFolder=false\n\n" \
-                        "[video]\n"               \
-                        "gbaGamma=2.2\n"          \
-                        "lcdGamma=1.54\n"         \
-                        "contrast=1.0\n"          \
-                        "brightness=0.0\n\n"      \
-                        "[advanced]\n"            \
-                        "saveOverride=false\n"    \
+#define DEFAULT_CONFIG  "[general]\n"           \
+                        "backlight=64\n"        \
+                        "directBoot=false\n"    \
+                        "useGbaDb=true\n\n"     \
+                        "[video]\n"             \
+                        "gbaGamma=2.2\n"        \
+                        "lcdGamma=1.54\n"       \
+                        "contrast=1.0\n"        \
+                        "brightness=0.0\n\n"    \
+                        "[advanced]\n"          \
+                        "saveOverride=false\n"  \
                         "defaultSave=14"
 
 
@@ -63,7 +63,6 @@ typedef struct
 	u8 backlight; // Both LCDs.
 	bool directBoot;
 	bool useGbaDb;
-	bool useSaveFolder;
 
 	// [video]
 	float gbaGamma;
@@ -92,7 +91,6 @@ static OafConfig g_oafConfig =
 	64,    // backlight
 	false, // directBoot
 	true,  // useGbaDb
-	false, // useSaveFolder
 
 	// [video]
 	2.2f,  // gbaGamma
@@ -506,8 +504,6 @@ static int confIniHandler(void* user, const char* section, const char* name, con
 			config->directBoot = (strcmp(value, "false") == 0 ? false : true);
 		else if(strcmp(name, "useGbaDb") == 0)
 			config->useGbaDb = (strcmp(value, "true") == 0 ? true : false);
-		else if(strcmp(name, "useSaveFolder") == 0)
-			config->useSaveFolder = (strcmp(value, "false") == 0 ? false : true);
 	}
 	else if(strcmp(section, "video") == 0)
 	{
@@ -595,18 +591,45 @@ static Result showFileBrowser(char romAndSavePath[512])
 	return res;
 }
 
-Result oafParseConfigEarly(void)
+static void rom2SavePath(char romPath[512], const u8 saveSlot)
 {
-	// Create the work dir and switch to it before parsing the config.
-	Result res = fsMakePath(OAF_WORK_DIR);
-	if(res == RES_OK || res == RES_FR_EXIST)
+	if(saveSlot > 9)
 	{
-		if((res = fChdir(OAF_WORK_DIR)) == RES_OK)
-		{
-			res = parseConfig("config.ini", &g_oafConfig);
-		}
+		*romPath = '\0'; // Prevent using the ROM as save file.
+		return;
 	}
 
+	char tmpSaveFileName[256];
+	static char numberedExt[7] = {'.', 'X', '.', 's', 'a', 'v', '\0'};
+
+	numberedExt[1] = '0' + saveSlot;
+
+	// Extract the file name and change the extension.
+	// The numbered extension is 2 chars longer than unnumbered.
+	safeStrcpy(tmpSaveFileName, strrchr(romPath, '/') + 1, 256 - 2);
+	strcpy(tmpSaveFileName + strlen(tmpSaveFileName) - 4, (saveSlot == 0 ? ".sav" : numberedExt));
+
+	// Construct the new path.
+	strcpy(romPath, OAF_SAVE_DIR "/");
+	strcat(romPath, tmpSaveFileName);
+}
+
+Result oafParseConfigEarly(void)
+{
+	Result res;
+	do
+	{
+		// Create the work dir and switch to it.
+		if((res = fsMakePath(OAF_WORK_DIR)) != RES_OK && res != RES_FR_EXIST) break;
+		if((res = fChdir(OAF_WORK_DIR)) != RES_OK) break;
+
+		// Create the saves folder.
+		if((res = fMkdir(OAF_SAVE_DIR)) != RES_OK && res != RES_FR_EXIST) break;
+
+		// Parse the config.
+		res = parseConfig("config.ini", &g_oafConfig);
+	} while(0);
+
 	return res;
 }
 
@@ -634,7 +657,7 @@ Result oafInitAndRun(void)
 			if((res = loadGbaRom(romAndSavePath, &romSize)) != RES_OK) break;
 
 			// Adjust path for the save file and get save type.
-			strcpy(romAndSavePath + strlen(romAndSavePath) - 4, ".sav");
+			rom2SavePath(romAndSavePath, 0); // TODO: Save slot config.
 			u16 saveType;
 			if(g_oafConfig.useGbaDb || g_oafConfig.saveOverride)
 				saveType = getSaveType(romSize, romAndSavePath);