From 041252ba368e476d924089096acacd6536842828 Mon Sep 17 00:00:00 2001 From: Steveice10 <1269164+Steveice10@users.noreply.github.com> Date: Sat, 1 Apr 2023 20:27:56 -0700 Subject: [PATCH] file_sys: Attempt to open New 3DS variant NCCH if available. (#6383) --- src/core/file_sys/archive_ncch.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/core/file_sys/archive_ncch.cpp b/src/core/file_sys/archive_ncch.cpp index 1b70d0795..23a7f98c2 100644 --- a/src/core/file_sys/archive_ncch.cpp +++ b/src/core/file_sys/archive_ncch.cpp @@ -12,6 +12,7 @@ #include "common/common_types.h" #include "common/file_util.h" #include "common/logging/log.h" +#include "common/settings.h" #include "common/string_util.h" #include "common/swap.h" #include "core/core.h" @@ -88,8 +89,17 @@ ResultVal> NCCHArchive::OpenFile(const Path& path, NCCHFilePath openfile_path; std::memcpy(&openfile_path, binary.data(), sizeof(NCCHFilePath)); - std::string file_path = - Service::AM::GetTitleContentPath(media_type, title_id, openfile_path.content_index); + std::string file_path; + if (Settings::values.is_new_3ds) { + // Try the New 3DS specific variant first. + file_path = Service::AM::GetTitleContentPath(media_type, title_id | 0x20000000, + openfile_path.content_index); + } + if (!Settings::values.is_new_3ds || !FileUtil::Exists(file_path)) { + file_path = + Service::AM::GetTitleContentPath(media_type, title_id, openfile_path.content_index); + } + auto ncch_container = NCCHContainer(file_path, 0, openfile_path.content_index); Loader::ResultStatus result;