B4DS: Add support for *Kuniya Burete Sanga Ari: Hills and Rivers Remain*

Author: RocketRobz

retail/arm9/include/dsiwaresSetForBootloader.h

@@ -294,6 +294,7 @@ static const char dsiWareForBootloader1[][4] = {
 	"KEK", // Koukou Eitango: Kiho 400 Go Master
 	"KVF", // Kuizu Ongaku Nojika (bootloaderi-exclusive)
 	"KT9", // Kung Fu Dragon
+	"KY3", // Kuniya Burete Sanga Ari: Hills and Rivers Remain
 	"K47", // Kyou Hanan no hi Hyakka: Hyakkajiten Maipedea Yori (bootloaderi-exclusive)
 	"K5M", // G.G Series: The Last Knight
 	"KQ9", // The Legend of Zelda: Four Swords: Anniversary Edition

retail/arm9/source/conf_sd.cpp

@@ -2110,6 +2110,7 @@ int loadFromSD(configuration* conf, const char *bootstrapPath) {
 					||	strncmp(romTid, "KEG", 3) == 0 // Electroplankton: Lumiloop
 					||	strncmp(romTid, "KEA", 3) == 0 // Electroplankton: Trapy
 					||	strncmp(romTid, "KFO", 3) == 0 // Frenzic
+					||	strncmp(romTid, "KY3", 3) == 0 // Kuniya Burete Sanga Ari: Hills and Rivers Remain
 					||	strncmp(romTid, "K5M", 3) == 0 // G.G Series: The Last Knight
 					||	strncmp(romTid, "KPT", 3) == 0 // Link 'n' Launch
 					||	strncmp(romTid, "KNP", 3) == 0 // Need for Speed: Nitro-X

retail/bootloader/source/arm7/dsi2ds_patches.c

@@ -74,11 +74,11 @@ void patchDSiModeToDSMode(cardengineArm9* ce9, const tNDSHeader* ndsHeader) {
 	const u32 heapEnd = extendedMemory ? (((u32)ndsHeader->arm9destination >= 0x02004000) ? 0x027D8000 : 0x02700000) : heapEndRetail;
 	const u32 heapEnd8MBHack = extendedMemory ? heapEnd : heapEndRetail+0x400000; // extendedMemory ? #0x27B0000 : #0x27E0000 (mirrors to 0x23E0000 on retail DS units)
 	const u32 heapEndExceed = extendedMemory ? heapEnd+0x800000 : heapEndRetail+0xC00000; // extendedMemory ? #0x2FB0000 (mirrors to 0x27B0000 on debug DS units) : #0x2FE0000 (mirrors to 0x23E0000 on retail DS units)
-	const u32 heapEndMaxForRetail = maxHeapOpen ? ((_io_dldi_size == 0x0F) ? 0x023F6000 : (_io_dldi_size == 0x0E) ? 0x023FA000 : 0x023FC000) : heapEnd;
-	const u32 heapEndMaxForRetail2 = maxHeapOpen ? ((_io_dldi_size == 0x0F) ? heapEndMaxForRetail : 0x023FF000) : heapEnd;
-	const u32 heapEndMaxForRetail32 = maxHeapOpen ? 0x023FF000 : heapEnd;
-	const u32 heapEndMaxForRetailMus = maxHeapOpen ? heapEndMaxForRetail-0x4000 : heapEnd;
-	// const u32 heapEndMaxForDebug = maxHeapOpen ? ((_io_dldi_size == 0x0F) ? 0x027F6000 : (_io_dldi_size == 0x0E) ? 0x027FA000 : 0x027FC000) : heapEnd;
+	const u32 heapEndMaxForRetail = (maxHeapOpen && !extendedMemory) ? ((_io_dldi_size == 0x0F) ? 0x023F6000 : (_io_dldi_size == 0x0E) ? 0x023FA000 : 0x023FC000) : heapEnd;
+	const u32 heapEndMaxForRetail2 = (maxHeapOpen && !extendedMemory) ? ((_io_dldi_size == 0x0F) ? heapEndMaxForRetail : 0x023FF000) : heapEnd;
+	const u32 heapEndMaxForRetail32 = (maxHeapOpen && !extendedMemory) ? 0x023FF000 : heapEnd;
+	const u32 heapEndMaxForRetailMus = (maxHeapOpen && !extendedMemory) ? heapEndMaxForRetail-0x4000 : heapEnd;
+	// const u32 heapEndMaxForDebug = (maxHeapOpen && extendedMemory) ? ((_io_dldi_size == 0x0F) ? 0x027F6000 : (_io_dldi_size == 0x0E) ? 0x027FA000 : 0x027FC000) : heapEnd;
 	const u32 heapEnd_512KBFreeForDebug = extendedMemory ? 0x02740000 : heapEnd;
 	// const u32 heapEnd_512KBFreeForDebugAlt = extendedMemory ? 0x02700000 : heapEnd;
 	const u32 heapEndMaxForRetail_512KBFreeForDebugAlt = extendedMemory ? 0x02700000 : heapEndMaxForRetail;
@@ -15055,6 +15055,33 @@ void patchDSiModeToDSMode(cardengineArm9* ce9, const tNDSHeader* ndsHeader) {
 		setBL(0x02024980, (u32)dsiSaveCreate);
 	}
 
+	// Kuniya Burete Sanga Ari: Hills and Rivers Remain (Japan)
+	// Saving not supported due to using more than one file in filesystem
+	// Requires either 8MB of RAM or Memory Expansion Pak
+	else if (strcmp(romTid, "KY3J") == 0 && twlFontFound && debugOrMep) {
+		useSharedFont = true;
+		if (!extendedMemory) {
+			const u32 newCodeAddr = 0x02019224;
+			codeCopy((u32*)newCodeAddr, (u32*)0x0201F874, 0x28);
+			setBL(0x0202A74C, newCodeAddr);
+			patchTwlFontLoad(false, newCodeAddr+0x10, 0x02018590);
+		}
+
+		*(u32*)0x02004AA0 = 0xE1A00000; // nop
+		*(u32*)0x0200E4E8 = 0xE1A00000; // nop
+		*(u32*)0x02011A24 = 0xE1A00000; // nop
+		*(u32*)0x02016AC8 = 0xE3A00001; // mov r0, #1
+		patchInitDSiWare(0x02016AE0, heapEndMaxForRetail2);
+		patchUserSettingsReadDSiWare(0x02017FD8);
+		*(u32*)0x02018000 = wirelessReturnCodeArm;
+		*(u32*)0x02018004 = 0xE12FFF1E; // bx lr
+		*(u32*)0x0201800C = 0xE3A00000; // mov r0, #0
+		*(u32*)0x02018010 = 0xE12FFF1E; // bx lr
+		if (!extendedMemory) {
+			*(u32*)0x0202B328 = 0xE3A01901; // mov r1, #0x4000 (Shrink SDAT heap from 0x80000)
+		}
+	}
+
 	// Kyara Pasha!: Hello Kitty (Japan)
 	// Shows Japanese error screen (Possibly related to camera)
 	/*else if (strcmp(romTid, "KYKJ") == 0) {

retail/bootloader/source/arm7/main.arm7.c

@@ -1457,6 +1457,7 @@ int arm7_main(void) {
 					||	strncmp(romTid, "KEA", 3) == 0 // Electroplankton: Trapy
 					||	strncmp(romTid, "KFO", 3) == 0 // Frenzic
 					// ||	strncmp(romTid, "KHB", 3) == 0 // Happy Birthday Mart
+					||	strncmp(romTid, "KY3", 3) == 0 // Kuniya Burete Sanga Ari: Hills and Rivers Remain
 					||	strncmp(romTid, "K5M", 3) == 0 // G.G Series: The Last Knight
 					||	strncmp(romTid, "KPT", 3) == 0 // Link 'n' Launch
 					||	strncmp(romTid, "CLJ", 3) == 0 // Mario & Luigi: Bowser's Inside Story
@@ -1591,7 +1592,8 @@ int arm7_main(void) {
 	}
 	u32 ce9DldiItcm = 0;
 	if (
-	   strncmp(romTid, "K6T", 3) == 0 // Orion's Odyssey
+	   strncmp(romTid, "KY3", 3) == 0 // Kuniya Burete Sanga Ari: Hills and Rivers Remain
+	|| strncmp(romTid, "K6T", 3) == 0 // Orion's Odyssey
 	|| strncmp(romTid, "KPS", 3) == 0 // Phantasy Star 0 Mini
 	|| strncmp(romTid, "KHR", 3) == 0 // Picture Perfect: Pocket Stylist
 	|| strncmp(romTid, "KZU", 3) == 0 // Tales to Enjoy!: Little Red Riding Hood