Slot1launch: Separate reading 1T-ROM and MROM cartridge headers - Fix address of ModuleParams - Fix loading and setting personalData (#2597)

* slot1launch: Split loading header for 1T-ROM and MROM cartridges

* slot1launch: Fix moduleParams pointing to wrong data

* slot1launch: Fix loading personalData passed to games

Author: Lorenzooone

slot1launch/bootloader/source/hook.c

@@ -21,7 +21,6 @@
 
 #include "hook.h"
 #include "common.h"
-#include "cardengine_arm7_bin.h"
 
 extern unsigned long language;
 extern bool gameSoftReset;

slot1launch/bootloader/source/main.arm7.c

@@ -105,6 +105,8 @@ static const u32 cheatDataEndSignature[2] = {0xCF000000, 0x00000000};
 
 // Module params
 static const u32 moduleParamsSignature[2] = {0xDEC00621, 0x2106C0DE};
+static module_params_t emulatedModuleParams; 
+static module_params_t* moduleParams;
 
 // Sleep input write
 static const u32 sleepInputWriteEndSignature1[2]     = {0x04000136, 0x027FFFA8};
@@ -122,16 +124,33 @@ const char* getRomTid(const tNDSHeader* ndsHeader) {
 	return romTid;
 }
 
-static module_params_t* moduleParams;
-
 u32* findModuleParamsOffset(const tNDSHeader* ndsHeader) {
 	//dbg_printf("findModuleParamsOffset:\n");
 
 	u32* moduleParamsOffset = findOffset(
 			(u32*)ndsHeader->arm9destination, ndsHeader->arm9binarySize,
-			moduleParamsSignature, 2
+			moduleParamsSignature, 2 
 		);
-	return moduleParamsOffset;
+
+	// Return NULL if nothing is found
+	if(moduleParamsOffset == NULL) {
+		if (memcmp(ndsHeader->gameCode, "AS2E", 4) == 0) // Spider-Man 2 (USA) - Special case
+		{
+			emulatedModuleParams.sdk_version = LAST_NON_SDK5_VERSION;
+			return (u32*)&emulatedModuleParams;
+		}
+
+		return NULL;
+	}
+
+	uintptr_t subtract_value = sizeof(module_params_t) - (sizeof(u32) * 2);
+	uintptr_t base_ptr = (uintptr_t)moduleParamsOffset;
+
+	// This would be a really weird case. Return NULL
+	if(base_ptr < subtract_value)
+		return NULL;
+
+	return (u32*)(base_ptr - subtract_value);
 }
 
 u32* findSleepInputWriteOffset(const tNDSHeader* ndsHeader, const module_params_t* moduleParams) {
@@ -140,7 +159,7 @@ u32* findSleepInputWriteOffset(const tNDSHeader* ndsHeader, const module_params_
 	u32* offset = NULL;
 	u32* endOffset = findOffset(
 		(u32*)ndsHeader->arm7destination, ndsHeader->arm7binarySize,
-		(moduleParams->sdk_version > 0x5000000) ? sleepInputWriteEndSignature5 : sleepInputWriteEndSignature1, 2
+		isSdk5(moduleParams) ? sleepInputWriteEndSignature5 : sleepInputWriteEndSignature1, 2
 	);
 	if (endOffset) {
 		offset = findOffsetBackwards(
@@ -273,9 +292,9 @@ static void my_readUserSettings(tNDSHeader* ndsHeader) {
 		}
 	}
 
-	PERSONAL_DATA* personalData = (PERSONAL_DATA*)((u32)__NDSHeader - (u32)ndsHeader + (u32)PersonalData); //(u8*)((u32)ndsHeader - 0x180)
+	PERSONAL_DATA* personalData = (PERSONAL_DATA*)((u32)ndsHeader - ((u32)__NDSHeader - (u32)PersonalData)); //(u8*)((u32)ndsHeader - 0x180)
 
-	tonccpy(PersonalData, currentSettings, sizeof(PERSONAL_DATA));
+	tonccpy(personalData, currentSettings, sizeof(PERSONAL_DATA));
 
 	if (useTwlCfg && (language == 0xFF || language == -1)) {
 		language = twlCfgLang;
@@ -1031,15 +1050,15 @@ void arm7_main (void) {
 
 	ndsHeader = loadHeader(dsiHeaderTemp);
 
+	my_readUserSettings(ndsHeader); // Header has to be loaded first
+
 	bool isDSBrowser = (memcmp(ndsHeader->gameCode, "UBRP", 4) == 0);
 
 	arm9_extendedMemory = (dsiModeConfirmed || isDSBrowser);
 	if (!arm9_extendedMemory) {
 		tonccpy((u32*)0x023FF000, (u32*)(isSdk5(moduleParams) ? 0x02FFF000 : 0x027FF000), 0x1000);
 	}
 
-	my_readUserSettings(ndsHeader); // Header has to be loaded first
-
 	if (my_isDSiMode()) {
 		if ((REG_SNDEXTCNT & SNDEXTCNT_ENABLE) && ((!soundFreq && (REG_SNDEXTCNT & BIT(13))) || (soundFreq && !(REG_SNDEXTCNT & BIT(13))))) {
 			if (soundFreq) {

slot1launch/bootloader/source/module_params.h

@@ -3,6 +3,10 @@
 
 #include <nds/ndstypes.h>
 
+// Not precise, since it doesn't really matter...
+#define FIRST_SDK5_VERSION 0x05000000
+#define LAST_NON_SDK5_VERSION (FIRST_SDK5_VERSION - 1)
+
 typedef struct {
 	u32 auto_load_list_offset;
 	u32 auto_load_list_end;
@@ -16,7 +20,7 @@ typedef struct {
 } module_params_t;
 
 inline bool isSdk5(const module_params_t* moduleParams) {
-	return (moduleParams->sdk_version > 0x5000000);
+	return (moduleParams == NULL) || (moduleParams->sdk_version >= FIRST_SDK5_VERSION);
 }
 
 #endif // MODULE_PARAMS_H

slot1launch/bootloader/source/read_card.c

@@ -273,9 +273,9 @@ int cardInit (sNDSHeaderExt* ndsHeader, u32* chipID)
 		CARD_ACTIVATE | CARD_nRESET | CARD_CLK_SLOW | CARD_BLK_SIZE(1) | CARD_DELAY1(0x1FFF) | CARD_DELAY2(0x3F),
 		NULL, 0);
 
-	*chipID=cardReadID(CARD_CLK_SLOW);	
+	*chipID=cardReadID(CARD_CLK_SLOW);
+	normalChip = ((*chipID) & 0x80000000) != 0;		// ROM chip ID MSB
 	while (REG_ROMCTRL & CARD_BUSY);
-	//u32 iCheapCard=iCardId&0x80000000;
 
 	// Read the header
 	cardParamCommand (CARD_CMD_HEADER_READ, 0,
@@ -284,12 +284,22 @@ int cardInit (sNDSHeaderExt* ndsHeader, u32* chipID)
 
 	tonccpy(ndsHeader, headerData, 0x200);
 
-	if ((ndsHeader->unitCode != 0) || (ndsHeader->dsi_flags != 0)) {
+	if((ndsHeader->unitCode != 0) || (ndsHeader->dsi_flags != 0)) {
 		// Extended header found
-		for (i = 1; i < 8; i++) {
-			cardParamCommand (CARD_CMD_HEADER_READ, i * 0x200,
-			CARD_ACTIVATE | CARD_nRESET | CARD_CLK_SLOW | CARD_BLK_SIZE(4) | CARD_DELAY1(0x1FFF) | CARD_DELAY2(0x3F),
-			(void*)headerData + (i * 0x200), 0x200/sizeof(u32));
+		if(normalChip) {
+			// If 1T-ROM, read in blocks of 0x200 bytes, like the official DSi FW.
+			// Also covers NAND.
+			for (i = 1; i < 8; i++) {
+				cardParamCommand (CARD_CMD_HEADER_READ, i * 0x200,
+				CARD_ACTIVATE | CARD_nRESET | CARD_CLK_SLOW | CARD_BLK_SIZE(1) | CARD_DELAY1(0x1FFF) | CARD_DELAY2(0x3F),
+				(void*)headerData + (i * 0x200), 0x200/sizeof(u32));
+			}
+		}
+		else {
+			// If MROM, read 0x1000 bytes, like the official DSi FW.
+			cardParamCommand (CARD_CMD_HEADER_READ, 0,
+				CARD_ACTIVATE | CARD_nRESET | CARD_CLK_SLOW | CARD_BLK_SIZE(4) | CARD_DELAY1(0x1FFF) | CARD_DELAY2(0x3F),
+				(void*)headerData, 0x1000/sizeof(u32));
 		}
 		if (ndsHeader->dsi1[0]==0xFFFFFFFF && ndsHeader->dsi1[1]==0xFFFFFFFF
 		 && ndsHeader->dsi1[2]==0xFFFFFFFF && ndsHeader->dsi1[3]==0xFFFFFFFF) {
@@ -321,7 +331,6 @@ int cardInit (sNDSHeaderExt* ndsHeader, u32* chipID)
 		((ndsHeader->cardControlBF & (CARD_CLK_SLOW|CARD_DELAY1(0x1FFF))) + ((ndsHeader->cardControlBF & CARD_DELAY2(0x3F)) >> 16));
 
 	// Adjust card transfer method depending on the most significant bit of the chip ID
-	normalChip = ((*chipID) & 0x80000000) != 0;		// ROM chip ID MSB
 	if (!normalChip) {
 		portFlagsKey1 |= CARD_SEC_LARGE;
 	}