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

Boot: Remove skip_app_loader parameter

This commit is contained in:
JosJuice 2017-08-01 15:25:00 +02:00
parent fea75d045c
commit 42d7dc2e08
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Boot/Boot.h
View File

@ -102,7 +102,7 @@ private:
static void SetupMSR(); static void SetupMSR();
static void SetupBAT(bool is_wii); static void SetupBAT(bool is_wii);
static bool RunApploader(bool is_wii, const DiscIO::Volume& volume); static bool RunApploader(bool is_wii, const DiscIO::Volume& volume);
static bool EmulatedBS2_GC(const DiscIO::Volume* volume, bool skip_app_loader = false); static bool EmulatedBS2_GC(const DiscIO::Volume* volume);
static bool EmulatedBS2_Wii(const DiscIO::Volume* volume); static bool EmulatedBS2_Wii(const DiscIO::Volume* volume);
static bool EmulatedBS2(bool is_wii, const DiscIO::Volume* volume); static bool EmulatedBS2(bool is_wii, const DiscIO::Volume* volume);
static bool Load_BS2(const std::string& boot_rom_filename); static bool Load_BS2(const std::string& boot_rom_filename);

5
Source/Core/Core/Boot/Boot_BS2Emu.cpp
View File

@ -188,7 +188,7 @@ void CBoot::SetupGCMemory()
// GameCube Bootstrap 2 HLE: // GameCube Bootstrap 2 HLE:
// copy the apploader to 0x81200000 // copy the apploader to 0x81200000
// execute the apploader, function by function, using the above utility. // execute the apploader, function by function, using the above utility.
bool CBoot::EmulatedBS2_GC(const DiscIO::Volume* volume, bool skip_app_loader) bool CBoot::EmulatedBS2_GC(const DiscIO::Volume* volume)
{ {
INFO_LOG(BOOT, "Faking GC BS2..."); INFO_LOG(BOOT, "Faking GC BS2...");
@ -213,9 +213,6 @@ bool CBoot::EmulatedBS2_GC(const DiscIO::Volume* volume, bool skip_app_loader)
// Global pointer to Small Data Area Base (Luigi's Mansion's apploader uses it) // Global pointer to Small Data Area Base (Luigi's Mansion's apploader uses it)
PowerPC::ppcState.gpr[13] = ntsc ? 0x81465320 : 0x814b4fc0; PowerPC::ppcState.gpr[13] = ntsc ? 0x81465320 : 0x814b4fc0;
if (skip_app_loader)
return false;
return RunApploader(/*is_wii*/ false, *volume); return RunApploader(/*is_wii*/ false, *volume);
} }