Allow cheats to be used with DSi Sound as donor ROM

Author: RocketRobz

retail/bootloaderi/source/arm7/hook_arm7.c

@@ -468,8 +468,12 @@ int hookNdsRetailArm7(
 	extern u32 cheatEngineOffset;
 	extern char cheatEngineBuffer[0x400];
 	u16 cheatSizeLimit = (ce7NotFound ? 0x1C00 : 0x8000);
-	if (!ce7NotFound && (cheatEngineOffset == CHEAT_ENGINE_DSIWARE_LOCATION)) {
-		cheatSizeLimit -= 0x1800;
+	if (!ce7NotFound) {
+		if (cheatEngineOffset == CHEAT_ENGINE_DSIWARE_LOCATION) {
+			cheatSizeLimit -= 0x1800;
+		} else if (cheatEngineOffset == CHEAT_ENGINE_DSIWARE_LOCATION3) {
+			cheatSizeLimit -= 0x1000;
+		}
 	}
 	char* cheatDataOffset = (char*)cheatEngineOffset+0x3E8;
 	/*if (ce7NotFound) {

retail/bootloaderi/source/arm7/patch_arm7.c

@@ -436,12 +436,12 @@ void patchRamClearI(const tNDSHeader* ndsHeader, const module_params_t* modulePa
 	}
 
 	if (*(u32*)0x02FFE1A0 != 0x00403000) {
-		extern u8 consoleModel;
+		// extern u8 consoleModel;
 		extern u32 ce7Location;
-		extern u32 cheatSizeTotal;
-		const bool cheatsEnabled = (cheatSizeTotal > 4 && cheatSizeTotal <= 0x8000);
+		// extern u32 cheatSizeTotal;
+		// const bool cheatsEnabled = (cheatSizeTotal > 4 && cheatSizeTotal <= 0x8000);
 
-		ramClearOffset[0] = (consoleModel == 0 && _isDSiWare && cheatsEnabled && newArm7binarySize != 0x28E54) ? CHEAT_ENGINE_DSIWARE_LOCATION3 : 0x02FFC000;
+		// ramClearOffset[0] = (consoleModel == 0 && _isDSiWare && cheatsEnabled && newArm7binarySize != 0x28E54) ? CHEAT_ENGINE_DSIWARE_LOCATION3 : 0x02FFC000;
 		ramClearOffset[2] = ce7Location;
 	} else {
 		extern u32 ce9Location;

retail/common/include/locations.h

@@ -77,7 +77,7 @@
 #define CHEAT_ENGINE_TWLSDK_LOCATION               0x02F60000
 #define CHEAT_ENGINE_TWLSDK_LOCATION_3DS           0x0DFF7C00
 #define CHEAT_ENGINE_DSIWARE_LOCATION              0x02FD9400
-#define CHEAT_ENGINE_DSIWARE_LOCATION3             0x02FF3C00
+#define CHEAT_ENGINE_DSIWARE_LOCATION3             0x02F80C00
 #define CARDENGINEI_ARM7_LOCATION                  0x037C0400
 #define CARDENGINEI_ARM7_LOCATION_ALT              0x03008400
 #define CARDENGINEI_ARM7_TWLSDK_LOCATION           0x03037A00