Update ROM pre-load settings for *MegaMan ZX* & *ZX Advent* (3DS)

retail/arm9/include/configuration.h

@@ -37,9 +37,9 @@ typedef struct configuration {
 	u32 apPatchSize;
 	u32 cheatSize;
 	u32 musicsSize;
-	u32 dataToPreloadAddr;
-	u32 dataToPreloadSize;
-	u32 dataToPreloadFrame;
+	u32 dataToPreloadAddr[2];
+	u32 dataToPreloadSize[2];
+	// u32 dataToPreloadFrame;
 	u8 language;
 	char* guiLanguage;
 	s8 region; // SDK 5

retail/arm9/source/conf_sd.cpp

@@ -145,9 +145,9 @@ static void loadPreLoadSettings(configuration* conf, const char* pckPath, const
 	}
 
 	if (file) {
-		conf->dataToPreloadAddr = offsetOfOpenedNitroFile;
-		conf->dataToPreloadSize = getFileSize(file);
-		conf->dataToPreloadFrame = 0;
+		conf->dataToPreloadAddr[0] = offsetOfOpenedNitroFile;
+		conf->dataToPreloadSize[0] = getFileSize(file);
+		// conf->dataToPreloadFrame = 0;
 		fclose(file);
 		return;
 	}
@@ -196,20 +196,18 @@ static void loadPreLoadSettings(configuration* conf, const char* pckPath, const
 		}
 
 		if (offset > 0) {
-			if (size > 0xC) {
-				size = 0xC;
+			if (size > 0x10) {
+				size = 0x10;
 			}
 			fseek(file, offset, SEEK_SET);
 			u32 *buffer = new u32[size/4];
 			fread(buffer, 1, size, file);
 
-			/* for (u32 i = 0; i < size/8; i++) {
+			for (u32 i = 0; i < size/8; i++) {
 				conf->dataToPreloadAddr[i] = buffer[0+(i*2)];
 				conf->dataToPreloadSize[i] = buffer[1+(i*2)];
-			} */
-			conf->dataToPreloadAddr = buffer[0];
-			conf->dataToPreloadSize = buffer[1];
-			conf->dataToPreloadFrame = (size == 0xC) ? buffer[2] : 0;
+			}
+			// conf->dataToPreloadFrame = (size == 0xC) ? buffer[2] : 0;
 			delete[] buffer;
 		}
 	}
@@ -1592,11 +1590,11 @@ int loadFromSD(configuration* conf, const char *bootstrapPath) {
 			fclose(cebin);
 
 			loadPreLoadSettings(conf, conf->consoleModel > 0 ? "nitro:/preLoadSettings3DS.pck" : "nitro:/preLoadSettingsDSi.pck", romTid, headerCRC);
-			if (conf->dataToPreloadAddr == 0) {
+			if (conf->dataToPreloadAddr[0] == 0) {
 				// Set NitroFS pre-load, in case if full ROM pre-load fails
-				conf->dataToPreloadAddr = ndsArm7BinOffset+ndsArm7Size;
-				conf->dataToPreloadSize = ((internalRomSize == 0 || internalRomSize > conf->romSize) ? conf->romSize : internalRomSize)-conf->dataToPreloadAddr;
-				conf->dataToPreloadFrame = 0;
+				conf->dataToPreloadAddr[0] = ndsArm7BinOffset+ndsArm7Size;
+				conf->dataToPreloadSize[0] = ((internalRomSize == 0 || internalRomSize > conf->romSize) ? conf->romSize : internalRomSize)-conf->dataToPreloadAddr[0];
+				// conf->dataToPreloadFrame = 0;
 			}
 		} else {
 			const bool binary3 = (REG_SCFG_EXT7 == 0 ? !dsiEnhancedMbk : (a7mbk6 != 0x00403000));
@@ -1926,11 +1924,11 @@ int loadFromSD(configuration* conf, const char *bootstrapPath) {
 		b4dsDebugRam = (conf->b4dsMode == 2 || (*(vu32*)(0x02800000) == 0x314D454D && *(vu32*)(0x02C00000) == 0x324D454D));
 
 		loadPreLoadSettings(conf, "nitro:/preLoadSettingsMEP.pck", romTid, headerCRC);
-		if (conf->dataToPreloadAddr == 0) {
+		if (conf->dataToPreloadAddr[0] == 0) {
 			// Set NitroFS pre-load, in case if full ROM pre-load fails
-			conf->dataToPreloadAddr = ndsArm7BinOffset+ndsArm7Size;
-			conf->dataToPreloadSize = ((internalRomSize == 0 || internalRomSize > conf->romSize) ? conf->romSize : internalRomSize)-conf->dataToPreloadAddr;
-			conf->dataToPreloadFrame = 0;
+			conf->dataToPreloadAddr[0] = ndsArm7BinOffset+ndsArm7Size;
+			conf->dataToPreloadSize[0] = ((internalRomSize == 0 || internalRomSize > conf->romSize) ? conf->romSize : internalRomSize)-conf->dataToPreloadAddr[0];
+			// conf->dataToPreloadFrame = 0;
 		}
 
 		// Load in-game menu ce9 binary

retail/arm9/source/nds_loader_arm9.c

@@ -270,9 +270,10 @@ int runNds(u32 cluster, u32 saveCluster, u32 donorTwlCluster, /* u32 gbaCluster,
 	loader->saveSize                    = conf->saveSize;
 	// loader->gbaRomSize                  = conf->gbaRomSize;
 	// loader->gbaSaveSize                 = conf->gbaSaveSize;
-	loader->dataToPreloadAddr           = conf->dataToPreloadAddr;
-	loader->dataToPreloadSize           = conf->dataToPreloadSize;
-	loader->dataToPreloadFrame          = conf->dataToPreloadFrame;
+	loader->dataToPreloadAddr[0]        = conf->dataToPreloadAddr[0];
+	loader->dataToPreloadSize[0]        = conf->dataToPreloadSize[0];
+	loader->dataToPreloadAddr[1]        = conf->dataToPreloadAddr[1];
+	loader->dataToPreloadSize[1]        = conf->dataToPreloadSize[1];
 	loader->wideCheatFileCluster        = wideCheatCluster;
 	loader->wideCheatSize               = conf->wideCheatSize;
 	loader->apPatchFileCluster          = apPatchCluster;

retail/bootloader/source/arm7/load_crt0.s

@@ -43,7 +43,7 @@
 	@ .global gbaSaveSize
 	.global dataToPreloadAddr
 	.global dataToPreloadSize
-	.global dataToPreloadFrame
+	@ .global dataToPreloadFrame
 	.global wideCheatFileCluster
 	.global wideCheatSize
 	.global apPatchFileCluster
@@ -122,10 +122,12 @@ saveSize:
 @	.word	0x00000000		@ GBA .sav file size
 dataToPreloadAddr:
 	.word	0x00000000
+	.word	0x00000000
 dataToPreloadSize:
 	.word	0x00000000
-dataToPreloadFrame:
 	.word	0x00000000
+@dataToPreloadFrame:
+@	.word	0x00000000
 wideCheatFileCluster:
 	.word	0x00000000
 wideCheatSize:

retail/bootloaderi/source/arm7/hook_arm9.c

@@ -213,10 +213,11 @@ int hookNdsRetailArm9(
 	extern u32 baseFatOff;
 	extern u32 baseFatSize;
 	extern u32 romPaddingSize;
-	extern u32 dataToPreloadAddr;
-	extern u32 dataToPreloadSize;
+	extern u32 dataToPreloadAddr[2];
+	extern u32 dataToPreloadSize[2];
 	// extern u32 dataToPreloadFrame;
 	extern bool romLocationAdjust(const tNDSHeader* ndsHeader, const bool laterSdk, const bool isSdk5, const bool dsiBios, u32* romLocation);
+	extern u32 dataToPreloadFullSize(void);
 	extern bool dataToPreloadFound(const tNDSHeader* ndsHeader);
 	const char* romTid = getRomTid(ndsHeader);
 	const bool laterSdk = ((moduleParams->sdk_version >= 0x2008000 && moduleParams->sdk_version != 0x2012774) || moduleParams->sdk_version == 0x20029A8);
@@ -283,7 +284,6 @@ int hookNdsRetailArm9(
 		//extern bool gbaRomFound;
 		extern u8 gameOnFlashcard;
 		bool runOverlayCheck = overlayPatch;
-		u32 dataToPreloadSizeAligned = 0;
 		ce9->cacheBlockSize = cacheBlockSize;
 		if (ce9->overlaysSrc) {
 			ce9->overlaysSrcAlign = (ce9->overlaysSrc/ce9->cacheBlockSize)*ce9->cacheBlockSize;
@@ -337,17 +337,16 @@ int hookNdsRetailArm9(
 			//ce9->romLocation[1] = ce9->romLocation[0]+dataToPreloadSize[0];
 			// ce9->romLocation -= dataToPreloadAddr[0];
 			//ce9->romLocation[1] -= dataToPreloadAddr[1];
-			configureRomMap(ce9, ndsHeader, dataToPreloadAddr, dsiMode);
-			for (u32 i = 0; i < dataToPreloadSize/*+dataToPreloadSize[1]*/; i += cacheBlockSize) {
+			configureRomMap(ce9, ndsHeader, dataToPreloadAddr[0], dsiMode);
+			for (u32 i = 0; i < dataToPreloadFullSize(); i += cacheBlockSize) {
 				ce9->cacheAddress += cacheBlockSize;
 				romLocationAdjust(ndsHeader, laterSdk, (ce9->valueBits & b_isSdk5), (ce9->valueBits & b_dsiBios), &ce9->cacheAddress);
-				dataToPreloadSizeAligned += cacheBlockSize;
+				ce9->cacheSlots--;
+			}
+			for (int i = 0; i < 2; i++) {
+				ce9->romPartSrc[i] = dataToPreloadAddr[i];
+				ce9->romPartSize[i] = dataToPreloadSize[i];
 			}
-			ce9->cacheSlots -= dataToPreloadSizeAligned/cacheBlockSize;
-			ce9->romPartSrc = dataToPreloadAddr;
-			//ce9->romPartSrc[1] = dataToPreloadAddr[1];
-			ce9->romPartSize = dataToPreloadSize;
-			//ce9->romPartSize[1] = dataToPreloadSize[1];
 			/* if (dataToPreloadFrame) {
 				ce9->valueBits |= b_waitForPreloadToFinish;
 			} */

retail/bootloaderi/source/arm7/load_crt0.s

@@ -43,7 +43,7 @@
 	@ .global gbaSaveSize
 	.global dataToPreloadAddr
 	.global dataToPreloadSize
-	.global dataToPreloadFrame
+	@ .global dataToPreloadFrame
 	.global wideCheatFileCluster
 	.global wideCheatSize
 	.global apPatchFileCluster
@@ -122,10 +122,12 @@ saveSize:
 @	.word	0x00000000		@ GBA .sav file size
 dataToPreloadAddr:
 	.word	0x00000000
+	.word	0x00000000
 dataToPreloadSize:
 	.word	0x00000000
-dataToPreloadFrame:
 	.word	0x00000000
+@dataToPreloadFrame:
+@	.word	0x00000000
 wideCheatFileCluster:
 	.word	0x00000000
 wideCheatSize:

retail/bootloaderi/source/arm7/main.arm7.c

@@ -105,9 +105,9 @@ extern u32 romSize;
 extern u32 saveSize;
 // extern u32 gbaRomSize;
 // extern u32 gbaSaveSize;
-extern u32 dataToPreloadAddr;
-extern u32 dataToPreloadSize;
-extern u32 dataToPreloadFrame;
+extern u32 dataToPreloadAddr[2];
+extern u32 dataToPreloadSize[2];
+// extern u32 dataToPreloadFrame;
 extern u32 wideCheatFileCluster;
 extern u32 wideCheatSize;
 extern u32 apPatchFileCluster;
@@ -1018,13 +1018,25 @@ static void my_readUserSettings(tNDSHeader* ndsHeader) {
 	}
 }
 
+u32 dataToPreloadFullSize(void) {
+	u32 dataToPreloadSizeAlign[2] = {dataToPreloadSize[0], dataToPreloadSize[1]};
+	for (int i = 0; i < 2; i++) {
+		if (!dataToPreloadSize[i]) break;
+		while ((dataToPreloadSizeAlign[i] % 0x4000) != 0) {
+			dataToPreloadSizeAlign[i]++;
+		}
+	}
+
+	return dataToPreloadSizeAlign[0] + dataToPreloadSizeAlign[1];
+}
+
 bool dataToPreloadFound(const tNDSHeader* ndsHeader) {
 	if (strncmp(ndsHeader->gameCode, "UBR", 3) == 0) {
-		return (dataToPreloadSize > 0 && (dataToPreloadSize/*+dataToPreloadSize[1]*/) <= retail_CACHE_ADRESS_SIZE_BROWSER-0x40000);
+		return (dataToPreloadSize[0] > 0 && dataToPreloadFullSize() <= retail_CACHE_ADRESS_SIZE_BROWSER-0x40000);
 	}
 	const bool cheatsEnabled = (cheatSizeTotal > 4 && cheatSizeTotal <= 0x8000);
 
-	return (dataToPreloadSize > 0 && (dataToPreloadSize/*+dataToPreloadSize[1]*/) <= (consoleModel > 0 ? (dsiModeConfirmed ? (ndsHeader->unitCode > 0 ? dev_CACHE_ADRESS_SIZE_TWLSDK : dev_CACHE_ADRESS_SIZE_DSIMODE) : dev_CACHE_ADRESS_SIZE) : (dsiModeConfirmed ? (ndsHeader->unitCode > 0 ? (cheatsEnabled ? retail_CACHE_ADRESS_SIZE_TWLSDK_CHEAT : retail_CACHE_ADRESS_SIZE_TWLSDK) : retail_CACHE_ADRESS_SIZE_DSIMODE) : retail_CACHE_ADRESS_SIZE))-0x40000);
+	return (dataToPreloadSize[0] > 0 && dataToPreloadFullSize() <= (consoleModel > 0 ? (dsiModeConfirmed ? (ndsHeader->unitCode > 0 ? dev_CACHE_ADRESS_SIZE_TWLSDK : dev_CACHE_ADRESS_SIZE_DSIMODE) : dev_CACHE_ADRESS_SIZE) : (dsiModeConfirmed ? (ndsHeader->unitCode > 0 ? (cheatsEnabled ? retail_CACHE_ADRESS_SIZE_TWLSDK_CHEAT : retail_CACHE_ADRESS_SIZE_TWLSDK) : retail_CACHE_ADRESS_SIZE_DSIMODE) : retail_CACHE_ADRESS_SIZE))-0x40000);
 }
 
 static void loadROMPartIntoRAM(const tNDSHeader* ndsHeader, aFile* file) {
@@ -1162,9 +1174,9 @@ static void buildRomMap(const tNDSHeader* ndsHeader, const module_params_t* modu
 	// Load ROM into RAM
 	const u32 romLocation = ROMinRAM ? getRomLocation(ndsHeader, !laterSdk, isSdk5(moduleParams), dsiBios) : getRomPartLocation(ndsHeader, !laterSdk, isSdk5(moduleParams), dsiBios);
 
-	u32 romOffset[2] = {(ROMinRAM ? 0 : dataToPreloadAddr), romOffset[0]};
-	s32 romSizeEdit[2] = {(ROMinRAM ? baseRomSize : dataToPreloadSize), romSizeEdit[0]};
-	bool skipArm7Binary = false;
+	u32 romOffset[2] = {(ROMinRAM ? 0 : dataToPreloadAddr[0]), (ROMinRAM ? 0 : dataToPreloadAddr[1])};
+	s32 romSizeEdit[2] = {(ROMinRAM ? baseRomSize : dataToPreloadSize[0]), (ROMinRAM ? baseRomSize : dataToPreloadSize[1])};
+	int iCount = 1;
 	if (ROMinRAM) {
 		if (usesCloneboot) {
 			romOffset[0] = 0x4000;
@@ -1182,13 +1194,18 @@ static void buildRomMap(const tNDSHeader* ndsHeader, const module_params_t* modu
 				romSizeEdit[0] = overlaysSize;
 				romOffset[1] = (baseArm7Off + baseArm7Size);
 				romSizeEdit[1] -= romOffset[1];
-				skipArm7Binary = true;
+				iCount++;
 			} else {
 				romSizeEdit[0] -= romOffset[0];
 			}
 		}
-	} else if (!dataToPreloadFound(ndsHeader)) {
-		return;
+	} else {
+		if (!dataToPreloadFound(ndsHeader)) {
+			return;
+		}
+		if (dataToPreloadSize[1]) {
+			iCount++;
+		}
 	}
 
 	/* dbg_printf("romOffset[0]: ");
@@ -1207,7 +1224,7 @@ static void buildRomMap(const tNDSHeader* ndsHeader, const module_params_t* modu
 	u32 romLocationChange = romLocation;
 	u32 romLocationChangePrep = romLocationChange;
 	u32 romBlockSize = 0;
-	for (int i = 0; i < (skipArm7Binary ? 2 : 1); i++) {
+	for (int i = 0; i < iCount; i++) {
 		u32 romOffsetChange = romOffset[i];
 		while (romSizeEdit[i] > 0) {
 			bool readRom = false;

retail/cardenginei/arm9/source/cardDma.thumb.c

@@ -382,17 +382,20 @@ void cardSetDma(u32 * params) {
 	romPart = false;
 	//int romPartNo = 0;
 	if (!(ce9->valueBits & ROMinRAM)) {
-		/*for (int i = 0; i < 2; i++) {
+		#ifndef TWLSDK
+		for (int i = 0; i < 2; i++) {
 			if (ce9->romPartSize[i] == 0) {
 				break;
 			}
 			romPart = (src >= ce9->romPartSrc[i] && src < ce9->romPartSrc[i]+ce9->romPartSize[i]);
 			if (romPart) {
-				romPartNo = i;
+				// romPartNo = i;
 				break;
 			}
-		}*/
-		romPart = (ce9->romPartSize > 0 && src >= ce9->romPartSrc && src < ce9->romPartSrc+ce9->romPartSize);
+		}
+		#else
+		romPart = (ce9->romPartSize[0] > 0 && src >= ce9->romPartSrc[0] && src < ce9->romPartSrc[0]+ce9->romPartSize[0]);
+		#endif
 		/* #ifndef DLDI
 		#ifndef TWLSDK
 		if (romPart && (ce9->valueBits & waitForPreloadToFinish)) {

retail/cardenginei/arm9/source/card_engine_header.s

@@ -64,8 +64,10 @@ cacheBlockSize:
 	.hword	0
 romPartSrc:
 	.word	0x00000000
+	.word	0x00000000
 romPartSize:
 	.word	0x00000000
+	.word	0x00000000
 #ifndef TWLSDK
 romMapLines:
 	.word	0x00000000

retail/cardenginei/arm9/source/cardengine.c

@@ -836,17 +836,20 @@ void cardRead(u32* cacheStruct, u8* dst0, u32 src0, u32 len0) {
 	romPart = false;
 	//int romPartNo = 0;
 	if (!(ce9->valueBits & ROMinRAM)) {
-		/*for (int i = 0; i < 2; i++) {
+		#ifndef TWLSDK
+		for (int i = 0; i < 2; i++) {
 			if (ce9->romPartSize[i] == 0) {
 				break;
 			}
 			romPart = (src >= ce9->romPartSrc[i] && src < ce9->romPartSrc[i]+ce9->romPartSize[i]);
 			if (romPart) {
-				romPartNo = i;
+				// romPartNo = i;
 				break;
 			}
-		}*/
-		romPart = (ce9->romPartSize > 0 && src >= ce9->romPartSrc && src < ce9->romPartSrc+ce9->romPartSize);
+		}
+		#else
+		romPart = (ce9->romPartSize[0] > 0 && src >= ce9->romPartSrc[0] && src < ce9->romPartSrc[0]+ce9->romPartSize[0]);
+		#endif
 		/* #ifndef DLDI
 		#ifndef TWLSDK
 		if (romPart && (ce9->valueBits & waitForPreloadToFinish)) {

retail/common/include/cardengine_header_arm9.h

@@ -121,8 +121,8 @@ typedef struct cardengineArm9 {
 	u32 cacheAddress;
 	u16 cacheSlots;
 	u16 cacheBlockSize;
-	u32 romPartSrc;
-	u32 romPartSize;
+	u32 romPartSrc[2];
+	u32 romPartSize[2];
 	u32 romMapLines;
 	u32 romMap[8][3]; // 0: ROM part start, 1: ROM part start in RAM, 2: ROM part end in RAM
 } cardengineArm9;

retail/common/include/load_crt0.h

@@ -26,9 +26,9 @@ typedef struct loadCrt0 {
     u32 saveSize;
     // u32 gbaRomSize;
     // u32 gbaSaveSize;
-	u32 dataToPreloadAddr;
-	u32 dataToPreloadSize;
-	u32 dataToPreloadFrame;
+	u32 dataToPreloadAddr[2];
+	u32 dataToPreloadSize[2];
+	// u32 dataToPreloadFrame;
     u32 wideCheatFileCluster;
     u32 wideCheatSize;
     u32 apPatchFileCluster;

retail/preLoadSettings/Title list.txt

@@ -94,3 +94,31 @@ Ultimate Mortal Kombat (Europe) (YUTP) (DSi/3DS)
 WarioWare: D.I.Y. (USA) (UORE) (DSi)
 WarioWare: Do It Yourself (Europe) (UORP) (DSi/3DS)
 Made in Ore (Japan) (UORJ) (DSi)
+
+Pre-loaded data:
+
+Base 10 (Art Style) (MEP):
+- Sound data
+
+MegaMan Battle Network 5: Double Team DS (USA) (DSi for all regions, 3DS for Europe version):
+- Sound data and intro graphics
+
+MegaMan ZX (3DS):
+- USA/Japan: Everything except for sound data and video cutscenes
+- Europe: Everything except for sound data, video cutscenes, title_###.bin files, and x##.bin & z##.bin files
+
+MegaMan ZX Advent (3DS):
+- USA/Japan: Everything except for sound data, video cutscenes, and Download Play client
+- Europe: Everything except for sound data, video cutscenes, Download Play client, and language-specific text files
+
+SaGa 3: Jikuu no Hasha: Shadow or Light (DSi/3DS):
+- Sound data
+
+Sonic Rush Adventure (MEP/DSi/3DS):
+- Opening cutscene music
+
+Style Savvy (DSi/3DS):
+- Sound data (minus padding)
+
+Super Mario 64 DS (DSi):
+- Everything except the level data