incompatibleGameListB4DS is now empty

DS-Homebrew · Sep 13, 2024 · be513c6 · be513c6
1 parent f6a4b0a
commit be513c6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/romsel_aktheme/arm9/source/fileBrowse.cpp b/romsel_aktheme/arm9/source/fileBrowse.cpp
@@ -1003,10 +1003,12 @@ bool donorRomMsg(void) {
 	return proceedToLaunch;
 }
 
-bool checkForCompatibleGame(const char *filename) {
+bool checkForCompatibleGame() {
+	return true;
+
 	bool proceedToLaunch = true;
 
-	if (!dsiFeatures() && ms().secondaryDevice) {
+	/* if (!dsiFeatures() && ms().secondaryDevice) {
 		// TODO: If the list gets large enough, switch to bsearch().
 		for (unsigned int i = 0; i < sizeof(incompatibleGameListB4DS)/sizeof(incompatibleGameListB4DS[0]); i++) {
 			if (memcmp(gameTid[cursorPosOnScreen], incompatibleGameListB4DS[i], 3) == 0) {
@@ -1015,7 +1017,7 @@ bool checkForCompatibleGame(const char *filename) {
 				break;
 			}
 		}
-	}
+	} */
 
 	/* if (proceedToLaunch && ms().secondaryDevice) {
 		// TODO: If the list gets large enough, switch to bsearch().
@@ -1076,7 +1078,7 @@ bool checkForCompatibleGame(const char *filename) {
 	return proceedToLaunch;
 }
 
-bool gameCompatibleMemoryPit(const char* filename) {
+bool gameCompatibleMemoryPit(void) {
 	// TODO: If the list gets large enough, switch to bsearch().
 	for (unsigned int i = 0; i < sizeof(incompatibleGameListMemoryPit)/sizeof(incompatibleGameListMemoryPit[0]); i++) {
 		if (memcmp(gameTid[cursorPosOnScreen], incompatibleGameListMemoryPit[i], 3) == 0) {
@@ -1087,7 +1089,7 @@ bool gameCompatibleMemoryPit(const char* filename) {
 	return true;
 }
 
-bool checkForGbaBiosRequirement(const char* filename) {
+bool checkForGbaBiosRequirement(void) {
 	extern bool gbaBiosFound[2];
 
 	if (gbaBiosFound[ms().secondaryDevice]) {
@@ -1737,8 +1739,8 @@ std::string browseForFile(const std::vector<std::string_view> extensionList) {
 
 				if (isTwlm[cursorPosOnScreen] || (!isDSiWare[cursorPosOnScreen] && (!dsiFeatures() || bs().b4dsMode) && ms().secondaryDevice && bnrRomType[cursorPosOnScreen] == 0 && gameTid[cursorPosOnScreen][0] == 'D' && romUnitCode[cursorPosOnScreen] == 3 && requiresDonorRom[cursorPosOnScreen] != 51)
 				|| (isDSiWare[cursorPosOnScreen] && ((((!dsiFeatures() && (!sdFound() || !ms().dsiWareToSD)) || bs().b4dsMode) && ms().secondaryDevice && !dsiWareCompatibleB4DS())
-				|| (isDSiMode() && memcmp(io_dldi_data->friendlyName, "CycloDS iEvolution", 18) != 0 && sys().arm7SCFGLocked() && !sys().dsiWramAccess() && !gameCompatibleMemoryPit(dirContents.at(fileOffset).name.c_str()))))
-				|| (bnrRomType[cursorPosOnScreen] == 1 && (!ms().secondaryDevice || dsiFeatures() || ms().gbaBooter == TWLSettings::EGbaGbar2) && checkForGbaBiosRequirement(dirContents.at(fileOffset).name.c_str()))) {
+				|| (isDSiMode() && memcmp(io_dldi_data->friendlyName, "CycloDS iEvolution", 18) != 0 && sys().arm7SCFGLocked() && !sys().dsiWramAccess() && !gameCompatibleMemoryPit())))
+				|| (bnrRomType[cursorPosOnScreen] == 1 && (!ms().secondaryDevice || dsiFeatures() || ms().gbaBooter == TWLSettings::EGbaGbar2) && checkForGbaBiosRequirement())) {
 					proceedToLaunch = cannotLaunchMsg(gameTid[cursorPosOnScreen][0]);
 					refreshBanners(screenOffset, fileOffset, dirContents);
 				}
@@ -1759,7 +1761,7 @@ std::string browseForFile(const std::vector<std::string_view> extensionList) {
 					}
 				}
 				if (proceedToLaunch && (useBootstrapAnyway || ((!dsiFeatures() || bs().b4dsMode) && isDSiWare[cursorPosOnScreen])) && bnrRomType[cursorPosOnScreen] == 0 && !dsModeForced && isHomebrew[cursorPosOnScreen] == 0) {
-					proceedToLaunch = checkForCompatibleGame(dirContents.at(fileOffset).name.c_str());
+					proceedToLaunch = checkForCompatibleGame();
 					if (proceedToLaunch && requiresDonorRom[cursorPosOnScreen]) {
 						const char* pathDefine = "DONORTWL_NDS_PATH"; // SDK5.x (TWL)
 						if (requiresDonorRom[cursorPosOnScreen] == 52) {

diff --git a/romsel_dsimenutheme/arm9/source/fileBrowse.cpp b/romsel_dsimenutheme/arm9/source/fileBrowse.cpp
@@ -1851,9 +1851,11 @@ bool donorRomMsg(const char *filename) {
 }
 
 bool checkForCompatibleGame(const char *filename) {
+	return true;
+
 	bool proceedToLaunch = true;
 
-	if (!dsiFeatures() && ms().secondaryDevice) {
+	/* if (!dsiFeatures() && ms().secondaryDevice) {
 		// TODO: If the list gets large enough, switch to bsearch().
 		for (unsigned int i = 0; i < sizeof(incompatibleGameListB4DS)/sizeof(incompatibleGameListB4DS[0]); i++) {
 			if (memcmp(gameTid[CURPOS], incompatibleGameListB4DS[i], 3) == 0) {
@@ -1862,7 +1864,7 @@ bool checkForCompatibleGame(const char *filename) {
 				break;
 			}
 		}
-	}
+	} */
 
 	/* if (proceedToLaunch && ms().secondaryDevice) {
 		// TODO: If the list gets large enough, switch to bsearch().

diff --git a/romsel_r4theme/arm9/source/fileBrowse.cpp b/romsel_r4theme/arm9/source/fileBrowse.cpp
@@ -606,9 +606,11 @@ void showLocation(void) {
 }
 
 bool checkForCompatibleGame(const char *filename) {
+	return true;
+
 	bool proceedToLaunch = true;
 
-	if (!dsiFeatures() && ms().secondaryDevice) {
+	/* if (!dsiFeatures() && ms().secondaryDevice) {
 		// TODO: If the list gets large enough, switch to bsearch().
 		for (unsigned int i = 0; i < sizeof(incompatibleGameListB4DS)/sizeof(incompatibleGameListB4DS[0]); i++) {
 			if (memcmp(gameTid, incompatibleGameListB4DS[i], 3) == 0) {
@@ -617,7 +619,7 @@ bool checkForCompatibleGame(const char *filename) {
 				break;
 			}
 		}
-	}
+	} */
 
 	/* if (proceedToLaunch && ms().secondaryDevice) {
 		// TODO: If the list gets large enough, switch to bsearch().
@@ -689,7 +691,7 @@ bool checkForCompatibleGame(const char *filename) {
 	return proceedToLaunch;
 }
 
-bool gameCompatibleMemoryPit(const char* filename) {
+bool gameCompatibleMemoryPit(void) {
 	// TODO: If the list gets large enough, switch to bsearch().
 	for (unsigned int i = 0; i < sizeof(incompatibleGameListMemoryPit)/sizeof(incompatibleGameListMemoryPit[0]); i++) {
 		if (memcmp(gameTid, incompatibleGameListMemoryPit[i], 3) == 0) {
@@ -700,7 +702,7 @@ bool gameCompatibleMemoryPit(const char* filename) {
 	return true;
 }
 
-bool checkForGbaBiosRequirement(const char* filename) {
+bool checkForGbaBiosRequirement(void) {
 	extern bool gbaBiosFound[2];
 
 	if (gbaBiosFound[ms().secondaryDevice]) {
@@ -1256,8 +1258,8 @@ std::string browseForFile(const std::vector<std::string_view> extensionList) {
 
 				if (isTwlm || (!isDSiWare && (!dsiFeatures() || bs().b4dsMode) && ms().secondaryDevice && bnrRomType == 0 && gameTid[0] == 'D' && romUnitCode == 3 && requiresDonorRom != 51)
 				|| (isDSiWare && ((((!dsiFeatures() && (!sdFound() || !ms().dsiWareToSD)) || bs().b4dsMode) && ms().secondaryDevice && !dsiWareCompatibleB4DS())
-				|| (isDSiMode() && memcmp(io_dldi_data->friendlyName, "CycloDS iEvolution", 18) != 0 && sys().arm7SCFGLocked() && !sys().dsiWramAccess() && !gameCompatibleMemoryPit(dirContents.at(fileOffset).name.c_str()))))
-				|| (bnrRomType == 1 && (!ms().secondaryDevice || dsiFeatures() || ms().gbaBooter == TWLSettings::EGbaGbar2) && checkForGbaBiosRequirement(dirContents.at(fileOffset).name.c_str()))) {
+				|| (isDSiMode() && memcmp(io_dldi_data->friendlyName, "CycloDS iEvolution", 18) != 0 && sys().arm7SCFGLocked() && !sys().dsiWramAccess() && !gameCompatibleMemoryPit())))
+				|| (bnrRomType == 1 && (!ms().secondaryDevice || dsiFeatures() || ms().gbaBooter == TWLSettings::EGbaGbar2) && checkForGbaBiosRequirement())) {
 					proceedToLaunch = cannotLaunchMsg(gameTid[0]);
 				}
 				bool useBootstrapAnyway = ((perGameSettings_useBootstrap == -1 ? ms().useBootstrap : perGameSettings_useBootstrap) || !ms().secondaryDevice);

diff --git a/universal/include/incompatibleGameMap.h b/universal/include/incompatibleGameMap.h
@@ -1,10 +1,8 @@
 #ifndef INCOMPATIBLEMAP_H
 #define INCOMPATIBLEMAP_H
 
-static const char incompatibleGameListB4DS[][4] = {
-	"AWD", // Diddy Kong Racing
-	"CP3", // Viva Pinata: Pocket Paradise
-};
+// static const char incompatibleGameListB4DS[][4] = {
+// };
 
 // static const char incompatibleGameListFC[][4] = {
 // };