update for AR decryption, skips passing the verification code back to the AR simulator
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1007 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
9399c2223c
commit
549e3d537f
|
@ -470,7 +470,7 @@ void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry> &ops)
|
||||||
u32 uCodes[1200];
|
u32 uCodes[1200];
|
||||||
int i,ret;
|
int i,ret;
|
||||||
|
|
||||||
for(int i = 0; i < vCodes.size(); ++i)
|
for(i = 0; i < vCodes.size(); ++i)
|
||||||
{
|
{
|
||||||
transform(vCodes[i].begin(), vCodes[i].end(), vCodes[i].begin(), toupper);
|
transform(vCodes[i].begin(), vCodes[i].end(), vCodes[i].begin(), toupper);
|
||||||
//PanicAlert("Encrypted AR Code\n%s", vCodes[i].c_str());
|
//PanicAlert("Encrypted AR Code\n%s", vCodes[i].c_str());
|
||||||
|
@ -483,15 +483,28 @@ void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry> &ops)
|
||||||
}
|
}
|
||||||
else if (!batchdecrypt(uCodes, vCodes.size()<<1))
|
else if (!batchdecrypt(uCodes, vCodes.size()<<1))
|
||||||
{
|
{
|
||||||
PanicAlert("Action Replay Code Decryption Error:\nCRC Check Failed\n\nFirst Code in Block(verification code):\n%s", vCodes[0].c_str());
|
PanicAlert("Action Replay Code Decryption Error:\nCRC Check Failed\n\n"
|
||||||
}
|
"First Code in Block(should be verification code):\n%s", vCodes[0].c_str());
|
||||||
|
|
||||||
for (i = 0; i < (vCodes.size()<<1); i+=2)
|
for (i = 0; i < (vCodes.size()<<1); i+=2)
|
||||||
|
{
|
||||||
|
AREntry op;
|
||||||
|
op.cmd_addr = uCodes[i];
|
||||||
|
op.value = uCodes[i+1];
|
||||||
|
ops.push_back(op);
|
||||||
|
//PanicAlert("Decrypted AR Code without verification code:\n%08X %08X", uCodes[i], uCodes[i+1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
AREntry op;
|
// Skip passing the verification code back
|
||||||
op.cmd_addr = uCodes[i];
|
for (i = 2; i < (vCodes.size()<<1); i+=2)
|
||||||
op.value = uCodes[i+1];
|
{
|
||||||
ops.push_back(op);
|
AREntry op;
|
||||||
//PanicAlert("Decrypted AR Code:\n%08X %08X", uCodes[i], uCodes[i+1]);
|
op.cmd_addr = uCodes[i];
|
||||||
|
op.value = uCodes[i+1];
|
||||||
|
ops.push_back(op);
|
||||||
|
//PanicAlert("Decrypted AR Code:\n%08X %08X", uCodes[i], uCodes[i+1]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,7 +71,6 @@ void LoadActionReplayCodes(IniFile &ini)
|
||||||
|
|
||||||
std::vector<std::string> lines;
|
std::vector<std::string> lines;
|
||||||
std::vector<std::string> encryptedLines;
|
std::vector<std::string> encryptedLines;
|
||||||
std::string oldName;
|
|
||||||
ARCode currentCode;
|
ARCode currentCode;
|
||||||
arCodes.clear();
|
arCodes.clear();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue