diff options
-rw-r--r-- | src/mame/drivers/pcxt.c | 17 | ||||
-rw-r--r-- | src/mame/drivers/rainbow.c | 10 | ||||
-rw-r--r-- | src/mame/includes/rainbow.h | 4 | ||||
-rw-r--r-- | src/mame/video/rainbow.c | 2 |
4 files changed, 16 insertions, 17 deletions
diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c index 50f275caa7b..ee7b13f3e2f 100644 --- a/src/mame/drivers/pcxt.c +++ b/src/mame/drivers/pcxt.c @@ -202,34 +202,33 @@ static WRITE8_HANDLER( disk_iobank_w ) Pit8253 *********************************/ -UINT8 pc_speaker_get_spk(running_machine &machine) +// pc_speaker_get_spk, pc_speaker_set_spkrdata, and pc_speaker_set_input already exists in MESS, can the implementations be merged? +UINT8 pcxt_speaker_get_spk(running_machine &machine) { pcxt_state *state = machine.driver_data<pcxt_state>(); return state->m_pc_spkrdata & state->m_pc_input; } - -void pc_speaker_set_spkrdata(running_machine &machine, UINT8 data) +void pcxt_speaker_set_spkrdata(running_machine &machine, UINT8 data) { device_t *speaker = machine.device("speaker"); pcxt_state *state = machine.driver_data<pcxt_state>(); state->m_pc_spkrdata = data ? 1 : 0; - speaker_level_w( speaker, pc_speaker_get_spk(machine) ); + speaker_level_w( speaker, pcxt_speaker_get_spk(machine) ); } - -void pc_speaker_set_input(running_machine &machine, UINT8 data) +void pcxt_speaker_set_input(running_machine &machine, UINT8 data) { device_t *speaker = machine.device("speaker"); pcxt_state *state = machine.driver_data<pcxt_state>(); state->m_pc_input = data ? 1 : 0; - speaker_level_w( speaker, pc_speaker_get_spk(machine) ); + speaker_level_w( speaker, pcxt_speaker_get_spk(machine) ); } static WRITE_LINE_DEVICE_HANDLER( ibm5150_pit8253_out2_changed ) { - pc_speaker_set_input( device->machine(), state ); + pcxt_speaker_set_input( device->machine(), state ); } @@ -304,7 +303,7 @@ static WRITE8_DEVICE_HANDLER( port_b_w ) /* PPI controller port B*/ pit8253_gate2_w(state->m_pit8253, BIT(data, 0)); - pc_speaker_set_spkrdata( device->machine(), data & 0x02 ); + pcxt_speaker_set_spkrdata( device->machine(), data & 0x02 ); state->m_port_b_data = data; // device_t *beep = device->machine().device("beep"); // device_t *cvsd = device->machine().device("cvsd"); diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c index 4c21890c15e..fcbaf6d6955 100644 --- a/src/mame/drivers/rainbow.c +++ b/src/mame/drivers/rainbow.c @@ -176,8 +176,8 @@ Notes on Rainbow Islands Extra by Robert Gallagher Green - Protection Fairy, gives you the protection fairy for about 8 seconds at the beginning of each round, or after you die. (NOT perm. like RI, code at $C528 in RIE handles this, and is distinctly different from the code at $BC8C in RI) - Blue - Yellow Potion, gives you perm. fast rbisland power - Indigo - Red Potion, gives you perm. 2X rbisland power + Blue - Yellow Potion, gives you perm. fast rainbow power + Indigo - Red Potion, gives you perm. 2X rainbow power Violet - Shoes, gives you perm. fast feet. Unlike the secret rooms in Rainbow Islands, in Rainbow Islands Extra, only 2 letters of the code @@ -194,10 +194,10 @@ Notes on Rainbow Islands Extra by Robert Gallagher If you enter all 10 secret rooms in Rainbow Islands Extra, and do NOT collect the powerups in _any_ of the rooms, you will receive "SPECIAL BIG BONUS !! 50000000 PTS." - If you enter all 10 secret rooms, and do NOT collect the bubble-rbisland power in secret room 10, + If you enter all 10 secret rooms, and do NOT collect the bubble-rainbow power in secret room 10, (though you may collect them in others) you will receive "SPECIAL BIG BONUS !! 10000000 PTS." - If you collect the bubble-rbisland power in secret room 10, you will receive "ALL ROOM CLEAR + If you collect the bubble-rainbow power in secret room 10, you will receive "ALL ROOM CLEAR 5000000" bonus instead. In Rainbow Islands Extra (as in Rainbow Islands), if you collect 2 of any colour 'cane'... @@ -260,7 +260,7 @@ that can be entered on the copyright screen: L -> left R -> right J -> jump - B -> rbisland + B -> rainbow S -> start | regular | extra diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h index cedcb959b46..0ea1e355860 100644 --- a/src/mame/includes/rainbow.h +++ b/src/mame/includes/rainbow.h @@ -35,7 +35,7 @@ public: }; -/*----------- defined in machine/rbisland.c -----------*/ +/*----------- defined in machine/rainbow.c -----------*/ void rbisland_cchip_init(running_machine &machine, int version); READ16_HANDLER( rbisland_cchip_ctrl_r ); @@ -45,7 +45,7 @@ WRITE16_HANDLER( rbisland_cchip_bank_w ); WRITE16_HANDLER( rbisland_cchip_ram_w ); -/*----------- defined in video/rbisland.c -----------*/ +/*----------- defined in video/rainbow.c -----------*/ SCREEN_UPDATE( rbisland ); VIDEO_START( jumping ); diff --git a/src/mame/video/rainbow.c b/src/mame/video/rainbow.c index b3cedaf18b1..61ed333e7e2 100644 --- a/src/mame/video/rainbow.c +++ b/src/mame/video/rainbow.c @@ -65,7 +65,7 @@ SCREEN_UPDATE( rbisland ) /*************************************************************************** Jumping uses different sprite controller -than rbisland island. - values are remapped +than Rainbow Island. - values are remapped at address 0x2EA in the code. Apart from physical layout, the main change is that the Y settings are active low. |