mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 17:53:22 +02:00
submission_package: Account for multi-content NSPs
Previously we assumed a submission package can only contain one Program NCA with a single TitleID. However, Super Mario 3D All-Stars contains four Program NCAs, each with their unique TitleIDs. This accounts for the existence of multi-content games such as this one. - Fixes booting Super Mario 3D All-Stars from the games list.
This commit is contained in:
parent
5fc6bf96d8
commit
41c2f5200c
@ -267,9 +267,9 @@ void NSP::ReadNCAs(const std::vector<VirtualFile>& files) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const CNMT cnmt(inner_file);
|
const CNMT cnmt(inner_file);
|
||||||
auto& ncas_title = ncas[cnmt.GetTitleID()];
|
|
||||||
|
|
||||||
ncas_title[{cnmt.GetType(), ContentRecordType::Meta}] = nca;
|
ncas[cnmt.GetTitleID()][{cnmt.GetType(), ContentRecordType::Meta}] = nca;
|
||||||
|
|
||||||
for (const auto& rec : cnmt.GetContentRecords()) {
|
for (const auto& rec : cnmt.GetContentRecords()) {
|
||||||
const auto id_string = Common::HexToString(rec.nca_id, false);
|
const auto id_string = Common::HexToString(rec.nca_id, false);
|
||||||
auto next_file = pfs->GetFile(fmt::format("{}.nca", id_string));
|
auto next_file = pfs->GetFile(fmt::format("{}.nca", id_string));
|
||||||
@ -287,12 +287,12 @@ void NSP::ReadNCAs(const std::vector<VirtualFile>& files) {
|
|||||||
|
|
||||||
auto next_nca = std::make_shared<NCA>(std::move(next_file), nullptr, 0);
|
auto next_nca = std::make_shared<NCA>(std::move(next_file), nullptr, 0);
|
||||||
if (next_nca->GetType() == NCAContentType::Program) {
|
if (next_nca->GetType() == NCAContentType::Program) {
|
||||||
program_status[cnmt.GetTitleID()] = next_nca->GetStatus();
|
program_status[next_nca->GetTitleId()] = next_nca->GetStatus();
|
||||||
}
|
}
|
||||||
if (next_nca->GetStatus() == Loader::ResultStatus::Success ||
|
if (next_nca->GetStatus() == Loader::ResultStatus::Success ||
|
||||||
(next_nca->GetStatus() == Loader::ResultStatus::ErrorMissingBKTRBaseRomFS &&
|
(next_nca->GetStatus() == Loader::ResultStatus::ErrorMissingBKTRBaseRomFS &&
|
||||||
(cnmt.GetTitleID() & 0x800) != 0)) {
|
(next_nca->GetTitleId() & 0x800) != 0)) {
|
||||||
ncas_title[{cnmt.GetType(), rec.type}] = std::move(next_nca);
|
ncas[next_nca->GetTitleId()][{cnmt.GetType(), rec.type}] = std::move(next_nca);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user