diff options
| author | 2023-05-26 14:12:01 +0200 | |
|---|---|---|
| committer | 2023-05-26 14:12:13 +0200 | |
| commit | 997be1f7e548213767637f2590f909e4b4353d90 (patch) | |
| tree | 998e6f8c55b54912841034e9a8eac6ed2e81da74 /src | |
| parent | 0ecfed834b5c7be4c110c96de94189f4635afdec (diff) | |
Systems promoted to working
---------------------------
Basketball (Tomy) [hap, Sean Riddle]
Volleyball (Tomy) [hap, Sean Riddle]
Diffstat (limited to 'src')
| -rw-r--r-- | src/mame/handheld/hh_mn1400.cpp | 20 | ||||
| -rw-r--r-- | src/mame/handheld/hh_tms1k.cpp | 15 | ||||
| -rw-r--r-- | src/mame/layout/compperf.lay | 50 | ||||
| -rw-r--r-- | src/mame/layout/tmbaskb.lay | 268 | ||||
| -rw-r--r-- | src/mame/layout/tmvolleyb.lay | 206 | ||||
| -rw-r--r-- | src/mame/namco/namcos22.cpp | 3 |
6 files changed, 521 insertions, 41 deletions
diff --git a/src/mame/handheld/hh_mn1400.cpp b/src/mame/handheld/hh_mn1400.cpp index 6817996df53..b16bcb75beb 100644 --- a/src/mame/handheld/hh_mn1400.cpp +++ b/src/mame/handheld/hh_mn1400.cpp @@ -5,9 +5,6 @@ Matsushita (Panasonic) MN1400 handhelds -TODO: -- internal artwork for tmbaskb - *******************************************************************************/ #include "emu.h" @@ -22,8 +19,9 @@ TODO: // internal artwork #include "compperf.lh" // clickable #include "scrablexa.lh" +#include "tmbaskb.lh" // clickable -#include "hh_mn1400_test.lh" // common test-layout - use external artwork +//#include "hh_mn1400_test.lh" // common test-layout - use external artwork namespace { @@ -112,6 +110,10 @@ u16 hh_mn1400_state::read_inputs(int columns) * MN1400ML (28 pins, die label: 1400 ML-0) * 10 LEDs, 2-bit sound + known releases: + - USA: Computer Perfection, published by Lakeside + - UK: Computer Perfection, published by Action GT + *******************************************************************************/ class compperf_state : public hh_mn1400_state @@ -506,9 +508,9 @@ static INPUT_PORTS_START( tmbaskb ) PORT_CONFNAME( 0x01, 0x01, DEF_STR( Players ) ) PORT_CONFSETTING( 0x01, "1" ) PORT_CONFSETTING( 0x00, "2" ) - PORT_CONFNAME( 0x02, 0x02, DEF_STR( Difficulty ) ) - PORT_CONFSETTING( 0x02, "1" ) // PRO1 - PORT_CONFSETTING( 0x00, "2" ) // PRO2 + PORT_CONFNAME( 0x02, 0x00, DEF_STR( Difficulty ) ) + PORT_CONFSETTING( 0x00, "1" ) // PRO1 + PORT_CONFSETTING( 0x02, "2" ) // PRO2 INPUT_PORTS_END // config @@ -527,7 +529,7 @@ void tmbaskb_state::tmbaskb(machine_config &config) // video hardware PWM_DISPLAY(config, m_display).set_size(6, 8); m_display->set_segmask(3, 0x7f); - config.set_default_layout(layout_hh_mn1400_test); + config.set_default_layout(layout_tmbaskb); // sound hardware SPEAKER(config, "mono").front_center(); @@ -560,4 +562,4 @@ SYST( 1979, compperf, 0, 0, compperf, compperf, compperf_state, SYST( 1980, scrablexa, scrablex, 0, scrablexa, scrablexa, scrablexa_state, empty_init, "Selchow & Righter", "Scrabble Lexor: Computer Word Game (MN1405 version)", MACHINE_SUPPORTS_SAVE ) -SYST( 1980, tmbaskb, 0, 0, tmbaskb, tmbaskb, tmbaskb_state, empty_init, "Tomy", "Basketball (Tomy)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) +SYST( 1980, tmbaskb, 0, 0, tmbaskb, tmbaskb, tmbaskb_state, empty_init, "Tomy", "Basketball (Tomy)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) diff --git a/src/mame/handheld/hh_tms1k.cpp b/src/mame/handheld/hh_tms1k.cpp index 7ce2aa4fdcb..b4908a5a788 100644 --- a/src/mame/handheld/hh_tms1k.cpp +++ b/src/mame/handheld/hh_tms1k.cpp @@ -54,7 +54,6 @@ TODO: "First Up" button after the alarm sound. - finish bshipb SN76477 sound (incomplete output PLA) - redo internal artwork for the baseball games (embedded SVG for diamond shapes) -- tmvolleyb internal artwork - improve elecbowl driver - tithermos temperature sensor comparator (right now just the digital clock works) - is alphie(patent) the same as the final version? @@ -170,6 +169,7 @@ on Joerg Woerner's datamath.org: http://www.datamath.org/IC_List.htm @MP3476 TMS1100 1979, Milton Bradley Super Simon MP3479 TMS1100 1980, Microvision cartridge: Baseball MP3481 TMS1100 1979, Microvision cartridge: Connect Four + *MP3487 TMS1100 1980, Lakeside Strobe @MP3489 TMS1100 1980, Kenner Live Action Football @MP3491 TMS1100 1979, Mattel Thoroughbred Horse Race Analyzer *MP3493 TMS1100 1980, Milton Bradley OMNI Entertainment System (1/2) @@ -345,12 +345,13 @@ on Joerg Woerner's datamath.org: http://www.datamath.org/IC_List.htm #include "timaze.lh" #include "tisr16.lh" #include "tithermos.lh" +#include "tmvolleyb.lh" // clickable #include "vclock3.lh" #include "wizatron.lh" #include "xl25.lh" // clickable #include "zodiac.lh" // clickable -#include "hh_tms1k_test.lh" // common test-layout - use external artwork +//#include "hh_tms1k_test.lh" // common test-layout - use external artwork namespace { @@ -15357,7 +15358,7 @@ ROM_END /******************************************************************************* Tomy Volleyball - * TMS1000 MP0159 (die label: 1000B, MP0159) + * TMS1000 MP0159 TOMY VOLLEY (die label: 1000B, MP0159) * 2 7seg LEDs, 14 other LEDs, 1-bit sound *******************************************************************************/ @@ -15472,7 +15473,7 @@ void tmvolleyb_state::tmvolleyb(machine_config &config) // video hardware PWM_DISPLAY(config, m_display).set_size(4, 8); m_display->set_segmask(3, 0x7f); - config.set_default_layout(layout_hh_tms1k_test); + config.set_default_layout(layout_tmvolleyb); // sound hardware SPEAKER(config, "mono").front_center(); @@ -15687,7 +15688,7 @@ void tbreakup_state::tbreakup(machine_config &config) ROM_START( tbreakup ) ROM_REGION( 0x0400, "maincpu", 0 ) - ROM_LOAD( "mp2726a", 0x0000, 0x0400, CRC(1f7c28e2) SHA1(164cda4eb3f0b1d20955212a197c9aadf8d18a06) ) + ROM_LOAD( "mp2726_tomy_wipe", 0x0000, 0x0400, CRC(1f7c28e2) SHA1(164cda4eb3f0b1d20955212a197c9aadf8d18a06) ) ROM_REGION( 867, "maincpu:mpla", 0 ) ROM_LOAD( "tms1000_common2_micro.pla", 0, 867, CRC(d33da3cf) SHA1(13c4ebbca227818db75e6db0d45b66ba5e207776) ) @@ -15822,7 +15823,7 @@ void phpball_state::phpball(machine_config &config) ROM_START( phpball ) ROM_REGION( 0x0800, "maincpu", 0 ) - ROM_LOAD( "mp1180", 0x0000, 0x0800, CRC(2163b92d) SHA1(bc53d1911e88b4e89d951c6f769703105c13389c) ) + ROM_LOAD( "mp1180_tomy_pinb", 0x0000, 0x0800, CRC(2163b92d) SHA1(bc53d1911e88b4e89d951c6f769703105c13389c) ) ROM_REGION( 867, "maincpu:mpla", 0 ) ROM_LOAD( "tms1100_common2_micro.pla", 0, 867, CRC(7cc90264) SHA1(c6e1cf1ffb178061da9e31858514f7cd94e86990) ) @@ -16751,7 +16752,7 @@ SYST( 1989, copycata, copycat, 0, copycata, copycata, copycata_state, SYST( 1981, ditto, 0, 0, ditto, ditto, ditto_state, empty_init, "Tiger Electronics", "Ditto", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) SYST( 1982, t7in1ss, 0, 0, t7in1ss, t7in1ss, t7in1ss_state, empty_init, "Tiger Electronics", "7 in 1 Sports Stadium", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) -SYST( 1979, tmvolleyb, 0, 0, tmvolleyb, tmvolleyb, tmvolleyb_state, empty_init, "Tomy", "Volleyball (Tomy)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) +SYST( 1979, tmvolleyb, 0, 0, tmvolleyb, tmvolleyb, tmvolleyb_state, empty_init, "Tomy", "Volleyball (Tomy)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) SYST( 1979, tbreakup, 0, 0, tbreakup, tbreakup, tbreakup_state, empty_init, "Tomy", "Break Up (Tomy)", MACHINE_SUPPORTS_SAVE ) SYST( 1980, phpball, 0, 0, phpball, phpball, phpball_state, empty_init, "Tomy", "Power House Pinball", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) diff --git a/src/mame/layout/compperf.lay b/src/mame/layout/compperf.lay index ef189b7a3e5..6b047de50af 100644 --- a/src/mame/layout/compperf.lay +++ b/src/mame/layout/compperf.lay @@ -39,34 +39,29 @@ license:CC0-1.0 <disk state="1"><color red="0.066" green="0.36" blue="0.56" /></disk> </element> - <element name="nothing" defstate="0"> - <rect><color alpha="0" /></rect> - </element> + <element name="nothing" defstate="0"><rect><color alpha="0" /></rect></element> <element name="switch1" defstate="0"> - <rect><color red="1" green="1" blue="1" /></rect> - <text state="0x01" string="MODE T"><color red="0.1" green="0.1" blue="0.1" /></text> - <text state="0x00" string="MODE N"><color red="0.1" green="0.1" blue="0.1" /></text> - <text state="0x02" string="MODE R"><color red="0.1" green="0.1" blue="0.1" /></text> + <text state="0x01" string="MODE T" align="1"></text> + <text state="0x00" string="MODE N" align="1"></text> + <text state="0x02" string="MODE R" align="1"></text> </element> <element name="switch2" defstate="0"> - <rect><color red="1" green="1" blue="1" /></rect> - <text state="0x01" string="GAME 1"><color red="0.1" green="0.1" blue="0.1" /></text> - <text state="0x02" string="GAME 2"><color red="0.1" green="0.1" blue="0.1" /></text> - <text state="0x04" string="GAME 3"><color red="0.1" green="0.1" blue="0.1" /></text> - <text state="0x00" string="GAME 4"><color red="0.1" green="0.1" blue="0.1" /></text> + <text state="0x01" string="GAME 1" align="1"></text> + <text state="0x02" string="GAME 2" align="1"></text> + <text state="0x04" string="GAME 3" align="1"></text> + <text state="0x00" string="GAME 4" align="1"></text> </element> <element name="switch3" defstate="0"> - <rect><color red="1" green="1" blue="1" /></rect> - <text state="0x00" string="SKILL 1"><color red="0.1" green="0.1" blue="0.1" /></text> - <text state="0x02" string="SKILL 2"><color red="0.1" green="0.1" blue="0.1" /></text> - <text state="0x01" string="SKILL 3"><color red="0.1" green="0.1" blue="0.1" /></text> + <text state="0x00" string="SKILL 1" align="1"></text> + <text state="0x02" string="SKILL 2" align="1"></text> + <text state="0x01" string="SKILL 3" align="1"></text> </element> - <element name="text_l1"><text string="SET"><color red="1" green="1" blue="1" /></text></element> - <element name="text_l2"><text string="SCORE"><color red="1" green="1" blue="1" /></text></element> + <element name="text_l1"><text string="SET"></text></element> + <element name="text_l2"><text string="SCORE"></text></element> <element name="text_0"> <disk><color red="1" green="1" blue="1" /></disk> @@ -154,12 +149,21 @@ license:CC0-1.0 <element ref="blackda"><bounds xc="59.55" yc="129.39" width="21" height="21" /></element> <!-- inner part --> - <element ref="text_l1"><bounds xc="84" yc="96.5" width="10" height="3" /></element> - <element ref="text_l2"><bounds xc="116" yc="96.5" width="10" height="3" /></element> + <element ref="text_l1"><bounds xc="84" yc="96.5" width="20" height="3" /></element> + <element ref="text_l2"><bounds xc="116" yc="96.5" width="20" height="3" /></element> + + <element ref="whited" inputtag="IN.1" inputmask="0x03" inputraw="yes"><bounds xc="84" yc="111" width="3.5" height="3.5" /></element> + <element ref="whited" inputtag="IN.0" inputmask="0x07" inputraw="yes"><bounds xc="100" yc="122" width="3.5" height="3.5" /></element> + <element ref="whited" inputtag="IN.1" inputmask="0x0c" inputraw="yes"><bounds xc="116" yc="111" width="3.5" height="3.5" /></element> + + <!-- block clickable input --> + <element ref="nothing" inputtag="IN.1" inputmask="0x00" inputraw="yes"><bounds xc="89.5" yc="114.5" width="20" height="3" /></element> + <element ref="nothing" inputtag="IN.0" inputmask="0x00" inputraw="yes"><bounds xc="106" yc="125.5" width="20" height="3" /></element> + <element ref="nothing" inputtag="IN.1" inputmask="0x00" inputraw="yes"><bounds xc="122" yc="114.5" width="20" height="3" /></element> - <element ref="switch1" inputtag="IN.1" inputmask="0x03" inputraw="yes"><bounds xc="84" yc="108.5" width="21" height="6" /></element> - <element ref="switch2" inputtag="IN.0" inputmask="0x07" inputraw="yes"><bounds xc="100" yc="119" width="21" height="6" /></element> - <element ref="switch3" inputtag="IN.1" inputmask="0x0c" inputraw="yes"><bounds xc="116" yc="108.5" width="21" height="6" /></element> + <element ref="switch1" inputtag="IN.1" inputmask="0x03" inputraw="yes"><bounds xc="89.5" yc="114.5" width="20" height="3" /></element> + <element ref="switch2" inputtag="IN.0" inputmask="0x07" inputraw="yes"><bounds xc="106" yc="125.5" width="20" height="3" /></element> + <element ref="switch3" inputtag="IN.1" inputmask="0x0c" inputraw="yes"><bounds xc="122" yc="114.5" width="20" height="3" /></element> <element ref="silver" blend="multiply"><bounds xc="100" yc="100" width="150" height="150" /></element> diff --git a/src/mame/layout/tmbaskb.lay b/src/mame/layout/tmbaskb.lay new file mode 100644 index 00000000000..8f95e8b7d70 --- /dev/null +++ b/src/mame/layout/tmbaskb.lay @@ -0,0 +1,268 @@ +<?xml version="1.0"?> +<!-- +license:CC0-1.0 +--> +<mamelayout version="2"> + +<!-- define elements --> + + <element name="white"><rect><color red="0.82" green="0.82" blue="0.82" /></rect></element> + <element name="black"><rect><color red="0" green="0" blue="0" /></rect></element> + <element name="orange"><rect><color red="0.6" green="0.35" blue="0.1" /></rect></element> + <element name="whited"><disk><color red="0.82" green="0.82" blue="0.82" /></disk></element> + <element name="blackd"><disk><color red="0" green="0" blue="0" /></disk></element> + <element name="black2d"><disk><color red="0.1" green="0.1" blue="0.1" /></disk></element> + + <element name="led" defstate="0"> + <disk state="1"><color red="1.0" green="0.1" blue="0.15" /></disk> + <disk state="0"><color red="0.1" green="0.01" blue="0.015" /></disk> + </element> + + <element name="ledm" defstate="0"> + <disk state="1"><color red="1.0" green="0.4" blue="0.4" /></disk> + <disk state="0"><color red="0.9" green="0.99" blue="0.985" /></disk> + </element> + + <element name="digit" defstate="0"> + <led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg> + </element> + + <element name="buts" defstate="0"> + <disk state="0"><color red="0.1" green="0.1" blue="0.1" /></disk> + <disk state="1"><color red="0.25" green="0.25" blue="0.25" /></disk> + </element> + + <element name="nothing" defstate="0"><rect><color alpha="0" /></rect></element> + + <element name="switch1" defstate="0"> + <rect><color red="0.6" green="0.35" blue="0.1" /></rect> + <text state="0x00" string="PRO1" align="1"><color red="0.82" green="0.82" blue="0.82" /></text> + <text state="0x01" string="PRO2" align="1"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + <element name="switch2" defstate="0"> + <rect><color red="0.6" green="0.35" blue="0.1" /></rect> + <text state="0x01" string="1PLAYER" align="2"><color red="0.82" green="0.82" blue="0.82" /></text> + <text state="0x00" string="2PLAYER" align="2"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + + <element name="text_score1"> + <text string="SCORE"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + <element name="text_score2"> + <rect><color red="0.6" green="0.35" blue="0.1" /></rect> + <text string="SCORE"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + + <element name="text_b4"> + <rect><color red="0.1" green="0.25" blue="0.5" /></rect> + <text string="4"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + <element name="text_b5"> + <rect><color red="0.1" green="0.25" blue="0.5" /></rect> + <text string="5"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + <element name="text_b6"> + <rect><color red="0.1" green="0.25" blue="0.5" /></rect> + <text string="6"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + <element name="text_b7"> + <rect><color red="0.1" green="0.25" blue="0.5" /></rect> + <text string="7"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + <element name="text_b8"> + <rect><color red="0.1" green="0.25" blue="0.5" /></rect> + <text string="8"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + + <element name="text_r4"> + <rect><color red="0.5" green="0.15" blue="0.1" /></rect> + <text string="4"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + <element name="text_r5"> + <rect><color red="0.5" green="0.15" blue="0.1" /></rect> + <text string="5"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + <element name="text_r6"> + <rect><color red="0.5" green="0.15" blue="0.1" /></rect> + <text string="6"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + <element name="text_r7"> + <rect><color red="0.5" green="0.15" blue="0.1" /></rect> + <text string="7"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + <element name="text_r8"> + <rect><color red="0.5" green="0.15" blue="0.1" /></rect> + <text string="8"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + + +<!-- digits --> + + <group name="digits"> + <bounds x="0" y="0" width="45" height="43" /> + + <element ref="white"><bounds x="0" y="0" width="45" height="43" /></element> + <element ref="black"><bounds x="2" y="2" width="41" height="39" /></element> + + <element ref="white"><bounds x="1" y="30.5" width="43" height="2" /></element> + <element ref="white"><bounds xc="22.5" y="31.5" width="2" height="10.5" /></element> + + <element name="0.7" ref="led"><bounds xc="12.25" yc="36.75" width="5.5" height="5.5" /></element> <!-- X --> + <element name="1.7" ref="led"><bounds xc="32.75" yc="36.75" width="5.5" height="5.5" /></element> <!-- X' --> + + <element name="digit1" ref="digit"><bounds x="4" yc="16.25" width="17" height="22" /></element> + <element name="digit0" ref="digit"><bounds x="24" yc="16.25" width="17" height="22" /></element> + </group> + + +<!-- basket area --> + + <group name="basket"> + <bounds x="0" y="0" width="71" height="54" /> + + <element ref="white"><bounds x="0" yc="27" width="53" height="54" /></element> + <element ref="black"><bounds x="0" yc="27" width="51" height="50" /></element> + + <element ref="white"><bounds x="16" yc="27" width="1" height="45" /></element> + <element ref="white"><bounds x="24" yc="27" width="1" height="45" /></element> + <element ref="white"><bounds x="32" yc="27" width="1" height="45" /></element> + + <element ref="white"><bounds x="0" yc="27" width="53" height="38" /></element> + <element ref="black"><bounds x="0" yc="27" width="51" height="34" /></element> + + <element ref="whited"><bounds x="2.5" yc="27" width="10" height="19" /></element> + <element ref="blackd"><bounds x="4" yc="27" width="7" height="16" /></element> + + <element ref="whited"><bounds xc="52" yc="27" width="38" height="38" /></element> + <element ref="blackd"><bounds xc="52" yc="27" width="34" height="34" /></element> + <element ref="white"><bounds xc="52" yc="27" width="2" height="36" /></element> + </group> + + +<!-- playfield --> + + <group name="field"> + <bounds x="0" y="0" width="230" height="140" /> + + <element ref="black"><bounds x="0" y="0" width="230" height="140" /></element> + + <group ref="basket"><bounds x="1" yc="70" width="71" height="54" /></group> + <group ref="basket"><bounds x="158" yc="70" width="71" height="54" /><orientation flipx="yes" /></group> + + <element ref="whited"><bounds xc="115" yc="70" width="38" height="38" /></element> + <element ref="blackd"><bounds xc="115" yc="70" width="34" height="34" /></element> + + <element ref="white"><bounds xc="115" y="1" width="2" height="138" /></element> + + <element ref="whited"><bounds xc="115" yc="70" width="17" height="17" /></element> + <element ref="blackd"><bounds xc="115" yc="70" width="13" height="13" /></element> + + <!-- icons --> + <element ref="text_b8"><bounds xc="42" yc="30" width="6" height="6" /><orientation rotate="90" /></element> + <element ref="text_r7"><bounds xc="76" yc="24" width="6" height="6" /><orientation rotate="270" /></element> + <element ref="text_b7"><bounds xc="132" yc="24" width="6" height="6" /><orientation rotate="90" /></element> + <element ref="text_b4"><bounds xc="200" yc="24" width="6" height="6" /><orientation rotate="90" /></element> + + <element ref="text_b6"><bounds xc="69.75" yc="81" width="6" height="6" /><orientation rotate="90" /></element> + <element ref="text_r5"><bounds xc="160.25" yc="59" width="6" height="6" /><orientation rotate="270" /></element> + + <element ref="text_r6"><bounds xc="30" yc="116" width="6" height="6" /><orientation rotate="270" /></element> + <element ref="text_r8"><bounds xc="98" yc="116" width="6" height="6" /><orientation rotate="270" /></element> + <element ref="text_b5"><bounds xc="154" yc="116" width="6" height="6" /><orientation rotate="90" /></element> + <element ref="text_r4"><bounds xc="188" yc="110" width="6" height="6" /><orientation rotate="270" /></element> + + <element ref="whited"><bounds xc="47.5" yc="30" width="3" height="3" /></element> + <element ref="whited"><bounds xc="70.5" yc="24" width="3" height="3" /></element> + <element ref="whited"><bounds xc="137.5" yc="24" width="3" height="3" /></element> + <element ref="whited"><bounds xc="205.5" yc="24" width="3" height="3" /></element> + + <element ref="whited"><bounds xc="75.25" yc="81" width="3" height="3" /></element> + <element ref="whited"><bounds xc="154.75" yc="59" width="3" height="3" /></element> + + <element ref="whited"><bounds xc="24.5" yc="116" width="3" height="3" /></element> + <element ref="whited"><bounds xc="92.5" yc="116" width="3" height="3" /></element> + <element ref="whited"><bounds xc="159.5" yc="116" width="3" height="3" /></element> + <element ref="whited"><bounds xc="182.5" yc="110" width="3" height="3" /></element> + + <!-- leds --> + <element name="2.5" ref="led" blend="add"><bounds xc="115" yc="70" width="5.5" height="5.5" /></element> <!-- 0 --> + + <element name="2.4" ref="led" blend="add"><bounds xc="8.5" yc="70" width="5.5" height="5.5" /></element> <!-- 12' --> + <element name="4.5" ref="led" blend="add"><bounds xc="58.75" yc="73" width="5.5" height="5.5" /></element> <!-- 2 --> + <element name="5.5" ref="ledm" blend="multiply"><bounds xc="69.75" yc="73" width="5.5" height="5.5" /></element> + <element name="5.5" ref="led" blend="add"><bounds xc="69.75" yc="73" width="5.5" height="5.5" /></element> <!-- 3 --> + <element name="2.2" ref="led" blend="add"><bounds xc="92.375" yc="64" width="5.5" height="5.5" /></element> <!-- 4 --> + + <element name="2.0" ref="led" blend="add"><bounds xc="221.5" yc="70" width="5.5" height="5.5" /></element> <!-- 12 --> + <element name="4.6" ref="led" blend="add"><bounds xc="171.25" yc="67" width="5.5" height="5.5" /></element> <!-- 2' --> + <element name="5.6" ref="ledm" blend="multiply"><bounds xc="160.25" yc="67" width="5.5" height="5.5" /></element> + <element name="5.6" ref="led" blend="add"><bounds xc="160.25" yc="67" width="5.5" height="5.5" /></element> <!-- 3' --> + <element name="2.1" ref="led" blend="add"><bounds xc="137.625" yc="76" width="5.5" height="5.5" /></element> <!-- 4' --> + + <element name="3.5" ref="led" blend="add"><bounds xc="42" yc="38" width="5.5" height="5.5" /></element> <!-- 1 --> + <element name="2.7" ref="led" blend="add"><bounds xc="76" yc="32" width="5.5" height="5.5" /></element> <!-- 8' --> + <element name="5.1" ref="led" blend="add"><bounds xc="87" yc="32" width="5.5" height="5.5" /></element> <!-- 7' --> + <element name="3.2" ref="led" blend="add"><bounds xc="121" yc="32" width="5.5" height="5.5" /></element> <!-- 5 --> + <element name="4.2" ref="led" blend="add"><bounds xc="132" yc="32" width="5.5" height="5.5" /></element> <!-- 6 --> + <element name="3.0" ref="led" blend="add"><bounds xc="166" yc="32" width="5.5" height="5.5" /></element> <!-- 13 --> + <element name="3.3" ref="led" blend="add"><bounds xc="200" yc="32" width="5.5" height="5.5" /></element> <!-- 9 --> + <element name="4.3" ref="led" blend="add"><bounds xc="218" yc="48" width="5.5" height="5.5" /></element> <!-- 10 --> + + <element name="3.6" ref="led" blend="add"><bounds xc="188" yc="102" width="5.5" height="5.5" /></element> <!-- 1' --> + <element name="2.3" ref="led" blend="add"><bounds xc="154" yc="108" width="5.5" height="5.5" /></element> <!-- 8 --> + <element name="5.2" ref="led" blend="add"><bounds xc="143" yc="108" width="5.5" height="5.5" /></element> <!-- 7 --> + <element name="3.1" ref="led" blend="add"><bounds xc="109" yc="108" width="5.5" height="5.5" /></element> <!-- 5' --> + <element name="4.1" ref="led" blend="add"><bounds xc="98" yc="108" width="5.5" height="5.5" /></element> <!-- 6' --> + <element name="3.4" ref="led" blend="add"><bounds xc="64" yc="108" width="5.5" height="5.5" /></element> <!-- 13' --> + <element name="3.7" ref="led" blend="add"><bounds xc="30" yc="108" width="5.5" height="5.5" /></element> <!-- 9' --> + <element name="4.7" ref="led" blend="add"><bounds xc="12" yc="92" width="5.5" height="5.5" /></element> <!-- 10' --> + </group> + + +<!-- build screen --> + + <group name="layout"> + <bounds left="17" right="283" top="24" bottom="238" /> + + <element ref="orange"><bounds xc="150" yc="150" width="266" height="176" /></element> + <group ref="field"><bounds xc="150" yc="150" width="230" height="140" /></group> + + <element ref="white"><bounds x="33" y="78" width="4" height="144" /></element> + <element ref="white"><bounds x="263" y="78" width="4" height="144" /></element> + <element ref="white"><bounds x="33" y="78" width="234" height="4" /></element> + <element ref="white"><bounds x="33" y="218" width="234" height="4" /></element> + + <element ref="orange"><bounds x="31" y="76" width="4" height="148" /></element> + <element ref="orange"><bounds x="265" y="76" width="4" height="148" /></element> + <element ref="orange"><bounds x="31" y="76" width="238" height="4" /></element> + <element ref="orange"><bounds x="31" y="220" width="238" height="4" /></element> + + <!-- edge leds --> + <element ref="white"><bounds x="25" yc="150" width="11" height="26" /></element> + <element ref="black"><bounds x="27" yc="150" width="8" height="22" /></element> + <element name="5.7" ref="led"><bounds x="28.25" yc="150" width="5.5" height="5.5" /></element> <!-- 11' --> + + <element ref="white"><bounds x="264" yc="150" width="11" height="26" /></element> + <element ref="black"><bounds x="265" yc="150" width="8" height="22" /></element> + <element name="5.3" ref="led"><bounds x="266.25" yc="150" width="5.5" height="5.5" /></element> <!-- 11 --> + + <element ref="text_score1"><bounds xc="150" y="24" width="50" height="9" /></element> + <group ref="digits"><bounds xc="150" y="33" width="45" height="43" /></group> + + <!-- other buttons --> + <element ref="nothing" inputtag="IN.3" inputmask="0x00" inputraw="yes"><bounds xc="150" y="232.5" width="230" height="4.5" /></element> + <element ref="switch1" inputtag="IN.3" inputmask="0x02" inputraw="yes"><bounds xc="111" y="232.5" width="30" height="4.5" /></element> + <element ref="switch2" inputtag="IN.3" inputmask="0x01" inputraw="yes"><bounds xc="193" y="232.5" width="30" height="4.5" /></element> + + <element ref="black2d" inputtag="IN.3" inputmask="0x02" inputraw="yes"><bounds xc="100" y="226" width="6" height="6" /></element> + <element ref="black2d" inputtag="IN.3" inputmask="0x01" inputraw="yes"><bounds xc="200" y="226" width="6" height="6" /></element> + + <element ref="text_score2"><bounds xc="150" y="232.5" width="30" height="4.5" /></element> + <element ref="buts" inputtag="IN.2" inputmask="0x01"><bounds xc="150" y="226" width="6" height="6" /></element> + </group> + + <view name="Internal Layout"> + <group ref="layout"><bounds left="24" right="238" top="17" bottom="283" /><orientation rotate="270" /></group> + </view> + +</mamelayout> diff --git a/src/mame/layout/tmvolleyb.lay b/src/mame/layout/tmvolleyb.lay new file mode 100644 index 00000000000..354bcdce684 --- /dev/null +++ b/src/mame/layout/tmvolleyb.lay @@ -0,0 +1,206 @@ +<?xml version="1.0"?> +<!-- +license:CC0-1.0 +--> +<mamelayout version="2"> + +<!-- define elements --> + + <element name="white"><rect><color red="0.82" green="0.82" blue="0.82" /></rect></element> + <element name="grey"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element> + <element name="black"><rect><color red="0" green="0" blue="0" /></rect></element> + <element name="black2d"><disk><color red="0.1" green="0.1" blue="0.1" /></disk></element> + <element name="orange"><rect><color red="0.82" green="0.33" blue="0.1" /></rect></element> + + <element name="triangle"> + <image><data><![CDATA[ + <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="10" height="10"> + <path d="M 5,0 10,10 0,10 z" fill="#ffffff" stroke="none" stroke-width="0" /> + </svg> + ]]></data></image> + </element> + + <element name="led" defstate="0"> + <disk state="1"><color red="1.0" green="0.1" blue="0.15" /></disk> + <disk state="0"><color red="0.1" green="0.01" blue="0.015" /></disk> + </element> + + <element name="digit" defstate="0"> + <led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg> + </element> + + <element name="but1" defstate="0"> + <disk state="0"> + <bounds x="0" y="0" width="6" height="6" /> + <color red="0.82" green="0.82" blue="0.82" /> + </disk> + <disk state="0"> + <bounds x="0" y="17" width="6" height="6" /> + <color red="0.82" green="0.82" blue="0.82" /> + </disk> + <rect state="0"> + <bounds x="0" y="3" width="6" height="17" /> + <color red="0.82" green="0.82" blue="0.82" /> + </rect> + <disk state="1"> + <bounds x="0" y="0" width="6" height="6" /> + <color red="0.60" green="0.60" blue="0.60" /> + </disk> + <disk state="1"> + <bounds x="0" y="17" width="6" height="6" /> + <color red="0.60" green="0.60" blue="0.60" /> + </disk> + <rect state="1"> + <bounds x="0" y="3" width="6" height="17" /> + <color red="0.60" green="0.60" blue="0.60" /> + </rect> + </element> + + <element name="buts" defstate="0"> + <disk state="0"><color red="0.82" green="0.82" blue="0.82" /></disk> + <disk state="1"><color red="0.60" green="0.60" blue="0.60" /></disk> + </element> + + <element name="nothing" defstate="0"><rect><color alpha="0" /></rect></element> + + <element name="switch1" defstate="0"> + <rect><color red="0.82" green="0.33" blue="0.1" /></rect> + <text state="0x00" string="GAME1" align="1"><color red="0.82" green="0.82" blue="0.82" /></text> + <text state="0x01" string="GAME2" align="1"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + <element name="switch2" defstate="0"> + <rect><color red="0.82" green="0.33" blue="0.1" /></rect> + <text state="0x01" string="1PLAYER" align="2"><color red="0.82" green="0.82" blue="0.82" /></text> + <text state="0x00" string="2PLAYER" align="2"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + + <element name="text_serve"> + <rect><color red="0.82" green="0.33" blue="0.1" /></rect> + <text string="SERVE"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + <element name="text_score1"> + <text string="SCORE"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + <element name="text_score2"> + <rect><color red="0.82" green="0.33" blue="0.1" /></rect> + <text string="SCORE"><color red="0.82" green="0.82" blue="0.82" /></text> + </element> + + +<!-- digits --> + + <group name="digits"> + <bounds x="0" y="0" width="45" height="43" /> + + <element ref="white"><bounds x="0" y="0" width="45" height="43" /></element> + <element ref="black"><bounds x="2" y="2" width="41" height="39" /></element> + + <element ref="white"><bounds x="1" y="30.5" width="43" height="2" /></element> + <element ref="white"><bounds xc="22.5" y="31.5" width="2" height="10.5" /></element> + + <element name="3.7" ref="led"><bounds xc="12.25" yc="36.75" width="5.5" height="5.5" /></element> + <element name="2.7" ref="led"><bounds xc="32.75" yc="36.75" width="5.5" height="5.5" /></element> + + <element name="digit0" ref="digit"><bounds x="4" yc="16.25" width="17" height="22" /></element> + <element name="digit1" ref="digit"><bounds x="24" yc="16.25" width="17" height="22" /></element> + </group> + + +<!-- playfield --> + + <group name="field"> + <bounds x="0" y="0" width="230" height="140" /> + + <element ref="white"><bounds x="0" y="0" width="230" height="140" /></element> + <element ref="black"><bounds x="2" y="2" width="226" height="136" /></element> + + <!-- icons --> + <element ref="triangle"><bounds xc="31.25" yc="24" width="6" height="6" /><orientation rotate="90" /></element> + <element ref="triangle"><bounds xc="31.25" yc="70" width="6" height="6" /><orientation rotate="90" /></element> + <element ref="triangle"><bounds xc="31.25" yc="116" width="6" height="6" /><orientation rotate="90" /></element> + + <element ref="triangle"><bounds xc="87.25" yc="24" width="6" height="6" /><orientation rotate="90" /></element> + <element ref="triangle"><bounds xc="87.25" yc="70" width="6" height="6" /><orientation rotate="90" /></element> + <element ref="triangle"><bounds xc="87.25" yc="116" width="6" height="6" /><orientation rotate="90" /></element> + + <element ref="triangle"><bounds xc="142.75" yc="24" width="6" height="6" /><orientation rotate="270" /></element> + <element ref="triangle"><bounds xc="142.75" yc="70" width="6" height="6" /><orientation rotate="270" /></element> + <element ref="triangle"><bounds xc="142.75" yc="116" width="6" height="6" /><orientation rotate="270" /></element> + + <element ref="triangle"><bounds xc="198.75" yc="24" width="6" height="6" /><orientation rotate="270" /></element> + <element ref="triangle"><bounds xc="198.75" yc="70" width="6" height="6" /><orientation rotate="270" /></element> + <element ref="triangle"><bounds xc="198.75" yc="116" width="6" height="6" /><orientation rotate="270" /></element> + + <element ref="grey" blend="multiply"><bounds xc="115" yc="70" width="220" height="130" /></element> + <element ref="white"><bounds xc="115" y="1" width="2" height="138" /></element> + + <!-- buttons --> + <element ref="but1" inputtag="IN.3" inputmask="0x04"><bounds xc="18" yc="24" width="6" height="23" /></element> + <element ref="but1" inputtag="IN.3" inputmask="0x02"><bounds xc="18" yc="70" width="6" height="23" /></element> + <element ref="but1" inputtag="IN.3" inputmask="0x01"><bounds xc="18" yc="116" width="6" height="23" /></element> + + <element ref="but1" inputtag="IN.2" inputmask="0x01"><bounds xc="74" yc="24" width="6" height="23" /></element> + <element ref="but1" inputtag="IN.2" inputmask="0x02"><bounds xc="74" yc="70" width="6" height="23" /></element> + <element ref="but1" inputtag="IN.2" inputmask="0x04"><bounds xc="74" yc="116" width="6" height="23" /></element> + + <element ref="but1" inputtag="IN.0" inputmask="0x04"><bounds xc="156" yc="24" width="6" height="23" /></element> + <element ref="but1" inputtag="IN.0" inputmask="0x02"><bounds xc="156" yc="70" width="6" height="23" /></element> + <element ref="but1" inputtag="IN.0" inputmask="0x01"><bounds xc="156" yc="116" width="6" height="23" /></element> + + <element ref="but1" inputtag="IN.1" inputmask="0x01"><bounds xc="212" yc="24" width="6" height="23" /></element> + <element ref="but1" inputtag="IN.1" inputmask="0x02"><bounds xc="212" yc="70" width="6" height="23" /></element> + <element ref="but1" inputtag="IN.1" inputmask="0x04"><bounds xc="212" yc="116" width="6" height="23" /></element> + + <!-- leds --> + <element name="3.5" ref="led"><bounds xc="44" yc="24" width="5.5" height="5.5" /></element> + <element name="3.4" ref="led"><bounds xc="44" yc="70" width="5.5" height="5.5" /></element> + <element name="3.3" ref="led"><bounds xc="44" yc="116" width="5.5" height="5.5" /></element> + + <element name="3.0" ref="led"><bounds xc="100" yc="24" width="5.5" height="5.5" /></element> + <element name="3.1" ref="led"><bounds xc="100" yc="70" width="5.5" height="5.5" /></element> + <element name="3.2" ref="led"><bounds xc="100" yc="116" width="5.5" height="5.5" /></element> + + <element name="2.2" ref="led"><bounds xc="130" yc="24" width="5.5" height="5.5" /></element> + <element name="2.1" ref="led"><bounds xc="130" yc="70" width="5.5" height="5.5" /></element> + <element name="2.0" ref="led"><bounds xc="130" yc="116" width="5.5" height="5.5" /></element> + + <element name="2.3" ref="led"><bounds xc="186" yc="24" width="5.5" height="5.5" /></element> + <element name="2.4" ref="led"><bounds xc="186" yc="70" width="5.5" height="5.5" /></element> + <element name="2.5" ref="led"><bounds xc="186" yc="116" width="5.5" height="5.5" /></element> + </group> + + +<!-- build screen --> + + <group name="layout"> + <bounds left="10" right="290" top="24" bottom="238" /> + + <element ref="orange"><bounds xc="150" yc="150" width="280" height="176" /></element> + <group ref="field"><bounds xc="150" yc="150" width="230" height="140" /></group> + + <element ref="text_score1"><bounds xc="150" y="24" width="50" height="9" /></element> + <group ref="digits"><bounds xc="150" y="33" width="45" height="43" /></group> + + <!-- other buttons --> + <element ref="text_serve"><bounds xc="28.5" yc="196" width="7" height="30" /><orientation rotate="90" /></element> + <element ref="but1" inputtag="IN.3" inputmask="0x08"><bounds xc="19" yc="196" width="6" height="23" /></element> + + <element ref="text_serve"><bounds xc="271.5" yc="104" width="7" height="30" /><orientation rotate="270" /></element> + <element ref="but1" inputtag="IN.2" inputmask="0x08"><bounds xc="281" yc="104" width="6" height="23" /></element> + + <element ref="nothing" inputtag="IN.7" inputmask="0x00" inputraw="yes"><bounds xc="150" y="232.5" width="230" height="4.5" /></element> + <element ref="switch1" inputtag="IN.7" inputmask="0x01" inputraw="yes"><bounds xc="109" y="232.5" width="30" height="4.5" /></element> + <element ref="switch2" inputtag="IN.6" inputmask="0x08" inputraw="yes"><bounds xc="193" y="232.5" width="30" height="4.5" /></element> + + <element ref="black2d" inputtag="IN.7" inputmask="0x01" inputraw="yes"><bounds xc="100" y="226" width="6" height="6" /></element> + <element ref="black2d" inputtag="IN.6" inputmask="0x08" inputraw="yes"><bounds xc="200" y="226" width="6" height="6" /></element> + + <element ref="text_score2"><bounds xc="150" y="232.5" width="30" height="4.5" /></element> + <element ref="buts" inputtag="IN.1" inputmask="0x08"><bounds xc="150" y="226" width="6" height="6" /></element> + </group> + + <view name="Internal Layout"> + <group ref="layout"><bounds left="24" right="238" top="10" bottom="290" /><orientation rotate="270" /></group> + </view> + +</mamelayout> diff --git a/src/mame/namco/namcos22.cpp b/src/mame/namco/namcos22.cpp index 3ef0ae37e76..6ddb808f29f 100644 --- a/src/mame/namco/namcos22.cpp +++ b/src/mame/namco/namcos22.cpp @@ -24,8 +24,7 @@ TODO: - where is the steering wheel motor torque output for dirtdash? Answer: The data comes from the Serial Port on the MOTHER PCB at J2 Pin 7 /TXD - tokyowar garbage tile at right edge in attract mode. It's part of the cabinet link message, maybe BTANB? -- ridgera2 title screen scrolls horizontally on some video footage, is it an undumped version? or an effect that only - happens on linked cabinets? +- ridgera2 title screen scrolls horizontally on some video footage, C139 related? - texture u/v mapping is often 1 pixel off, resulting in many glitch lines/gaps between textures - improve vertex lighting (is it phong shading?) - global offset is wrong in non-super22 testmode video test |
