Close #2349

DS-Homebrew · Jan 25, 2024 · a836b7d · a836b7d
1 parent e7f5378
commit a836b7d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/quickmenu/arm9/source/main.cpp b/quickmenu/arm9/source/main.cpp
@@ -3205,10 +3205,7 @@ int dsClassicMenu(void) {
 				} else if (extension(filename[ms().secondaryDevice], ".a52")) {
 					ms().launchType[ms().secondaryDevice] = TWLSettings::EA5200DSLaunch;
 
-					ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
-					if (isDSiMode() && access(ndsToBoot, F_OK) != 0) {
-						ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
-					}
+					ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/A5200DS.nds";
 					if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
 						ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/A5200DS.nds";
 						boostVram = true;

diff --git a/romsel_dsimenutheme/arm9/source/main.cpp b/romsel_dsimenutheme/arm9/source/main.cpp
@@ -2298,10 +2298,7 @@ int dsiMenuTheme(void) {
 				} else if (extension(filename, {".a52"})) {
 					ms().launchType[ms().secondaryDevice] = Launch::EA5200DSLaunch;
 
-					ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
-					if (isDSiMode() && access(ndsToBoot, F_OK) != 0) {
-						ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
-					}
+					ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/A5200DS.nds";
 					if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
 						ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/A5200DS.nds";
 						boostVram = true;

diff --git a/romsel_r4theme/arm9/source/main.cpp b/romsel_r4theme/arm9/source/main.cpp
@@ -2307,10 +2307,7 @@ int r4Theme(void) {
 				} else if (extension(filename, {".a52"})) {
 					ms().launchType[ms().secondaryDevice] = TWLSettings::EA5200DSLaunch;
 
-					ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
-					if (isDSiMode() && access(ndsToBoot, F_OK) != 0) {
-						ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
-					}
+					ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/A5200DS.nds";
 					if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
 						ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/A5200DS.nds";
 						boostVram = true;

diff --git a/title/arm9/source/main.cpp b/title/arm9/source/main.cpp
@@ -1144,10 +1144,7 @@ void lastRunROM()
 	} else if (ms().launchType[ms().previousUsedDevice] == Launch::EA5200DSLaunch) {
 		if (access(ms().romPath[ms().previousUsedDevice].c_str(), F_OK) != 0) return;	// Skip to running TWiLight Menu++
 
-		argarray.at(0) = (char*)"sd:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
-		if (isDSiMode() && access(argarray[0], F_OK) != 0) {
-			argarray.at(0) = (char*)"fat:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
-		}
+		argarray.at(0) = (char*)"sd:/_nds/TWiLightMenu/emulators/A5200DS.nds";
 		if (!isDSiMode() || access(argarray[0], F_OK) != 0) {
 			argarray.at(0) = (char*)"fat:/_nds/TWiLightMenu/emulators/A5200DS.nds";
 		}