diff options
author | Alex W. Jackson <alex.w.jackson@gmail.com> | 2015-03-02 04:51:24 -0500 |
---|---|---|
committer | Alex W. Jackson <alex.w.jackson@gmail.com> | 2015-03-02 04:51:24 -0500 |
commit | 9d22738e5a29829295f077b244a6f9f3cc7041ad (patch) | |
tree | e799413e0eddc476160f634362ee9cf7469dd560 | |
parent | 333e54ff31450667c754de15160ce24839faab9f (diff) |
thunderx.c: convert to bankdev, merge with gbusters.c, add notes and correct various things based on schematics [Alex Jackson]
-rw-r--r-- | src/mame/drivers/gbusters.c | 403 | ||||
-rw-r--r-- | src/mame/drivers/thunderx.c | 433 | ||||
-rw-r--r-- | src/mame/includes/gbusters.h | 62 | ||||
-rw-r--r-- | src/mame/includes/thunderx.h | 62 | ||||
-rw-r--r-- | src/mame/mame.mak | 1 | ||||
-rw-r--r-- | src/mame/video/gbusters.c | 70 | ||||
-rw-r--r-- | src/mame/video/thunderx.c | 48 |
7 files changed, 315 insertions, 764 deletions
diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c deleted file mode 100644 index 6814f52866f..00000000000 --- a/src/mame/drivers/gbusters.c +++ /dev/null @@ -1,403 +0,0 @@ -/*************************************************************************** - - Gangbusters (GX878) (c) 1988 Konami - - Preliminary driver by: - Manuel Abadia <manu@teleline.es> - -***************************************************************************/ - -#include "emu.h" -#include "cpu/z80/z80.h" -#include "cpu/m6809/konami.h" /* for the callback and the firq irq definition */ - -#include "sound/2151intf.h" -#include "includes/konamipt.h" -#include "includes/gbusters.h" - -INTERRUPT_GEN_MEMBER(gbusters_state::gbusters_interrupt) -{ - if (m_k052109->is_irq_enabled()) - device.execute().set_input_line(KONAMI_IRQ_LINE, HOLD_LINE); -} - -READ8_MEMBER(gbusters_state::bankedram_r) -{ - if (m_palette_selected) - return m_paletteram[offset]; - else - return m_ram[offset]; -} - -WRITE8_MEMBER(gbusters_state::bankedram_w) -{ - if (m_palette_selected) - m_palette->write(space, offset, data); - else - m_ram[offset] = data; -} - -WRITE8_MEMBER(gbusters_state::gbusters_1f98_w) -{ - /* bit 0 = enable char ROM reading through the video RAM */ - m_k052109->set_rmrd_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE); - - /* bit 7 used (during gfx rom tests), but unknown */ - - /* other bits unused/unknown */ - if (data & 0xfe) - { - //logerror("%04x: (1f98) write %02x\n",space.device().safe_pc(), data); - //popmessage("$1f98 = %02x", data); - } -} - -WRITE8_MEMBER(gbusters_state::gbusters_coin_counter_w) -{ - /* bit 0 select palette RAM or work RAM at 5800-5fff */ - m_palette_selected = ~data & 0x01; - - /* bits 1 & 2 = coin counters */ - coin_counter_w(machine(), 0, data & 0x02); - coin_counter_w(machine(), 1, data & 0x04); - - /* bits 3 selects tilemap priority */ - m_priority = data & 0x08; - - /* bit 7 is used but unknown */ - - /* other bits unused/unknown */ - if (data & 0xf8) - { -#if 0 - char baf[40]; - sprintf(baf, "ccnt = %02x", data); - popmessage(baf); -#endif - logerror("%04x: (ccount) write %02x\n", space.device().safe_pc(), data); - } -} - -WRITE8_MEMBER(gbusters_state::gbusters_unknown_w) -{ - logerror("%04x: write %02x to 0x1f9c\n",space.device().safe_pc(), data); - -{ -char baf[40]; - sprintf(baf,"??? = %02x", data); -// popmessage(baf); -} -} - -WRITE8_MEMBER(gbusters_state::gbusters_sh_irqtrigger_w) -{ - m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); -} - -WRITE8_MEMBER(gbusters_state::gbusters_snd_bankswitch_w) -{ - int bank_B = BIT(data, 2); /* ?? */ - int bank_A = BIT(data, 0); /* ?? */ - m_k007232->set_bank(bank_A, bank_B ); - -#if 0 - { - char baf[40]; - sprintf(baf,"snd_bankswitch = %02x", data); - popmessage(baf); - } -#endif -} - -/* special handlers to combine 052109 & 051960 */ -READ8_MEMBER(gbusters_state::k052109_051960_r) -{ - if (m_k052109->get_rmrd_line() == CLEAR_LINE) - { - if (offset >= 0x3800 && offset < 0x3808) - return m_k051960->k051937_r(space, offset - 0x3800); - else if (offset < 0x3c00) - return m_k052109->read(space, offset); - else - return m_k051960->k051960_r(space, offset - 0x3c00); - } - else - return m_k052109->read(space, offset); -} - -WRITE8_MEMBER(gbusters_state::k052109_051960_w) -{ - if (offset >= 0x3800 && offset < 0x3808) - m_k051960->k051937_w(space, offset - 0x3800, data); - else if (offset < 0x3c00) - m_k052109->write(space, offset, data); - else - m_k051960->k051960_w(space, offset - 0x3c00, data); -} - - -static ADDRESS_MAP_START( gbusters_map, AS_PROGRAM, 8, gbusters_state ) - AM_RANGE(0x1f80, 0x1f80) AM_WRITE(gbusters_coin_counter_w) /* coin counters */ - AM_RANGE(0x1f84, 0x1f84) AM_WRITE(soundlatch_byte_w) /* sound code # */ - AM_RANGE(0x1f88, 0x1f88) AM_WRITE(gbusters_sh_irqtrigger_w) /* cause interrupt on audio CPU */ - AM_RANGE(0x1f8c, 0x1f8c) AM_WRITE(watchdog_reset_w) /* watchdog reset */ - AM_RANGE(0x1f90, 0x1f90) AM_READ_PORT("SYSTEM") - AM_RANGE(0x1f91, 0x1f91) AM_READ_PORT("P1") - AM_RANGE(0x1f92, 0x1f92) AM_READ_PORT("P2") - AM_RANGE(0x1f93, 0x1f93) AM_READ_PORT("DSW3") - AM_RANGE(0x1f94, 0x1f94) AM_READ_PORT("DSW1") - AM_RANGE(0x1f95, 0x1f95) AM_READ_PORT("DSW2") - AM_RANGE(0x1f98, 0x1f98) AM_WRITE(gbusters_1f98_w) /* enable gfx ROM read through VRAM */ - AM_RANGE(0x1f9c, 0x1f9c) AM_WRITE(gbusters_unknown_w) /* ??? */ - AM_RANGE(0x0000, 0x3fff) AM_READWRITE(k052109_051960_r, k052109_051960_w) /* tiles + sprites (RAM H21, G21 & H6) */ - AM_RANGE(0x4000, 0x57ff) AM_RAM /* RAM I12 */ - AM_RANGE(0x5800, 0x5fff) AM_READWRITE(bankedram_r, bankedram_w) AM_SHARE("ram") /* palette + work RAM (RAM D16 & C16) */ - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") /* banked ROM */ - AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM 878n02.rom */ -ADDRESS_MAP_END - -static ADDRESS_MAP_START( gbusters_sound_map, AS_PROGRAM, 8, gbusters_state ) - AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM 878h01.rom */ - AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */ - AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_byte_r) /* soundlatch_byte_r */ - AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("k007232", k007232_device, read, write) /* 007232 registers */ - AM_RANGE(0xc001, 0xc001) AM_DEVREAD("ymsnd", ym2151_device, status_r) /* YM 2151 */ - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write) /* YM 2151 */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(gbusters_snd_bankswitch_w) /* 007232 bankswitch? */ -ADDRESS_MAP_END - -/*************************************************************************** - - Input Ports - -***************************************************************************/ - -static INPUT_PORTS_START( gbusters ) - PORT_START("DSW1") - KONAMI_COINAGE_LOC(DEF_STR( Free_Play ), "No Coin B", SW1) - /* "No Coin B" = coins produce sound, but no effect on coin counter */ - - PORT_START("DSW2") - PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") - PORT_DIPSETTING( 0x03, "2" ) - PORT_DIPSETTING( 0x02, "3" ) - PORT_DIPSETTING( 0x01, "5" ) - PORT_DIPSETTING( 0x00, "7" ) - PORT_DIPNAME( 0x04, 0x04, "Bullets" ) PORT_DIPLOCATION("SW2:3") - PORT_DIPSETTING( 0x04, "50" ) - PORT_DIPSETTING( 0x00, "60" ) - PORT_DIPNAME( 0x18, 0x10, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5") - PORT_DIPSETTING( 0x18, "50k, 200k, Every 400k" ) - PORT_DIPSETTING( 0x10, "70k, 250k, Every 500k" ) - PORT_DIPSETTING( 0x08, "50k Only" ) - PORT_DIPSETTING( 0x00, "70k Only" ) - PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") - PORT_DIPSETTING( 0x60, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Difficult ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Very_Difficult ) ) - PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - - PORT_START("DSW3") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1") - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW3:2" ) /* Listed as "Unused" */ - PORT_SERVICE_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW3:3" ) - PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW3:4" ) /* Listed as "Unused" */ - PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START("SYSTEM") - KONAMI8_SYSTEM_UNK - - PORT_START("P1") - KONAMI8_B12_UNK(1) - - PORT_START("P2") - KONAMI8_B12_UNK(2) -INPUT_PORTS_END - - -/*************************************************************************** - - Machine Driver - -***************************************************************************/ - -WRITE8_MEMBER(gbusters_state::volume_callback) -{ - m_k007232->set_volume(0, (data >> 4) * 0x11, 0); - m_k007232->set_volume(1, 0, (data & 0x0f) * 0x11); -} - -void gbusters_state::machine_start() -{ - UINT8 *ROM = memregion("maincpu")->base(); - - membank("bank1")->configure_entries(0, 16, &ROM[0x10000], 0x2000); - membank("bank1")->set_entry(0); - - m_paletteram.resize(0x800); - m_palette->basemem().set(m_paletteram, ENDIANNESS_BIG, 2); - - save_item(NAME(m_paletteram)); - save_item(NAME(m_palette_selected)); - save_item(NAME(m_priority)); -} - -void gbusters_state::machine_reset() -{ - UINT8 *RAM = memregion("maincpu")->base(); - - /* mirror address for banked ROM */ - memcpy(&RAM[0x18000], &RAM[0x10000], 0x08000); - - m_palette_selected = 0; - m_priority = 0; -} - -WRITE8_MEMBER( gbusters_state::banking_callback ) -{ - /* bits 0-3 ROM bank */ - membank("bank1")->set_entry(data & 0x0f); - - if (data & 0xf0) - { - //logerror("%04x: (lines) write %02x\n",device->safe_pc(), data); - //popmessage("lines = %02x", data); - } - - /* other bits unknown */ -} - -static MACHINE_CONFIG_START( gbusters, gbusters_state ) - - /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* Konami custom 052526 */ - MCFG_CPU_PROGRAM_MAP(gbusters_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", gbusters_state, gbusters_interrupt) - MCFG_KONAMICPU_LINE_CB(WRITE8(gbusters_state, banking_callback)) - - MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* ? */ - MCFG_CPU_PROGRAM_MAP(gbusters_sound_map) - - /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(64*8, 32*8) - MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) - MCFG_SCREEN_UPDATE_DRIVER(gbusters_state, screen_update_gbusters) - MCFG_SCREEN_PALETTE("palette") - - MCFG_PALETTE_ADD("palette", 1024) - MCFG_PALETTE_ENABLE_SHADOWS() - MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - - MCFG_DEVICE_ADD("k052109", K052109, 0) - MCFG_GFX_PALETTE("palette") - MCFG_K052109_CB(gbusters_state, tile_callback) - - MCFG_DEVICE_ADD("k051960", K051960, 0) - MCFG_GFX_PALETTE("palette") - MCFG_K051960_CB(gbusters_state, sprite_callback) - - /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") - - MCFG_YM2151_ADD("ymsnd", 3579545) - MCFG_SOUND_ROUTE(0, "mono", 0.60) - MCFG_SOUND_ROUTE(1, "mono", 0.60) - - MCFG_SOUND_ADD("k007232", K007232, 3579545) - MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(gbusters_state, volume_callback)) - MCFG_SOUND_ROUTE(0, "mono", 0.30) - MCFG_SOUND_ROUTE(1, "mono", 0.30) -MACHINE_CONFIG_END - - -/*************************************************************************** - - Game ROMs - -***************************************************************************/ - -ROM_START( gbusters ) - ROM_REGION( 0x30000, "maincpu", 0 ) /* code + banked roms + space for banked RAM */ - ROM_LOAD( "878n02.k13", 0x10000, 0x08000, CRC(51697aaa) SHA1(1e6461e2e5e871d44085623a890158a4c1c4c404) ) - ROM_CONTINUE( 0x08000, 0x08000 ) - ROM_LOAD( "878j03.k15", 0x20000, 0x10000, CRC(3943a065) SHA1(6b0863f4182e6c973adfaa618f096bd4cc9b7b6d) ) - - ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the sound CPU */ - ROM_LOAD( "878h01.f8", 0x00000, 0x08000, CRC(96feafaa) SHA1(8b6547e610cb4fa1c1f5bf12cb05e9a12a353903) ) - - ROM_REGION( 0x80000, "k052109", 0 ) /* tiles */ - ROM_LOAD32_WORD( "878c07.h27", 0x00000, 0x40000, CRC(eeed912c) SHA1(b2e27610b38f3fc9c2cdad600b03c8bae4fb9138) ) - ROM_LOAD32_WORD( "878c08.k27", 0x00002, 0x40000, CRC(4d14626d) SHA1(226b1d83fb82586302be0a67737a427475856537) ) - - ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */ - ROM_LOAD32_WORD( "878c05.h5", 0x00000, 0x40000, CRC(01f4aea5) SHA1(124123823be6bd597805484539d821aaaadde2c0) ) - ROM_LOAD32_WORD( "878c06.k5", 0x00002, 0x40000, CRC(edfaaaaf) SHA1(67468c4ce47e8d43d58de8d3b50b048c66508156) ) - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "878a09.f20", 0x0000, 0x0100, CRC(e2d09a1b) SHA1(a9651e137486b2df367c39eb43f52d0833589e87) ) /* priority encoder (not used) */ - - ROM_REGION( 0x40000, "k007232", 0 ) /* samples for 007232 */ - ROM_LOAD( "878c04.d5", 0x00000, 0x40000, CRC(9e982d1c) SHA1(a5b611c67b0f2ac50c679707931ee12ebbf72ebe) ) -ROM_END - -ROM_START( gbustersa ) - ROM_REGION( 0x30000, "maincpu", 0 ) /* code + banked roms + space for banked RAM */ - ROM_LOAD( "878_02.k13", 0x10000, 0x08000, CRC(57178414) SHA1(89b1403158f6ce18706c8a941109554d03cf77d9) ) /* unknown region/version leter */ - ROM_CONTINUE( 0x08000, 0x08000 ) - ROM_LOAD( "878_03.k15", 0x20000, 0x10000, CRC(6c59e660) SHA1(66a92eb8a93c9f542489fa31bec6ed1819d174da) ) /* unknown region/version leter */ - - ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the sound CPU */ - ROM_LOAD( "878h01.f8", 0x00000, 0x08000, CRC(96feafaa) SHA1(8b6547e610cb4fa1c1f5bf12cb05e9a12a353903) ) - - ROM_REGION( 0x80000, "k052109", 0 ) /* tiles */ - ROM_LOAD32_WORD( "878c07.h27", 0x00000, 0x40000, CRC(eeed912c) SHA1(b2e27610b38f3fc9c2cdad600b03c8bae4fb9138) ) - ROM_LOAD32_WORD( "878c08.k27", 0x00002, 0x40000, CRC(4d14626d) SHA1(226b1d83fb82586302be0a67737a427475856537) ) - - ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */ - ROM_LOAD32_WORD( "878c05.h5", 0x00000, 0x40000, CRC(01f4aea5) SHA1(124123823be6bd597805484539d821aaaadde2c0) ) - ROM_LOAD32_WORD( "878c06.k5", 0x00002, 0x40000, CRC(edfaaaaf) SHA1(67468c4ce47e8d43d58de8d3b50b048c66508156) ) - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "878a09.f20", 0x0000, 0x0100, CRC(e2d09a1b) SHA1(a9651e137486b2df367c39eb43f52d0833589e87) ) /* priority encoder (not used) */ - - ROM_REGION( 0x40000, "k007232", 0 ) /* samples for 007232 */ - ROM_LOAD( "878c04.d5", 0x00000, 0x40000, CRC(9e982d1c) SHA1(a5b611c67b0f2ac50c679707931ee12ebbf72ebe) ) -ROM_END - -ROM_START( crazycop ) - ROM_REGION( 0x30000, "maincpu", 0 ) /* code + banked roms + space for banked RAM */ - ROM_LOAD( "878m02.k13", 0x10000, 0x08000, CRC(9c1c9f52) SHA1(7a60ad20aac92da8258b43b04f8c7f27bb71f1df) ) - ROM_CONTINUE( 0x08000, 0x08000 ) - ROM_LOAD( "878j03.k15", 0x20000, 0x10000, CRC(3943a065) SHA1(6b0863f4182e6c973adfaa618f096bd4cc9b7b6d) ) - - ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the sound CPU */ - ROM_LOAD( "878h01.f8", 0x00000, 0x08000, CRC(96feafaa) SHA1(8b6547e610cb4fa1c1f5bf12cb05e9a12a353903) ) - - ROM_REGION( 0x80000, "k052109", 0 ) /* tiles */ - ROM_LOAD32_WORD( "878c07.h27", 0x00000, 0x40000, CRC(eeed912c) SHA1(b2e27610b38f3fc9c2cdad600b03c8bae4fb9138) ) - ROM_LOAD32_WORD( "878c08.k27", 0x00002, 0x40000, CRC(4d14626d) SHA1(226b1d83fb82586302be0a67737a427475856537) ) - - ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */ - ROM_LOAD32_WORD( "878c05.h5", 0x00000, 0x40000, CRC(01f4aea5) SHA1(124123823be6bd597805484539d821aaaadde2c0) ) - ROM_LOAD32_WORD( "878c06.k5", 0x00002, 0x40000, CRC(edfaaaaf) SHA1(67468c4ce47e8d43d58de8d3b50b048c66508156) ) - - ROM_REGION( 0x0100, "proms", 0 ) - ROM_LOAD( "878a09.f20", 0x0000, 0x0100, CRC(e2d09a1b) SHA1(a9651e137486b2df367c39eb43f52d0833589e87) ) /* priority encoder (not used) */ - - ROM_REGION( 0x40000, "k007232", 0 ) /* samples for 007232 */ - ROM_LOAD( "878c04.d5", 0x00000, 0x40000, CRC(9e982d1c) SHA1(a5b611c67b0f2ac50c679707931ee12ebbf72ebe) ) -ROM_END - - - -GAME( 1988, gbusters, 0, gbusters, gbusters, driver_device, 0, ROT90, "Konami", "Gang Busters (set 1)", GAME_SUPPORTS_SAVE ) /* N02 & J03 program roms */ -GAME( 1988, gbustersa, gbusters, gbusters, gbusters, driver_device, 0, ROT90, "Konami", "Gang Busters (set 2)", GAME_SUPPORTS_SAVE ) /* unknown region program roms */ -GAME( 1988, crazycop, gbusters, gbusters, gbusters, driver_device, 0, ROT90, "Konami", "Crazy Cop (Japan)", GAME_SUPPORTS_SAVE ) /* M02 & J03 program roms */ diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c index ac510c0a4c1..77a82af1ec2 100644 --- a/src/mame/drivers/thunderx.c +++ b/src/mame/drivers/thunderx.c @@ -1,11 +1,29 @@ /*************************************************************************** - Super Contra / Thunder Cross + Super Contra (GX775) (c) 1988 Konami + Thunder Cross (GX873) (c) 1988 Konami + Gang Busters (GX878) (c) 1988 Konami driver by Bryan McPhail, Manuel Abadia K052591 emulation by Eddie Edwards + These three games run on very similar boards, to the extent that + Thunder Cross and Gang Busters share the same schematics with + callouts ("USED ONLY GX873" or "USED ONLY GX878") to indicate the + per-game differences. + + Super Contra uses an external latch for program ROM banking + instead of the builtin banking of the Konami custom CPU, + and is the only one of the three games that uses sprite shadows. + + Thunder Cross has no 007232 sound chip, and has a 052591 PMC, + a programmable custom chip also used by S.P.Y. and Hexion. + Here it's used for collision detection. + + Gang Busters uses the 052526 custom CPU instead of 052001, and + has slightly different tile ROM addressing. + - There was a set in MAME at one time that was given the setname (thndrxja) which is supposedly a later revision of the japanese set currently in MAME. No roms were ever sourced for this set, so the GAME macro no longer exists. @@ -21,7 +39,7 @@ #include "includes/thunderx.h" -INTERRUPT_GEN_MEMBER(thunderx_state::scontra_interrupt) +INTERRUPT_GEN_MEMBER(thunderx_state::vblank_interrupt) { if (m_k052109->is_irq_enabled()) device.execute().set_input_line(KONAMI_IRQ_LINE, HOLD_LINE); @@ -39,59 +57,35 @@ void thunderx_state::device_timer(emu_timer &timer, device_timer_id id, int para } } -READ8_MEMBER(thunderx_state::scontra_bankedram_r) -{ - if (m_palette_selected) - return m_paletteram[offset]; - else - return m_ram[offset]; -} - -WRITE8_MEMBER(thunderx_state::scontra_bankedram_w) -{ - if (m_palette_selected) - m_palette->write(space, offset, data); - else - m_ram[offset] = data; -} +#define VERBOSE 0 +#define LOG(x) do { if (VERBOSE) logerror x; } while (0) +#define PMC_BK (m_1f98_latch & 0x02) -READ8_MEMBER(thunderx_state::thunderx_bankedram_r) +READ8_MEMBER(thunderx_state::pmc_r) { - if (m_rambank & 0x01) - return m_ram[offset]; - else if (m_rambank & 0x10) + if (PMC_BK) { - if (m_pmcbank) - { -// logerror("%04x read pmcram %04x\n",space.device().safe_pc(),offset); - return m_pmcram[offset]; - } - else - { - logerror("%04x read pmc internal ram %04x\n",space.device().safe_pc(),offset); - return 0; - } +// logerror("%04x read pmcram %04x\n",space.device().safe_pc(),offset); + return m_pmcram[offset]; } else - return m_paletteram[offset]; + { + LOG(("%04x read pmc internal ram %04x\n",space.device().safe_pc(),offset)); + return 0; + } } -WRITE8_MEMBER(thunderx_state::thunderx_bankedram_w) +WRITE8_MEMBER(thunderx_state::pmc_w) { - if (m_rambank & 0x01) - m_ram[offset] = data; - else if (m_rambank & 0x10) + if (PMC_BK) { - if (m_pmcbank) - { - logerror("%04x pmcram %04x = %02x\n",space.device().safe_pc(),offset,data); - m_pmcram[offset] = data; - } - else - logerror("%04x pmc internal ram %04x = %02x\n",space.device().safe_pc(),offset,data); + LOG(("%04x pmcram %04x = %02x\n",space.device().safe_pc(),offset,data)); + m_pmcram[offset] = data; } else - m_palette->write(space, offset, data); + { + LOG(("%04x pmc internal ram %04x = %02x\n",space.device().safe_pc(),offset,data)); + } } /* @@ -283,23 +277,33 @@ void thunderx_state::calculate_collisions( ) run_collisions(X0, Y0, X1, Y1, CM, HM); } -READ8_MEMBER(thunderx_state::thunderx_1f98_r) +WRITE8_MEMBER(thunderx_state::scontra_1f98_w) +{ + // bit 0 = enable char ROM reading through the video RAM + m_k052109->set_rmrd_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE); + + m_1f98_latch = data; +} + +READ8_MEMBER(thunderx_state::_1f98_r) { - return m_1f98_data; + // thunderx and gbusters read from here during the gfx rom test... + // though it doesn't look like it should be readable based on the schematics + return m_1f98_latch; } WRITE8_MEMBER(thunderx_state::thunderx_1f98_w) { // logerror("%04x: 1f98_w %02x\n", space.device().safe_pc(),data); - /* bit 0 = enable char ROM reading through the video RAM */ + // bit 0 = enable char ROM reading through the video RAM m_k052109->set_rmrd_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE); - /* bit 1 = PMC-BK */ - m_pmcbank = (data & 0x02) >> 1; + // bit 1 = PMC BK (select PMC program or data RAM) + // handled in pmc_r() and pmc_w() - /* bit 2 = do collision detection when 0->1 */ - if ((data & 4) && !(m_1f98_data & 4)) + // bit 2 = PMC START (do collision detection when 0->1) + if ((data & 4) && !(m_1f98_latch & 4)) { calculate_collisions(); @@ -307,51 +311,60 @@ WRITE8_MEMBER(thunderx_state::thunderx_1f98_w) timer_set(downcast<cpu_device *>(&space.device())->cycles_to_attotime(100), TIMER_THUNDERX_FIRQ); } - m_1f98_data = data; + m_1f98_latch = data; } WRITE8_MEMBER(thunderx_state::scontra_bankswitch_w) { - // logerror("%04x: bank switch %02x\n", space.device().safe_pc(), data & 0x0f); - membank("bank1")->set_entry(data & 0x0f); + // bits 0-3 select ROM bank at 6000-7fff + m_rombank->set_entry(data & 0x0f); - /* bit 4 select work RAM or palette RAM at 5800-5fff */ - m_palette_selected = ~data & 0x10; + // bit 4 selects work RAM or palette RAM at 5800-5fff + m_bank5800->set_bank((data & 0x10) >> 4); - /* bits 5/6 coin counters */ + // bits 5-6 coin counters coin_counter_w(machine(), 0, data & 0x20); coin_counter_w(machine(), 1, data & 0x40); - /* bit 7 controls layer priority */ + // bit 7 controls layer priority m_priority = data & 0x80; } WRITE8_MEMBER(thunderx_state::thunderx_videobank_w) { - //logerror("%04x: select video ram bank %02x\n",space.device().safe_pc(),data); - /* 0x01 = work RAM at 4000-5fff */ - /* 0x00 = palette at 5800-5fff */ - /* 0x10 = unknown RAM at 5800-5fff */ - m_rambank = data; + // 0x01 = work RAM at 4000-5fff + // 0x00 = palette at 5800-5fff + // 0x10 = PMC at 5800-5fff + m_bank5800->set_bank(data & 0x10 ? 2 : (data & 0x1)); - /* bits 1/2 coin counters */ + /* bits 1-2 coin counters */ coin_counter_w(machine(), 0, data & 0x02); coin_counter_w(machine(), 1, data & 0x04); - /* bit 3 controls layer priority (seems to be always 1) */ + /* bit 3 controls layer priority */ m_priority = data & 0x08; } -WRITE8_MEMBER(thunderx_state::thunderx_sh_irqtrigger_w) +WRITE8_MEMBER(thunderx_state::gbusters_videobank_w) { - m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); + // same as thunderx without the PMC + m_bank5800->set_bank(data & 0x1); + + coin_counter_w(machine(), 0, data & 0x02); + coin_counter_w(machine(), 1, data & 0x04); + + m_priority = data & 0x08; } -WRITE8_MEMBER(thunderx_state::scontra_snd_bankswitch_w) +WRITE8_MEMBER(thunderx_state::sh_irqtrigger_w) { - /* b3-b2: bank for chanel B */ - /* b1-b0: bank for chanel A */ + m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); +} +WRITE8_MEMBER(thunderx_state::k007232_bankswitch_w) +{ + /* b3-b2: bank for channel B */ + /* b1-b0: bank for channel A */ int bank_A = (data & 0x03); int bank_B = ((data >> 2) & 0x03); m_k007232->set_bank(bank_A, bank_B); @@ -387,7 +400,7 @@ WRITE8_MEMBER(thunderx_state::k052109_051960_w) static ADDRESS_MAP_START( scontra_map, AS_PROGRAM, 8, thunderx_state ) AM_RANGE(0x1f80, 0x1f80) AM_WRITE(scontra_bankswitch_w) /* bankswitch control + coin counters */ AM_RANGE(0x1f84, 0x1f84) AM_WRITE(soundlatch_byte_w) - AM_RANGE(0x1f88, 0x1f88) AM_WRITE(thunderx_sh_irqtrigger_w) /* cause interrupt on audio CPU */ + AM_RANGE(0x1f88, 0x1f88) AM_WRITE(sh_irqtrigger_w) /* cause interrupt on audio CPU */ AM_RANGE(0x1f8c, 0x1f8c) AM_WRITE(watchdog_reset_w) AM_RANGE(0x1f90, 0x1f90) AM_READ_PORT("SYSTEM") AM_RANGE(0x1f91, 0x1f91) AM_READ_PORT("P1") @@ -395,44 +408,39 @@ static ADDRESS_MAP_START( scontra_map, AS_PROGRAM, 8, thunderx_state ) AM_RANGE(0x1f93, 0x1f93) AM_READ_PORT("DSW3") AM_RANGE(0x1f94, 0x1f94) AM_READ_PORT("DSW1") AM_RANGE(0x1f95, 0x1f95) AM_READ_PORT("DSW2") - AM_RANGE(0x1f98, 0x1f98) AM_WRITE(thunderx_1f98_w) + AM_RANGE(0x1f98, 0x1f98) AM_READWRITE(_1f98_r, scontra_1f98_w) AM_RANGE(0x0000, 0x3fff) AM_READWRITE(k052109_051960_r, k052109_051960_w) /* video RAM + sprite RAM */ AM_RANGE(0x4000, 0x57ff) AM_RAM - AM_RANGE(0x5800, 0x5fff) AM_READWRITE(scontra_bankedram_r, scontra_bankedram_w) AM_SHARE("ram") /* palette + work RAM */ - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") + AM_RANGE(0x5800, 0x5fff) AM_DEVICE("bank5800", address_map_bank_device, amap8) /* palette + work RAM + PMC */ + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("rombank") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( thunderx_map, AS_PROGRAM, 8, thunderx_state ) AM_RANGE(0x1f80, 0x1f80) AM_WRITE(thunderx_videobank_w) - AM_RANGE(0x1f84, 0x1f84) AM_WRITE(soundlatch_byte_w) - AM_RANGE(0x1f88, 0x1f88) AM_WRITE(thunderx_sh_irqtrigger_w) /* cause interrupt on audio CPU */ - AM_RANGE(0x1f8c, 0x1f8c) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x1f90, 0x1f90) AM_READ_PORT("SYSTEM") - AM_RANGE(0x1f91, 0x1f91) AM_READ_PORT("P1") - AM_RANGE(0x1f92, 0x1f92) AM_READ_PORT("P2") - AM_RANGE(0x1f93, 0x1f93) AM_READ_PORT("DSW3") - AM_RANGE(0x1f94, 0x1f94) AM_READ_PORT("DSW1") - AM_RANGE(0x1f95, 0x1f95) AM_READ_PORT("DSW2") - AM_RANGE(0x1f98, 0x1f98) AM_READWRITE(thunderx_1f98_r, thunderx_1f98_w) /* registers */ - AM_RANGE(0x0000, 0x3fff) AM_READWRITE(k052109_051960_r, k052109_051960_w) + AM_RANGE(0x1f98, 0x1f98) AM_READWRITE(_1f98_r, thunderx_1f98_w) /* registers */ + AM_IMPORT_FROM(scontra_map) +ADDRESS_MAP_END - AM_RANGE(0x4000, 0x57ff) AM_RAM - AM_RANGE(0x5800, 0x5fff) AM_READWRITE(thunderx_bankedram_r, thunderx_bankedram_w) AM_SHARE("ram") /* palette + work RAM + unknown RAM */ - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") - AM_RANGE(0x8000, 0xffff) AM_ROM +static ADDRESS_MAP_START( gbusters_map, AS_PROGRAM, 8, thunderx_state ) + AM_RANGE(0x1f80, 0x1f80) AM_WRITE(gbusters_videobank_w) + AM_IMPORT_FROM(scontra_map) ADDRESS_MAP_END -static ADDRESS_MAP_START( scontra_sound_map, AS_PROGRAM, 8, thunderx_state ) - AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM */ - AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */ - AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_byte_r) /* soundlatch_byte_r */ - AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("k007232", k007232_device, read, write) /* 007232 registers */ - AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write) /* YM2151 */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(scontra_snd_bankswitch_w) /* 007232 bank select */ + +static ADDRESS_MAP_START( scontra_bank5800_map, AS_PROGRAM, 8, thunderx_state ) + AM_RANGE(0x0000, 0x07ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") + AM_RANGE(0x0800, 0x0fff) AM_RAM +ADDRESS_MAP_END + +static ADDRESS_MAP_START( thunderx_bank5800_map, AS_PROGRAM, 8, thunderx_state ) + AM_RANGE(0x0000, 0x07ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") + AM_RANGE(0x0800, 0x0fff) AM_RAM + AM_RANGE(0x1000, 0x17ff) AM_READWRITE(pmc_r, pmc_w) AM_SHARE("pmcram") ADDRESS_MAP_END + static ADDRESS_MAP_START( thunderx_sound_map, AS_PROGRAM, 8, thunderx_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM @@ -440,6 +448,12 @@ static ADDRESS_MAP_START( thunderx_sound_map, AS_PROGRAM, 8, thunderx_state ) AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write) ADDRESS_MAP_END +static ADDRESS_MAP_START( scontra_sound_map, AS_PROGRAM, 8, thunderx_state ) + AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE("k007232", k007232_device, read, write) + AM_RANGE(0xf000, 0xf000) AM_WRITE(k007232_bankswitch_w) + AM_IMPORT_FROM(thunderx_sound_map) +ADDRESS_MAP_END + /*************************************************************************** Input Ports @@ -494,23 +508,9 @@ static INPUT_PORTS_START( scontra ) INPUT_PORTS_END static INPUT_PORTS_START( thunderx ) - PORT_START("SYSTEM") - KONAMI8_SYSTEM_10 - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_INCLUDE( scontra ) - PORT_START("P1") - KONAMI8_B12_UNK(1) - - PORT_START("P2") - KONAMI8_B12_UNK(2) - - PORT_START("DSW1") - KONAMI_COINAGE_LOC(DEF_STR( Free_Play ), "No Coin B", SW1) - /* "No Coin B" = coins produce sound, but no effect on coin counter */ - - PORT_START("DSW2") + PORT_MODIFY("DSW2") PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x03, "2" ) PORT_DIPSETTING( 0x02, "3" ) @@ -533,7 +533,7 @@ static INPUT_PORTS_START( thunderx ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START("DSW3") + PORT_MODIFY("DSW3") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -555,6 +555,42 @@ static INPUT_PORTS_START( thnderxj ) PORT_DIPSETTING( 0x00, "50000" ) INPUT_PORTS_END +static INPUT_PORTS_START( gbusters ) + PORT_INCLUDE( scontra ) + + PORT_MODIFY("DSW2") + PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") + PORT_DIPSETTING( 0x03, "2" ) + PORT_DIPSETTING( 0x02, "3" ) + PORT_DIPSETTING( 0x01, "5" ) + PORT_DIPSETTING( 0x00, "7" ) + PORT_DIPNAME( 0x04, 0x04, "Bullets" ) PORT_DIPLOCATION("SW2:3") + PORT_DIPSETTING( 0x04, "50" ) + PORT_DIPSETTING( 0x00, "60" ) + PORT_DIPNAME( 0x18, 0x10, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5") + PORT_DIPSETTING( 0x18, "50k, 200k, Every 400k" ) + PORT_DIPSETTING( 0x10, "70k, 250k, Every 500k" ) + PORT_DIPSETTING( 0x08, "50k Only" ) + PORT_DIPSETTING( 0x00, "70k Only" ) + PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7") + PORT_DIPSETTING( 0x60, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Difficult ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Very_Difficult ) ) + PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + + PORT_MODIFY("DSW3") + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1") + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW3:2" ) /* Listed as "Unused" */ + PORT_SERVICE_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW3:3" ) + PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW3:4" ) /* Listed as "Unused" */ + PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) +INPUT_PORTS_END + /*************************************************************************** @@ -568,35 +604,25 @@ WRITE8_MEMBER(thunderx_state::volume_callback) m_k007232->set_volume(1, 0, (data & 0x0f) * 0x11); } -MACHINE_START_MEMBER(thunderx_state,scontra) +void thunderx_state::machine_start() { - m_paletteram.resize(0x800); - m_palette->basemem().set(m_paletteram, ENDIANNESS_BIG, 2); - - save_item(NAME(m_paletteram)); + save_item(NAME(m_1f98_latch)); save_item(NAME(m_priority)); - save_item(NAME(m_1f98_data)); - save_item(NAME(m_palette_selected)); - save_item(NAME(m_rambank)); - save_item(NAME(m_pmcbank)); - membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base(), 0x2000); + // verified from both scontra and thunderx/gbusters schematics + // banks 4-7 must mirror banks 0-3 for gbusters rom test to pass + UINT8 *ROM = memregion("maincpu")->base(); + m_rombank->configure_entries(0, 4, &ROM[0], 0x2000); + m_rombank->configure_entries(4, 4, &ROM[0], 0x2000); + m_rombank->configure_entries(8, 8, &ROM[0x10000], 0x2000); } -MACHINE_START_MEMBER(thunderx_state,thunderx) -{ - MACHINE_START_CALL_MEMBER(scontra); - memset(m_pmcram, 0, sizeof(m_pmcram)); - save_item(NAME(m_pmcram)); -} - -MACHINE_RESET_MEMBER(thunderx_state, scontra) +void thunderx_state::machine_reset() { + m_rombank->set_entry(0); + m_bank5800->set_bank(0); + m_1f98_latch = 0; m_priority = 0; - m_1f98_data = 0; - m_palette_selected = 0; - m_rambank = 0; - m_pmcbank = 0; } static MACHINE_CONFIG_START( scontra, thunderx_state ) @@ -604,13 +630,17 @@ static MACHINE_CONFIG_START( scontra, thunderx_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 (verified on pcb) */ MCFG_CPU_PROGRAM_MAP(scontra_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", thunderx_state, scontra_interrupt) + MCFG_CPU_VBLANK_INT_DRIVER("screen", thunderx_state, vblank_interrupt) MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(scontra_sound_map) - MCFG_MACHINE_START_OVERRIDE(thunderx_state, scontra) - MCFG_MACHINE_RESET_OVERRIDE(thunderx_state, scontra) + MCFG_DEVICE_ADD("bank5800", ADDRESS_MAP_BANK, 0) + MCFG_DEVICE_PROGRAM_MAP(scontra_bank5800_map) + MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_BIG) + MCFG_ADDRESS_MAP_BANK_DATABUS_WIDTH(8) + MCFG_ADDRESS_MAP_BANK_ADDRBUS_WIDTH(12) + MCFG_ADDRESS_MAP_BANK_STRIDE(0x0800) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -618,7 +648,7 @@ static MACHINE_CONFIG_START( scontra, thunderx_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(64*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) - MCFG_SCREEN_UPDATE_DRIVER(thunderx_state, screen_update_scontra) + MCFG_SCREEN_UPDATE_DRIVER(thunderx_state, screen_update) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 1024) @@ -647,53 +677,38 @@ static MACHINE_CONFIG_START( scontra, thunderx_state ) MACHINE_CONFIG_END -WRITE8_MEMBER( thunderx_state::thunderx_banking_callback ) +WRITE8_MEMBER( thunderx_state::banking_callback ) { //logerror("thunderx %04x: bank select %02x\n", machine().device("maincpu")->safe_pc(), data); - membank("bank1")->set_entry(data & 0x0f); + m_rombank->set_entry(data & 0x0f); } -static MACHINE_CONFIG_START( thunderx, thunderx_state ) +static MACHINE_CONFIG_DERIVED( thunderx, scontra ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 (verified on pcb) */ + MCFG_DEVICE_MODIFY("maincpu") /* 052001 (verified on pcb) */ MCFG_CPU_PROGRAM_MAP(thunderx_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", thunderx_state, scontra_interrupt) - MCFG_KONAMICPU_LINE_CB(WRITE8(thunderx_state, thunderx_banking_callback)) + MCFG_KONAMICPU_LINE_CB(WRITE8(thunderx_state, banking_callback)) - MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */ + MCFG_DEVICE_MODIFY("audiocpu") MCFG_CPU_PROGRAM_MAP(thunderx_sound_map) - MCFG_MACHINE_START_OVERRIDE(thunderx_state, thunderx) - MCFG_MACHINE_RESET_OVERRIDE(thunderx_state, scontra) + MCFG_DEVICE_MODIFY("bank5800") + MCFG_DEVICE_PROGRAM_MAP(thunderx_bank5800_map) + MCFG_ADDRESS_MAP_BANK_ADDRBUS_WIDTH(13) - /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(64*8, 32*8) - MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 ) - MCFG_SCREEN_UPDATE_DRIVER(thunderx_state, screen_update_scontra) - MCFG_SCREEN_PALETTE("palette") - - MCFG_PALETTE_ADD("palette", 1024) - MCFG_PALETTE_ENABLE_SHADOWS() - MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) + MCFG_DEVICE_REMOVE("k007232") +MACHINE_CONFIG_END - MCFG_DEVICE_ADD("k052109", K052109, 0) - MCFG_GFX_PALETTE("palette") - MCFG_K052109_CB(thunderx_state, tile_callback) +static MACHINE_CONFIG_DERIVED( gbusters, scontra ) - MCFG_DEVICE_ADD("k051960", K051960, 0) - MCFG_GFX_PALETTE("palette") - MCFG_K051960_CB(thunderx_state, sprite_callback) - - /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + /* basic machine hardware */ + MCFG_DEVICE_MODIFY("maincpu") /* 052526 */ + MCFG_CPU_PROGRAM_MAP(gbusters_map) + MCFG_KONAMICPU_LINE_CB(WRITE8(thunderx_state, banking_callback)) - MCFG_YM2151_ADD("ymsnd", 3579545) - MCFG_SOUND_ROUTE(0, "mono", 1.0) - MCFG_SOUND_ROUTE(1, "mono", 1.0) + MCFG_DEVICE_MODIFY("k052109") + MCFG_K052109_CB(thunderx_state, gbusters_tile_callback) MACHINE_CONFIG_END @@ -939,6 +954,77 @@ ROM_START( thunderxj ) ROM_LOAD( "873a08.f20", 0x0000, 0x0100, CRC(e2d09a1b) SHA1(a9651e137486b2df367c39eb43f52d0833589e87) ) /* priority encoder (not used) */ ROM_END +ROM_START( gbusters ) + ROM_REGION( 0x20000, "maincpu", 0 ) /* banked program ROMs */ + ROM_LOAD( "878n02.k13", 0x00000, 0x10000, CRC(51697aaa) SHA1(1e6461e2e5e871d44085623a890158a4c1c4c404) ) /* banked + fixed ROM */ + ROM_LOAD( "878j03.k15", 0x10000, 0x10000, CRC(3943a065) SHA1(6b0863f4182e6c973adfaa618f096bd4cc9b7b6d) ) /* banked ROM */ + + ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the sound CPU */ + ROM_LOAD( "878h01.f8", 0x00000, 0x08000, CRC(96feafaa) SHA1(8b6547e610cb4fa1c1f5bf12cb05e9a12a353903) ) + + ROM_REGION( 0x80000, "k052109", 0 ) /* tiles */ + ROM_LOAD32_WORD( "878c07.h27", 0x00000, 0x40000, CRC(eeed912c) SHA1(b2e27610b38f3fc9c2cdad600b03c8bae4fb9138) ) + ROM_LOAD32_WORD( "878c08.k27", 0x00002, 0x40000, CRC(4d14626d) SHA1(226b1d83fb82586302be0a67737a427475856537) ) + + ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */ + ROM_LOAD32_WORD( "878c05.h5", 0x00000, 0x40000, CRC(01f4aea5) SHA1(124123823be6bd597805484539d821aaaadde2c0) ) + ROM_LOAD32_WORD( "878c06.k5", 0x00002, 0x40000, CRC(edfaaaaf) SHA1(67468c4ce47e8d43d58de8d3b50b048c66508156) ) + + ROM_REGION( 0x40000, "k007232", 0 ) /* samples for 007232 */ + ROM_LOAD( "878c04.d5", 0x00000, 0x40000, CRC(9e982d1c) SHA1(a5b611c67b0f2ac50c679707931ee12ebbf72ebe) ) + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "878a09.f20", 0x0000, 0x0100, CRC(e2d09a1b) SHA1(a9651e137486b2df367c39eb43f52d0833589e87) ) /* priority encoder (not used) */ +ROM_END + +ROM_START( gbustersa ) + ROM_REGION( 0x20000, "maincpu", 0 ) /* banked program ROMs */ + ROM_LOAD( "878_02.k13", 0x00000, 0x10000, CRC(57178414) SHA1(89b1403158f6ce18706c8a941109554d03cf77d9) ) /* unknown region/version leter */ + ROM_LOAD( "878_03.k15", 0x10000, 0x10000, CRC(6c59e660) SHA1(66a92eb8a93c9f542489fa31bec6ed1819d174da) ) /* unknown region/version leter */ + + ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the sound CPU */ + ROM_LOAD( "878h01.f8", 0x00000, 0x08000, CRC(96feafaa) SHA1(8b6547e610cb4fa1c1f5bf12cb05e9a12a353903) ) + + ROM_REGION( 0x80000, "k052109", 0 ) /* tiles */ + ROM_LOAD32_WORD( "878c07.h27", 0x00000, 0x40000, CRC(eeed912c) SHA1(b2e27610b38f3fc9c2cdad600b03c8bae4fb9138) ) + ROM_LOAD32_WORD( "878c08.k27", 0x00002, 0x40000, CRC(4d14626d) SHA1(226b1d83fb82586302be0a67737a427475856537) ) + + ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */ + ROM_LOAD32_WORD( "878c05.h5", 0x00000, 0x40000, CRC(01f4aea5) SHA1(124123823be6bd597805484539d821aaaadde2c0) ) + ROM_LOAD32_WORD( "878c06.k5", 0x00002, 0x40000, CRC(edfaaaaf) SHA1(67468c4ce47e8d43d58de8d3b50b048c66508156) ) + + ROM_REGION( 0x40000, "k007232", 0 ) /* samples for 007232 */ + ROM_LOAD( "878c04.d5", 0x00000, 0x40000, CRC(9e982d1c) SHA1(a5b611c67b0f2ac50c679707931ee12ebbf72ebe) ) + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "878a09.f20", 0x0000, 0x0100, CRC(e2d09a1b) SHA1(a9651e137486b2df367c39eb43f52d0833589e87) ) /* priority encoder (not used) */ +ROM_END + +ROM_START( crazycop ) + ROM_REGION( 0x20000, "maincpu", 0 ) /* banked program ROMs */ + ROM_LOAD( "878m02.k13", 0x00000, 0x10000, CRC(9c1c9f52) SHA1(7a60ad20aac92da8258b43b04f8c7f27bb71f1df) ) /* banked + fixed ROM */ + ROM_LOAD( "878j03.k15", 0x10000, 0x10000, CRC(3943a065) SHA1(6b0863f4182e6c973adfaa618f096bd4cc9b7b6d) ) /* banked ROM */ + + ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the sound CPU */ + ROM_LOAD( "878h01.f8", 0x00000, 0x08000, CRC(96feafaa) SHA1(8b6547e610cb4fa1c1f5bf12cb05e9a12a353903) ) + + ROM_REGION( 0x80000, "k052109", 0 ) /* tiles */ + ROM_LOAD32_WORD( "878c07.h27", 0x00000, 0x40000, CRC(eeed912c) SHA1(b2e27610b38f3fc9c2cdad600b03c8bae4fb9138) ) + ROM_LOAD32_WORD( "878c08.k27", 0x00002, 0x40000, CRC(4d14626d) SHA1(226b1d83fb82586302be0a67737a427475856537) ) + + ROM_REGION( 0x80000, "k051960", 0 ) /* sprites */ + ROM_LOAD32_WORD( "878c05.h5", 0x00000, 0x40000, CRC(01f4aea5) SHA1(124123823be6bd597805484539d821aaaadde2c0) ) + ROM_LOAD32_WORD( "878c06.k5", 0x00002, 0x40000, CRC(edfaaaaf) SHA1(67468c4ce47e8d43d58de8d3b50b048c66508156) ) + + ROM_REGION( 0x40000, "k007232", 0 ) /* samples for 007232 */ + ROM_LOAD( "878c04.d5", 0x00000, 0x40000, CRC(9e982d1c) SHA1(a5b611c67b0f2ac50c679707931ee12ebbf72ebe) ) + + ROM_REGION( 0x0100, "proms", 0 ) + ROM_LOAD( "878a09.f20", 0x0000, 0x0100, CRC(e2d09a1b) SHA1(a9651e137486b2df367c39eb43f52d0833589e87) ) /* priority encoder (not used) */ +ROM_END + + + /***************************************************************************/ GAME( 1988, scontra, 0, scontra, scontra, driver_device, 0, ROT90, "Konami", "Super Contra", GAME_SUPPORTS_SAVE ) @@ -947,3 +1033,6 @@ GAME( 1988, thunderx, 0, thunderx, thunderx, driver_device, 0, ROT0, "K GAME( 1988, thunderxa, thunderx, thunderx, thunderx, driver_device, 0, ROT0, "Konami", "Thunder Cross (set 2)", GAME_SUPPORTS_SAVE ) GAME( 1988, thunderxb, thunderx, thunderx, thunderx, driver_device, 0, ROT0, "Konami", "Thunder Cross (set 3)", GAME_SUPPORTS_SAVE ) GAME( 1988, thunderxj, thunderx, thunderx, thnderxj, driver_device, 0, ROT0, "Konami", "Thunder Cross (Japan)", GAME_SUPPORTS_SAVE ) +GAME( 1988, gbusters, 0, gbusters, gbusters, driver_device, 0, ROT90, "Konami", "Gang Busters (set 1)", GAME_SUPPORTS_SAVE ) /* N02 & J03 program roms */ +GAME( 1988, gbustersa, gbusters, gbusters, gbusters, driver_device, 0, ROT90, "Konami", "Gang Busters (set 2)", GAME_SUPPORTS_SAVE ) /* unknown region program roms */ +GAME( 1988, crazycop, gbusters, gbusters, gbusters, driver_device, 0, ROT90, "Konami", "Crazy Cop (Japan)", GAME_SUPPORTS_SAVE ) /* M02 & J03 program roms */ diff --git a/src/mame/includes/gbusters.h b/src/mame/includes/gbusters.h deleted file mode 100644 index 764f7795a4f..00000000000 --- a/src/mame/includes/gbusters.h +++ /dev/null @@ -1,62 +0,0 @@ -/************************************************************************* - - Gangbusters - -*************************************************************************/ - -#include "sound/k007232.h" -#include "video/k052109.h" -#include "video/k051960.h" -#include "video/konami_helper.h" - -class gbusters_state : public driver_device -{ -public: - gbusters_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_ram(*this, "ram"), - m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"), - m_k007232(*this, "k007232"), - m_k052109(*this, "k052109"), - m_k051960(*this, "k051960"), - m_palette(*this, "palette") { } - - /* memory pointers */ - required_shared_ptr<UINT8> m_ram; - dynamic_array<UINT8> m_paletteram; - - /* video-related */ - int m_layer_colorbase[3]; - int m_sprite_colorbase; - - /* misc */ - int m_palette_selected; - int m_priority; - - /* devices */ - required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; - required_device<k007232_device> m_k007232; - required_device<k052109_device> m_k052109; - required_device<k051960_device> m_k051960; - required_device<palette_device> m_palette; - DECLARE_READ8_MEMBER(bankedram_r); - DECLARE_WRITE8_MEMBER(bankedram_w); - DECLARE_WRITE8_MEMBER(gbusters_1f98_w); - DECLARE_WRITE8_MEMBER(gbusters_coin_counter_w); - DECLARE_WRITE8_MEMBER(gbusters_unknown_w); - DECLARE_WRITE8_MEMBER(gbusters_sh_irqtrigger_w); - DECLARE_READ8_MEMBER(k052109_051960_r); - DECLARE_WRITE8_MEMBER(k052109_051960_w); - DECLARE_WRITE8_MEMBER(gbusters_snd_bankswitch_w); - virtual void machine_start(); - virtual void machine_reset(); - virtual void video_start(); - UINT32 screen_update_gbusters(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - INTERRUPT_GEN_MEMBER(gbusters_interrupt); - DECLARE_WRITE8_MEMBER(volume_callback); - K052109_CB_MEMBER(tile_callback); - K051960_CB_MEMBER(sprite_callback); - DECLARE_WRITE8_MEMBER(banking_callback); -}; diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h index fda023a665c..38ba33a28ee 100644 --- a/src/mame/includes/thunderx.h +++ b/src/mame/includes/thunderx.h @@ -4,6 +4,7 @@ *************************************************************************/ #include "cpu/m6809/konami.h" +#include "machine/bankdev.h" #include "sound/k007232.h" #include "video/k052109.h" #include "video/k051960.h" @@ -19,62 +20,59 @@ public: thunderx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_ram(*this, "ram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), + m_bank5800(*this, "bank5800"), m_k007232(*this, "k007232"), m_k052109(*this, "k052109"), m_k051960(*this, "k051960"), - m_palette(*this, "palette") { } - - /* memory pointers */ - required_shared_ptr<UINT8> m_ram; - UINT8 m_pmcram[0x800]; - dynamic_array<UINT8> m_paletteram; - - /* video-related */ - int m_layer_colorbase[3]; - int m_sprite_colorbase; - - /* misc */ - int m_priority; - UINT8 m_1f98_data; - int m_palette_selected; - int m_rambank; - int m_pmcbank; + m_palette(*this, "palette"), + m_rombank(*this, "rombank"), + m_pmcram(*this, "pmcram") { } /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; + required_device<address_map_bank_device> m_bank5800; optional_device<k007232_device> m_k007232; required_device<k052109_device> m_k052109; required_device<k051960_device> m_k051960; required_device<palette_device> m_palette; - DECLARE_READ8_MEMBER(scontra_bankedram_r); - DECLARE_WRITE8_MEMBER(scontra_bankedram_w); - DECLARE_READ8_MEMBER(thunderx_bankedram_r); - DECLARE_WRITE8_MEMBER(thunderx_bankedram_w); - DECLARE_READ8_MEMBER(thunderx_1f98_r); - DECLARE_WRITE8_MEMBER(thunderx_1f98_w); + /* memory */ + required_memory_bank m_rombank; + optional_shared_ptr<UINT8> m_pmcram; + + /* misc */ + int m_priority; + UINT8 m_1f98_latch; + DECLARE_WRITE8_MEMBER(scontra_bankswitch_w); DECLARE_WRITE8_MEMBER(thunderx_videobank_w); - DECLARE_WRITE8_MEMBER(thunderx_sh_irqtrigger_w); + DECLARE_WRITE8_MEMBER(gbusters_videobank_w); + DECLARE_READ8_MEMBER(pmc_r); + DECLARE_WRITE8_MEMBER(pmc_w); + DECLARE_WRITE8_MEMBER(scontra_1f98_w); + DECLARE_READ8_MEMBER(thunderx_1f98_r); + DECLARE_WRITE8_MEMBER(thunderx_1f98_w); + DECLARE_WRITE8_MEMBER(sh_irqtrigger_w); DECLARE_READ8_MEMBER(k052109_051960_r); DECLARE_WRITE8_MEMBER(k052109_051960_w); - DECLARE_WRITE8_MEMBER(scontra_snd_bankswitch_w); + DECLARE_WRITE8_MEMBER(k007232_bankswitch_w); + + virtual void machine_start(); + virtual void machine_reset(); virtual void video_start(); - DECLARE_MACHINE_START(scontra); - DECLARE_MACHINE_RESET(scontra); - DECLARE_MACHINE_START(thunderx); - UINT32 screen_update_scontra(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - INTERRUPT_GEN_MEMBER(scontra_interrupt); + + UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + INTERRUPT_GEN_MEMBER(vblank_interrupt); void run_collisions( int s0, int e0, int s1, int e1, int cm, int hm ); void calculate_collisions( ); DECLARE_WRITE8_MEMBER(volume_callback); K052109_CB_MEMBER(tile_callback); + K052109_CB_MEMBER(gbusters_tile_callback); K051960_CB_MEMBER(sprite_callback); - DECLARE_WRITE8_MEMBER(thunderx_banking_callback); + DECLARE_WRITE8_MEMBER(banking_callback); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/mame.mak b/src/mame/mame.mak index 64fc41d5d33..4e4c172d7a2 100644 --- a/src/mame/mame.mak +++ b/src/mame/mame.mak @@ -1346,7 +1346,6 @@ $(MAMEOBJ)/konami.a: \ $(DRIVERS)/firebeat.o $(MACHINE)/midikbd.o \ $(DRIVERS)/flkatck.o $(VIDEO)/flkatck.o \ $(DRIVERS)/gberet.o $(VIDEO)/gberet.o \ - $(DRIVERS)/gbusters.o $(VIDEO)/gbusters.o \ $(DRIVERS)/gijoe.o $(VIDEO)/gijoe.o \ $(DRIVERS)/gradius3.o $(VIDEO)/gradius3.o \ $(DRIVERS)/gticlub.o \ diff --git a/src/mame/video/gbusters.c b/src/mame/video/gbusters.c deleted file mode 100644 index 1da0380ce9c..00000000000 --- a/src/mame/video/gbusters.c +++ /dev/null @@ -1,70 +0,0 @@ -#include "emu.h" -#include "includes/gbusters.h" - - -/*************************************************************************** - - Callbacks for the K052109 - -***************************************************************************/ - -K052109_CB_MEMBER(gbusters_state::tile_callback) -{ - /* (color & 0x02) is flip y handled internally by the 052109 */ - *code |= ((*color & 0x0d) << 8) | ((*color & 0x10) << 5) | (bank << 12); - *color = m_layer_colorbase[layer] + ((*color & 0xe0) >> 5); -} - -/*************************************************************************** - - Callbacks for the K051960 - -***************************************************************************/ - -K051960_CB_MEMBER(gbusters_state::sprite_callback) -{ - *priority = (*color & 0x30) >> 4; - *color = m_sprite_colorbase + (*color & 0x0f); -} - - -/*************************************************************************** - - Start the video hardware emulation. - -***************************************************************************/ - -void gbusters_state::video_start() -{ - m_layer_colorbase[0] = 48; - m_layer_colorbase[1] = 0; - m_layer_colorbase[2] = 16; - m_sprite_colorbase = 32; -} - - -UINT32 gbusters_state::screen_update_gbusters(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - m_k052109->tilemap_update(); - - /* sprite priority 3 = disable */ - if (m_priority) - { -// m_k051960->k051960_sprites_draw(bitmap, cliprect, screen.priority(), 1, 1); /* are these used? */ - m_k052109->tilemap_draw(screen, bitmap, cliprect, 2, TILEMAP_DRAW_OPAQUE, 0); - m_k051960->k051960_sprites_draw(bitmap, cliprect, screen.priority(), 2, 2); - m_k052109->tilemap_draw(screen, bitmap, cliprect, 1, 0, 0); - m_k051960->k051960_sprites_draw(bitmap, cliprect, screen.priority(), 0, 0); - m_k052109->tilemap_draw(screen, bitmap, cliprect, 0, 0, 0); - } - else - { -// m_k051960->k051960_sprites_draw(bitmap, cliprect, screen.priority(), 1, 1); /* are these used? */ - m_k052109->tilemap_draw(screen, bitmap, cliprect, 1, TILEMAP_DRAW_OPAQUE, 0); - m_k051960->k051960_sprites_draw(bitmap, cliprect, screen.priority(), 2, 2); - m_k052109->tilemap_draw(screen, bitmap, cliprect, 2, 0, 0); - m_k051960->k051960_sprites_draw(bitmap, cliprect, screen.priority(), 0, 0); - m_k052109->tilemap_draw(screen, bitmap, cliprect, 0, 0, 0); - } - return 0; -} diff --git a/src/mame/video/thunderx.c b/src/mame/video/thunderx.c index f5ca50ea5f2..0c6577383ad 100644 --- a/src/mame/video/thunderx.c +++ b/src/mame/video/thunderx.c @@ -7,12 +7,20 @@ ***************************************************************************/ +static const int layer_colorbase[] = { 768 / 16, 0 / 16, 256 / 16 }; + K052109_CB_MEMBER(thunderx_state::tile_callback) { *code |= ((*color & 0x1f) << 8) | (bank << 13); - *color = m_layer_colorbase[layer] + ((*color & 0xe0) >> 5); + *color = layer_colorbase[layer] + ((*color & 0xe0) >> 5); } +K052109_CB_MEMBER(thunderx_state::gbusters_tile_callback) +{ + /* (color & 0x02) is flip y handled internally by the 052109 */ + *code |= ((*color & 0x0d) << 8) | ((*color & 0x10) << 5) | (bank << 12); + *color = layer_colorbase[layer] + ((*color & 0xe0) >> 5); +} /*************************************************************************** @@ -20,6 +28,8 @@ K052109_CB_MEMBER(thunderx_state::tile_callback) ***************************************************************************/ +static const int sprite_colorbase = 512 / 16; + K051960_CB_MEMBER(thunderx_state::sprite_callback) { /* Sprite priority 1 means appear behind background, used only to mask sprites */ @@ -27,13 +37,13 @@ K051960_CB_MEMBER(thunderx_state::sprite_callback) /* Sprite priority 3 means don't draw (not used) */ switch (*color & 0x30) { - case 0x00: *priority = 0xf0; break; - case 0x10: *priority = 0xf0 | 0xcc | 0xaa; break; - case 0x20: *priority = 0xf0 | 0xcc; break; + case 0x00: *priority = 0; break; + case 0x10: *priority = GFX_PMASK_2 | GFX_PMASK_1; break; + case 0x20: *priority = GFX_PMASK_2; break; case 0x30: *priority = 0xffff; break; } - *color = m_sprite_colorbase + (*color & 0x0f); + *color = sprite_colorbase + (*color & 0x0f); } @@ -46,11 +56,6 @@ K051960_CB_MEMBER(thunderx_state::sprite_callback) void thunderx_state::video_start() { - m_layer_colorbase[0] = 48; - m_layer_colorbase[1] = 0; - m_layer_colorbase[2] = 16; - m_sprite_colorbase = 32; - m_palette->set_shadow_factor(7.0/8.0); } @@ -61,26 +66,21 @@ void thunderx_state::video_start() ***************************************************************************/ -UINT32 thunderx_state::screen_update_scontra(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +UINT32 thunderx_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { m_k052109->tilemap_update(); screen.priority().fill(0, cliprect); - /* The background color is always from layer 1 - but it's always black anyway */ -// bitmap.fill(16 * m_layer_colorbase[1], cliprect); - if (m_priority) - { - m_k052109->tilemap_draw(screen, bitmap, cliprect, 2, TILEMAP_DRAW_OPAQUE, 1); - m_k052109->tilemap_draw(screen, bitmap, cliprect, 1, 0, 2); - } - else - { - m_k052109->tilemap_draw(screen, bitmap, cliprect, 1, TILEMAP_DRAW_OPAQUE, 1); - m_k052109->tilemap_draw(screen, bitmap, cliprect, 2, 0, 2); - } - m_k052109->tilemap_draw(screen, bitmap, cliprect, 0, 0, 4); + /* The background color is always from layer 1 */ + m_k052109->tilemap_draw(screen, bitmap, cliprect, 1, TILEMAP_DRAW_OPAQUE, 0); + + int bg = m_priority ? 2 : 1; + int fg = m_priority ? 1 : 2; + m_k052109->tilemap_draw(screen, bitmap, cliprect, bg, 0, 1); + m_k052109->tilemap_draw(screen, bitmap, cliprect, fg, 0, 2); m_k051960->k051960_sprites_draw(bitmap, cliprect, screen.priority(), -1, -1); + m_k052109->tilemap_draw(screen, bitmap, cliprect, 0, 0, 0); return 0; } |