arm9/source/globalsettings.cpp

@@ -81,24 +81,23 @@ void cGlobalSettings::loadSettings() {
     autorunWithLastRom = ini.GetInt("system", "autorunWithLastRom", autorunWithLastRom);
     homebrewreset = ini.GetInt("system", "homebrewreset", homebrewreset);
     resetHotKey = ini.GetInt("system", "resethotkey", resetHotKey);
-    phatCol = ini.GetInt("system", "phatCol", phatCol);
-    
+    phatCol = ini.GetInt("system", "phatcol", phatCol);
+
+    temp = ini.GetString("system", "scrollSpeed", "fast");
+    scrollSpeed =
+            (temp == "slow") ? EScrollSlow : ((temp == "medium") ? EScrollMedium : EScrollFast);
+
+    temp = ini.GetString("system", "viewMode", "icon");
+    viewMode = (temp == "list") ? EViewList 
+         : (temp == "icon") ? EViewIcon 
+         : (temp == "small") ? EViewSmall
+         : EViewInternal;
+
+    temp = ini.GetString("system", "slot2mode", "ask");
+    slot2mode = (temp == "gba") ? ESlot2Gba : ((temp == "nds") ? ESlot2Nds : ESlot2Ask);
+
     temp = ini.GetString("system", "saveext", ".sav");
     saveExt = (temp == ".sav");
-    temp = ini.GetString("system", "scrollSpeed", "fast");
-    scrollSpeed = (temp == "slow") ? EScrollSlow
-                : (temp == "medium") ? EScrollMedium
-                : EScrollFast;
-    temp = ini.GetString("system", "viewMode", "icon");
-    viewMode = (temp == "list") ? EViewList
-            : (temp == "icon") ? EViewIcon
-            : (temp == "small") ? EViewSmall
-            : (temp == "internal") ? EViewInternal
-            : EViewInternal;
-    temp = ini.GetString("system", "slot2mode", "ask");
-    slot2mode = (temp == "gba") ? ESlot2Gba
-            : (temp == "nds") ? ESlot2Nds
-            : ESlot2Ask;
 
 #ifdef __KERNEL_LAUNCHER_SUPPORT__
     temp = ini.GetString("system", "nds-bootstrap", "false");
@@ -138,16 +137,11 @@ void cGlobalSettings::saveSettings() {
     ini.SetInt("system", "resethotkey", resetHotKey);
     ini.SetInt("system", "dsonly", dsOnly);
     ini.SetInt("system", "phatCol", phatCol);
-    ini.SetString(
-        "system", "saveext",
-        saveExt ? ".sav" 
-        : ".nds.sav");
-    ini.SetString(
-        "system", "scrollSpeed",
-        (scrollSpeed == EScrollSlow) ? "slow"
-        : (scrollSpeed == EScrollMedium) ? "medium"
-        : (scrollSpeed == EScrollFast) ? "fast"
-        : "fast");
+
+    ini.SetString("system", "scrollSpeed",
+                  (scrollSpeed == EScrollSlow)
+                          ? "slow"
+                          : ((scrollSpeed == EScrollMedium) ? "medium" : "fast"));
     ini.SetString(
         "system", "viewMode",
         (viewMode == EViewList) ? "list" 
@@ -155,12 +149,9 @@ void cGlobalSettings::saveSettings() {
         : (viewMode == EViewSmall) ? "small" 
         : (viewMode == EViewInternal) ? "internal"
         : "internal");
-    ini.SetString(
-        "system", "slot2mode",
-        (slot2mode == ESlot2Gba) ? "gba"
-        : (slot2mode == ESlot2Nds) ? "nds"
-        : (slot2mode == ESlot2Ask) ? "ask"
-        : "ask" );
+    ini.SetString("system", "slot2mode",
+                  (slot2mode == ESlot2Gba) ? "gba" : ((slot2mode == ESlot2Nds) ? "nds" : "ask"));
+    ini.SetString("system", "saveext", saveExt ? ".sav" : ".nds.sav");
 
 #ifdef __KERNEL_LAUNCHER_SUPPORT__
     ini.SetString("system", "nds-bootstrap",

arm9/source/inifile.cpp

@@ -190,30 +190,29 @@ bool CIniFile::SaveIniFileModified(const std::string& FileName) {
 bool CIniFile::SaveIniFile(const std::string& FileName) {
     if (FileName != "") m_sFileName = FileName;
 
-    FILE* f = fopen(m_sFileName.c_str(), "w");
-    if (f == NULL) {
+    FILE* f = fopen(m_sFileName.c_str(), "wb");
+    if (NULL == f) {
         return false;
     }
 
     for (size_t ii = 0; ii < m_FileContainer.size(); ii++) {
         std::string& strline = m_FileContainer[ii];
         size_t notSpace = strline.find_first_not_of(' ');
-        if (notSpace != std::string::npos) {
-            strline = strline.substr(notSpace);
-        }
-
+        strline = strline.substr(notSpace);
         if (strline.find('[') == 0 && ii > 0) {
-            if (!m_FileContainer[ii - 1].empty())
-                fprintf(f, "\n");
+            if (!m_FileContainer[ii - 1].empty() && m_FileContainer[ii - 1] != "")
+                fwrite("\r\n", 1, 2, f);
         }
-
-        if (!strline.empty()) {
-            fprintf(f, "%s\n", strline.c_str());
+        if (!strline.empty() && strline != "") {
+            fwrite(strline.c_str(), 1, strline.length(), f);
+            fwrite("\r\n", 1, 2, f);
         }
     }
 
     fclose(f);
+
     m_bModified = false;
+
     return true;
 }
 

arm9/source/launcher/NdsBootstrapLauncher.cpp

@@ -142,9 +142,7 @@ bool NdsBootstrapLauncher::prepareIni() {
         ini.SetString("NDS-BOOTSTRAP", "DSI_MODE", "0");
     }
     if(gs().phatCol) {
-    #ifdef __DSIMODE__
         ini.SetString("NDS-BOOTSTRAP", "PHAT_COLORS", "1");
-    #endif
     }
 
     if (access("/_nds/debug.txt", F_OK) == 0) {

arm9/source/mainwnd.cpp

@@ -537,12 +537,13 @@ void cMainWnd::setParam(void) {
     _values.clear();
     _values.push_back(LANG("switches", "Disable"));
     _values.push_back(LANG("switches", "Enable"));
-    settingWnd.addSettingItem(LANG("file settings", "show hidden files"), _values, gs().showHiddenFiles);
+    settingWnd.addSettingItem(LANG("file settings", "show hidden files"), _values,
+                              gs().showHiddenFiles);
     _values.clear();
     _values.push_back(".nds.sav");
     _values.push_back(".sav");
     settingWnd.addSettingItem(LANG("file settings", "save extension"), _values, gs().saveExt);
-    _values.clear();
+        _values.clear();
     _values.push_back("no");
     _values.push_back("yes");
     settingWnd.addSettingItem(LANG("file settings", "use saves folder"), _values, gs().saveDir);
@@ -553,16 +554,14 @@ void cMainWnd::setParam(void) {
     _values.push_back("disable");
     _values.push_back("enable");
     settingWnd.addSettingItem(LANG("nds bootstrap", "dsmode"), _values, gs().dsOnly);
-    _values.clear();
-    _values.push_back("release");
-    _values.push_back("nightly");
-    settingWnd.addSettingItem(LANG("nds bootstrap", "text"), _values, gs().nightly);
-#ifdef __DSIMODE__
     _values.clear();
     _values.push_back("disable");
     _values.push_back("enable");
     settingWnd.addSettingItem(LANG("nds bootstrap", "phatCol"), _values, gs().phatCol);
-#endif
+    _values.clear();
+    _values.push_back("release");
+    _values.push_back("nightly");
+    settingWnd.addSettingItem(LANG("nds bootstrap", "text"), _values, gs().nightly);
 #ifdef __KERNEL_LAUNCHER_SUPPORT__
     _values.clear();
     _values.push_back("Kernel");
@@ -609,13 +608,13 @@ void cMainWnd::setParam(void) {
 
     // page 3: filesystem
     gs().showHiddenFiles = settingWnd.getItemSelection(2, 0);
-    gs().saveExt = settingWnd.getItemSelection(2, 1);
-    gs().saveDir = settingWnd.getItemSelection(2, 2);
+    gs().saveExt = settingWnd.getItemSelection(2, 2);
+    gs().saveDir = settingWnd.getItemSelection(2, 3);
 
     // page 4: ndsbs
     gs().dsOnly = settingWnd.getItemSelection(3, 0);
-    gs().nightly = settingWnd.getItemSelection(3, 1);
-    gs().phatCol = settingWnd.getItemSelection(3, 2);
+    gs().phatCol = settingWnd.getItemSelection(3, 1);
+    gs().nightly = settingWnd.getItemSelection(3, 2);
 
     // page 5: other
     gs().cheats = settingWnd.getItemSelection(4, 0);

arm9/source/version.h

@@ -8,7 +8,7 @@
 */
 
 #define AKMENU_VERSION_MAIN "1"
-#define AKMENU_VERSION_SUB "6.1"
+#define AKMENU_VERSION_SUB "6"
 
 #ifndef __KERNEL_LAUNCHER_SUPPORT__
 #define AKMENU_LOADER_NAME "nds-bootstrap"

language/Deutsch/language.txt

@@ -280,7 +280,6 @@ target slot = Ziel Speicher-Slot
 flash memory = Flash Memory
 microsd card = microSD Card
 slot2 card = Slot2 Card
-slot1 card = Slot1 Card
 favorites = Favoriten
 
 [hotkeys]

language/Français/language.txt

@@ -278,7 +278,7 @@ target slot = Slot de destination
 flash memory = Flash Memory
 microsd card = microSD Card
 slot2 card = Slot 2 Card
-slot1 card = Slot 1 Card
+slot2 card = Slot 1 Card
 favorites = Favorites
 
 [hotkeys]

package/_nds/akmenunext/globalsettings.ini

@@ -23,4 +23,3 @@ scrollSpeed = fast
 nds-bootstrap = true
 slot2mode = ask
 resethotkey = 0
-phatCol = 0

package/_nds/akmenunext/language/Deutsch/language.txt

@@ -280,7 +280,6 @@ target slot = Ziel Speicher-Slot
 flash memory = Flash Memory
 microsd card = microSD Card
 slot2 card = Slot2 Card
-slot1 card = Slot1 Card
 favorites = Favoriten
 
 [hotkeys]

package/_nds/akmenunext/language/Français/language.txt

@@ -278,7 +278,7 @@ target slot = Slot de destination
 flash memory = Flash Memory
 microsd card = microSD Card
 slot2 card = Slot 2 Card
-slot1 card = Slot 1 Card
+slot2 card = Slot 1 Card
 favorites = Favorites
 
 [hotkeys]