Mapper 218 support

This commit is contained in:
Souryo 2016-06-18 18:16:25 -04:00
parent 184be6b1f8
commit bef12d69a8
8 changed files with 74 additions and 27 deletions

View file

@ -341,6 +341,8 @@ void BaseMapper::Initialize(RomData &romData)
memset(_isWriteRegisterAddr, 0, sizeof(_isWriteRegisterAddr));
AddRegisterRange(RegisterStartAddress(), RegisterEndAddress(), MemoryOperation::Any);
_nesHeader = romData.NesHeader;
_mirroringType = romData.MirroringType;
_prgSize = (uint32_t)romData.PrgRom.size();

View file

@ -75,6 +75,7 @@ private:
vector<uint8_t> _originalPrgRom;
protected:
NESHeader _nesHeader;
uint16_t _mapperID;
uint8_t _subMapperID;
@ -168,7 +169,7 @@ public:
void ApplyCheats();
void SetDefaultNametables(uint8_t* nametableA, uint8_t* nametableB);
virtual void SetDefaultNametables(uint8_t* nametableA, uint8_t* nametableB);
GameSystem GetGameSystem();
uint32_t GetCrc32();

View file

@ -420,6 +420,7 @@
<ClInclude Include="Mapper201.h" />
<ClInclude Include="Mapper202.h" />
<ClInclude Include="Mapper203.h" />
<ClInclude Include="Mapper218.h" />
<ClInclude Include="Mapper225.h" />
<ClInclude Include="Mapper226.h" />
<ClInclude Include="Mapper230.h" />

View file

@ -640,6 +640,9 @@
<ClInclude Include="MMC1_155.h">
<Filter>Nes\Mappers\MMC</Filter>
</ClInclude>
<ClInclude Include="Mapper218.h">
<Filter>Nes\Mappers\Unnamed</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">

35
Core/Mapper218.h Normal file
View file

@ -0,0 +1,35 @@
#pragma once
#include "BaseMapper.h"
class Mapper218 : public BaseMapper
{
protected:
uint16_t GetPRGPageSize() { return 0x8000; }
uint16_t GetCHRPageSize() { return 0x2000; }
void InitMapper()
{
SelectPRGPage(0, 0);
if(GetMirroringType() == MirroringType::FourScreens) {
SetMirroringType(_nesHeader.Byte6 & 0x01 ? MirroringType::ScreenBOnly : MirroringType::ScreenAOnly);
}
}
void SetDefaultNametables(uint8_t* nametableA, uint8_t* nametableB)
{
BaseMapper::SetDefaultNametables(nametableA, nametableB);
uint16_t mask = 0;
switch(GetMirroringType()) {
case MirroringType::Vertical: mask = 0x400; break;
case MirroringType::Horizontal: mask = 0x800; break;
case MirroringType::ScreenAOnly: mask = 0x1000; break;
case MirroringType::ScreenBOnly: mask = 0x2000; break;
}
for(int i = 0; i < 8; i++) {
SetPpuMemoryMapping(i * 0x400, i * 0x400 + 0x3FF, (i * 0x400) & mask ? GetNametable(1) : GetNametable(0));
}
}
};

View file

@ -38,6 +38,7 @@
#include "Mapper201.h"
#include "Mapper202.h"
#include "Mapper203.h"
#include "Mapper218.h"
#include "Mapper225.h"
#include "Mapper226.h"
#include "Mapper230.h"
@ -225,6 +226,7 @@ BaseMapper* MapperFactory::GetMapperFromID(RomData &romData)
case 206: return new Namco108();
case 207: return new TaitoX1005(true);
case 210: return new Namco163();
case 218: return new Mapper218();
case 225: return new Mapper225();
case 226: return new Mapper226();
case 230: return new Mapper230();

View file

@ -29,32 +29,6 @@ enum class GameSystem
Unknown,
};
struct RomData
{
string RomName;
string Filename;
uint16_t MapperID;
uint8_t SubMapperID = 0;
GameSystem System = GameSystem::Unknown;
bool HasBattery = false;
bool HasTrainer = false;
MirroringType MirroringType;
int32_t ChrRamSize = -1;
bool IsNes20Header = false;
vector<uint8_t> PrgRom;
vector<uint8_t> ChrRom;
vector<uint8_t> TrainerData;
vector<vector<uint8_t>> FdsDiskData;
vector<uint8_t> RawData;
uint32_t Crc32;
bool Error = false;
};
struct NESHeader
{
/*
@ -220,4 +194,32 @@ struct NESHeader
calculatedLength = sizeof(NESHeader) + 0x4000 * PrgCount + 0x2000 * ChrCount;
}
}
};
struct RomData
{
string RomName;
string Filename;
uint16_t MapperID;
uint8_t SubMapperID = 0;
GameSystem System = GameSystem::Unknown;
bool HasBattery = false;
bool HasTrainer = false;
MirroringType MirroringType;
int32_t ChrRamSize = -1;
bool IsNes20Header = false;
vector<uint8_t> PrgRom;
vector<uint8_t> ChrRom;
vector<uint8_t> TrainerData;
vector<vector<uint8_t>> FdsDiskData;
vector<uint8_t> RawData;
uint32_t Crc32;
bool Error = false;
NESHeader NesHeader;
};

View file

@ -29,6 +29,7 @@ RomData iNesLoader::LoadRom(vector<uint8_t>& romFile)
}
romData.HasTrainer = header.HasTrainer();
romData.ChrRamSize = header.GetChrRamSize();
romData.NesHeader = header;
if(romData.HasTrainer) {
//512-byte trainer at $7000-$71FF (stored before PRG data)