citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #4678 from wwylele/mii-archive 

archive_ncch: add open source mii archive
This commit is contained in:
Weiyi Wang 2019-03-17 15:54:28 -04:00 committed by GitHub
parent 6f6bfd4b3d 36ae10f555
commit 29c3d72940
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6143 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6139
externals/open_source_archives/include/mii.app.romfs.h vendored Normal file
View File

File diff suppressed because it is too large Load Diff

7
src/core/file_sys/archive_ncch.cpp
View File

@ -22,6 +22,7 @@
#include "core/hle/service/fs/archive.h" #include "core/hle/service/fs/archive.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
#include "country_list.app.romfs.h" #include "country_list.app.romfs.h"
#include "mii.app.romfs.h"
#include "shared_font.app.romfs.h" #include "shared_font.app.romfs.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
@ -130,9 +131,9 @@ ResultVal<std::unique_ptr<FileBackend>> NCCHArchive::OpenFile(const Path& path,
std::vector<u8> archive_data; std::vector<u8> archive_data;
if (high == shared_data_archive) { if (high == shared_data_archive) {
if (low == mii_data) { if (low == mii_data) {
LOG_ERROR(Service_FS, "Failed to get a handle for shared data archive: Mii Data."); LOG_WARNING(Service_FS,
Core::System::GetInstance().SetStatus(Core::System::ResultStatus::ErrorSystemFiles, "Mii data file missing. Loading open source replacement from memory");
"Mii Data"); archive_data = std::vector<u8>(std::begin(MII_DATA), std::end(MII_DATA));
} else if (low == region_manifest) { } else if (low == region_manifest) {
LOG_WARNING( LOG_WARNING(
Service_FS, Service_FS,