From 7f899ef6d0af0e926d2718022456bf7be174e1fb Mon Sep 17 00:00:00 2001 From: RocketRobz Date: Sun, 21 Jan 2024 20:59:32 -0700 Subject: [PATCH] Revert "Hide `Card Read DMA` for TWL titles" This reverts commit 3be92f086e2dc777ce1d7c551fa1b6fa9591c9ba. --- romsel_dsimenutheme/arm9/source/perGameSettings.cpp | 10 ++++------ romsel_r4theme/arm9/source/perGameSettings.cpp | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/romsel_dsimenutheme/arm9/source/perGameSettings.cpp b/romsel_dsimenutheme/arm9/source/perGameSettings.cpp index 7b56494564..d72a7e5536 100644 --- a/romsel_dsimenutheme/arm9/source/perGameSettings.cpp +++ b/romsel_dsimenutheme/arm9/source/perGameSettings.cpp @@ -598,10 +598,10 @@ void perGameSettings (std::string filename) { perGameOp[perGameOps] = 13; // DSiWare booter } if ((perGameSettings_dsiwareBooter == -1 ? ms().dsiWareBooter : perGameSettings_dsiwareBooter) || sys().arm7SCFGLocked() || ms().consoleModel > 0) { - /* if (dsiFeatures() && ms().secondaryDevice && (!ms().dsiWareToSD || sys().arm7SCFGLocked()) && !bs().b4dsMode && !blacklisted_cardReadDma) { + if (dsiFeatures() && ms().secondaryDevice && (!ms().dsiWareToSD || sys().arm7SCFGLocked()) && !bs().b4dsMode && !blacklisted_cardReadDma) { perGameOps++; perGameOp[perGameOps] = 5; // Card Read DMA - } */ + } perGameOps++; perGameOp[perGameOps] = 7; // Bootstrap if (((dsiFeatures() && sdFound()) || !ms().secondaryDevice) && ms().consoleModel >= 2 && (!isDSiMode() || !sys().arm7SCFGLocked())) { @@ -654,7 +654,7 @@ void perGameSettings (std::string filename) { perGameOp[perGameOps] = 14; // Game Loader } if (bootstrapEnabled) { - if (((dsiFeatures() && !bs().b4dsMode) || !ms().secondaryDevice) && unitCode[CURPOS] < 3 && !blacklisted_cardReadDma) { + if (((dsiFeatures() && !bs().b4dsMode) || !ms().secondaryDevice) && !blacklisted_cardReadDma) { perGameOps++; perGameOp[perGameOps] = 5; // Card Read DMA } @@ -882,9 +882,7 @@ void perGameSettings (std::string filename) { break; case 5: printSmall(false, perGameOpStartXpos, perGameOpYpos, STR_CARD_READ_DMA + ":", startAlign, FontPalette::dialog); - 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) { + if (perGameSettings_cardReadDMA == -1) { printSmall(false, perGameOpEndXpos, perGameOpYpos, STR_DEFAULT, endAlign, FontPalette::dialog); } else if (perGameSettings_cardReadDMA == 1) { printSmall(false, perGameOpEndXpos, perGameOpYpos, STR_ON, endAlign, FontPalette::dialog); diff --git a/romsel_r4theme/arm9/source/perGameSettings.cpp b/romsel_r4theme/arm9/source/perGameSettings.cpp index 762932fca8..318d9d5cb5 100644 --- a/romsel_r4theme/arm9/source/perGameSettings.cpp +++ b/romsel_r4theme/arm9/source/perGameSettings.cpp @@ -559,10 +559,10 @@ void perGameSettings (std::string filename) { perGameOp[perGameOps] = 13; // DSiWare booter } if ((perGameSettings_dsiwareBooter == -1 ? ms().dsiWareBooter : perGameSettings_dsiwareBooter) || sys().arm7SCFGLocked() || ms().consoleModel > 0) { - /* if (dsiFeatures() && ms().secondaryDevice && (!ms().dsiWareToSD || sys().arm7SCFGLocked()) && !bs().b4dsMode && !blacklisted_cardReadDma) { + if (dsiFeatures() && ms().secondaryDevice && (!ms().dsiWareToSD || sys().arm7SCFGLocked()) && !bs().b4dsMode && !blacklisted_cardReadDma) { perGameOps++; perGameOp[perGameOps] = 5; // Card Read DMA - } */ + } perGameOps++; perGameOp[perGameOps] = 7; // Bootstrap if (((dsiFeatures() && sdFound()) || !ms().secondaryDevice) && ms().consoleModel >= 2 && (!isDSiMode() || !sys().arm7SCFGLocked())) { @@ -608,7 +608,7 @@ void perGameSettings (std::string filename) { perGameOp[perGameOps] = 14; // Game Loader } if (bootstrapEnabled) { - if (((dsiFeatures() && !bs().b4dsMode) || !ms().secondaryDevice) && romUnitCode < 3 && !blacklisted_cardReadDma) { + if (((dsiFeatures() && !bs().b4dsMode) || !ms().secondaryDevice) && !blacklisted_cardReadDma) { perGameOps++; perGameOp[perGameOps] = 5; // Card Read DMA } @@ -796,9 +796,7 @@ void perGameSettings (std::string filename) { break; case 5: printSmall(false, 32, perGameOpYpos, "Card Read DMA:"); - if (perGameSettings_dsiMode==-1 ? (DEFAULT_DSI_MODE && romUnitCode > 0) : perGameSettings_dsiMode > 0) { - printSmallRightAlign(false, 256-24, perGameOpYpos, "Off"); - } else if (perGameSettings_cardReadDMA == -1) { + if (perGameSettings_cardReadDMA == -1) { printSmallRightAlign(false, 256-24, perGameOpYpos, "Default"); } else if (perGameSettings_cardReadDMA == 1) { printSmallRightAlign(false, 256-24, perGameOpYpos, "On");