new NOT WORKING

---------------
Ron II Mah-Jong [system11, Angelo Salese, The Dumping Union]
This commit is contained in:
angelosa 2017-06-04 07:43:17 +02:00
parent bd0d880c5d
commit 57204def70
3 changed files with 400 additions and 0 deletions

View File

@ -3120,6 +3120,7 @@ files {
MAME_DIR .. "src/mame/drivers/mjkjidai.cpp",
MAME_DIR .. "src/mame/includes/mjkjidai.h",
MAME_DIR .. "src/mame/video/mjkjidai.cpp",
MAME_DIR .. "src/mame/drivers/ron.cpp",
}
createMAMEProjects(_target, _subtarget, "sega")

396
src/mame/drivers/ron.cpp Normal file
View File

@ -0,0 +1,396 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese
/***************************************************************************
Ron II Mah-Jongg (c) 1981 Sanritsu
TODO:
- colors;
- sound / hookup MCS-48;
- finish inputs;
***************************************************************************/
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "screen.h"
#include "speaker.h"
// TBD
#define MAIN_CLOCK XTAL_4MHz
#define VIDEO_CLOCK XTAL_3_579545MHz*2
class ron_state : public driver_device
{
public:
ron_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
m_vram(*this, "vram"),
m_cram(*this, "cram"),
m_mj_ports(*this, { "PL1_1", "PL1_2", "PL1_3", "PL1_4","PL2_1", "PL2_2", "PL2_3", "PL2_4" })
{
}
// screen updates
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_PALETTE_INIT(ron);
INTERRUPT_GEN_MEMBER(vblank_irq);
DECLARE_WRITE8_MEMBER(output_w);
DECLARE_READ8_MEMBER(p1_mux_r);
DECLARE_READ8_MEMBER(p2_mux_r);
DECLARE_WRITE8_MEMBER(mux_w);
protected:
// driver_device overrides
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
// devices
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_shared_ptr<uint8_t> m_vram;
required_shared_ptr<uint8_t> m_cram;
required_ioport_array<8> m_mj_ports;
private:
bool m_nmi_enable;
uint8_t m_mux_data;
uint8_t read_mux(bool which);
};
void ron_state::video_start()
{
}
uint32_t ron_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect )
{
gfx_element *gfx = m_gfxdecode->gfx(0);
int y,x;
int count = 0;
for (y=0;y<32;y++)
{
for (x=0;x<32;x++)
{
uint16_t tile = m_cram[count];
gfx->opaque(bitmap,cliprect,tile,0,0,0,x*8,y*8);
count++;
}
}
gfx = m_gfxdecode->gfx(1);
count = 0;
for (y=0;y<32;y++)
{
for (x=0;x<32;x++)
{
uint16_t tile = m_vram[count];
gfx->transpen(bitmap,cliprect,tile,0,0,0,x*8,y*8,0);
count++;
}
}
return 0;
}
WRITE8_MEMBER(ron_state::output_w)
{
m_nmi_enable = (data & 0x10) == 0x10;
if(data & 0xef)
printf("%02x\n",data);
}
uint8_t ron_state::read_mux(bool which)
{
uint8_t base_port = which == true ? 4 : 0;
//uint8_t i,res;
// printf("%02x\n", m_mux_data);
//res = 0;//ioport("COINS")->read();
for(uint8_t i=0;i<4;i++)
{
if((~m_mux_data) & (1 << i))
return (m_mj_ports[i+base_port])->read();
}
// TODO: check me
return machine().rand();
}
READ8_MEMBER(ron_state::p1_mux_r)
{
return read_mux(false);
}
READ8_MEMBER(ron_state::p2_mux_r)
{
return read_mux(true);
}
WRITE8_MEMBER(ron_state::mux_w)
{
m_mux_data = data;
}
static ADDRESS_MAP_START( ron_map, AS_PROGRAM, 8, ron_state )
AM_RANGE(0x0000, 0x4fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_SHARE("vram")
AM_RANGE(0x8400, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8bff) AM_RAM AM_SHARE("cram")
AM_RANGE(0x8c00, 0x8fff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( ron_io, AS_IO, 8, ron_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00, 0x00) AM_READ(p1_mux_r)
AM_RANGE(0x01, 0x01) AM_READ(p2_mux_r)
AM_RANGE(0x02, 0x02) AM_READ_PORT("DSW")
AM_RANGE(0x03, 0x03) AM_READ_PORT("SYSTEM") AM_WRITE(mux_w)
AM_RANGE(0x0a, 0x0a) AM_WRITE(output_w)
ADDRESS_MAP_END
static INPUT_PORTS_START( ron )
PORT_START("SYSTEM")
PORT_DIPNAME( 0x01, 0x01, "SYSTEM" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, "DIPS" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x02, DEF_STR( On ) )
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x04, DEF_STR( On ) )
PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x10, DEF_STR( On ) )
PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x20, DEF_STR( On ) )
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
PORT_START("PL1_1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_I )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_M )
PORT_START("PL1_2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_J )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_N )
PORT_START("PL1_3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_K )
PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("PL1_4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_L )
PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("PL2_1")
PORT_DIPNAME( 0x01, 0x01, "DSWA" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_START("PL2_2")
PORT_DIPNAME( 0x01, 0x01, "DSWA" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("PL2_3")
PORT_DIPNAME( 0x01, 0x01, "DSWA" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("PL2_4")
PORT_DIPNAME( 0x01, 0x01, "DSWA" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
static const gfx_layout charlayout_1bpp =
{
8,8,
RGN_FRAC(1,1),
1,
{ RGN_FRAC(0,1) },
{ STEP8(0,1) },
{ STEP8(0,8) },
8*8
};
static const gfx_layout charlayout_2bpp =
{
8,8,
RGN_FRAC(1,2),
2,
{ RGN_FRAC(0,2),RGN_FRAC(1,2) },
{ STEP8(0,1) },
{ STEP8(0,8) },
8*8
};
static GFXDECODE_START( ron )
GFXDECODE_ENTRY( "gfx1", 0, charlayout_1bpp, 0, 1 )
GFXDECODE_ENTRY( "gfx2", 0, charlayout_2bpp, 4, 1 )
GFXDECODE_END
void ron_state::machine_start()
{
}
void ron_state::machine_reset()
{
}
PALETTE_INIT_MEMBER(ron_state, ron)
{
// TODO: proms?
palette.set_pen_color(0, rgb_t(pal1bit(0), pal1bit(0), pal1bit(0)));
palette.set_pen_color(1, rgb_t(pal1bit(1), pal1bit(1), pal1bit(1)));
palette.set_pen_color(2, rgb_t(pal1bit(0), pal1bit(0), pal1bit(0)));
palette.set_pen_color(3, rgb_t(pal1bit(0), pal1bit(0), pal1bit(0)));
palette.set_pen_color(4, rgb_t(pal1bit(0), pal1bit(0), pal1bit(0)));
palette.set_pen_color(5, rgb_t(pal1bit(1), pal1bit(1), pal1bit(0)));
palette.set_pen_color(6, rgb_t(pal1bit(0), pal1bit(0), pal1bit(1)));
palette.set_pen_color(7, rgb_t(pal1bit(1), pal1bit(1), pal1bit(1)));
}
INTERRUPT_GEN_MEMBER( ron_state::vblank_irq )
{
if (m_nmi_enable)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
static MACHINE_CONFIG_START( ron )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,MAIN_CLOCK)
MCFG_CPU_PROGRAM_MAP(ron_map)
MCFG_CPU_IO_MAP(ron_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ron_state, vblank_irq)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_UPDATE_DRIVER(ron_state, screen_update)
MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 442, 0, 256, 263, 0, 240)
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ron)
MCFG_PALETTE_ADD("palette", 8)
MCFG_PALETTE_INIT_OWNER(ron_state, ron)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/***************************************************************************
Machine driver(s)
***************************************************************************/
ROM_START( ron2 )
ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
ROM_LOAD( "r0__1.9h", 0x000000, 0x001000, CRC(82a55ad4) SHA1(96ff9da1d2c57bc916f3341416ed4eb4144a16eb) )
ROM_LOAD( "r0__2.9k", 0x001000, 0x001000, CRC(6b654f8b) SHA1(145e7ea8c65c72b3858d22d3ce4c1a75672c9ed4) )
ROM_LOAD( "r0__3.9l", 0x002000, 0x001000, CRC(6a8c1ef0) SHA1(9300a54102ca096fbf3d5056ede782fba0f5f970) )
ROM_LOAD( "r0__4.9n", 0x003000, 0x001000, CRC(86340522) SHA1(0175dda90e9e4798e9f2ab7a0ab97aa397ca18b8) )
ROM_LOAD( "r0__5.8h", 0x004000, 0x001000, CRC(3a28ad40) SHA1(872ced2d7515850cd86b84c81b14f200093746ad) )
ROM_REGION( 0x0800, "gfx1", ROMREGION_ERASE00 )
ROM_LOAD( "r0__b.4k", 0x0000, 0x0800, CRC(8a61cdde) SHA1(0a38573ed644f1ed897443187f5cb61a6eb499b2) )
ROM_REGION( 0x1000, "gfx2", ROMREGION_ERASE00 )
ROM_LOAD( "r0_a1.4n", 0x0000, 0x0800, CRC(2d6276f4) SHA1(432b7fe0a1f1e9fdc9e276bcf27f74a5aec6c940) )
ROM_LOAD( "r0_a2.4l", 0x0800, 0x0800, CRC(2fe4a54f) SHA1(bb1d109851677ede58f875eff2588f60f979864e) )
ROM_REGION( 0x10000, "mcu", ROMREGION_ERASE00 )
ROM_LOAD( "r0_mu.4a", 0x0000, 0x000800, CRC(3491d8d5) SHA1(0aa0581350f4b3b81f3fa1f7c55a9bfb1f2c5f3b) )
ROM_LOAD( "r0_v0.4c", 0x0800, 0x000800, CRC(4160eb7f) SHA1(1756937378cbabb2229129b794d8c5d955252ed4) )
ROM_REGION( 0x500, "proms", ROMREGION_ERASE00 )
ROM_LOAD( "82s123_1.6b", 0x000000, 0x000020, CRC(bd9bb647) SHA1(aad83eb295107cdc7ee96d78e81b0621ac351398) )
ROM_LOAD( "82s123_2.6c", 0x000100, 0x000020, CRC(439109d6) SHA1(f0d79048bb27a63c641296b3b1b81f513df9b33d) )
ROM_LOAD( "82s129_3.2n", 0x000200, 0x000100, CRC(018ab2a0) SHA1(039c574d8fd3c1a8e9eca6a7c79fe92e8496b157) )
ROM_LOAD( "82s129_4.2m", 0x000300, 0x000100, CRC(f3c05d59) SHA1(bd48963aa9f2bedaa0c1fd031d7c93089161d1d9) )
ROM_LOAD( "82s123_5.1n", 0x000400, 0x000020, CRC(869784fa) SHA1(4bd0f26961d0bb54edb5eab5708d34468721d4c4) )
ROM_END
GAME( 1981, ron2, 0, ron, ron, ron_state, 0, ROT270, "Sanritsu", "Ron II Mah-Jongg", MACHINE_NOT_WORKING | MACHINE_WRONG_COLORS | MACHINE_NO_SOUND )

View File

@ -32152,6 +32152,9 @@ rollace2 // (c) 1983 Williams
@source:rotaryf.cpp
rotaryf //
@source:ron.cpp
ron2 // (c) 1981 Sanritsu
@source:roul.cpp
roul // (c) 1990