Revert "Bug fix"

This reverts commit e533bfc.
DS-Homebrew · Jan 22, 2024 · e8878c2 · e8878c2
1 parent bbc2ed8
commit e8878c2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/romsel_dsimenutheme/arm9/source/perGameSettings.cpp b/romsel_dsimenutheme/arm9/source/perGameSettings.cpp
@@ -882,7 +882,7 @@ void perGameSettings (std::string filename) {
 				break;
 			case 5:
 				printSmall(false, perGameOpStartXpos, perGameOpYpos, STR_CARD_READ_DMA + ":", startAlign, FontPalette::dialog);
-				if (unitCode[CURPOS] > 0 && (perGameSettings_dsiMode==-1 ? DEFAULT_DSI_MODE : perGameSettings_dsiMode > 0)) {
+				if (perGameSettings_dsiMode==-1 ? (DEFAULT_DSI_MODE && unitCode[CURPOS] > 0) : perGameSettings_dsiMode > 0) {
 					printSmall(false, perGameOpEndXpos, perGameOpYpos, STR_OFF, endAlign, FontPalette::dialog);
 				} else if (perGameSettings_cardReadDMA == -1) {
 					printSmall(false, perGameOpEndXpos, perGameOpYpos, STR_DEFAULT, endAlign, FontPalette::dialog);
@@ -1078,10 +1078,8 @@ void perGameSettings (std::string filename) {
 						}
 						break;
 					case 5:
-						if (unitCode[CURPOS] == 0 || (perGameSettings_dsiMode==-1 ? (DEFAULT_DSI_MODE == TWLSettings::EDSMode) : perGameSettings_dsiMode < 1)) {
-							perGameSettings_cardReadDMA--;
-							if (perGameSettings_cardReadDMA < -1) perGameSettings_cardReadDMA = 1;
-						}
+						perGameSettings_cardReadDMA--;
+						if (perGameSettings_cardReadDMA < -1) perGameSettings_cardReadDMA = 1;
 						break;
 					case 6:
 						perGameSettings_directBoot = !perGameSettings_directBoot;
@@ -1156,10 +1154,8 @@ void perGameSettings (std::string filename) {
 						}
 						break;
 					case 5:
-						if (unitCode[CURPOS] == 0 || (perGameSettings_dsiMode==-1 ? (DEFAULT_DSI_MODE == TWLSettings::EDSMode) : perGameSettings_dsiMode < 1)) {
-							perGameSettings_cardReadDMA++;
-							if (perGameSettings_cardReadDMA > 1) perGameSettings_cardReadDMA = -1;
-						}
+						perGameSettings_cardReadDMA++;
+						if (perGameSettings_cardReadDMA > 1) perGameSettings_cardReadDMA = -1;
 						break;
 					case 6:
 						perGameSettings_directBoot = !perGameSettings_directBoot;

diff --git a/romsel_r4theme/arm9/source/perGameSettings.cpp b/romsel_r4theme/arm9/source/perGameSettings.cpp
@@ -796,7 +796,7 @@ void perGameSettings (std::string filename) {
 				break;
 			case 5:
 				printSmall(false, 32, perGameOpYpos, "Card Read DMA:");
-				if (romUnitCode > 0 && (perGameSettings_dsiMode==-1 ? DEFAULT_DSI_MODE : perGameSettings_dsiMode > 0)) {
+				if (perGameSettings_dsiMode==-1 ? (DEFAULT_DSI_MODE && romUnitCode > 0) : perGameSettings_dsiMode > 0) {
 					printSmallRightAlign(false, 256-24, perGameOpYpos, "Off");
 				} else if (perGameSettings_cardReadDMA == -1) {
 					printSmallRightAlign(false, 256-24, perGameOpYpos, "Default");
@@ -981,10 +981,8 @@ void perGameSettings (std::string filename) {
 						}
 						break;
 					case 5:
-						if (romUnitCode == 0 || (perGameSettings_dsiMode==-1 ? (DEFAULT_DSI_MODE == TWLSettings::EDSMode) : perGameSettings_dsiMode < 1)) {
-							perGameSettings_cardReadDMA--;
-							if (perGameSettings_cardReadDMA < -1) perGameSettings_cardReadDMA = 1;
-						}
+						perGameSettings_cardReadDMA--;
+						if (perGameSettings_cardReadDMA < -1) perGameSettings_cardReadDMA = 1;
 						break;
 					case 6:
 						perGameSettings_directBoot = !perGameSettings_directBoot;
@@ -1058,10 +1056,8 @@ void perGameSettings (std::string filename) {
 						}
 						break;
 					case 5:
-						if (romUnitCode == 0 || (perGameSettings_dsiMode==-1 ? (DEFAULT_DSI_MODE == TWLSettings::EDSMode) : perGameSettings_dsiMode < 1)) {
-							perGameSettings_cardReadDMA++;
-							if (perGameSettings_cardReadDMA > 1) perGameSettings_cardReadDMA = -1;
-						}
+						perGameSettings_cardReadDMA++;
+						if (perGameSettings_cardReadDMA > 1) perGameSettings_cardReadDMA = -1;
 						break;
 					case 6:
 						perGameSettings_directBoot = !perGameSettings_directBoot;