From 34d6c77a2dbea2fa9886b623d4d93f5f7e313526 Mon Sep 17 00:00:00 2001 From: hap Date: Mon, 12 Jun 2023 13:43:26 +0200 Subject: tigeroad: remove tilerom tag lookup, midas: remove neogeo.h dependency --- src/emu/xtal.cpp | 1 + src/mame/capcom/sidearms.cpp | 17 +++++++++--- src/mame/capcom/tigeroad.cpp | 56 +++++++++++++++++++++------------------- src/mame/capcom/tigeroad.h | 3 ++- src/mame/capcom/tigeroad_spr.cpp | 2 +- src/mame/capcom/tigeroad_v.cpp | 10 +++---- src/mame/neogeo/midas.cpp | 15 ++++++----- src/mame/neogeo/neogeo.cpp | 5 ++-- src/mame/neogeo/neogeo.h | 6 +++++ src/mame/neogeo/neogeo_spr.h | 5 ---- 10 files changed, 69 insertions(+), 51 deletions(-) diff --git a/src/emu/xtal.cpp b/src/emu/xtal.cpp index 2f7f9e30eb5..872f113b023 100644 --- a/src/emu/xtal.cpp +++ b/src/emu/xtal.cpp @@ -347,6 +347,7 @@ const double XTAL::known_xtals[] = { 23'961'600, /* 23.9616_MHz_XTAL Osborne 4 (Vixen) */ 24'000'000, /* 24_MHz_XTAL Mario, 80's Data East games, 80's Konami games */ 24'073'400, /* 24.0734_MHz_XTAL DEC Rainbow 100 */ + 24'167'829, /* 24.167829MHz_XTAL Neo Geo AES rev. 3-3 and later */ 24'270'000, /* 24.27_MHz_XTAL CIT-101XL */ 24'300'000, /* 24.3_MHz_XTAL ADM 36 132-column display clock */ 24'576'000, /* 24.576_MHz_XTAL Pole Position h/w, Model 3 CPU board */ diff --git a/src/mame/capcom/sidearms.cpp b/src/mame/capcom/sidearms.cpp index 42ef833e881..ce5ec91dda1 100644 --- a/src/mame/capcom/sidearms.cpp +++ b/src/mame/capcom/sidearms.cpp @@ -13,9 +13,18 @@ Change Log: MAY-2015 System11 - added turtshipko and turtshipkn. -- amended comments for T-5 instances, A14 is tied high on the PCBs hence the need to load the higher half of the ROM only -- order of age is guessed - turtshipko has grey bullets and a different level order, 3x horizontal and then 3x vertical (as far as tested). Bullets probably fixed based on feedback before it was licensed to Sharp Image and Pacific Games - differences between US/JP/Korea versions previously in MAME are minimal. -- turtshipkn I assume is newer, the disclaimer is in pure Korean and the orange bullets are retained. Given the 88/9 release date from the startup screen it would seem unlikely that this came out first, then got grey bullets and back to orange in time for it to still be a 1988 game in other countries. +- amended comments for T-5 instances, A14 is tied high on the PCBs hence + the need to load the higher half of the ROM only +- order of age is guessed - turtshipko has grey bullets and a different + level order, 3x horizontal and then 3x vertical (as far as tested). + Bullets probably fixed based on feedback before it was licensed to Sharp + Image and Pacific Games - differences between US/JP/Korea versions + previously in MAME are minimal. +- turtshipkn I assume is newer, the disclaimer is in pure Korean and the + orange bullets are retained. Given the 88/9 release date from the + startup screen it would seem unlikely that this came out first, then + got grey bullets and back to orange in time for it to still be a 1988 + game in other countries. JUL-2003 AAT @@ -1370,7 +1379,7 @@ GAME( 1988, turtship, 0, turtship, turtship, sidearms_state, init_turts GAME( 1988, turtshipj, turtship, turtship, turtship, sidearms_state, init_turtship, ROT0, "Philko (Pacific Games license)", "Turtle Ship (Japan)", MACHINE_SUPPORTS_SAVE ) GAME( 1988, turtshipk, turtship, turtship, turtship, sidearms_state, init_turtship, ROT0, "Philko", "Turtle Ship (Korea)", MACHINE_SUPPORTS_SAVE ) GAME( 1988, turtshipko, turtship, turtship, turtship, sidearms_state, init_turtship, ROT0, "Philko", "Turtle Ship (Korea, older)", MACHINE_SUPPORTS_SAVE ) -GAME( 1988, turtshipkn, turtship, turtship, turtship, sidearms_state, init_turtship, ROT0, "Philko", "Turtle Ship (Korea, 88/9)", MACHINE_SUPPORTS_SAVE ) +GAME( 1988, turtshipkn, turtship, turtship, turtship, sidearms_state, init_turtship, ROT0, "Philko", "Turtle Ship (Korea, 88/9)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, dyger, 0, turtship, dyger, sidearms_state, init_dyger, ROT270, "Philko", "Dyger (Korea set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, dygera, dyger, turtship, dyger, sidearms_state, init_dyger, ROT270, "Philko", "Dyger (Korea set 2)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/capcom/tigeroad.cpp b/src/mame/capcom/tigeroad.cpp index 7c64949ae0d..17498f612b9 100644 --- a/src/mame/capcom/tigeroad.cpp +++ b/src/mame/capcom/tigeroad.cpp @@ -20,6 +20,9 @@ TODO: 010C70: 4E90 jsr (A0) ; throws address error here None of the available 5 vectors seems to fit here, btanb? +BTANB: +- race track fg tiles have priority over minimap in f1dream + ************************************************************************** Memory Overview: @@ -809,8 +812,8 @@ ROM_START( tigeroad ) // N86614A-5 + N86614B-6 board combo - ECT program roms ROM_LOAD32_BYTE( "tr-11a.3d", 0x00001, 0x20000, CRC(cd9152e5) SHA1(6df3c43c0c41289890296c2b2aeca915dfdae3b0) ) ROM_LOAD32_BYTE( "tr-12a.2d", 0x00000, 0x20000, CRC(7d8a99d0) SHA1(af8221cfd2ce9aa3bf296981fb7fddd1e9ef4599) ) - ROM_REGION( 0x08000, "bgmap", 0 ) - ROM_LOAD( "tr_13.7l", 0x0000, 0x8000, CRC(a79be1eb) SHA1(4191ccd48f7650930f9a4c2be0790239d7420bb1) ) + ROM_REGION16_LE( 0x08000, "bgmap", 0 ) + ROM_LOAD16_WORD( "tr_13.7l", 0x0000, 0x8000, CRC(a79be1eb) SHA1(4191ccd48f7650930f9a4c2be0790239d7420bb1) ) ROM_REGION( 0x0100, "proms", 0 ) ROM_LOAD( "tr.9e", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used) - N82S129A or compatible @@ -847,8 +850,8 @@ ROM_START( tigeroadu ) // N86614A-5 + N86614B-6 board combo - US ROMSTAR program ROM_LOAD32_BYTE( "tr-11a.3d", 0x00001, 0x20000, CRC(cd9152e5) SHA1(6df3c43c0c41289890296c2b2aeca915dfdae3b0) ) ROM_LOAD32_BYTE( "tr-12a.2d", 0x00000, 0x20000, CRC(7d8a99d0) SHA1(af8221cfd2ce9aa3bf296981fb7fddd1e9ef4599) ) - ROM_REGION( 0x08000, "bgmap", 0 ) - ROM_LOAD( "tr_13.7l", 0x0000, 0x8000, CRC(a79be1eb) SHA1(4191ccd48f7650930f9a4c2be0790239d7420bb1) ) + ROM_REGION16_LE( 0x08000, "bgmap", 0 ) + ROM_LOAD16_WORD( "tr_13.7l", 0x0000, 0x8000, CRC(a79be1eb) SHA1(4191ccd48f7650930f9a4c2be0790239d7420bb1) ) ROM_REGION( 0x0100, "proms", 0 ) ROM_LOAD( "tr.9e", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used) - N82S129A or compatible @@ -886,8 +889,8 @@ ROM_START( toramich ) // N86614A-5 + N86614B-6 board combo ROM_LOAD32_BYTE( "tr-11a.3d", 0x00001, 0x20000, CRC(cd9152e5) SHA1(6df3c43c0c41289890296c2b2aeca915dfdae3b0) ) ROM_LOAD32_BYTE( "tr-12a.2d", 0x00000, 0x20000, CRC(7d8a99d0) SHA1(af8221cfd2ce9aa3bf296981fb7fddd1e9ef4599) ) - ROM_REGION( 0x08000, "bgmap", 0 ) - ROM_LOAD( "tr_13.7l", 0x0000, 0x8000, CRC(a79be1eb) SHA1(4191ccd48f7650930f9a4c2be0790239d7420bb1) ) + ROM_REGION16_LE( 0x08000, "bgmap", 0 ) + ROM_LOAD16_WORD( "tr_13.7l", 0x0000, 0x8000, CRC(a79be1eb) SHA1(4191ccd48f7650930f9a4c2be0790239d7420bb1) ) ROM_REGION( 0x0100, "proms", 0 ) ROM_LOAD( "tr.9e", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used) - N82S129A or compatible @@ -1025,8 +1028,8 @@ ROM_START( tigeroadb ) ROM_LOAD32_BYTE( "gfx.ic2", 0x40002, 0x10000, CRC(a0b4615c) SHA1(f9df393c1f4a7b88fbc4c870da1819f36f29e111) ) ROM_LOAD32_BYTE( "gfx.ic3", 0x40003, 0x10000, CRC(f956392e) SHA1(e0da0c353067e32fc6015e84b00070a7c7fa1de9) ) - ROM_REGION( 0x08000, "bgmap", 0 ) - ROM_LOAD( "gfx.ic175", 0x0000, 0x8000, CRC(a79be1eb) SHA1(4191ccd48f7650930f9a4c2be0790239d7420bb1) ) + ROM_REGION16_LE( 0x08000, "bgmap", 0 ) + ROM_LOAD16_WORD( "gfx.ic175", 0x0000, 0x8000, CRC(a79be1eb) SHA1(4191ccd48f7650930f9a4c2be0790239d7420bb1) ) ROM_REGION( 0x0100, "proms", 0 ) ROM_LOAD( "82s129.ic74", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used) @@ -1060,8 +1063,8 @@ ROM_START( f1dream ) // N86614A-5 + N86614B-6 board combo ROM_LOAD32_BYTE( "f1_08.3d", 0x00001, 0x10000, CRC(811f2e22) SHA1(cca7e8cc43408c2c3067a731a98a8a6418a000aa) ) ROM_LOAD32_BYTE( "f1_07.2d", 0x00000, 0x10000, CRC(aa9a1233) SHA1(c2079ad81d67b54483ea5f69ac2edf276ad58ca9) ) - ROM_REGION( 0x08000, "bgmap", 0 ) - ROM_LOAD( "f1_15.7l", 0x0000, 0x8000, CRC(978758b7) SHA1(ebd415d70e2f1af3b1bd51f40e7d60f22369638c) ) + ROM_REGION16_LE( 0x08000, "bgmap", 0 ) + ROM_LOAD16_WORD( "f1_15.7l", 0x0000, 0x8000, CRC(978758b7) SHA1(ebd415d70e2f1af3b1bd51f40e7d60f22369638c) ) ROM_REGION( 0x0100, "proms", 0 ) ROM_LOAD( "tr.9e", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used) - N82S129A or compatible @@ -1094,8 +1097,8 @@ ROM_START( f1dreamb ) ROM_LOAD32_BYTE( "03d_08.bin", 0x00001, 0x10000, CRC(811f2e22) SHA1(cca7e8cc43408c2c3067a731a98a8a6418a000aa) ) ROM_LOAD32_BYTE( "02d_07.bin", 0x00000, 0x10000, CRC(aa9a1233) SHA1(c2079ad81d67b54483ea5f69ac2edf276ad58ca9) ) - ROM_REGION( 0x08000, "bgmap", 0 ) - ROM_LOAD( "07l_15.bin", 0x0000, 0x8000, CRC(978758b7) SHA1(ebd415d70e2f1af3b1bd51f40e7d60f22369638c) ) + ROM_REGION16_LE( 0x08000, "bgmap", 0 ) + ROM_LOAD16_WORD( "07l_15.bin", 0x0000, 0x8000, CRC(978758b7) SHA1(ebd415d70e2f1af3b1bd51f40e7d60f22369638c) ) ROM_REGION( 0x0100, "proms", 0 ) ROM_LOAD( "09e_tr.bin", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used) @@ -1128,8 +1131,8 @@ ROM_START( f1dreamba ) ROM_LOAD32_BYTE( "03d_08.bin", 0x00001, 0x10000, CRC(811f2e22) SHA1(cca7e8cc43408c2c3067a731a98a8a6418a000aa) ) ROM_LOAD32_BYTE( "02d_07.bin", 0x00000, 0x10000, CRC(aa9a1233) SHA1(c2079ad81d67b54483ea5f69ac2edf276ad58ca9) ) - ROM_REGION( 0x08000, "bgmap", 0 ) - ROM_LOAD( "07l_15.bin", 0x0000, 0x8000, CRC(978758b7) SHA1(ebd415d70e2f1af3b1bd51f40e7d60f22369638c) ) + ROM_REGION16_LE( 0x08000, "bgmap", 0 ) + ROM_LOAD16_WORD( "07l_15.bin", 0x0000, 0x8000, CRC(978758b7) SHA1(ebd415d70e2f1af3b1bd51f40e7d60f22369638c) ) ROM_REGION( 0x0100, "proms", 0 ) ROM_LOAD( "09e_tr.bin", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used) @@ -1163,8 +1166,8 @@ ROM_START( pushman ) ROM_LOAD( "7.ic132.3h", 0x00000, 0x10000, CRC(b70020bd) SHA1(218ca4a08b87b7dc5c1eed99960f4098c4fc7e0c) ) ROM_LOAD( "9.ic149.3j", 0x10000, 0x10000, CRC(cc555667) SHA1(6c79e14fc18d1d836392044779cb3219494a3447) ) - ROM_REGION( 0x10000, "bgmap", 0 ) - ROM_LOAD( "10.ic189.7l", 0x00000, 0x08000, CRC(a500132d) SHA1(26b02c9fea69b51c5f7dc1b43b838cd336ebf862) ) + ROM_REGION16_LE( 0x08000, "bgmap", 0 ) + ROM_LOAD16_WORD( "10.ic189.7l", 0x00000, 0x08000, CRC(a500132d) SHA1(26b02c9fea69b51c5f7dc1b43b838cd336ebf862) ) ROM_REGION( 0x0100, "proms", 0 ) // this is the same as tiger road / f1-dream ROM_LOAD( "n82s129an.ic82.9e", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used) @@ -1202,8 +1205,9 @@ ROM_START( pushmana ) ROM_LOAD( "pushman.007", 0x00000, 0x10000, CRC(b70020bd) SHA1(218ca4a08b87b7dc5c1eed99960f4098c4fc7e0c) ) // .132 ROM_LOAD( "pushman.009", 0x10000, 0x10000, CRC(cc555667) SHA1(6c79e14fc18d1d836392044779cb3219494a3447) ) // .149 - ROM_REGION( 0x10000, "bgmap", 0 ) - ROM_LOAD( "pushmana.189", 0x00000, 0x10000, CRC(59f25598) SHA1(ace33afd6e6d07376ed01048db99b13bcec790d7) ) + ROM_REGION16_LE( 0x08000, "bgmap", 0 ) + ROM_LOAD16_WORD( "pushmana.189", 0x00000, 0x08000, CRC(59f25598) SHA1(ace33afd6e6d07376ed01048db99b13bcec790d7) ) // 1st and 2nd half identical + ROM_IGNORE( 0x08000 ) ROM_REGION( 0x0100, "proms", 0 ) // this is the same as tiger road / f1-dream ROM_LOAD( "n82s129an.ic82", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used) @@ -1235,8 +1239,8 @@ ROM_START( pushmans ) ROM_LOAD( "pman-7.ic132", 0x00000, 0x10000, CRC(208cb197) SHA1(161633b6b0acf25447a5c0b3c6fbf18adc6e2243) ) ROM_LOAD( "pman-9.ic149", 0x10000, 0x10000, CRC(77ee8577) SHA1(63d13683dd097d8e7cb71ad3abe04e11f2a58bd3) ) - ROM_REGION( 0x10000, "bgmap", 0 ) - ROM_LOAD( "pman-10.ic189", 0x00000, 0x08000, CRC(5f9ae9a1) SHA1(87619918c28c942780f6dbd3818d4cc69932eefc) ) + ROM_REGION16_LE( 0x08000, "bgmap", 0 ) + ROM_LOAD16_WORD( "pman-10.ic189", 0x00000, 0x08000, CRC(5f9ae9a1) SHA1(87619918c28c942780f6dbd3818d4cc69932eefc) ) ROM_REGION( 0x0100, "proms", 0 ) // this is the same as tiger road / f1-dream ROM_LOAD( "n82s129an.ic82", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used) @@ -1268,8 +1272,8 @@ ROM_START( pushmant ) // Single plane PCB ROM_LOAD( "7.ic132", 0x00000, 0x10000, CRC(208cb197) SHA1(161633b6b0acf25447a5c0b3c6fbf18adc6e2243) ) ROM_LOAD( "9.ic149", 0x10000, 0x10000, CRC(77ee8577) SHA1(63d13683dd097d8e7cb71ad3abe04e11f2a58bd3) ) - ROM_REGION( 0x10000, "bgmap", 0 ) - ROM_LOAD( "10.ic189", 0x00000, 0x08000, CRC(5f9ae9a1) SHA1(87619918c28c942780f6dbd3818d4cc69932eefc) ) // Same as the Sammy set + ROM_REGION16_LE( 0x08000, "bgmap", 0 ) + ROM_LOAD16_WORD( "10.ic189", 0x00000, 0x08000, CRC(5f9ae9a1) SHA1(87619918c28c942780f6dbd3818d4cc69932eefc) ) // Same as the Sammy set ROM_REGION( 0x0100, "proms", 0 ) // this is the same as tiger road / f1-dream ROM_LOAD( "n82s129an.ic82", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used) @@ -1301,8 +1305,8 @@ ROM_START( bballs ) ROM_LOAD( "bb7.h2", 0x00000, 0x10000, CRC(a352d53b) SHA1(c71e976b7c28630d7af11fffe0d1cfd7d611ee8b) ) ROM_LOAD( "bb9.j2", 0x10000, 0x10000, CRC(78d185ac) SHA1(6ed6e1f5eeb93129eeeab6bae22b640c9782f7fc) ) - ROM_REGION( 0x10000, "bgmap", 0 ) - ROM_LOAD( "bb10.l6", 0x00000, 0x08000, CRC(d06498f9) SHA1(9f33bbc40ebe11c03aec29289f76f1c3ca5bf009) ) + ROM_REGION16_LE( 0x08000, "bgmap", 0 ) + ROM_LOAD16_WORD( "bb10.l6", 0x00000, 0x08000, CRC(d06498f9) SHA1(9f33bbc40ebe11c03aec29289f76f1c3ca5bf009) ) ROM_REGION( 0x0100, "proms", 0 ) // this is the same as tiger road / f1-dream ROM_LOAD( "bb_prom.e9", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used) N82S129 BPROM @@ -1334,8 +1338,8 @@ ROM_START( bballsa ) ROM_LOAD( "7.ic132", 0x00000, 0x10000, CRC(2289393a) SHA1(e1370925a92f7d9f96c9431cf1b8dd262c41017e) ) ROM_LOAD( "9.ic149", 0x10000, 0x10000, CRC(1fe3d172) SHA1(f7415e8633507a507ec1cd68de224722a726a473) ) - ROM_REGION( 0x10000, "bgmap", 0 ) - ROM_LOAD( "10.ic189", 0x00000, 0x08000, CRC(52e4ab27) SHA1(c9ae15f970b4bf120a4bbee9adcf0e5e4de001e7) ) + ROM_REGION16_LE( 0x08000, "bgmap", 0 ) + ROM_LOAD16_WORD( "10.ic189", 0x00000, 0x08000, CRC(52e4ab27) SHA1(c9ae15f970b4bf120a4bbee9adcf0e5e4de001e7) ) ROM_REGION( 0x0100, "proms", 0 ) // this is the same as tiger road / f1-dream ROM_LOAD( "bb_prom.e9", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used) N82S129 BPROM diff --git a/src/mame/capcom/tigeroad.h b/src/mame/capcom/tigeroad.h index 5daf1fbd6ca..7bad5353c76 100644 --- a/src/mame/capcom/tigeroad.h +++ b/src/mame/capcom/tigeroad.h @@ -28,6 +28,7 @@ public: , m_has_coinlock(true) , m_spriteram(*this, "spriteram") , m_videoram(*this, "videoram") + , m_bgmap(*this, "bgmap") , m_msm(*this, "msm") , m_gfxdecode(*this, "gfxdecode") , m_spritegen(*this, "spritegen") @@ -50,12 +51,12 @@ protected: void scroll_w(offs_t offset, u16 data, u16 mem_mask = ~0); void main_map(address_map &map); - // misc bool m_has_coinlock; private: required_device m_spriteram; required_shared_ptr m_videoram; + required_region_ptr m_bgmap; optional_device m_msm; required_device m_gfxdecode; required_device m_spritegen; diff --git a/src/mame/capcom/tigeroad_spr.cpp b/src/mame/capcom/tigeroad_spr.cpp index dab1db5c7b5..12a485d25a6 100644 --- a/src/mame/capcom/tigeroad_spr.cpp +++ b/src/mame/capcom/tigeroad_spr.cpp @@ -51,6 +51,7 @@ void tigeroad_spr_device::device_reset() { } + /* 4 words per sprite @@ -66,7 +67,6 @@ void tigeroad_spr_device::device_reset() */ - void tigeroad_spr_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, u16* ram, u32 size, bool flip_screen, bool rev_y) { const u16 *source = &ram[size/2] - 4; diff --git a/src/mame/capcom/tigeroad_v.cpp b/src/mame/capcom/tigeroad_v.cpp index fc734d13771..a9ed9feacf5 100644 --- a/src/mame/capcom/tigeroad_v.cpp +++ b/src/mame/capcom/tigeroad_v.cpp @@ -64,11 +64,9 @@ void tigeroad_state::scroll_w(offs_t offset, u16 data, u16 mem_mask) TILE_GET_INFO_MEMBER(tigeroad_state::get_bg_tile_info) { - u8 *tilerom = memregion("bgmap")->base(); - - int data = tilerom[tile_index]; - int attr = tilerom[tile_index + 1]; - int code = data + ((attr & 0xc0) << 2) + (m_bgcharbank << 10); + int data = m_bgmap[tile_index]; + int attr = data >> 8; + int code = (data & 0xff) + ((attr & 0xc0) << 2) + (m_bgcharbank << 10); int color = attr & 0x0f; int flags = (attr & 0x20) ? TILE_FLIPX : 0; @@ -90,7 +88,7 @@ TILE_GET_INFO_MEMBER(tigeroad_state::get_fg_tile_info) TILEMAP_MAPPER_MEMBER(tigeroad_state::tigeroad_tilemap_scan) { // logical (col,row) -> memory offset - return 2 * (col % 8) + 16 * ((127 - row) % 8) + 128 * (col / 8) + 2048 * ((127 - row) / 8); + return (col % 8) + 8 * ((127 - row) % 8) + 0x40 * (col / 8) + 0x400 * ((127 - row) / 8); } void tigeroad_state::video_start() diff --git a/src/mame/neogeo/midas.cpp b/src/mame/neogeo/midas.cpp index e6e622bf4a5..3b81336b33d 100644 --- a/src/mame/neogeo/midas.cpp +++ b/src/mame/neogeo/midas.cpp @@ -52,7 +52,6 @@ *************************************************************************************************************/ #include "emu.h" -#include "neogeo.h" #include "cpu/m68000/m68000.h" #include "cpu/mcs51/mcs51.h" @@ -60,7 +59,11 @@ #include "sound/ymz280b.h" #include "machine/eepromser.h" #include "machine/ticket.h" + +#include "neogeo_spr.h" + #include "emupal.h" +#include "screen.h" #include "speaker.h" @@ -630,17 +633,17 @@ void midas_state::livequiz(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &midas_state::livequiz_map); m_maincpu->set_vblank_int("screen", FUNC(midas_state::irq1_line_hold)); - pic16c56_device &pic1(PIC16C56(config, "pic1", XTAL(24'000'000) / 6)); // !! PIC12C508 !! unknown MHz + pic16c56_device &pic1(PIC16C56(config, "pic1", XTAL(24'000'000) / 6)); // !! PIC12C508 !! unknown MHz pic1.set_disable(); // Currently not hooked up - pic16c56_device &pic2(PIC16C56(config, "pic2", XTAL(24'000'000) / 6)); // !! PIC12C508 !! unknown MHz + pic16c56_device &pic2(PIC16C56(config, "pic2", XTAL(24'000'000) / 6)); // !! PIC12C508 !! unknown MHz pic2.set_disable(); // Currently not hooked up EEPROM_93C46_16BIT(config, m_eeprom); /* video hardware */ SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_raw(NEOGEO_PIXEL_CLOCK, NEOGEO_HTOTAL, NEOGEO_HBEND, NEOGEO_HBSTART, NEOGEO_VTOTAL, NEOGEO_VBEND, NEOGEO_VBSTART); + m_screen->set_raw(XTAL(24'000'000) / 4, NEOGEO_HTOTAL, NEOGEO_HBEND, NEOGEO_HBSTART, NEOGEO_VTOTAL, NEOGEO_VBEND, NEOGEO_VBSTART); m_screen->set_screen_update(FUNC(midas_state::screen_update)); m_screen->screen_vblank().set(FUNC(midas_state::screen_vblank)); @@ -684,7 +687,7 @@ void midas_state::hammer(machine_config &config) /* video hardware */ SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_raw(NEOGEO_PIXEL_CLOCK, NEOGEO_HTOTAL, NEOGEO_HBEND, NEOGEO_HBSTART, NEOGEO_VTOTAL, NEOGEO_VBEND, NEOGEO_VBSTART); + m_screen->set_raw(XTAL(24'000'000) / 4, NEOGEO_HTOTAL, NEOGEO_HBEND, NEOGEO_HBSTART, NEOGEO_VTOTAL, NEOGEO_VBEND, NEOGEO_VBSTART); m_screen->set_screen_update(FUNC(midas_state::screen_update)); m_screen->screen_vblank().set(FUNC(midas_state::screen_vblank)); @@ -820,7 +823,7 @@ void midas_state::init_livequiz() uint16_t *rom = (uint16_t *) memregion("maincpu")->base(); // PROTECTION CHECKS - rom[0x13345a/2] = 0x4e75; + rom[0x13345a/2] = 0x4e75; } /*************************************************************************************** diff --git a/src/mame/neogeo/neogeo.cpp b/src/mame/neogeo/neogeo.cpp index 925a252c1fe..f45c3f3e697 100644 --- a/src/mame/neogeo/neogeo.cpp +++ b/src/mame/neogeo/neogeo.cpp @@ -1088,13 +1088,13 @@ void neogeo_base_state::memcard_w(offs_t offset, uint16_t data, uint16_t mem_mas m_memcard->write((offs_t(m_card_bank) << 21) | offset, data); } + /************************************* * * Inter-CPU communications * *************************************/ - CUSTOM_INPUT_MEMBER(neogeo_base_state::get_audio_result) { uint8_t ret = m_soundlatch2->read(); @@ -1123,7 +1123,6 @@ uint8_t neogeo_base_state::audio_cpu_bank_select_r(offs_t offset) * *************************************/ - void neogeo_base_state::set_use_cart_vectors(int state) { m_use_cart_vectors = state; @@ -1290,6 +1289,7 @@ uint16_t neogeo_base_state::read_lorom_kof10th(offs_t offset) return rom[offset + 0x80/2]; } + /************************************* * * Machine initialization @@ -1538,6 +1538,7 @@ void neogeo_base_state::set_slot_idx(int slot) } } + /************************************* * * Machine start diff --git a/src/mame/neogeo/neogeo.h b/src/mame/neogeo/neogeo.h index a555bc9aaef..9e1e97f4184 100644 --- a/src/mame/neogeo/neogeo.h +++ b/src/mame/neogeo/neogeo.h @@ -29,6 +29,12 @@ #include "screen.h" +#define NEOGEO_MASTER_CLOCK (24000000) +#define NEOGEO_MAIN_CPU_CLOCK (NEOGEO_MASTER_CLOCK / 2) +#define NEOGEO_AUDIO_CPU_CLOCK (NEOGEO_MASTER_CLOCK / 6) +#define NEOGEO_YM2610_CLOCK (NEOGEO_MASTER_CLOCK / 3) +#define NEOGEO_PIXEL_CLOCK (NEOGEO_MASTER_CLOCK / 4) + // On scanline 224, /VBLANK goes low 56 mclks (14 pixels) from the rising edge of /HSYNC. // Two mclks after /VBLANK goes low, the hardware sets a pending IRQ1 flip-flop. #define NEOGEO_VBLANK_IRQ_HTIM (attotime::from_ticks(56+2, NEOGEO_MASTER_CLOCK)) diff --git a/src/mame/neogeo/neogeo_spr.h b/src/mame/neogeo/neogeo_spr.h index 28e85a7fa9c..613c2e84296 100644 --- a/src/mame/neogeo/neogeo_spr.h +++ b/src/mame/neogeo/neogeo_spr.h @@ -7,11 +7,6 @@ #pragma once // todo, move these back, currently the sprite code needs some of the values tho -#define NEOGEO_MASTER_CLOCK (24000000) -#define NEOGEO_MAIN_CPU_CLOCK (NEOGEO_MASTER_CLOCK / 2) -#define NEOGEO_AUDIO_CPU_CLOCK (NEOGEO_MASTER_CLOCK / 6) -#define NEOGEO_YM2610_CLOCK (NEOGEO_MASTER_CLOCK / 3) -#define NEOGEO_PIXEL_CLOCK (NEOGEO_MASTER_CLOCK / 4) #define NEOGEO_HTOTAL (0x180) #define NEOGEO_HBEND (0x01e) /* this should really be 29.5 */ #define NEOGEO_HBSTART (0x15e) /* this should really be 349.5 */ -- cgit v1.2.3