Do not patch MPU region 2 for TWL games running in DS mode

DS-Homebrew · Dec 25, 2024 · 2ab59cc · 2ab59cc
1 parent 725856c
commit 2ab59cc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/retail/bootloader/source/arm7/patch_arm9.c b/retail/bootloader/source/arm7/patch_arm9.c
@@ -942,7 +942,7 @@ static void patchMpu(const tNDSHeader* ndsHeader, const module_params_t* moduleP
 }
 
 static void patchMpu2(const tNDSHeader* ndsHeader, const module_params_t* moduleParams, const bool usesCloneboot) {
-	if ((moduleParams->sdk_version < 0x2008000) && !extendedMemory) {
+	if (((moduleParams->sdk_version < 0x2008000) && !extendedMemory) || ndsHeader->unitCode > 0) {
 		return;
 	}
 

diff --git a/retail/bootloaderi/source/arm7/patch_arm9.c b/retail/bootloaderi/source/arm7/patch_arm9.c
@@ -995,9 +995,9 @@ static void patchMpu(const tNDSHeader* ndsHeader, const module_params_t* moduleP
 }
 
 void patchMpu2(const tNDSHeader* ndsHeader, const module_params_t* moduleParams, const bool usesCloneboot) {
-	/* if (moduleParams->sdk_version > 0x5000000 && (ndsHeader->unitCode == 0 || !dsiModeConfirmed)) {
+	if (ndsHeader->unitCode > 0 && !dsiModeConfirmed) {
 		return;
-	} */
+	}
 
 	unpatchedFunctions* unpatchedFuncs = (unpatchedFunctions*)UNPATCHED_FUNCTION_LOCATION;
 

diff --git a/retail/cardenginei/arm7/source/patcher/patch_arm9.c b/retail/cardenginei/arm7/source/patcher/patch_arm9.c
@@ -581,6 +581,10 @@ static void patchMpu(const tNDSHeader* ndsHeader, const module_params_t* moduleP
 }
 
 static void patchMpu2(const tNDSHeader* ndsHeader, const module_params_t* moduleParams) {
+	if (ndsHeader->unitCode > 0) {
+		return;
+	}
+
 	unpatchedFunctions* unpatchedFuncs = (unpatchedFunctions*)UNPATCHED_FUNCTION_LOCATION;
 
 	// Find the mpu init
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     static void patchMpu2(const tNDSHeader* ndsHeader, const module_params_t* moduleParams, const bool usesCloneboot) {
-    	if ((moduleParams->sdk_version < 0x2008000) && !extendedMemory) {
+    	if (((moduleParams->sdk_version < 0x2008000) && !extendedMemory) || ndsHeader->unitCode > 0) {
     		return;
     	}
@@ Expand Down @@