ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix build

This commit is contained in:
alexwjackson 2017-05-30 20:48:35 +00:00
parent 268cf919e8
commit b3a71e8af6
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
trunk/src/boards/vrc2and4.cpp
View File

@ -20,8 +20,8 @@
#include "mapinc.h" #include "mapinc.h"
static bool isPirate, is22; static bool isPirate;
static uint8 reg1mask, reg2mask; static uint8 is22, reg1mask, reg2mask;
static uint16 IRQCount; static uint16 IRQCount;
static uint8 IRQLatch, IRQa; static uint8 IRQLatch, IRQa;
static uint8 prgreg[2], chrreg[8]; static uint8 prgreg[2], chrreg[8];
@ -81,7 +81,7 @@ static void Sync(void) {
} }
static DECLFW(VRC24Write) { static DECLFW(VRC24Write) {
A = A & 0xF000 | !!(A & reg2mask) << 1 | !!(A & regmask1); A = A & 0xF000 | !!(A & reg2mask) << 1 | !!(A & reg1mask);
if ((A >= 0xB000) && (A <= 0xE003)) { if ((A >= 0xB000) && (A <= 0xE003)) {
if (UNIFchrrama) if (UNIFchrrama)
big_bank = (V & 8) << 2; // my personally many-in-one feature ;) just for support pirate cart 2-in-1 big_bank = (V & 8) << 2; // my personally many-in-one feature ;) just for support pirate cart 2-in-1
@ -167,28 +167,6 @@ static void VRC24Close(void) {
WRAM = NULL; WRAM = NULL;
} }
void Mapper21_Init(CartInfo *info) {
isPirate = false;
is22 = false;
reg1mask = 0x42;
reg2mask = 0x84;
VRC24_Init(info);
}
void Mapper22_Init(CartInfo *info) {
isPirate = false;
is22 = true;
reg1mask = 2;
reg2mask = 1;
// no IRQ (all mapper 22 games are VRC2)
// no WRAM
info->Power = VRC24Power;
GameStateRestore = StateRestore;
AddExState(&StateRegs, ~0, 0, 0);
}
static void VRC24_Init(CartInfo *info) { static void VRC24_Init(CartInfo *info) {
info->Power = VRC24Power; info->Power = VRC24Power;
info->Close = VRC24Close; info->Close = VRC24Close;
@ -208,9 +186,31 @@ static void VRC24_Init(CartInfo *info) {
AddExState(&StateRegs, ~0, 0, 0); AddExState(&StateRegs, ~0, 0, 0);
} }
void Mapper21_Init(CartInfo *info) {
isPirate = false;
is22 = 0;
reg1mask = 0x42;
reg2mask = 0x84;
VRC24_Init(info);
}
void Mapper22_Init(CartInfo *info) {
isPirate = false;
is22 = 1;
reg1mask = 2;
reg2mask = 1;
// no IRQ (all mapper 22 games are VRC2)
// no WRAM
info->Power = VRC24Power;
GameStateRestore = StateRestore;
AddExState(&StateRegs, ~0, 0, 0);
}
void Mapper23_Init(CartInfo *info) { void Mapper23_Init(CartInfo *info) {
isPirate = false; isPirate = false;
is22 = false; is22 = 0;
reg2mask = 0x15; reg2mask = 0x15;
reg2mask = 0x2a; reg2mask = 0x2a;
VRC24_Init(info); VRC24_Init(info);
@ -218,7 +218,7 @@ void Mapper23_Init(CartInfo *info) {
void Mapper25_Init(CartInfo *info) { void Mapper25_Init(CartInfo *info) {
isPirate = false; isPirate = false;
is22 = false; is22 = 0;
reg1mask = 0xa; reg1mask = 0xa;
reg2mask = 0x5; reg2mask = 0x5;
VRC24_Init(info); VRC24_Init(info);
@ -226,7 +226,7 @@ void Mapper25_Init(CartInfo *info) {
void UNLT230_Init(CartInfo *info) { void UNLT230_Init(CartInfo *info) {
isPirate = true; isPirate = true;
is22 = false; is22 = 0;
reg1mask = 0x15; reg1mask = 0x15;
reg2mask = 0x2a; reg2mask = 0x2a;
VRC24_Init(info); VRC24_Init(info);