Update romSizeLimit to account for 480KB of (unmirrored) DSi WRAM

DS-Homebrew · Aug 31, 2024 · fd29cfc · fd29cfc
1 parent 363c3c7
commit fd29cfc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/romsel_aktheme/arm9/source/perGameSettings.cpp b/romsel_aktheme/arm9/source/perGameSettings.cpp
@@ -470,8 +470,8 @@ void perGameSettings (std::string filename) {
 		}
 	}
 
-	u32 romSizeLimit = (ms().consoleModel > 0 ? 0x1BC0000 : 0xBC0000);
-	u32 romSizeLimitTwl = (ms().consoleModel > 0 ? 0x1000000 : 0);
+	const u32 romSizeLimit = (ms().consoleModel > 0 ? 0x1BC0000 : 0xBC0000) + ((sys().dsiWramAccess() && !sys().dsiWramMirrored()) ? 0x78000 : 0);
+	const u32 romSizeLimitTwl = (ms().consoleModel > 0 ? 0x1000000 : 0);
 
 	extern bool dsiWareCompatibleB4DS(void);
 	bool showPerGameSettings = (bnrRomType[cursorPosOnScreen] == 0 && !isDSiWare[cursorPosOnScreen]);

diff --git a/romsel_dsimenutheme/arm9/source/perGameSettings.cpp b/romsel_dsimenutheme/arm9/source/perGameSettings.cpp
@@ -513,8 +513,8 @@ void perGameSettings (std::string filename) {
 		}
 	}
 
-	u32 romSizeLimit = (ms().consoleModel > 0 ? 0x1BC0000 : 0xBC0000);
-	u32 romSizeLimitTwl = (ms().consoleModel > 0 ? 0x1000000 : 0);
+	const u32 romSizeLimit = (ms().consoleModel > 0 ? 0x1BC0000 : 0xBC0000) + ((sys().dsiWramAccess() && !sys().dsiWramMirrored()) ? 0x78000 : 0);
+	const u32 romSizeLimitTwl = (ms().consoleModel > 0 ? 0x1000000 : 0);
 
 	extern bool dsiWareCompatibleB4DS(void);
 	bool showPerGameSettings = (bnrRomType[CURPOS] == 0 && !isDSiWare[CURPOS]);

diff --git a/romsel_r4theme/arm9/source/perGameSettings.cpp b/romsel_r4theme/arm9/source/perGameSettings.cpp
@@ -473,8 +473,8 @@ void perGameSettings (std::string filename) {
 		}
 	}
 
-	u32 romSizeLimit = (ms().consoleModel > 0 ? 0x1BC0000 : 0xBC0000);
-	u32 romSizeLimitTwl = (ms().consoleModel > 0 ? 0x1000000 : 0);
+	const u32 romSizeLimit = (ms().consoleModel > 0 ? 0x1BC0000 : 0xBC0000) + ((sys().dsiWramAccess() && !sys().dsiWramMirrored()) ? 0x78000 : 0);
+	const u32 romSizeLimitTwl = (ms().consoleModel > 0 ? 0x1000000 : 0);
 
 	extern bool dsiWareCompatibleB4DS(void);
 	bool showPerGameSettings = (bnrRomType == 0 && !isDSiWare);

diff --git a/universal/include/common/systemdetails.h b/universal/include/common/systemdetails.h
@@ -20,6 +20,7 @@ class SystemDetails
 	};
 
 	bool dsiWramAccess() { return _dsiWramAccess; }
+	bool dsiWramMirrored() { return _dsiWramMirrored; }
 	bool arm7SCFGLocked() { return _arm7SCFGLocked; }
 	bool isRunFromSD() { return _isRunFromSD; }
 	bool isRegularDS() { return _isRegularDS; }
@@ -37,6 +38,7 @@ class SystemDetails
 
 private:
 	bool _dsiWramAccess;
+	bool _dsiWramMirrored;
 	bool _arm7SCFGLocked;
 	bool _isRunFromSD;
 	bool _isRegularDS;

diff --git a/universal/source/common/systemdetails.cpp b/universal/source/common/systemdetails.cpp
@@ -32,6 +32,7 @@ SystemDetails::SystemDetails()
 
 	_isRunFromSD = false;
 	_dsiWramAccess = false;
+	_dsiWramMirrored = false;
 	_arm7SCFGLocked = false;
 	_isRegularDS = true;
 	_isDSPhat = false;
@@ -49,6 +50,7 @@ SystemDetails::SystemDetails()
 		u32 wordBak = *(vu32*)0x03700000;
 		*(vu32*)0x03700000 = 0x414C5253;
 		_dsiWramAccess = *(vu32*)0x03700000 == 0x414C5253;
+		_dsiWramMirrored = (*(vu32*)0x03700000 == 0x414C5253 && *(vu32*)0x03708000 == 0x414C5253);
 		*(vu32*)0x03700000 = wordBak;
 	}