diff options
| author | Mathew Maidment <mathew1800@gmail.com> | 2015-12-30 17:47:25 -0500 |
|---|---|---|
| committer | Mathew Maidment <mathew1800@gmail.com> | 2015-12-30 17:47:25 -0500 |
| commit | 787bf156f02c61e0812e8afe673d3bc670dfe717 (patch) | |
| tree | ab564d62de472ba3bcd431263b67e07e0d38945d /Source/Core | |
| parent | 330329254cca72a173ab52bdee41a231371c9c50 (diff) | |
| parent | d9e921cc2c18063640611a2a705ee6e8a73ab0be (diff) | |
Merge pull request #3414 from booto/set-dtv-bit-for-wads-too
VI: set the JP bit of VI's DTV reg when needed
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Boot/Boot_WiiWAD.cpp | 7 | ||||
| -rw-r--r-- | Source/Core/Core/HW/VideoInterface.cpp | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Source/Core/Core/Boot/Boot_WiiWAD.cpp b/Source/Core/Core/Boot/Boot_WiiWAD.cpp index 3ae57817e2..00bca2eb97 100644 --- a/Source/Core/Core/Boot/Boot_WiiWAD.cpp +++ b/Source/Core/Core/Boot/Boot_WiiWAD.cpp @@ -15,6 +15,7 @@ #include "Core/Boot/Boot_DOL.h" #include "Core/HLE/HLE.h" #include "Core/HW/Memmap.h" +#include "Core/HW/VideoInterface.h" #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h" #include "Core/PowerPC/PowerPC.h" @@ -88,7 +89,11 @@ bool CBoot::Boot_WiiWAD(const std::string& _pFilename) // setup Wii memory if (!SetupWiiMemory(ContentLoader.GetCountry())) return false; - + // this sets a bit that is used to detect NTSC-J + if (ContentLoader.GetCountry() == DiscIO::IVolume::COUNTRY_JAPAN) + { + VideoInterface::SetRegionReg('J'); + } // DOL const DiscIO::SNANDContent* pContent = ContentLoader.GetContentByIndex(ContentLoader.GetBootIndex()); if (pContent == nullptr) diff --git a/Source/Core/Core/HW/VideoInterface.cpp b/Source/Core/Core/HW/VideoInterface.cpp index 533a2e166e..19ebe24044 100644 --- a/Source/Core/Core/HW/VideoInterface.cpp +++ b/Source/Core/Core/HW/VideoInterface.cpp @@ -154,6 +154,7 @@ void Preset(bool _bNTSC) // Say component cable is plugged m_DTVStatus.component_plugged = SConfig::GetInstance().bProgressive; + m_DTVStatus.ntsc_j = SConfig::GetInstance().bForceNTSCJ; s_ticks_last_line_start = 0; s_half_line_count = 1; |