B4DS: Add support for USA and Europe versions of *Treasure Hunter X*/*Fall in the Dark*

Author: RocketRobz

retail/arm9/include/dsiwaresSetForBootloader.h

@@ -200,7 +200,6 @@ static const char dsiWareForBootloader1[][4] = {
 	"K5K", // Escape Trick: Convenience Store (bootloaderi-exclusive)
 	"KER", // G.G Series: Exciting River
 	"KYB", // Face Pilot: Fly With Your Nintendo DSi Camera! (bootloaderi-exclusive)
-	"K4E", // Fall in the Dark
 	"Z2E", // Famicom Wars DS: Ushinawareta Hikari
 	"KFK", // Farm Frenzy
 	"KU7", // Fashion Tycoon
@@ -542,6 +541,7 @@ static const char dsiWareForBootloader3[][4] = {
 	"KWV", // The Tower DS: Hotel
 	"KW4", // The Tower DS: Shopping Santa
 	"KDZ", // Trajectile
+	"K4E", // Treasure Hunter X
 	"KB7", // Trollboarder
 	"K72", // True Swing Golf Express
 	"KTI", // Turn: The Lost Artifact

retail/bootloader/source/arm7/dsi2ds_patches.c

@@ -11588,20 +11588,6 @@ void patchDSiModeToDSMode(cardengineArm9* ce9, const tNDSHeader* ndsHeader) {
 		} */
 	}
 
-	// Fall in the Dark (Japan)
-	// A bit hard/confusing to add save support
-	else if (strcmp(romTid, "K4EJ") == 0) {
-		useSharedFont = twlFontFound;
-		*(u32*)0x02010284 = 0xE1A00000; // nop
-		*(u32*)0x02013894 = 0xE1A00000; // nop
-		patchInitDSiWare(0x02019000, heapEnd);
-		patchUserSettingsReadDSiWare(0x0201A5C0);
-		*(u32*)0x02022CA0 = 0xE12FFF1E; // bx lr
-		if (!twlFontFound) {
-			*(u32*)0x0203EE0C = 0xE1A00000; // nop (Skip Manual screen)
-		}
-	}
-
 	// Famicom Wars DS: Ushinawareta Hikari (Japan)
 	// DSi save function patching not needed
 	else if (strcmp(romTid, "Z2EJ") == 0) {
@@ -26693,6 +26679,48 @@ void patchDSiModeToDSMode(cardengineArm9* ce9, const tNDSHeader* ndsHeader) {
 		*(u32*)0x02103DF8 = 0x1E0000; // Shrink sound heap from 0x300000
 	}
 
+	// Treasure Hunter X (USA)
+	// A bit hard/confusing to add save support
+	else if (strcmp(romTid, "K4EE") == 0) {
+		useSharedFont = twlFontFound;
+		*(u32*)0x02010290 = 0xE1A00000; // nop
+		*(u32*)0x020138AC = 0xE1A00000; // nop
+		patchInitDSiWare(0x02019034, heapEnd);
+		patchUserSettingsReadDSiWare(0x0201A604);
+		*(u32*)0x02022CBC = 0xE12FFF1E; // bx lr
+		if (!twlFontFound) {
+			*(u32*)0x0203EE90 = 0xE1A00000; // nop (Skip Manual screen)
+		}
+	}
+
+	// Treasure Hunter X (Europe)
+	// A bit hard/confusing to add save support
+	else if (strcmp(romTid, "K4EP") == 0) {
+		useSharedFont = twlFontFound;
+		*(u32*)0x020102CC = 0xE1A00000; // nop
+		*(u32*)0x02013970 = 0xE1A00000; // nop
+		patchInitDSiWare(0x02019114, heapEnd);
+		patchUserSettingsReadDSiWare(0x0201A6E4);
+		*(u32*)0x02022DB0 = 0xE12FFF1E; // bx lr
+		if (!twlFontFound) {
+			*(u32*)0x0203EF6C = 0xE1A00000; // nop (Skip Manual screen)
+		}
+	}
+
+	// Fall in the Dark (Japan)
+	// A bit hard/confusing to add save support
+	else if (strcmp(romTid, "K4EJ") == 0) {
+		useSharedFont = twlFontFound;
+		*(u32*)0x02010284 = 0xE1A00000; // nop
+		*(u32*)0x02013894 = 0xE1A00000; // nop
+		patchInitDSiWare(0x02019000, heapEnd);
+		patchUserSettingsReadDSiWare(0x0201A5C0);
+		*(u32*)0x02022CA0 = 0xE12FFF1E; // bx lr
+		if (!twlFontFound) {
+			*(u32*)0x0203EE0C = 0xE1A00000; // nop (Skip Manual screen)
+		}
+	}
+
 	// Trollboarder (USA)
 	// Trollboarder (Europe)
 	else if (strcmp(romTid, "KB7E") == 0 || strcmp(romTid, "KB7P") == 0) {

retail/bootloaderi/source/arm7/patch_common.c

@@ -6318,12 +6318,6 @@ void dsiWarePatch(cardengineArm9* ce9, const tNDSHeader* ndsHeader) {
 		// *(u32*)0x0203C9E4 = 0xE12FFF1E; // bx lr
 	}
 
-	// Fall in the Dark (Japan)
-	// A bit hard/confusing to add save support
-	else if (strcmp(romTid, "K4EJ") == 0 && !twlFontFound) {
-		*(u32*)0x0203EE0C = 0xE1A00000; // nop (Skip Manual screen)
-	}
-
 	// Farm Frenzy (USA)
 	else if (strcmp(romTid, "KFKE") == 0 && saveOnFlashcardNtr) {
 		tonccpy((u32*)0x0200F4CC, dsiSaveGetResultCode, 0xC);
@@ -15223,6 +15217,24 @@ void dsiWarePatch(cardengineArm9* ce9, const tNDSHeader* ndsHeader) {
 		toncset16((u16*)0x020B8F88, nopT, 0x4A/sizeof(u16)); // Do not use DSi WRAM
 	}
 
+	// Treasure Hunter X (USA)
+	// A bit hard/confusing to add save support
+	else if (strcmp(romTid, "K4EE") == 0 && !twlFontFound) {
+		*(u32*)0x0203EE90 = 0xE1A00000; // nop (Skip Manual screen)
+	}
+
+	// Treasure Hunter X (Europe)
+	// A bit hard/confusing to add save support
+	else if (strcmp(romTid, "K4EP") == 0 && !twlFontFound) {
+		*(u32*)0x0203EF6C = 0xE1A00000; // nop (Skip Manual screen)
+	}
+
+	// Fall in the Dark (Japan)
+	// A bit hard/confusing to add save support
+	else if (strcmp(romTid, "K4EJ") == 0 && !twlFontFound) {
+		*(u32*)0x0203EE0C = 0xE1A00000; // nop (Skip Manual screen)
+	}
+
 	// Trollboarder (USA)
 	// Trollboarder (Europe)
 	else if ((strcmp(romTid, "KB7E") == 0 || strcmp(romTid, "KB7P") == 0) && saveOnFlashcardNtr) {