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

Mapper 14: Fixed some CHR banking issues

Browse source
This commit is contained in:
Sour 2018-06-17 16:42:49 -04:00
parent 2929a7c738
commit c07a995df4
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Core/MMC3_14.h
View file

@ -29,20 +29,20 @@ protected:
Stream(_mode, _vrcMirroring, prgRegs, chrRegs); Stream(_mode, _vrcMirroring, prgRegs, chrRegs);
} }
virtual void SelectCHRPage(uint16_t slot, uint16_t page, ChrMemoryType memoryType = ChrMemoryType::Default) override void UpdateChrMapping() override
{ {
if(_mode & 0x02) { int slotSwap = (GetState().Reg8000 & 0x80) ? 4 : 0;
if(slot <= 3) { int outerBank0 = (_mode & 0x08) ? 0x100 : 0;
if(!_chrMode && (_mode & 0x80) || _chrMode && slot <= 1 && (_mode & 0x20) || _chrMode && slot >= 2 && (_mode & 0x08)) { int outerBank1 = (_mode & 0x20) ? 0x100 : 0;
page |= 0x100; int outerBank2 = (_mode & 0x80) ? 0x100 : 0;
} SelectCHRPage(0 ^ slotSwap, outerBank0 | (_registers[0] & (~1)));
} else { SelectCHRPage(1 ^ slotSwap, outerBank0 | _registers[0] | 1);
if(_chrMode && (_mode & 0x80) || !_chrMode && slot <= 5 && (_mode & 0x20) || !_chrMode && slot >= 6 && (_mode & 0x08)) { SelectCHRPage(2 ^ slotSwap, outerBank0 | (_registers[1] & (~1)));
page |= 0x100; SelectCHRPage(3 ^ slotSwap, outerBank0 | _registers[1] | 1);
} SelectCHRPage(4 ^ slotSwap, outerBank1 | _registers[2]);
} SelectCHRPage(5 ^ slotSwap, outerBank1 | _registers[3]);
} SelectCHRPage(6 ^ slotSwap, outerBank2 | _registers[4]);
MMC3::SelectCHRPage(slot, page, memoryType); SelectCHRPage(7 ^ slotSwap, outerBank2 | _registers[5]);
} }
void UpdateVrcState() void UpdateVrcState()