Force-enable sleep patch in nds-bootstrap, if R4iDSN card is used on …

…DSi/3DS
DS-Homebrew · Jan 2, 2019 · 716047a · 716047a
1 parent de2d525
commit 716047a
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 1 deletion.
diff --git a/mainmenu/arm9/source/main.cpp b/mainmenu/arm9/source/main.cpp
@@ -2036,6 +2036,11 @@ int main(int argc, char **argv) {
 						bootstrapini.SetInt( "NDS-BOOTSTRAP", "GAME_SOFT_RESET", gameSoftReset);
 						bootstrapini.SetInt( "NDS-BOOTSTRAP", "PATCH_MPU_REGION", mpuregion);
 						bootstrapini.SetInt( "NDS-BOOTSTRAP", "PATCH_MPU_SIZE", mpusize);
+						if (memcmp(io_dldi_data->friendlyName, "R4iDSN", 6) == 0 && !isRegularDS) {
+							bootstrapini.SetInt( "NDS-BOOTSTRAP", "FORCE_SLEEP_PATCH", 1);
+						} else {
+							bootstrapini.SetInt( "NDS-BOOTSTRAP", "FORCE_SLEEP_PATCH", 0);
+						}
 						// Read cheats
 						std::string cheatpath = "/_nds/cheats.xml";
                         int c;

diff --git a/romsel_aktheme/arm9/source/common/bootstrapconfig.cpp b/romsel_aktheme/arm9/source/common/bootstrapconfig.cpp
@@ -1,3 +1,4 @@
+#include "systemdetails.h"
 #include "bootstrapconfig.h"
 #include "dsimenusettings.h"
 #include "filecopy.h"
@@ -12,6 +13,7 @@ BootstrapConfig::BootstrapConfig(const std::string &fileName, const std::string
 	_donorSdk = 0;
 	_mpuSize = 0;
 	_mpuRegion = 0;
+	_forceSleepPatch = (memcmp(io_dldi_data->friendlyName, "R4iDSN", 6) == 0 && !sys().isRegularDS()) ? true : false;
 	_isHomebrew = _gametid.empty() || _sdkVersion == 0;
 	_saveSize = 0x80000;
 	_dsiMode = 0;
@@ -387,7 +389,8 @@ int BootstrapConfig::launch()
 		.option("NDS-BOOTSTRAP", "DONOR_SDK_VER", _donorSdk)
 		.option("NDS-BOOTSTRAP", "GAME_SOFT_RESET", _softReset)
 		.option("NDS-BOOTSTRAP", "PATCH_MPU_REGION", _mpuRegion)
-		.option("NDS-BOOTSTRAP", "PATCH_MPU_SIZE", _mpuSize);
+		.option("NDS-BOOTSTRAP", "PATCH_MPU_SIZE", _mpuSize)
+		.option("NDS-BOOTSTRAP", "FORCE_SLEEP_PATCH", _forceSleepPatch);
 
 	if (_configSavedHandler)
 		_configSavedHandler();

diff --git a/romsel_aktheme/arm9/source/common/bootstrapconfig.h b/romsel_aktheme/arm9/source/common/bootstrapconfig.h
@@ -25,6 +25,7 @@ class BootstrapConfig
 
         BootstrapConfig& donorSdk();
         BootstrapConfig& mpuSettings();
+        BootstrapConfig& forceSleepPatch();
         BootstrapConfig& saveSize();
         BootstrapConfig& softReset();
 
@@ -63,6 +64,7 @@ class BootstrapConfig
         int _donorSdk;
         int _mpuSize;
         int _mpuRegion;
+        int _forceSleepPatch;
         bool _isHomebrew;
         int _saveSize;
         int _dsiMode;

diff --git a/romsel_aktheme/arm9/source/common/systemdetails.h b/romsel_aktheme/arm9/source/common/systemdetails.h
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include "nitrofs.h"
 #include <nds.h>
+#include <nds/arm9/dldi.h>
 
 class SystemDetails
 {

diff --git a/romsel_dsimenutheme/arm9/source/main.cpp b/romsel_dsimenutheme/arm9/source/main.cpp
@@ -1353,6 +1353,11 @@ int main(int argc, char **argv) {
 						bootstrapini.SetInt( "NDS-BOOTSTRAP", "GAME_SOFT_RESET", gameSoftReset);
 						bootstrapini.SetInt( "NDS-BOOTSTRAP", "PATCH_MPU_REGION", mpuregion);
 						bootstrapini.SetInt( "NDS-BOOTSTRAP", "PATCH_MPU_SIZE", mpusize);
+						if (memcmp(io_dldi_data->friendlyName, "R4iDSN", 6) == 0 && !isRegularDS) {
+							bootstrapini.SetInt( "NDS-BOOTSTRAP", "FORCE_SLEEP_PATCH", 1);
+						} else {
+							bootstrapini.SetInt( "NDS-BOOTSTRAP", "FORCE_SLEEP_PATCH", 0);
+						}
 						// Read cheats
 						std::string cheatpath = "/_nds/cheats.xml";
                         int c;

diff --git a/romsel_r4theme/arm9/source/main.cpp b/romsel_r4theme/arm9/source/main.cpp
@@ -1565,6 +1565,11 @@ int main(int argc, char **argv) {
 						bootstrapini.SetInt( "NDS-BOOTSTRAP", "GAME_SOFT_RESET", gameSoftReset);
 						bootstrapini.SetInt( "NDS-BOOTSTRAP", "PATCH_MPU_REGION", mpuregion);
 						bootstrapini.SetInt( "NDS-BOOTSTRAP", "PATCH_MPU_SIZE", mpusize);
+						if (memcmp(io_dldi_data->friendlyName, "R4iDSN", 6) == 0 && !isRegularDS) {
+							bootstrapini.SetInt( "NDS-BOOTSTRAP", "FORCE_SLEEP_PATCH", 1);
+						} else {
+							bootstrapini.SetInt( "NDS-BOOTSTRAP", "FORCE_SLEEP_PATCH", 0);
+						}
 						// Read cheats
 						std::string cheatpath = "/_nds/cheats.xml";
                         int c;