6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-13 07:30:21 +00:00
Code Issues Projects Releases Wiki Activity

Ensures Codemasters games have the proper initial state.

Browse Source
This commit is contained in:
Thomas Harte 2018-10-19 22:10:14 -04:00
parent 6fff514901
commit f49718e94b
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Machines/MasterSystem/MasterSystem.cpp
View File

@ -108,6 +108,13 @@ class ConcreteMachine:
cartridge_.resize(48*1024); cartridge_.resize(48*1024);
memset(&cartridge_[48*1024 - new_space], 0xff, new_space); memset(&cartridge_[48*1024 - new_space], 0xff, new_space);
} }
if(paging_scheme_ == Target::PagingScheme::Codemasters) {
// The Codemasters cartridges start with pages 0, 1 and 0 again initially visible.
paging_registers_[0] = 0;
paging_registers_[1] = 1;
paging_registers_[2] = 0;
}
page_cartridge(); page_cartridge();
// Load the BIOS if relevant. // Load the BIOS if relevant.
@ -175,12 +182,22 @@ class ConcreteMachine:
break; break;
case CPU::Z80::PartialMachineCycle::Write: case CPU::Z80::PartialMachineCycle::Write:
if(paging_scheme_ == Target::PagingScheme::Sega) {
if(address >= 0xfffd && cartridge_.size() > 48*1024) { if(address >= 0xfffd && cartridge_.size() > 48*1024) {
if(paging_registers_[address - 0xfffd] != *cycle.value) { if(paging_registers_[address - 0xfffd] != *cycle.value) {
paging_registers_[address - 0xfffd] = *cycle.value; paging_registers_[address - 0xfffd] = *cycle.value;
page_cartridge(); page_cartridge();
} }
} }
} else {
// i.e. this is the Codemasters paging scheme.
if(!(address&0x3fff) && address < 0xc000) {
if(paging_registers_[address >> 14] != *cycle.value) {
paging_registers_[address >> 14] = *cycle.value;
page_cartridge();
}
}
}
if(write_pointers_[address >> 10]) write_pointers_[address >> 10][address & 1023] = *cycle.value; if(write_pointers_[address >> 10]) write_pointers_[address >> 10][address & 1023] = *cycle.value;
else LOG("Ignored write to ROM"); else LOG("Ignored write to ROM");
@ -370,8 +387,10 @@ class ConcreteMachine:
c * 0x4000); c * 0x4000);
} }
// The first 1kb doesn't page though. // The first 1kb doesn't page though, if this is the Sega paging scheme.
if(paging_scheme_ == Target::PagingScheme::Sega) {
map(read_pointers_, cartridge_.data(), 0x400, 0x0000); map(read_pointers_, cartridge_.data(), 0x400, 0x0000);
}
} else { } else {
map(read_pointers_, nullptr, 0xc000, 0x0000); map(read_pointers_, nullptr, 0xc000, 0x0000);
} }