diff options
| -rw-r--r-- | src/mame/capcom/cps1.cpp | 7 | ||||
| -rw-r--r-- | src/mame/konami/bottom9.cpp | 55 | ||||
| -rw-r--r-- | src/mame/konami/spy.cpp | 40 |
3 files changed, 52 insertions, 50 deletions
diff --git a/src/mame/capcom/cps1.cpp b/src/mame/capcom/cps1.cpp index 8a123d05939..7e9ce2ee5e7 100644 --- a/src/mame/capcom/cps1.cpp +++ b/src/mame/capcom/cps1.cpp @@ -405,8 +405,11 @@ TIMER_CALLBACK_MEMBER(cps_state::raster_irq) uint16_t cps_state::irqack_r(offs_t offset) { // FC0-FC2(any) + BGACK: VPA and clears both IPL1 and IPL2 - m_maincpu->set_input_line(M68K_IRQ_IPL1, CLEAR_LINE); - m_maincpu->set_input_line(M68K_IRQ_IPL2, CLEAR_LINE); + if (!machine().side_effects_disabled()) + { + m_maincpu->set_input_line(M68K_IRQ_IPL1, CLEAR_LINE); + m_maincpu->set_input_line(M68K_IRQ_IPL2, CLEAR_LINE); + } return m68000_base_device::autovector(offset + 1); } diff --git a/src/mame/konami/bottom9.cpp b/src/mame/konami/bottom9.cpp index 9f5dc2716cf..5ed8e6bd215 100644 --- a/src/mame/konami/bottom9.cpp +++ b/src/mame/konami/bottom9.cpp @@ -333,10 +333,10 @@ static INPUT_PORTS_START( bottom9 ) PORT_DIPSETTING( 0x01, "2:00" ) PORT_DIPSETTING( 0x00, "2:10" ) PORT_DIPNAME( 0x18, 0x08, "Bonus Time" ) PORT_DIPLOCATION("SW2:4,5") - PORT_DIPSETTING( 0x18, "0 Seconds" ) - PORT_DIPSETTING( 0x10, "20 Seconds" ) - PORT_DIPSETTING( 0x08, "30 Seconds" ) - PORT_DIPSETTING( 0x00, "40 Seconds" ) + PORT_DIPSETTING( 0x18, DEF_STR( None ) ) + PORT_DIPSETTING( 0x10, "20 sec" ) + PORT_DIPSETTING( 0x08, "30 sec" ) + PORT_DIPSETTING( 0x00, "40 sec" ) PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") PORT_DIPSETTING( 0x60, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) @@ -354,7 +354,7 @@ static INPUT_PORTS_START( bottom9 ) PORT_DIPNAME( 0x10, 0x10, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1") PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "SW3:2" ) // According to manual: N/U + PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "SW3:2" ) // According to manual: N/U PORT_SERVICE_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW3:3" ) PORT_DIPNAME( 0x80, 0x80, "Fielder Control" ) PORT_DIPLOCATION("SW3:4") PORT_DIPSETTING( 0x80, DEF_STR( Normal ) ) @@ -377,10 +377,10 @@ static INPUT_PORTS_START( mstadium ) PORT_DIPSETTING( 0x01, "3" ) PORT_DIPSETTING( 0x00, "4" ) PORT_DIPNAME( 0x0c, 0x08, "Play Inning Time" ) PORT_DIPLOCATION("SW2:3,4") - PORT_DIPSETTING( 0x0c, "6 Minutes" ) - PORT_DIPSETTING( 0x08, "8 Minutes" ) - PORT_DIPSETTING( 0x04, "10 Minutes" ) - PORT_DIPSETTING( 0x00, "12 Minutes" ) + PORT_DIPSETTING( 0x0c, "6 min" ) + PORT_DIPSETTING( 0x08, "8 min" ) + PORT_DIPSETTING( 0x04, "10 min" ) + PORT_DIPSETTING( 0x00, "12 min" ) PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:5") PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -476,7 +476,7 @@ ROM_START( bottom9 ) ROM_REGION( 0x8000, "audiocpu", 0 ) // Z80 code ROM_LOAD( "891j01.g8", 0x0000, 0x8000, CRC(31b0a0a8) SHA1(8e047f81c19f25de97fa22e70dcfe9e06bfae699) ) - ROM_REGION( 0x080000, "k052109", 0 ) // tiles + ROM_REGION( 0x080000, "k052109", 0 ) // tiles ROM_LOAD32_BYTE( "891e10c", 0x00000, 0x10000, CRC(209b0431) SHA1(07f05f63267d5ed5c99b5f786bb66a87045db9e1) ) ROM_LOAD32_BYTE( "891e10a", 0x00001, 0x10000, CRC(8020a9e8) SHA1(3792794a1b875506089da63cae955668cc61f54b) ) ROM_LOAD32_BYTE( "891e09c", 0x00002, 0x10000, CRC(9dcaefbf) SHA1(8b61b1627737b959158aa6c7ea5db63f6aec7436) ) @@ -505,23 +505,23 @@ ROM_START( bottom9 ) ROM_LOAD32_BYTE( "891e05d", 0xc0003, 0x10000, CRC(f6d3f886) SHA1(b8bdcc9470aa93849b8c8a1f03971281cacc6d44) ) ROM_REGION( 0x020000, "k051316", 0 ) - ROM_LOAD( "891e07a", 0x00000, 0x10000, CRC(b8d8b939) SHA1(ee91fb46d70db2d17f5909c4ea7ee1cf2d317d10) ) // zoom/rotate + ROM_LOAD( "891e07a", 0x00000, 0x10000, CRC(b8d8b939) SHA1(ee91fb46d70db2d17f5909c4ea7ee1cf2d317d10) ) // zoom/rotate ROM_LOAD( "891e07b", 0x10000, 0x10000, CRC(83b2f92d) SHA1(c4972018e1f8109656784fae3e023a5522622c4b) ) - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "891b11.f23", 0x0000, 0x0100, CRC(ecb854aa) SHA1(3bd321ca3076d4e0042e0af656d51909fa6a5b3b) ) // priority encoder (not used) - ROM_REGION( 0x40000, "k007232_1", 0 ) // samples ROM_LOAD( "891e08a", 0x00000, 0x10000, CRC(cef667bf) SHA1(e773fc0ced45e01e13cdee18c404d609356d2d0e) ) ROM_LOAD( "891e08b", 0x10000, 0x10000, CRC(f7c14a7a) SHA1(05261a065de33e158e8d72d74eb657035abb5d03) ) ROM_LOAD( "891e08c", 0x20000, 0x10000, CRC(756b7f3c) SHA1(6f36f0b4e08db27a8b6e180d12be6427677ad62d) ) ROM_LOAD( "891e08d", 0x30000, 0x10000, CRC(cd0d7305) SHA1(82403ce1f38014ebf94008a66c98697a572303f9) ) - ROM_REGION( 0x40000, "k007232_2", 0 ) // samples + ROM_REGION( 0x40000, "k007232_2", 0 ) // samples ROM_LOAD( "891e04a", 0x00000, 0x10000, CRC(daebbc74) SHA1(f61daebf80e5e4640c4cea4ea5767e64a49d928d) ) ROM_LOAD( "891e04b", 0x10000, 0x10000, CRC(5ffb9ad1) SHA1(e8f00c63dc3091aa344e82dc29f41aedd5a764b4) ) ROM_LOAD( "891e04c", 0x20000, 0x10000, CRC(2dbbf16b) SHA1(84b2005a1fe61a6a0cf1aa6e0fdf7ff8b1f8f82a) ) ROM_LOAD( "891e04d", 0x30000, 0x10000, CRC(8b0cd2cc) SHA1(e14109c69fa24d309aed4ff3589cc6619e29f97f) ) + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "891b11.f23", 0x0000, 0x0100, CRC(ecb854aa) SHA1(3bd321ca3076d4e0042e0af656d51909fa6a5b3b) ) // priority encoder (not used) ROM_END ROM_START( bottom9n ) @@ -532,7 +532,7 @@ ROM_START( bottom9n ) ROM_REGION( 0x8000, "audiocpu", 0 ) // Z80 code ROM_LOAD( "891j01.g8", 0x0000, 0x8000, CRC(31b0a0a8) SHA1(8e047f81c19f25de97fa22e70dcfe9e06bfae699) ) - ROM_REGION( 0x080000, "k052109", 0 ) // tiles + ROM_REGION( 0x080000, "k052109", 0 ) // tiles ROM_LOAD32_BYTE( "891e10c", 0x00000, 0x10000, CRC(209b0431) SHA1(07f05f63267d5ed5c99b5f786bb66a87045db9e1) ) ROM_LOAD32_BYTE( "891e10a", 0x00001, 0x10000, CRC(8020a9e8) SHA1(3792794a1b875506089da63cae955668cc61f54b) ) ROM_LOAD32_BYTE( "891e09c", 0x00002, 0x10000, CRC(9dcaefbf) SHA1(8b61b1627737b959158aa6c7ea5db63f6aec7436) ) @@ -560,25 +560,24 @@ ROM_START( bottom9n ) ROM_LOAD32_BYTE( "891e05h", 0xc0002, 0x10000, CRC(b0aba53b) SHA1(e76b345ae354533959ed06217b91ce3c93b22a23) ) ROM_LOAD32_BYTE( "891e05d", 0xc0003, 0x10000, CRC(f6d3f886) SHA1(b8bdcc9470aa93849b8c8a1f03971281cacc6d44) ) - ROM_REGION( 0x020000, "k051316", 0 ) - ROM_LOAD( "891e07a", 0x00000, 0x10000, CRC(b8d8b939) SHA1(ee91fb46d70db2d17f5909c4ea7ee1cf2d317d10) ) // zoom/rotate + ROM_LOAD( "891e07a", 0x00000, 0x10000, CRC(b8d8b939) SHA1(ee91fb46d70db2d17f5909c4ea7ee1cf2d317d10) ) // zoom/rotate ROM_LOAD( "891e07b", 0x10000, 0x10000, CRC(83b2f92d) SHA1(c4972018e1f8109656784fae3e023a5522622c4b) ) - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "891b11.f23", 0x0000, 0x0100, CRC(ecb854aa) SHA1(3bd321ca3076d4e0042e0af656d51909fa6a5b3b) ) // priority encoder (not used) - ROM_REGION( 0x40000, "k007232_1", 0 ) // samples ROM_LOAD( "891e08a", 0x00000, 0x10000, CRC(cef667bf) SHA1(e773fc0ced45e01e13cdee18c404d609356d2d0e) ) ROM_LOAD( "891e08b", 0x10000, 0x10000, CRC(f7c14a7a) SHA1(05261a065de33e158e8d72d74eb657035abb5d03) ) ROM_LOAD( "891e08c", 0x20000, 0x10000, CRC(756b7f3c) SHA1(6f36f0b4e08db27a8b6e180d12be6427677ad62d) ) ROM_LOAD( "891e08d", 0x30000, 0x10000, CRC(cd0d7305) SHA1(82403ce1f38014ebf94008a66c98697a572303f9) ) - ROM_REGION( 0x40000, "k007232_2", 0 ) // samples + ROM_REGION( 0x40000, "k007232_2", 0 ) // samples ROM_LOAD( "891e04a", 0x00000, 0x10000, CRC(daebbc74) SHA1(f61daebf80e5e4640c4cea4ea5767e64a49d928d) ) ROM_LOAD( "891e04b", 0x10000, 0x10000, CRC(5ffb9ad1) SHA1(e8f00c63dc3091aa344e82dc29f41aedd5a764b4) ) ROM_LOAD( "891e04c", 0x20000, 0x10000, CRC(2dbbf16b) SHA1(84b2005a1fe61a6a0cf1aa6e0fdf7ff8b1f8f82a) ) ROM_LOAD( "891e04d", 0x30000, 0x10000, CRC(8b0cd2cc) SHA1(e14109c69fa24d309aed4ff3589cc6619e29f97f) ) + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "891b11.f23", 0x0000, 0x0100, CRC(ecb854aa) SHA1(3bd321ca3076d4e0042e0af656d51909fa6a5b3b) ) // priority encoder (not used) ROM_END ROM_START( mstadium ) @@ -589,7 +588,7 @@ ROM_START( mstadium ) ROM_REGION( 0x8000, "audiocpu", 0 ) // Z80 code ROM_LOAD( "891w01.g8", 0x0000, 0x8000, CRC(edec565a) SHA1(69cba0d00c6ef76c4ce2b553e3fd15de8abbbf31) ) - ROM_REGION( 0x080000, "k052109", 0 ) // tiles + ROM_REGION( 0x080000, "k052109", 0 ) // tiles ROM_LOAD32_BYTE( "891e10c", 0x00000, 0x10000, CRC(209b0431) SHA1(07f05f63267d5ed5c99b5f786bb66a87045db9e1) ) ROM_LOAD32_BYTE( "891e10a", 0x00001, 0x10000, CRC(8020a9e8) SHA1(3792794a1b875506089da63cae955668cc61f54b) ) ROM_LOAD32_BYTE( "891e09c", 0x00002, 0x10000, CRC(9dcaefbf) SHA1(8b61b1627737b959158aa6c7ea5db63f6aec7436) ) @@ -618,23 +617,23 @@ ROM_START( mstadium ) ROM_LOAD32_BYTE( "891e05d", 0xc0003, 0x10000, CRC(f6d3f886) SHA1(b8bdcc9470aa93849b8c8a1f03971281cacc6d44) ) ROM_REGION( 0x020000, "k051316", 0 ) - ROM_LOAD( "891e07a", 0x00000, 0x10000, CRC(b8d8b939) SHA1(ee91fb46d70db2d17f5909c4ea7ee1cf2d317d10) ) // zoom/rotate + ROM_LOAD( "891e07a", 0x00000, 0x10000, CRC(b8d8b939) SHA1(ee91fb46d70db2d17f5909c4ea7ee1cf2d317d10) ) // zoom/rotate ROM_LOAD( "891e07b", 0x10000, 0x10000, CRC(83b2f92d) SHA1(c4972018e1f8109656784fae3e023a5522622c4b) ) - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "891b11.f23", 0x0000, 0x0100, CRC(ecb854aa) SHA1(3bd321ca3076d4e0042e0af656d51909fa6a5b3b) ) // priority encoder (not used) - ROM_REGION( 0x40000, "k007232_1", 0 ) // samples ROM_LOAD( "891e08a", 0x00000, 0x10000, CRC(cef667bf) SHA1(e773fc0ced45e01e13cdee18c404d609356d2d0e) ) ROM_LOAD( "891e08b", 0x10000, 0x10000, CRC(f7c14a7a) SHA1(05261a065de33e158e8d72d74eb657035abb5d03) ) ROM_LOAD( "891e08c", 0x20000, 0x10000, CRC(756b7f3c) SHA1(6f36f0b4e08db27a8b6e180d12be6427677ad62d) ) ROM_LOAD( "891e08d", 0x30000, 0x10000, CRC(cd0d7305) SHA1(82403ce1f38014ebf94008a66c98697a572303f9) ) - ROM_REGION( 0x40000, "k007232_2", 0 ) // samples + ROM_REGION( 0x40000, "k007232_2", 0 ) // samples ROM_LOAD( "891e04a", 0x00000, 0x10000, CRC(daebbc74) SHA1(f61daebf80e5e4640c4cea4ea5767e64a49d928d) ) ROM_LOAD( "891e04b", 0x10000, 0x10000, CRC(5ffb9ad1) SHA1(e8f00c63dc3091aa344e82dc29f41aedd5a764b4) ) ROM_LOAD( "891e04c", 0x20000, 0x10000, CRC(2dbbf16b) SHA1(84b2005a1fe61a6a0cf1aa6e0fdf7ff8b1f8f82a) ) ROM_LOAD( "891e04d", 0x30000, 0x10000, CRC(8b0cd2cc) SHA1(e14109c69fa24d309aed4ff3589cc6619e29f97f) ) + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "891b11.f23", 0x0000, 0x0100, CRC(ecb854aa) SHA1(3bd321ca3076d4e0042e0af656d51909fa6a5b3b) ) // priority encoder (not used) ROM_END } // anonymous namespace diff --git a/src/mame/konami/spy.cpp b/src/mame/konami/spy.cpp index 32f79fc70da..8f6966fbcfc 100644 --- a/src/mame/konami/spy.cpp +++ b/src/mame/konami/spy.cpp @@ -133,8 +133,8 @@ K051960_CB_MEMBER(spy_state::sprite_callback) { enum { sprite_colorbase = 512 / 16 }; - /* bit 4 = priority over layer A (0 = have priority) */ - /* bit 5 = priority over layer B (1 = have priority) */ + // bit 4 = priority over layer A (0 = have priority) + // bit 5 = priority over layer B (1 = have priority) *priority = 0x00; if ( *color & 0x10) *priority |= GFX_PMASK_1; if (~*color & 0x20) *priority |= GFX_PMASK_2; @@ -244,22 +244,6 @@ Collision check routine: 3f: 5f 7e 00 ce 08 ret */ -void spy_state::bankswitch_w(uint8_t data) -{ - /* bit 0 = RAM bank */ - if (BIT(~data, 0)) - popmessage("bankswitch RAM bank 0"); - - /* bit 1-4 = ROM bank */ - int bank; - if (BIT(data, 4)) - bank = 8 + ((data & 0x06) >> 1); - else - bank = (data & 0x0e) >> 1; - - m_rombank->set_entry(bank); -} - void spy_state::pmc_run() { constexpr uint16_t MAX_SPRITES = 64; @@ -341,6 +325,22 @@ void spy_state::pmc_run() } } +void spy_state::bankswitch_w(uint8_t data) +{ + /* bit 0 = RAM bank */ + if (BIT(~data, 0)) + popmessage("bankswitch RAM bank 0"); + + /* bit 1-4 = ROM bank */ + int bank; + if (BIT(data, 4)) + bank = 8 + ((data & 0x06) >> 1); + else + bank = (data & 0x0e) >> 1; + + m_rombank->set_entry(bank); +} + void spy_state::spy_3f90_w(uint8_t data) { @@ -681,5 +681,5 @@ ROM_END } // anonymous namespace -GAME( 1989, spy, 0, spy, spy, spy_state, empty_init, ROT0, "Konami", "S.P.Y. - Special Project Y (World ver. N)", MACHINE_SUPPORTS_SAVE ) -GAME( 1989, spyu, spy, spy, spy, spy_state, empty_init, ROT0, "Konami", "S.P.Y. - Special Project Y (US ver. M)", MACHINE_SUPPORTS_SAVE ) +GAME( 1989, spy, 0, spy, spy, spy_state, empty_init, ROT0, "Konami", "S.P.Y.: Special Project Y. (World ver. N)", MACHINE_SUPPORTS_SAVE ) +GAME( 1989, spyu, spy, spy, spy, spy_state, empty_init, ROT0, "Konami", "S.P.Y.: Special Project Y. (US ver. M)", MACHINE_SUPPORTS_SAVE ) |
