From b1185fb23992f1b4e3132f2a9755d68c69a73e77 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sat, 24 Jul 2021 16:53:25 +0100 Subject: [PATCH 1/2] DSPHLE: handle Wii Startup Menu ucode correctly --- Data/Sys/GameSettings/0000000100000002r1.ini | 14 -------------- Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp | 2 +- Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp | 1 + 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 Data/Sys/GameSettings/0000000100000002r1.ini diff --git a/Data/Sys/GameSettings/0000000100000002r1.ini b/Data/Sys/GameSettings/0000000100000002r1.ini deleted file mode 100644 index b81190e10d..0000000000 --- a/Data/Sys/GameSettings/0000000100000002r1.ini +++ /dev/null @@ -1,14 +0,0 @@ -# 1-2 - System Menu (v1, Startup Disc Menu) - -[Core] -# Values set here will override the main Dolphin settings. -DSPHLE = False - -[OnLoad] -# Add memory patches to be loaded once on boot here. - -[OnFrame] -# Add memory patches to be applied every frame here. - -[ActionReplay] -# Add action replay cheats here. diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp index 289141b60f..6d4b295621 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp @@ -27,7 +27,7 @@ AXWiiUCode::AXWiiUCode(DSPHLE* dsphle, u32 crc) : AXUCode(dsphle, crc), m_last_m INFO_LOG_FMT(DSPHLE, "Instantiating AXWiiUCode"); - m_old_axwii = (crc == 0xfa450138); + m_old_axwii = (crc == 0xfa450138) || (crc == 0x7699af32); } AXWiiUCode::~AXWiiUCode() diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp index 487f8a28ed..ab9459535e 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp @@ -276,6 +276,7 @@ std::unique_ptr UCodeFactory(u32 crc, DSPHLE* dsphle, bool wii) case 0xadbc06bd: // Elebits case 0x4cc52064: // Bleach: Versus Crusade case 0xd9c4bf34: // WiiMenu + case 0x7699af32: // Wii Startup Menu INFO_LOG_FMT(DSPHLE, "CRC {:08x}: Wii - AXWii chosen", crc); return std::make_unique(dsphle, crc); From f7948ce7c91b9b5e879feb4073176eb52e2f2fb4 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sat, 24 Jul 2021 18:22:48 +0100 Subject: [PATCH 2/2] DSPHLE: fix Wii System Menu 1.0 ucode --- Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp | 2 +- Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp index 6d4b295621..2a3df476f9 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp @@ -214,7 +214,7 @@ void AXWiiUCode::HandleCommandList() case CMD_OUTPUT: case CMD_OUTPUT_DPL2: - volume = m_cmdlist[curr_idx++]; + volume = m_crc == 0xd9c4bf34 ? 0x8000 : m_cmdlist[curr_idx++]; addr_hi = m_cmdlist[curr_idx++]; addr_lo = m_cmdlist[curr_idx++]; addr2_hi = m_cmdlist[curr_idx++]; diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp index ab9459535e..7af03c0c52 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp @@ -275,7 +275,7 @@ std::unique_ptr UCodeFactory(u32 crc, DSPHLE* dsphle, bool wii) case 0xfa450138: // Wii Sports - PAL case 0xadbc06bd: // Elebits case 0x4cc52064: // Bleach: Versus Crusade - case 0xd9c4bf34: // WiiMenu + case 0xd9c4bf34: // Wii System Menu 1.0 case 0x7699af32: // Wii Startup Menu INFO_LOG_FMT(DSPHLE, "CRC {:08x}: Wii - AXWii chosen", crc); return std::make_unique(dsphle, crc);