Revert "Update 441"

This reverts commit 73c868c19e.
This commit is contained in:
LibretroAdmin
2025-02-12 10:40:23 +01:00
parent 73c868c19e
commit 26f92531a9

View File

@@ -1,7 +1,7 @@
/* FCEUmm - NES/Famicom Emulator /* FCEUmm - NES/Famicom Emulator
* *
* Copyright notice for this file: * Copyright notice for this file:
* Copyright (C) 2023-2024 negativeExponent * Copyright (C) 2022
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -18,70 +18,51 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
/* 841026C and 850335C multicart circuit boards */ /* 850335C PCB */
#include "mapinc.h" #include "mapinc.h"
#include "mmc3.h" #include "mmc3.h"
static uint8 reg; static void Mapper441_PRGWrap(uint32 A, uint8 V) {
int prgAND =EXPREGS[0] &0x08? 0x0F: 0x1F;
static void M441PW(uint16 A, uint16 V) { int prgOR =EXPREGS[0] <<4 &0x30;
uint8 mask = (reg & 0x08) ? 0x0F : 0x1F; if (EXPREGS[0] &0x04) {
uint8 base = (reg << 4) & 0x30; if (~A &0x4000) {
setprg8(A, ~2 &V &prgAND | prgOR &~prgAND);
if (reg & 0x04) { setprg8(A |0x4000, 2 |V &prgAND | prgOR &~prgAND);
setprg8(0x8000, (base & ~mask) | ((mmc3.reg[6] & ~0x02) & mask));
setprg8(0xA000, (base & ~mask) | ((mmc3.reg[7] & ~0x02) & mask));
setprg8(0xC000, (base & ~mask) | ((mmc3.reg[6] | 0x02) & mask));
setprg8(0xE000, (base & ~mask) | ((mmc3.reg[7] | 0x02) & mask));
} else {
setprg8(A, (base & ~mask) | (V & mask));
} }
} else
setprg8(A, V &prgAND | prgOR &~prgAND);
} }
static void M441CW(uint16 A, uint16 V) { static void Mapper441_CHRWrap(uint32 A, uint8 V) {
uint16 mask = (reg & 0x40) ? 0x7F : 0xFF; int chrAND =EXPREGS[0] &0x40? 0x7F: 0xFF;
uint16 base = (reg << 3) & 0x180; int chrOR =EXPREGS[0] <<3 &0x180;
setchr1(A, V &chrAND | chrOR &~chrAND);
setchr1(A, (base & ~mask) | (V & mask));
} }
static DECLFW(M441Write) { static DECLFW(Mapper441_Write) {
if (MMC3_WramIsWritable()) { if (~EXPREGS[0] &0x80) EXPREGS[0] =V;
if (!(reg & 0x80)) { FixMMC3PRG(MMC3_cmd);
reg = V; FixMMC3CHR(MMC3_cmd);
MMC3_FixPRG();
MMC3_FixCHR();
} else {
CartBW(A, V);
}
}
} }
static void M441Reset(void) { static void Mapper441_Reset(void) {
reg = 0; EXPREGS[0] =0;
MMC3_Reset(); MMC3RegReset();
} }
static void M441Power(void) { static void Mapper441_Power(void) {
reg = 0; EXPREGS[0] =0;
MMC3_Power(); GenMMC3Power();
SetWriteHandler(0x6000, 0x7FFF, M441Write); SetWriteHandler(0x6000, 0x7FFF, Mapper441_Write);
} }
void Mapper441_Init(CartInfo *info) { void Mapper441_Init(CartInfo *info) {
int ws = (info->PRGRamSize + info->PRGRamSaveSize) / 1024; GenMMC3_Init(info, 256, 256, 0, 0);
cwrap = Mapper441_CHRWrap;
if (!ws) { pwrap = Mapper441_PRGWrap;
if (info->battery) { info->Power = Mapper441_Power;
ws = 8; info->Reset = Mapper441_Reset;
} AddExState(EXPREGS, 1, 0, "EXPR");
}
MMC3_Init(info, MMC3B, ws, info->battery);
MMC3_cwrap = M441CW;
MMC3_pwrap = M441PW;
info->Power = M441Power;
info->Reset = M441Reset;
AddExState(&reg, 1, 0, "EXPR");
} }