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

Merge pull request #339 from negativeExponent/updates_and_fixes

Browse Source 
Cleanup mapper struct, move stuff around in iNESLoad()
This commit is contained in:
hizzlekizzle
2020-03-12 10:27:50 -05:00
committed by GitHub
parent 4f68f50b64 f2c3d35d25
commit 68b8f0e120
3 changed files with 748 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ines-correct.h
View File

@@ -380,6 +380,8 @@
{0x282745C5, 141, -1}, /* Q Boy (Asia) (Ja) (Unl).nes */ {0x282745C5, 141, -1}, /* Q Boy (Asia) (Ja) (Unl).nes */
{0x4B9ECFB2, 21, -1}, /* Wai Wai World 2 - SOS!! Paseri Jou (Japan) (Virtual Console).nes */ {0x4B9ECFB2, 21, -1}, /* Wai Wai World 2 - SOS!! Paseri Jou (Japan) (Virtual Console).nes */
{0x33751782, 4, -1}, /* Zoda's Revenge - StarTropics II (USA, Europe) (Virtual Console).nes */ {0x33751782, 4, -1}, /* Zoda's Revenge - StarTropics II (USA, Europe) (Virtual Console).nes */
{0x9BBF3E5D, 15, -1}, /* 168-in-1 New Contra Function 16 */
/* TXC / Sachen / JoyVan */ /* TXC / Sachen / JoyVan */

992
src/ines.c
View File

File diff suppressed because it is too large Load Diff

14
src/unif.c
View File

@@ -434,11 +434,11 @@ static BMAPPING bmap[] = {
{ "830118C", 348, BMC830118C_Init, 0 }, { "830118C", 348, BMC830118C_Init, 0 },
{ "A65AS", 285, BMCA65AS_Init, 0 }, { "A65AS", 285, BMCA65AS_Init, 0 },
{ "AB-G1L", NO_INES, AbG1l_Init, 0 }, { "AB-G1L", NO_INES, AbG1l_Init, 0 },
{ "AC08", NO_INES, AC08_Init, 0 }, /* Mapper 42.. but not.. Used for Green Beret */ { "AC08", 42, AC08_Init, 0 },
{ "ANROM", 7, ANROM_Init, 0 }, { "ANROM", 7, ANROM_Init, 0 },
{ "AX5705", 530, UNLAX5705_Init, 0 }, { "AX5705", 530, UNLAX5705_Init, 0 },
{ "BB", 108, UNLBB_Init, 0 }, { "BB", 108, UNLBB_Init, 0 },
{ "BS-110",NO_INES, BS110_Init, 0 }, { "BS-110", NO_INES, BS110_Init, 0 },
{ "BS-5", 286, BMCBS5_Init, 0 }, { "BS-5", 286, BMCBS5_Init, 0 },
{ "CC-21", 27, UNLCC21_Init, 0 }, { "CC-21", 27, UNLCC21_Init, 0 },
{ "CITYFIGHT", 266, UNLCITYFIGHT_Init, 0 }, { "CITYFIGHT", 266, UNLCITYFIGHT_Init, 0 },
@@ -446,7 +446,7 @@ static BMAPPING bmap[] = {
{ "CNROM", 3, CNROM_Init, 0 }, { "CNROM", 3, CNROM_Init, 0 },
{ "CPROM", 13, CPROM_Init, BMCFLAG_16KCHRR }, { "CPROM", 13, CPROM_Init, BMCFLAG_16KCHRR },
{ "D1038", 59, BMCD1038_Init, 0 }, { "D1038", 59, BMCD1038_Init, 0 },
{ "DANCE", 256, UNLOneBus_Init, 0 }, /* redundant */ { "DANCE", 256, UNLOneBus_Init, 0 },
{ "DANCE2000", 518, UNLD2000_Init, 0 }, { "DANCE2000", 518, UNLD2000_Init, 0 },
{ "DREAMTECH01", 521, DreamTech01_Init, 0 }, { "DREAMTECH01", 521, DreamTech01_Init, 0 },
{ "EDU2000", 329, UNLEDU2000_Init, 0 }, { "EDU2000", 329, UNLEDU2000_Init, 0 },
@@ -520,7 +520,7 @@ static BMAPPING bmap[] = {
{ "SSS-NROM-256", NO_INES, SSSNROM_Init, 0 }, { "SSS-NROM-256", NO_INES, SSSNROM_Init, 0 },
{ "SUNSOFT_UNROM", 93, SUNSOFT_UNROM_Init, 0 }, /* fix me, real pcb name, real pcb type */ { "SUNSOFT_UNROM", 93, SUNSOFT_UNROM_Init, 0 }, /* fix me, real pcb name, real pcb type */
{ "Sachen-74LS374N", 150, S74LS374N_Init, 0 }, { "Sachen-74LS374N", 150, S74LS374N_Init, 0 },
{ "Sachen-74LS374NA", 243, S74LS374N_Init, 0 }, /* seems to be custom mapper */ { "Sachen-74LS374NA", 150, S74LS374N_Init, 0 }, /* seems to be custom mapper */
{ "Sachen-8259A", 141, S8259A_Init, 0 }, { "Sachen-8259A", 141, S8259A_Init, 0 },
{ "Sachen-8259B", 138, S8259B_Init, 0 }, { "Sachen-8259B", 138, S8259B_Init, 0 },
{ "Sachen-8259C", 139, S8259C_Init, 0 }, { "Sachen-8259C", 139, S8259C_Init, 0 },
@@ -553,7 +553,7 @@ static BMAPPING bmap[] = {
{ "UNROM-512-32", 30, UNROM512_Init, BMCFLAG_32KCHRR }, { "UNROM-512-32", 30, UNROM512_Init, BMCFLAG_32KCHRR },
{ "UOROM", 2, UNROM_Init, 0 }, { "UOROM", 2, UNROM_Init, 0 },
{ "VRC7", 85, UNLVRC7_Init, 0 }, { "VRC7", 85, UNLVRC7_Init, 0 },
{ "WELL-NO-DG450",NO_INES, WellNoDG450_Init, 0 }, { "WELL-NO-DG450", NO_INES, WellNoDG450_Init, 0 },
{ "YOKO", 264, UNLYOKO_Init, 0 }, { "YOKO", 264, UNLYOKO_Init, 0 },
{ "COOLBOY", 268, COOLBOY_Init, BMCFLAG_256KCHRR }, { "COOLBOY", 268, COOLBOY_Init, BMCFLAG_256KCHRR },
{ "158B", 258, UNL158B_Init, 0 }, { "158B", 258, UNL158B_Init, 0 },
@@ -603,12 +603,12 @@ static BMAPPING bmap[] = {
{ "K-3033", 322, BMCK3033_Init, 0 }, { "K-3033", 322, BMCK3033_Init, 0 },
{ "830134C", 315, BMC830134C_Init, 0 }, { "830134C", 315, BMC830134C_Init, 0 },
{ "GN-26", 344, BMCGN26_Init, 0 }, { "GN-26", 344, BMCGN26_Init, 0 },
{ "KG256", NO_INES,KG256_Init, 0 }, { "KG256", NO_INES, KG256_Init, 0 },
{ "T4A54A", 134, Bs5652_Init, 0 }, { "T4A54A", 134, Bs5652_Init, 0 },
{ "WX-KB4K", 134, Bs5652_Init, 0 }, { "WX-KB4K", 134, Bs5652_Init, 0 },
{ "SB-5013", 359, Mapper359_Init, 0 }, { "SB-5013", 359, Mapper359_Init, 0 },
{ "82112C", 540, Mapper540_Init, 0 }, { "82112C", 540, Mapper540_Init, 0 },
{ "N49C-300", 369, Mapper369_Init }, { "N49C-300", 369, Mapper369_Init, 0 },
#ifdef COPYFAMI #ifdef COPYFAMI
{ "COPYFAMI_MMC3", NO_INES, MapperCopyFamiMMC3_Init, 0 }, { "COPYFAMI_MMC3", NO_INES, MapperCopyFamiMMC3_Init, 0 },