Skip to content

Commit eb5ca2e

Browse files
thor2016thor2016
authored
Merge pull request #778 from awjackson/mapper97
More mapper fixes
2 parents 71ba361 + 4008488 commit eb5ca2e

8 files changed

+20
-101
lines changed

‎src/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,6 @@ set(SRC_CORE
408408
${CMAKE_CURRENT_SOURCE_DIR}/boards/120.cpp
409409
${CMAKE_CURRENT_SOURCE_DIR}/boards/121.cpp
410410
${CMAKE_CURRENT_SOURCE_DIR}/boards/12in1.cpp
411-
${CMAKE_CURRENT_SOURCE_DIR}/boards/151.cpp
412411
${CMAKE_CURRENT_SOURCE_DIR}/boards/156.cpp
413412
${CMAKE_CURRENT_SOURCE_DIR}/boards/158B.cpp
414413
${CMAKE_CURRENT_SOURCE_DIR}/boards/15.cpp

‎src/boards/151.cpp

-59
This file was deleted.

‎src/boards/datalatch.cpp

+3-20
Original file line numberDiff line numberDiff line change
@@ -370,31 +370,14 @@ void Mapper94_Init(CartInfo *info) {
370370
//------------------ Map 97 ---------------------------
371371

372372
static void M97Sync(void) {
373-
setchr8(0);
374373
setprg16(0x8000, ~0);
375374
setprg16(0xc000, latche & 15);
376-
switch (latche >> 6) {
377-
case 0: break;
378-
case 1: setmirror(MI_H); break;
379-
case 2: setmirror(MI_V); break;
380-
case 3: break;
381-
}
382-
setchr8(((latche >> 1) & 1) | ((latche << 1) & 2));
375+
setmirror((latche >> 7) & 1);
376+
setchr8(0);
383377
}
384378

385379
void Mapper97_Init(CartInfo *info) {
386-
Latch_Init(info, M97Sync, ~0, 0x8000, 0xFFFF, 0, 0);
387-
}
388-
389-
//------------------ Map 101 ---------------------------
390-
391-
static void M101Sync(void) {
392-
setprg32(0x8000, 0);
393-
setchr8(latche);
394-
}
395-
396-
void Mapper101_Init(CartInfo *info) {
397-
Latch_Init(info, M101Sync, ~0, 0x6000, 0x7FFF, 0, 0);
380+
Latch_Init(info, M97Sync, ~0, 0x8000, 0xBFFF, 0, 0);
398381
}
399382

400383
//------------------ Map 107 ---------------------------

‎src/ines-correct.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@
129129
{0xd4a76b07, 79, 0}, /* F-15 City Wars*/
130130
{0x1eb4a920, 79, 1}, /* Double Strike */
131131
{0x3e1271d5, 79, 1}, /* Tiles of Fate */
132+
{0x0da5e32e, 87, 1}, /* Urusei Yatsura */
132133
{0xd2699893, 88, 0}, /* Dragon Spirit */
133134
{0xbb7c5f7a, 89, 8}, /* Mito Koumon or something similar */
134-
{0x0da5e32e, 101, -1}, /* new Uruusey Yatsura */
135135
{0x8eab381c, 113, 1}, /* Death Bots */
136136
{0x6a03d3f3, 114, -1},
137137
{0x0d98db53, 114, -1}, /* Pocahontas */

‎src/ines.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ BMAPPINGLocal bmap[] = {
547547
{"100-in-1", 15, Mapper15_Init},
548548
{"BANDAI 24C02", 16, Mapper16_Init},
549549
{"FFE Rev. B", 17, Mapper17_Init},
550-
{"JALECO SS880006", 18, Mapper18_Init}, // JF-NNX (EB89018-30007) boards
550+
{"JALECO SS88006", 18, Mapper18_Init}, // JF-NNX (EB89018-30007) boards
551551
{"Namcot 106", 19, Mapper19_Init},
552552
// {"", 20, Mapper20_Init},
553553
{"Konami VRC2/VRC4 A", 21, Mapper21_Init},
@@ -557,7 +557,7 @@ BMAPPINGLocal bmap[] = {
557557
{"Konami VRC2/VRC4 D", 25, Mapper25_Init},
558558
{"Konami VRC6 Rev. B", 26, Mapper26_Init},
559559
{"CC-21 MI HUN CHE", 27, UNLCC21_Init}, // Former dupe for VRC2/VRC4 mapper, redefined with crc to mihunche boards
560-
{"", 28, Mapper28_Init},
560+
{"ACTION 53", 28, Mapper28_Init},
561561
{"RET-CUFROM", 29, Mapper29_Init},
562562
{"UNROM 512", 30, UNROM512_Init},
563563
{"infiniteneslives-NSF", 31, Mapper31_Init},
@@ -630,7 +630,7 @@ BMAPPINGLocal bmap[] = {
630630
// {"", 98, Mapper98_Init},
631631
{"VS Uni/Dual- system", 99, Mapper99_Init},
632632
// {"", 100, Mapper100_Init},
633-
{"", 101, Mapper101_Init},
633+
// {"", 101, Mapper101_Init}, // Deprecated, dupe
634634
// {"", 102, Mapper102_Init},
635635
{"FDS DOKIDOKI FULL", 103, Mapper103_Init},
636636
// {"", 104, Mapper104_Init},
@@ -647,7 +647,7 @@ BMAPPINGLocal bmap[] = {
647647
{"MMC3 PIRATE A", 115, Mapper115_Init},
648648
{"MMC1/MMC3/VRC PIRATE",116, UNLSL12_Init},
649649
{"FUTURE MEDIA BOARD", 117, Mapper117_Init},
650-
{"TSKROM", 118, TKSROM_Init},
650+
{"TKSROM", 118, TKSROM_Init},
651651
{"NES-TQROM", 119, Mapper119_Init},
652652
{"FDS TOBIDASE", 120, Mapper120_Init},
653653
{"MMC3 PIRATE PROT. A", 121, Mapper121_Init},
@@ -680,11 +680,11 @@ BMAPPINGLocal bmap[] = {
680680
{"SA0037", 148, SA0037_Init},
681681
{"SA0036", 149, SA0036_Init},
682682
{"S74LS374N", 150, S74LS374N_Init},
683-
{"", 151, Mapper151_Init},
684-
{"", 152, Mapper152_Init},
683+
// {"", 151, Mapper151_Init}, // Deprecated, dupe
684+
{"BA SARA DISCRETE", 152, Mapper152_Init},
685685
{"BANDAI SRAM", 153, Mapper153_Init}, // Bandai board 16 with SRAM instead of EEPROM
686686
{"", 154, Mapper154_Init},
687-
{"", 155, Mapper155_Init},
687+
{"MMC1A", 155, Mapper155_Init}, // No WRAM disable
688688
{"", 156, Mapper156_Init},
689689
{"BANDAI BARCODE", 157, Mapper157_Init},
690690
// {"", 158, Mapper158_Init},
@@ -709,15 +709,15 @@ BMAPPINGLocal bmap[] = {
709709
{"", 177, Mapper177_Init},
710710
{"", 178, Mapper178_Init},
711711
// {"", 179, Mapper179_Init},
712-
{"", 180, Mapper180_Init},
712+
{"UNROM+74HC08", 180, Mapper180_Init}, // Crazy Climber
713713
{"", 181, Mapper181_Init},
714714
// {"", 182, Mapper182_Init}, // Deprecated, dupe
715715
{"", 183, Mapper183_Init},
716-
{"", 184, Mapper184_Init},
717-
{"", 185, Mapper185_Init},
718-
{"", 186, Mapper186_Init},
716+
{"SUNSOFT-K", 184, Mapper184_Init}, // Sunsoft-1 mapper
717+
{"CNROM+SECURITY", 185, Mapper185_Init},
718+
{"STUDY BOX", 186, Mapper186_Init},
719719
{"", 187, Mapper187_Init},
720-
{"", 188, Mapper188_Init},
720+
{"KARAOKE STUDIO", 188, Mapper188_Init},
721721
{"", 189, Mapper189_Init},
722722
{"", 190, Mapper190_Init},
723723
{"", 191, Mapper191_Init},
@@ -757,8 +757,8 @@ BMAPPINGLocal bmap[] = {
757757
{"", 225, Mapper225_Init},
758758
{"BMC 22+20-in-1", 226, Mapper226_Init},
759759
{"", 227, Mapper227_Init},
760-
{"", 228, Mapper228_Init},
761-
{"", 229, Mapper229_Init},
760+
{"ACTIVE ENTERPRISES", 228, Mapper228_Init},
761+
{"BMC 31-in-1", 229, Mapper229_Init},
762762
{"BMC Contra+22-in-1", 230, Mapper230_Init},
763763
{"", 231, Mapper231_Init},
764764
{"BMC QUATTRO", 232, Mapper232_Init},

‎src/vsuni.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ VSUNIENTRY VSUniGames[] =
268268
{ "Freedom Force", 0xed96436bd1b5e688ULL, 4, 0, GIPPU_RP2C04_0001, VS_OPTION_GUN, 0, EGIVS_NORMAL }, /* Wrong color in game select screen? */
269269
{ "Stroke and Match Golf", 0x612325606e82bc66ULL, 99, 2, GIPPU_RP2C04_0002, VS_OPTION_SWAPDIRAB | VS_OPTION_PREDIP, 0x01, EGIVS_NORMAL },
270270

271-
{ "Goonies", 0xb4032d694e1d2733ULL, 151, 1, GIPPU_RP2C04_0003, 0, 0, EGIVS_NORMAL },
272-
{ "Gradius", 0x50687ae63bdad976ULL, 151, 1, GIPPU_RP2C04_0001, VS_OPTION_SWAPDIRAB, 0, EGIVS_NORMAL },
271+
{ "Goonies", 0xb4032d694e1d2733ULL, 75, 2, GIPPU_RP2C04_0003, 0, 0, EGIVS_NORMAL },
272+
{ "Gradius", 0x47b22dfda574b968ULL, 75, 2, GIPPU_RP2C04_0001, VS_OPTION_SWAPDIRAB, 0, EGIVS_NORMAL },
273273
{ "Gumshoe", 0x87161f8ee37758d3ULL, 99, 2, GIPPU_RC2C05_03, VS_OPTION_GUN, 0, EGIVS_NORMAL },
274274
{ "Gumshoe", 0xb8500780bf69ce29ULL, 99, 2, GIPPU_RC2C05_03, VS_OPTION_GUN, 0, EGIVS_NORMAL },
275275
{ "Hogan's Alley", 0xd78b7f0bb621fb45ULL, 99, 2, GIPPU_RP2C04_0001, VS_OPTION_GUN, 0, EGIVS_NORMAL },

‎vc/vc14_fceux.vcxproj

-1
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,6 @@ xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z_64.dll" "$(OutDir)"</Command>
400400
<ClCompile Include="..\src\boards\121.cpp" />
401401
<ClCompile Include="..\src\boards\12in1.cpp" />
402402
<ClCompile Include="..\src\boards\15.cpp" />
403-
<ClCompile Include="..\src\boards\151.cpp" />
404403
<ClCompile Include="..\src\boards\156.cpp" />
405404
<ClCompile Include="..\src\boards\158B.cpp" />
406405
<ClCompile Include="..\src\boards\164.cpp" />

‎vc/vc14_fceux.vcxproj.filters

-3
Original file line numberDiff line numberDiff line change
@@ -781,9 +781,6 @@
781781
<ClCompile Include="..\src\boards\99.cpp">
782782
<Filter>boards</Filter>
783783
</ClCompile>
784-
<ClCompile Include="..\src\boards\151.cpp">
785-
<Filter>boards</Filter>
786-
</ClCompile>
787784
<ClCompile Include="..\src\boards\156.cpp">
788785
<Filter>boards</Filter>
789786
</ClCompile>

0 commit comments

Comments
 (0)