Emulation/Mesen2
1
0
Fork 0
mirror of https://github.com/SourMesen/Mesen2.git synced 2025-04-02 10:21:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

NES: Added support for mapper 487 (Maxivision 30-in-1)

Browse source
This commit is contained in:
Sour 2025-03-12 20:18:06 +09:00
parent d0a3db20d8
commit 24dfab45de
5 changed files with 97 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Core/Core.vcxproj
View file

@ -25,6 +25,7 @@
<ClInclude Include="NES\Mappers\Homebrew\RainbowAudio.h" />
<ClInclude Include="NES\Debugger\IExtModeMapperDebug.h" />
<ClInclude Include="NES\Mappers\Homebrew\FlashS29.h" />
<ClInclude Include="NES\Mappers\Unlicensed\Mapper487.h" />
<ClInclude Include="NES\OpnInterface.h" />
<ClInclude Include="SMS\Input\ColecoVisionController.h" />
<ClInclude Include="Debugger\AddressInfo.h" />

3
Core/Core.vcxproj.filters
View file

@ -2973,6 +2973,9 @@
<ClInclude Include="SNES\Coprocessors\SufamiTurbo\SufamiTurbo.h">
<Filter>SNES\Coprocessors\SufamiTurbo</Filter>
</ClInclude>
<ClInclude Include="NES\Mappers\Unlicensed\Mapper487.h">
<Filter>NES\Mappers\Unlicensed</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Shared\Video\RotateFilter.cpp">

3
Core/NES/MapperFactory.cpp
View file

@ -243,6 +243,7 @@
#include "NES/Mappers/Unlicensed/Mapper60.h"
#include "NES/Mappers/Unlicensed/Mapper62.h"
#include "NES/Mappers/Unlicensed/Mapper83.h"
#include "NES/Mappers/Unlicensed/Mapper487.h"
#include "NES/Mappers/Unlicensed/Nanjing.h"
#include "NES/Mappers/Unlicensed/Nina01.h"
#include "NES/Mappers/Unlicensed/Nina03_06.h"
@ -601,6 +602,8 @@ BaseMapper* MapperFactory::GetMapperFromID(RomData &romData)
case 366: return new BmcGn45();
case 487: return new Mapper487();
case 513: return new Sachen9602();
//514-517
case 518: return new Dance2000();

8
Core/NES/Mappers/Unlicensed/Mapper234.h
View file

@ -22,6 +22,12 @@ protected:
UpdateState();
}
void Serialize(Serializer& s) override
{
BaseMapper::Serialize(s);
SVArray(_regs, 2);
}
void UpdateState()
{
if(_regs[0] & 0x40) {
@ -63,6 +69,6 @@ protected:
} else {
_regs[1] = value & 0x71;
UpdateState();
}
}
}
};

83
Core/NES/Mappers/Unlicensed/Mapper487.h Normal file
View file

@ -0,0 +1,83 @@
#pragma once
#include "pch.h"
#include "NES/BaseMapper.h"
class Mapper487 : public BaseMapper
{
private:
uint8_t _regs[2] = {};
protected:
uint16_t RegisterStartAddress() override { return 0x4100; }
uint16_t RegisterEndAddress() override { return 0x5FFF; }
uint16_t GetPrgPageSize() override { return 0x8000; }
uint16_t GetChrPageSize() override { return 0x2000; }
void InitMapper() override
{
AddRegisterRange(0x8000, 0xFFFF, MemoryOperation::Write);
UpdateState();
}
void Reset(bool softReset) override
{
_regs[0] = 0;
_regs[1] = 0;
UpdateState();
}
void Serialize(Serializer& s) override
{
BaseMapper::Serialize(s);
SVArray(_regs, 2);
}
void UpdateState()
{
uint8_t prg = _regs[1] & 0x1E;
uint8_t chr = (
((_regs[1] & 0x1E) << 2) |
(_regs[0] & 0x03)
);
if(_regs[1] & 0x40) {
//64kb banks, use inner bank for A15
prg |= (_regs[0] & 0x08) >> 3;
chr |= _regs[0] & 0x04;
} else {
//32kb banks, use outer bank LSB as A15
prg |= _regs[1] & 0x01;
chr |= (_regs[1] & 0x01) << 2;
}
if(_regs[1] & 0x20) {
//Skip first 512kb of PRG/CHR when using 2nd set of prg/chr roms
prg += 0x10;
chr += 0x40;
}
SelectPrgPage(0, prg);
SelectChrPage(0, chr);
SetMirroringType(_regs[1] & 0x80 ? MirroringType::Horizontal : MirroringType::Vertical);
}
void WriteRegister(uint16_t addr, uint8_t value) override
{
if(addr < 0x6000) {
if(addr & 0x100) {
if(addr & 0x80) {
_regs[1] = value;
} else if(!(_regs[1] & 0x20)) {
//NINA03-style register
_regs[0] = value & 0x0F;
}
UpdateState();
}
} else if(_regs[1] & 0x20) {
//Color dreams-style register
_regs[0] = ((value & 0x01) << 3) | ((value & 0x70) >> 4);
UpdateState();
}
}
};