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

mapper 99 - fixed 

UNIF SMB2J - now not support SMB2j which is proven bad dump
This commit is contained in:
CaH4e3 2012-12-03 15:26:22 +00:00
parent 6652cec0ae
commit 5ca09c31d5
6 changed files with 278 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/boards/09-034a.cpp Normal file
View File

@ -0,0 +1,67 @@
/* FCE Ultra - NES/Famicom Emulator
*
* Copyright notice for this file:
* Copyright (C) 2007 CaH4e3
*
* 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
*
* FDS Conversions
*
* Super Mario Bros 2 J alt version is a BAD incomplete dump, should be mapper 43
*
* Both Voleyball and Zanac by Whirlind Manu shares the same PCB, but with
* some differences: Voleyball has 8K CHR ROM and 8K ROM at 6000K, Zanac
* have 8K CHR RAM and banked 16K ROM mapper at 6000 as two 8K banks.
*
* PCB for this mapper is "09-034A"
*/
#include "mapinc.h"
static uint8 prg;
static SFORMAT StateRegs[] =
{
{ &prg, 1, "PRG" },
{ 0 }
};
static void Sync(void) {
setprg8r(1, 0x6000, prg);
setprg32(0x8000, 0);
setchr8(0);
}
static DECLFW(UNLSMB2JWrite) {
prg = V & 1;
Sync();
}
static void UNLSMB2JPower(void) {
prg = 0;
Sync();
SetReadHandler(0x6000, 0xFFFF, CartBR);
SetWriteHandler(0x4027, 0x4027, UNLSMB2JWrite);
}
static void StateRestore(int version) {
Sync();
}
void UNLSMB2J_Init(CartInfo *info) {
info->Power = UNLSMB2JPower;
GameStateRestore = StateRestore;
AddExState(&StateRegs, ~0, 0, 0);
}

98
src/boards/smb2j.cpp
View File

@ -1,98 +0,0 @@
/* FCE Ultra - NES/Famicom Emulator
*
* Copyright notice for this file:
* Copyright (C) 2007 CaH4e3
*
* 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
* Super Mario Bros 2 J alt version
* as well as "Voleyball" FDS conversion, bank layot is similar but no bankswitching and CHR ROM present
*
* mapper seems wrongly researched by me ;( it should be mapper 43 modification
*/
#include "mapinc.h"
static uint8 prg, IRQa;
static uint16 IRQCount;
static SFORMAT StateRegs[]=
{
{&prg, 1, "PRG"},
{&IRQa, 1, "IRQA"},
{&IRQCount, 2, "IRQC"},
{0}
};
static void Sync(void)
{
setprg4r(1,0x5000,1);
setprg8r(1,0x6000,1);
setprg32(0x8000,prg);
setchr8(0);
}
static DECLFW(UNLSMB2JWrite)
{
if(A==0x4022)
{
prg=V&1;
Sync();
}
if(A==0x4122)
{
IRQa=V;
IRQCount=0;
X6502_IRQEnd(FCEU_IQEXT);
}
}
static void UNLSMB2JPower(void)
{
prg=~0;
Sync();
SetReadHandler(0x5000,0x7FFF,CartBR);
SetReadHandler(0x8000,0xFFFF,CartBR);
SetWriteHandler(0x4020,0xffff,UNLSMB2JWrite);
}
static void UNLSMB2JReset(void)
{
prg=~0;
Sync();
}
static void UNLSMB2JIRQHook(int a)
{
if(IRQa)
{
IRQCount+=a*3;
if((IRQCount>>12)==IRQa)
X6502_IRQBegin(FCEU_IQEXT);
}
}
static void StateRestore(int version)
{
Sync();
}
void UNLSMB2J_Init(CartInfo *info)
{
info->Reset=UNLSMB2JReset;
info->Power=UNLSMB2JPower;
MapIRQHook=UNLSMB2JIRQHook;
GameStateRestore=StateRestore;
AddExState(&StateRegs, ~0, 0, 0);
}

9
src/fceu.cpp
View File

@ -756,7 +756,14 @@ void FCEU_MemoryRand(uint8 *ptr, uint32 size)
int x=0; int x=0;
while(size) while(size)
{ {
*ptr=(x&4)?0xFF:0x00; *ptr = (x & 4) ? 0xFF : 0x00; // Huang Di DEBUG MODE enabled by default
// Cybernoid NO MUSIC by default
// *ptr = (x & 4) ? 0x7F : 0x00; // Huang Di DEBUG MODE enabled by default
// Minna no Taabou no Nakayoshi Daisakusen DOESN'T BOOT
// Cybernoid NO MUSIC by default
// *ptr = (x & 1) ? 0x55 : 0xAA; // F-15 Sity War HISCORE is screwed...
// 1942 SCORE/HISCORE is screwed...
// *ptr = 0xFF; // Work for all cases
x++; x++;
size--; size--;
ptr++; ptr++;

439
src/vsuni.cpp
View File

@ -34,77 +34,69 @@
#define IOPTION_SWAPDIRAB 0x2 #define IOPTION_SWAPDIRAB 0x2
#define IOPTION_PREDIP 0x10 #define IOPTION_PREDIP 0x10
typedef struct typedef struct {
{ char *name;
char *name; uint64 md5partial;
uint64 md5partial; int mapper;
int mapper; int mirroring;
int mirroring; int ppu;
int ppu; int ioption;
int ioption; int predip;
int predip;
} VSUNIENTRY; } VSUNIENTRY;
VSUNIENTRY *curvs; VSUNIENTRY *curvs;
static uint8 DIPS=0; static uint8 DIPS = 0;
uint8 vsdip=0; uint8 vsdip = 0;
void FCEUI_VSUniToggleDIPView(void) void FCEUI_VSUniToggleDIPView(void) {
{ DIPS = !DIPS;
DIPS=!DIPS;
} }
void FCEU_VSUniToggleDIP(int w) void FCEU_VSUniToggleDIP(int w) {
{ vsdip ^= 1 << w;
vsdip^=1<<w;
} }
void FCEUI_VSUniSetDIP(int w, int state) void FCEUI_VSUniSetDIP(int w, int state) {
{ if (((vsdip >> w) & 1) != state)
if(((vsdip >> w) & 1) != state) FCEUI_VSUniToggleDIP(w);
FCEUI_VSUniToggleDIP(w);
} }
uint8 FCEUI_VSUniGetDIPs(void) uint8 FCEUI_VSUniGetDIPs(void) {
{ return(vsdip);
return(vsdip);
} }
static uint8 secdata[2][32]= static uint8 secdata[2][32] =
{ {
{ {
0xff, 0xbf, 0xb7, 0x97, 0x97, 0x17, 0x57, 0x4f, 0xff, 0xbf, 0xb7, 0x97, 0x97, 0x17, 0x57, 0x4f,
0x6f, 0x6b, 0xeb, 0xa9, 0xb1, 0x90, 0x94, 0x14, 0x6f, 0x6b, 0xeb, 0xa9, 0xb1, 0x90, 0x94, 0x14,
0x56, 0x4e, 0x6f, 0x6b, 0xeb, 0xa9, 0xb1, 0x90, 0x56, 0x4e, 0x6f, 0x6b, 0xeb, 0xa9, 0xb1, 0x90,
0xd4, 0x5c, 0x3e, 0x26, 0x87, 0x83, 0x13, 0x00 0xd4, 0x5c, 0x3e, 0x26, 0x87, 0x83, 0x13, 0x00
}, },
{ {
0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00,
0x00, 0x6F, 0x00, 0x00, 0x00, 0x00, 0x94, 0x00, 0x00, 0x6F, 0x00, 0x00, 0x00, 0x00, 0x94, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
} }
}; };
static uint8 *secptr; static uint8 *secptr;
static uint8 VSindex; static uint8 VSindex;
static DECLFR(VSSecRead) static DECLFR(VSSecRead) {
{ switch (A) {
switch(A) case 0x5e00: VSindex = 0; return X.DB;
{ case 0x5e01: return(secptr[(VSindex++) & 0x1F]);
case 0x5e00: VSindex=0;return X.DB; }
case 0x5e01: return(secptr[(VSindex++)&0x1F]); return(0x00);
}
return(0x00);
} }
uint8 coinon=0; uint8 coinon = 0;
void FCEU_VSUniCoin(void) void FCEU_VSUniCoin(void) {
{ coinon = 6;
coinon=6;
} }
static int curppu; static int curppu;
@ -114,7 +106,7 @@ static int64 curmd5;
#define RP2C04_002 2 #define RP2C04_002 2
#define RP2C04_003 3 #define RP2C04_003 3
#define RP2C05_004 4 #define RP2C05_004 4
#define RCP2C03B 5 #define RCP2C03B 5
#define RC2C05_01 6 #define RC2C05_01 6
#define RC2C05_02 7 #define RC2C05_02 7
#define RC2C05_03 8 #define RC2C05_03 8
@ -123,105 +115,82 @@ static int64 curmd5;
static readfunc OldReadPPU; static readfunc OldReadPPU;
static writefunc OldWritePPU[2]; static writefunc OldWritePPU[2];
static DECLFR(A2002_Gumshoe) static DECLFR(A2002_Gumshoe) {
{ return((OldReadPPU(A) & ~0x3F) | 0x1C);
return( (OldReadPPU(A)&~0x3F) | 0x1C);
} }
static DECLFR(A2002_Topgun) static DECLFR(A2002_Topgun) {
{ return((OldReadPPU(A) & ~0x3F) | 0x1B);
return( (OldReadPPU(A)&~0x3F) | 0x1B);
} }
static DECLFR(A2002_MBJ) // Mighty Bomb Jack static DECLFR(A2002_MBJ) { // Mighty Bomb Jack
{ return((OldReadPPU(A) & ~0x3F) | 0x3D);
return( (OldReadPPU(A)&~0x3F) | 0x3D);
} }
static DECLFW(B2000_2001_2C05) static DECLFW(B2000_2001_2C05) {
{ OldWritePPU[(A & 1) ^ 1](A ^ 1, V);
OldWritePPU[(A&1)^1](A ^ 1, V);
} }
static uint8 xevselect = 0; static uint8 xevselect = 0;
static DECLFR(XevRead) static DECLFR(XevRead) {
{ if (A == 0x54FF) {
//printf("%04x\n",A); return(0x5);
if(A == 0x54FF) } else if (A == 0x5678) {
{ return(xevselect ? 0 : 1);
return(0x5); } else if (A == 0x578F) {
} return(xevselect ? 0xd1 : 0x89);
else if(A == 0x5678) } else if (A == 0x5567) {
{ xevselect ^= 1;
return(xevselect?0:1); return(xevselect ? 0x37 : 0x3E);
} }
else if(A == 0x578F) return(X.DB);
{
return(xevselect?0xd1:0x89);
}
else if(A == 0x5567)
{
xevselect ^=1;
return(xevselect?0x37:0x3E);
}
return(X.DB);
} }
void FCEU_VSUniSwap(uint8 *j0, uint8 *j1) void FCEU_VSUniSwap(uint8 *j0, uint8 *j1) {
{ if (curvs->ioption & IOPTION_SWAPDIRAB) {
if(curvs->ioption & IOPTION_SWAPDIRAB) uint16 t = *j0;
{ *j0 = (*j0 & 0xC) | (*j1 & 0xF3);
uint16 t=*j0; *j1 = (*j1 & 0xC) | (t & 0xF3);
*j0=(*j0&0xC)|(*j1&0xF3); }
*j1=(*j1&0xC)|(t&0xF3);
}
} }
void FCEU_VSUniPower(void) void FCEU_VSUniPower(void) {
{ coinon = 0;
coinon = 0; VSindex = 0;
VSindex = 0;
if(secptr) if (secptr)
SetReadHandler(0x5e00,0x5e01,VSSecRead); SetReadHandler(0x5e00, 0x5e01, VSSecRead);
if(curppu == RC2C05_04) if (curppu == RC2C05_04) {
{ OldReadPPU = GetReadHandler(0x2002);
OldReadPPU = GetReadHandler(0x2002); SetReadHandler(0x2002, 0x2002, A2002_Topgun);
SetReadHandler(0x2002, 0x2002, A2002_Topgun); } else if (curppu == RC2C05_03) {
} OldReadPPU = GetReadHandler(0x2002);
else if(curppu == RC2C05_03) SetReadHandler(0x2002, 0x2002, A2002_Gumshoe);
{ } else if (curppu == RC2C05_02) {
OldReadPPU = GetReadHandler(0x2002); OldReadPPU = GetReadHandler(0x2002);
SetReadHandler(0x2002, 0x2002, A2002_Gumshoe); SetReadHandler(0x2002, 0x2002, A2002_MBJ);
} }
else if(curppu == RC2C05_02) if (curppu == RC2C05_04 || curppu == RC2C05_01 || curppu == RC2C05_03 || curppu == RC2C05_02) {
{ OldWritePPU[0] = GetWriteHandler(0x2000);
OldReadPPU = GetReadHandler(0x2002); OldWritePPU[1] = GetWriteHandler(0x2001);
SetReadHandler(0x2002, 0x2002, A2002_MBJ); SetWriteHandler(0x2000, 0x2001, B2000_2001_2C05);
} }
if(curppu == RC2C05_04 || curppu == RC2C05_01 || curppu == RC2C05_03 || curppu == RC2C05_02) if (curmd5 == 0x2d396247cf58f9faLL) { /* Super Xevious */
{ SetReadHandler(0x5400, 0x57FF, XevRead);
OldWritePPU[0] = GetWriteHandler(0x2000); }
OldWritePPU[1] = GetWriteHandler(0x2001);
SetWriteHandler(0x2000, 0x2001, B2000_2001_2C05);
}
if(curmd5 == 0x2d396247cf58f9faLL) /* Super Xevious */
{
SetReadHandler(0x5400,0x57FF,XevRead);
}
} }
/* Games that will probably not be supported ever(or for a long time), since they require /* Games that will probably not be supported ever(or for a long time), since they require
dual-system: dual-system:
Balloon Fight Balloon Fight
VS Mahjong VS Mahjong
VS Tennis VS Tennis
Wrecking Crew Wrecking Crew
*/ */
/* Games/PPU list. Information copied from MAME. ROMs are exchangable, so don't take /* Games/PPU list. Information copied from MAME. ROMs are exchangable, so don't take
this list as "this game must use this PPU". this list as "this game must use this PPU".
RP2C04-001: RP2C04-001:
- Baseball - Baseball
@ -281,137 +250,127 @@ RC2C05-04:
- Top Gun - Top Gun
*/ */
VSUNIENTRY VSUniGames[] = VSUNIENTRY VSUniGames[] =
{ {
{"Baseball", 0x691d4200ea42be45LL, 99, 2,RP2C04_001,0}, { "Baseball", 0x691d4200ea42be45LL, 99, 2, RP2C04_001, 0 },
{"Battle City", 0x8540949d74c4d0ebLL, 99, 2,RP2C04_001,0}, { "Battle City", 0x8540949d74c4d0ebLL, 99, 2, RP2C04_001, 0 },
{"Battle City(Bootleg)",0x8093cbe7137ac031LL, 99, 2,RP2C04_001,0}, { "Battle City(Bootleg)", 0x8093cbe7137ac031LL, 99, 2, RP2C04_001, 0 },
{"Clu Clu Land", 0x1b8123218f62b1eeLL, 99, 2,RP2C05_004,IOPTION_SWAPDIRAB}, { "Clu Clu Land", 0x1b8123218f62b1eeLL, 99, 2, RP2C05_004, IOPTION_SWAPDIRAB },
{"Dr Mario", 0xe1af09c477dc0081LL, 1, 0,RP2C04_003,IOPTION_SWAPDIRAB}, { "Dr Mario", 0xe1af09c477dc0081LL, 1, 0, RP2C04_003, IOPTION_SWAPDIRAB },
{"Duck Hunt", 0x47735d1e5f1205bbLL, 99, 2,RCP2C03B ,IOPTION_GUN}, { "Duck Hunt", 0x47735d1e5f1205bbLL, 99, 2, RCP2C03B, IOPTION_GUN },
{"Excitebike", 0x3dcd1401bcafde77LL, 99, 2,RP2C04_003,0}, { "Excitebike", 0x3dcd1401bcafde77LL, 99, 2, RP2C04_003, 0 },
{"Excitebike (J)", 0x7ea51c9d007375f0LL, 99, 2,RP2C05_004,0}, { "Excitebike (J)", 0x7ea51c9d007375f0LL, 99, 2, RP2C05_004, 0 },
{"Freedom Force", 0xed96436bd1b5e688LL, 4, 0,RP2C04_001,IOPTION_GUN}, /* Wrong color in game select screen? */ { "Freedom Force", 0xed96436bd1b5e688LL, 4, 0, RP2C04_001, IOPTION_GUN }, /* Wrong color in game select screen? */
{"Stroke and Match Golf",0x612325606e82bc66LL, 99, 2,RP2C04_002,IOPTION_SWAPDIRAB|IOPTION_PREDIP,0x01}, { "Stroke and Match Golf", 0x612325606e82bc66LL, 99, 2, RP2C04_002, IOPTION_SWAPDIRAB | IOPTION_PREDIP, 0x01 },
{"Goonies", 0x3b0085c4ff29098eLL, 151,1,RP2C04_003,0}, { "Goonies", 0xb4032d694e1d2733LL, 151, 1, RP2C04_003, 0 },
{"Gradius", 0x50687ae63bdad976LL,151, 1,RP2C04_001,IOPTION_SWAPDIRAB}, { "Gradius", 0x50687ae63bdad976LL, 151, 1, RP2C04_001, IOPTION_SWAPDIRAB },
{"Gumshoe", 0xb8500780bf69ce29LL, 99, 2,RC2C05_03,IOPTION_GUN}, { "Gumshoe", 0x87161f8ee37758d3LL, 99, 2, RC2C05_03, IOPTION_GUN },
{"Hogan's Alley", 0xd78b7f0bb621fb45LL, 99, 2,RP2C04_001,IOPTION_GUN}, { "Gumshoe", 0xb8500780bf69ce29LL, 99, 2, RC2C05_03, IOPTION_GUN },
{"Ice Climber", 0xd21e999513435e2aLL, 99, 2,RP2C05_004,IOPTION_SWAPDIRAB}, { "Hogan's Alley", 0xd78b7f0bb621fb45LL, 99, 2, RP2C04_001, IOPTION_GUN },
{"Ladies Golf", 0x781b24be57ef6785LL, 99, 2,RP2C04_002,IOPTION_SWAPDIRAB|IOPTION_PREDIP,0x1}, { "Ice Climber", 0xd21e999513435e2aLL, 99, 2, RP2C05_004, IOPTION_SWAPDIRAB },
{ "Ladies Golf", 0x781b24be57ef6785LL, 99, 2, RP2C04_002, IOPTION_SWAPDIRAB | IOPTION_PREDIP, 0x1 },
{"Mach Rider", 0x015672618af06441LL, 99, 2, RP2C04_002,0}, { "Mach Rider", 0x015672618af06441LL, 99, 2, RP2C04_002, 0 },
{"Mach Rider (J)", 0xa625afb399811a8aLL, 99, 2, RP2C04_001,0}, { "Mach Rider (J)", 0xa625afb399811a8aLL, 99, 2, RP2C04_001, 0 },
{"Mighty Bomb Jack", 0xe6a89f4873fac37bLL, 0, 2, RC2C05_02,0}, { "Mighty Bomb Jack", 0xe6a89f4873fac37bLL, 0, 2, RC2C05_02, 0 },
{"Ninja Jajamaru Kun", 0xb26a2c31474099c0LL, 99, 2,RC2C05_01 ,IOPTION_SWAPDIRAB}, { "Ninja Jajamaru Kun", 0xb26a2c31474099c0LL, 99, 2, RC2C05_01, IOPTION_SWAPDIRAB },
{"Pinball", 0xc5f49d3de7f2e9b8LL, 99, 2,RP2C04_001,IOPTION_PREDIP,0x01}, { "Pinball", 0xc5f49d3de7f2e9b8LL, 99, 2, RP2C04_001, IOPTION_PREDIP, 0x01 },
{"Pinball (J)", 0x66ab1a3828cc901cLL, 99, 2,RCP2C03B,IOPTION_PREDIP,0x1}, { "Pinball (J)", 0x66ab1a3828cc901cLL, 99, 2, RCP2C03B, IOPTION_PREDIP, 0x1 },
{"Platoon", 0x160f237351c19f1fLL, 68, 1,RP2C04_001,0}, { "Platoon", 0x160f237351c19f1fLL, 68, 1, RP2C04_001, 0 },
{"RBI Baseball", 0x6a02d345812938afLL, 4, 1,RP2C04_001 ,IOPTION_SWAPDIRAB}, { "RBI Baseball", 0x6a02d345812938afLL, 4, 1, RP2C04_001, IOPTION_SWAPDIRAB },
{"Soccer", 0xd4e7a9058780eda3LL, 99, 2,RP2C04_003,IOPTION_SWAPDIRAB}, { "Soccer", 0xd4e7a9058780eda3LL, 99, 2, RP2C04_003, IOPTION_SWAPDIRAB },
{"Star Luster", 0x8360e134b316d94cLL, 99, 2,RCP2C03B ,0}, { "Star Luster", 0x8360e134b316d94cLL, 99, 2, RCP2C03B, 0 },
{"Stroke and Match Golf (J)",0x869bb83e02509747LL, 99, 2,RCP2C03B,IOPTION_SWAPDIRAB|IOPTION_PREDIP,0x1}, { "Stroke and Match Golf (J)", 0x869bb83e02509747LL, 99, 2, RCP2C03B, IOPTION_SWAPDIRAB | IOPTION_PREDIP, 0x1 },
{"Super Sky Kid", 0x78d04c1dd4ec0101LL, 4, 1,RCP2C03B ,IOPTION_SWAPDIRAB | IOPTION_PREDIP,0x20}, { "Super Sky Kid", 0x78d04c1dd4ec0101LL, 4, 1, RCP2C03B, IOPTION_SWAPDIRAB | IOPTION_PREDIP, 0x20 },
{"Super Xevious", 0x2d396247cf58f9faLL, 206, 0,RP2C04_001,0}, { "Super Xevious", 0x2d396247cf58f9faLL, 206, 0, RP2C04_001, 0 },
{"Tetris", 0x531a5e8eea4ce157LL, 99, 2,RCP2C03B ,IOPTION_PREDIP,0x20}, { "Tetris", 0x531a5e8eea4ce157LL, 99, 2, RCP2C03B, IOPTION_PREDIP, 0x20 },
{"Top Gun", 0xf1dea36e6a7b531dLL, 2, 0,RC2C05_04 ,0}, { "Top Gun", 0xf1dea36e6a7b531dLL, 2, 0, RC2C05_04, 0 },
{"VS Castlevania", 0x92fd6909c81305b9LL, 2, 1,RP2C04_002,0}, { "VS Castlevania", 0x92fd6909c81305b9LL, 2, 1, RP2C04_002, 0 },
{"VS Slalom", 0x4889b5a50a623215LL, 0, 1,RP2C04_002,0}, { "VS Slalom", 0x4889b5a50a623215LL, 0, 1, RP2C04_002, 0 },
{"VS Super Mario Bros",0x39d8cfa788e20b6cLL, 99, 2,RP2C05_004,0}, { "VS Super Mario Bros", 0x39d8cfa788e20b6cLL, 99, 2, RP2C05_004, 0 },
{"VS TKO Boxing", 0x6e1ee06171d8ce3aLL,4, 1,RP2C04_003,IOPTION_PREDIP,0x00}, { "VS Super Mario Bros [a1]", 0xfc182e5aefbce14dLL, 99, 2, RP2C05_004, 0 },
{0} { "VS TKO Boxing", 0x6e1ee06171d8ce3aLL, 4, 1, RP2C04_003, IOPTION_PREDIP, 0x00 },
{ 0 }
}; };
void FCEU_VSUniCheck(uint64 md5partial, int *MapperNo, uint8 *Mirroring) void FCEU_VSUniCheck(uint64 md5partial, int *MapperNo, uint8 *Mirroring) {
{ VSUNIENTRY *vs = VSUniGames;
VSUNIENTRY *vs = VSUniGames;
while(vs->name) while (vs->name) {
{ if (md5partial == vs->md5partial) {
if(md5partial == vs->md5partial) if (vs->ppu < RCP2C03B) pale = vs->ppu;
{ *MapperNo = vs->mapper;
*Mirroring = vs->mirroring;
GameInfo->type = GIT_VSUNI;
GameInfo->cspecial = SIS_VSUNISYSTEM;
GameInfo->inputfc = SIFC_NONE;
curppu = vs->ppu;
curmd5 = md5partial;
if(vs->ppu < RCP2C03B) pale = vs->ppu; secptr = 0;
*MapperNo = vs->mapper;
*Mirroring = vs->mirroring;
GameInfo->type = GIT_VSUNI;
GameInfo->cspecial = SIS_VSUNISYSTEM;
GameInfo->inputfc = SIFC_NONE;
curppu = vs->ppu;
curmd5 = md5partial;
secptr = 0; {
static int64 tko = 0x6e1ee06171d8ce3aULL, rbi = 0x6a02d345812938afULL;
if (md5partial == tko)
secptr = secdata[0];
if (md5partial == rbi)
secptr = secdata[1];
}
{ vsdip = 0x0;
static int64 tko=0x6e1ee06171d8ce3aULL, rbi=0x6a02d345812938afULL; if (vs->ioption & IOPTION_PREDIP) {
if(md5partial == tko) vsdip = vs->predip;
secptr=secdata[0]; }
if(md5partial == rbi) if (vs->ioption & IOPTION_GUN) {
secptr = secdata[1]; GameInfo->input[0] = SI_ZAPPER;
} GameInfo->input[1] = SI_NONE;
} else {
vsdip = 0x0; GameInfo->input[0] = GameInfo->input[1] = SI_GAMEPAD;
if(vs->ioption & IOPTION_PREDIP) }
{ curvs = vs;
vsdip= vs->predip; return;
} }
if(vs->ioption & IOPTION_GUN) vs++;
{ }
GameInfo->input[0] = SI_ZAPPER;
GameInfo->input[1] = SI_NONE;
}
else
{
GameInfo->input[0] = GameInfo->input[1] = SI_GAMEPAD;
}
curvs = vs;
return;
}
vs++;
}
} }
void FCEU_VSUniDraw(uint8 *XBuf) void FCEU_VSUniDraw(uint8 *XBuf) {
{ uint32 *dest;
uint32 *dest; int y, x;
int y,x;
if(!DIPS) return; if (!DIPS) return;
dest=(uint32 *)(XBuf+256*12+164); dest = (uint32*)(XBuf + 256 * 12 + 164);
for(y=24;y;y--,dest+=(256-72)>>2) for (y = 24; y; y--, dest += (256 - 72) >> 2) {
{ for (x = 72 >> 2; x; x--, dest++)
for(x=72>>2;x;x--,dest++) *dest = 0;
*dest=0; }
}
dest=(uint32 *)(XBuf+256*(12+4)+164+6 ); dest = (uint32*)(XBuf + 256 * (12 + 4) + 164 + 6);
for(y=16;y;y--,dest+=(256>>2)-16) for (y = 16; y; y--, dest += (256 >> 2) - 16)
for(x=8;x;x--) for (x = 8; x; x--) {
{ *dest = 0x01010101;
*dest=0x01010101; dest += 2;
dest+=2; }
}
dest=(uint32 *)(XBuf+256*(12+4)+164+6 ); dest = (uint32*)(XBuf + 256 * (12 + 4) + 164 + 6);
for(x=0;x<8;x++,dest+=2) for (x = 0; x < 8; x++, dest += 2) {
{ uint32 *da = dest + (256 >> 2);
uint32 *da=dest+(256>>2);
if(!((vsdip>>x)&1)) if (!((vsdip >> x) & 1))
da+=(256>>2)*10; da += (256 >> 2) * 10;
for(y=4;y;y--,da+=256>>2) for (y = 4; y; y--, da += 256 >> 2)
*da=0; *da = 0;
} }
} }
SFORMAT FCEUVSUNI_STATEINFO[]={ SFORMAT FCEUVSUNI_STATEINFO[] = {
{ &vsdip, 1, "vsdp"}, { &vsdip, 1, "vsdp" },
{ &coinon, 1, "vscn"}, { &coinon, 1, "vscn" },
{ &VSindex, 1, "vsin"}, { &VSindex, 1, "vsin" },
{ 0} { 0 }
}; };

2
vc/vc10_fceux.vcxproj
View File

@ -228,6 +228,7 @@
<PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</PreprocessToFile> <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</PreprocessToFile>
<PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</PreprocessSuppressLineNumbers> <PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</PreprocessSuppressLineNumbers>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\boards\09-034a.cpp" />
<ClCompile Include="..\src\boards\103.cpp" /> <ClCompile Include="..\src\boards\103.cpp" />
<ClCompile Include="..\src\boards\106.cpp" /> <ClCompile Include="..\src\boards\106.cpp" />
<ClCompile Include="..\src\boards\108.cpp" /> <ClCompile Include="..\src\boards\108.cpp" />
@ -362,7 +363,6 @@
<ClCompile Include="..\src\boards\sc-127.cpp" /> <ClCompile Include="..\src\boards\sc-127.cpp" />
<ClCompile Include="..\src\boards\sheroes.cpp" /> <ClCompile Include="..\src\boards\sheroes.cpp" />
<ClCompile Include="..\src\boards\sl1632.cpp" /> <ClCompile Include="..\src\boards\sl1632.cpp" />
<ClCompile Include="..\src\boards\smb2j.cpp" />
<ClCompile Include="..\src\boards\subor.cpp" /> <ClCompile Include="..\src\boards\subor.cpp" />
<ClCompile Include="..\src\boards\super24.cpp" /> <ClCompile Include="..\src\boards\super24.cpp" />
<ClCompile Include="..\src\boards\supervision.cpp" /> <ClCompile Include="..\src\boards\supervision.cpp" />

6
vc/vc10_fceux.vcxproj.filters
View File

@ -262,9 +262,6 @@
<ClCompile Include="..\src\boards\sl1632.cpp"> <ClCompile Include="..\src\boards\sl1632.cpp">
<Filter>boards</Filter> <Filter>boards</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\boards\smb2j.cpp">
<Filter>boards</Filter>
</ClCompile>
<ClCompile Include="..\src\boards\subor.cpp"> <ClCompile Include="..\src\boards\subor.cpp">
<Filter>boards</Filter> <Filter>boards</Filter>
</ClCompile> </ClCompile>
@ -961,6 +958,9 @@
<ClCompile Include="..\src\boards\vrc3.cpp"> <ClCompile Include="..\src\boards\vrc3.cpp">
<Filter>boards</Filter> <Filter>boards</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\boards\09-034a.cpp">
<Filter>boards</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\src\cart.h"> <ClInclude Include="..\src\cart.h">