Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates to mappers 268, 351 and 422 #605

Merged
merged 4 commits into from
May 29, 2024
Merged

Updates to mappers 268, 351 and 422 #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ec7f73
M422: Fix an issue in CNROM mode.
May 28, 2024
209b0eb
M351: Correct the emulation of Wai Wai World 2 in VRC4 mode.
May 28, 2024
8c1a624
M268: Add Submappers 10/11.
May 28, 2024
bdbff7f
M422: Correct a problem with Super Mario Bros. 3.
May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/boards/126-422-534.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ static void wrapMirroring(uint8 V) {
static DECLFW(writeWRAM) {
CartBW(A, V);
if ((A &3) ==2) { /* CNROM Bank (D0-D3), Bank Enable (D4-D6) and Bank Enable Lock (D7) */
int latchMask =0xFF &~(EXPREGS[2] &0x80? 0x70: 0x00) &~(EXPREGS [2] >>3 &0x0E);
int latchMask =0xFF &~(EXPREGS[2] &0x80? 0xF0: 0x00) &~(EXPREGS [2] >>3 &0x0E);
EXPREGS[2] =EXPREGS[2] &~latchMask | V &latchMask;
FixMMC3CHR(MMC3_cmd);
} else
Expand All @@ -118,18 +118,27 @@ static DECLFW(writeWRAM) {
EXPREGS[A &3] =V;
FixMMC3PRG(MMC3_cmd);
FixMMC3CHR(MMC3_cmd);
mwrap(A000B); /* After 6001 or 6003 swite */
mwrap(A000B); /* After 6001 or 6003 write */
}
}

static DECLFW(MMC3_CMDWriteA) { /* In mmc3.c, MMC3_cmd is updated *after* FixMMC3PRG is called, but we need MMC3_cmd in wrapPRG, so work around this problem until the MMC3 core is properly rewritten to actually make sense. */
if ((A &0xE001) ==0x8000) {
MMC3_cmd =V;
FixMMC3PRG(MMC3_cmd);
FixMMC3CHR(MMC3_cmd);
} else
MMC3_CMDWrite(A, V);
}

static DECLFW(writeCart) {
if ((EXPREGS[3] &0x09) ==0x09) /* UNROM and ANROM modes treat all writes to $8000-$FFFF as if they were going to $8000-$9FFF */
MMC3_CMDWrite(0x8000 | (EXPREGS[3] &0x08? 1: A) &1, V); /* A0 substitution only looks at bit 3 of register 3 */
MMC3_CMDWriteA(0x8000 | (EXPREGS[3] &0x08? 1: A) &1, V); /* A0 substitution only looks at bit 3 of register 3 */
else
if (A >=0xC000)
MMC3_IRQWrite(A, V ^(invertC000? 0xFF: 0x00)); /* Mapper 534 inverts the MMC3 scanline counter reload value */
else
MMC3_CMDWrite(A, V);
MMC3_CMDWriteA(A, V);
}

static DECLFR(readPRG) {
Expand Down
10 changes: 10 additions & 0 deletions src/boards/268.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,14 @@ static void Mapper268_CHRWrap(uint32 A, uint8 V) {
setchr1r(CHRRAM && EXPREGS[4] &0x01 && (V &0xFE) ==(EXPREGS[4] &0xFE)? 0x10: 0x00, A, V &chrMaskMMC3 | chrOffset | A >>10 &chrMaskGNROM);
}

void Mapper268_MirrorWrap(uint8 V) {
A000B =V;
if ((submapper &~1) ==10 && ~EXPREGS[0] &0x20)
setmirror(EXPREGS[0] &0x10? MI_1: MI_0);
else
setmirror(A000B &1? MI_H: MI_V);
}

static DECLFR(Mapper268_ReadWRAM) {
return A001B &0xA0? CartBR(A): X.DB;
}
Expand All @@ -104,6 +112,7 @@ static DECLFW(Mapper268_WriteReg) {
EXPREGS[index] =V;
FixMMC3PRG(MMC3_cmd);
FixMMC3CHR(MMC3_cmd);
Mapper268_MirrorWrap(A000B);
}
}

Expand Down Expand Up @@ -134,6 +143,7 @@ void Mapper268_Init(CartInfo *info) {
GenMMC3_Init(info, 512, 256, (info->PRGRamSize +info->PRGRamSaveSize) >>10, info->battery);
cwrap = Mapper268_CHRWrap;
pwrap = Mapper268_PRGWrap;
mwrap = Mapper268_MirrorWrap;
info->Power = Mapper268_Power;
info->Reset = Mapper268_Reset;
info->Close = Mapper268_close;
Expand Down
6 changes: 4 additions & 2 deletions src/boards/351.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,9 @@ static DECLFW(writeMMC1) {

static DECLFW(writeVRC4) {
uint8 index;
A =A &0xF000 | (A &0x800? ((A &8? 1: 0) | (A &4? 2: 0)): ((A &4? 1: 0) | (A &8? 2: 0)));
if (~reg[2] &4) A =A &0xF800 | A >>1 &0x3FF; /* A2,A1 -> A1,A0 if 5002.2=1 */
A |=A >>2 &3; /* A3,A2 -> A1,A0 */
if (A &0x800) A =A >>1 &1 | A <<1 &2 | A &~3; /* A8==1 => Swap A1,A0 */
switch (A &0xF000) {
case 0x8000: case 0xA000:
VRC4_prg[A >>13 &1] =V;
Expand Down Expand Up @@ -216,7 +218,7 @@ static DECLFW(writeVRC4) {
}
break;
default:
index =(A -0xB000) >>11 | A >>1 &1;
index =(A -0xB000) >>11 &~1 | A >>1 &1;
if (A &1)
VRC4_chr[index] =VRC4_chr[index] & 0x0F | V <<4;
else
Expand Down
Loading