Fix not returning to hiyaCFW menu

Author: RocketRobz

retail/arm9/source/conf_sd.cpp

@@ -1602,8 +1602,16 @@ int loadFromSD(configuration* conf, const char *bootstrapPath) {
 			}
 			*(vu32*)0x03700000 = wordBak;
 		}
-		if (access("sd:/hiya.dsi", F_OK) == 0) {
-			conf->valueBits2 |= BIT(6);
+		if (isDSiMode() && conf->consoleModel < 2 && access("sd:/hiya.dsi", F_OK) == 0 && access("sd:/shared1/TWLCFG0.dat", F_OK) == 0 && access("sd:/sys/HWINFO_N.dat", F_OK) == 0 && REG_SCFG_EXT7 != 0) {
+			FILE* twlCfgFile = fopen("sd:/shared1/TWLCFG0.dat", "rb");
+			fseek(twlCfgFile, 0x88, SEEK_SET);
+			fread((void*)0x02000400, 1, 0x128, twlCfgFile);
+			fclose(twlCfgFile);
+
+			u32 srBackendId[2] = {*(u32*)0x02000428, *(u32*)0x0200042C};
+			if (srBackendId[0] != 0x53524C41 || srBackendId[1] != 0x00030004) {
+				conf->valueBits2 |= BIT(6);
+			}
 		}
 
 		if (!conf->isDSiWare || !scfgSdmmcEnabled) {
@@ -1619,7 +1627,7 @@ int loadFromSD(configuration* conf, const char *bootstrapPath) {
 					(u8*)CARDENGINEI_ARM7_BUFFERED_LOCATION
 				);
 				if (rc == 0) {
-					if (REG_SCFG_EXT7 != 0) {
+					if (REG_SCFG_EXT7 != 0 && !(conf->valueBits2 & BIT(6))) {
 						tonccpy((u8*)LOADER_RETURN_SDK5_LOCATION, twlmenuResetGamePath, 256);
 					}
 					tonccpy((u8*)LOADER_RETURN_SDK5_LOCATION+0x100, &srBackendId, 8);
@@ -1645,7 +1653,7 @@ int loadFromSD(configuration* conf, const char *bootstrapPath) {
 					(u8*)CARDENGINEI_ARM7_BUFFERED_LOCATION
 				);
 				if (rc == 0) {
-					if (REG_SCFG_EXT7 != 0) {
+					if (REG_SCFG_EXT7 != 0 && !(conf->valueBits2 & BIT(6))) {
 						tonccpy((u8*)LOADER_RETURN_LOCATION, twlmenuResetGamePath, 256);
 					}
 					tonccpy((u8*)LOADER_RETURN_LOCATION+0x100, &srBackendId, 8);
@@ -1712,7 +1720,7 @@ int loadFromSD(configuration* conf, const char *bootstrapPath) {
 				(u8*)CARDENGINEI_ARM7_BUFFERED_LOCATION
 			);
 			if (rc == 0) {
-				if (REG_SCFG_EXT7 != 0) {
+				if (REG_SCFG_EXT7 != 0 && !(conf->valueBits2 & BIT(6))) {
 					tonccpy((u8*)LOADER_RETURN_DSIWARE_LOCATION, twlmenuResetGamePath, 256);
 				}
 				tonccpy((u8*)LOADER_RETURN_DSIWARE_LOCATION+0x100, &srBackendId, 8);

retail/cardenginei/arm7/source/cardengine.c

@@ -233,8 +233,6 @@ static void unlaunchSetFilename(bool boot) {
 }
 
 static void unlaunchSetHiyaFilename(void) {
-	if (!(valueBits & hiyaCfwFound)) return;
-
 	tonccpy((u8*)0x02000800, unlaunchAutoLoadID, 12);
 	*(u16*)(0x0200080C) = 0x3F0;		// Unlaunch Length for CRC16 (fixed, must be 3F0h)
 	*(u16*)(0x0200080E) = 0;			// Unlaunch CRC16 (empty)
@@ -483,7 +481,11 @@ void reset(const bool downloadedSrl) {
 		*(u32*)0x02000000 = BIT(3);
 		*(u32*)0x02000004 = 0x54455352; // 'RSET'
 		if (consoleModel < 2) {
-			(*(u32*)(ce7+0xB500) == 0 && (valueBits & b_dsiSD)) ? unlaunchSetFilename(false) : unlaunchSetHiyaFilename();
+			if (valueBits & hiyaCfwFound) {
+				unlaunchSetHiyaFilename();
+			} else if (*(u32*)(ce7+0xB500) == 0 && (valueBits & b_dsiSD)) {
+				unlaunchSetFilename(false);
+			}
 		}
 		if (*(u32*)(ce7+0xB500) == 0 && (valueBits & b_dsiSD)) {
 			tonccpy((u32*)0x02000300, sr_data_srloader, 0x20);
@@ -778,12 +780,16 @@ void forceGameReboot(void) {
 	sharedAddr[4] = 0x57534352;
 	IPC_SendSync(0x8);
 	if (consoleModel < 2) {
-		if (valueBits & b_dsiSD) {
+		if (valueBits & hiyaCfwFound) {
+			unlaunchSetHiyaFilename();
+		} else if ((valueBits & b_dsiSD) &&
 			#ifdef TWLSDK
-			(*(u32*)(ce7+0x8500) == 0) ? unlaunchSetFilename(false) : unlaunchSetHiyaFilename();
+			(*(u32*)(ce7+0x8500) == 0)
 			#else
-			(*(u32*)(ce7+0xB500) == 0) ? unlaunchSetFilename(false) : unlaunchSetHiyaFilename();
+			(*(u32*)(ce7+0xB500) == 0)
 			#endif
+		) {
+				unlaunchSetFilename(false);
 		}
 		waitFrames(5);							// Wait for DSi screens to stabilize
 	}
@@ -847,7 +853,9 @@ void returnToLoader(bool reboot) {
 			}
 			waitFrames(1);
 		} else {
-			if (*(u32*)(ce7+0x8500) == 0) {
+			if (valueBits & hiyaCfwFound) {
+				unlaunchSetHiyaFilename();
+			} else if (*(u32*)(ce7+0x8500) == 0) {
 				unlaunchSetFilename(true);
 			} else {
 				// Use different SR backend ID
@@ -958,8 +966,9 @@ void returnToLoader(bool reboot) {
 		}
 		waitFrames(1);
 	} else {
-		if (*(u32*)(ce7+0xB500) == 0 && (valueBits & b_dsiSD))
-		{
+		if (valueBits & hiyaCfwFound) {
+			unlaunchSetHiyaFilename();
+		} else if (*(u32*)(ce7+0xB500) == 0 && (valueBits & b_dsiSD)) {
 			unlaunchSetFilename(true);
 		} else {
 			// Use different SR backend ID

retail/cardenginei/arm7_dsiware/source/cardengine.c

@@ -150,8 +150,6 @@ static void unlaunchSetFilename(bool boot) {
 }
 
 static void unlaunchSetHiyaFilename(void) {
-	if (!(valueBits & hiyaCfwFound)) return;
-
 	tonccpy((u8*)0x02000800, unlaunchAutoLoadID, 12);
 	*(u16*)(0x0200080C) = 0x3F0;		// Unlaunch Length for CRC16 (fixed, must be 3F0h)
 	*(u16*)(0x0200080E) = 0;			// Unlaunch CRC16 (empty)
@@ -426,7 +424,11 @@ void forceGameReboot(void) {
 	sharedAddr[4] = 0x57534352;
 	IPC_SendSync(0x8);
 	if (consoleModel < 2) {
-		(*(u32*)(ce7+0x8100) == 0) ? unlaunchSetFilename(false) : unlaunchSetHiyaFilename();
+		if (valueBits & hiyaCfwFound) {
+			unlaunchSetHiyaFilename();
+		} else if (*(u32*)(ce7+0x8100) == 0) {
+			unlaunchSetFilename(false);
+		}
 		waitFrames(5);							// Wait for DSi screens to stabilize
 	}
 	u32 clearBuffer = 0;
@@ -475,7 +477,9 @@ void returnToLoader(bool reboot) {
 			}
 			//waitFrames(1);
 		} else {
-			if (*(u32*)(ce7+0x8100) == 0) {
+			if (valueBits & hiyaCfwFound) {
+				unlaunchSetHiyaFilename();
+			} else if (*(u32*)(ce7+0x8100) == 0) {
 				unlaunchSetFilename(true);
 			} else {
 				// Use different SR backend ID