tmnt: remove useless define

This commit is contained in:
hap 2022-12-13 14:27:01 +01:00
parent 80af2d387b
commit f18251f57c
6 changed files with 47 additions and 57 deletions

View File

@ -234,7 +234,7 @@ void parodius_state::main_map(address_map &map)
map(0x3fc4, 0x3fc4).w(FUNC(parodius_state::videobank_w)); map(0x3fc4, 0x3fc4).w(FUNC(parodius_state::videobank_w));
map(0x3fc8, 0x3fc8).w(FUNC(parodius_state::sh_irqtrigger_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(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); map(0xa000, 0xffff).rom().region("maincpu", 0x3a000);
} }

View File

@ -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; int l0, r0, b0, t0;
// check valid // check valid
if (!(p0[0] & cm)) continue; if (!(p0[0] & cm))
continue;
// get area // get area
l0 = p0[3] - p0[1]; 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; int l1,r1,b1,t1;
// check valid // check valid
if (!(p1[0] & hm)) continue; if (!(p1[0] & hm))
continue;
// get area // get area
l1 = p1[3] - p1[1]; l1 = p1[3] - p1[1];

View File

@ -4395,42 +4395,31 @@ void tmnt_state::init_tmnt()
for (int A = 0; A < len; A++) for (int A = 0; A < len; A++)
{ {
#define CA0 0 // following table derived from the schematics. It indicates, for each of the
#define CA1 1 // 9 low bits of the sprite line address, which bit to pick it from.
#define CA2 2 // For example, when the PROM contains 4, which applies to 4x2 sprites,
#define CA3 3 // bit OA1 comes from CA5, OA2 from CA0, and so on.
#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. */
static const uint8_t bit_pick_table[10][8] = 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) */ //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 */ { 3, 3, 3, 3, 3, 3, 3, 3 }, // CA3
{ CA0, CA0, CA5, CA5, CA5, CA5, CA5, CA5 }, /* OA1 */ { 0, 0, 5, 5, 5, 5, 5, 5 }, // OA1
{ CA1, CA1, CA0, CA0, CA0, CA7, CA7, CA7 }, /* OA2 */ { 1, 1, 0, 0, 0, 7, 7, 7 }, // OA2
{ CA2, CA2, CA1, CA1, CA1, CA0, CA0, CA9 }, /* OA3 */ { 2, 2, 1, 1, 1, 0, 0, 9 }, // OA3
{ CA4, CA4, CA2, CA2, CA2, CA1, CA1, CA0 }, /* OA4 */ { 4, 4, 2, 2, 2, 1, 1, 0 }, // OA4
{ CA5, CA6, CA4, CA4, CA4, CA2, CA2, CA1 }, /* OA5 */ { 5, 6, 4, 4, 4, 2, 2, 1 }, // OA5
{ CA6, CA5, CA6, CA6, CA6, CA4, CA4, CA2 }, /* OA6 */ { 6, 5, 6, 6, 6, 4, 4, 2 }, // OA6
{ CA7, CA7, CA7, CA7, CA8, CA6, CA6, CA4 }, /* OA7 */ { 7, 7, 7, 7, 8, 6, 6, 4 }, // OA7
{ CA8, CA8, CA8, CA8, CA7, CA8, CA8, CA6 }, /* OA8 */ { 8, 8, 8, 8, 7, 8, 8, 6 }, // OA8
{ CA9, CA9, CA9, CA9, CA9, CA9, CA9, CA8 } /* OA9 */ { 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 entry = code_conv_table[(A & 0x7f800) >> 11] & 7;
int bits[32]; 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++) for (int i = 0; i < 10; i++)
bits[i] = (A >> i) & 0x01; bits[i] = (A >> i) & 0x01;

View File

@ -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, 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, 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 ) GAME( 1991, vendettaz, vendetta, vendetta, vendet4p, vendetta_state, empty_init, ROT0, "Konami", "Vendetta (Asia, 4 Players, ver. Z)", MACHINE_SUPPORTS_SAVE )

View File

@ -5278,10 +5278,10 @@ ROM_END
ROM_START( alpinr2b ) ROM_START( alpinr2b )
ROM_REGION( 0x800000, "maincpu", 0 ) /* main program */ ROM_REGION( 0x800000, "maincpu", 0 ) /* main program */
ROM_LOAD32_BYTE( "ars2ver-b.2", 0x000003, 0x200000, CRC(ed977f83) SHA1(26c57cdfc15f799a999ee22f141e1c0cabfc91dc) ) 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.3", 0x000001, 0x200000, CRC(8e7a9983) SHA1(34c82e5f080efe04d6b77a77a8391cb48b69c1af) ) // "
ROM_LOAD32_BYTE( "ars2ver-b.4", 0x000002, 0x200000, CRC(610e49c2) SHA1(433c6d2216551bac31584306f748af1c912c3b07) ) 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.5", 0x000000, 0x200000, CRC(7f3517b0) SHA1(3e6ba1a51bf235f40f933aae1f00638b88bba522) ) // "
ROM_REGION( 0x10000*2, "master", 0 ) /* Master DSP */ ROM_REGION( 0x10000*2, "master", 0 ) /* Master DSP */
ROM_LOAD16_WORD( "c71.bin", 0,0x1000*2, CRC(47c623ab) SHA1(e363ac50f5556f83308d4cc191b455e9b62bcfc8) ) ROM_LOAD16_WORD( "c71.bin", 0,0x1000*2, CRC(47c623ab) SHA1(e363ac50f5556f83308d4cc191b455e9b62bcfc8) )
@ -5331,10 +5331,10 @@ ROM_END
ROM_START( alpinr2a ) ROM_START( alpinr2a )
ROM_REGION( 0x800000, "maincpu", 0 ) /* main program */ ROM_REGION( 0x800000, "maincpu", 0 ) /* main program */
ROM_LOAD32_BYTE( "ars2ver-a.2", 0x000003, 0x200000, CRC(b07b15a4) SHA1(ea3b2d7b4ef4ccf3aafeef7e7eac92e8d446f4e7) ) 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.3", 0x000002, 0x200000, CRC(90a92e40) SHA1(bf8083256e56e7e33e61b4cdaf9fd03dabfb36ba) ) // "
ROM_LOAD32_BYTE( "ars2ver-a.4", 0x000001, 0x200000, CRC(9e9d771d) SHA1(6fb983e3f4f8233544667b1bbf87864e4fb8698c) ) 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.5", 0x000000, 0x200000, CRC(e93c7771) SHA1(305f35488a55be1b845702df972bba8334c0726c) ) // "
ROM_REGION( 0x10000*2, "master", 0 ) /* Master DSP */ ROM_REGION( 0x10000*2, "master", 0 ) /* Master DSP */
ROM_LOAD16_WORD( "c71.bin", 0,0x1000*2, CRC(47c623ab) SHA1(e363ac50f5556f83308d4cc191b455e9b62bcfc8) ) ROM_LOAD16_WORD( "c71.bin", 0,0x1000*2, CRC(47c623ab) SHA1(e363ac50f5556f83308d4cc191b455e9b62bcfc8) )