izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug caused by static usage of Core::System::GetInstance()

Browse Source 
Removed unused headers
Removed unneeded code
Optimised code
Added sanity checks
Added SafeCopyFromEmu/SafeCopyToEmu
Set Triforce buttons to be translatable
This commit is contained in:
crediar
2026-02-04 19:38:53 -06:00
committed by Jordan Woyak
parent cc88a1215f
commit 219546cd4d
9 changed files with 347 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DiscIO/VolumeDisc.cpp
+11 -23
View File
@@ -30,41 +30,24 @@ std::string VolumeDisc::GetGameID(const Partition& partition) const
memcpy(id + 1, boot_id->game_id.data() + 2, 2);
switch (boot_id->region_flags)
switch (GetCountry())
{
default:
case 0x02: // JAPAN
case Country::Japan:
id[3] = 'J';
break;
case 0x08: // ASIA
case Country::Taiwan:
id[3] = 'W';
break;
case 0x0E: // USA
case Country::USA:
id[3] = 'E';
break;
case 0x0C: // EXPORT
case Country::Europe:
id[3] = 'P';
break;
}
// There only seem to be three different makers here,
// so we can just check the first char to difference between them.
//
// NAMCO CORPORATION, SEGA CORPORATION and Hitmaker co,ltd.
switch (boot_id->manufacturer[0])
{
case 'N': // NAMCO CORPORATION
id[4] = '8';
id[5] = '2';
break;
default:
case 'H': // Hitmaker co,ltd.
case 'S': // SEGA CORPORATION
id[4] = '6';
id[5] = 'E';
break;
}
memcpy(id + 4, GetMakerID().c_str(), 2);
return DecodeString(id);
}
@@ -133,6 +116,11 @@ std::string VolumeDisc::GetMakerID(const Partition& partition) const
{
const BootID* boot_id = static_cast<const VolumeGC*>(this)->GetTriforceBootID();
// There only seem to be three different makers here,
// so we can just check the first char to difference between them.
//
// NAMCO CORPORATION, SEGA CORPORATION and Hitmaker co,ltd.
switch (boot_id->manufacturer[0])
{
case 'S': // SEGA CORPORATION