From b1dc90fd68e47342cc0453102f24eeead81016e3 Mon Sep 17 00:00:00 2001 From: RocketRobz Date: Wed, 29 Jan 2025 20:13:39 -0700 Subject: [PATCH] Fix for nds-bootstrap commit eb55b861 --- romsel_aktheme/arm9/source/perGameSettings.cpp | 3 ++- romsel_dsimenutheme/arm9/source/perGameSettings.cpp | 3 ++- romsel_r4theme/arm9/source/perGameSettings.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/romsel_aktheme/arm9/source/perGameSettings.cpp b/romsel_aktheme/arm9/source/perGameSettings.cpp index fe36450e1a..5b2e55c57e 100644 --- a/romsel_aktheme/arm9/source/perGameSettings.cpp +++ b/romsel_aktheme/arm9/source/perGameSettings.cpp @@ -474,7 +474,8 @@ void perGameSettings (std::string filename) { } } - u32 romSizeLimit = (ms().consoleModel > 0 ? 0x1BE0000 : 0xBE0000) + ((sys().dsiWramAccess() && !sys().dsiWramMirrored()) ? ((!sys().arm7SCFGLocked() || *(u32*)0x02FFE1A0 != 0x00403000) ? 0x88000 : 0x80000) : 0); + #define sharedWramEnabled (!sys().arm7SCFGLocked() || *(u32*)0x02FFE1A0 != 0x00403000) + u32 romSizeLimit = (ms().consoleModel > 0 ? 0x1BE0000 : 0xBE0000) + ((sys().dsiWramAccess() && !sys().dsiWramMirrored()) ? (sharedWramEnabled ? 0x88000 : 0x80000) : (sharedWramEnabled ? 0x8000 : 0)); romSizeLimit -= 0x400000; // Account for DSi mode setting const u32 romSizeLimitTwl = (ms().consoleModel > 0 ? 0x1000000 : 0); diff --git a/romsel_dsimenutheme/arm9/source/perGameSettings.cpp b/romsel_dsimenutheme/arm9/source/perGameSettings.cpp index 26b403089e..9d77e270dc 100644 --- a/romsel_dsimenutheme/arm9/source/perGameSettings.cpp +++ b/romsel_dsimenutheme/arm9/source/perGameSettings.cpp @@ -519,7 +519,8 @@ void perGameSettings (std::string filename, bool* dsiBinariesFound, bool* dsiBin } } - u32 romSizeLimit = (ms().consoleModel > 0 ? 0x1BE0000 : 0xBE0000) + ((sys().dsiWramAccess() && !sys().dsiWramMirrored()) ? ((!sys().arm7SCFGLocked() || *(u32*)0x02FFE1A0 != 0x00403000) ? 0x88000 : 0x80000) : 0); + #define sharedWramEnabled (!sys().arm7SCFGLocked() || *(u32*)0x02FFE1A0 != 0x00403000) + u32 romSizeLimit = (ms().consoleModel > 0 ? 0x1BE0000 : 0xBE0000) + ((sys().dsiWramAccess() && !sys().dsiWramMirrored()) ? (sharedWramEnabled ? 0x88000 : 0x80000) : (sharedWramEnabled ? 0x8000 : 0)); romSizeLimit -= 0x400000; // Account for DSi mode setting const u32 romSizeLimitTwl = (ms().consoleModel > 0 ? 0x1000000 : 0); diff --git a/romsel_r4theme/arm9/source/perGameSettings.cpp b/romsel_r4theme/arm9/source/perGameSettings.cpp index 69da19b230..11dc2b41da 100644 --- a/romsel_r4theme/arm9/source/perGameSettings.cpp +++ b/romsel_r4theme/arm9/source/perGameSettings.cpp @@ -477,7 +477,8 @@ void perGameSettings (std::string filename) { } } - u32 romSizeLimit = (ms().consoleModel > 0 ? 0x1BE0000 : 0xBE0000) + ((sys().dsiWramAccess() && !sys().dsiWramMirrored()) ? ((!sys().arm7SCFGLocked() || *(u32*)0x02FFE1A0 != 0x00403000) ? 0x88000 : 0x80000) : 0); + #define sharedWramEnabled (!sys().arm7SCFGLocked() || *(u32*)0x02FFE1A0 != 0x00403000) + u32 romSizeLimit = (ms().consoleModel > 0 ? 0x1BE0000 : 0xBE0000) + ((sys().dsiWramAccess() && !sys().dsiWramMirrored()) ? (sharedWramEnabled ? 0x88000 : 0x80000) : (sharedWramEnabled ? 0x8000 : 0)); romSizeLimit -= 0x400000; // Account for DSi mode setting const u32 romSizeLimitTwl = (ms().consoleModel > 0 ? 0x1000000 : 0);