From 5e2c907acdd508061fb0c50eed1cd2153d812207 Mon Sep 17 00:00:00 2001 From: negativeExponent Date: Sat, 12 Feb 2022 15:37:18 +0800 Subject: [PATCH] Sort mapper numbers --- src/ines.c | 111 +++++++++++++++++++++++++---------------------------- 1 file changed, 53 insertions(+), 58 deletions(-) diff --git a/src/ines.c b/src/ines.c index 8c9035d..c417a7a 100644 --- a/src/ines.c +++ b/src/ines.c @@ -553,7 +553,6 @@ INES_BOARD_BEGIN() /* INES_BOARD( "", 131, Mapper131_Init ) */ INES_BOARD( "TXC/UNL-22211", 132, Mapper132_Init ) INES_BOARD( "SA72008", 133, SA72008_Init ) -/* INES_BOARD( "MMC3 BMC PIRATE", 134, Mapper134_Init ) */ INES_BOARD( "MMC3 BMC PIRATE", 134, Bs5652_Init ) /* INES_BOARD( "", 135, Mapper135_Init ) */ INES_BOARD( "Sachen 3011", 136, Mapper136_Init ) @@ -677,59 +676,7 @@ INES_BOARD_BEGIN() INES_BOARD( "", 254, Mapper254_Init ) INES_BOARD( "", 255, Mapper255_Init ) /* Duplicate of M225? */ - /* NES 2.0 BOARDS THAT DO NOT HAVE UNIF ASSOCIATION */ - - INES_BOARD( "8-in-1 JY-119", 267, Mapper267_Init ) - INES_BOARD( "Games Xplosion 121-in-1", 269, Mapper269_Init ) - INES_BOARD( "YY860417C", 281, Mapper281_Init ) - INES_BOARD( "860224C", 282, Mapper282_Init ) - INES_BOARD( "GKCX1", 288, Mapper288_Init ) - INES_BOARD( "MMC3 BMC PIRATE", 294, Bs5652_Init ) /* nesdev redirects this as mapper 134 */ - INES_BOARD( "TXC 01-22110-000", 297, Mapper297_Init ) - INES_BOARD( "5/20-in-1 1993 Copyright", 334, Mapper334_Init ) - INES_BOARD( "Super Mario Family", 353, Mapper353_Init ) - INES_BOARD( "7-in-1 Rockman (JY-208)", 356, Mapper356_Init ) - INES_BOARD( "Bit Corp 4-in-1", 357, Mapper357_Init ) - INES_BOARD( "SB-5013/GCL8050/841242C", 359, Mapper359_Init ) - INES_BOARD( "Bitcorp 31-in-1", 360, Mapper360_Init ) - INES_BOARD( "OK-411", 361, GN45_Init ) /* OK-411 is emulated together with GN-45 */ - INES_BOARD( "JY830832C", 364, Mapper364_Init ) - INES_BOARD( "GN-45", 366, GN45_Init ) - INES_BOARD( "Yung-08", 368, Mapper368_Init ) - INES_BOARD( "Golden Mario Party II - Around the World 6-in-1", 370, Mapper370_Init ) - INES_BOARD( "MMC3 PIRATE SFC-12", 372, Mapper372_Init ) - INES_BOARD( "95/96 Super HiK 4-in-1", 374, Mapper374_Init ) - INES_BOARD( "YY841155C", 376, Mapper376_Init ) - INES_BOARD( "42 to 80,000 (970630C)", 380, Mapper380_Init ) - INES_BOARD( "KN-42", 381, Mapper381_Init ) - INES_BOARD( "830928C", 382, Mapper382_Init ) - INES_BOARD( "YY840708C", 383, Mapper383_Init ) - INES_BOARD( "Caltron 9-in-1", 389, Mapper389_Init ) - INES_BOARD( "Realtec 8031", 390, Mapper390_Init ) - INES_BOARD( "NewStar 12-in-1/7-in-1", 293, Mapper293_Init ) - INES_BOARD( "820720C", 393, Mapper393_Init ) - INES_BOARD( "Realtec 8210", 395, Mapper395_Init ) - INES_BOARD( "BMC Super 19-in-1 (VIP19)", 401, Mapper401_Init ) - INES_BOARD( "89433", 403, Mapper403_Init ) - INES_BOARD( "A88S-1", 411, Mapper411_Init ) - INES_BOARD( "0353", 415, Mapper415_Init ) - INES_BOARD( "4-in-1/N-32", 416, Mapper416_Init ) - INES_BOARD( "", 417, Mapper417_Init ) - INES_BOARD( "BS-400R/BS-4040", 422, Mapper422_Init ) - INES_BOARD( "Realtec 8090", 432, Mapper432_Init ) - INES_BOARD( "NC-20MB", 433, Mapper433_Init ) - INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init ) - INES_BOARD( "Sachen 3014", 533, Mapper533_Init ) - INES_BOARD( "NJ064", 534, Mapper534_Init ) - INES_BOARD( "60-1064-16L (FDS)", 538, Mapper538_Init ) - INES_BOARD( "Kid Ikarus (FDS)", 539, Mapper539_Init ) - INES_BOARD( "82112C", 540, Mapper540_Init ) - INES_BOARD( "LittleCom 160-in-1", 541, Mapper541_Init ) - INES_BOARD( "5-in-1 (CH-501)", 543, Mapper543_Init ) - INES_BOARD( "KS-7010", 554, Mapper554_Init ) - INES_BOARD( "", 550, Mapper550_Init ) - - /* UNIF to NES 2.0 BOARDS */ + /* NES 2.0 MAPPERS */ INES_BOARD( "OneBus", 256, UNLOneBus_Init ) INES_BOARD( "158B", 258, UNL158B_Init ) @@ -741,17 +688,24 @@ INES_BOARD_BEGIN() INES_BOARD( "YOKO", 264, UNLYOKO_Init ) INES_BOARD( "T-262", 265, BMCT262_Init ) INES_BOARD( "CITYFIGHT", 266, UNLCITYFIGHT_Init ) + INES_BOARD( "8-in-1 JY-119", 267, Mapper267_Init ) INES_BOARD( "COOLBOY/MINDKIDS", 268, Mapper268_Init ) /* Submapper distinguishes between COOLBOY and MINDKIDS */ + INES_BOARD( "Games Xplosion 121-in-1", 269, Mapper269_Init ) INES_BOARD( "80013-B", 274, BMC80013B_Init ) + INES_BOARD( "YY860417C", 281, Mapper281_Init ) + INES_BOARD( "860224C", 282, Mapper282_Init ) INES_BOARD( "GS-2004/GS-2013", 283, Mapper283_Init ) INES_BOARD( "A65AS", 285, BMCA65AS_Init ) INES_BOARD( "BS-5", 286, BMCBS5_Init ) - INES_BOARD( "411120-C", 287, BMC411120C_Init ) -/* INES_BOARD( "K-3088", 287, BMCK3088_Init ) */ + INES_BOARD( "411120-C, 811120-C", 287, BMC411120C_Init ) + INES_BOARD( "GKCX1", 288, Mapper288_Init ) INES_BOARD( "60311C", 289, BMC60311C_Init ) INES_BOARD( "NTD-03", 290, BMCNTD03_Init ) INES_BOARD( "DRAGONFIGHTER", 292, UNLBMW8544_Init ) + INES_BOARD( "NewStar 12-in-1/7-in-1", 293, Mapper293_Init ) + INES_BOARD( "MMC3 BMC PIRATE", 294, Bs5652_Init ) /* nesdev redirects this as mapper 134 */ INES_BOARD( "YY860216C", 295, Mapper295_Init ) + INES_BOARD( "TXC 01-22110-000", 297, Mapper297_Init ) INES_BOARD( "TF1201", 298, UNLTF1201_Init ) INES_BOARD( "11160", 299, BMC11160_Init ) INES_BOARD( "190in1", 300, BMC190in1_Init ) @@ -780,6 +734,7 @@ INES_BOARD_BEGIN() INES_BOARD( "12-IN-1", 331, BMC12IN1_Init ) INES_BOARD( "WS", 332, BMCWS_Init ) INES_BOARD( "NEWSTAR-GRM070-8IN1", 333, BMC8IN1_Init ) + INES_BOARD( "5/20-in-1 1993 Copyright", 334, Mapper334_Init ) INES_BOARD( "CTC-09", 335, BMCCTC09_Init ) INES_BOARD( "K-3046", 336, BMCK3046_Init ) INES_BOARD( "CTC-12IN1", 337, BMCCTC12IN1_Init ) @@ -794,22 +749,52 @@ INES_BOARD_BEGIN() INES_BOARD( "830118C", 348, BMC830118C_Init ) INES_BOARD( "G-146", 349, BMCG146_Init ) INES_BOARD( "891227", 350, BMC891227_Init ) + INES_BOARD( "Super Mario Family", 353, Mapper353_Init ) INES_BOARD( "3D-BLOCK", 355, UNL3DBlock_Init ) + INES_BOARD( "7-in-1 Rockman (JY-208)", 356, Mapper356_Init ) + INES_BOARD( "Bit Corp 4-in-1", 357, Mapper357_Init ) INES_BOARD( "YY860606C", 358, Mapper358_Init ) + INES_BOARD( "SB-5013/GCL8050/841242C", 359, Mapper359_Init ) + INES_BOARD( "Bitcorp 31-in-1", 360, Mapper360_Init ) + INES_BOARD( "OK-411", 361, GN45_Init ) /* OK-411 is emulated together with GN-45 */ + INES_BOARD( "JY830832C", 364, Mapper364_Init ) + INES_BOARD( "GN-45", 366, GN45_Init ) + INES_BOARD( "Yung-08", 368, Mapper368_Init ) INES_BOARD( "N49C-300", 369, Mapper369_Init ) + INES_BOARD( "Golden Mario Party II - Around the World 6-in-1", 370, Mapper370_Init ) + INES_BOARD( "MMC3 PIRATE SFC-12", 372, Mapper372_Init ) + INES_BOARD( "95/96 Super HiK 4-in-1", 374, Mapper374_Init ) + INES_BOARD( "YY841155C", 376, Mapper376_Init ) INES_BOARD( "JY-111/JY-112", 377, Mapper377_Init ) + INES_BOARD( "42 to 80,000 (970630C)", 380, Mapper380_Init ) + INES_BOARD( "KN-42", 381, Mapper381_Init ) + INES_BOARD( "830928C", 382, Mapper382_Init ) + INES_BOARD( "YY840708C", 383, Mapper383_Init ) INES_BOARD( "YY860729C", 386, Mapper386_Init ) INES_BOARD( "YY850735C", 387, Mapper387_Init ) INES_BOARD( "YY850835C", 388, Mapper388_Init ) + INES_BOARD( "Caltron 9-in-1", 389, Mapper389_Init ) + INES_BOARD( "Realtec 8031", 390, Mapper390_Init ) INES_BOARD( "BS-110", 391, Mapper391_Init ) + INES_BOARD( "820720C", 393, Mapper393_Init ) + INES_BOARD( "Realtec 8210", 395, Mapper395_Init ) INES_BOARD( "YY850437C", 396, Mapper396_Init ) INES_BOARD( "YY850439C", 397, Mapper397_Init ) + INES_BOARD( "BMC Super 19-in-1 (VIP19)", 401, Mapper401_Init ) INES_BOARD( "831019C J-2282", 402, J2282_Init ) - INES_BOARD( "JY012005", 404, Mapper404_Init ) - INES_BOARD( "JY-302", 410, Mapper410_Init ) + INES_BOARD( "89433", 403, Mapper403_Init ) + INES_BOARD( "JY012005", 404, Mapper404_Init ) + INES_BOARD( "JY-302", 410, Mapper410_Init ) + INES_BOARD( "A88S-1", 411, Mapper411_Init ) + INES_BOARD( "0353", 415, Mapper415_Init ) + INES_BOARD( "4-in-1/N-32", 416, Mapper416_Init ) + INES_BOARD( "", 417, Mapper417_Init ) INES_BOARD( "SC871115C", 421, Mapper421_Init ) + INES_BOARD( "BS-400R/BS-4040", 422, Mapper422_Init ) INES_BOARD( "AB-G1L/WELL-NO-DG450", 428, Mapper428_Init ) INES_BOARD( "LIKO BBG-235-8-1B", 429, Mapper429_Init ) + INES_BOARD( "Realtec 8090", 432, Mapper432_Init ) + INES_BOARD( "NC-20MB", 433, Mapper433_Init ) INES_BOARD( "S-009", 434, Mapper434_Init ) INES_BOARD( "820401/T-217", 436, Mapper436_Init ) INES_BOARD( "NTDEC TH2348", 437, Mapper437_Init ) @@ -819,6 +804,7 @@ INES_BOARD_BEGIN() INES_BOARD( "DS-9-27", 452, Mapper452_Init ) INES_BOARD( "K6C3001A", 456, Mapper456_Init ) INES_BOARD( "SA-9602B", 513, SA9602B_Init ) + INES_BOARD( "Brilliant Com Cocoma Pack", 516, Mapper516_Init ) INES_BOARD( "DANCE2000", 518, UNLD2000_Init ) INES_BOARD( "EH8813A", 519, UNLEH8813A_Init ) INES_BOARD( "DREAMTECH01", 521, DreamTech01_Init ) @@ -830,8 +816,17 @@ INES_BOARD_BEGIN() INES_BOARD( "AX-40G", 527, UNLAX40G_Init ) INES_BOARD( "T-230", 529, UNLT230_Init ) INES_BOARD( "AX5705", 530, UNLAX5705_Init ) + INES_BOARD( "Sachen 3014", 533, Mapper533_Init ) + INES_BOARD( "NJ064", 534, Mapper534_Init ) INES_BOARD( "LH53", 535, LH53_Init ) + INES_BOARD( "60-1064-16L (FDS)", 538, Mapper538_Init ) + INES_BOARD( "Kid Ikarus (FDS)", 539, Mapper539_Init ) + INES_BOARD( "82112C", 540, Mapper540_Init ) + INES_BOARD( "LittleCom 160-in-1", 541, Mapper541_Init ) + INES_BOARD( "5-in-1 (CH-501)", 543, Mapper543_Init ) INES_BOARD( "SACHEN 3013", 553, Mapper553_Init ) + INES_BOARD( "KS-7010", 554, Mapper554_Init ) + INES_BOARD( "", 550, Mapper550_Init ) INES_BOARD( "YC-03-09", 558, Mapper558_Init ) INES_BOARD_END()