ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

throw an error if the loaded nand region isn't supported by the loaded dsiware title 

this normally wouldn't be needed but people seem to think it's a good idea to shove the same nand file in every region slot in the firmware config
This commit is contained in:
CasualPokePlayer 2023-11-03 05:42:01 -07:00
parent 7d4b21f9c7
commit 169137c204
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/dll/melonDS.wbx.zst
View File

Binary file not shown.

22
waterbox/melon/BizFileManager.cpp
View File

@ -376,6 +376,12 @@ const char* InitNAND(FirmwareSettings& fwSettings, bool clearNand, bool dsiWare)
if (dsiWare)
{
auto rom = GetFileData("dsiware.rom");
if (!rom)
{
return "Failed to obtain DSiWare ROM!";
}
auto tmdData = GetFileData("tmd.rom");
if (!tmdData)
{
@ -390,10 +396,24 @@ const char* InitNAND(FirmwareSettings& fwSettings, bool clearNand, bool dsiWare)
DSi_TMD::TitleMetadata tmd;
memcpy(&tmd, tmdData->first.get(), sizeof(DSi_TMD::TitleMetadata));
if (!mount.ImportTitle("dsiware.rom", tmd, false))
if (!mount.ImportTitle(rom->first.get(), rom->second, tmd, false))
{
return "Loading DSiWare failed!";
}
// verify that the imported title is supported by this NAND
// it will not actually appear otherwise
DSi_NAND::DSiSerialData serialData;
if (!mount.ReadSerialData(serialData))
{
return "Failed to obtain serial data!";
}
auto regionFlags = rom->second > 0x1B0 ? rom->first[0x1B0] : 0;
if (!(regionFlags & (1 << static_cast<u8>(serialData.Region))))
{
return "Loaded NAND region does not support this DSiWare title!";
}
}
}