From a836b7d30b3582d57af848dde2277ded9dfe3a50 Mon Sep 17 00:00:00 2001 From: RocketRobz Date: Wed, 24 Jan 2024 17:13:56 -0700 Subject: [PATCH] Close #2349 --- quickmenu/arm9/source/main.cpp | 5 +---- romsel_dsimenutheme/arm9/source/main.cpp | 5 +---- romsel_r4theme/arm9/source/main.cpp | 5 +---- title/arm9/source/main.cpp | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/quickmenu/arm9/source/main.cpp b/quickmenu/arm9/source/main.cpp index 09a45a4880..2804b42d8d 100644 --- 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 index 95e9886e9f..9c3bb35af8 100644 --- 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 index 18a70a7148..159560ab9d 100644 --- 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 index 1ef1bec2ba..4a7cb59830 100644 --- 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"; }