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

Mapper 112: Fixed mapper issue causing bugs in Zhen Ben Xi You Ji (and rewrote mapper implementation to not rely on MMC3 code)

Browse source
This commit is contained in:
Sour 2019-01-20 09:21:17 -05:00
parent 05f12b4948
commit 79393027f0
1 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
Core/Mapper112.h
View file

@ -3,66 +3,59 @@
#include "stdafx.h"
#include "MMC3.h"
class Mapper112 : public MMC3
class Mapper112 : public BaseMapper
{
private:
uint8_t _currentReg;
uint8_t _outerChrBank;
uint8_t _registers[8];
protected:
uint16_t RegisterStartAddress() override { return 0x8000; }
uint16_t RegisterEndAddress() override { return 0xFFFF; }
uint16_t GetPRGPageSize() override { return 0x2000; }
uint16_t GetCHRPageSize() override { return 0x400; }
void InitMapper() override
{
_currentReg = 0;
_outerChrBank = 0;
MMC3::InitMapper();
memset(_registers, 0, sizeof(_registers));
SetMirroringType(MirroringType::Vertical);
}
AddRegisterRange(0x4020, 0x5FFF, MemoryOperation::Write);
void UpdateMirroring() override
{
SelectPRGPage(2, -2);
SelectPRGPage(3, -1);
UpdateState();
}
void StreamState(bool saving) override
{
MMC3::StreamState(saving);
Stream(_currentReg, _outerChrBank);
ArrayInfo<uint8_t> registers { _registers, 8 };
Stream(registers, _currentReg, _outerChrBank);
}
void SelectCHRPage(uint16_t slot, uint16_t page, ChrMemoryType memoryType) override
void UpdateState()
{
switch(slot){
case 4: page |= (_outerChrBank & 0x10) << 4; break;
case 5: page |= (_outerChrBank & 0x20) << 3; break;
case 6: page |= (_outerChrBank & 0x40) << 2; break;
case 7: page |= (_outerChrBank & 0x80) << 1; break;
}
SelectPRGPage(0, _registers[0]);
SelectPRGPage(1, _registers[1]);
MMC3::SelectCHRPage(slot, page, memoryType);
SelectChrPage2x(0, _registers[2]);
SelectChrPage2x(1, _registers[3]);
SelectCHRPage(4, _registers[4]);
SelectCHRPage(5, _registers[5]);
SelectCHRPage(6, _registers[6]);
SelectCHRPage(7, _registers[7]);
}
void WriteRegister(uint16_t addr, uint8_t value) override
{
switch(addr & 0xE001) {
case 0x8000:
//Adjust register numbers to match MMC3
_currentReg = value & 0x07;
if(_currentReg >= 2) {
_currentReg -= 2;
} else {
_currentReg += 6;
}
break;
case 0xA000:
_registers[_currentReg] = value;
break;
case 0xC000:
_outerChrBank = value;
break;
case 0xE000:
SetMirroringType(value & 0x01 ? MirroringType::Horizontal : MirroringType::Vertical);
break;
case 0x8000: _currentReg = value & 0x07; break;
case 0xA000: _registers[_currentReg] = value; break;
case 0xC000: _outerChrBank = value; break;
case 0xE000: SetMirroringType(value & 0x01 ? MirroringType::Horizontal : MirroringType::Vertical); break;
}
UpdateState();