Merge pull request #12159 from noahpistilli/evc+rgnsel

Add Everybody Votes Channel and Region Select to WiiLink config
dolphin-emu · Sep 4, 2023 · efabcaf · efabcaf
2 parents 3e9c9a3 + fdaa82f
commit efabcaf
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 2 deletions.
diff --git a/Data/Sys/GameSettings/HAJ.ini b/Data/Sys/GameSettings/HAJ.ini
@@ -0,0 +1,9 @@
+# HAJE01, HAJJ01, HAPP01 - Everybody Votes Channel
+
+[WC24Patch]
+$Main
+vt.wapp.wii.com:vt.wiilink24.com:1
+vtp.wapp.wii.com:vtp.wiilink24.com:0
+
+[WC24Patch_Enabled]
+$Main
diff --git a/Data/Sys/GameSettings/HAL.ini b/Data/Sys/GameSettings/HAL.ini
@@ -0,0 +1,19 @@
+# HALE01, HALJ01, HALP01 - Region Select
+
+[OnFrame_Enabled]
+$RSAPatch
+
+[OnFrame]
+# This patch changes the flag in its nwc24dl.bin to not have an RSA signature.
+# Although Dolphin doesn't validate the RSA signature, a real Wii does which is why we added this workaround.
+$RSAPatch
+0x80009DEC:dword:0x60000000
+0x8001AB20:dword:0x38600001
+0x8001AC68:dword:0x38600001
+
+[WC24Patch]
+$Main
+cfh.wapp.wii.com:ch.wiilink24.com:1
+
+[WC24Patch_Enabled]
+$Main
diff --git a/Source/Core/Core/CommonTitles.h b/Source/Core/Core/CommonTitles.h
@@ -39,6 +39,12 @@ constexpr u64 EVERYBODY_VOTES_CHANNEL_NTSC_J = 0x0001000148414a4a;
 
 constexpr u64 EVERYBODY_VOTES_CHANNEL_PAL = 0x0001000148414a50;
 
+constexpr u64 REGION_SELECT_CHANNEL_NTSC_U = 0x0001000848414c45;
+
+constexpr u64 REGION_SELECT_CHANNEL_NTSC_J = 0x0001000848414c4a;
+
+constexpr u64 REGION_SELECT_CHANNEL_PAL = 0x0001000848414c50;
+
 constexpr u64 IOS(u32 major_version)
 {
   return 0x0000000100000000 | major_version;

diff --git a/Source/Core/Core/WC24PatchEngine.cpp b/Source/Core/Core/WC24PatchEngine.cpp
@@ -18,8 +18,7 @@
 
 namespace WC24PatchEngine
 {
-static std::array<u64, 12> s_wc24_channels{
-    // Nintendo Channel
+static constexpr std::array<u64, 15> s_wc24_channels{
     Titles::NINTENDO_CHANNEL_NTSC_U,
     Titles::NINTENDO_CHANNEL_NTSC_J,
     Titles::NINTENDO_CHANNEL_PAL,
@@ -32,6 +31,9 @@ static std::array<u64, 12> s_wc24_channels{
     Titles::EVERYBODY_VOTES_CHANNEL_NTSC_U,
     Titles::EVERYBODY_VOTES_CHANNEL_NTSC_J,
     Titles::EVERYBODY_VOTES_CHANNEL_PAL,
+    Titles::REGION_SELECT_CHANNEL_NTSC_U,
+    Titles::REGION_SELECT_CHANNEL_NTSC_J,
+    Titles::REGION_SELECT_CHANNEL_PAL,
 };
 
 static std::vector<NetworkPatch> s_patches;