summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/cclimber.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/cclimber.cpp')
-rw-r--r--src/mame/drivers/cclimber.cpp112
1 files changed, 70 insertions, 42 deletions
diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp
index 229a04fe52c..e22b66d4414 100644
--- a/src/mame/drivers/cclimber.cpp
+++ b/src/mame/drivers/cclimber.cpp
@@ -253,35 +253,35 @@ void cclimber_state::machine_start()
save_item(NAME(m_nmi_mask));
}
-WRITE8_MEMBER(cclimber_state::swimmer_sh_soundlatch_w)
+void cclimber_state::swimmer_sh_soundlatch_w(uint8_t data)
{
m_soundlatch->write(data);
m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80
}
-WRITE8_MEMBER(cclimber_state::yamato_p0_w)
+void cclimber_state::yamato_p0_w(uint8_t data)
{
m_yamato_p0 = data;
}
-WRITE8_MEMBER(cclimber_state::yamato_p1_w)
+void cclimber_state::yamato_p1_w(uint8_t data)
{
m_yamato_p1 = data;
}
-READ8_MEMBER(cclimber_state::yamato_p0_r)
+uint8_t cclimber_state::yamato_p0_r()
{
return m_yamato_p0;
}
-READ8_MEMBER(cclimber_state::yamato_p1_r)
+uint8_t cclimber_state::yamato_p1_r()
{
return m_yamato_p1;
}
-WRITE_LINE_MEMBER(cclimber_state::toprollr_rombank_w)
+void cclimber_state::toprollr_rombank_w(int state)
{
m_toprollr_rombank = m_mainlatch->q5_r() | (m_mainlatch->q6_r() << 1);
@@ -301,13 +301,13 @@ MACHINE_RESET_MEMBER(cclimber_state,cclimber)
}
#endif
-WRITE_LINE_MEMBER(cclimber_state::nmi_mask_w)
+void cclimber_state::nmi_mask_w(int state)
{
m_nmi_mask = state;
}
-READ8_MEMBER(cclimber_state::bagmanf_a000_r)
+uint8_t cclimber_state::bagmanf_a000_r()
{
// Should this actually use the same PAL16R6 as the parent set?
return 0x3f;
@@ -317,7 +317,7 @@ READ8_MEMBER(cclimber_state::bagmanf_a000_r)
/* Note that River Patrol reads/writes to a000-a4f0. This is a bug in the code.
The instruction at 0x0593 should say LD DE,$8000 */
-void cclimber_state::cclimber_map(address_map &map)
+void cclimber_state::rpatrol_map(address_map &map)
{
map(0x0000, 0x5fff).rom();
map(0x6000, 0x6bff).ram(); /* Crazy Kong only */
@@ -336,9 +336,17 @@ void cclimber_state::cclimber_map(address_map &map)
map(0x9c00, 0x9fff).ram().w(FUNC(cclimber_state::cclimber_colorram_w)).share("colorram");
map(0xa000, 0xa007).w(m_mainlatch, FUNC(ls259_device::write_d0));
map(0xa000, 0xa000).portr("P1");
+ map(0xa800, 0xa800).portr("P2");
+ map(0xb000, 0xb000).portr("DSW");
+ map(0xb800, 0xb800).portr("SYSTEM");
+}
+
+void cclimber_state::cclimber_map(address_map &map)
+{
+ rpatrol_map(map);
+
map(0xa800, 0xa800).portr("P2").w("cclimber_audio", FUNC(cclimber_audio_device::sample_rate_w));
map(0xb000, 0xb000).portr("DSW").w("cclimber_audio", FUNC(cclimber_audio_device::sample_volume_w));
- map(0xb800, 0xb800).portr("SYSTEM");
}
void cclimber_state::decrypted_opcodes_map(address_map &map)
@@ -481,6 +489,13 @@ void cclimber_state::cclimber_portmap(address_map &map)
map(0x0c, 0x0c).r("cclimber_audio:aysnd", FUNC(ay8910_device::data_r));
}
+void cclimber_state::rpatrol_portmap(address_map &map)
+{
+ map.global_mask(0xff);
+ map(0x08, 0x09).w("aysnd", FUNC(ay8910_device::address_data_w));
+ map(0x0c, 0x0c).r("aysnd", FUNC(ay8910_device::data_r));
+}
+
void cclimber_state::yamato_portmap(address_map &map)
{
map.global_mask(0xff);
@@ -1110,13 +1125,13 @@ static GFXDECODE_START( gfx_toprollr )
GFXDECODE_ENTRY( "gfx3", 0x0000, cclimber_charlayout, 24*4, 16 )
GFXDECODE_END
-WRITE_LINE_MEMBER(cclimber_state::vblank_irq)
+void cclimber_state::vblank_irq(int state)
{
if (state && m_nmi_mask)
m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
-WRITE_LINE_MEMBER(cclimber_state::bagmanf_vblank_irq)
+void cclimber_state::bagmanf_vblank_irq(int state)
{
if (state && m_nmi_mask)
m_maincpu->set_input_line(0, HOLD_LINE);
@@ -1164,6 +1179,19 @@ void cclimber_state::cclimber(machine_config &config)
CCLIMBER_AUDIO(config, "cclimber_audio", 0);
}
+void cclimber_state::rpatrol(machine_config &config)
+{
+ root(config);
+
+ m_maincpu->set_addrmap(AS_PROGRAM, &cclimber_state::rpatrol_map);
+ m_maincpu->set_addrmap(AS_IO, &cclimber_state::rpatrol_portmap);
+
+ // sound hardware
+ SPEAKER(config, "speaker").front_center();
+
+ AY8910(config, "aysnd", XTAL(18'432'000)/3/2/2).add_route(ALL_OUTPUTS, "speaker", 0.5);
+}
+
void cclimber_state::cclimberx(machine_config &config)
{
cclimber(config);
@@ -1343,7 +1371,7 @@ ROM_START( cclimber )
ROM_LOAD( "cclimber.pr2", 0x0020, 0x0020, CRC(ab1940fa) SHA1(8d98e05cbaa6f55770c12e0a9a8ed9c73cc54423) )
ROM_LOAD( "cclimber.pr3", 0x0040, 0x0020, CRC(71317756) SHA1(1195f0a037e379cc1a3c0314cb746f5cd2bffe50) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "cc13", 0x0000, 0x1000, CRC(e0042f75) SHA1(86cb31b110742a0f7ae33052c88f42d00deb5468) )
ROM_LOAD( "cc12", 0x1000, 0x1000, CRC(5da13aaa) SHA1(b2d41e69435d09c456648a10e33f5e1fbb0bc64c) )
ROM_END
@@ -1375,7 +1403,7 @@ ROM_START( cclimbera )
ROM_LOAD( "cclimber.pr2", 0x0020, 0x0020, CRC(ab1940fa) SHA1(8d98e05cbaa6f55770c12e0a9a8ed9c73cc54423) )
ROM_LOAD( "cclimber.pr3", 0x0040, 0x0020, CRC(71317756) SHA1(1195f0a037e379cc1a3c0314cb746f5cd2bffe50) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "cc13", 0x0000, 0x1000, CRC(e0042f75) SHA1(86cb31b110742a0f7ae33052c88f42d00deb5468) )
ROM_LOAD( "cc12", 0x1000, 0x1000, CRC(5da13aaa) SHA1(b2d41e69435d09c456648a10e33f5e1fbb0bc64c) )
ROM_END
@@ -1407,7 +1435,7 @@ ROM_START( cclimberj )
ROM_LOAD( "cclimber.pr2", 0x0020, 0x0020, CRC(ab1940fa) SHA1(8d98e05cbaa6f55770c12e0a9a8ed9c73cc54423) )
ROM_LOAD( "cclimber.pr3", 0x0040, 0x0020, CRC(71317756) SHA1(1195f0a037e379cc1a3c0314cb746f5cd2bffe50) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "cc13j.bin", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "cc12j.bin", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
ROM_END
@@ -1440,7 +1468,7 @@ ROM_START( ccboot )
ROM_LOAD( "cclimber.pr3", 0x0040, 0x0020, CRC(71317756) SHA1(1195f0a037e379cc1a3c0314cb746f5cd2bffe50) )
ROM_LOAD( "ccboot.prm", 0x0060, 0x0100, CRC(9e11550d) SHA1(b8cba8e16e10e23fba1f11551102ab77b680bdf0) ) /* decryption table (not used) */
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "cc13j.bin", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "cc12j.bin", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
ROM_END
@@ -1473,7 +1501,7 @@ ROM_START( ccboot2 )
ROM_LOAD( "cclimber.pr3", 0x0040, 0x0020, CRC(71317756) SHA1(1195f0a037e379cc1a3c0314cb746f5cd2bffe50) )
ROM_LOAD( "ccboot.prm", 0x0060, 0x0100, CRC(9e11550d) SHA1(b8cba8e16e10e23fba1f11551102ab77b680bdf0) ) /* decryption table (not used) */
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "cc13j.bin", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "cc12j.bin", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
ROM_END
@@ -1506,7 +1534,7 @@ ROM_START( ccbootmr ) /* Model Racing bootleg */
ROM_LOAD( "198-74288.c9", 0x0040, 0x0020, CRC(b4e827a5) SHA1(31a5a5ad54417a474d22bb16c473415d99a2b6f1) )
ROM_LOAD( "214-74187.cpu",0x0060, 0x0100, CRC(9e11550d) SHA1(b8cba8e16e10e23fba1f11551102ab77b680bdf0) ) /* decryption table (not used) */
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "213.r4", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "212.n4", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
ROM_END
@@ -1534,7 +1562,7 @@ ROM_START( cclimbroper )
ROM_LOAD( "cc9-2716.cpu", 0x0000, 0x0800, CRC(a546a18f) SHA1(302ba08cef61b1badc361666fd559713037a2e43) )
ROM_LOAD( "cc8-2716.cpu", 0x0800, 0x0800, CRC(0224e507) SHA1(c9b534246b6bb743294581a5e74608a295cf0734) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "cc7-2532.cpu", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "cc6-2532.cpu", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
@@ -1567,7 +1595,7 @@ ROM_START( cclimbrrod )
ROM_LOAD( "cc9.bin", 0x0000, 0x0800, CRC(6fb2afaf) SHA1(d2fe31d00af10e6bcabef51885ce52fb17d1bfbc) )
ROM_LOAD( "cc8.bin", 0x0800, 0x0800, CRC(227ee804) SHA1(0cda61a0ceeab299e7d40d33bf6dad3490928323) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "cc7.cpu", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "cc6.cpu", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
@@ -1604,7 +1632,7 @@ ROM_START( ckongpt2 )
ROM_LOAD( "prom.u6", 0x0020, 0x0020, CRC(26aada9e) SHA1(f59645e606ea4f0dd0fc4ea47dd03f526c534941) )
ROM_LOAD( "prom.t6", 0x0040, 0x0020, CRC(676b3166) SHA1(29b9434cd34d43ea5664e436e2a24b54f8d88aac) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "14.5s", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "13.5p", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
ROM_END
@@ -1633,7 +1661,7 @@ ROM_START( ckongpt2a )
ROM_LOAD( "prom.u6", 0x0020, 0x0020, CRC(26aada9e) SHA1(f59645e606ea4f0dd0fc4ea47dd03f526c534941) )
ROM_LOAD( "prom.t6", 0x0040, 0x0020, CRC(676b3166) SHA1(29b9434cd34d43ea5664e436e2a24b54f8d88aac) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "14.5s", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "13.5p", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
ROM_END
@@ -1662,7 +1690,7 @@ ROM_START( ckongpt2j )
ROM_LOAD( "prom.u6", 0x0020, 0x0020, CRC(26aada9e) SHA1(f59645e606ea4f0dd0fc4ea47dd03f526c534941) )
ROM_LOAD( "prom.t6", 0x0040, 0x0020, CRC(676b3166) SHA1(29b9434cd34d43ea5664e436e2a24b54f8d88aac) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "14.5s", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "13.5p", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
ROM_END
@@ -1691,7 +1719,7 @@ ROM_START( ckongpt2jeu )
ROM_LOAD( "prom.u6", 0x0020, 0x0020, CRC(26aada9e) SHA1(f59645e606ea4f0dd0fc4ea47dd03f526c534941) )
ROM_LOAD( "prom.t6", 0x0040, 0x0020, CRC(676b3166) SHA1(29b9434cd34d43ea5664e436e2a24b54f8d88aac) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "14.5s", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "13.5p", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
ROM_END
@@ -1721,7 +1749,7 @@ ROM_START( ckongpt2b )
ROM_LOAD( "prom.u6", 0x0020, 0x0020, CRC(26aada9e) SHA1(f59645e606ea4f0dd0fc4ea47dd03f526c534941) )
ROM_LOAD( "prom.t6", 0x0040, 0x0020, CRC(676b3166) SHA1(29b9434cd34d43ea5664e436e2a24b54f8d88aac) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "14.5s", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "13.5p", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
ROM_END
@@ -1750,7 +1778,7 @@ ROM_START( ckongpt2b2 )
ROM_LOAD( "prom.t6", 0x0020, 0x0020, CRC(26aada9e) SHA1(f59645e606ea4f0dd0fc4ea47dd03f526c534941) )
ROM_LOAD( "prom.u6", 0x0040, 0x0020, CRC(676b3166) SHA1(29b9434cd34d43ea5664e436e2a24b54f8d88aac) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "7.bin", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "6.bin", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
ROM_END
@@ -1781,7 +1809,7 @@ ROM_START( ckong )
ROM_LOAD( "ck6u.bin", 0x0020, 0x0020, CRC(ab1940fa) SHA1(8d98e05cbaa6f55770c12e0a9a8ed9c73cc54423) )
ROM_LOAD( "ck6t.bin", 0x0040, 0x0020, CRC(b4e827a5) SHA1(31a5a5ad54417a474d22bb16c473415d99a2b6f1) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "falcon13", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "falcon12", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) ) // differs from ckongalc
ROM_END
@@ -1816,7 +1844,7 @@ ROM_START( ckongo )
ROM_LOAD( "prom.u6", 0x0020, 0x0020, CRC(26aada9e) SHA1(f59645e606ea4f0dd0fc4ea47dd03f526c534941) )
ROM_LOAD( "prom.t6", 0x0040, 0x0020, CRC(676b3166) SHA1(29b9434cd34d43ea5664e436e2a24b54f8d88aac) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "cc13j.bin", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "cc12j.bin", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
ROM_END
@@ -1845,7 +1873,7 @@ ROM_START( ckongalc )
ROM_LOAD( "ck6u.bin", 0x0020, 0x0020, CRC(ab1940fa) SHA1(8d98e05cbaa6f55770c12e0a9a8ed9c73cc54423) )
ROM_LOAD( "ck6t.bin", 0x0040, 0x0020, CRC(b4e827a5) SHA1(31a5a5ad54417a474d22bb16c473415d99a2b6f1) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "cc13j.bin", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "ck12.bin", 0x1000, 0x1000, CRC(2eb23b60) SHA1(c9e7dc584562aceb374193655fbacb7df6c9c731) ) // sldh w/ckongdks
ROM_END
@@ -1874,7 +1902,7 @@ ROM_START( bigkong )
ROM_LOAD( "prom.u6", 0x0020, 0x0020, CRC(26aada9e) SHA1(f59645e606ea4f0dd0fc4ea47dd03f526c534941) )
ROM_LOAD( "prom.t6", 0x0040, 0x0020, CRC(676b3166) SHA1(29b9434cd34d43ea5664e436e2a24b54f8d88aac) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "cc13j.bin", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "cc12j.bin", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
ROM_END
@@ -1903,7 +1931,7 @@ ROM_START( monkeyd )
ROM_LOAD( "ck6u.bin", 0x0020, 0x0020, BAD_DUMP CRC(ab1940fa) SHA1(8d98e05cbaa6f55770c12e0a9a8ed9c73cc54423) )
ROM_LOAD( "ck6t.bin", 0x0040, 0x0020, BAD_DUMP CRC(b4e827a5) SHA1(31a5a5ad54417a474d22bb16c473415d99a2b6f1) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "cc13j.bin", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "ck12.bin", 0x1000, 0x1000, CRC(2eb23b60) SHA1(c9e7dc584562aceb374193655fbacb7df6c9c731) )
ROM_END
@@ -2076,7 +2104,7 @@ ROM_START( dking )
ROM_LOAD( "ck6t.bin", 0x0040, 0x0020, CRC(b4e827a5) SHA1(31a5a5ad54417a474d22bb16c473415d99a2b6f1) ) // 82s123.1t
ROM_LOAD( "82s129.5g", 0x0060, 0x0100, CRC(9e11550d) SHA1(b8cba8e16e10e23fba1f11551102ab77b680bdf0) ) // Decryption Table?
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "falcon13", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) ) // d6.1m
ROM_LOAD( "falcon12", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) ) // d5.1k
ROM_END
@@ -2108,7 +2136,7 @@ ROM_START( ckongdks )
ROM_LOAD( "ck6t.bin", 0x0040, 0x0020, CRC(b4e827a5) SHA1(31a5a5ad54417a474d22bb16c473415d99a2b6f1) ) // 82s123.1t
ROM_LOAD( "82s129.5g", 0x0060, 0x0100, CRC(9e11550d) SHA1(b8cba8e16e10e23fba1f11551102ab77b680bdf0) ) // Decryption Table?
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "ck08.bin", 0x0000, 0x1000, CRC(31c0a7de) SHA1(ace23fde4cb3c336b8377c1a1e940607d545e8c3) ) // 97.241211%
ROM_LOAD( "ck07.bin", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
ROM_END
@@ -2253,7 +2281,7 @@ ROM_START( cannonb )
ROM_LOAD( "prom.u6", 0x0020, 0x0020, CRC(26aada9e) SHA1(f59645e606ea4f0dd0fc4ea47dd03f526c534941) )
ROM_LOAD( "prom.t6", 0x0040, 0x0020, CRC(676b3166) SHA1(29b9434cd34d43ea5664e436e2a24b54f8d88aac) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "canballs.5s", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "canballs.5p", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
@@ -2292,7 +2320,7 @@ ROM_START( cannonb2 )
ROM_LOAD( "u6.bin", 0x0020, 0x0020, CRC(c0539747) SHA1(1bc70057b59b8cb11299fb6b0d84a46da6c0a025) )
ROM_LOAD( "t6.bin", 0x0040, 0x0020, CRC(b4e827a5) SHA1(31a5a5ad54417a474d22bb16c473415d99a2b6f1) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "cb6.bin", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "cb5.bin", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
ROM_END
@@ -2323,7 +2351,7 @@ ROM_START( cannonb3 )
ROM_LOAD( "b pos u6 n82s123n.bin", 0x0020, 0x0020, CRC(a758b567) SHA1(d188c90dba10fe3abaae92488786b555b35218c5) )
ROM_LOAD( "a pos t6 n82s123n.bin", 0x0040, 0x0020, CRC(676b3166) SHA1(29b9434cd34d43ea5664e436e2a24b54f8d88aac) )
- ROM_REGION( 0x2000, "samples", 0 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "ck14 pos s5 2532.bin", 0x0000, 0x1000, CRC(5f0bcdfb) SHA1(7f79bf6de117348f606696ed7ea1937bbf926612) )
ROM_LOAD( "ck13 pos r5 2532.bin", 0x1000, 0x1000, CRC(9003ffbd) SHA1(fd016056aabc23957643f37230f03842294f795e) )
ROM_END
@@ -2371,7 +2399,7 @@ ROM_START( bagmanf )
ROM_LOAD( "2732 07 pos dboard.bin", 0x0000, 0x1000, CRC(2e0057ff) SHA1(33e3ffa6418f86864eb81e5e9bda4bf540c143a6) )
ROM_LOAD( "2732 08 pos dboard.bin", 0x1000, 0x1000, CRC(b2120edd) SHA1(52b89dbcc749b084331fa82b13d0876e911fce52) )
- ROM_REGION( 0x2000, "samples", ROMREGION_ERASE00 ) /* samples */
+ ROM_REGION( 0x2000, "cclimber_audio:samples", ROMREGION_ERASE00 )
/* unpopulated */
ROM_END
@@ -2641,7 +2669,7 @@ ROM_START( toprollr )
ROM_LOAD( "1.d5", 0x0c000, 0x02000, CRC(9894374d) SHA1(173de4abbc3fb5d522aa6d6d5caf8e4d54f2a598) )
ROM_LOAD( "7.d3", 0x0e000, 0x02000, CRC(904fffb6) SHA1(5528bc2a4d2fe8672428fd4725644265f0d57ded) )
- ROM_REGION( 0x2000, "samples", 0 )
+ ROM_REGION( 0x2000, "cclimber_audio:samples", 0 )
ROM_LOAD( "12.p3", 0x0000, 0x2000, CRC(7f989dc9) SHA1(3b4d18cbb992872b3cf8f5eaf5381ed3a9468cc1) )
ROM_REGION( 0x01a0, "proms", 0 )
@@ -2740,10 +2768,10 @@ GAME( 1981, ckongpt2b2, ckongpt2, cclimber, ckongb2, cclimber_state, empty_i
// see bagman.cpp for parent
GAME( 1982, bagmanf, bagman, bagmanf, bagmanf, cclimber_state, empty_init, ROT270, "bootleg", "Le Bagnard (bootleg on Crazy Kong hardware)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, rpatrol, 0, cclimber, rpatrol, cclimber_state, init_rpatrol, ROT0, "Orca", "River Patrol (Japan)", MACHINE_SUPPORTS_SAVE)
-GAME( 1981, rpatroln, rpatrol, cclimber, rpatrol, cclimber_state, empty_init, ROT0, "Orca", "River Patrol (Japan, unprotected)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, rpatrolb, rpatrol, cclimber, rpatrol, cclimber_state, empty_init, ROT0, "bootleg", "River Patrol (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, silvland, rpatrol, cclimber, rpatrol, cclimber_state, empty_init, ROT0, "Falcon", "Silver Land", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, rpatrol, 0, rpatrol, rpatrol, cclimber_state, init_rpatrol, ROT0, "Orca", "River Patrol (Japan)", MACHINE_SUPPORTS_SAVE)
+GAME( 1981, rpatroln, rpatrol, rpatrol, rpatrol, cclimber_state, empty_init, ROT0, "Orca", "River Patrol (Japan, unprotected)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, rpatrolb, rpatrol, rpatrol, rpatrol, cclimber_state, empty_init, ROT0, "bootleg", "River Patrol (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, silvland, rpatrol, rpatrol, rpatrol, cclimber_state, empty_init, ROT0, "Falcon", "Silver Land", MACHINE_SUPPORTS_SAVE )
// see pacman.cpp for parent
GAME( 1985, cannonb, cannonbp, cannonb, cannonb, cclimber_state, init_cannonb, ROT90, "bootleg (Soft)", "Cannon Ball (bootleg on Crazy Kong hardware) (set 1, buggy)" , MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // bootleggers missed protection after bonus game