empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mapper 37: Fixed reset & added WRAM write protect behavior for block register

Browse source
This commit is contained in:
Souryo 2016-01-20 20:05:18 -05:00
parent 642faea14a
commit 65edf01c28
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/Console.cpp
View file

@ -147,10 +147,10 @@ void Console::ResetComponents(bool softReset)
_debugger->Step(1);
}
_memoryManager->Reset(softReset);
_ppu->Reset();
_apu->Reset(softReset);
_cpu->Reset(softReset);
_memoryManager->Reset(softReset);
SoundMixer::StopAudio(true);

5
Core/MMC3.h
View file

@ -98,6 +98,11 @@ class MMC3 : public BaseMapper
}
}
bool CanWriteToWorkRam()
{
return _wramEnabled && !_wramWriteProtected;
}
virtual void UpdateState()
{
_currentRegister = _state.Reg8000 & 0x07;

12
Core/MMC3_37.h
View file

@ -17,6 +17,12 @@ protected:
MMC3::StreamState(saving);
}
virtual void Reset(bool softReset)
{
_selectedBlock = 0;
UpdateState();
}
virtual void SelectCHRPage(uint16_t slot, uint16_t page, ChrMemoryType memoryType = ChrMemoryType::Default)
{
if(_selectedBlock >= 4) {
@ -47,8 +53,10 @@ protected:
void WriteRegister(uint16_t addr, uint8_t value)
{
if(addr < 0x8000) {
_selectedBlock = value & 0x07;
UpdateState();
if(CanWriteToWorkRam()) {
_selectedBlock = value & 0x07;
UpdateState();
}
} else {
MMC3::WriteRegister(addr, value);
}