diff options
author | Vas Crabb <vas@vastheman.com> | 2017-03-16 01:37:40 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2017-03-16 01:37:40 +1100 |
commit | 24b6af66bb7a0dd7f566edc099d704acd7e4baac (patch) | |
tree | 133871b8b5d86e58e32912e1a2e6ed13eb5e6b11 | |
parent | 88ea7982ed772e9672b82ee92a41c1c86db97cd6 (diff) |
pasha2: hook up lamp outputs and clickable artwork
-rw-r--r-- | src/mame/drivers/pasha2.cpp | 29 | ||||
-rw-r--r-- | src/mame/layout/gotcha.lay | 2 | ||||
-rw-r--r-- | src/mame/layout/pasha2.lay | 134 |
3 files changed, 150 insertions, 15 deletions
diff --git a/src/mame/drivers/pasha2.cpp b/src/mame/drivers/pasha2.cpp index 0834666f3d8..c4bdaeba961 100644 --- a/src/mame/drivers/pasha2.cpp +++ b/src/mame/drivers/pasha2.cpp @@ -80,6 +80,9 @@ Notes: #include "screen.h" #include "speaker.h" +#include "pasha2.lh" + + class pasha2_state : public driver_device { public: @@ -214,19 +217,17 @@ WRITE16_MEMBER(pasha2_state::oki2_bank_w) WRITE16_MEMBER(pasha2_state::pasha2_lamps_w) { -#ifdef MAME_DEBUG - if (data) - popmessage("1P: %c%c%c 2P: %c%c%c 3P: %c%c%c", - (data & 0x001) ? 'R' : '-', - (data & 0x002) ? 'G' : '-', - (data & 0x004) ? 'B' : '-', - (data & 0x010) ? 'R' : '-', - (data & 0x020) ? 'G' : '-', - (data & 0x040) ? 'B' : '-', - (data & 0x100) ? 'R' : '-', - (data & 0x200) ? 'G' : '-', - (data & 0x400) ? 'B' : '-'); -#endif + machine().output().set_value("lamp_p1_r", BIT(data, 0)); + machine().output().set_value("lamp_p1_g", BIT(data, 1)); + machine().output().set_value("lamp_p1_b", BIT(data, 2)); + + machine().output().set_value("lamp_p2_r", BIT(data, 4)); + machine().output().set_value("lamp_p2_g", BIT(data, 5)); + machine().output().set_value("lamp_p2_b", BIT(data, 6)); + + machine().output().set_value("lamp_p3_r", BIT(data, 8)); + machine().output().set_value("lamp_p3_g", BIT(data, 9)); + machine().output().set_value("lamp_p3_b", BIT(data, 10)); } static ADDRESS_MAP_START( pasha2_map, AS_PROGRAM, 16, pasha2_state ) @@ -486,4 +487,4 @@ DRIVER_INIT_MEMBER(pasha2_state,pasha2) membank("bank1")->set_entry(0); } -GAME( 1998, pasha2, 0, pasha2, pasha2, pasha2_state, pasha2, ROT0, "Dong Sung", "Pasha Pasha 2", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +GAMEL( 1998, pasha2, 0, pasha2, pasha2, pasha2_state, pasha2, ROT0, "Dong Sung", "Pasha Pasha 2", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_pasha2 ) diff --git a/src/mame/layout/gotcha.lay b/src/mame/layout/gotcha.lay index d546cb5421f..1e4539d3baf 100644 --- a/src/mame/layout/gotcha.lay +++ b/src/mame/layout/gotcha.lay @@ -2,7 +2,7 @@ <!-- license:CC0 copyright-holders:Vas Crabb -Got-cha / Pash Pash Champ Mini Game Festival layout +Got-cha / Pasha Pasha Champ Mini Game Festival layout --> <mamelayout version="2"> diff --git a/src/mame/layout/pasha2.lay b/src/mame/layout/pasha2.lay new file mode 100644 index 00000000000..0eee5863328 --- /dev/null +++ b/src/mame/layout/pasha2.lay @@ -0,0 +1,134 @@ +<?xml version="1.0"?> +<!-- +license:CC0 +copyright-holders:Vas Crabb +Pash Pash 2 layout +--> +<mamelayout version="2"> + + <element name="red_surround" defstate="0"> + <disk state="0"><color red="0.25" green="0" blue="0" /></disk> + <disk state="1"><color red="0.25" green="0" blue="0" /></disk> + </element> + <element name="green_surround" defstate="0"> + <disk state="0"><color red="0" green="0.25" blue="0" /></disk> + <disk state="1"><color red="0" green="0.25" blue="0" /></disk> + </element> + <element name="blue_surround" defstate="0"> + <disk state="0"><color red="0" green="0" blue="0.25" /></disk> + <disk state="1"><color red="0" green="0" blue="0.25" /></disk> + </element> + + <element name="red_lamp" defstate="0"> + <disk state="0"><color red="0.15" green="0" blue="0" /></disk> + <disk state="1"><color red="0.85" green="0" blue="0" /></disk> + </element> + <element name="green_lamp" defstate="0"> + <disk state="0"><color red="0" green="0.15" blue="0" /></disk> + <disk state="1"><color red="0" green="0.85" blue="0" /></disk> + </element> + <element name="blue_lamp" defstate="0"> + <disk state="0"><color red="0" green="0" blue="0.15" /></disk> + <disk state="1"><color red="0" green="0" blue="0.85" /></disk> + </element> + + <element name="start_surround" defstate="0"> + <rect><color red="0.25" green="0.25" blue="0" /></rect> + </element> + <element name="start_lamp" defstate="0"> + <rect><color red="0.85" green="0.85" blue="0" /></rect> + <text string="START"> + <color red="0.0" green="0.0" blue="0.0" /> + <bounds x="0.1" y="0.3" width="0.8" height="0.4" /> + </text> + </element> + + <element name="backdrop"> + <rect><color red="0" green="0" blue="0" /></rect> + </element> + + <view name="Button Lamps"> + <screen index="0"> + <bounds left="0" top="0" right="1000" bottom="750" /> + </screen> + + <bezel name="backdrop" element="backdrop"> + <bounds left="0" top="750" right="1000" bottom="940" /> + </bezel> + + <bezel name="lamp_p1_r" element="red_surround" inputtag="INPUTS" inputmask="0x0001"> + <bounds left="30" top="820" right="100" bottom="890" /> + </bezel> + <bezel name="lamp_p1_r" element="red_lamp" inputtag="INPUTS" inputmask="0x0001"> + <bounds left="35" top="825" right="95" bottom="885" /> + </bezel> + <bezel name="lamp_p1_g" element="green_surround" inputtag="INPUTS" inputmask="0x0002"> + <bounds left="120" top="850" right="190" bottom="920" /> + </bezel> + <bezel name="lamp_p1_g" element="green_lamp" inputtag="INPUTS" inputmask="0x0002"> + <bounds left="125" top="855" right="185" bottom="915" /> + </bezel> + <bezel name="lamp_p1_b" element="blue_surround" inputtag="INPUTS" inputmask="0x0004"> + <bounds left="210" top="820" right="280" bottom="890" /> + </bezel> + <bezel name="lamp_p1_b" element="blue_lamp" inputtag="INPUTS" inputmask="0x0004"> + <bounds left="215" top="825" right="275" bottom="885" /> + </bezel> + <bezel name="lamp_p1_s" element="start_surround" inputtag="INPUTS" inputmask="0x0008"> + <bounds left="125" top="780" right="185" bottom="810" /> + </bezel> + <bezel name="lamp_p1_s" element="start_lamp" inputtag="INPUTS" inputmask="0x0008"> + <bounds left="127" top="782" right="183" bottom="808" /> + </bezel> + + <bezel name="lamp_p2_r" element="red_surround" inputtag="INPUTS" inputmask="0x0010"> + <bounds left="375" top="820" right="445" bottom="890" /> + </bezel> + <bezel name="lamp_p2_r" element="red_lamp" inputtag="INPUTS" inputmask="0x0010"> + <bounds left="380" top="825" right="440" bottom="885" /> + </bezel> + <bezel name="lamp_p2_g" element="green_surround" inputtag="INPUTS" inputmask="0x0020"> + <bounds left="465" top="850" right="535" bottom="920" /> + </bezel> + <bezel name="lamp_p2_g" element="green_lamp" inputtag="INPUTS" inputmask="0x0020"> + <bounds left="470" top="855" right="530" bottom="915" /> + </bezel> + <bezel name="lamp_p2_b" element="blue_surround" inputtag="INPUTS" inputmask="0x0040"> + <bounds left="555" top="820" right="625" bottom="890" /> + </bezel> + <bezel name="lamp_p2_b" element="blue_lamp" inputtag="INPUTS" inputmask="0x0040"> + <bounds left="560" top="825" right="620" bottom="885" /> + </bezel> + <bezel name="lamp_p2_s" element="start_surround" inputtag="INPUTS" inputmask="0x0080"> + <bounds left="470" top="780" right="530" bottom="810" /> + </bezel> + <bezel name="lamp_p2_s" element="start_lamp" inputtag="INPUTS" inputmask="0x0080"> + <bounds left="472" top="782" right="528" bottom="808" /> + </bezel> + + <bezel name="lamp_p3_r" element="red_surround" inputtag="INPUTS" inputmask="0x1000"> + <bounds left="720" top="820" right="790" bottom="890" /> + </bezel> + <bezel name="lamp_p3_r" element="red_lamp" inputtag="INPUTS" inputmask="0x1000"> + <bounds left="725" top="825" right="785" bottom="885" /> + </bezel> + <bezel name="lamp_p3_g" element="green_surround" inputtag="INPUTS" inputmask="0x2000"> + <bounds left="810" top="850" right="880" bottom="920" /> + </bezel> + <bezel name="lamp_p3_g" element="green_lamp" inputtag="INPUTS" inputmask="0x2000"> + <bounds left="815" top="855" right="875" bottom="915" /> + </bezel> + <bezel name="lamp_p3_b" element="blue_surround" inputtag="INPUTS" inputmask="0x4000"> + <bounds left="900" top="820" right="970" bottom="890" /> + </bezel> + <bezel name="lamp_p3_b" element="blue_lamp" inputtag="INPUTS" inputmask="0x4000"> + <bounds left="905" top="825" right="965" bottom="885" /> + </bezel> + <bezel name="lamp_p3_s" element="start_surround" inputtag="INPUTS" inputmask="0x8000"> + <bounds left="815" top="780" right="875" bottom="810" /> + </bezel> + <bezel name="lamp_p3_s" element="start_lamp" inputtag="INPUTS" inputmask="0x8000"> + <bounds left="817" top="782" right="873" bottom="808" /> + </bezel> + </view> +</mamelayout> |