Don't use YSMenu for ak2i

DS-Homebrew · Dec 11, 2017 · 17e8f4b · 17e8f4b
1 parent 79dab43
commit 17e8f4b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/romsel_dsimenutheme/arm9/source/main.cpp b/romsel_dsimenutheme/arm9/source/main.cpp
@@ -782,17 +782,6 @@ int main(int argc, char **argv) {
 								break;
 							}
 
-							case 3: {
-								CIniFile fcrompathini("fat:/YSMenu/YSMenu.ini");
-								path = ReplaceAll(argarray[0], "fat:/", slashchar);
-								fcrompathini.SetString("YSMENU", "AUTO_BOOT", path);
-								fcrompathini.SetString("YSMENU", "DEFAULT_DMA", "true");
-								fcrompathini.SetString("YSMENU", "DEFAULT_RESET", "false");
-								fcrompathini.SaveIniFile("fat:/YSMenu/YSMenu.ini");
-								err = runNdsFile ("fat:/YSMenu.nds", 0, NULL);
-								break;
-							}
-
 							case 2:
 							case 4:
 							case 5: {
@@ -804,6 +793,15 @@ int main(int argc, char **argv) {
 								break;
 							}
 
+							case 3: {
+								CIniFile fcrompathini("fat:/_afwd/lastsave.ini");
+								path = ReplaceAll(argarray[0], "fat:/", woodfat);
+								fcrompathini.SetString("Save Info", "lastLoaded", path);
+								fcrompathini.SaveIniFile("fat:/_afwd/lastsave.ini");
+								err = runNdsFile ("fat:/Afwd.dat", 0, NULL);
+								break;
+							}
+
 							case 6: {
 								CIniFile fcrompathini("fat:/_dstwo/autoboot.ini");
 								path = ReplaceAll(argarray[0], "fat:/", dstwofat);

diff --git a/romsel_dsmenutheme/arm9/source/main.cpp b/romsel_dsmenutheme/arm9/source/main.cpp
@@ -620,17 +620,6 @@ int main(int argc, char **argv) {
 								break;
 							}
 
-							case 3: {
-								CIniFile fcrompathini("fat:/YSMenu/YSMenu.ini");
-								path = ReplaceAll(argarray[0], "fat:/", slashchar);
-								fcrompathini.SetString("YSMENU", "AUTO_BOOT", path);
-								fcrompathini.SetString("YSMENU", "DEFAULT_DMA", "true");
-								fcrompathini.SetString("YSMENU", "DEFAULT_RESET", "false");
-								fcrompathini.SaveIniFile("fat:/YSMenu/YSMenu.ini");
-								err = runNdsFile ("fat:/YSMenu.nds", 0, NULL);
-								break;
-							}
-
 							case 2:
 							case 4:
 							case 5: {
@@ -642,6 +631,15 @@ int main(int argc, char **argv) {
 								break;
 							}
 
+							case 3: {
+								CIniFile fcrompathini("fat:/_afwd/lastsave.ini");
+								path = ReplaceAll(argarray[0], "fat:/", woodfat);
+								fcrompathini.SetString("Save Info", "lastLoaded", path);
+								fcrompathini.SaveIniFile("fat:/_afwd/lastsave.ini");
+								err = runNdsFile ("fat:/Afwd.dat", 0, NULL);
+								break;
+							}
+
 							case 6: {
 								CIniFile fcrompathini("fat:/_dstwo/autoboot.ini");
 								path = ReplaceAll(argarray[0], "fat:/", dstwofat);

diff --git a/titleandsettings/arm9/source/main.cpp b/titleandsettings/arm9/source/main.cpp
@@ -306,7 +306,6 @@ int main(int argc, char **argv) {
 			switch (flashcard) {
 				case 0:
 				case 1:
-				case 3:
 				default:
 					runNdsFile ("fat:/YSMenu.nds", 0, NULL);
 					break;
@@ -315,6 +314,9 @@ int main(int argc, char **argv) {
 				case 5:
 					runNdsFile ("fat:/Wfwd.dat", 0, NULL);
 					break;
+				case 3:
+					runNdsFile ("fat:/Afwd.dat", 0, NULL);
+					break;
 				case 6:
 					runNdsFile ("fat:/_dstwo/autoboot.nds", 0, NULL);
 					break;
@@ -1059,7 +1061,6 @@ int main(int argc, char **argv) {
 						switch (flashcard) {
 							case 0:
 							case 1:
-							case 3:
 							default:
 								err = runNdsFile ("fat:/YSMenu.nds", 0, NULL);
 								break;
@@ -1068,6 +1069,9 @@ int main(int argc, char **argv) {
 							case 5:
 								err = runNdsFile ("fat:/Wfwd.dat", 0, NULL);
 								break;
+							case 3:
+								err = runNdsFile ("fat:/Afwd.dat", 0, NULL);
+								break;
 							case 6:
 								err = runNdsFile ("fat:/_dstwo/autoboot.nds", 0, NULL);
 								break;