From 42d7dc2e08939d9b6944e0ef36ec37c970d884d5 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 1 Aug 2017 15:25:00 +0200 Subject: [PATCH] Boot: Remove skip_app_loader parameter --- Source/Core/Core/Boot/Boot.h | 2 +- Source/Core/Core/Boot/Boot_BS2Emu.cpp | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Boot/Boot.h b/Source/Core/Core/Boot/Boot.h index 265ca79cda..333f0e4fc5 100644 --- a/Source/Core/Core/Boot/Boot.h +++ b/Source/Core/Core/Boot/Boot.h @@ -102,7 +102,7 @@ private: static void SetupMSR(); static void SetupBAT(bool is_wii); 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(bool is_wii, const DiscIO::Volume* volume); static bool Load_BS2(const std::string& boot_rom_filename); diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp index beb59a950d..21503de918 100644 --- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp @@ -188,7 +188,7 @@ void CBoot::SetupGCMemory() // GameCube Bootstrap 2 HLE: // copy the apploader to 0x81200000 // 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..."); @@ -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) PowerPC::ppcState.gpr[13] = ntsc ? 0x81465320 : 0x814b4fc0; - if (skip_app_loader) - return false; - return RunApploader(/*is_wii*/ false, *volume); }