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

Merge pull request #3414 from booto/set-dtv-bit-for-wads-too 

VI: set the JP bit of VI's DTV reg when needed
This commit is contained in:
Mathew Maidment 2015-12-30 17:47:25 -05:00
parent 330329254c d9e921cc2c
commit 787bf156f0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/Boot/Boot_WiiWAD.cpp
View File

@ -15,6 +15,7 @@
#include "Core/Boot/Boot_DOL.h" #include "Core/Boot/Boot_DOL.h"
#include "Core/HLE/HLE.h" #include "Core/HLE/HLE.h"
#include "Core/HW/Memmap.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.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
@ -88,7 +89,11 @@ bool CBoot::Boot_WiiWAD(const std::string& _pFilename)
// setup Wii memory // setup Wii memory
if (!SetupWiiMemory(ContentLoader.GetCountry())) if (!SetupWiiMemory(ContentLoader.GetCountry()))
return false; return false;
// this sets a bit that is used to detect NTSC-J
if (ContentLoader.GetCountry() == DiscIO::IVolume::COUNTRY_JAPAN)
{
VideoInterface::SetRegionReg('J');
}
// DOL // DOL
const DiscIO::SNANDContent* pContent = ContentLoader.GetContentByIndex(ContentLoader.GetBootIndex()); const DiscIO::SNANDContent* pContent = ContentLoader.GetContentByIndex(ContentLoader.GetBootIndex());
if (pContent == nullptr) if (pContent == nullptr)

1
Source/Core/Core/HW/VideoInterface.cpp
View File

@ -154,6 +154,7 @@ void Preset(bool _bNTSC)
// Say component cable is plugged // Say component cable is plugged
m_DTVStatus.component_plugged = SConfig::GetInstance().bProgressive; m_DTVStatus.component_plugged = SConfig::GetInstance().bProgressive;
m_DTVStatus.ntsc_j = SConfig::GetInstance().bForceNTSCJ;
s_ticks_last_line_start = 0; s_ticks_last_line_start = 0;
s_half_line_count = 1; s_half_line_count = 1;