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

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:
Shawn Hoffman 2008-10-29 21:23:56 +00:00
parent 9399c2223c
commit 549e3d537f
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/Core/Src/ARDecrypt.cpp
View File

@ -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,10 +483,22 @@ 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
{
// Skip passing the verification code back
for (i = 2; i < (vCodes.size()<<1); i+=2)
{ {
AREntry op; AREntry op;
op.cmd_addr = uCodes[i]; op.cmd_addr = uCodes[i];
@ -494,4 +506,5 @@ void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry> &ops)
ops.push_back(op); ops.push_back(op);
//PanicAlert("Decrypted AR Code:\n%08X %08X", uCodes[i], uCodes[i+1]); //PanicAlert("Decrypted AR Code:\n%08X %08X", uCodes[i], uCodes[i+1]);
} }
}
} }

1
Source/Core/Core/Src/ActionReplay.cpp
View File

@ -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();