diff options
| author | JMC47 <JMC4789@gmail.com> | 2023-09-04 12:00:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-04 12:00:02 -0400 |
| commit | efabcaf6eaa4edca1e2472968c817f621a30eecf (patch) | |
| tree | 825c2a2aff38bbac4b9ddbfd358f68fc7f79a227 | |
| parent | 3e9c9a3e8de5ebe6ec7a247fcb218645c2be640f (diff) | |
| parent | fdaa82f96ddfe7818207cc3930e683fe8ddff1bc (diff) | |
Merge pull request #12159 from noahpistilli/evc+rgnsel
Add Everybody Votes Channel and Region Select to WiiLink config
| -rw-r--r-- | Data/Sys/GameSettings/HAJ.ini | 9 | ||||
| -rw-r--r-- | Data/Sys/GameSettings/HAL.ini | 19 | ||||
| -rw-r--r-- | Source/Core/Core/CommonTitles.h | 6 | ||||
| -rw-r--r-- | Source/Core/Core/WC24PatchEngine.cpp | 6 |
4 files changed, 38 insertions, 2 deletions
diff --git a/Data/Sys/GameSettings/HAJ.ini b/Data/Sys/GameSettings/HAJ.ini new file mode 100644 index 0000000000..97da4f2deb --- /dev/null +++ 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 new file mode 100644 index 0000000000..5d8cd65f8b --- /dev/null +++ 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 index 50c8b4d742..a6043c7cd6 100644 --- 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 index b5092a7feb..aa62ac7580 100644 --- 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; |