RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-04 14:08:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/AlexAltea/rpcs3

Browse source 
NOTE: I included some changes of the forks of O1L and Dante38490 to my
fork. However, a conflict appeared while merging their sources with the
ones of DH. I had to resolve this conflict manually and push all the
changes like a new commit, that's why there changes weren't recorded
individually and (probably) won't appear at in the commits list. I am
very sorry for this, I'll try to avoid this in the future.

In order to preserve the authors of those commits, I write this list
here:
O1L: Dummy Modules (cellAudio, cellSaveData, and more)

23ece01a0b

784fc571b3

Dante38490: Spotted and fixed an issue in git-version-gen.cmd

44e8867125

Regarding my changes:
* New lv2 SysCalls implemented (and others improved)
* SDATA unpacker implemented
* Changed layout of sc_table
This commit is contained in:
Alexandro Sánchez Bach 2013-11-09 02:05:58 +01:00
parent 099333c992
commit 60261408c2
24 changed files with 2323 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rpcs3/Gui/MainFrame.cpp
View file

@ -233,7 +233,12 @@ void MainFrame::BootSelf(wxCommandEvent& WXUNUSED(event))
wxString fileIn = ctrl.GetPath();
wxString fileOut = ctrl.GetPath()+".elf";
scetool_decrypt((scetool::s8 *)fileIn.mb_str(), (scetool::s8 *)fileOut.mb_str());
if (!scetool_decrypt((scetool::s8 *)fileIn.mb_str(), (scetool::s8 *)fileOut.mb_str()))
{
ConLog.Write("SELF: Could not decrypt file");
return;
}
Emu.SetPath(ctrl.GetPath()+".elf");
Emu.Load();