Compare commits

...

5 Commits

Author SHA1 Message Date
Luma dadoopa
2f5f30f816 removing trailing whitespace 2018-10-19 22:06:32 -07:00
Luma dadoopa
008928d48b my changes didn't go over apparently :/ 2018-10-19 21:54:40 -07:00
Luma dadoopa
ffb93ad723 fixing up build errors hopefully 2018-10-19 21:37:30 -07:00
Luma dadoopa
3102039a6c removing these files that i forgot to remove 2018-10-19 20:26:46 -07:00
Luma dadoopa
ca85bee161 Adding key dump guide to help tab, i found it annoying to search the site for it 2018-10-19 20:25:44 -07:00
3 changed files with 161 additions and 4 deletions

View File

@@ -450,6 +450,7 @@ void GMainWindow::ConnectMenuEvents() {
connect(ui.action_Rederive, &QAction::triggered, this,
std::bind(&GMainWindow::OnReinitializeKeys, this, ReinitializeKeyBehavior::Warning));
connect(ui.action_About, &QAction::triggered, this, &GMainWindow::OnAbout);
connect(ui.action_Key_Dump, &QAction::triggered, this, &GMainWindow::OnKeyDumpHelp);
}
void GMainWindow::OnDisplayTitleBars(bool show) {
@@ -1008,7 +1009,6 @@ void GMainWindow::OnMenuInstallToNAND() {
if (filename.endsWith("xci", Qt::CaseInsensitive) ||
filename.endsWith("nsp", Qt::CaseInsensitive)) {
std::shared_ptr<FileSys::NSP> nsp;
if (filename.endsWith("nsp", Qt::CaseInsensitive)) {
nsp = std::make_shared<FileSys::NSP>(
@@ -1248,7 +1248,6 @@ void GMainWindow::ToggleWindowMode() {
render_window->setFocus();
game_list->hide();
}
} else {
// Render in a separate window...
ui.horizontalLayout->removeWidget(render_window);
@@ -1283,6 +1282,158 @@ void GMainWindow::OnAbout() {
aboutDialog.exec();
}
void GMainWindow::OnKeyDumpHelp() {
QTextBrowser* textBrowser = new QTextBrowser();
QDesktopWidget dw;
textBrowser->setOpenExternalLinks(true);
textBrowser->setFixedSize(dw.width() * 0.6, dw.height() * 0.9);
textBrowser->setHtml(
"<div class=\"container\"> <div class=\"columns\"> <div class=\"column is-two-thirds\"> "
"<section class=\"section\"> <h1 class=\"title\">Quickstart Guide</h1> <div "
"class=\"content\"> <h1 id=\"yuzu-quickstart-guide\">yuzu Quickstart Guide</h1> <p>To "
"start playing games, yuzu needs a couple of different files and directories from your "
"switch in order to play them properly.</p> <p>This guide will help you copy all of your "
"system files, games, updates, and DLC from your switch to your computer and organize "
"them "
"in a format yuzu understands. This process should take about an hour to an hour and a "
"half.</p> <h2 id=\"prerequisites\">Prerequisites</h2> <ul> <li>A Nintendo Switch "
"vulnerable to fusee-gelee (purchased before July 2018 will definitely work, purchased "
"after has a lower probability of working)</li> <li>An SD card with at least ~29 GB of "
"free space (an almost empty 32GB card will work)</li> <li><a "
"href=\"https://files.sshnuke.net/biskeydumpv6.zip\">biskeydump</a></li> <li><a "
"href=\"https://github.com/CTCaer/hekate/releases/download/v3.2/"
"hekate_ctcaer_3.2.bin\">hekate</a></li> <li><a "
"href=\"https://yuzu-emu.org/help/quickstart/yuzu_copy.bat\">Copy Script</a></li> <li><a "
"href=\"https://files.sshnuke.net/HacDiskMount1055.zip\">HacDiskMount</a></li> <li><a "
"href=\"https://files.sshnuke.net/TegraRcmSmash1213.zip\">TegraRcmSmash</a></li> <li><a "
"href=\"https://zadig.akeo.ie/\">Zadig</a></li> <li><a "
"href=\"https://www.amazon.com/Anker-Portable-Reader-RS-MMC-Micro/dp/B006T9B6R2/"
"ref=sr_1_4?s=pc&amp;ie=UTF8&amp;qid=1538875513&amp;sr=1-4&amp;keywords=micro+sd+card+"
"reader\">microSD Card Reader</a> &ndash; If your computer has one built-in, you can use "
"thatm</li> <li><a "
"href=\"https://www.amazon.com/gp/product/B07FP3PC4R/"
"ref=oh_aui_detailpage_o03_s00?ie=UTF8&amp;psc=1\">RCM Jig</a> &ndash; we highly "
"recommend "
"this one, but you could use any of the methods outlined <a "
"href=\"https://xghostboyx.github.io/RCM-Guide/\">here</a></li> </ul> <p> "
"<code>%YUZU_DIR%</code> is the home directory for yuzu on your computer: - For Windows, "
"this is <code>C:\\Users\\&lt;YourUserName&gt;\\AppData\\Roaming\\yuzu</code> - For Linux, "
"this "
"is <code>~/.local/share/yuzu</code> </p> <h2 id=\"directions\">Directions</h2> <ol> "
"<li>Download this <a href=\"https://yuzu-emu.org/help/quickstart/console.keys\">keys "
"template</a>. It will help make sure you don&rsquo;t miss anything in the next "
"steps.</li> <li> Launch biskeydump on your switch using <a href=\"#rcm\">this sub-guide "
"using the biskeydump.bin file you downloaded earlier</a>. If the background of the QR "
"code is red, retry until it is blue. You can scan the QR code for convenience or copy "
"the "
"codes by typing them into your computer. Our testing has found that QRDroid "
"doesn&rsquo;t "
"work properly but <a "
"href=\"https://play.google.com/store/apps/details?id=com.kaspersky.qrscanner\">QR Code "
"Reader by Kaspersky Lab</a> does. Copy the keys template from step 1 into "
"<code>%YUZU_DIR%/keys</code> and make sure it is still named <code>console.keys</code>. "
"In it, replace the large <code>XXXX...XXX</code> strings with the corresponding key "
"from "
"biskeydump. You should have copied: <ul> <li><code>tsec_key</code></li> "
"<li><code>bis_key_0_crypt</code></li> <li><code>bis_key_0_tweak</code></li> "
"<li><code>bis_key_1_crypt</code></li> <li><code>bis_key_1_tweak</code></li> "
"<li><code>bis_key_2_crypt</code></li> <li><code>bis_key_2_tweak</code></li> </ul> </li> "
"<li> Launch hekate on your switch using <a href=\"#rcm\">this sub-guide except using "
"the "
"hekate_ctcaer_3.2.bin file you downloaded earlier</a>. Navigate hekate using volume up "
"and down to go up and down and power to select. <ul> <li>3a. Select <code>Console "
"info</code> and then <code>Print fuse info</code>. It should print out some data onto "
"your screen and then say <code>Press power to dump to SD card</code>. Press power and "
"it "
"should now say <code>Done</code> and <code>Press volume to go to menu</code>. Press a "
"volume button and then select back in the menu.</li> <li>3b. Select <code>Tools</code> "
"and then select <code>Dump package1/2</code>. After it finishes, it should say "
"<code>Done "
"press any key</code> near the bottom. Press any key to return to the tools menu.</li> "
"<li>3c. Select <code>Backup</code> and then select <code>Backup eMMC BOOT0/1</code>. "
"After it finished filling the progress bar it should say <code>Finished and verified "
"press any key</code>. Press any key to return to the backup menu.</li> <li>3d. Finally, "
"select <code>Backup eMMC Raw GPP</code>. This should take some time as your "
"switch&rsquo;s nand is quite large. If the progress bar appears to go backwards at some "
"points or turn green, do not worry as this is hekate verifying the data. This should "
"take "
"between 40-80 minutes depending on the quality of your SD card.</li> <li>3e. Make sure "
"you power off your switch to avoid damage to your sd card, then open your sd card on "
"your "
"computer. Find the <code>yuzu_copy.bat</code> file you downloaded earlier and copy it "
"to "
"the root of your sd card. Double-click it to start the copy. This should take between "
"10-20 minutes. It should not have any errors listed. If it does, double check and make "
"sure you ran steps 3a-3d correctly.</li> </ul> </li> <li> Open HacDiskMount as "
"Administrator (Right-click and select Run As Administrator) and go to <code>File &gt; "
"Open file</code> and select the rawnand.bin that was copied to your Desktop in step 3e. "
"<ul> <li>4a. Double-click on the row marked <code>PRODINFO</code>. Under the export to "
"file area, click browse and pick somewhere easy to get to, like your Desktop. Dump the "
"file as <code>PRODINFO.bin</code>. Click start and wait for it to complete. Then close "
"the dialog. (NOTE: There is no need to enter any keys in the boxes at the top of the "
"dialog at this moment.)</li> <li>4b. Select the row named "
"<code>BCPKG2-1-Normal-Main</code>. Dump it into the same directory you used last step "
"with the name <code>BCPKG2-1-Normal-Main.bin</code> using the <code>Dump to file</code> "
"button. Again, no keys are necessary at this point. After it finishes, close the "
"dialog</li> <li>4c. Copy the <code>PRODINFO.bin</code> and "
"<code>BCPKG2-1-Normal-Main</code> files to the <code>%YUZU_DIR%/sysdata</code> "
"dir.</li> "
"<li>4d. Double-click on the row named <code>SYSTEM</code>. In the keys boxes, enter "
"<code>bis_key2_crypt</code> in the top one and <code>bis_key2_tweak</code> in the "
"bottom "
"one and click test. If the text is red, double check your keys. Click on "
"<code>Install</code> and wait until it says driver, then click <code>Mount</code>. The "
"application may become unresponsive for a moment. In the new drive (default Z:), there "
"will be a couple of folders with some named <code>Contents</code> and "
"<code>save</code>. "
"Copy all of these into <code>%YUZU_DIR%/nand/system</code>. After this is done, click "
"<code>Unmount</code> and close the dialog.</li> <li>4e. Double-click on the row named "
"<code>USER</code>. Enter the same key. Click <code>Mount</code>, and the tool may "
"become "
"unresponsive again. Once this mounts, open the new drive (usually Z:) and copy the "
"<code>Contents</code> and <code>save</code> folders to "
"<code>%YUZU_DIR%/nand/user</code>. "
"After, click <code>Unmount</code> and close the dialog and then the program.</li> </ul> "
"</li> <li>(OPTIONAL) If you have games or game data stored on your sd card, copy the "
"<code>Nintendo</code> folder of your sd card into <code>%YUZU_DIR%/sdmc</code>.</li> "
"<li>Open yuzu. You should see a dialog with a progress bar informing you that your keys "
"are being derived. If you get a missing file error message, double check the files in "
"your <code>sysdata</code> dir and try again. If there is no errors, a message informing "
"you that it was successful will show and then yuzu will refresh to show you your "
"games.</li> </ol> <h2 id=\"rcm\">RCM</h2> <ol> <li>If you have already used this guide "
"once, skip to step 6.</li> <li>Extract the RCMSmasher zip file you downloaded in the "
"prerequisites. Put the bin file from the step that redirected you here in the same "
"folder.</li> <li>Plug your switch into your computer</li> <li>Download and Open Zadig "
"(prerequisites) and choose APX in the device list. If APX does not show, go to the "
"Options menu and check List all devices. If it still doesn&rsquo;t appear, double check "
"the connection the between the switch and your computer.</li> <li>For Driver type, "
"cycle "
"the arrows until it says libusbK (v3.0.7.0). This is very important.</li> <li>Hit "
"install "
"driver.</li> <li>Power off your switch while it is still connected to your "
"computer.</li> "
"<li>Insert your RCM jig into the right joy-con slot and then press VOL+ and Power at "
"the "
"same time. Nothing should happen. If the switch starts to turn on normally, go back to "
"step 6 and try again.</li> <li>Drag and drop the bin file from step 1 of this guide "
"onto "
"the RCMSmasher.exe program. It should not stay open and your switch should now display "
"some text on it. If it did not, make sure you have carefully followed all of the "
"previous "
"steps and try again.</li> </ol> <h3 "
"id=\"if-you-need-any-help-during-this-process-or-get-a-strange-error-during-or-while-"
"using-yuzu-feel-free-to-ask-for-help-on-the-yuzu-discord-happy-emulating\">If you need "
"any help during this process or get a strange error during or while using yuzu, feel "
"free "
"to ask for help on the <a href=\"https://discordapp.com/invite/u77vRWY\">yuzu "
"discord!</a> Happy Emulating!</h3> <h2 id=\"notes\">Notes</h2> <ul> <li>Should you need "
"to re-run this process (in the event of a firmware update or new games), you can simply "
"update the sysdata files and then go to <code>Help &gt; Reinitialize "
"keys...</code>.</li> "
"</ul> </div> </section> </div> </div> </div>");
textBrowser->show();
}
void GMainWindow::OnToggleFilterBar() {
game_list->setFilterVisible(ui.action_Show_Filter_Bar->isChecked());
if (ui.action_Show_Filter_Bar->isChecked()) {
@@ -1424,7 +1575,6 @@ void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) {
errors += tr("- Missing PRODINFO - Cannot derive title keys\n");
if (!errors.isEmpty()) {
QMessageBox::warning(
this, tr("Warning Missing Derivation Components"),
tr("The following are missing from your configuration that may hinder key "
@@ -1606,4 +1756,4 @@ int main(int argc, char* argv[]) {
int result = app.exec();
detached_tasks.WaitForAllTasks();
return result;
}
}

View File

@@ -165,6 +165,7 @@ private slots:
void OnMenuRecentFile();
void OnConfigure();
void OnAbout();
void OnKeyDumpHelp();
void OnToggleFilterBar();
void OnDisplayTitleBars(bool);
void ToggleFullscreen();

View File

@@ -105,6 +105,7 @@
<addaction name="separator"/>
<addaction name="action_Rederive"/>
<addaction name="action_About"/>
<addaction name="action_Key_Dump"/>
</widget>
<addaction name="menu_File"/>
<addaction name="menu_Emulation"/>
@@ -170,6 +171,11 @@
<string>About yuzu</string>
</property>
</action>
<action name="action_Key_Dump">
<property name="text">
<string>Key Dump Guide</string>
</property>
</action>
<action name="action_Single_Window_Mode">
<property name="checkable">
<bool>true</bool>