Cleanly separate mappers 361 and 366.

This commit is contained in:
NewRisingSun
2025-09-12 13:36:12 +02:00
parent 2f7bb51349
commit 675d2ab6dd
5 changed files with 119 additions and 6 deletions

54
src/boards/361.c Normal file
View File

@@ -0,0 +1,54 @@
/* FCEUmm - NES/Famicom Emulator
*
* Copyright notice for this file:
* Copyright (C) 2020
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*
*/
#include "mapinc.h"
#include "asic_mmc3.h"
static uint8 reg;
static void sync () {
MMC3_syncPRG(0x0F, reg &~0x0F);
MMC3_syncCHR(0x7F, reg <<3 &~0x7F);
MMC3_syncMirror();
}
static DECLFW (writeReg) {
reg = V;
sync();
}
static void reset () {
reg = 0;
MMC3_clear();
}
static void power () {
reg = 0;
MMC3_power();
}
void Mapper361_Init (CartInfo *info) {
MMC3_init(info, sync, MMC3_TYPE_AX5202P, NULL, NULL, NULL, writeReg);
info->Power = power;
info->Reset = reset;
AddExState(&reg, 1, 0, "EXPR");
}

59
src/boards/366.c Normal file
View File

@@ -0,0 +1,59 @@
/* FCEUmm - NES/Famicom Emulator
*
* Copyright notice for this file:
* Copyright (C) 2020
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*
*/
#include "mapinc.h"
#include "asic_mmc3.h"
#include "cartram.h"
static uint8 reg;
static void sync () {
MMC3_syncWRAM(0);
MMC3_syncPRG(0x0F, reg &~0x0F);
MMC3_syncCHR(0x7F, reg <<3 &~0x7F);
MMC3_syncMirror();
}
static DECLFW (writeReg) {
if (~reg &0x80) {
reg = A &0xFF;
sync();
}
}
static void reset () {
reg = 0;
MMC3_clear();
}
static void power () {
reg = 0;
MMC3_power();
}
void Mapper366_Init (CartInfo *info) {
MMC3_init(info, sync, MMC3_TYPE_AX5202P, NULL, NULL, NULL, writeReg);
WRAM_init(info, 8);
info->Power = power;
info->Reset = reset;
AddExState(&reg, 1, 0, "EXPR");
}

View File

@@ -1311,12 +1311,12 @@ void Mapper367_Init(CartInfo *info) {
/* Mapper 361 and 366, previously assigned as Mapper 205 */
static void GN45PW(uint32 A, uint8 V) {
/* GN-30A - \ED\E0\F7\E0\EB\FC\ED\E0\FF \EC\E0\F1\EA\E0 \E4\EE\EB\E6\ED\E0 \E1\FB\F2\FC 1F + \E0\EF\EF\E0\F0\E0\F2\ED\FB\E9 \EF\E5\F0\E5\EA\EB\FE\F7\E0\F2\E5\EB\FC \ED\E0 \F8\E8\ED\E5 \E0\E4\F0\E5\F1\E0 */
setprg8(A, (V & 0x0f) | EXPREGS[0]);
setprg8(A, (V & 0x0f) | EXPREGS[0] &~0x0F);
}
static void GN45CW(uint32 A, uint8 V) {
/* GN-30A - \ED\E0\F7\E0\EB\FC\ED\E0\FF \EC\E0\F1\EA\E0 \E4\EE\EB\E6\ED\E0 \E1\FB\F2\FC FF */
setchr1(A, (V & 0x7F) | (EXPREGS[0] << 3));
setchr1(A, (V & 0x7F) | (EXPREGS[0] << 3 &~0x7F));
}
static DECLFW(GN45Write0) {

View File

@@ -805,11 +805,11 @@ INES_BOARD_BEGIN()
INES_BOARD( "YY860606C", 358, Mapper358_Init )
INES_BOARD( "SB-5013/GCL8050/841242C", 359, Mapper359_Init )
INES_BOARD( "Bitcorp 31-in-1", 360, Mapper360_Init )
INES_BOARD( "OK-411", 361, GN45_Init ) /* OK-411 is emulated together with GN-45 */
INES_BOARD( "OK-411", 361, Mapper361_Init )
INES_BOARD( "830506C", 362, Mapper362_Init )
INES_BOARD( "5069", 363, Mapper363_Init )
INES_BOARD( "JY830832C", 364, Mapper364_Init )
INES_BOARD( "GN-45", 366, GN45_Init )
INES_BOARD( "GN-45", 366, Mapper366_Init )
INES_BOARD( "JC-016-2 variant", 367, Mapper367_Init )
INES_BOARD( "Yung-08", 368, Mapper368_Init )
INES_BOARD( "N49C-300", 369, Mapper369_Init )

View File

@@ -251,8 +251,6 @@ void Mapper252_Init(CartInfo *);
void Mapper253_Init(CartInfo *);
void Mapper254_Init(CartInfo *);
void Mapper255_Init(CartInfo *);
void GN45_Init(CartInfo *info); /* m361, m366 */
void Mapper270_Init(CartInfo *);
void Mapper272_Init(CartInfo *);
void Mapper273_Init(CartInfo *);
@@ -290,9 +288,11 @@ void Mapper357_Init(CartInfo *);
void Mapper358_Init(CartInfo *);
void Mapper359_Init(CartInfo *);
void Mapper360_Init(CartInfo *);
void Mapper361_Init(CartInfo *);
void Mapper362_Init(CartInfo *);
void Mapper363_Init(CartInfo *);
void Mapper364_Init(CartInfo *);
void Mapper366_Init(CartInfo *);
void Mapper367_Init(CartInfo *);
void Mapper368_Init(CartInfo *);
void Mapper369_Init(CartInfo *);