Proper fix for *Puppy Palace*

Co-Authored-By: Mow <32942550+taxicat1@users.noreply.github.com>

Author: RocketRobz

README.md

@@ -72,6 +72,7 @@ An alternative forwarder generator for 3DS users. YANBF forwarders are 3DS-mode
 ## Other
 - [devkitPro](https://devkitpro.org): devkitARM and libnds
 - [Arisotura](https://github.com/Arisotura): BIOS reader from [dsibiosdumper](https://github.com/Arisotura/dsibiosdumper) used in the in-game menu
+- [Mow](https://github.com/taxicat1): Proper fix for *Puppy Palace* crash on boot
 - retrogamefan, Rudolph, and [Mow](https://github.com/taxicat1): Included AP-patches
    - [enler](https://github.com/enler): Fixing AP-patch for Pokemon Black 2 (Japan) for DS⁽ⁱ⁾ mode compatibility
    - [Rocket Robz](https://github.com/RocketRobz): Fixing some DS⁽ⁱ⁾-Enhanced game AP-patches for DS⁽ⁱ⁾ mode compatibility

retail/bootloader/source/arm7/patch_common.c

@@ -434,6 +434,21 @@ void patchBinary(cardengineArm9* ce9, const tNDSHeader* ndsHeader, module_params
         *(u32*)0x02000C14 = 0xE1A00000; //nop
 	}*/
 
+	// Puppy Palace (USA)
+	else if (strcmp(romTid, "YPTE") == 0) {
+		*(u32*)0x020131E8 = 0xE320F000; // nop
+	}
+
+	// My Puppy Shop (Europe)
+	else if (strcmp(romTid, "YPTP") == 0) {
+		*(u32*)0x020131C4 = 0xE320F000; // nop
+	}
+
+	// Machi no Pet-ya-san DS: 200 Piki Wan-chan Daishuugou (Japan)
+	else if (strcmp(romTid, "YPTJ") == 0) {
+		*(u32*)0x0201DBF8 = 0xE320F000; // nop
+	}
+
 	// Golden Sun: Dark Dawn (USA, Australia)
 	else if (strcmp(romTid, "BO5E") == 0) {
 		// setBEQ(0x02003CA0, 0x02003C30); // Skip a block of DSProtect code branches

retail/bootloaderi/source/arm7/hook_arm9.c

@@ -418,9 +418,7 @@ int hookNdsRetailArm9(
 		if (strncmp(romTid, "UBR", 3) == 0 || iUncompressedSize > 0x26C000) {
 			ce9->valueBits |= b_slowSoftReset;
 		}
-		if (!dataToPreloadFound(ndsHeader) && (strncmp(romTid, "YPT", 3) == 0)) { // Puppy Palace
-			ce9->valueBits |= b_resetOnFirstException;
-		} else if (strncmp(romTid, "CLJ", 3) == 0) { // Mario & Luigi: Bowser's Inside Story
+		if (strncmp(romTid, "CLJ", 3) == 0) { // Mario & Luigi: Bowser's Inside Story
 			ce9->valueBits |= b_resetOnEveryException;
 		}
 

retail/bootloaderi/source/arm7/patch_common.c

@@ -16543,6 +16543,21 @@ void patchBinary(cardengineArm9* ce9, const tNDSHeader* ndsHeader, module_params
         *(u32*)0x20DE16C = 0xE1A00000; //nop
 	}*/
 
+	// Puppy Palace (USA)
+	else if (strcmp(romTid, "YPTE") == 0) {
+		*(u32*)0x020131E8 = 0xE320F000; // nop
+	}
+
+	// My Puppy Shop (Europe)
+	else if (strcmp(romTid, "YPTP") == 0) {
+		*(u32*)0x020131C4 = 0xE320F000; // nop
+	}
+
+	// Machi no Pet-ya-san DS: 200 Piki Wan-chan Daishuugou (Japan)
+	else if (strcmp(romTid, "YPTJ") == 0) {
+		*(u32*)0x0201DBF8 = 0xE320F000; // nop
+	}
+
 	// Golden Sun: Dark Dawn (USA, Australia)
 	else if (strcmp(romTid, "BO5E") == 0) {
 		// setBEQ(0x02003CA0, 0x02003C30); // Skip a block of DSProtect code branches