admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #142 from retro-wertz/vs_system_updates

Browse Source 
Vs system updates
This commit is contained in:
Twinaphex
2017-09-06 20:40:29 +02:00
committed by GitHub
parent e545e7df2a 2a7e5f29e2
commit bb3cdbe61e
12 changed files with 333 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/drivers/libretro/libretro.c
View File

@@ -199,6 +199,8 @@ FILE *FCEUD_UTF8fopen(const char *n, const char *m)
#define MAXPAL 17 /* raw palette # */ #define MAXPAL 17 /* raw palette # */
static int use_ntsc = 0; static int use_ntsc = 0;
static int external_palette_exist = 0; static int external_palette_exist = 0;
extern int ipalette;
extern int ntsccol;
struct st_palettes { struct st_palettes {
char name[32]; char name[32];
@@ -618,26 +620,25 @@ static void retro_set_custom_palette(void)
ntsccol = 0; ntsccol = 0;
use_raw_palette = false; use_raw_palette = false;
if (current_palette == 0 || current_palette > MAXPAL || (GameInfo->type == GIT_VSUNI)) if (current_palette == 0 || current_palette > MAXPAL
|| (GameInfo->type == GIT_VSUNI))
{ {
if (current_palette > MAXPAL && GameInfo->type != GIT_VSUNI) if (current_palette > MAXPAL && GameInfo->type != GIT_VSUNI)
{ {
if (external_palette_exist) if (external_palette_exist)
ipalette = 1; ipalette = 1;
else
{
FCEU_PrintError("nes.pal not found in system directory.\n");
FCEU_PrintError("Using default palette instead.\n");
}
} }
if (GameInfo->type == GIT_VSUNI) if (current_palette == 0)
FCEU_PrintError("Cannot use custom palette with VS. System.\n"); ntsccol = use_ntsc;
if (current_palette == 0 && use_ntsc) FCEU_ResetPalette(); /* Do palette reset. Priority will be:
ntsccol = 1; * -ipalette : sets external palette
* -ntsccol : sets ntsc to default palette.
FCEU_ResetPalette(); /* Do palette reset*/ * If none of the above are true, then
* default palette will be used.
* VS.System should always use default palette.
*/
return; return;
} }
@@ -1051,6 +1052,12 @@ static void FCEUD_UpdateInput(void)
} }
} }
if (GameInfo->type == GIT_VSUNI)
FCEU_VSUniSwap(&pad[0], &pad[1]); /* TODO: Incomplete! Some
* non-zapper/gun game
* still has no input.
*/
JSReturn[0] = pad[0] | (pad[1] << 8); JSReturn[0] = pad[0] | (pad[1] << 8);
if (input_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2)) if (input_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2))
@@ -1610,8 +1617,14 @@ bool retro_load_game(const struct retro_game_info *game)
FCEUI_SetInput(0, SI_GAMEPAD, &JSReturn[0], 0); FCEUI_SetInput(0, SI_GAMEPAD, &JSReturn[0], 0);
FCEUI_SetInput(1, SI_GAMEPAD, &JSReturn[0], 0); FCEUI_SetInput(1, SI_GAMEPAD, &JSReturn[0], 0);
FCEU_LoadGamePalette(); /* check and load external palette nes.pal... */ external_palette_exist = ipalette;
external_palette_exist = ipalette; /* save status if found or not */ if (external_palette_exist)
FCEU_printf("nes.pal loaded from system directory.\n");
else
FCEU_PrintError("Cannot find nes.pal from system directory.\n");
if (GameInfo->type == GIT_VSUNI)
FCEU_PrintError("VS.System rom loaded, will use default palette.\n");
retro_set_custom_palette(); retro_set_custom_palette();

8
src/palette.c
View File

@@ -52,10 +52,10 @@ pal *palo;
static pal *palpoint[8] = static pal *palpoint[8] =
{ {
palette, palette,
rp2c04001, rp2c04_0001,
rp2c04002, rp2c04_0002,
rp2c04003, rp2c04_0003,
rp2c05004, rp2c04_0004,
}; };
void FCEUI_SetPaletteArray(uint8 *pal) { void FCEUI_SetPaletteArray(uint8 *pal) {

16
src/palettes/palettes.h
View File

@@ -1,16 +1,16 @@
pal rp2c04001[64] = { pal rp2c04_0001[64] = {
#include "rp2c04001.h" #include "rp2c04-0001.h"
}; };
pal rp2c04002[64] = { pal rp2c04_0002[64] = {
#include "rp2c04002.h" #include "rp2c04-0002.h"
}; };
pal rp2c04003[64] = { pal rp2c04_0003[64] = {
#include "rp2c04003.h" #include "rp2c04-0003.h"
}; };
pal rp2c05004[64] = { pal rp2c04_0004[64] = {
#include "rp2c05004.h" #include "rp2c04-0004.h"
}; };
pal unvpalette[7] = { pal unvpalette[7] = {

64
src/palettes/rp2c04-0001.h Normal file
View File

@@ -0,0 +1,64 @@
{ 0xff, 0xb6, 0xb6 },
{ 0xda, 0x6d, 0xff },
{ 0xff, 0x00, 0x00 },
{ 0x91, 0x91, 0xff },
{ 0x00, 0x91, 0x91 },
{ 0x24, 0x48, 0x00 },
{ 0x48, 0x48, 0x48 },
{ 0xff, 0x00, 0x91 },
{ 0xff, 0xff, 0xff },
{ 0x6d, 0x6d, 0x6d },
{ 0xff, 0xb6, 0x00 },
{ 0xb6, 0x00, 0x6d },
{ 0x91, 0x00, 0x6d },
{ 0xda, 0xda, 0x00 },
{ 0x6d, 0x48, 0x00 },
{ 0xff, 0xff, 0xff },
{ 0x6d, 0xb6, 0xff },
{ 0xda, 0xb6, 0x6d },
{ 0x6d, 0x24, 0x00 },
{ 0x6d, 0xda, 0x00 },
{ 0x91, 0xda, 0xff },
{ 0xda, 0xb6, 0xff },
{ 0xff, 0xda, 0x91 },
{ 0x00, 0x48, 0xff },
{ 0xff, 0xda, 0x00 },
{ 0x48, 0xff, 0xda },
{ 0x00, 0x00, 0x00 },
{ 0x48, 0x00, 0x00 },
{ 0xda, 0xda, 0xda },
{ 0x91, 0x91, 0x91 },
{ 0xff, 0x00, 0xff },
{ 0x00, 0x24, 0x91 },
{ 0x00, 0x00, 0x6d },
{ 0xb6, 0xda, 0xff },
{ 0xff, 0xb6, 0xff },
{ 0x00, 0xff, 0x00 },
{ 0x00, 0xff, 0xff },
{ 0x00, 0x48, 0x48 },
{ 0x00, 0xb6, 0x6d },
{ 0xb6, 0x00, 0xff },
{ 0x00, 0x00, 0x00 },
{ 0x91, 0x48, 0x00 },
{ 0xff, 0x91, 0xff },
{ 0xb6, 0x24, 0x00 },
{ 0x91, 0x00, 0xff },
{ 0x00, 0x00, 0xda },
{ 0xff, 0x91, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x24, 0x91, 0x00 },
{ 0xb6, 0xb6, 0xb6 },
{ 0x00, 0x6d, 0x24 },
{ 0xb6, 0xff, 0x48 },
{ 0x6d, 0x48, 0xda },
{ 0xff, 0xff, 0x00 },
{ 0xda, 0x6d, 0x00 },
{ 0x00, 0x48, 0x00 },
{ 0x00, 0x6d, 0xda },
{ 0x00, 0x91, 0x00 },
{ 0x24, 0x24, 0x24 },
{ 0xff, 0xff, 0x6d },
{ 0xff, 0x6d, 0xff },
{ 0x91, 0x6d, 0x00 },
{ 0x91, 0xff, 0x6d },

64
src/palettes/rp2c04-0002.h Normal file
View File

@@ -0,0 +1,64 @@
{ 0x00, 0x00, 0x00 },
{ 0xff, 0xb6, 0x00 },
{ 0x91, 0x6d, 0x00 },
{ 0xb6, 0xff, 0x48 },
{ 0x91, 0xff, 0x6d },
{ 0xff, 0x6d, 0xff },
{ 0x00, 0x91, 0x91 },
{ 0xb6, 0xda, 0xff },
{ 0xff, 0x00, 0x00 },
{ 0x91, 0x00, 0xff },
{ 0xff, 0xff, 0x6d },
{ 0xff, 0x91, 0xff },
{ 0xff, 0xff, 0xff },
{ 0xda, 0x6d, 0xff },
{ 0x91, 0xda, 0xff },
{ 0x00, 0x91, 0x00 },
{ 0x00, 0x48, 0x00 },
{ 0x6d, 0xb6, 0xff },
{ 0xb6, 0x24, 0x00 },
{ 0xda, 0xda, 0xda },
{ 0x00, 0xb6, 0x6d },
{ 0x6d, 0xda, 0x00 },
{ 0x48, 0x00, 0x00 },
{ 0x91, 0x91, 0xff },
{ 0x48, 0x48, 0x48 },
{ 0xff, 0x00, 0xff },
{ 0x00, 0x00, 0x6d },
{ 0x48, 0xff, 0xda },
{ 0xda, 0xb6, 0xff },
{ 0x6d, 0x48, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x6d, 0x48, 0xda },
{ 0x91, 0x00, 0x6d },
{ 0xff, 0xda, 0x91 },
{ 0xff, 0x91, 0x00 },
{ 0xff, 0xb6, 0xff },
{ 0x00, 0x6d, 0xda },
{ 0x6d, 0x24, 0x00 },
{ 0xb6, 0xb6, 0xb6 },
{ 0x00, 0x00, 0xda },
{ 0xb6, 0x00, 0xff },
{ 0xff, 0xda, 0x00 },
{ 0x6d, 0x6d, 0x6d },
{ 0x24, 0x48, 0x00 },
{ 0x00, 0x48, 0xff },
{ 0x00, 0x00, 0x00 },
{ 0xda, 0xda, 0x00 },
{ 0xff, 0xff, 0xff },
{ 0xda, 0xb6, 0x6d },
{ 0x24, 0x24, 0x24 },
{ 0x00, 0xff, 0x00 },
{ 0xda, 0x6d, 0x00 },
{ 0x00, 0x48, 0x48 },
{ 0x00, 0x24, 0x91 },
{ 0xff, 0x00, 0x91 },
{ 0x24, 0x91, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0xff, 0xff },
{ 0x91, 0x48, 0x00 },
{ 0xff, 0xff, 0x00 },
{ 0xff, 0xb6, 0xb6 },
{ 0xb6, 0x00, 0x6d },
{ 0x00, 0x6d, 0x24 },
{ 0x91, 0x91, 0x91 },

64
src/palettes/rp2c04-0003.h Normal file
View File

@@ -0,0 +1,64 @@
{ 0xb6, 0x00, 0xff },
{ 0xff, 0x6d, 0xff },
{ 0x91, 0xff, 0x6d },
{ 0xb6, 0xb6, 0xb6 },
{ 0x00, 0x91, 0x00 },
{ 0xff, 0xff, 0xff },
{ 0xb6, 0xda, 0xff },
{ 0x24, 0x48, 0x00 },
{ 0x00, 0x24, 0x91 },
{ 0x00, 0x00, 0x00 },
{ 0xff, 0xda, 0x91 },
{ 0x6d, 0x48, 0x00 },
{ 0xff, 0x00, 0x91 },
{ 0xda, 0xda, 0xda },
{ 0xda, 0xb6, 0x6d },
{ 0x91, 0xda, 0xff },
{ 0x91, 0x91, 0xff },
{ 0x00, 0x91, 0x91 },
{ 0xb6, 0x00, 0x6d },
{ 0x00, 0x48, 0xff },
{ 0x24, 0x91, 0x00 },
{ 0x91, 0x6d, 0x00 },
{ 0xda, 0x6d, 0x00 },
{ 0x00, 0xb6, 0x6d },
{ 0x6d, 0x6d, 0x6d },
{ 0x6d, 0x48, 0xda },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0xda },
{ 0xff, 0x00, 0x00 },
{ 0xb6, 0x24, 0x00 },
{ 0xff, 0x91, 0xff },
{ 0xff, 0xb6, 0xb6 },
{ 0xda, 0x6d, 0xff },
{ 0x00, 0x48, 0x00 },
{ 0x00, 0x00, 0x6d },
{ 0xff, 0xff, 0x00 },
{ 0x24, 0x24, 0x24 },
{ 0xff, 0xb6, 0x00 },
{ 0xff, 0x91, 0x00 },
{ 0xff, 0xff, 0xff },
{ 0x6d, 0xda, 0x00 },
{ 0x91, 0x00, 0x6d },
{ 0x6d, 0xb6, 0xff },
{ 0xff, 0x00, 0xff },
{ 0x00, 0x6d, 0xda },
{ 0x91, 0x91, 0x91 },
{ 0x00, 0x00, 0x00 },
{ 0x6d, 0x24, 0x00 },
{ 0x00, 0xff, 0xff },
{ 0x48, 0x00, 0x00 },
{ 0xb6, 0xff, 0x48 },
{ 0xff, 0xb6, 0xff },
{ 0x91, 0x48, 0x00 },
{ 0x00, 0xff, 0x00 },
{ 0xda, 0xda, 0x00 },
{ 0x48, 0x48, 0x48 },
{ 0x00, 0x6d, 0x24 },
{ 0x00, 0x00, 0x00 },
{ 0xda, 0xb6, 0xff },
{ 0xff, 0xff, 0x6d },
{ 0x91, 0x00, 0xff },
{ 0x48, 0xff, 0xda },
{ 0xff, 0xda, 0x00 },
{ 0x00, 0x48, 0x48 },

64
src/palettes/rp2c04-0004.h Normal file
View File

@@ -0,0 +1,64 @@
{ 0x91, 0x6d, 0x00 },
{ 0x6d, 0x48, 0xda },
{ 0x00, 0x91, 0x91 },
{ 0xda, 0xda, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0xff, 0xb6, 0xb6 },
{ 0x00, 0x24, 0x91 },
{ 0xda, 0x6d, 0x00 },
{ 0xb6, 0xb6, 0xb6 },
{ 0x6d, 0x24, 0x00 },
{ 0x00, 0xff, 0x00 },
{ 0x00, 0x00, 0x6d },
{ 0xff, 0xda, 0x91 },
{ 0xff, 0xff, 0x00 },
{ 0x00, 0x91, 0x00 },
{ 0xb6, 0xff, 0x48 },
{ 0xff, 0x6d, 0xff },
{ 0x48, 0x00, 0x00 },
{ 0x00, 0x48, 0xff },
{ 0xff, 0x91, 0xff },
{ 0x00, 0x00, 0x00 },
{ 0x48, 0x48, 0x48 },
{ 0xb6, 0x24, 0x00 },
{ 0xff, 0x91, 0x00 },
{ 0xda, 0xb6, 0x6d },
{ 0x00, 0xb6, 0x6d },
{ 0x91, 0x91, 0xff },
{ 0x24, 0x91, 0x00 },
{ 0x91, 0x00, 0x6d },
{ 0x00, 0x00, 0x00 },
{ 0x91, 0xff, 0x6d },
{ 0x6d, 0xb6, 0xff },
{ 0xb6, 0x00, 0x6d },
{ 0x00, 0x6d, 0x24 },
{ 0x91, 0x48, 0x00 },
{ 0x00, 0x00, 0xda },
{ 0x91, 0x00, 0xff },
{ 0xb6, 0x00, 0xff },
{ 0x6d, 0x6d, 0x6d },
{ 0xff, 0x00, 0x91 },
{ 0x00, 0x48, 0x48 },
{ 0xda, 0xda, 0xda },
{ 0x00, 0x6d, 0xda },
{ 0x00, 0x48, 0x00 },
{ 0x24, 0x24, 0x24 },
{ 0xff, 0xff, 0x6d },
{ 0x91, 0x91, 0x91 },
{ 0xff, 0x00, 0xff },
{ 0xff, 0xb6, 0xff },
{ 0xff, 0xff, 0xff },
{ 0x6d, 0x48, 0x00 },
{ 0xff, 0x00, 0x00 },
{ 0xff, 0xda, 0x00 },
{ 0x48, 0xff, 0xda },
{ 0xff, 0xff, 0xff },
{ 0x91, 0xda, 0xff },
{ 0x00, 0x00, 0x00 },
{ 0xff, 0xb6, 0x00 },
{ 0xda, 0x6d, 0xff },
{ 0xb6, 0xda, 0xff },
{ 0x6d, 0xda, 0x00 },
{ 0xda, 0xb6, 0xff },
{ 0x00, 0xff, 0xff },
{ 0x24, 0x48, 0x00 },

64
src/palettes/rp2c04001.h
View File

@@ -1,64 +0,0 @@
{ 0xfc, 0xc4, 0xd8 },
{ 0x40, 0x88, 0xfc },
{ 0xd8, 0x28, 0x00 },
{ 0x5c, 0x94, 0xfc },
{ 0x00, 0x80, 0x88 },
{ 0x00, 0x44, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0xe4, 0x00, 0x58 },
{ 0xfc, 0xfc, 0xfc },
{ 0x74, 0x74, 0x74 },
{ 0xfc, 0x98, 0x38 },
{ 0xa8, 0x00, 0x10 },
{ 0x8c, 0x00, 0x74 },
{ 0xfc, 0x98, 0x38 },
{ 0x40, 0x2c, 0x00 },
{ 0xfc, 0xfc, 0xfc },
{ 0x3c, 0xbc, 0xfc },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x80, 0xd0, 0x10 },
{ 0x9c, 0xfc, 0xf0 },
{ 0xc4, 0xd4, 0xfc },
{ 0xfc, 0xbc, 0xb0 },
{ 0x20, 0x38, 0xec },
{ 0x00, 0x00, 0x00 },
{ 0x58, 0xf8, 0x98 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0xfc, 0xfc },
{ 0xbc, 0xbc, 0xbc },
{ 0xf4, 0x78, 0xfc },
{ 0x24, 0x18, 0x8c },
{ 0x00, 0x00, 0x00 },
{ 0xa8, 0xe4, 0xfc },
{ 0x00, 0x00, 0x00 },
{ 0x4c, 0xdc, 0x48 },
{ 0x00, 0xe8, 0xd8 },
{ 0x18, 0x3c, 0x5c },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x7c, 0x08, 0x00 },
{ 0xfc, 0xc4, 0xfc },
{ 0xa4, 0x00, 0x00 },
{ 0x80, 0x00, 0xf0 },
{ 0x00, 0x00, 0xa8 },
{ 0xfc, 0x74, 0x60 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x94, 0x00 },
{ 0xbc, 0xbc, 0xbc },
{ 0x00, 0x50, 0x00 },
{ 0xe0, 0xfc, 0xa0 },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0xd8, 0xa8 },
{ 0xc8, 0x4c, 0x0c },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x70, 0xec },
{ 0x00, 0x44, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0xe0, 0xfc, 0xa0 },
{ 0xfc, 0x74, 0xb4 },
{ 0x88, 0x70, 0x00 },
{ 0x00, 0x00, 0x00 },

64
src/palettes/rp2c04002.h
View File

@@ -1,64 +0,0 @@
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0x98, 0x38 },
{ 0x88, 0x70, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0xa8, 0xf0, 0xbc },
{ 0xfc, 0x74, 0xb4 },
{ 0x00, 0x00, 0x00 },
{ 0xa8, 0xe4, 0xfc },
{ 0xd8, 0x28, 0x00 },
{ 0x80, 0x00, 0xf0 },
{ 0xfc, 0xe4, 0xa0 },
{ 0xfc, 0xc4, 0xfc },
{ 0xfc, 0xfc, 0xfc },
{ 0x40, 0x88, 0xfc },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x3c, 0x14 },
{ 0x00, 0x00, 0x00 },
{ 0x3c, 0xbc, 0xfc },
{ 0xa4, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x90, 0x38 },
{ 0x80, 0xd0, 0x10 },
{ 0x00, 0x00, 0x00 },
{ 0x5c, 0x94, 0xfc },
{ 0x00, 0x00, 0x00 },
{ 0xf4, 0x78, 0xfc },
{ 0x00, 0x00, 0x00 },
{ 0x58, 0xf8, 0x98 },
{ 0x00, 0x00, 0x00 },
{ 0x40, 0x2c, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x44, 0x00, 0x9c },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0xbc, 0xb0 },
{ 0xfc, 0x74, 0x60 },
{ 0xd4, 0xc8, 0xfc },
{ 0x00, 0x70, 0xec },
{ 0x00, 0x00, 0x00 },
{ 0xbc, 0xbc, 0xbc },
{ 0x00, 0x00, 0xa8 },
{ 0xbc, 0x00, 0xbc },
{ 0x00, 0x00, 0x00 },
{ 0x74, 0x74, 0x74 },
{ 0x00, 0x44, 0x00 },
{ 0x20, 0x38, 0xec },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0xd8, 0xa8 },
{ 0xfc, 0xfc, 0xfc },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x4c, 0xdc, 0x48 },
{ 0xc8, 0x4c, 0x0c },
{ 0x18, 0x3c, 0x5c },
{ 0x24, 0x18, 0x8c },
{ 0xe4, 0x00, 0x58 },
{ 0x00, 0x94, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0xe8, 0xd8 },
{ 0x7c, 0x08, 0x00 },
{ 0xfc, 0xd8, 0xa8 },
{ 0x00, 0x00, 0x00 },
{ 0xa8, 0x00, 0x10 },
{ 0x00, 0x50, 0x00 },
{ 0x74, 0x74, 0x74 },

64
src/palettes/rp2c04003.h
View File

@@ -1,64 +0,0 @@
{ 0x44, 0x00, 0x9c },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x74, 0x74, 0x74 },
{ 0x00, 0xa8, 0x00 },
{ 0xfc, 0xfc, 0xfc },
{ 0xa8, 0xe4, 0xfc },
{ 0x00, 0x44, 0x00 },
{ 0x24, 0x18, 0x8c },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0xbc, 0xb0 },
{ 0x40, 0x2c, 0x00 },
{ 0xe4, 0x00, 0x58 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0xfc, 0xfc },
{ 0x5c, 0x94, 0xfc },
{ 0x00, 0x80, 0x88 },
{ 0x00, 0x00, 0x00 },
{ 0x20, 0x38, 0xec },
{ 0x00, 0x94, 0x00 },
{ 0x88, 0x70, 0x00 },
{ 0xc8, 0x4c, 0x0c },
{ 0x00, 0x90, 0x38 },
{ 0x74, 0x74, 0x74 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0xa8 },
{ 0xd8, 0x28, 0x00 },
{ 0xa4, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0xc4, 0xd8 },
{ 0x40, 0x88, 0xfc },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0xd8, 0xa8 },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0x98, 0x38 },
{ 0xfc, 0x74, 0x60 },
{ 0xfc, 0xfc, 0xfc },
{ 0x80, 0xd0, 0x10 },
{ 0x00, 0x00, 0x00 },
{ 0x3c, 0xbc, 0xfc },
{ 0xf4, 0x78, 0xfc },
{ 0x00, 0x70, 0xec },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0xe8, 0xd8 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x7c, 0x08, 0x00 },
{ 0x4c, 0xdc, 0x48 },
{ 0xf0, 0xbc, 0x3c },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x50, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0xc4, 0xd4, 0xfc },
{ 0xfc, 0xd8, 0xa8 },
{ 0x80, 0x00, 0xf0 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x18, 0x3c, 0x5c },

64
src/palettes/rp2c05004.h
View File

@@ -1,64 +0,0 @@
{ 0x88, 0x70, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x80, 0x88 },
{ 0xf0, 0xbc, 0x3c },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x24, 0x18, 0x8c },
{ 0xc8, 0x4c, 0x0c },
{ 0xbc, 0xbc, 0xbc },
{ 0x00, 0x00, 0x00 },
{ 0x4c, 0xdc, 0x48 },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0xbc, 0xb0 },
{ 0xfc, 0xd8, 0xa8 },
{ 0x00, 0xa8, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0x74, 0xb4 },
{ 0x00, 0x00, 0x00 },
{ 0x20, 0x38, 0xec },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0x74, 0x60 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x5c, 0x94, 0xfc },
{ 0x00, 0x94, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0xa8, 0xf0, 0xbc },
{ 0x3c, 0xbc, 0xfc },
{ 0xa8, 0x00, 0x10 },
{ 0x00, 0x50, 0x00 },
{ 0x7c, 0x08, 0x00 },
{ 0x00, 0x00, 0xa8 },
{ 0x80, 0x00, 0xf0 },
{ 0x00, 0x00, 0x00 },
{ 0x74, 0x74, 0x74 },
{ 0xe4, 0x00, 0x58 },
{ 0x18, 0x3c, 0x5c },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x70, 0xec },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0xe4, 0xa0 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x40, 0x2c, 0x00 },
{ 0xd8, 0x28, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0xfc, 0xfc },
{ 0x9c, 0xfc, 0xf0 },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0x98, 0x38 },
{ 0x00, 0x00, 0x00 },
{ 0xa8, 0xe4, 0xfc },
{ 0x80, 0xd0, 0x10 },
{ 0x00, 0x00, 0x00 },
{ 0xfc, 0xfc, 0xfc },
{ 0x00, 0x44, 0x00 },

75
src/vsuni.c
View File

@@ -95,10 +95,10 @@ void FCEU_VSUniCoin(void) {
static int curppu; static int curppu;
static int64 curmd5; static int64 curmd5;
#define RP2C04_001 1 #define RP2C04_0001 1
#define RP2C04_002 2 #define RP2C04_0002 2
#define RP2C04_003 3 #define RP2C04_0003 3
#define RP2C05_004 4 #define RP2C04_0004 4
#define RCP2C03B 5 #define RCP2C03B 5
#define RC2C05_01 6 #define RC2C05_01 6
#define RC2C05_02 7 #define RC2C05_02 7
@@ -185,7 +185,7 @@ dual-system:
/* 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-0001:
- Baseball - Baseball
- Freedom Force - Freedom Force
- Gradius - Gradius
@@ -195,30 +195,30 @@ RP2C04-001:
- Platoon - Platoon
- Super Xevious - Super Xevious
RP2C04-002: RP2C04-0002:
- Castlevania - Castlevania
- Ladies golf - Ladies Golf
- Mach Rider (Endurance Course) - Mach Rider (Endurance Course)
- Raid on Bungeling Bay (Japan) - Raid on Bungeling Bay (Japan)
- Slalom - Slalom
- Stroke N' Match Golf - Stroke N' Match Golf
- Wrecking Crew - Wrecking Crew
RP2C04-003: RP2C04-0003:
- Dr mario - Dr. Mario
- Excite Bike - Excite Bike
- Goonies - Goonies
- Soccer - Soccer
- TKO Boxing - TKO Boxing
RP2c05-004: RP2C04-0004:
- Clu Clu Land - Clu Clu Land
- Excite Bike (Japan) - Excite Bike (Japan)
- Ice Climber - Ice Climber
- Ice Climber Dual (Japan) - Ice Climber Dual (Japan)
- Super Mario Bros. - Super Mario Bros.
Rcp2c03b: RCP2C03B:
- Battle City - Battle City
- Duck Hunt - Duck Hunt
- Mahjang - Mahjang
@@ -245,47 +245,48 @@ RC2C05-04:
VSUNIENTRY VSUniGames[] = VSUNIENTRY VSUniGames[] =
{ {
{ "Baseball", 0x691d4200ea42be45LL, 99, 2, RP2C04_001, 0 }, { "Baseball", 0x691d4200ea42be45LL, 99, 2, RP2C04_0001, 0 },
{ "Battle City", 0x8540949d74c4d0ebLL, 99, 2, RP2C04_001, 0 }, { "Battle City", 0x8540949d74c4d0ebLL, 99, 2, RP2C04_0001, 0 },
{ "Battle City(Bootleg)", 0x8093cbe7137ac031LL, 99, 2, RP2C04_001, 0 }, { "Battle City(Bootleg)", 0x8093cbe7137ac031LL, 99, 2, RP2C04_0001, 0 },
{ "Clu Clu Land", 0x1b8123218f62b1eeLL, 99, 2, RP2C05_004, IOPTION_SWAPDIRAB }, { "Clu Clu Land", 0x1b8123218f62b1eeLL, 99, 2, RP2C04_0004, IOPTION_SWAPDIRAB },
{ "Dr Mario", 0xe1af09c477dc0081LL, 1, 0, RP2C04_003, IOPTION_SWAPDIRAB }, { "Dr Mario", 0xe1af09c477dc0081LL, 1, 0, RP2C04_0003, 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_0003, 0 },
{ "Excitebike (J)", 0x7ea51c9d007375f0LL, 99, 2, RP2C05_004, 0 }, { "Excitebike (J)", 0x7ea51c9d007375f0LL, 99, 2, RP2C04_0004, 0 },
{ "Freedom Force", 0xed96436bd1b5e688LL, 4, 0, RP2C04_001, IOPTION_GUN }, /* Wrong color in game select screen? */ { "Freedom Force", 0xed96436bd1b5e688LL, 4, 0, RP2C04_0001, 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_0002, IOPTION_SWAPDIRAB | IOPTION_PREDIP, 0x01 },
{ "Goonies", 0xb4032d694e1d2733LL, 151, 1, RP2C04_003, 0 }, { "Goonies", 0xb4032d694e1d2733LL, 151, 1, RP2C04_0003, 0 },
{ "Gradius", 0x50687ae63bdad976LL, 151, 1, RP2C04_001, IOPTION_SWAPDIRAB }, { "Gradius", 0x50687ae63bdad976LL, 151, 1, RP2C04_0001, IOPTION_SWAPDIRAB },
{ "Gumshoe", 0x87161f8ee37758d3LL, 99, 2, RC2C05_03, IOPTION_GUN }, { "Gumshoe", 0x87161f8ee37758d3LL, 99, 2, RC2C05_03, IOPTION_GUN },
{ "Gumshoe", 0xb8500780bf69ce29LL, 99, 2, RC2C05_03, IOPTION_GUN }, { "Gumshoe", 0xb8500780bf69ce29LL, 99, 2, RC2C05_03, IOPTION_GUN },
{ "Hogan's Alley", 0xd78b7f0bb621fb45LL, 99, 2, RP2C04_001, IOPTION_GUN }, { "Gumshoe", 0xa6bf132ba11d0a8cLL, 99, 2, RC2C05_03, IOPTION_GUN }, /* Gumshoe (VS).nes added: 2017-9-5*/
{ "Ice Climber", 0xd21e999513435e2aLL, 99, 2, RP2C05_004, IOPTION_SWAPDIRAB }, { "Hogan's Alley", 0xd78b7f0bb621fb45LL, 99, 2, RP2C04_0001, IOPTION_GUN },
{ "Ladies Golf", 0x781b24be57ef6785LL, 99, 2, RP2C04_002, IOPTION_SWAPDIRAB | IOPTION_PREDIP, 0x1 }, { "Ice Climber", 0xd21e999513435e2aLL, 99, 2, RP2C04_0004, IOPTION_SWAPDIRAB },
{ "Ladies Golf", 0x781b24be57ef6785LL, 99, 2, RP2C04_0002, IOPTION_SWAPDIRAB | IOPTION_PREDIP, 0x1 },
{ "Mach Rider", 0x015672618af06441LL, 99, 2, RP2C04_002, 0 }, { "Mach Rider", 0x015672618af06441LL, 99, 2, RP2C04_0002, 0 },
{ "Mach Rider (J)", 0xa625afb399811a8aLL, 99, 2, RP2C04_001, 0 }, { "Mach Rider (J)", 0xa625afb399811a8aLL, 99, 2, RP2C04_0001, 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_0001, 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_0001, 0 },
{ "RBI Baseball", 0x6a02d345812938afLL, 4, 1, RP2C04_001, IOPTION_SWAPDIRAB }, { "RBI Baseball", 0x6a02d345812938afLL, 4, 1, RP2C04_0001, IOPTION_SWAPDIRAB },
{ "Soccer", 0xd4e7a9058780eda3LL, 99, 2, RP2C04_003, IOPTION_SWAPDIRAB }, { "Soccer", 0xd4e7a9058780eda3LL, 99, 2, RP2C04_0003, 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_0001, 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_0002, 0 },
{ "VS Slalom", 0x4889b5a50a623215LL, 0, 1, RP2C04_002, 0 }, { "VS Slalom", 0x4889b5a50a623215LL, 0, 1, RP2C04_0002, 0 },
{ "VS Super Mario Bros", 0x39d8cfa788e20b6cLL, 99, 2, RP2C05_004, 0 }, { "VS Super Mario Bros", 0x39d8cfa788e20b6cLL, 99, 2, RP2C04_0004, 0 },
{ "VS Super Mario Bros [a1]", 0xfc182e5aefbce14dLL, 99, 2, RP2C05_004, 0 }, { "VS Super Mario Bros [a1]", 0xfc182e5aefbce14dLL, 99, 2, RP2C04_0004, 0 },
{ "VS TKO Boxing", 0x6e1ee06171d8ce3aLL, 4, 1, RP2C04_003, IOPTION_PREDIP, 0x00 }, { "VS TKO Boxing", 0x6e1ee06171d8ce3aLL, 4, 1, RP2C04_0003, IOPTION_PREDIP, 0x00 },
{ 0 } { 0 }
}; };