piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 15:19:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

ZeldaHLE: Properly implement light command 03.

Browse Source 
On at least one version (AC/Pikmin 1 NTSC) it doesn't even send a sync mail and
just reloops to the dispatcher.
This commit is contained in:
Pierre Bourdon
2015-08-08 18:31:02 +02:00
parent 7f7e036a02
commit 8526a4131c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp
View File

@ -264,6 +264,8 @@ void ZeldaUCode::HandleMailDefault(u32 mail)
void ZeldaUCode::HandleMailLight(u32 mail) void ZeldaUCode::HandleMailLight(u32 mail)
{ {
bool add_command = true;
switch (m_mail_current_state) switch (m_mail_current_state)
{ {
case MailState::WAITING: case MailState::WAITING:
@ -274,11 +276,15 @@ void ZeldaUCode::HandleMailLight(u32 mail)
// for each command - the alternative is to rewrite command handling as // for each command - the alternative is to rewrite command handling as
// an asynchronous procedure, and we wouldn't want that, would we? // an asynchronous procedure, and we wouldn't want that, would we?
Write32(mail); Write32(mail);
switch ((mail >> 24) & 0x7F) switch ((mail >> 24) & 0x7F)
{ {
case 0: m_mail_expected_cmd_mails = 0; break; case 0: m_mail_expected_cmd_mails = 0; break;
case 1: m_mail_expected_cmd_mails = 4; break; case 1: m_mail_expected_cmd_mails = 4; break;
case 2: m_mail_expected_cmd_mails = 2; break; case 2: m_mail_expected_cmd_mails = 2; break;
// Doesn't even register as a command, just rejumps to the dispatcher.
case 3: add_command = false; break;
default: default:
PanicAlert("Received unknown command in light protocol: %08x", mail); PanicAlert("Received unknown command in light protocol: %08x", mail);
break; break;
@ -287,7 +293,7 @@ void ZeldaUCode::HandleMailLight(u32 mail)
{ {
SetMailState(MailState::WRITING_CMD); SetMailState(MailState::WRITING_CMD);
} }
else else if (add_command)
{ {
m_pending_commands_count += 1; m_pending_commands_count += 1;
RunPendingCommands(); RunPendingCommands();