ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9954 from Tilka/ax 

DSPHLE: fix problems with older ucodes
This commit is contained in:
Léo Lam 2021-07-29 01:42:24 +02:00 committed by GitHub
parent f0a7602eca f7948ce7c9
commit 0553b4a241
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Data/Sys/GameSettings/0000000100000002r1.ini
View File

@ -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.

4
Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp
View File

@ -27,7 +27,7 @@ AXWiiUCode::AXWiiUCode(DSPHLE* dsphle, u32 crc) : AXUCode(dsphle, crc), m_last_m
INFO_LOG_FMT(DSPHLE, "Instantiating AXWiiUCode"); INFO_LOG_FMT(DSPHLE, "Instantiating AXWiiUCode");
m_old_axwii = (crc == 0xfa450138); m_old_axwii = (crc == 0xfa450138) || (crc == 0x7699af32);
} }
AXWiiUCode::~AXWiiUCode() AXWiiUCode::~AXWiiUCode()
@ -214,7 +214,7 @@ void AXWiiUCode::HandleCommandList()
case CMD_OUTPUT: case CMD_OUTPUT:
case CMD_OUTPUT_DPL2: 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_hi = m_cmdlist[curr_idx++];
addr_lo = m_cmdlist[curr_idx++]; addr_lo = m_cmdlist[curr_idx++];
addr2_hi = m_cmdlist[curr_idx++]; addr2_hi = m_cmdlist[curr_idx++];

3
Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp
View File

@ -275,7 +275,8 @@ std::unique_ptr<UCodeInterface> UCodeFactory(u32 crc, DSPHLE* dsphle, bool wii)
case 0xfa450138: // Wii Sports - PAL case 0xfa450138: // Wii Sports - PAL
case 0xadbc06bd: // Elebits case 0xadbc06bd: // Elebits
case 0x4cc52064: // Bleach: Versus Crusade 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); INFO_LOG_FMT(DSPHLE, "CRC {:08x}: Wii - AXWii chosen", crc);
return std::make_unique<AXWiiUCode>(dsphle, crc); return std::make_unique<AXWiiUCode>(dsphle, crc);