From f9fde5adb87b9f9e10a6228b4b67f9315ad3bea9 Mon Sep 17 00:00:00 2001 From: RocketRobz Date: Fri, 13 Sep 2024 17:18:54 -0600 Subject: [PATCH] Bug fix --- romsel_aktheme/arm9/source/perGameSettings.cpp | 4 ++-- romsel_dsimenutheme/arm9/source/perGameSettings.cpp | 4 ++-- romsel_r4theme/arm9/source/perGameSettings.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/romsel_aktheme/arm9/source/perGameSettings.cpp b/romsel_aktheme/arm9/source/perGameSettings.cpp index fea776e18d..1d6e591263 100644 --- a/romsel_aktheme/arm9/source/perGameSettings.cpp +++ b/romsel_aktheme/arm9/source/perGameSettings.cpp @@ -554,14 +554,14 @@ void perGameSettings (std::string filename) { perGameOps++; perGameOp[perGameOps] = 13; // DSiWare booter } - if ((perGameSettings_dsiwareBooter == -1 ? ms().dsiWareBooter : perGameSettings_dsiwareBooter) || sys().arm7SCFGLocked() || ms().consoleModel > 0) { + if ((perGameSettings_dsiwareBooter == -1 ? ms().dsiWareBooter : perGameSettings_dsiwareBooter) || !dsiFeatures() || (ms().secondaryDevice && bs().b4dsMode) || !ms().dsiWareToSD || sys().arm7SCFGLocked() || ms().consoleModel > 0) { if (ms().secondaryDevice && (!dsiFeatures() || bs().b4dsMode || !ms().dsiWareToSD || sys().arm7SCFGLocked()) && !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())) { + if (((dsiFeatures() && sdFound()) || !ms().secondaryDevice) && ms().consoleModel >= 2 && (!isDSiMode() || !sys().arm7SCFGLocked()) && widescreenFound) { perGameOps++; perGameOp[perGameOps] = 8; // Screen Aspect Ratio } diff --git a/romsel_dsimenutheme/arm9/source/perGameSettings.cpp b/romsel_dsimenutheme/arm9/source/perGameSettings.cpp index 330572ec42..915e43c607 100644 --- a/romsel_dsimenutheme/arm9/source/perGameSettings.cpp +++ b/romsel_dsimenutheme/arm9/source/perGameSettings.cpp @@ -597,14 +597,14 @@ void perGameSettings (std::string filename) { perGameOps++; perGameOp[perGameOps] = 13; // DSiWare booter } - if ((perGameSettings_dsiwareBooter == -1 ? ms().dsiWareBooter : perGameSettings_dsiwareBooter) || sys().arm7SCFGLocked() || ms().consoleModel > 0) { + if ((perGameSettings_dsiwareBooter == -1 ? ms().dsiWareBooter : perGameSettings_dsiwareBooter) || !dsiFeatures() || (ms().secondaryDevice && bs().b4dsMode) || !ms().dsiWareToSD || sys().arm7SCFGLocked() || ms().consoleModel > 0) { if (ms().secondaryDevice && (!dsiFeatures() || bs().b4dsMode || !ms().dsiWareToSD || sys().arm7SCFGLocked()) && !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())) { + if (((dsiFeatures() && sdFound()) || !ms().secondaryDevice) && ms().consoleModel >= 2 && (!isDSiMode() || !sys().arm7SCFGLocked()) && widescreenFound) { perGameOps++; perGameOp[perGameOps] = 8; // Screen Aspect Ratio } diff --git a/romsel_r4theme/arm9/source/perGameSettings.cpp b/romsel_r4theme/arm9/source/perGameSettings.cpp index f40ecf5731..d7310c44ef 100644 --- a/romsel_r4theme/arm9/source/perGameSettings.cpp +++ b/romsel_r4theme/arm9/source/perGameSettings.cpp @@ -557,14 +557,14 @@ void perGameSettings (std::string filename) { perGameOps++; perGameOp[perGameOps] = 13; // DSiWare booter } - if ((perGameSettings_dsiwareBooter == -1 ? ms().dsiWareBooter : perGameSettings_dsiwareBooter) || sys().arm7SCFGLocked() || ms().consoleModel > 0) { + if ((perGameSettings_dsiwareBooter == -1 ? ms().dsiWareBooter : perGameSettings_dsiwareBooter) || !dsiFeatures() || (ms().secondaryDevice && bs().b4dsMode) || !ms().dsiWareToSD || sys().arm7SCFGLocked() || ms().consoleModel > 0) { if (ms().secondaryDevice && (!dsiFeatures() || bs().b4dsMode || !ms().dsiWareToSD || sys().arm7SCFGLocked()) && !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())) { + if (((dsiFeatures() && sdFound()) || !ms().secondaryDevice) && ms().consoleModel >= 2 && (!isDSiMode() || !sys().arm7SCFGLocked()) && widescreenFound) { perGameOps++; perGameOp[perGameOps] = 8; // Screen Aspect Ratio }