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

Merge pull request #114 from retro-wertz/update

Browse Source 
updates
This commit is contained in:
Twinaphex
2017-05-09 14:31:06 +02:00
committed by GitHub
parent 8177370f4e f6bcfada73
commit fc569b7c36
3 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/boards/fk23c.c
View File

@@ -93,7 +93,8 @@ static uint64 CartList[] =
0x8fd9c235957a6df0LL, // 5-in-1 (K5003) [p1][!]-1125) (Ch).nes 0x8fd9c235957a6df0LL, // 5-in-1 (K5003) [p1][!]-1125) (Ch).nes
0x0315924d00dd7807LL, // Mortal Kombat 30 Peoples (DH1043) (Ch).nes 0x0315924d00dd7807LL, // Mortal Kombat 30 Peoples (DH1043) (Ch).nes
0x4b99c39fdb66128aLL, // 4-in-1 (FK23C8078) (Ch) [p1][U][!].unf 0x4b99c39fdb66128aLL, // 4-in-1 (FK23C8078) (Ch) [p1][U][!].unf
0 /* Abandon all hope if the game has 0 in the lower 64-bits of its MD5 hash */ 0x22a0ba5743191778LL, // Rockman 4 MI (Hack)
0 /* Abandon all hope if the game has 0 in the lower 64-bits of its MD5 hash */
}; };
int DetectPRGbonus(CartInfo *tmp) { int DetectPRGbonus(CartInfo *tmp) {
@@ -112,30 +113,37 @@ int DetectPRGbonus(CartInfo *tmp) {
} }
static void BMCFK23CPW(uint32 A, uint8 V) { static void BMCFK23CPW(uint32 A, uint8 V) {
/* Modified (c)May 2017 - Backport older implementations from FCEUmm
* to support big sized FK23CA carts which broke in latest commits.
*/
uint32 bank = (EXPREGS[1] & 0x1F); uint32 bank = (EXPREGS[1] & 0x1F);
uint32 hiblock = ((EXPREGS[0] & 8) << 4) | ((EXPREGS[0] & 0x80) << 1) | (UNIFchrrama ? ((EXPREGS[2] & 0x40) << 3) : 0); uint32 hiblock = ((EXPREGS[0] & 8) << 4) | ((EXPREGS[0] & 0x80) << 1) | (UNIFchrrama ? ((EXPREGS[2] & 0x40) << 3) : 0);
uint32 block = (EXPREGS[1] & 0x60) | hiblock; uint32 block = (EXPREGS[1] & 0x60) | hiblock;
uint32 extra = (EXPREGS[3] & 2); uint32 extra = (EXPREGS[3] & 2);
if ((EXPREGS[0] & 7) == 4) switch (EXPREGS[0] & 7) {
setprg32(0x8000, EXPREGS[1] >> 1); case 4:
else if ((EXPREGS[0] & 7) == 3) { setprg32(0x8000,(EXPREGS[1] | block) >> 1);
setprg16(0x8000, EXPREGS[1]); break;
setprg16(0xC000, EXPREGS[1]); case 3:
} else { setprg16(0x8000,(EXPREGS[1] | block));
setprg16(0xC000,(EXPREGS[1] | block));
break;
default:
if (EXPREGS[0] & 3) { if (EXPREGS[0] & 3) {
uint32 blocksize = (6) - (EXPREGS[0] & 3); uint32 blocksize = (6) - (EXPREGS[0] & 3);
uint32 mask = (1 << blocksize) - 1; uint32 mask = (1 << blocksize) - 1;
V &= mask; V &= mask;
//V &= 63; //? is this a good idea? //V &= 63; //? is this a good idea?
V |= (EXPREGS[1] << 1); V |= EXPREGS[1] << 1;
setprg8(A, V); setprg8(A, (V | (hiblock << 1)));
} else } else
setprg8(A, (block << 1) | (V & prg_mask)); setprg8(A, ((V & prg_mask) | (block << 1)));
if (EXPREGS[3] & 2) { if (extra) {
setprg8(0xC000, EXPREGS[4]); setprg8(0xC000, EXPREGS[4]);
setprg8(0xE000, EXPREGS[5]); setprg8(0xE000, EXPREGS[5]);
} }
break;
} }
setprg8r(0x10, 0x6000, A001B & 3); setprg8r(0x10, 0x6000, A001B & 3);
} }
@@ -191,10 +199,9 @@ static DECLFW(BMCFK23CWrite) {
} }
} }
if (is_BMCFK23CA) { if (is_BMCFK23CA)
if(EXPREGS[3] & 2) if(EXPREGS[3] & 2)
EXPREGS[0] &= ~7; // hacky hacky! if someone wants extra banking, then for sure doesn't want mode 4 for it! (allow to run A version boards on normal mapper) EXPREGS[0] &= ~7; // hacky hacky! if someone wants extra banking, then for sure doesn't want mode 4 for it! (allow to run A version boards on normal mapper)
}
} }
static void BMCFK23CReset(void) { static void BMCFK23CReset(void) {
@@ -253,7 +260,7 @@ void BMCFK23C_Init(CartInfo *info) {
AddExState(&dipswitch, 1, 0, "DPSW"); AddExState(&dipswitch, 1, 0, "DPSW");
prg_bonus = DetectPRGbonus(info); prg_bonus = DetectPRGbonus(info);
prg_mask = 0x7F >> (prg_bonus); prg_mask = (0x7F >> prg_bonus);
} }
void BMCFK23CA_Init(CartInfo *info) { void BMCFK23CA_Init(CartInfo *info) {
@@ -276,5 +283,5 @@ void BMCFK23CA_Init(CartInfo *info) {
AddExState(&dipswitch, 1, 0, "DPSW"); AddExState(&dipswitch, 1, 0, "DPSW");
prg_bonus = DetectPRGbonus(info); prg_bonus = DetectPRGbonus(info);
prg_mask = 0x7F >> (prg_bonus); prg_mask = (0x7F >> prg_bonus);
} }

3
src/boards/mmc3.c
View File

@@ -358,6 +358,9 @@ void Mapper4_Init(CartInfo *info) {
FCEU_printf("Low-G-Man can not work normally in the iNES format.\nThis game has been recognized by its CRC32 value, and the appropriate changes will be made so it will run.\nIf you wish to hack this game, you should use the UNIF format for your hack.\n\n"); FCEU_printf("Low-G-Man can not work normally in the iNES format.\nThis game has been recognized by its CRC32 value, and the appropriate changes will be made so it will run.\nIf you wish to hack this game, you should use the UNIF format for your hack.\n\n");
ws = 0; ws = 0;
} }
if (info->CRC32 == 0x97b6cb19)
isRevB = 0;
GenMMC3_Init(info, 512, 256, ws, info->battery); GenMMC3_Init(info, 512, 256, ws, info->battery);
info->Power = M4Power; info->Power = M4Power;
hackm4 = info->mirror; hackm4 = info->mirror;

37
src/ines-correct.h
View File

@@ -41,8 +41,8 @@
{0x291bcd7d, 1, 8}, /* Pachio Kun 2 */ {0x291bcd7d, 1, 8}, /* Pachio Kun 2 */
{0xa9a4ea4c, 1, 8}, /* Satomi Hakkenden */ {0xa9a4ea4c, 1, 8}, /* Satomi Hakkenden */
{0xcc3544b0, 1, 8}, /* Triathron */ {0xcc3544b0, 1, 8}, /* Triathron */
{0x934db14a, 1, -1}, /* All-Pro Basketball */ {0x934db14a, 1, -1}, /* All-Pro Basketball */
{0xf74dfc91, 1, -1}, /* Win, Lose, or Draw */ {0xf74dfc91, 1, -1}, /* Win, Lose, or Draw */
{0x9ea1dc76, 2, 0}, /* Rainbow Islands */ {0x9ea1dc76, 2, 0}, /* Rainbow Islands */
{0x6d65cac6, 2, 0}, /* Terra Cresta */ {0x6d65cac6, 2, 0}, /* Terra Cresta */
{0xe1b260da, 2, 1}, /* Argos no Senshi */ {0xe1b260da, 2, 1}, /* Argos no Senshi */
@@ -70,7 +70,8 @@
{0x02cc3973, 3, 1}, /* Ninja Kid */ {0x02cc3973, 3, 1}, /* Ninja Kid */
{0xbc065fc3, 3, 1}, /* Pipe Dream */ {0xbc065fc3, 3, 1}, /* Pipe Dream */
{0xc9ee15a7, 3, -1}, /* 3 is probably best. 41 WILL NOT WORK. */ {0xc9ee15a7, 3, -1}, /* 3 is probably best. 41 WILL NOT WORK. */
{0x22d6d5bd, 4, 1}, /* Jikuu Yuuden - Debias (J) */ {0x97b6cb19, 4, -1}, /* Aladdin (SuperGame) (Mapper 4) [!] */
{0x22d6d5bd, 4, 1}, /* Jikuu Yuuden - Debias (J) */
{0xd97c31b0, 4, 1}, //Rasaaru Ishii no Childs Quest (J) {0xd97c31b0, 4, 1}, //Rasaaru Ishii no Childs Quest (J)
{0x404b2e8b, 4, 2}, /* Rad Racer 2 */ {0x404b2e8b, 4, 2}, /* Rad Racer 2 */
{0x15141401, 4, 8}, /* Asmik Kun Land */ {0x15141401, 4, 8}, /* Asmik Kun Land */
@@ -87,7 +88,7 @@
{0x345d3a1a, 11, 1}, /* Castle of Deceit */ {0x345d3a1a, 11, 1}, /* Castle of Deceit */
{0x5e66eaea, 13, 1}, /* Videomation */ {0x5e66eaea, 13, 1}, /* Videomation */
{0xcd373baa, 14, -1}, /* Samurai Spirits (Rex Soft) */ {0xcd373baa, 14, -1}, /* Samurai Spirits (Rex Soft) */
{0xbfc7a2e9, 16, 8}, /* Gokuu Den (J) [a1] */ {0xbfc7a2e9, 16, 8}, /* Gokuu Den (J) [a1] */
{0x6e68e31a, 16, 8}, /* Dragon Ball 3*/ {0x6e68e31a, 16, 8}, /* Dragon Ball 3*/
{0x33b899c9, 16, -1}, /* Dragon Ball - Dai Maou Fukkatsu (J) [!] */ {0x33b899c9, 16, -1}, /* Dragon Ball - Dai Maou Fukkatsu (J) [!] */
{0xa262a81f, 16, -1}, /* Rokudenashi Blues (J) */ {0xa262a81f, 16, -1}, /* Rokudenashi Blues (J) */
@@ -132,9 +133,9 @@
{0x054bd3e9, 74, -1}, /* Di 4 Ci - Ji Qi Ren Dai Zhan (As) */ {0x054bd3e9, 74, -1}, /* Di 4 Ci - Ji Qi Ren Dai Zhan (As) */
{0x496ac8f7, 74, -1}, /* Ji Jia Zhan Shi (As) */ {0x496ac8f7, 74, -1}, /* Ji Jia Zhan Shi (As) */
{0xae854cef, 74, -1}, /* Jia A Fung Yun (Chinese) */ {0xae854cef, 74, -1}, /* Jia A Fung Yun (Chinese) */
{0xba51ac6f, 78, 2}, /* Holy Diver (J) [!] */ {0xba51ac6f, 78, 2}, /* Holy Diver (J) [!] */
{0x3d1c3137, 78, 8}, /* Uchuusen - Cosmo Carrier */ {0x3d1c3137, 78, 8}, /* Uchuusen - Cosmo Carrier */
{0xa4fbb438, 79, 0}, /* F-15 City War (AVE) (REV1.x) [b1] */ {0xa4fbb438, 79, 0}, /* F-15 City War (AVE) (REV1.x) [b1] */
{0xd4a76b07, 79, 0}, /* F-15 City Wars*/ {0xd4a76b07, 79, 0}, /* F-15 City Wars*/
{0x1eb4a920, 79, 1}, /* Double Strike */ {0x1eb4a920, 79, 1}, /* Double Strike */
{0x3e1271d5, 79, 1}, /* Tiles of Fate */ {0x3e1271d5, 79, 1}, /* Tiles of Fate */
@@ -146,11 +147,11 @@
{0x8eab381c, 113, 1}, /* Death Bots */ {0x8eab381c, 113, 1}, /* Death Bots */
{0x3d3ff543, 113, 0}, /* Kazama Jun to Asama Yuuko no AV Dragon Mahjong (Japan) (Unl) */ {0x3d3ff543, 113, 0}, /* Kazama Jun to Asama Yuuko no AV Dragon Mahjong (Japan) (Unl) */
{0x68379fdb, 113, 1}, /* Pipemania (Australia) (HES) (Unl) */ {0x68379fdb, 113, 1}, /* Pipemania (Australia) (HES) (Unl) */
{0x6a03d3f3, 114, -1}, /* Lion King, The (Unl) (Mapper 114) */ {0x6a03d3f3, 114, -1}, /* Lion King, The (Unl) (Mapper 114) */
{0x0d98db53, 114, -1}, /* Pocahontas */ {0x0d98db53, 114, -1}, /* Pocahontas */
{0x4e7729ff, 114, -1}, /* Super Donkey Kong */ {0x4e7729ff, 114, -1}, /* Super Donkey Kong */
{0xc5e5c5b2, 115, -1}, /* Bao Qing Tian (As).nes */ {0xc5e5c5b2, 115, -1}, /* Bao Qing Tian (As).nes */
{0xa1dc16c0, 116, -1}, /* Street Heroes (Sachen) [b1] */ {0xa1dc16c0, 116, -1}, /* Street Heroes (Sachen) [b1] */
{0xe40dfb7e, 116, -1}, /* Somari (P conf.) */ {0xe40dfb7e, 116, -1}, /* Somari (P conf.) */
{0xc9371ebb, 116, -1}, /* Somari (W conf.) */ {0xc9371ebb, 116, -1}, /* Somari (W conf.) */
{0xcbf4366f, 118, 8}, /* Alien Syndrome (U.S. unlicensed) */ {0xcbf4366f, 118, 8}, /* Alien Syndrome (U.S. unlicensed) */
@@ -171,8 +172,8 @@
{0xb6a727fa, 146, -1}, /* Papillion (As) [!] */ {0xb6a727fa, 146, -1}, /* Papillion (As) [!] */
{0xa62b79e1, 146, -1}, /* Side Winder (HES) [!] */ {0xa62b79e1, 146, -1}, /* Side Winder (HES) [!] */
{0xcc868d4e, 149, -1}, /* 16 Mahjong [p1][!] */ {0xcc868d4e, 149, -1}, /* 16 Mahjong [p1][!] */
{0x29582ca1, 150, -1}, /* Mei Nu Quan (Honey Peach) (Sachen) [!] */ {0x29582ca1, 150, -1}, /* Mei Nu Quan (Honey Peach) (Sachen) [!] */
{0x40dbf7a2, 150, -1}, /* Olympic IQ (Sachen) [!] */ {0x40dbf7a2, 150, -1}, /* Olympic IQ (Sachen) [!] */
{0x73fb55ac, 150, -1}, /* 2-in-1 Cosmo Cop + Cyber Monster (Sachen) [!] */ {0x73fb55ac, 150, -1}, /* 2-in-1 Cosmo Cop + Cyber Monster (Sachen) [!] */
{0xddcbda16, 150, -1}, /* 2-in-1 Tough Cop + Super Tough Cop (Sachen) [!] */ {0xddcbda16, 150, -1}, /* 2-in-1 Tough Cop + Super Tough Cop (Sachen) [!] */
{0x47918d84, 150, -1}, /* auto-upturn */ {0x47918d84, 150, -1}, /* auto-upturn */
@@ -190,7 +191,7 @@
{0xcfd4a281, 155, 8}, /* Money Game. Yay for money! */ {0xcfd4a281, 155, 8}, /* Money Game. Yay for money! */
{0x2f27cdef, 155, 8}, /* Tatakae!! Rahmen Man */ {0x2f27cdef, 155, 8}, /* Tatakae!! Rahmen Man */
{0xc1719664, 155, 8}, /* Tatakae!! Rahmen Man - Sakuretsu Choujin 102 Gei (Japan) */ {0xc1719664, 155, 8}, /* Tatakae!! Rahmen Man - Sakuretsu Choujin 102 Gei (Japan) */
{0xccc03440, 156, -1}, /* Buzz and Waldog (U) (Prototype) [!] */ {0xccc03440, 156, -1}, /* Buzz and Waldog (U) (Prototype) [!] */
{0x983d8175, 157, 8}, /* Datach Battle Rush */ {0x983d8175, 157, 8}, /* Datach Battle Rush */
{0x894efdbc, 157, 8}, /* Datach Crayon Shin Chan */ {0x894efdbc, 157, 8}, /* Datach Crayon Shin Chan */
{0x19e81461, 157, 8}, /* Datach DBZ */ {0x19e81461, 157, 8}, /* Datach DBZ */
@@ -226,19 +227,19 @@
{0x0f05ff0a, 181, -1}, /* Seicross (redump) */ {0x0f05ff0a, 181, -1}, /* Seicross (redump) */
{0x96ce586e, 189, 8}, /* Street Fighter 2 YOKO */ {0x96ce586e, 189, 8}, /* Street Fighter 2 YOKO */
{0x0E76E4C1, 190, 0}, /* Magic Kid Googoo */ {0x0E76E4C1, 190, 0}, /* Magic Kid Googoo */
{0x555a555e, 191, -1}, /* Sugoro Quest - Dice no Senshitachi (Ch) */ {0x555a555e, 191, -1}, /* Sugoro Quest - Dice no Senshitachi (Ch) */
{0x2cc381f6, 191, -1}, /* Sugoro Quest - Dice no Senshitachi (As) */ {0x2cc381f6, 191, -1}, /* Sugoro Quest - Dice no Senshitachi (As) */
{0xa145fae6, 192, -1}, /* Young Chivalry (Ch) [b3] */ {0xa145fae6, 192, -1}, /* Young Chivalry (Ch) [b3] */
{0xa9115bc1, 192, -1}, /* Young Chivalry (Ch) [!] */ {0xa9115bc1, 192, -1}, /* Young Chivalry (Ch) [!] */
{0x4c7bbb0e, 192, -1}, /* Young Chivalry (Ch) [b2] */ {0x4c7bbb0e, 192, -1}, /* Young Chivalry (Ch) [b2] */
{0x98c1cd4b, 192, -1}, /* Ying Lie Qun Xia Zhuan (Chinese) */ {0x98c1cd4b, 192, -1}, /* Ying Lie Qun Xia Zhuan (Chinese) */
{0xee810d55, 192, -1}, /* You Ling Xing Dong (Ch) */ {0xee810d55, 192, -1}, /* You Ling Xing Dong (Ch) */
{0x442f1a29, 192, -1}, /* Young chivalry */ {0x442f1a29, 192, -1}, /* Young chivalry */
{0x637134e8, 193, 1}, /* Fighting Hero */ {0x637134e8, 193, 1}, /* Fighting Hero */
{0xa925226c, 194, -1}, /* Dai-2-Ji - Super Robot Taisen (As) */ {0xa925226c, 194, -1}, /* Dai-2-Ji - Super Robot Taisen (As) */
{0x7f3dbf1b, 195, 0}, /* Chaos World (Ch) */ {0x7f3dbf1b, 195, 0}, /* Chaos World (Ch) */
{0xb616885c, 195, 0}, /* CHaos WOrld (Ch)*/ {0xb616885c, 195, 0}, /* CHaos WOrld (Ch)*/
{0x33c5df92, 195, -1}, /* Captain Tsubasa Vol. II - Super Striker (Ch) [a1] */ {0x33c5df92, 195, -1}, /* Captain Tsubasa Vol. II - Super Striker (Ch) [a1] */
{0x1bc0be6c, 195, -1}, /* Captain Tsubasa Vol 2 - Super Striker (C) */ {0x1bc0be6c, 195, -1}, /* Captain Tsubasa Vol 2 - Super Striker (C) */
{0xd5224fde, 195, -1}, /* Crystalis (c) */ {0xd5224fde, 195, -1}, /* Crystalis (c) */
{0xfdec419f, 196, -1}, /* Street Fighter VI 16 Peoples (Unl) [!] */ {0xfdec419f, 196, -1}, /* Street Fighter VI 16 Peoples (Unl) [!] */
@@ -246,7 +247,7 @@
{0x9a2cf02c, 198, -1}, {0x9a2cf02c, 198, -1},
{0xd8b401a7, 198, -1}, {0xd8b401a7, 198, -1},
{0x28192599, 198, -1}, {0x28192599, 198, -1},
{0x19b9e732, 198, -1}, /* Tenchi wo Kurau II - Shokatsu Koumei Den (J) (PRG0) [T-Chi] */ {0x19b9e732, 198, -1}, /* Tenchi wo Kurau II - Shokatsu Koumei Den (J) (PRG0) [T-Chi] */
{0xdd431ba7, 198, -1}, /* Tenchi wo kurau 2 (c) */ {0xdd431ba7, 198, -1}, /* Tenchi wo kurau 2 (c) */
{0xd871d3e6, 199, -1}, /* Dragon Ball Z 2 - Gekishin Freeza! (C) */ {0xd871d3e6, 199, -1}, /* Dragon Ball Z 2 - Gekishin Freeza! (C) */
{0xed481b7c, 199, -1}, /* Dragon Ball Z Gaiden - Saiya Jin Zetsumetsu Keikaku (C) */ {0xed481b7c, 199, -1}, /* Dragon Ball Z Gaiden - Saiya Jin Zetsumetsu Keikaku (C) */