diff options
author | 2022-04-02 22:37:40 +1100 | |
---|---|---|
committer | 2022-04-02 22:37:40 +1100 | |
commit | 6be2761faa09298a809e1868da4f29b4d858f42f (patch) | |
tree | a532f1ff4d2573737f07845340fcc1c54681668e /src | |
parent | af704c04bbd289e8ff8ffa5e31deebae3c43ba19 (diff) | |
parent | 90b68ac070343c16fe9c9954a1f6baeec7fc8f63 (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'src')
-rw-r--r-- | src/mame/drivers/neogeo.cpp | 4 | ||||
-rw-r--r-- | src/mame/mame.lst | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp index a68855d5c79..24908de2a84 100644 --- a/src/mame/drivers/neogeo.cpp +++ b/src/mame/drivers/neogeo.cpp @@ -12163,8 +12163,8 @@ GAME( 2002, rotd, neogeo, rotd, neogeo, mvs_led_state, empty_ini GAME( 2002, rotdh, rotd, rotd, neogeo, mvs_led_state, empty_init, ROT0, "Evoga / Playmore", "Rage of the Dragons (NGH-2640?)", MACHINE_SUPPORTS_SAVE ) // Atlus -GAME( 2002, matrim, neogeo, matrim, neogeo, mvs_led_state, empty_init, ROT0, "Noise Factory / Atlus", "Matrimelee / Shin Gouketsuji Ichizoku Toukon (NGM-2660 ~ NGH-2660)", MACHINE_SUPPORTS_SAVE ) -GAME( 2002, matrimbl, matrim, matrimbl, neogeo, mvs_led_state, empty_init, ROT0, "bootleg", "Matrimelee / Shin Gouketsuji Ichizoku Toukon (bootleg)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, matrim, neogeo, matrim, neogeo, mvs_led_state, empty_init, ROT0, "Noise Factory / Atlus", "Matrimelee / Shin Gouketsuji Ichizoku Toukon (NGM-2660 ~ NGH-2660)", MACHINE_SUPPORTS_SAVE ) +GAME( 2003, matrimbl, matrim, matrimbl, neogeo, mvs_led_state, empty_init, ROT0, "bootleg", "Matrimelee / Shin Gouketsuji Ichizoku Toukon (bootleg)", MACHINE_SUPPORTS_SAVE ) /***** Unlicensed commercial releases *****/ diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 9d6438e029f..70da166c953 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -32985,7 +32985,7 @@ maglord // 0005 (c) 1990 Alpha Denshi Co. maglordh // 0005 (c) 1990 Alpha Denshi Co. mahretsu // 0004 (c) 1990 SNK marukodq // 0206 (c) 1995 Takara -matrim // 0266 (c) 2002 Atlus +matrim // 0266 (c) 2003 Atlus matrimbl // bootleg miexchng // 0231 (c) 1997 Face minasan // 0027 (c) 1990 Monolith Corp. |