From 0a8ab31e6d9db1228735923df7b04e68594d862b Mon Sep 17 00:00:00 2001 From: Simon Aarons <40786398+simonmkwii-dev@users.noreply.github.com> Date: Sat, 13 Oct 2018 20:07:28 +1100 Subject: [PATCH] This shit better not happen again --- Ryujinx.HLE/HOS/Horizon.cs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Ryujinx.HLE/HOS/Horizon.cs b/Ryujinx.HLE/HOS/Horizon.cs index a3eaae4fcd..1ee2f32a1c 100644 --- a/Ryujinx.HLE/HOS/Horizon.cs +++ b/Ryujinx.HLE/HOS/Horizon.cs @@ -243,13 +243,26 @@ namespace Ryujinx.HLE.HOS ControlData = new Nacp(Reader); } - public void LoadNca(string NcaFile) + public void LoadNca(string NcaFile, string PatchNca = null) { FileStream File = new FileStream(NcaFile, FileMode.Open, FileAccess.Read); Nca Nca = new Nca(KeySet, File, true); - LoadNca(Nca, null); + if (PatchNca != null) + { + FileStream BaseNcaFile = new FileStream(PatchNca, FileMode.Open, FileAccess.Read); + + Nca BaseNca = new Nca(KeySet, BaseNcaFile, true); + + Nca.SetBaseNca(BaseNca); + + LoadNca(Nca, null); + } + else + { + LoadNca(Nca, null); + } } public void LoadNsp(string NspFile)