Fix *Shepherd's Crossing 2 DS* not booting

DS-Homebrew · Apr 2, 2024 · 02b6b70 · 02b6b70
1 parent 7eab01f
commit 02b6b70
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/retail/bootloader/source/arm7/hook_arm9.c b/retail/bootloader/source/arm7/hook_arm9.c
@@ -194,7 +194,6 @@ int hookNdsRetailArm9(
 	const char* romTid = getRomTid(ndsHeader);
 	extern u32 romPaddingSize;
 	extern u32 romLocation;
-	extern u32 romSizeLimit;
 	extern u16 s2FlashcardId;
 	extern bool maxHeapOpen;
 

diff --git a/retail/bootloader/source/arm7/ips.c b/retail/bootloader/source/arm7/ips.c
@@ -47,8 +47,9 @@ bool applyIpsPatch(const tNDSHeader* ndsHeader, u8* ipsbyte, bool arm9Only, bool
 				if (usesCloneboot) {
 					rombyte -= 0x8000;
 				} else if (ndsHeader->arm9overlaySource == 0 || ndsHeader->arm9overlaySize == 0) {
-					rombyte -= ndsHeader->arm7romOffset;
-					rombyte -= ndsHeader->arm7binarySize;
+					rombyte -= (ndsHeader->arm7romOffset + ndsHeader->arm7binarySize);
+				} else if (ndsHeader->arm9overlaySource > ndsHeader->arm7romOffset) {
+					rombyte -= (ndsHeader->arm9romOffset + ndsHeader->arm9binarySize);
 				} else {
 					rombyte -= ndsHeader->arm9overlaySource;
 				}

diff --git a/retail/bootloader/source/arm7/main.arm7.c b/retail/bootloader/source/arm7/main.arm7.c
@@ -694,8 +694,9 @@ static bool isROMLoadableInRAM(const tDSiHeader* dsiHeader, const tNDSHeader* nd
 			romSize -= 0x8000;
 			romSize += 0x88;
 		} else if (ndsHeader->arm9overlaySource == 0 || ndsHeader->arm9overlaySize == 0) {
-			romSize -= ndsHeader->arm7romOffset;
-			romSize -= ndsHeader->arm7binarySize;
+			romSize -= (ndsHeader->arm7romOffset + ndsHeader->arm7binarySize);
+		} else if (ndsHeader->arm9overlaySource > ndsHeader->arm7romOffset) {
+			romSize -= (ndsHeader->arm9romOffset + ndsHeader->arm9binarySize);
 		} else {
 			romSize -= ndsHeader->arm9overlaySource;
 		}
@@ -914,6 +915,8 @@ static void loadROMintoRAM(const tNDSHeader* ndsHeader, const module_params_t* m
 		romSizeEdit += 0x88;
 	} else if (ndsHeader->arm9overlaySource == 0 || ndsHeader->arm9overlaySize == 0) {
 		romOffset = (ndsHeader->arm7romOffset + ndsHeader->arm7binarySize);
+	} else if (ndsHeader->arm9overlaySource > ndsHeader->arm7romOffset) {
+		romOffset = (ndsHeader->arm9romOffset + ndsHeader->arm9binarySize);
 	} else {
 		romOffset = ndsHeader->arm9overlaySource;
 	}

diff --git a/retail/bootloaderi/source/arm7/hook_arm9.c b/retail/bootloaderi/source/arm7/hook_arm9.c
@@ -462,6 +462,8 @@ int hookNdsRetailArm9(
 			romOffset = 0x4000;
 		} else if (ndsHeader->arm9overlaySource == 0 || ndsHeader->arm9overlaySize == 0) {
 			romOffset = (ndsHeader->arm7romOffset + ndsHeader->arm7binarySize);
+		} else if (ndsHeader->arm9overlaySource > ndsHeader->arm7romOffset) {
+			romOffset = (ndsHeader->arm9romOffset + ndsHeader->arm9binarySize);
 		} else {
 			romOffset = ndsHeader->arm9overlaySource;
 		}

diff --git a/retail/bootloaderi/source/arm7/ips.c b/retail/bootloaderi/source/arm7/ips.c
@@ -52,8 +52,9 @@ bool applyIpsPatch(const tNDSHeader* ndsHeader, u8* ipsbyte, const bool arm9Only
 				if (usesCloneboot) {
 					rombyte -= 0x4000;
 				} else if (ndsHeader->arm9overlaySource == 0 || ndsHeader->arm9overlaySize == 0) {
-					rombyte -= ndsHeader->arm7romOffset;
-					rombyte -= ndsHeader->arm7binarySize;
+					rombyte -= (ndsHeader->arm7romOffset + ndsHeader->arm7binarySize);
+				} else if (ndsHeader->arm9overlaySource > ndsHeader->arm7romOffset) {
+					rombyte -= (ndsHeader->arm9romOffset + ndsHeader->arm9binarySize);
 				} else {
 					rombyte -= ndsHeader->arm9overlaySource;
 				}

diff --git a/retail/bootloaderi/source/arm7/main.arm7.c b/retail/bootloaderi/source/arm7/main.arm7.c
@@ -800,6 +800,8 @@ static bool isROMLoadableInRAM(const tDSiHeader* dsiHeader, const tNDSHeader* nd
 			romSize += 0x88;
 		} else if (ndsHeader->arm9overlaySource == 0 || ndsHeader->arm9overlaySize == 0) {
 			romOffset = (ndsHeader->arm7romOffset + ndsHeader->arm7binarySize);
+		} else if (ndsHeader->arm9overlaySource > ndsHeader->arm7romOffset) {
+			romOffset = (ndsHeader->arm9romOffset + ndsHeader->arm9binarySize);
 		} else {
 			romOffset = ndsHeader->arm9overlaySource;
 		}
@@ -1016,6 +1018,8 @@ static void loadIOverlaysintoRAM(const tDSiHeader* dsiHeader, aFile* file, const
 		romOffset = 0x4000;
 	} else if (ndsHeader->arm9overlaySource == 0 || ndsHeader->arm9overlaySize == 0) {
 		romOffset = (ndsHeader->arm7romOffset + ndsHeader->arm7binarySize);
+	} else if (ndsHeader->arm9overlaySource > ndsHeader->arm7romOffset) {
+		romOffset = (ndsHeader->arm9romOffset + ndsHeader->arm9binarySize);
 	} else {
 		romOffset = ndsHeader->arm9overlaySource;
 	}
@@ -1038,6 +1042,8 @@ static void loadROMintoRAM(const tNDSHeader* ndsHeader, const module_params_t* m
 		romSizeEdit += 0x88;
 	} else if (ndsHeader->arm9overlaySource == 0 || ndsHeader->arm9overlaySize == 0) {
 		romOffset = (ndsHeader->arm7romOffset + ndsHeader->arm7binarySize);
+	} else if (ndsHeader->arm9overlaySource > ndsHeader->arm7romOffset) {
+		romOffset = (ndsHeader->arm9romOffset + ndsHeader->arm9binarySize);
 	} else {
 		romOffset = ndsHeader->arm9overlaySource;
 	}