From f94d3b5ab1a56469c50096fc2ec5930c8ded5b83 Mon Sep 17 00:00:00 2001
From: Crementif <26669564+Crementif@users.noreply.github.com>
Date: Tue, 26 Mar 2024 02:59:08 +0100
Subject: [PATCH] [WWHD] Port WWHD workarounds to Japanese version

Fixes https://github.com/cemu-project/cemu_graphic_packs/pull/602
---
 .../WindWakerHD_FPSSlowdownFix/patches.txt    |  4 ++++
 .../WindWakerHD_FPSSlowdownFix/rules.txt      |  2 +-
 .../WindWakerHD_IntelFixes/patches.txt        | 11 ++++++++++
 Workarounds/WindWakerHD_IntelFixes/rules.txt  |  2 +-
 Workarounds/WindWakerHD_PictoBox/patches.txt  | 22 ++++++++++++++++++-
 Workarounds/WindWakerHD_PictoBox/rules.txt    |  2 +-
 6 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/Workarounds/WindWakerHD_FPSSlowdownFix/patches.txt b/Workarounds/WindWakerHD_FPSSlowdownFix/patches.txt
index a48ceeec..e836cef4 100644
--- a/Workarounds/WindWakerHD_FPSSlowdownFix/patches.txt
+++ b/Workarounds/WindWakerHD_FPSSlowdownFix/patches.txt
@@ -5,3 +5,7 @@ moduleMatches = 0xB7E748DE
 [WWHDUS] ;Ported to US by M&M
 moduleMatches = 0x475BD29F
 0x025AC25C = nop; SUSPEND OliveOperationMgrThread
+
+[WWHDJP] ;Ported to JP by Crementif
+moduleMatches = 0x74BD3F6A
+0x025AC24C = nop; SUSPEND OliveOperationMgrThread
\ No newline at end of file
diff --git a/Workarounds/WindWakerHD_FPSSlowdownFix/rules.txt b/Workarounds/WindWakerHD_FPSSlowdownFix/rules.txt
index b5c4a242..55929d6c 100644
--- a/Workarounds/WindWakerHD_FPSSlowdownFix/rules.txt
+++ b/Workarounds/WindWakerHD_FPSSlowdownFix/rules.txt
@@ -1,5 +1,5 @@
 [Definition]
-titleIds = 0005000010143500,0005000010143600
+titleIds = 0005000010143400,0005000010143500,0005000010143600
 name = FPS Slowdown
 path = "The Legend of Zelda: The Wind Waker HD/Workarounds/FPS Slowdown"
 description = Fixes slowdown that could occur on weaker hardware.
diff --git a/Workarounds/WindWakerHD_IntelFixes/patches.txt b/Workarounds/WindWakerHD_IntelFixes/patches.txt
index 406bd48c..6d9aa51f 100644
--- a/Workarounds/WindWakerHD_IntelFixes/patches.txt
+++ b/Workarounds/WindWakerHD_IntelFixes/patches.txt
@@ -7,6 +7,7 @@ _emptyString = 0x10166948
 0x0278EED8 = lis r0, _emptyString@ha
 0x0278EEE4 = addic r0, r0, _emptyString@l
 
+
 [WWHDUS] ;ported to US by M&M
 moduleMatches = 0x475BD29F
 
@@ -15,3 +16,13 @@ _emptyString = 0x1016693C
 ;is_useSsaoDirectDraw
 0x0278E618 = lis r0, _emptyString@ha
 0x0278E624 = addic r0, r0, _emptyString@l
+
+
+[WWHDJP] ;ported to JP by Crementif
+moduleMatches = 0x74BD3F6A
+
+_emptyString = 0x1016695C
+
+;is_useSsaoDirectDraw
+0x0278F0F8 = lis r0, _emptyString@ha
+0x0278F104 = addic r0, r0, _emptyString@l
\ No newline at end of file
diff --git a/Workarounds/WindWakerHD_IntelFixes/rules.txt b/Workarounds/WindWakerHD_IntelFixes/rules.txt
index 6bdb8932..0b753dac 100644
--- a/Workarounds/WindWakerHD_IntelFixes/rules.txt
+++ b/Workarounds/WindWakerHD_IntelFixes/rules.txt
@@ -1,5 +1,5 @@
 [Definition]
-titleIds = 0005000010143500,0005000010143600
+titleIds = 0005000010143400,0005000010143500,0005000010143600
 name= Graphical fixes for Intel Integrated GPUs
 path = "The Legend of Zelda: The Wind Waker HD/Workarounds/Intel Integrated GPU Fixes"
 description = Fixes graphical bugs while using an Intel iGPU. Don't use this if you're using a Nvidia or AMD GPU.
diff --git a/Workarounds/WindWakerHD_PictoBox/patches.txt b/Workarounds/WindWakerHD_PictoBox/patches.txt
index 22ae8456..a52c3eb7 100644
--- a/Workarounds/WindWakerHD_PictoBox/patches.txt
+++ b/Workarounds/WindWakerHD_PictoBox/patches.txt
@@ -15,6 +15,7 @@ _sub_exit = 0x022D0138
 0x022D0130 = nop           ; cmp r0, 3
 0x022D0134 = nop           ; bne 0x022D00F0
 
+
 [WW_EUR]
 moduleMatches = 0xB7E748DE
 
@@ -30,4 +31,23 @@ _sub_exit = 0x022D013C
 
 #Third picture
 0x022D0134 = nop           ; cmp r0, 3
-0x022D0138 = nop           ; bne 0x022D00F4
\ No newline at end of file
+0x022D0138 = nop           ; bne 0x022D00F4
+
+
+[WW_JPN]
+moduleMatches = 0x74BD3F6A
+
+_sub_exit = 0x022D0140
+
+#First picture
+0x022D00F0 = nop           ; cmp r0, 1
+0x022D00F4 = b _sub_exit   ; beq 0x022D0140
+
+
+#Second picture
+0x022D011C = nop           ; cmp r0, 2
+0x022D0120 = nop           ; bne 0x022D00F8
+
+#Third picture
+0x022D0138 = nop           ; cmp r0, 3
+0x022D013C = nop           ; bne 0x022D00F8
\ No newline at end of file
diff --git a/Workarounds/WindWakerHD_PictoBox/rules.txt b/Workarounds/WindWakerHD_PictoBox/rules.txt
index 2c7bb74e..c61b489c 100644
--- a/Workarounds/WindWakerHD_PictoBox/rules.txt
+++ b/Workarounds/WindWakerHD_PictoBox/rules.txt
@@ -1,5 +1,5 @@
 [Definition]
-titleIds = 0005000010143500,0005000010143600
+titleIds = 0005000010143400,0005000010143500,0005000010143600
 name = Picto-Box Fix
 path = "The Legend of Zelda: The Wind Waker HD/Workarounds/Picto-Box Fix"
 description = This is more of a cheat than workaround. Forces Lenzo to accept any pictures in the quest 'Lenzo's Research Assistant'. Made by Vladimir-1799.