Fix #1570

Author: RocketRobz

retail/bootloader/source/arm7/hook_arm9.c

@@ -19,6 +19,7 @@
 #define b_overlaysCached BIT(6)
 #define b_cacheFlushFlag BIT(7)
 #define b_cardReadFix BIT(8)
+#define b_bypassExceptionHandler BIT(9)
 #define b_softResetMb BIT(13)
 
 
@@ -242,6 +243,9 @@ int hookNdsRetailArm9(
 	if (patchOffsetCache.resetMb) {
 		ce9->valueBits |= b_softResetMb;
 	}
+	if (strncmp(romTid, "AZE", 3) == 0) { // Zelda: Phantom Hourglass
+		ce9->valueBits |= b_bypassExceptionHandler;
+	}
 	ce9->mainScreen             = mainScreen;
 	ce9->s2FlashcardId          = s2FlashcardId;
 	ce9->overlaysSrc            = (ndsHeader->arm9overlaySource > ndsHeader->arm7romOffset) ? (ndsHeader->arm9romOffset + ndsHeader->arm9binarySize) : ndsHeader->arm9overlaySource;

retail/bootloaderi/source/arm7/hook_arm9.c

@@ -27,6 +27,7 @@
 #define b_softResetMb BIT(13)
 #define b_cloneboot BIT(14)
 #define b_isDlp BIT(15)
+#define b_bypassExceptionHandler BIT(16)
 
 
 static const int MAX_HANDLER_LEN = 50;
@@ -333,6 +334,9 @@ int hookNdsRetailArm9(
 	if (strncmp(romTid, "HND", 3) == 0) {
 		ce9->valueBits |= b_isDlp;
 	}
+	if (strncmp(romTid, "AZE", 3) == 0) { // Zelda: Phantom Hourglass
+		ce9->valueBits |= b_bypassExceptionHandler;
+	}
 	ce9->mainScreen             = mainScreen;
 	ce9->overlaysSrc            = (ndsHeader->arm9overlaySource > ndsHeader->arm7romOffset) ? (ndsHeader->arm9romOffset + ndsHeader->arm9binarySize) : ndsHeader->arm9overlaySource;
 	ce9->overlaysSize           = overlaysSize;

retail/cardengine/arm9/source/exception.c

@@ -4,6 +4,8 @@
 #include "locations.h"
 #include "cardengine_header_arm9.h"
 
+#define bypassExceptionHandler BIT(9)
+
 #define EXCEPTION_VECTOR_SDK1	(*(VoidFn *)(0x27FFD9C))
 
 extern cardengineArm9* volatile ce9;
@@ -27,10 +29,10 @@ void userException() {
 //---------------------------------------------------------------------------------
 void setExceptionHandler2() {
 //---------------------------------------------------------------------------------
-	if (EXCEPTION_VECTOR_SDK1 == enterException && *exceptionC == userException) return;
+	if (EXCEPTION_VECTOR_SDK1 == ((ce9->valueBits & bypassExceptionHandler) ? 0 : enterException) && *exceptionC == userException) return;
 
 	exceptionStack = (u32)EXCEPTION_STACK_LOCATION;
-	EXCEPTION_VECTOR_SDK1 = enterException;
+	EXCEPTION_VECTOR_SDK1 = (ce9->valueBits & bypassExceptionHandler) ? 0 : enterException;
 	*exceptionC = userException;
 }
 

retail/cardenginei/arm9/source/exception.c

@@ -5,6 +5,7 @@
 #include "cardengine_header_arm9.h"
 
 #define dsiBios BIT(11)
+#define bypassExceptionHandler BIT(16)
 
 #define EXCEPTION_VECTOR_SDK1	(*(VoidFn *)(0x27FFD9C))
 
@@ -31,12 +32,12 @@ void userException() {
 void setExceptionHandler2() {
 //---------------------------------------------------------------------------------
 	#ifdef TWLSDK
-	if (EXCEPTION_VECTOR == enterException && *exceptionC == userException) return;
+	if (EXCEPTION_VECTOR == ((ce9->valueBits & bypassExceptionHandler) ? 0 : enterException) && *exceptionC == userException) return;
 	#else
 	if (!(ce9->valueBits & dsiBios)) {
-		if (EXCEPTION_VECTOR_SDK1 == enterException && *exceptionC == userException) return;
+		if (EXCEPTION_VECTOR_SDK1 == ((ce9->valueBits & bypassExceptionHandler) ? 0 : enterException) && *exceptionC == userException) return;
 	} else {
-		if (EXCEPTION_VECTOR == enterException && *exceptionC == userException) return;
+		if (EXCEPTION_VECTOR == ((ce9->valueBits & bypassExceptionHandler) ? 0 : enterException) && *exceptionC == userException) return;
 	}
 	#endif
 
@@ -47,13 +48,13 @@ void setExceptionHandler2() {
 	#endif
 	#ifdef TWLSDK
 	exceptionStack = (u32)EXCEPTION_STACK_LOCATION_SDK5;
-	EXCEPTION_VECTOR = enterException;
+	EXCEPTION_VECTOR = (ce9->valueBits & bypassExceptionHandler) ? 0 : enterException;
 	#else
 	exceptionStack = (u32)EXCEPTION_STACK_LOCATION;
 	if (!(ce9->valueBits & dsiBios)) {
-		EXCEPTION_VECTOR_SDK1 = enterException;
+		EXCEPTION_VECTOR_SDK1 = (ce9->valueBits & bypassExceptionHandler) ? 0 : enterException;
 	} else {
-		EXCEPTION_VECTOR = enterException;
+		EXCEPTION_VECTOR = (ce9->valueBits & bypassExceptionHandler) ? 0 : enterException;
 	}
 	#endif
 	*exceptionC = userException;

retail/cardenginei/arm9_dsiware/source/exception.c

@@ -4,6 +4,8 @@
 #include "locations.h"
 #include "cardengine_header_arm9.h"
 
+#define bypassExceptionHandler BIT(16)
+
 extern cardengineArm9* volatile ce9;
 
 extern u32 exceptionAddr;
@@ -26,10 +28,10 @@ void userException() {
 //---------------------------------------------------------------------------------
 void setExceptionHandler2() {
 //---------------------------------------------------------------------------------
-	if (EXCEPTION_VECTOR == enterException && *exceptionC == userException) return;
+	if (EXCEPTION_VECTOR == ((ce9->valueBits & bypassExceptionHandler) ? 0 : enterException) && *exceptionC == userException) return;
 
 	exceptionStack = (u32)EXCEPTION_STACK_LOCATION_SDK5;
-	EXCEPTION_VECTOR = enterException;
+	EXCEPTION_VECTOR = (ce9->valueBits & bypassExceptionHandler) ? 0 : enterException;
 	*exceptionC = userException;
 }
 

retail/common/include/cardengine_header_arm9.h

@@ -101,6 +101,7 @@ typedef struct cardengineArm9 {
 		13: softResetMb
 		14: cloneboot
 		15: isDlp
+		16: bypassExceptionHandler
 	*/
 	s32 mainScreen;
 	u32 consoleModel;
@@ -218,6 +219,9 @@ typedef struct cardengineArm9 {
 		4: enableExceptionHandler
 		5: isSdk5
 		6: overlaysCached
+		7: cacheFlushFlag
+		8: cardReadFix
+		9: bypassExceptionHandler
 		13: softResetMb
 	*/
     s32 mainScreen;