When launching GBA ROM on flashcard, use DSi/3DS build, if DSi mode i…

…s detected
DS-Homebrew · Jan 1, 2020 · 6dace69 · 6dace69
1 parent 9d1019f
commit 6dace69
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 6 deletions.
diff --git a/quickmenu/arm9/source/main.cpp b/quickmenu/arm9/source/main.cpp
@@ -2246,8 +2246,14 @@ int main(int argc, char **argv) {
 
 					if (previousUsedDevice) {
 						ndsToBoot = gbar2DldiAccess ? "sd:/_nds/GBARunner2_arm7dldi_ds.nds" : "sd:/_nds/GBARunner2_arm9dldi_ds.nds";
+						if (isDSiMode()) {
+							ndsToBoot = consoleModel>0 ? "sd:/_nds/GBARunner2_arm7dldi_3ds.nds" : "sd:/_nds/GBARunner2_arm7dldi_dsi.nds";
+						}
 						if(access(ndsToBoot, F_OK) != 0) {
-							ndsToBoot = gbar2DldiAccess ? "fat:/_nds/GBARunner2_arm7dldi_ds.nds" : "fat:/_nds/GBARunner2_arm9dldi_ds.nds";
+							ndsToBoot = gbar2DldiAccess ? "/_nds/GBARunner2_arm7dldi_ds.nds" : "/_nds/GBARunner2_arm9dldi_ds.nds";
+							if (isDSiMode()) {
+								ndsToBoot = consoleModel>0 ? "/_nds/GBARunner2_arm7dldi_3ds.nds" : "/_nds/GBARunner2_arm7dldi_dsi.nds";
+							}
 						}
 						dsModeSwitch = true;
 					} else {

diff --git a/romsel_aktheme/arm9/source/windows/mainwnd.cpp b/romsel_aktheme/arm9/source/windows/mainwnd.cpp
@@ -1281,9 +1281,19 @@ void MainWnd::launchSelected()
         ms().saveSettings();
 		if (ms().secondaryDevice)
         {
-			ndsToBoot = ms().gbar2DldiAccess ? GBARUNNER_A7_SD : GBARUNNER_A9_SD;
-			if(access(ndsToBoot, F_OK) != 0) {
-				ndsToBoot = ms().gbar2DldiAccess ? GBARUNNER_A7 : GBARUNNER_A9;
+			if (isDSiMode())
+			{
+				ndsToBoot = ms().consoleModel>0 ? GBARUNNER_3DS : GBARUNNER_DSI;
+				if(access(ndsToBoot, F_OK) != 0) {
+					ndsToBoot = ms().consoleModel>0 ? GBARUNNER_3DS_FC : GBARUNNER_DSI_FC;
+				}
+			}
+			else
+			{
+				ndsToBoot = ms().gbar2DldiAccess ? GBARUNNER_A7_SD : GBARUNNER_A9_SD;
+				if(access(ndsToBoot, F_OK) != 0) {
+					ndsToBoot = ms().gbar2DldiAccess ? GBARUNNER_A7 : GBARUNNER_A9;
+				}
 			}
 
             bootFile(ndsToBoot, fullPath);

diff --git a/romsel_dsimenutheme/arm9/source/main.cpp b/romsel_dsimenutheme/arm9/source/main.cpp
@@ -1710,8 +1710,14 @@ int main(int argc, char **argv) {
 				if (ms().secondaryDevice) {
 					if (GBA) {
 						ndsToBoot = ms().gbar2DldiAccess ? "sd:/_nds/GBARunner2_arm7dldi_ds.nds" : "sd:/_nds/GBARunner2_arm9dldi_ds.nds";
+						if (isDSiMode()) {
+							ndsToBoot = ms().consoleModel>0 ? "sd:/_nds/GBARunner2_arm7dldi_3ds.nds" : "sd:/_nds/GBARunner2_arm7dldi_dsi.nds";
+						}
 						if(access(ndsToBoot, F_OK) != 0) {
-							ndsToBoot = ms().gbar2DldiAccess ? "fat:/_nds/GBARunner2_arm7dldi_ds.nds" : "fat:/_nds/GBARunner2_arm9dldi_ds.nds";
+							ndsToBoot = ms().gbar2DldiAccess ? "/_nds/GBARunner2_arm7dldi_ds.nds" : "/_nds/GBARunner2_arm9dldi_ds.nds";
+							if (isDSiMode()) {
+								ndsToBoot = ms().consoleModel>0 ? "/_nds/GBARunner2_arm7dldi_3ds.nds" : "/_nds/GBARunner2_arm7dldi_dsi.nds";
+							}
 						}
 						argarray.push_back(ROMpath);
 					} else if (SNES) {

diff --git a/romsel_r4theme/arm9/source/main.cpp b/romsel_r4theme/arm9/source/main.cpp
@@ -2062,8 +2062,14 @@ int main(int argc, char **argv) {
 				if (secondaryDevice) {
 					if (GBA) {
 						ndsToBoot = gbar2DldiAccess ? "sd:/_nds/GBARunner2_arm7dldi_ds.nds" : "sd:/_nds/GBARunner2_arm9dldi_ds.nds";
+						if (isDSiMode()) {
+							ndsToBoot = consoleModel>0 ? "sd:/_nds/GBARunner2_arm7dldi_3ds.nds" : "sd:/_nds/GBARunner2_arm7dldi_dsi.nds";
+						}
 						if(access(ndsToBoot, F_OK) != 0) {
-							ndsToBoot = gbar2DldiAccess ? "fat:/_nds/GBARunner2_arm7dldi_ds.nds" : "fat:/_nds/GBARunner2_arm9dldi_ds.nds";
+							ndsToBoot = gbar2DldiAccess ? "/_nds/GBARunner2_arm7dldi_ds.nds" : "/_nds/GBARunner2_arm9dldi_ds.nds";
+							if (isDSiMode()) {
+								ndsToBoot = consoleModel>0 ? "/_nds/GBARunner2_arm7dldi_3ds.nds" : "/_nds/GBARunner2_arm7dldi_dsi.nds";
+							}
 						}
 						argarray.push_back(ROMpath);
 					} else if (SNES) {