Skip to content

SNES: Add support for ExLoRom mapping #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuriks wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −8
Open

SNES: Add support for ExLoRom mapping #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions Core/SNES/BaseCartridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ int32_t BaseCartridge::GetHeaderScore(uint32_t addr)

uint32_t score = 0;
uint8_t mode = (cartInfo.MapMode & ~0x10);
if((mode == 0x20 || mode == 0x22) && addr < 0x8000) {
if((mode == 0x20 || mode == 0x22) && (addr & ~0x400000) < 0x8000) {
score++;
} else if((mode == 0x21 || mode == 0x25) && addr >= 0x8000) {
} else if((mode == 0x21 || mode == 0x25) && (addr & ~0x400000) >= 0x8000) {
score++;
}

Expand Down Expand Up @@ -180,7 +180,7 @@ int32_t BaseCartridge::GetHeaderScore(uint32_t addr)
void BaseCartridge::LoadRom()
{
//Find the best potential header among lorom/hirom + headerless/headered combinations
vector<uint32_t> baseAddresses = { 0, 0x200, 0x8000, 0x8200, 0x408000, 0x408200 };
vector<uint32_t> baseAddresses = { 0, 0x200, 0x8000, 0x8200, 0x400000, 0x400200, 0x408000, 0x408200 };
int32_t bestScore = -1;
bool hasHeader = false;
bool isLoRom = true;
Expand All @@ -206,7 +206,7 @@ void BaseCartridge::LoadRom()
}

if(isLoRom) {
flags |= CartFlags::LoRom;
flags |= isExRom ? CartFlags::ExLoRom : CartFlags::LoRom;
} else {
flags |= isExRom ? CartFlags::ExHiRom : CartFlags::HiRom;
}
Expand All @@ -220,8 +220,6 @@ void BaseCartridge::LoadRom()

if((flags & CartFlags::HiRom) && (_cartInfo.MapMode & 0x27) == 0x25) {
flags |= CartFlags::ExHiRom;
} else if((flags & CartFlags::LoRom) && (_cartInfo.MapMode & 0x27) == 0x22) {
flags |= CartFlags::ExLoRom;
}

if(_cartInfo.MapMode & 0x10) {
Expand Down Expand Up @@ -458,8 +456,12 @@ void BaseCartridge::RegisterHandlers(MemoryMappings& mm)

bool mapSram = _coprocessorType != CoprocessorType::SA1;

if(_flags & CartFlags::LoRom) {
mm.RegisterHandler(0x00, 0x7D, 0x8000, 0xFFFF, _prgRomHandlers);
if(_flags & (CartFlags::LoRom | CartFlags::ExLoRom)) {
if(_flags & CartFlags::ExLoRom) {
mm.RegisterHandler(0x00, 0x7D, 0x8000, 0xFFFF, _prgRomHandlers, 0, 0x400);
} else {
mm.RegisterHandler(0x00, 0x7D, 0x8000, 0xFFFF, _prgRomHandlers);
}
mm.RegisterHandler(0x80, 0xFF, 0x8000, 0xFFFF, _prgRomHandlers);

if(mapSram && _saveRamSize > 0) {
Expand Down
Loading