Port save relocation setting to soft-reset process

Author: RocketRobz

retail/bootloaderi/source/arm7/hook_arm7.c

@@ -59,6 +59,7 @@
 #define b_isDlp BIT(21)
 #define b_useColorLut BIT(22)
 #define b_clearRamOnReset BIT(23)
+#define b_saveRelocation BIT(24)
 #define b_i2cBricked BIT(30)
 #define b_scfgLocked BIT(31)
 
@@ -443,6 +444,10 @@ int hookNdsRetailArm7(
 	if (strncmp(romTid, "A5F", 3) == 0 || strncmp(romTid, "C5F", 3) == 0) { // Professor Layton and the Curious Village
 		ce7->valueBits |= b_clearRamOnReset;
 	}
+	extern bool saveRelocationApplied;
+	if (saveRelocationApplied) {
+		ce7->valueBits |= b_saveRelocation;
+	}
 	if (REG_SCFG_EXT == 0) {
 		ce7->valueBits |= b_scfgLocked;
 	}

retail/bootloaderi/source/arm7/patch_arm7.c

@@ -154,6 +154,7 @@ u32 vAddrOfRelocSrc = 0;
 u32 relocDestAtSharedMem = 0;
 u32 newSwiHaltAddr = 0;
 // bool swiHaltPatched = false;
+bool saveRelocationApplied = false;
 
 static void patchSwiHalt(const cardengineArm7* ce7, const tNDSHeader* ndsHeader, const module_params_t* moduleParams) {
 	extern bool pkmnGen5;
@@ -854,7 +855,9 @@ u32 patchCardNdsArm7(
 				}
 			}
 		}
-		if (!saveResult) {
+		if (saveResult) {
+			saveRelocationApplied = true;
+		} else {
 			patchOffsetCache.savePatchType = 0;
 		} /*else if (strncmp(romTid, "AMH", 3) == 0) {
 			aFile* savFile = (aFile*)(dsiSD ? SAV_FILE_LOCATION : SAV_FILE_LOCATION_ALT);

retail/cardenginei/arm7/source/patcher/hook_arm9.c

@@ -9,6 +9,7 @@
 #include "nds_header.h"
 #include "cardengine_header_arm9.h"
 
+#define pingIpc BIT(3)
 #define isSdk5_9 BIT(5)
 #define isSdk5_7 BIT(13)
 #define b_isDlp BIT(15)
@@ -124,7 +125,13 @@ int hookNdsRetailArm9(
 	//nocashMessage("hookNdsRetailArm9");
 
 	extern u32 iUncompressedSize;
+	extern u32 newSwiHaltAddr;
 
+	if (newSwiHaltAddr == 0) {
+		ce9->valueBits |= pingIpc;
+	} else {
+		ce9->valueBits &= ~pingIpc;
+	}
 	if (valueBits & isSdk5_7) {
 		ce9->valueBits |= isSdk5_9;
 	} else {

retail/cardenginei/arm7/source/patcher/patch_arm7.c

@@ -17,6 +17,7 @@
 #define dsiMode BIT(4)
 #define hasVramWifiBinary BIT(14)
 #define sleepMode BIT(17)
+#define saveRelocation BIT(24)
 
 extern u32 valueBits;
 extern u16 scfgRomBak;
@@ -41,7 +42,7 @@ const u16* generateA7InstrThumb(int arg1, int arg2) {
 	u32 offset = (u32)(arg2 - arg1 - 4);
 	//dbg_printf("generateA7InstrThumb offset\n");
 	//dbg_hexa(offset);
-	
+
 	// 1st instruction contains the upper 11 bit of the offset
 	instrs[0] = ((offset >> 12) & 0x7FF) | 0xF000;
 
@@ -70,6 +71,8 @@ static void patchSwiHalt(const cardengineArm7* ce7, const tNDSHeader* ndsHeader,
 	if (swiHaltOffset) {
 		// Patch
 		if (a7IsThumb) {
+			if (newSwiHaltAddr == 0) return;
+
 			tonccpy((u16*)newSwiHaltAddr, ce7->patches->newSwiHaltThumb, 0x18);
 			u32 srcAddr = (u32)swiHaltOffset - vAddrOfRelocSrc + 0x37F8000;
 			u32 dstAddr = (u32)newSwiHaltAddr - vAddrOfRelocSrc + 0x37F8000;
@@ -82,6 +85,7 @@ static void patchSwiHalt(const cardengineArm7* ce7, const tNDSHeader* ndsHeader,
 		} else {
 			u32* swiHaltPatch = ce7->patches->j_newSwiHalt;
 			tonccpy(swiHaltOffset, swiHaltPatch, 0xC);
+			newSwiHaltAddr = 1; // Let ce9 know not to ping arm7 IPC
 		}
 		// swiHaltPatched = true;
 		// dbg_printf("swiHalt hooked\n");
@@ -381,19 +385,21 @@ u32 patchCardNdsArm7(
 		patchMirrorCheck(ndsHeader, moduleParams);
 		patchVramWifiBinaryLoad(ndsHeader, moduleParams);
 		u32 saveResult = 0;
-		
-		if (ndsHeader->arm7binarySize==0x2352C || ndsHeader->arm7binarySize==0x235DC || ndsHeader->arm7binarySize==0x23CAC || ndsHeader->arm7binarySize==0x245C0 || ndsHeader->arm7binarySize==0x245C4) {
-			saveResult = savePatchInvertedThumb(ce7, ndsHeader, moduleParams);    
-		} else if (moduleParams->sdk_version > 0x5000000) {
-			// SDK 5
-			saveResult = savePatchV5(ce7, ndsHeader);
-		} else {
-			saveResult = savePatchV1(ce7, ndsHeader, moduleParams);
-			if (!saveResult) {
-				saveResult = savePatchV2(ce7, ndsHeader, moduleParams);
-			}
-			if (!saveResult) {
-				saveResult = savePatchUniversal(ce7, ndsHeader, moduleParams);
+
+		if (valueBits & saveRelocation) {
+			if (ndsHeader->arm7binarySize==0x2352C || ndsHeader->arm7binarySize==0x235DC || ndsHeader->arm7binarySize==0x23CAC || ndsHeader->arm7binarySize==0x245C0 || ndsHeader->arm7binarySize==0x245C4) {
+				saveResult = savePatchInvertedThumb(ce7, ndsHeader, moduleParams);
+			} else if (moduleParams->sdk_version > 0x5000000) {
+				// SDK 5
+				saveResult = savePatchV5(ce7, ndsHeader);
+			} else {
+				saveResult = savePatchV1(ce7, ndsHeader, moduleParams);
+				if (!saveResult) {
+					saveResult = savePatchV2(ce7, ndsHeader, moduleParams);
+				}
+				if (!saveResult) {
+					saveResult = savePatchUniversal(ce7, ndsHeader, moduleParams);
+				}
 			}
 		}
 	}

retail/common/include/cardengine_header_arm7.h

@@ -105,6 +105,7 @@ typedef struct cardengineArm7 {
 		21: isDlp
 		22: useColorLut
 		23: clearRamOnReset
+		24: saveRelocation
 		30: i2cBricked
 		31: scfgLocked
 	*/