Merge pull request #9954 from Tilka/ax

DSPHLE: fix problems with older ucodes
dolphin-emu · Jul 28, 2021 · 0553b4a · 0553b4a
2 parents f0a7602 + f7948ce
commit 0553b4a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/Data/Sys/GameSettings/0000000100000002r1.ini b/Data/Sys/GameSettings/0000000100000002r1.ini
diff --git 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()
@@ -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
@@ -275,7 +275,8 @@ std::unique_ptr<UCodeInterface> 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<AXWiiUCode>(dsphle, crc);