Skip to content

Commit 91a2033

Browse files
cuavascuavas
committed
merit/merit.cpp, msx1_cart.xml: Patched up some metadata.
1 parent 1226674 commit 91a2033

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎hash/msx1_cart.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21126,7 +21126,7 @@ legacy FM implementations cannot find it.
2112621126
<software name="jinj2">
2112721127
<description>Jinj 2 - Belmonte's Revenge (final)</description>
2112821128
<year>2012</year>
21129-
<publisher>RetroWorks</publisher>
21129+
<publisher>Retroworks</publisher>
2113021130
<part name="cart" interface="msx_cart">
2113121131
<feature name="start_page" value="1"/>
2113221132
<dataarea name="rom" size="0x8000">
@@ -21139,7 +21139,7 @@ legacy FM implementations cannot find it.
2113921139
<description>Jinj 2 - Belmonte's Revenge (v2.0)</description>
2114021140
<year>2012</year>
2114121141
<publisher>MSXdev</publisher>
21142-
<info name="developer" value="RetroWorks"/>
21142+
<info name="developer" value="Retroworks"/>
2114321143
<part name="cart" interface="msx_cart">
2114421144
<feature name="start_page" value="1"/>
2114521145
<dataarea name="rom" size="0x8000">
@@ -21152,7 +21152,7 @@ legacy FM implementations cannot find it.
2115221152
<description>Jinj 2 - Belmonte's Revenge (v1.0)</description>
2115321153
<year>2012</year>
2115421154
<publisher>MSXdev</publisher>
21155-
<info name="developer" value="RetroWorks"/>
21155+
<info name="developer" value="Retroworks"/>
2115621156
<part name="cart" interface="msx_cart">
2115721157
<feature name="start_page" value="1"/>
2115821158
<dataarea name="rom" size="0x8000">

‎src/mame/merit/merit.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2957,17 +2957,17 @@ GAME( 1985, trvwzv, trvwz, trvwhiz, trivia, merit_quiz_state, empty_
29572957
GAME( 1985, trvwz2, 0, trvwhiz, trivia, merit_quiz_state, init_key<2>, ROT90, "Merit", "Trivia ? Whiz (6221-05, Edition 2)", MACHINE_SUPPORTS_SAVE )
29582958
GAME( 1985, trvwz2a, trvwz2, trvwhiz, trivia, merit_quiz_state, init_key<2>, ROT90, "Merit", "Trivia ? Whiz (6221-05, Edition 2 Alt Sex trivia)", MACHINE_SUPPORTS_SAVE )
29592959

2960-
GAME( 1985, trvwz3, 0, trvwhiz, trivia, merit_quiz_state, empty_init, ROT0, "Merit", "Trivia ? Whiz (6221-05 U5-0D, Edition 3)", MACHINE_SUPPORTS_SAVE )
2961-
GAME( 1985, trvwz3a, trvwz3, trvwhiz, trivia, merit_quiz_state, empty_init, ROT0, "Merit", "Trivia ? Whiz (6221-05 U5-0C, Edition 3)", MACHINE_SUPPORTS_SAVE )
2960+
GAME( 1985, trvwz3, 0, trvwhiz, trivia, merit_quiz_state, empty_init, ROT0, "Merit", "Trivia ? Whiz (6221-05, U5-0D, Edition 3)", MACHINE_SUPPORTS_SAVE )
2961+
GAME( 1985, trvwz3a, trvwz3, trvwhiz, trivia, merit_quiz_state, empty_init, ROT0, "Merit", "Trivia ? Whiz (6221-05, U5-0C, Edition 3)", MACHINE_SUPPORTS_SAVE )
29622962
GAME( 1985, trvwz3b, trvwz3, trvwhiz, trivia, merit_quiz_state, empty_init, ROT0, "Merit", "Trivia ? Whiz (6221-05, Edition 3 Sex trivia III)", MACHINE_SUPPORTS_SAVE )
2963-
GAME( 1985, trvwz3v, trvwz3, trvwhiz, trivia, merit_quiz_state, empty_init, ROT90, "Merit", "Trivia ? Whiz (6221-04 U5-0E, Edition 3 Vertical)", MACHINE_SUPPORTS_SAVE )
2963+
GAME( 1985, trvwz3v, trvwz3, trvwhiz, trivia, merit_quiz_state, empty_init, ROT90, "Merit", "Trivia ? Whiz (6221-04, U5-0E, Edition 3 Vertical)", MACHINE_SUPPORTS_SAVE )
29642964

2965-
GAME( 1985, trvwz4, 0, trvwhziv, trvwhziv, merit_quiz_state, init_key<5>, ROT0, "Merit", "Trivia ? Whiz (6221-10, U5-0A Edition 4)", MACHINE_SUPPORTS_SAVE )
2966-
GAME( 1985, trvwz4v, trvwz4, trvwhziv, trvwhziv, merit_quiz_state, init_key<5>, ROT90, "Merit", "Trivia ? Whiz (6221-13, U5-0B Edition 4 Vertical)", MACHINE_SUPPORTS_SAVE )
2967-
GAME( 1985, trvwz4va, trvwz4, trvwhziv, trvwhziv, merit_quiz_state, init_key<5>, ROT90, "Merit", "Trivia ? Whiz (6221-13, U5-0B Edition 4 Vertical Alt Sex trivia)", MACHINE_SUPPORTS_SAVE )
2965+
GAME( 1985, trvwz4, 0, trvwhziv, trvwhziv, merit_quiz_state, init_key<5>, ROT0, "Merit", "Trivia ? Whiz (6221-10, U5-0A, Edition 4)", MACHINE_SUPPORTS_SAVE )
2966+
GAME( 1985, trvwz4v, trvwz4, trvwhziv, trvwhziv, merit_quiz_state, init_key<5>, ROT90, "Merit", "Trivia ? Whiz (6221-13, U5-0B, Edition 4 Vertical)", MACHINE_SUPPORTS_SAVE )
2967+
GAME( 1985, trvwz4va, trvwz4, trvwhziv, trvwhziv, merit_quiz_state, init_key<5>, ROT90, "Merit", "Trivia ? Whiz (6221-13, U5-0B, Edition 4 Vertical Alt Sex trivia)", MACHINE_SUPPORTS_SAVE )
29682968

2969-
GAME( 1985, tictac, 0, tictac, tictac, merit_quiz_state, init_key<8>, ROT0, "Merit", "Tic Tac Trivia (6221-23, U5-0C (07/07/86)", MACHINE_SUPPORTS_SAVE ) // all new trivia categories
2970-
GAME( 1985, tictaca, tictac, tictac, tictac, merit_quiz_state, init_key<4>, ROT0, "Merit", "Tic Tac Trivia (6221-23, U5-0C (02/11/86)", MACHINE_SUPPORTS_SAVE )
2969+
GAME( 1985, tictac, 0, tictac, tictac, merit_quiz_state, init_key<8>, ROT0, "Merit", "Tic Tac Trivia (6221-23, U5-0C, 07/07/86)", MACHINE_SUPPORTS_SAVE ) // all new trivia categories
2970+
GAME( 1985, tictaca, tictac, tictac, tictac, merit_quiz_state, init_key<4>, ROT0, "Merit", "Tic Tac Trivia (6221-23, U5-0C, 02/11/86)", MACHINE_SUPPORTS_SAVE )
29712971
GAME( 1985, tictacv, tictac, tictac, tictac, merit_quiz_state, init_key<4>, ROT90, "Merit", "Tic Tac Trivia (6221-22, U5-0 Vertical)", MACHINE_SUPPORTS_SAVE )
29722972

29732973
GAME( 1986, phrcraze, 0, phrcraze, phrcrazs, merit_quiz_state, init_key<7>, ROT0, "Merit", "Phraze Craze (6221-40, U5-3A Expanded Questions)", MACHINE_SUPPORTS_SAVE )
@@ -2979,8 +2979,8 @@ GAME( 1986, phrcrazev, phrcraze, phrcraze, phrcrazs, merit_quiz_state, init_k
29792979
GAME( 1987, dtrvwz5, 0, dtrvwz5, dtrvwh5, merit_quiz_state, init_key<6>, ROT0, "Merit", "Deluxe Trivia ? Whiz (6221-70, U5-0A Edition 5)", MACHINE_SUPPORTS_SAVE ) // CRT-209 module not dumped
29802980
GAME( 1987, dtrvwz5v, dtrvwz5, dtrvwz5, dtrvwh5, merit_quiz_state, init_key<6>, ROT90, "Merit", "Deluxe Trivia ? Whiz (6221-75, U5-0 Edition 5 Vertical)", MACHINE_SUPPORTS_SAVE ) // CRT-209 module not dumped
29812981

2982-
GAME( 1986, matchem, 0, couple, matchem, merit_state, init_crt209, ROT0, "Merit", "Match'em Up (6221-51, U5-1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // in some levels the tiles' GFX are jumbled
2983-
GAME( 1986, matchemg, matchem, couple, matchemg, merit_state, init_crt209, ROT0, "Merit", "Match'em Up (6221-55, U5-1 German)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // "
2984-
GAME( 1988, couple, matchem, couple, couple, merit_state, init_crt209, ROT0, "bootleg", "The Couples (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // "
2985-
GAME( 1988, couplep, matchem, couple, couplep, merit_state, init_crt209, ROT0, "bootleg", "The Couples (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // "
2986-
GAME( 1988, couplei, matchem, couple, couple, merit_state, init_crt209, ROT0, "bootleg", "The Couples (set 3)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // "
2982+
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
2983+
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 ) // "
2984+
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 ) // "
2985+
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 ) // "
2986+
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 ) // "

0 commit comments

Comments
 (0)