diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2021-07-24 16:53:25 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2021-07-24 16:57:12 +0100 |
| commit | b1185fb23992f1b4e3132f2a9755d68c69a73e77 (patch) | |
| tree | fdf979e812d363626c3cd54b4adc70e21b9e1f45 | |
| parent | 1fa527f44c465abdf6de030e8282cef68f51537e (diff) | |
DSPHLE: handle Wii Startup Menu ucode correctly
| -rw-r--r-- | Data/Sys/GameSettings/0000000100000002r1.ini | 14 | ||||
| -rw-r--r-- | Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp | 1 |
3 files changed, 2 insertions, 15 deletions
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<UCodeInterface> 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<AXWiiUCode>(dsphle, crc); |