mirror of
https://github.com/sanni/cartreader.git
synced 2024-11-30 16:34:14 +01:00
Merge pull request #654 from nsx0r/patch-44
[WIP] solving mappers with bus conflicts
This commit is contained in:
sanni
GitHub
commit
55964248b6
@ -2497,6 +2497,7 @@ void readPRG(boolean readrom) {
|
||||
}
|
||||
|
||||
word base = 0x8000;
|
||||
bool busConflict = false;
|
||||
|
||||
if (myFile) {
|
||||
switch (mapper) {
|
||||
@ -2531,13 +2532,27 @@ void readPRG(boolean readrom) {
|
||||
}
|
||||
break;
|
||||
|
||||
case 2: // 128K/256K
|
||||
for (int i = 0; i < 8; i++) { // 128K/256K
|
||||
write_prg_byte(0x8000, i);
|
||||
for (word address = 0x0; address < (((word)prgsize - 3) * 0x4000) + 0x4000; address += 512) {
|
||||
case 2: // bus conflicts - fixed last bank
|
||||
banks = int_pow(2, prgsize);
|
||||
busConflict = true;
|
||||
for (int i = 0; i < banks-1; i++) {
|
||||
for (int x = 0; x < 0x4000; x++) {
|
||||
if (read_prg_byte(0xC000 + x) == i) {
|
||||
write_prg_byte(0xC000 + x, i);
|
||||
busConflict = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (busConflict) {
|
||||
write_prg_byte(0xC000 + i, i);
|
||||
}
|
||||
for (word address = 0x0; address < 0x4000; address += 512) {
|
||||
dumpPRG(base, address);
|
||||
}
|
||||
}
|
||||
for (word address = 0x4000; address < 0x8000; address += 512) {
|
||||
dumpPRG(base, address);
|
||||
}
|
||||
break;
|
||||
|
||||
case 4:
|
||||
@ -2863,7 +2878,7 @@ void readPRG(boolean readrom) {
|
||||
banks = int_pow(2, prgsize) / 2; // 32k banks
|
||||
for (int i = 0; i < banks; i++) {
|
||||
write_prg_byte(0x6000, (i & 0x1E) >> 1); // high bits
|
||||
write_prg_byte(0x8000, i & 0x01); // low bit
|
||||
write_prg_byte(0x8000, i & 0x01); // low bit
|
||||
for (word address = 0x0; address < 0x8000; address += 512) {
|
||||
dumpPRG(base, address);
|
||||
}
|
||||
@ -3255,7 +3270,7 @@ void readPRG(boolean readrom) {
|
||||
dumpPRG(base, address);
|
||||
}
|
||||
}
|
||||
for (word address = 0x4000; address < 0x8000; address += 512) { // last 16k bank fixed at $C000-$FFFF
|
||||
for (word address = 0x4000; address < 0x8000; address += 512) { // last 16k bank fixed at $C000-$FFFF
|
||||
dumpPRG(base, address);
|
||||
}
|
||||
break;
|
||||
@ -3315,10 +3330,10 @@ void readPRG(boolean readrom) {
|
||||
case 178:
|
||||
banks = int_pow(2, prgsize);
|
||||
write_prg_byte(0x4800, 0); // NROM-256 mode
|
||||
write_prg_byte(0x4803, 0); // set PRG-RAM
|
||||
write_prg_byte(0x4803, 0); // set PRG-RAM
|
||||
for (int i = 0; i < banks; i += 2) {
|
||||
write_prg_byte(0x4802, i >> 3); // high PRG (up to 8 bits?!)
|
||||
write_prg_byte(0x4801, i & 0x07); // low PRG (3 bits)
|
||||
write_prg_byte(0x4801, i & 0x07); // low PRG (3 bits)
|
||||
for (word address = 0x0; address < 0x8000; address += 512) {
|
||||
dumpPRG(base, address);
|
||||
}
|
||||
@ -3863,7 +3878,7 @@ void readCHR(boolean readrom) {
|
||||
}
|
||||
break;
|
||||
|
||||
case 42:
|
||||
case 42:
|
||||
banks = int_pow(2, chrsize);
|
||||
for (int i = 0; i < banks; i++) {
|
||||
write_prg_byte(0x8000, i & 0x0F);
|
||||
@ -3902,11 +3917,11 @@ void readCHR(boolean readrom) {
|
||||
}
|
||||
break;
|
||||
|
||||
case 46:
|
||||
case 46:
|
||||
banks = int_pow(2, chrsize); // 8k banks
|
||||
for (int i = 0; i < banks; i++) {
|
||||
write_prg_byte(0x6000, (i & 0x78) << 1); // high bits
|
||||
write_prg_byte(0x8000, (i & 0x07) << 4); // low bits
|
||||
write_prg_byte(0x8000, (i & 0x07) << 4); // low bits
|
||||
for (word address = 0x0; address < 0x2000; address += 512) {
|
||||
dumpCHR(address);
|
||||
}
|
||||
@ -3915,7 +3930,7 @@ void readCHR(boolean readrom) {
|
||||
|
||||
case 52:
|
||||
banks = int_pow(2, chrsize);
|
||||
write_prg_byte(0xA001, 0x80); // enable WRAM write
|
||||
write_prg_byte(0xA001, 0x80); // enable WRAM write
|
||||
for (int i = 0; i < banks; i++) {
|
||||
write_prg_byte(0x6000, (i & 0x04) << 2 | (i & 0x03) << 4 | 0x40);
|
||||
for (word address = 0x0; address < 0x1000; address += 512) {
|
||||
@ -3935,7 +3950,7 @@ void readCHR(boolean readrom) {
|
||||
}
|
||||
break;
|
||||
|
||||
case 59:
|
||||
case 59:
|
||||
banks = int_pow(2, chrsize) / 2;
|
||||
for (int i = 0; i < banks; i++) {
|
||||
write_prg_byte(0x8000 + (i & 0x07), 0);
|
||||
@ -4186,7 +4201,7 @@ void readCHR(boolean readrom) {
|
||||
}
|
||||
break;
|
||||
|
||||
case 113:
|
||||
case 113:
|
||||
banks = int_pow(2, chrsize) / 2;
|
||||
for (int i = 0; i < banks; i++) {
|
||||
write_prg_byte(0x4100, (i & 0x08) << 3 | (i & 0x07));
|
||||
@ -4196,7 +4211,7 @@ void readCHR(boolean readrom) {
|
||||
}
|
||||
break;
|
||||
|
||||
case 126:
|
||||
case 126:
|
||||
banks = int_pow(2, chrsize) * 2;
|
||||
write_prg_byte(0xA001, 0x80); // enable WRAM
|
||||
write_prg_byte(0x6003, 0x00); // set MMC3 banking mode
|
||||
@ -4212,20 +4227,20 @@ void readCHR(boolean readrom) {
|
||||
}
|
||||
break;
|
||||
|
||||
case 134:
|
||||
banks = int_pow(2, chrsize) * 2;
|
||||
write_prg_byte(0x6000, 0x00); // set MMC3 banking mode
|
||||
for (int i = 0; i < banks; i += 2) {
|
||||
write_prg_byte(0x6001, (i & 0x180) >> 3); // select outer bank
|
||||
write_prg_byte(0x8000, 0); // 2k bank 0 at $0000
|
||||
write_prg_byte(0x8001, i);
|
||||
write_prg_byte(0x8000, 1); // 2k bank 1 at $0800
|
||||
write_prg_byte(0x8001, i + 2);
|
||||
for (word address = 0x0; address < 0x1000; address += 512) {
|
||||
dumpCHR(address);
|
||||
}
|
||||
case 134:
|
||||
banks = int_pow(2, chrsize) * 2;
|
||||
write_prg_byte(0x6000, 0x00); // set MMC3 banking mode
|
||||
for (int i = 0; i < banks; i += 2) {
|
||||
write_prg_byte(0x6001, (i & 0x180) >> 3); // select outer bank
|
||||
write_prg_byte(0x8000, 0); // 2k bank 0 at $0000
|
||||
write_prg_byte(0x8001, i);
|
||||
write_prg_byte(0x8000, 1); // 2k bank 1 at $0800
|
||||
write_prg_byte(0x8001, i + 2);
|
||||
for (word address = 0x0; address < 0x1000; address += 512) {
|
||||
dumpCHR(address);
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case 140: // 32K/128K
|
||||
banks = int_pow(2, chrsize) / 2;
|
||||
@ -4237,7 +4252,7 @@ void readCHR(boolean readrom) {
|
||||
}
|
||||
break;
|
||||
|
||||
case 174: // 64k
|
||||
case 174: // 64k
|
||||
for (int i = 0; i < 8; i++) {
|
||||
write_prg_byte(0xFF00 + (i << 1), 0);
|
||||
for (word address = 0x0; address < 0x2000; address += 512) {
|
||||
@ -4284,7 +4299,7 @@ void readCHR(boolean readrom) {
|
||||
}
|
||||
break;
|
||||
|
||||
case 185: // 8K [READ 32K TO OVERRIDE LOCKOUT]
|
||||
case 185: // 8K [READ 32K TO OVERRIDE LOCKOUT]
|
||||
for (int i = 0; i < 4; i++) { // Read 32K to locate valid 8K
|
||||
write_prg_byte(0x8000, i);
|
||||
byte chrcheck = read_chr_byte(0);
|
||||
@ -4356,7 +4371,7 @@ void readCHR(boolean readrom) {
|
||||
}
|
||||
break;
|
||||
|
||||
case 212:
|
||||
case 212:
|
||||
banks = int_pow(2, chrsize) / 2;
|
||||
for (int i = 0; i < banks; i++) {
|
||||
write_prg_byte(0x8000 + (i & 0x07), 0);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user