From 7f1fe7a6cbae394b524d551b0d40a6ff8650e947 Mon Sep 17 00:00:00 2001 From: "Mateus B. Cassiano" Date: Thu, 24 Dec 2015 15:57:54 -0300 Subject: [PATCH] Always load system fonts from IPL dump, if available --- Source/Core/Core/Boot/Boot.cpp | 2 + Source/Core/Core/HW/EXI_DeviceIPL.cpp | 67 ++++++++++++++++++++++++--- Source/Core/Core/HW/EXI_DeviceIPL.h | 2 + 3 files changed, 64 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp index 0fedaf7961..7a355062af 100644 --- a/Source/Core/Core/Boot/Boot.cpp +++ b/Source/Core/Core/Boot/Boot.cpp @@ -170,6 +170,7 @@ bool CBoot::Load_BS2(const std::string& _rBootROMFilename) const u32 USA_v1_0 = 0x6D740AE7; // https://forums.dolphin-emu.org/Thread-unknown-hash-on-ipl-bin?pid=385344#pid385344 const u32 USA_v1_1 = 0xD5E6FEEA; // https://forums.dolphin-emu.org/Thread-unknown-hash-on-ipl-bin?pid=385334#pid385334 const u32 USA_v1_2 = 0x86573808; // https://forums.dolphin-emu.org/Thread-unknown-hash-on-ipl-bin?pid=385399#pid385399 + const u32 BRA_v1_0 = 0x667D0B64; // GameCubes sold in Brazil have this IPL. Same as USA v1.2 but localized const u32 JAP_v1_0 = 0x6DAC1F2A; // Redump const u32 JAP_v1_1 = 0xD235E3F9; // https://bugs.dolphin-emu.org/issues/8936 const u32 PAL_v1_0 = 0x4F319F43; // Redump @@ -189,6 +190,7 @@ bool CBoot::Load_BS2(const std::string& _rBootROMFilename) case USA_v1_0: case USA_v1_1: case USA_v1_2: + case BRA_v1_0: ipl_region = USA_DIR; break; case JAP_v1_0: diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI_DeviceIPL.cpp index 36962bd826..d8a1f701ea 100644 --- a/Source/Core/Core/HW/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/HW/EXI_DeviceIPL.cpp @@ -101,8 +101,8 @@ CEXIIPL::CEXIIPL() : memcpy(m_pIPL, m_bNTSC ? iplverNTSC : iplverPAL, m_bNTSC ? sizeof(iplverNTSC) : sizeof(iplverPAL)); // Load fonts - LoadFileToIPL((File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + FONT_SJIS), 0x1aff00); - LoadFileToIPL((File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + FONT_ANSI), 0x1fcf00); + LoadFontFile((File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + FONT_SJIS), 0x1aff00); + LoadFontFile((File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + FONT_ANSI), 0x1fcf00); } else { @@ -152,15 +152,68 @@ void CEXIIPL::DoState(PointerWrap &p) void CEXIIPL::LoadFileToIPL(const std::string& filename, u32 offset) { - File::IOFile pStream(filename, "rb"); - if (pStream) - { - u64 filesize = pStream.GetSize(); + File::IOFile stream(filename, "rb"); + if (!stream) + return; - pStream.ReadBytes(m_pIPL + offset, filesize); + u64 filesize = stream.GetSize(); + + stream.ReadBytes(m_pIPL + offset, filesize); + + m_FontsLoaded = true; +} + +std::string CEXIIPL::FindIPLDump(const std::string& path_prefix) +{ + std::string ipl_dump_path; + + if (File::Exists(path_prefix + DIR_SEP + USA_DIR + DIR_SEP + GC_IPL)) + ipl_dump_path = path_prefix + DIR_SEP + USA_DIR + DIR_SEP + GC_IPL; + else if (File::Exists(path_prefix + DIR_SEP + EUR_DIR + DIR_SEP + GC_IPL)) + ipl_dump_path = path_prefix + DIR_SEP + EUR_DIR + DIR_SEP + GC_IPL; + else if (File::Exists(path_prefix + DIR_SEP + JAP_DIR + DIR_SEP + GC_IPL)) + ipl_dump_path = path_prefix + DIR_SEP + JAP_DIR + DIR_SEP + GC_IPL; + + return ipl_dump_path; +} + +void CEXIIPL::LoadFontFile(const std::string& filename, u32 offset) +{ + // Official IPL fonts are copyrighted. Dolphin ships with a set of free font alternatives but + // unfortunately the bundled fonts have different padding, causing issues with misplaced text + // in some titles. This function check if the user has IPL dumps available and load the fonts + // from those dumps instead of loading the bundled fonts + + // Check for IPL dumps in User folder + std::string ipl_rom_path = FindIPLDump(File::GetUserPath(D_GCUSER_IDX)); + + // If not found, check again in Sys folder + if (ipl_rom_path.empty()) + ipl_rom_path = FindIPLDump(File::GetSysDirectory() + GC_SYS_DIR); + + if (File::Exists(ipl_rom_path)) + { + // The user has an IPL dump, load the font from it + File::IOFile stream(ipl_rom_path, "rb"); + if (!stream) + return; + + // Official Windows-1252 and SJIS fonts present on the IPL dumps are 0x2575 and 0x4a24d bytes + // long respectively, so, determine the size of the font being loaded based on the offset + u64 fontsize = (offset == 0x1aff00) ? 0x4a24d : 0x2575; + + INFO_LOG(BOOT, "Found IPL dump, loading %s font from %s", ((offset == 0x1aff00) ? "SJIS" : "Windows-1252"), (ipl_rom_path).c_str()); + + stream.Seek(offset, 0); + stream.ReadBytes(m_pIPL + offset, fontsize); m_FontsLoaded = true; } + else + { + // No IPL dump available, load bundled font instead + LoadFileToIPL(filename, offset); + } } void CEXIIPL::SetCS(int _iCS) diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.h b/Source/Core/Core/HW/EXI_DeviceIPL.h index 40af936de2..06185be785 100644 --- a/Source/Core/Core/HW/EXI_DeviceIPL.h +++ b/Source/Core/Core/HW/EXI_DeviceIPL.h @@ -71,4 +71,6 @@ private: u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; } void LoadFileToIPL(const std::string& filename, u32 offset); + void LoadFontFile(const std::string& filename, u32 offset); + std::string FindIPLDump(const std::string& path_prefix); };