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

Alternate calculation of "CRC" for disks that don't have IDs

This commit is contained in:
LuigiBlood 2019-01-27 21:21:25 +01:00
parent e286d90dab
commit b8c47d0087
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Project64-core/N64System/N64DiskClass.cpp
View File

@ -58,7 +58,19 @@ bool CN64Disk::LoadDiskImage(const char * FileLoc)
m_RomName = RomName; m_RomName = RomName;
m_FileName = FileLoc; m_FileName = FileLoc;
m_DiskIdent.Format("%08X-%08X-C:%X", *(uint32_t *)(&m_DiskImage[0]), *(uint32_t *)(&m_DiskImage[0x43670]), m_DiskImage[0x43670]); if (*(uint32_t *)(&m_DiskImage[0x43670]) != 0)
{
m_DiskIdent.Format("%08X-%08X-C:%X", *(uint32_t *)(&m_DiskImage[0]), *(uint32_t *)(&m_DiskImage[0x43670]), m_DiskImage[0x43670]);
}
else
{
uint32_t crc = 0;
for (uint8_t i = 0; i < 0xE8; i += 4)
{
crc += *(uint32_t *)(m_DiskImage + i);
}
m_DiskIdent.Format("%08X-%08X-C:%X", *(uint32_t *)(&m_DiskImage[0]), crc, m_DiskImage[0x43670]);
}
m_Country = (Country)m_DiskImage[0x43670]; m_Country = (Country)m_DiskImage[0x43670];
if (g_Disk == this) if (g_Disk == this)

23
Source/Project64-core/RomList/RomList.cpp
View File

@ -429,12 +429,12 @@ bool CRomList::LoadDataFromRomFile(const char * FileName, uint8_t * Data, int32_
{ {
//Is a Disk Image //Is a Disk Image
File.SeekToBegin(); File.SeekToBegin();
if (!File.Read(Data, 0x20)) if (!File.Read(Data, 0x100))
{ {
return false; return false;
} }
File.Seek(0x43670, CFileBase::begin); File.Seek(0x43670, CFileBase::begin);
if (!File.Read(Data + 0x20, 0x20)) if (!File.Read(Data + 0x100, 0x20))
{ {
return false; return false;
} }
@ -480,15 +480,22 @@ bool CRomList::FillRomInfo(ROM_INFO * pRomInfo)
else else
{ {
char InternalName[22]; char InternalName[22];
memcpy(InternalName, (void *)(RomData + 0x20), 4); memcpy(InternalName, (void *)(RomData + 0x100), 4);
strcpy(pRomInfo->InternalName, InternalName); strcpy(pRomInfo->InternalName, InternalName);
pRomInfo->CartID[0] = *(RomData + 0x20); pRomInfo->CartID[0] = *(RomData + 0x100);
pRomInfo->CartID[1] = *(RomData + 0x21); pRomInfo->CartID[1] = *(RomData + 0x101);
pRomInfo->CartID[2] = *(RomData + 0x22); pRomInfo->CartID[2] = *(RomData + 0x102);
pRomInfo->Manufacturer = '\0'; pRomInfo->Manufacturer = '\0';
pRomInfo->Country = *(RomData + 0x20); pRomInfo->Country = *(RomData + 0x100);
pRomInfo->CRC1 = *(uint32_t *)(RomData + 0x00); pRomInfo->CRC1 = *(uint32_t *)(RomData + 0x00);
pRomInfo->CRC2 = *(uint32_t *)(RomData + 0x20); pRomInfo->CRC2 = *(uint32_t *)(RomData + 0x100);
if (pRomInfo->CRC2 == 0)
{
for (uint8_t i = 0; i < 0xE8; i += 4)
{
pRomInfo->CRC2 += *(uint32_t *)(RomData + i);
}
}
pRomInfo->CicChip = CIC_NUS_8303; pRomInfo->CicChip = CIC_NUS_8303;
FillRomExtensionInfo(pRomInfo); FillRomExtensionInfo(pRomInfo);
} }