admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #497 from NRS-NewRisingSun/mapper-fixes

Browse Source 
Mapper fixes
This commit is contained in:
Autechre
2022-02-16 16:39:29 +01:00
committed by GitHub
parent acfab9f61d 69d3723c37
commit f27adb5209
4 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/boards/396.c
View File

@@ -32,7 +32,7 @@ static void Sync (void) {
setprg16(0x8000, reg[1] << 3 | reg[0] & 7);
setprg16(0xC000, reg[1] << 3 | 7);
setchr8(0);
setmirror(((reg[0] >> 6) & 1) ^ 1);
setmirror(reg[1] &0x60? 0: 1);
}
static DECLFW(M396WriteInnerBank) {

2
src/boards/414.c
View File

@@ -38,7 +38,7 @@ static void Sync(void) {
setprg16(0xC000, latch_addr >> 1);
}
setchr8(latch_data);
setmirror((latch_data & 1) ^ 1);
setmirror((latch_addr & 1) ^ 1);
}
static DECLFW(M414Write) {

30
src/boards/432.c
View File

@@ -24,33 +24,43 @@
#include "mmc3.h"
static void M432CW(uint32 A, uint8 V) {
if (EXPREGS[0] & 4)
setchr1(A, (V & 0x7F) | ((EXPREGS[0] << 7) & 0x80) | ((EXPREGS[0] << 5) & 0x100));
else
setchr1(A, V | ((EXPREGS[0] << 5) & 0x100));
int chrAND = EXPREGS[1] &0x04? 0x7F: 0xFF;
int chrOR = EXPREGS[1] <<7 &0x080 | EXPREGS[1] <<5 &0x100;
setchr1(A, V &chrAND | chrOR &~chrAND);
}
static void M432PW(uint32 A, uint8 V) {
if (EXPREGS[0] & 4)
setprg8(A, (V & 0x0F) | ((EXPREGS[0] << 4) & 0x10) | ((EXPREGS[0] << 1) & 0x20));
else
setprg8(A, (V & 0x1F) | ((EXPREGS[0] << 1) & 0x20));
int prgAND = EXPREGS[1] &0x02? 0x0F: 0x1F;
int prgOR = EXPREGS[1] <<4 &0x10 | EXPREGS[1] <<1 &0x20;
if (A <0xC000 || ~EXPREGS[1] &0x40) setprg8(A, V &prgAND | prgOR &~prgAND);
if (A <0xC000 && EXPREGS[1] &0x40) setprg8(A |0x4000, V &prgAND | prgOR &~prgAND);
}
static DECLFR(M432Read) {
if (EXPREGS[0] &1)
return EXPREGS[2];
return CartBR(A);
}
static DECLFW(M432Write) {
EXPREGS[0] = V;
EXPREGS[A &1] = V;
FixMMC3PRG(MMC3_cmd);
FixMMC3CHR(MMC3_cmd);
}
static void M432Reset(void) {
EXPREGS[0] = 0;
EXPREGS[1] = 0;
EXPREGS[2] = (EXPREGS[2] +1) &3;
MMC3RegReset();
}
static void M432Power(void) {
EXPREGS[0] = 0;
EXPREGS[1] = 0;
EXPREGS[2] = 0;
GenMMC3Power();
SetReadHandler(0x8000, 0xFFFF, M432Read);
SetWriteHandler(0x6000, 0x7FFF, M432Write);
}
@@ -60,5 +70,5 @@ void Mapper432_Init(CartInfo *info) {
pwrap = M432PW;
info->Power = M432Power;
info->Reset = M432Reset;
AddExState(EXPREGS, 1, 0, "EXPR");
AddExState(EXPREGS, 3, 0, "EXPR");
}

7
src/boards/554.c
View File

@@ -43,17 +43,18 @@ static void Sync(void) {
}
static DECLFR(M554Read) {
if ((A >= 0xCAB6) && (A < 0xCAD7))
int A1 = A &~1;
if ((A >= 0xCAB6) && (A <= 0xCAD7))
{
reg = (A >> 2) & 0x0F;
Sync();
}
else if ((A == 0xEBE2) || (A == 0xEE32))
else if ((A1 == 0xEBE2) || (A1 == 0xEE32))
{
reg = (A >> 2) & 0x0F;
Sync();
}
else if (A == 0xFFFC)
else if (A1 == 0xFFFC)
{
reg = (A >> 2) & 0x0F;
Sync();