B4DS: Load DLDI to ITCM for 7 more DSiWare titles

Works with DLDI drivers up to 32KB

Author: RocketRobz

retail/bootloader/source/arm7/dsi2ds_patches.c

@@ -75,6 +75,7 @@ void patchDSiModeToDSMode(cardengineArm9* ce9, const tNDSHeader* ndsHeader) {
 	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 heapEnd_512KBFreeForDebug = extendedMemory ? 0x02740000 : heapEnd;
 	// const u32 heapEnd_512KBFreeForDebugAlt = extendedMemory ? 0x02700000 : heapEnd;
@@ -18672,7 +18673,7 @@ void patchDSiModeToDSMode(cardengineArm9* ce9, const tNDSHeader* ndsHeader) {
 	if (strcmp(romTid, "K6TE") == 0) {
 		*(u32*)0x02011FAC = 0xE1A00000; // nop
 		*(u32*)0x02015790 = 0xE1A00000; // nop
-		patchInitDSiWare(0x0201ABF0, heapEndMaxForRetail);
+		patchInitDSiWare(0x0201ABF0, heapEndMaxForRetail32);
 		*(u32*)0x0201AF7C = *(u32*)0x02004FE8;
 		patchUserSettingsReadDSiWare(0x0201C1F4);
 		*(u32*)0x02020B68 = 0xE1A00000; // nop
@@ -19518,7 +19519,7 @@ void patchDSiModeToDSMode(cardengineArm9* ce9, const tNDSHeader* ndsHeader) {
 		*(u32*)0x02007FAC = 0xE8BD8078; // LDMFD SP!, {R3-R6,PC}
 		// tonccpy((u32*)0x02009C88, dsiSaveGetResultCode, 0xC);
 		*(u32*)0x0200CC88 = 0xE1A00000; // nop
-		patchInitDSiWare(0x0202D950, heapEndMaxForRetail);
+		patchInitDSiWare(0x0202D950, heapEndMaxForRetail32);
 		*(u32*)0x0202DCCC -= 0x64000;
 		patchUserSettingsReadDSiWare(0x0202EE48);
 		*(u32*)0x0202EE70 = wirelessReturnCodeArm;
@@ -19818,7 +19819,7 @@ void patchDSiModeToDSMode(cardengineArm9* ce9, const tNDSHeader* ndsHeader) {
 		*(u32*)0x02013144 = 0xE1A00000; // nop
 		*(u32*)0x02013158 = 0xE1A00000; // nop
 		*(u32*)0x02016F98 = 0xE1A00000; // nop
-		patchInitDSiWare(0x0201F054, heapEndMaxForRetail);
+		patchInitDSiWare(0x0201F054, heapEndMaxForRetail32);
 		*(u32*)0x0201F3E0 = *(u32*)0x02004FE8;
 		patchUserSettingsReadDSiWare(0x02020614);
 		*(u32*)0x02025884 = 0xE1A00000; // nop
@@ -19866,7 +19867,7 @@ void patchDSiModeToDSMode(cardengineArm9* ce9, const tNDSHeader* ndsHeader) {
 		*(u32*)0x020132AC = 0xE1A00000; // nop
 		*(u32*)0x020132C0 = 0xE1A00000; // nop
 		*(u32*)0x0201718C = 0xE1A00000; // nop
-		patchInitDSiWare(0x0201F570, heapEndMaxForRetail);
+		patchInitDSiWare(0x0201F570, heapEndMaxForRetail32);
 		*(u32*)0x0201F8E0 = *(u32*)0x02004FD0;
 		patchUserSettingsReadDSiWare(0x02020B34);
 		*(u32*)0x02026080 = 0xE1A00000; // nop
@@ -24834,7 +24835,7 @@ void patchDSiModeToDSMode(cardengineArm9* ce9, const tNDSHeader* ndsHeader) {
 	else if (strcmp(romTid, "KZUE") == 0 || strcmp(romTid, "KZVE") == 0 || strcmp(romTid, "KZ7E") == 0 || strcmp(romTid, "KZ8E") == 0) {
 		*(u32*)0x02006F60 = 0xE1A00000; // nop
 		*(u32*)0x0200A80C = 0xE1A00000; // nop
-		patchInitDSiWare(0x0200FE40, heapEndMaxForRetail);
+		patchInitDSiWare(0x0200FE40, heapEndMaxForRetail32);
 		*(u32*)0x020101CC = *(u32*)0x02004FE8;
 		patchUserSettingsReadDSiWare(0x02011470);
 		setBL(0x0204D500, (u32)dsiSaveOpen);

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

@@ -1587,8 +1587,23 @@ int arm7_main(void) {
 		ce9DldiOffset = (extendedMemory ? 0x027D8000 : maxHeapOpen ? 0x023F6000 : (laterSdk ? 0x023D8000 : 0x023F7000));
 	}
 	u32 ce9DldiItcm = 0;
-	if (maxHeapOpen && (strncmp(romTid, "KAT", 3) == 0 || strncmp(romTid, "KNP", 3) == 0) && _io_dldi_size < 0x0F) {
-		ce9DldiItcm = 0x01FFC000;
+	if (maxHeapOpen) {
+		if (
+		   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
+		|| strncmp(romTid, "KZV", 3) == 0 // Tales to Enjoy!: Puss in Boots
+		|| strncmp(romTid, "KZ7", 3) == 0 // Tales to Enjoy!: The Three Little Pigs
+		|| strncmp(romTid, "KZ8", 3) == 0 // Tales to Enjoy!: The Ugly Duckling
+		) {
+			ce9DldiItcm = 0x01FF8400; // Set <= 32KB DLDI location at ITCM
+		} else if ( _io_dldi_size < 0x0F && (
+		   strncmp(romTid, "KAT", 3) == 0 // AiRace: Tunnel
+		|| strncmp(romTid, "KNP", 3) == 0 // Need for Speed: Nitro-X
+		)) {
+			ce9DldiItcm = 0x01FFC000; // Set <= 16KB DLDI location at ITCM
+		}
 	}
 	if (!dldiPatchBinary((data_t*)ce9Location, 0x3800, (data_t*)ce9DldiOffset, (data_t*)ce9DldiItcm)) {
 		dbg_printf("ce9 DLDI patch failed\n");

retail/common/include/locations.h

@@ -43,7 +43,7 @@
 #define CHEAT_ENGINE_LOCATION_B4DS_ALT       0x027FC000
 #define CHEAT_ENGINE_LOCATION_B4DS_ALT2      0x027FD000
 #define CARDENGINE_ARM7_LOCATION             0x0380E780
-#define CARDENGINE_ARM9_LOCATION_DLDI_START  0x02000000
+#define CARDENGINE_ARM9_LOCATION_DLDI_START  0x02000400
 #define CARDENGINE_ARM9_LOCATION_DLDI        0x023DA400
 #define CARDENGINE_ARM9_LOCATION_DLDI_32     0x023D4400
 #define CARDENGINE_ARM9_LOCATION_DLDI_ALT    0x023F9C00