Merge branch 'master' of gitler.moe:suwako/ares-openbsd
このコミットが含まれているのは:
コミット
24862f7c3b
|
@ -17,6 +17,7 @@ struct HVC_TxROM : Interface { //MMC3
|
||||||
if(id == "HVC-TVROM" ) return new HVC_TxROM(Revision::TVROM);
|
if(id == "HVC-TVROM" ) return new HVC_TxROM(Revision::TVROM);
|
||||||
if(id == "NES-QJ" ) return new HVC_TxROM(Revision::NESQJ);
|
if(id == "NES-QJ" ) return new HVC_TxROM(Revision::NESQJ);
|
||||||
if(id == "PAL-ZZ" ) return new HVC_TxROM(Revision::PALZZ);
|
if(id == "PAL-ZZ" ) return new HVC_TxROM(Revision::PALZZ);
|
||||||
|
if(id == "MC-ACC" ) return new HVC_TxROM(Revision::MCACC);
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,6 +44,7 @@ struct HVC_TxROM : Interface { //MMC3
|
||||||
TVROM,
|
TVROM,
|
||||||
NESQJ,
|
NESQJ,
|
||||||
PALZZ,
|
PALZZ,
|
||||||
|
MCACC,
|
||||||
} revision;
|
} revision;
|
||||||
|
|
||||||
HVC_TxROM(Revision revision) : revision(revision) {}
|
HVC_TxROM(Revision revision) : revision(revision) {}
|
||||||
|
@ -228,11 +230,19 @@ struct HVC_TxROM : Interface { //MMC3
|
||||||
}
|
}
|
||||||
|
|
||||||
auto ppuAddressBus(n14 address) -> void override {
|
auto ppuAddressBus(n14 address) -> void override {
|
||||||
if(!(characterAddress & 0x1000) && (address & 0x1000)) {
|
bool clocking = false;
|
||||||
|
if (revision != Revision::MCACC) {
|
||||||
|
clocking = !(characterAddress & 0x1000) && (address & 0x1000);
|
||||||
|
} else {
|
||||||
|
clocking = (characterAddress & 0x1000) && !(address & 0x1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (clocking) {
|
||||||
if (irqDelay == 0) {
|
if (irqDelay == 0) {
|
||||||
if (irqCounter == 0) {
|
if (irqCounter == 0) {
|
||||||
irqCounter = irqLatch + 1;
|
irqCounter = irqLatch + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (--irqCounter == 0) {
|
if (--irqCounter == 0) {
|
||||||
if (irqEnable) irqLine = 1;
|
if (irqEnable) irqLine = 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16620,9 +16620,9 @@ game
|
||||||
name: Incredible Crash Dummies, The (USA)
|
name: Incredible Crash Dummies, The (USA)
|
||||||
title: Incredible Crash Dummies, The (USA)
|
title: Incredible Crash Dummies, The (USA)
|
||||||
region: NTSC-U
|
region: NTSC-U
|
||||||
board: HVC-TLROM
|
board: MC-ACC
|
||||||
chip
|
chip
|
||||||
type: MMC3B
|
type: ACCLAIM-MC-ACC
|
||||||
memory
|
memory
|
||||||
type: ROM
|
type: ROM
|
||||||
size: 0x20000
|
size: 0x20000
|
||||||
|
@ -22753,9 +22753,9 @@ game
|
||||||
name: Mickey's Safari in Letterland (USA)
|
name: Mickey's Safari in Letterland (USA)
|
||||||
title: Mickey's Safari in Letterland (USA)
|
title: Mickey's Safari in Letterland (USA)
|
||||||
region: NTSC-U
|
region: NTSC-U
|
||||||
board: HVC-TLROM
|
board: MC-ACC
|
||||||
chip
|
chip
|
||||||
type: MMC3B
|
type: ACCLAIM-MC-ACC
|
||||||
memory
|
memory
|
||||||
type: ROM
|
type: ROM
|
||||||
size: 0x20000
|
size: 0x20000
|
||||||
|
|
|
@ -254,6 +254,9 @@ auto Famicom::analyzeINES(vector<u8>& data) -> string {
|
||||||
s += " board: HVC-HKROM\n";
|
s += " board: HVC-HKROM\n";
|
||||||
s += " chip type=MMC6\n";
|
s += " chip type=MMC6\n";
|
||||||
prgram = 1024;
|
prgram = 1024;
|
||||||
|
} else if (submapper == 3) {
|
||||||
|
s += " board: MC-ACC\n";
|
||||||
|
s += " chip type=ACCLAIM-MC-ACC\n";
|
||||||
} else {
|
} else {
|
||||||
s += " board: HVC-TLROM\n";
|
s += " board: HVC-TLROM\n";
|
||||||
s += " chip type=MMC3B\n";
|
s += " chip type=MMC3B\n";
|
||||||
|
|
読み込み中…
新しいイシューから参照