Added badgirl2, some small corrections

vpinball · Dec 19, 2023 · a677493 · a677493
1 parent be7a86f
commit a677493
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/release/whatsnew.txt b/release/whatsnew.txt
@@ -60,7 +60,7 @@ Fixed regression/crashes for Elvis and Monopoly (introduced in 3.1)
 Improved emulation robustness when running multiple machines from the same generation (e.g. System11) one after another (e.g. from within VPX)
  or when resetting certain machines
 
-*** ROM SUPPORT *** Thanks to ipdb.org, Valerio Curzio, Matt's Basement Arcade, inkochnito, flipprojets.fr, Idleman, idealjoker, Jo�o Pedras & Jo�o Carneiro, ingo333, Ronaldo, Quench, Museo del Recreativo, caius, Stephan Semmler (Flippermuseum Seligenstadt), Doug Cope, Michel Maignaut, Thierry Ailloud, Francis Voglioso, Chad Hendrickson, watacaractr
+*** ROM SUPPORT *** Thanks to ipdb.org, Valerio Curzio, Matt's Basement Arcade, inkochnito, flipprojets.fr, Idleman, idealjoker, Jo�o Pedras & Jo�o Carneiro, ingo333, Ronaldo, Quench, Museo del Recreativo, caius, Stephan Semmler (Flippermuseum Seligenstadt), Doug Cope, Michel Maignaut, Thierry Ailloud, Francis Voglioso, Chad Hendrickson, watacaractr, indisc
 New:
 Seeben: Brooklyn (Bingo) (not working)
         Brooklyn (set 2) (Bingo) (not working)
@@ -98,6 +98,7 @@ Shadow: Fix checksum of LH-6 with wrong text index patch
 
 Clones:
 Ali (7-digit conversion Free Play rev. 76)
+Bad Girls (alternate set)
 Beavis and Butt-Head (Class of 1812 MOD)
 Black Knight L-2
 Cue Ball Wizard (older display rev.)

diff --git a/src/machine/6821pia.c b/src/machine/6821pia.c
@@ -598,7 +598,7 @@ void pia_write(int which, int offset, int data)
 				/* determine the new value */
 				int temp = SET_C2(data) ? 1 : 0;
 
-				/* if this creates a transition, call the CA2 output function */
+				/* if this creates a transition, call the CB2 output function */
 				if (p->out_cb2 ^ temp)
 					if (p->intf->out_cb2_func) p->intf->out_cb2_func(0, temp);
 

diff --git a/src/windows/winmain.c b/src/windows/winmain.c
@@ -213,9 +213,11 @@ int main(int argc, char **argv)
 		extern void restore_win_timer_resolution();
 
 		set_lowest_possible_win_timer_resolution();
-
+#ifdef __GNUC__
+		strcpy(g_szGameName, drivers[game_index]->name);
+#else
 		strcpy_s(g_szGameName, sizeof(g_szGameName), drivers[game_index]->name);
-
+#endif
 #if ENABLE_PROFILER
 		start_profiler();
 #endif

diff --git a/src/wpc/driver.c b/src/wpc/driver.c
@@ -820,6 +820,7 @@ DRIVERNV(robowrfp)      //                Robo-War (Free Play)
 DRIVERNV(robowarf)      //                Robo-War (French)
 DRIVERNV(robowffp)      //                Robo-War (French Free Play)
 DRIVERNV(badgirls)      //S80b-717: 11/88 Bad Girls
+DRIVERNV(badgirl2)      //                Bad Girls (alternate set)
 DRIVERNV(badgrlfp)      //                Bad Girls (Free Play)
 DRIVERNV(badgirlg)      //                Bad Girls (German)
 DRIVERNV(badgrgfp)      //                Bad Girls (German Free Play)

diff --git a/src/wpc/gts80games.c b/src/wpc/gts80games.c
@@ -2123,6 +2123,15 @@ GTS80_ROMEND
 #define input_ports_badgirls input_ports_gts80
 CORE_GAMEDEFNV(badgirls, "Bad Girls",1988,"Gottlieb",gl_mGTS80BS3,0)
 
+INITGAME(badgirl2, GEN_GTS80B, FLIP616, dispAlpha, SNDBRD_GTS80B,GTS80_DISPALPHA,0x80)
+GTS80B_4K_ROMSTART(badgirl2, "prom2a.cpu",CRC(53e05ca7) SHA1(a45a37e180f10fcbc3fe89be28b3d5c7e56561c2),
+                             "prom1a.cpu",CRC(07082568) SHA1(ea89dede1543fe34f8f0e95a33120a727c3ff274))
+GTS80BSSOUND3232(            "drom1.snd", CRC(452dec20) SHA1(a9c41dfb2d83c5671ab96e946f13df774b567976),
+                             "yrom1.snd", CRC(ab3b8e2d) SHA1(b57a0b804b42b923bb102d295e3b8a69b1033d27))
+GTS80_ROMEND
+#define input_ports_badgirl2 input_ports_badgirls
+CORE_CLONEDEFNV(badgirl2, badgirls, "Bad Girls (alternate set)",1988,"Gottlieb",gl_mGTS80BS3,0)
+
 INITGAME(badgrlfp, GEN_GTS80B, FLIP616, dispAlpha, SNDBRD_GTS80B,GTS80_DISPALPHA,0x80)
 GTS80B_4K_ROMSTART(badgrlfp, "prom2.cpu",    CRC(583933ec) SHA1(89da6750d779d68db578715b058f9321695b79b0),
                              "prom1_fp.cpu", CRC(05e8259b) SHA1(d1e4e50e44e215dcfa510e4d45d6c39e136452b1))
@@ -2473,15 +2482,11 @@ static MEMORY_WRITE_START(manila_writemem)
   {0x2000,0xffff, MWA_NOP},      /*Game Prom (continued)*/
 MEMORY_END
 
-extern MACHINE_DRIVER_EXTERN(gts80);
 static MACHINE_DRIVER_START(manila)
-  MDRV_IMPORT_FROM(gts80)
+  MDRV_IMPORT_FROM(gts80bs1)
   MDRV_CPU_MODIFY("mcpu")
   MDRV_CPU_MEMORY(manila_readmem, manila_writemem)
   MDRV_NVRAM_HANDLER(generic_0fill)
-  MDRV_SCREEN_SIZE(320, 200)
-  MDRV_VISIBLE_AREA(0, 319, 0, 199)
-  MDRV_IMPORT_FROM(gts80s_b1)
 MACHINE_DRIVER_END
 
 /*-------------------------------------------------------------------