From f18251f57cbd92385b184417cdd9e0ed040f1229 Mon Sep 17 00:00:00 2001 From: hap Date: Tue, 13 Dec 2022 14:27:01 +0100 Subject: tmnt: remove useless define --- src/mame/konami/parodius.cpp | 4 ++-- src/mame/konami/thunderx.cpp | 14 ++++++++------ src/mame/konami/tmnt.cpp | 45 +++++++++++++++++--------------------------- src/mame/konami/vendetta.cpp | 1 - src/mame/konami/wecleman.cpp | 26 ++++++++++++------------- src/mame/namco/namcos22.cpp | 16 ++++++++-------- 6 files changed, 48 insertions(+), 58 deletions(-) diff --git a/src/mame/konami/parodius.cpp b/src/mame/konami/parodius.cpp index 6e7ce17e649..a6c1e3a6839 100644 --- a/src/mame/konami/parodius.cpp +++ b/src/mame/konami/parodius.cpp @@ -234,7 +234,7 @@ void parodius_state::main_map(address_map &map) map(0x3fc4, 0x3fc4).w(FUNC(parodius_state::videobank_w)); map(0x3fc8, 0x3fc8).w(FUNC(parodius_state::sh_irqtrigger_w)); map(0x3fcc, 0x3fcd).rw("k053260", FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)); - map(0x6000, 0x9fff).bankr(m_mainbank); // banked ROM + map(0x6000, 0x9fff).bankr(m_mainbank); map(0xa000, 0xffff).rom().region("maincpu", 0x3a000); } @@ -261,7 +261,7 @@ void parodius_state::sound_map(address_map &map) static INPUT_PORTS_START( parodius ) PORT_START("P1") - KONAMI8_ALT_B123(1) // button1 = power-up, button2 = shoot, button3 = missile + KONAMI8_ALT_B123(1) // button1 = power-up, button2 = shoot, button3 = missile PORT_START("P2") KONAMI8_ALT_B123(2) diff --git a/src/mame/konami/thunderx.cpp b/src/mame/konami/thunderx.cpp index bf76935b010..3eb6dd81eec 100644 --- a/src/mame/konami/thunderx.cpp +++ b/src/mame/konami/thunderx.cpp @@ -179,7 +179,8 @@ void thunderx_state::run_collisions( int s0, int e0, int s1, int e1, int cm, int int l0, r0, b0, t0; // check valid - if (!(p0[0] & cm)) continue; + if (!(p0[0] & cm)) + continue; // get area l0 = p0[3] - p0[1]; @@ -193,7 +194,8 @@ void thunderx_state::run_collisions( int s0, int e0, int s1, int e1, int cm, int int l1,r1,b1,t1; // check valid - if (!(p1[0] & hm)) continue; + if (!(p1[0] & hm)) + continue; // get area l1 = p1[3] - p1[1]; @@ -202,10 +204,10 @@ void thunderx_state::run_collisions( int s0, int e0, int s1, int e1, int cm, int b1 = p1[4] + p1[2]; // overlap check - if (l1 >= r0) continue; - if (l0 >= r1) continue; - if (t1 >= b0) continue; - if (t0 >= b1) continue; + if (l1 >= r0) continue; + if (l0 >= r1) continue; + if (t1 >= b0) continue; + if (t0 >= b1) continue; // set flags p0[0] = (p0[0] & 0x9f) | (p1[0] & 0x04) | 0x10; diff --git a/src/mame/konami/tmnt.cpp b/src/mame/konami/tmnt.cpp index 3760477cd44..92bf180f813 100644 --- a/src/mame/konami/tmnt.cpp +++ b/src/mame/konami/tmnt.cpp @@ -4395,42 +4395,31 @@ void tmnt_state::init_tmnt() for (int A = 0; A < len; A++) { -#define CA0 0 -#define CA1 1 -#define CA2 2 -#define CA3 3 -#define CA4 4 -#define CA5 5 -#define CA6 6 -#define CA7 7 -#define CA8 8 -#define CA9 9 - - /* following table derived from the schematics. It indicates, for each of the */ - /* 9 low bits of the sprite line address, which bit to pick it from. */ - /* For example, when the PROM contains 4, which applies to 4x2 sprites, */ - /* bit OA1 comes from CA5, OA2 from CA0, and so on. */ + // following table derived from the schematics. It indicates, for each of the + // 9 low bits of the sprite line address, which bit to pick it from. + // For example, when the PROM contains 4, which applies to 4x2 sprites, + // bit OA1 comes from CA5, OA2 from CA0, and so on. static const uint8_t bit_pick_table[10][8] = { - /*0(1x1) 1(2x1) 2(1x2) 3(2x2) 4(4x2) 5(2x4) 6(4x4) 7(8x8) */ - { CA3, CA3, CA3, CA3, CA3, CA3, CA3, CA3 }, /* CA3 */ - { CA0, CA0, CA5, CA5, CA5, CA5, CA5, CA5 }, /* OA1 */ - { CA1, CA1, CA0, CA0, CA0, CA7, CA7, CA7 }, /* OA2 */ - { CA2, CA2, CA1, CA1, CA1, CA0, CA0, CA9 }, /* OA3 */ - { CA4, CA4, CA2, CA2, CA2, CA1, CA1, CA0 }, /* OA4 */ - { CA5, CA6, CA4, CA4, CA4, CA2, CA2, CA1 }, /* OA5 */ - { CA6, CA5, CA6, CA6, CA6, CA4, CA4, CA2 }, /* OA6 */ - { CA7, CA7, CA7, CA7, CA8, CA6, CA6, CA4 }, /* OA7 */ - { CA8, CA8, CA8, CA8, CA7, CA8, CA8, CA6 }, /* OA8 */ - { CA9, CA9, CA9, CA9, CA9, CA9, CA9, CA8 } /* OA9 */ + //0(1x1) 1(2x1) 2(1x2) 3(2x2) 4(4x2) 5(2x4) 6(4x4) 7(8x8) + { 3, 3, 3, 3, 3, 3, 3, 3 }, // CA3 + { 0, 0, 5, 5, 5, 5, 5, 5 }, // OA1 + { 1, 1, 0, 0, 0, 7, 7, 7 }, // OA2 + { 2, 2, 1, 1, 1, 0, 0, 9 }, // OA3 + { 4, 4, 2, 2, 2, 1, 1, 0 }, // OA4 + { 5, 6, 4, 4, 4, 2, 2, 1 }, // OA5 + { 6, 5, 6, 6, 6, 4, 4, 2 }, // OA6 + { 7, 7, 7, 7, 8, 6, 6, 4 }, // OA7 + { 8, 8, 8, 8, 7, 8, 8, 6 }, // OA8 + { 9, 9, 9, 9, 9, 9, 9, 8 } // OA9 }; - /* pick the correct entry in the PROM (top 8 bits of the address) */ + // pick the correct entry in the PROM (top 8 bits of the address) int entry = code_conv_table[(A & 0x7f800) >> 11] & 7; int bits[32]; - /* the bits to scramble are the low 10 ones */ + // the bits to scramble are the low 10 ones for (int i = 0; i < 10; i++) bits[i] = (A >> i) & 0x01; diff --git a/src/mame/konami/vendetta.cpp b/src/mame/konami/vendetta.cpp index 4f0a5201c3e..0b13e7f9a77 100644 --- a/src/mame/konami/vendetta.cpp +++ b/src/mame/konami/vendetta.cpp @@ -1070,7 +1070,6 @@ ROM_END ***************************************************************************/ - GAME( 1991, vendetta, 0, vendetta, vendet4p, vendetta_state, empty_init, ROT0, "Konami", "Vendetta (World, 4 Players, ver. T)", MACHINE_SUPPORTS_SAVE ) GAME( 1991, vendettar, vendetta, vendetta, vendet4p, vendetta_state, empty_init, ROT0, "Konami", "Vendetta (US, 4 Players, ver. R)", MACHINE_SUPPORTS_SAVE ) GAME( 1991, vendettaz, vendetta, vendetta, vendet4p, vendetta_state, empty_init, ROT0, "Konami", "Vendetta (Asia, 4 Players, ver. Z)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/konami/wecleman.cpp b/src/mame/konami/wecleman.cpp index 3bf8802e06a..20f84c9e0ee 100644 --- a/src/mame/konami/wecleman.cpp +++ b/src/mame/konami/wecleman.cpp @@ -941,15 +941,15 @@ static const gfx_layout wecleman_bg_layout = static const uint32_t wecleman_road_layout_xoffset[64] = { - 0,7,6,5,4,3,2,1, - 8,15,14,13,12,11,10,9, - 16,23,22,21,20,19,18,17, - 24,31,30,29,28,27,26,25, - - 0+32,7+32,6+32,5+32,4+32,3+32,2+32,1+32, - 8+32,15+32,14+32,13+32,12+32,11+32,10+32,9+32, - 16+32,23+32,22+32,21+32,20+32,19+32,18+32,17+32, - 24+32,31+32,30+32,29+32,28+32,27+32,26+32,25+32 + 0,7,6,5,4,3,2,1, + 8,15,14,13,12,11,10,9, + 16,23,22,21,20,19,18,17, + 24,31,30,29,28,27,26,25, + + 0+32,7+32,6+32,5+32,4+32,3+32,2+32,1+32, + 8+32,15+32,14+32,13+32,12+32,11+32,10+32,9+32, + 16+32,23+32,22+32,21+32,20+32,19+32,18+32,17+32, + 24+32,31+32,30+32,29+32,28+32,27+32,26+32,25+32 }; /* We draw the road, made of 512 pixel lines, using 64x1 tiles */ @@ -979,10 +979,10 @@ GFXDECODE_END static const uint32_t hotchase_road_layout_xoffset[64] = { - 0*4,0*4,1*4,1*4,2*4,2*4,3*4,3*4,4*4,4*4,5*4,5*4,6*4,6*4,7*4,7*4, - 8*4,8*4,9*4,9*4,10*4,10*4,11*4,11*4,12*4,12*4,13*4,13*4,14*4,14*4,15*4,15*4, - 16*4,16*4,17*4,17*4,18*4,18*4,19*4,19*4,20*4,20*4,21*4,21*4,22*4,22*4,23*4,23*4, - 24*4,24*4,25*4,25*4,26*4,26*4,27*4,27*4,28*4,28*4,29*4,29*4,30*4,30*4,31*4,31*4 + 0*4,0*4,1*4,1*4,2*4,2*4,3*4,3*4,4*4,4*4,5*4,5*4,6*4,6*4,7*4,7*4, + 8*4,8*4,9*4,9*4,10*4,10*4,11*4,11*4,12*4,12*4,13*4,13*4,14*4,14*4,15*4,15*4, + 16*4,16*4,17*4,17*4,18*4,18*4,19*4,19*4,20*4,20*4,21*4,21*4,22*4,22*4,23*4,23*4, + 24*4,24*4,25*4,25*4,26*4,26*4,27*4,27*4,28*4,28*4,29*4,29*4,30*4,30*4,31*4,31*4 }; /* We draw the road, made of 512 pixel lines, using 64x1 tiles */ diff --git a/src/mame/namco/namcos22.cpp b/src/mame/namco/namcos22.cpp index 1f97137191b..6dccba2710e 100644 --- a/src/mame/namco/namcos22.cpp +++ b/src/mame/namco/namcos22.cpp @@ -5278,10 +5278,10 @@ ROM_END ROM_START( alpinr2b ) ROM_REGION( 0x800000, "maincpu", 0 ) /* main program */ - ROM_LOAD32_BYTE( "ars2ver-b.2", 0x000003, 0x200000, CRC(ed977f83) SHA1(26c57cdfc15f799a999ee22f141e1c0cabfc91dc) ) - ROM_LOAD32_BYTE( "ars2ver-b.3", 0x000001, 0x200000, CRC(8e7a9983) SHA1(34c82e5f080efe04d6b77a77a8391cb48b69c1af) ) - ROM_LOAD32_BYTE( "ars2ver-b.4", 0x000002, 0x200000, CRC(610e49c2) SHA1(433c6d2216551bac31584306f748af1c912c3b07) ) - ROM_LOAD32_BYTE( "ars2ver-b.5", 0x000000, 0x200000, CRC(7f3517b0) SHA1(3e6ba1a51bf235f40f933aae1f00638b88bba522) ) + ROM_LOAD32_BYTE( "ars2ver-b.2", 0x000003, 0x200000, CRC(ed977f83) SHA1(26c57cdfc15f799a999ee22f141e1c0cabfc91dc) ) // 2nd half empty + ROM_LOAD32_BYTE( "ars2ver-b.3", 0x000001, 0x200000, CRC(8e7a9983) SHA1(34c82e5f080efe04d6b77a77a8391cb48b69c1af) ) // " + ROM_LOAD32_BYTE( "ars2ver-b.4", 0x000002, 0x200000, CRC(610e49c2) SHA1(433c6d2216551bac31584306f748af1c912c3b07) ) // " + ROM_LOAD32_BYTE( "ars2ver-b.5", 0x000000, 0x200000, CRC(7f3517b0) SHA1(3e6ba1a51bf235f40f933aae1f00638b88bba522) ) // " ROM_REGION( 0x10000*2, "master", 0 ) /* Master DSP */ ROM_LOAD16_WORD( "c71.bin", 0,0x1000*2, CRC(47c623ab) SHA1(e363ac50f5556f83308d4cc191b455e9b62bcfc8) ) @@ -5331,10 +5331,10 @@ ROM_END ROM_START( alpinr2a ) ROM_REGION( 0x800000, "maincpu", 0 ) /* main program */ - ROM_LOAD32_BYTE( "ars2ver-a.2", 0x000003, 0x200000, CRC(b07b15a4) SHA1(ea3b2d7b4ef4ccf3aafeef7e7eac92e8d446f4e7) ) - ROM_LOAD32_BYTE( "ars2ver-a.3", 0x000002, 0x200000, CRC(90a92e40) SHA1(bf8083256e56e7e33e61b4cdaf9fd03dabfb36ba) ) - ROM_LOAD32_BYTE( "ars2ver-a.4", 0x000001, 0x200000, CRC(9e9d771d) SHA1(6fb983e3f4f8233544667b1bbf87864e4fb8698c) ) - ROM_LOAD32_BYTE( "ars2ver-a.5", 0x000000, 0x200000, CRC(e93c7771) SHA1(305f35488a55be1b845702df972bba8334c0726c) ) + ROM_LOAD32_BYTE( "ars2ver-a.2", 0x000003, 0x200000, CRC(b07b15a4) SHA1(ea3b2d7b4ef4ccf3aafeef7e7eac92e8d446f4e7) ) // 2nd half empty + ROM_LOAD32_BYTE( "ars2ver-a.3", 0x000002, 0x200000, CRC(90a92e40) SHA1(bf8083256e56e7e33e61b4cdaf9fd03dabfb36ba) ) // " + ROM_LOAD32_BYTE( "ars2ver-a.4", 0x000001, 0x200000, CRC(9e9d771d) SHA1(6fb983e3f4f8233544667b1bbf87864e4fb8698c) ) // " + ROM_LOAD32_BYTE( "ars2ver-a.5", 0x000000, 0x200000, CRC(e93c7771) SHA1(305f35488a55be1b845702df972bba8334c0726c) ) // " ROM_REGION( 0x10000*2, "master", 0 ) /* Master DSP */ ROM_LOAD16_WORD( "c71.bin", 0,0x1000*2, CRC(47c623ab) SHA1(e363ac50f5556f83308d4cc191b455e9b62bcfc8) ) -- cgit v1.2.3