Skip to content

Commit 5080559

Browse files
committed
Systems promoted to working
--------------------------- Match'em Up (6221-51, U5-1) [Ivan Vangelista] Clones promoted to working -------------------------- Match'em Up (6221-55, U5-1 German) [Ivan Vangelista] The Couples (set 1) [Ivan Vangelista] The Couples (set 2) [Ivan Vangelista] The Couples (set 3) [Ivan Vangelista]
1 parent 9a00624 commit 5080559

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

src/mame/merit/merit.cpp

+9-10
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
- add flipscreen according to schematics
1414
- pitboss: dip switches
1515
- general - add named output notifiers
16-
- implement proper use of bit 0 in m_extra_video_bank_bit for Match'em Up sets and clones
1716
1817
Notes: it's important that "questions" is 0xa0000 bytes with empty space filled
1918
with 0xff, because the built-in ROMs test checks how many question ROMs
@@ -165,7 +164,7 @@ class merit_state : public driver_device
165164

166165
pen_t m_pens[NUM_PENS];
167166
uint8_t m_lscnblk = 0;
168-
uint16_t m_extra_video_bank_bit = 0;
167+
uint16_t m_extra_video_bank_bit[2]{};
169168

170169
void hsync_changed(int state);
171170
void led1_w(uint8_t data);
@@ -385,7 +384,7 @@ MC6845_UPDATE_ROW(merit_state::crtc_update_row)
385384
{
386385
int const attr = m_ram_attr[ma & 0x7ff];
387386
int const region = (attr & 0x40) >> 6;
388-
int addr = ((m_ram_video[ma & 0x7ff] | ((attr & 0x80) << 1) | (m_extra_video_bank_bit)) << 4) | (ra & 0x0f);
387+
int addr = ((m_ram_video[ma & 0x7ff] | ((attr & 0x80) << 1) | (m_extra_video_bank_bit[0] | m_extra_video_bank_bit[1])) << 4) | (ra & 0x0f);
389388
int const colour = (attr & 0x7f) << 3;
390389

391390
addr &= (rlen - 1);
@@ -476,11 +475,11 @@ void merit_state::led2_w(uint8_t data)
476475
void merit_state::misc_w(uint8_t data)
477476
{
478477
flip_screen_set(~data & 0x10);
479-
m_extra_video_bank_bit = (data & 2) << 8;
478+
m_extra_video_bank_bit[0] = (data & 2) << 8;
479+
m_extra_video_bank_bit[1] = (data & 1) << 10;
480480
m_lscnblk = (data >> 3) & 1;
481481

482482
// other bits unknown
483-
// TODO: bit 0 gets set by couple and clones in the levels where the tiles' GFX are wrong. Another video bank bit?
484483
}
485484

486485
void merit_banked_state::bank_w(uint8_t data)
@@ -3027,8 +3026,8 @@ GAME( 1986, phrcrazev, phrcraze, phrcraze, phrcrazs, merit_quiz_state, init_k
30273026
GAME( 1987, dtrvwz5, 0, dtrvwz5, dtrvwz5, merit_quiz_state, init_dtrvwz5, ROT0, "Merit", "Deluxe Trivia ? Whiz (6221-70, U5-0A Edition 5)", MACHINE_SUPPORTS_SAVE )
30283027
GAME( 1987, dtrvwz5v, dtrvwz5, dtrvwz5, dtrvwz5, merit_quiz_state, init_dtrvwz5, ROT90, "Merit", "Deluxe Trivia ? Whiz (6221-75, U5-0 Edition 5 Vertical)", MACHINE_SUPPORTS_SAVE )
30293028

3030-
GAME( 1986, matchem, 0, couple, matchem, merit_state, init_crt209, ROT0, "Merit", "Match'em Up (6221-51, U5-1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // in some levels the tiles' GFX are jumbled
3031-
GAME( 1986, matchemg, matchem, couple, matchemg, merit_state, init_crt209, ROT0, "Merit", "Match'em Up (6221-55, U5-1 German)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // "
3032-
GAME( 1988, couple, matchem, couple, couple, merit_state, init_crt209, ROT0, "bootleg", "The Couples (set 1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // "
3033-
GAME( 1988, couplep, matchem, couple, couplep, merit_state, init_crt209, ROT0, "bootleg", "The Couples (set 2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // "
3034-
GAME( 1988, couplei, matchem, couple, couple, merit_state, init_crt209, ROT0, "bootleg", "The Couples (set 3)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // "
3029+
GAME( 1986, matchem, 0, couple, matchem, merit_state, init_crt209, ROT0, "Merit", "Match'em Up (6221-51, U5-1)", MACHINE_SUPPORTS_SAVE )
3030+
GAME( 1986, matchemg, matchem, couple, matchemg, merit_state, init_crt209, ROT0, "Merit", "Match'em Up (6221-55, U5-1 German)", MACHINE_SUPPORTS_SAVE )
3031+
GAME( 1988, couple, matchem, couple, couple, merit_state, init_crt209, ROT0, "bootleg", "The Couples (set 1)", MACHINE_SUPPORTS_SAVE )
3032+
GAME( 1988, couplep, matchem, couple, couplep, merit_state, init_crt209, ROT0, "bootleg", "The Couples (set 2)", MACHINE_SUPPORTS_SAVE )
3033+
GAME( 1988, couplei, matchem, couple, couple, merit_state, init_crt209, ROT0, "bootleg", "The Couples (set 3)", MACHINE_SUPPORTS_SAVE )

0 commit comments

Comments
 (0)