summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2025-08-30 04:59:23 +1000
committer Vas Crabb <vas@vastheman.com>2025-08-30 04:59:23 +1000
commit8125894390f2645cb0bfc397775410e7a2b36b5b (patch)
tree3d7a2680672df7bc5ddbabbdc65cefd06befb6bf
parente34b80d4c6ff251e643fa9154a64f51208be5161 (diff)
parent1ead624f414a9a0d6de4d8e5760776813f97937d (diff)
Merge remote-tracking branch 'mainline/release0280' into HEAD
-rw-r--r--src/mame/excellent/lastbank.cpp2
-rw-r--r--src/mame/skeleton/sgm.cpp4
-rw-r--r--src/mame/tvgames/generalplus_gpl16250_spi_direct.cpp2
-rw-r--r--src/mame/tvgames/generalplus_gpl32612.cpp1
4 files changed, 5 insertions, 4 deletions
diff --git a/src/mame/excellent/lastbank.cpp b/src/mame/excellent/lastbank.cpp
index a6a55871ea2..c2ab3dde319 100644
--- a/src/mame/excellent/lastbank.cpp
+++ b/src/mame/excellent/lastbank.cpp
@@ -927,4 +927,4 @@ GAME( 1995, fever13, 0, lastbank, fever13, fever13_state, empty_init, R
GAME( 1995, ukiyobox, fever13, lastbank, ukiyobox, fever13_state, empty_init, ROT0, "Excellent System", "Ukiyo Box (Japan, v1.3.7)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
GAME( 1996, mir7hg, 0, lastbank, mir7hg, fever13_state, empty_init, ROT0, "Excellent System", "Miracle Seven - Heaven's Gate (Japan, v1.0.2)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
GAME( 199?, wcircus, 0, lastbank, wcircus, wcircus_state, empty_init, ROT0, "Cobra", "Wonder Circus (Japan, v1.1.1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 199?, goldstrk, 0, lastbank, wcircus, wcircus_state, empty_init, ROT0, "Cobra", "Gold Strike (Japan, v1.1.1 - Location Test)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 199?, goldstrk, 0, lastbank, wcircus, wcircus_state, empty_init, ROT0, "Cobra", "Gold Strike (Japan, v1.1.1 - location test)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
diff --git a/src/mame/skeleton/sgm.cpp b/src/mame/skeleton/sgm.cpp
index 505d4053479..8dcfc8bec5a 100644
--- a/src/mame/skeleton/sgm.cpp
+++ b/src/mame/skeleton/sgm.cpp
@@ -187,5 +187,5 @@ ROM_END
} // anonymous namespace
-GAME( 2004?, wpddz, 0, wpddz, wpddz, sgm_state, empty_init, ROT0, "SGM", "Wang Pai Dou Dizhou", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 200?, dajiaddz, 0, wpddz, wpddz, sgm_state, empty_init, ROT0, "SGM", "Dajia Dou Dizhou", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 2004?, wpddz, 0, wpddz, wpddz, sgm_state, empty_init, ROT0, "SGM", "Wang Pai Dou Dizhu", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 200?, dajiaddz, 0, wpddz, wpddz, sgm_state, empty_init, ROT0, "SGM", "Dajia Dou Dizhu", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/tvgames/generalplus_gpl16250_spi_direct.cpp b/src/mame/tvgames/generalplus_gpl16250_spi_direct.cpp
index 5aad73a256f..b64d5f5fae4 100644
--- a/src/mame/tvgames/generalplus_gpl16250_spi_direct.cpp
+++ b/src/mame/tvgames/generalplus_gpl16250_spi_direct.cpp
@@ -299,7 +299,7 @@ CONS(2021, punij1pu, punirune, 0, generalplus_gpspi_direct, bfspyhnt, generalplu
CONS(2021, punij2pk, punirune, 0, generalplus_gpspi_direct, bfspyhnt, generalplus_gpspi_direct_game_state, empty_init, "Takara Tomy", "Punirunes (PUNIRUNZU_MAIN_V2, pink, Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
// has a link feature
-CONS(2021, punifrnd, 0, 0, generalplus_gpspi_direct, bfspyhnt, generalplus_gpspi_direct_game_state, empty_init, "Takara Tomy", u8"Punirunes Punitomo Tsūshin (hot pink, Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+CONS(2021, punifrnd, 0, 0, generalplus_gpspi_direct, bfspyhnt, generalplus_gpspi_direct_game_state, empty_init, "Takara Tomy", "Punirunes Punitomo Tsuushin (hot pink, Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
// Pocket Monsters ガチッとゲットだぜ! モンスターボールゴー! - Pocket Monsters is printed on the inner shell, but not the box?
CONS(2021, pokgoget, 0, 0, generalplus_gpspi_direct, bfspyhnt, generalplus_gpspi_direct_game_state, empty_init, "Takara Tomy", "Gachitto Get da ze! Monster Ball Go! (210406, Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/tvgames/generalplus_gpl32612.cpp b/src/mame/tvgames/generalplus_gpl32612.cpp
index 02d356f6a5a..6951fb52348 100644
--- a/src/mame/tvgames/generalplus_gpl32612.cpp
+++ b/src/mame/tvgames/generalplus_gpl32612.cpp
@@ -443,6 +443,7 @@ CONS( 2019, anpanm19, 0, 0, gpl32612, gpl32612, generalplus_g
// unknown (uses a glob) has GPspispi header, ARM based, SPI ROM
CONS( 201?, smatomo, 0, 0, gpl32612, gpl32612, generalplus_gpl32612_game_state, empty_init, "Bandai", "Smatomo (Japan)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING)
+// company is called 深圳市飞讯互动科技有限公司
// very generic packaging, boots from SPI, has game data on SD card (mostly NES games)
CONS( 202?, intrtvg, 0, 0, gpl32612, gpl32612, generalplus_gpl32612_game_state, empty_init, "Shen Zhen Shi Fei Xun Hu Dong Technology", "Interactive Game Console (Model B608, YRPRSODF)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING)
// also very generic packaging, similar SD card content to above, including NES games, but with some extra music/videos for the dance part