[ctrtool] support more prototype CXIs

SDK 0.10-era CXIs specify the full exheader size of 0x800 in the NCCH header, so allow that.
3DSGuy · Dec 23, 2024 · 7fc7e8d · 7fc7e8d
1 parent 6337c49
commit 7fc7e8d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ctrtool/src/NcchProcess.cpp b/ctrtool/src/NcchProcess.cpp
@@ -143,8 +143,8 @@ void ctrtool::NcchProcess::importHeader()
 
 	}
 
-
-	if (mHeader.header.exhdr_size.unwrap() != 0 && mHeader.header.exhdr_size.unwrap() != sizeof(ntd::n3ds::ExtendedHeader))
+	bool is_proto_exhdr_size = mHeader.header.format_version.unwrap() == ntd::n3ds::NcchCommonHeader::FormatVersion_CXI_PROTOTYPE && mHeader.header.exhdr_size.unwrap() == (sizeof(ntd::n3ds::ExtendedHeader) + sizeof(ntd::n3ds::AccessDescriptor));
+	if (mHeader.header.exhdr_size.unwrap() != 0 && mHeader.header.exhdr_size.unwrap() != sizeof(ntd::n3ds::ExtendedHeader) && !is_proto_exhdr_size)
 	{
 		throw tc::InvalidOperationException(mModuleLabel, fmt::format("NcchHeader has invalid ExHeader size. (0x{:02x})", mHeader.header.exhdr_size.unwrap()));
 	}