|
13 | 13 | - add flipscreen according to schematics
|
14 | 14 | - pitboss: dip switches
|
15 | 15 | - 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 |
17 | 16 |
|
18 | 17 | Notes: it's important that "questions" is 0xa0000 bytes with empty space filled
|
19 | 18 | with 0xff, because the built-in ROMs test checks how many question ROMs
|
@@ -165,7 +164,7 @@ class merit_state : public driver_device
|
165 | 164 |
|
166 | 165 | pen_t m_pens[NUM_PENS];
|
167 | 166 | uint8_t m_lscnblk = 0;
|
168 |
| - uint16_t m_extra_video_bank_bit = 0; |
| 167 | + uint16_t m_extra_video_bank_bit[2]{}; |
169 | 168 |
|
170 | 169 | void hsync_changed(int state);
|
171 | 170 | void led1_w(uint8_t data);
|
@@ -385,7 +384,7 @@ MC6845_UPDATE_ROW(merit_state::crtc_update_row)
|
385 | 384 | {
|
386 | 385 | int const attr = m_ram_attr[ma & 0x7ff];
|
387 | 386 | 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); |
389 | 388 | int const colour = (attr & 0x7f) << 3;
|
390 | 389 |
|
391 | 390 | addr &= (rlen - 1);
|
@@ -476,11 +475,11 @@ void merit_state::led2_w(uint8_t data)
|
476 | 475 | void merit_state::misc_w(uint8_t data)
|
477 | 476 | {
|
478 | 477 | 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; |
480 | 480 | m_lscnblk = (data >> 3) & 1;
|
481 | 481 |
|
482 | 482 | // 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? |
484 | 483 | }
|
485 | 484 |
|
486 | 485 | void merit_banked_state::bank_w(uint8_t data)
|
@@ -3027,8 +3026,8 @@ GAME( 1986, phrcrazev, phrcraze, phrcraze, phrcrazs, merit_quiz_state, init_k
|
3027 | 3026 | 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 )
|
3028 | 3027 | 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 )
|
3029 | 3028 |
|
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