6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-25 16:31:42 +00:00
Code Issues Projects Releases Wiki Activity

Corrects 16kb ASCII mapper.

Browse Source 
Also increases hit position acceptance for the 8kb ASCII.
This commit is contained in:
Thomas Harte 2018-01-22 22:13:16 -05:00
parent 8fb4409ebb
commit 6a112edc18
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Machines/MSX/Cartridges/ASCII16kb.hpp
View File

@ -26,11 +26,11 @@ class ASCII16kbROMSlotHandler: public ROMSlotHandler {
break;
case 0xc:
if(address == 0x6000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 8192, 0x4000, 0x4000);
map_.map(slot_, value * 0x4000, 0x4000, 0x4000);
break;
case 0xe:
if(address == 0x7000 || address == 0x77ff) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 8192, 0x8000, 0x4000);
map_.map(slot_, value * 0x4000, 0x8000, 0x4000);
break;
}
}

16
Machines/MSX/Cartridges/ASCII8kb.hpp
View File

@ -25,20 +25,20 @@ class ASCII8kbROMSlotHandler: public ROMSlotHandler {
confidence_counter_.add_miss();
break;
case 0xc:
if(address == 0x6000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 8192, 0x4000, 0x2000);
if(address == 0x6000 || address == 0x60ff) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 0x2000, 0x4000, 0x2000);
break;
case 0xd:
if(address == 0x6800) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 8192, 0x6000, 0x2000);
if(address == 0x6800 || address == 0x68ff) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 0x2000, 0x6000, 0x2000);
break;
case 0xe:
if(address == 0x7000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 8192, 0x8000, 0x2000);
if(address == 0x7000 || address == 0x70ff) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 0x2000, 0x8000, 0x2000);
break;
case 0xf:
if(address == 0x7800) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 8192, 0xa000, 0x2000);
if(address == 0x7800 || address == 0x78ff) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 0x2000, 0xa000, 0x2000);
break;
}
}

6
Machines/MSX/Cartridges/Konami.hpp
View File

@ -26,15 +26,15 @@ class KonamiROMSlotHandler: public ROMSlotHandler {
break;
case 3:
if(address == 0x6000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 8192, 0x6000, 0x2000);
map_.map(slot_, value * 0x2000, 0x6000, 0x2000);
break;
case 4:
if(address == 0x8000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 8192, 0x8000, 0x2000);
map_.map(slot_, value * 0x2000, 0x8000, 0x2000);
break;
case 5:
if(address == 0xa000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 8192, 0xa000, 0x2000);
map_.map(slot_, value * 0x2000, 0xa000, 0x2000);
break;
}
}

8
Machines/MSX/Cartridges/KonamiWithSCC.hpp
View File

@ -27,11 +27,11 @@ class KonamiWithSCCROMSlotHandler: public ROMSlotHandler {
break;
case 0x0a:
if(address == 0x5000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 8192, 0x4000, 0x2000);
map_.map(slot_, value * 0x2000, 0x4000, 0x2000);
break;
case 0x0e:
if(address == 0x7000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 8192, 0x6000, 0x2000);
map_.map(slot_, value * 0x2000, 0x6000, 0x2000);
break;
case 0x12:
if(address == 0x9000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
@ -40,7 +40,7 @@ class KonamiWithSCCROMSlotHandler: public ROMSlotHandler {
map_.unmap(slot_, 0x8000, 0x2000);
} else {
scc_is_visible_ = false;
map_.map(slot_, value * 8192, 0x8000, 0x2000);
map_.map(slot_, value * 0x2000, 0x8000, 0x2000);
}
break;
case 0x13:
@ -53,7 +53,7 @@ class KonamiWithSCCROMSlotHandler: public ROMSlotHandler {
break;
case 0x16:
if(address == 0xb000) confidence_counter_.add_hit(); else confidence_counter_.add_equivocal();
map_.map(slot_, value * 8192, 0xa000, 0x2000);
map_.map(slot_, value * 0x2000, 0xa000, 0x2000);
break;
}
}