diff options
author | Aaron Giles <aaron@aarongiles.com> | 2007-12-17 16:39:40 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2007-12-17 16:39:40 +0000 |
commit | df34329a478833efbd542a424ce1813a11214d4a (patch) | |
tree | 97960620a0153b267478c8f9ae93e55582ecaefa /src/mame/machine | |
parent | c82a966b3b72d79ac3ce394980d6b5806e752160 (diff) |
Changes for MAME 0.121u3.mame0121u3
Diffstat (limited to 'src/mame/machine')
-rw-r--r-- | src/mame/machine/asteroid.c | 7 | ||||
-rw-r--r-- | src/mame/machine/chaknpop.c | 2 | ||||
-rw-r--r-- | src/mame/machine/drakton.c | 4 | ||||
-rw-r--r-- | src/mame/machine/exctsccr.c | 32 | ||||
-rw-r--r-- | src/mame/machine/flstory.c | 2 | ||||
-rw-r--r-- | src/mame/machine/gaelco2.c | 2 | ||||
-rw-r--r-- | src/mame/machine/kanekotb.h | 160 | ||||
-rw-r--r-- | src/mame/machine/leland.c | 4 | ||||
-rw-r--r-- | src/mame/machine/scramble.c | 6 | ||||
-rw-r--r-- | src/mame/machine/simpsons.c | 2 | ||||
-rw-r--r-- | src/mame/machine/slapstic.c | 36 | ||||
-rw-r--r-- | src/mame/machine/steppers.c | 62 | ||||
-rw-r--r-- | src/mame/machine/steppers.h | 8 | ||||
-rw-r--r-- | src/mame/machine/strtheat.c | 3 |
14 files changed, 170 insertions, 160 deletions
diff --git a/src/mame/machine/asteroid.c b/src/mame/machine/asteroid.c index 72912641965..fef6613274f 100644 --- a/src/mame/machine/asteroid.c +++ b/src/mame/machine/asteroid.c @@ -107,7 +107,7 @@ READ8_HANDLER( asteroid_IN1_r ) int bitmask; res=readinputport(1); - bitmask = (1 << offset); + bitmask = (1 << (offset & 0x7)); if (res & bitmask) res = 0x80; @@ -186,8 +186,13 @@ READ8_HANDLER( llander_IN0_r ) if (avgdvg_done()) res |= 0x01; + else + res &= ~0x01; + if (activecpu_gettotalcycles() & 0x100) res |= 0x40; + else + res &= ~0x40; return res; } diff --git a/src/mame/machine/chaknpop.c b/src/mame/machine/chaknpop.c index 21eb9edefde..f10426250bc 100644 --- a/src/mame/machine/chaknpop.c +++ b/src/mame/machine/chaknpop.c @@ -17,7 +17,7 @@ static UINT8 mcu_result; /* mcu data that is extracted from the real board! */ /* updated on 2st Jun 2003 */ -static UINT8 mcu_data[256] = { +static const UINT8 mcu_data[256] = { 0x3a, 0xe6, 0x80, 0xc6, 0x0e, 0xdd, 0x77, 0xfd, 0x7e, 0xfe, 0x10, 0x38, 0x10, 0xdd, 0x7e, 0x03, 0xc6, 0x08, 0xdd, 0x77, 0x03, 0xdd, 0x7e, 0xff, diff --git a/src/mame/machine/drakton.c b/src/mame/machine/drakton.c index 70a6556ac46..61df996fcf1 100644 --- a/src/mame/machine/drakton.c +++ b/src/mame/machine/drakton.c @@ -103,9 +103,13 @@ static void drakton_decrypt_rom_B(void) DRIVER_INIT( drakton ) { + + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, MRA8_BANK1 ); + /* While the PAL supports up to 16 decryption methods, only four are actually used in the PAL. Therefore, we'll take a little memory overhead and decrypt the ROMs using each method in advance. */ + drakton_decrypt_rom_8(); drakton_decrypt_rom_9(); drakton_decrypt_rom_A(); diff --git a/src/mame/machine/exctsccr.c b/src/mame/machine/exctsccr.c index 46223367232..4aa9df433d9 100644 --- a/src/mame/machine/exctsccr.c +++ b/src/mame/machine/exctsccr.c @@ -37,19 +37,19 @@ static int mcu_code_latch; /* Exciting Soccer */ /* input = 0x6009 - data = 0x6170 */ -static UINT8 mcu_table1[MCU_KEY_TABLE_SIZE] = { +static const UINT8 mcu_table1[MCU_KEY_TABLE_SIZE] = { 0x23, 0x05, 0xfb, 0x07, 0x4d, 0x3b, 0x7d, 0x03, 0x9a, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* input = 0x600d - data = 0x61f0 */ -static UINT8 mcu_table2[MCU_KEY_TABLE_SIZE] = { +static const UINT8 mcu_table2[MCU_KEY_TABLE_SIZE] = { 0x75, 0x25, 0x4b, 0x10, 0xa6, 0x06, 0x9a, 0x02, 0x04, 0x11, 0x09, 0x09, 0x2a, 0x10, 0x3a, 0x10 }; /* input = ?????? - data = 0x6300 */ -static UINT8 mcu_table3[MCU_KEY_TABLE_SIZE*4] = { +static const UINT8 mcu_table3[MCU_KEY_TABLE_SIZE*4] = { 0xba, 0x26, 0x53, 0x0d, 0x01, 0x24, 0x1d, 0x15, 0xd0, 0x1d, 0x35, 0x1f, 0x32, 0x22, 0xa0, 0x2c, @@ -64,31 +64,31 @@ static UINT8 mcu_table3[MCU_KEY_TABLE_SIZE*4] = { }; /* input = 0x6007 - data = 0x629b */ -static UINT8 mcu_table4[MCU_KEY_TABLE_SIZE] = { +static const UINT8 mcu_table4[MCU_KEY_TABLE_SIZE] = { 0xc5, 0x24, 0xc5, 0x24, 0x27, 0x3f, 0xd0, 0x07, 0x07, 0x0b, 0xd8, 0x02, 0x9a, 0x08, 0x00, 0x00 }; /* input = 0x6007 - data = 0x629b */ -static UINT8 mcu_table5[MCU_KEY_TABLE_SIZE] = { +static const UINT8 mcu_table5[MCU_KEY_TABLE_SIZE] = { 0x54, 0x43, 0xd0, 0x07, 0xd8, 0x02, 0x9a, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* input = 0x6007 - data = 0x629b */ -static UINT8 mcu_table6[MCU_KEY_TABLE_SIZE] = { +static const UINT8 mcu_table6[MCU_KEY_TABLE_SIZE] = { 0x2b, 0x03, 0xd0, 0x07, 0xd8, 0x02, 0x9a, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* input = 0x6007 - data = 0x629b */ -static UINT8 mcu_table7[MCU_KEY_TABLE_SIZE] = { +static const UINT8 mcu_table7[MCU_KEY_TABLE_SIZE] = { 0xfa, 0x0e, 0x9a, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* input = 0x6011 - data = 0x607f */ -static UINT8 mcu_table8[MCU_KEY_TABLE_SIZE*2] = { +static const UINT8 mcu_table8[MCU_KEY_TABLE_SIZE*2] = { 0x0b, 0x78, 0x47, 0x04, 0x36, 0x18, 0x23, 0xf1, 0x10, 0xee, 0x16, 0x04, 0x11, 0x94, 0x16, 0xdd, @@ -199,19 +199,19 @@ WRITE8_HANDLER( exctsccr_mcu_w ) { /* Exciting Soccer II */ /* input = 0x6009 - data = 0x6170 */ -static UINT8 exctscc2_mcu_table1[MCU_KEY_TABLE_SIZE] = { +static const UINT8 exctscc2_mcu_table1[MCU_KEY_TABLE_SIZE] = { 0x56, 0x05, 0x90, 0x08, 0x19, 0x3e, 0xa8, 0x03, 0x2f, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* input = 0x600d - data = 0x61f0 */ -static UINT8 exctscc2_mcu_table2[MCU_KEY_TABLE_SIZE] = { +static const UINT8 exctscc2_mcu_table2[MCU_KEY_TABLE_SIZE] = { 0xff, 0x27, 0x35, 0x10, 0xd9, 0x06, 0xc3, 0x02, 0x4d, 0x12, 0x9e, 0x09, 0x14, 0x10, 0x24, 0x10 }; /* input = ?????? - data = 0x6300 */ -static UINT8 exctscc2_mcu_table3[MCU_KEY_TABLE_SIZE*4] = { +static const UINT8 exctscc2_mcu_table3[MCU_KEY_TABLE_SIZE*4] = { 0x41, 0x29, 0xb2, 0x12, 0x91, 0x26, 0xa6, 0x16, //0x12b2? 0x5f, 0x20, 0xc4, 0x21, 0xc1, 0x24, 0x3e, 0x2f, @@ -226,31 +226,31 @@ static UINT8 exctscc2_mcu_table3[MCU_KEY_TABLE_SIZE*4] = { }; /* input = 0x6007 - data = 0x629b */ -static UINT8 exctscc2_mcu_table4[MCU_KEY_TABLE_SIZE] = { +static const UINT8 exctscc2_mcu_table4[MCU_KEY_TABLE_SIZE] = { 0x55, 0x27, 0x55, 0x27, 0xf3, 0x41, 0x65, 0x08, 0xe3, 0x0b, 0x01, 0x03, 0x2f, 0x09, 0x00, 0x00 }; /* input = 0x6007 - data = 0x629b */ -static UINT8 exctscc2_mcu_table5[MCU_KEY_TABLE_SIZE] = { +static const UINT8 exctscc2_mcu_table5[MCU_KEY_TABLE_SIZE] = { 0xdd, 0x45, 0x65, 0x08, 0x01, 0x03, 0x2f, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* input = 0x6007 - data = 0x629b */ -static UINT8 exctscc2_mcu_table6[MCU_KEY_TABLE_SIZE] = { +static const UINT8 exctscc2_mcu_table6[MCU_KEY_TABLE_SIZE] = { 0x54, 0x03, 0x65, 0x08, 0x01, 0x03, 0x2f, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* input = 0x6007 - data = 0x629b */ -static UINT8 exctscc2_mcu_table7[MCU_KEY_TABLE_SIZE] = { +static const UINT8 exctscc2_mcu_table7[MCU_KEY_TABLE_SIZE] = { 0xe4, 0x0e, 0x2f, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* input = 0x6011 - data = 0x607f */ -static UINT8 exctscc2_mcu_table8[MCU_KEY_TABLE_SIZE*2] = { +static const UINT8 exctscc2_mcu_table8[MCU_KEY_TABLE_SIZE*2] = { 0x0c, 0x54, 0x4b, 0x0d, 0x38, 0xbd, 0x26, 0x81, 0x12, 0x37, 0x18, 0x4a, 0x13, 0x0f, 0x19, 0x23, diff --git a/src/mame/machine/flstory.c b/src/mame/machine/flstory.c index 174317be19a..c872891791f 100644 --- a/src/mame/machine/flstory.c +++ b/src/mame/machine/flstory.c @@ -180,7 +180,7 @@ READ8_HANDLER( onna34ro_mcu_status_r ) #define VICTNINE_MCU_SEED (memory_region(REGION_CPU1)[0xE685]) -static UINT8 victnine_mcu_data[0x100] = +static const UINT8 victnine_mcu_data[0x100] = { 0x3e, 0x08, 0xdd, 0x29, 0xcb, 0x14, 0xfd, 0x29, 0xcb, 0x15, 0xd9, 0x29, 0xd9, 0x30, 0x0d, 0xd9, diff --git a/src/mame/machine/gaelco2.c b/src/mame/machine/gaelco2.c index c634ec61004..b0df1dbbdfd 100644 --- a/src/mame/machine/gaelco2.c +++ b/src/mame/machine/gaelco2.c @@ -164,7 +164,7 @@ WRITE16_HANDLER( wrally2_coin_w ) ***************************************************************************/ -static struct EEPROM_interface gaelco2_eeprom_interface = +static const struct EEPROM_interface gaelco2_eeprom_interface = { 8, /* address bits */ 16, /* data bits */ diff --git a/src/mame/machine/kanekotb.h b/src/mame/machine/kanekotb.h index ca11a31c511..14f04d7fd18 100644 --- a/src/mame/machine/kanekotb.h +++ b/src/mame/machine/kanekotb.h @@ -17,7 +17,7 @@ // MCU executed command: 4300 0100 - factory settings // this command is issued whenever the nvram settings are corrupted // the MCU writes directly to NVRAM -static UINT16 bonkadv_mcu_43[] = { +static const UINT16 bonkadv_mcu_43[] = { 0x8BE0,0x8E71,0x0102,0x0102,0x0300,0x010C,0x0202,0x0202, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, 0x0030,0x0020,0x4F6B,0x0305,0x0000,0x0000,0x0000,0x0000, @@ -40,12 +40,12 @@ static UINT16 bonkadv_mcu_43[] = { 200E0E: 7E7F moveq #$7f, D7 200E10: 4E75 rts */ -static UINT16 bonkadv_mcu_4_34[] = { +static const UINT16 bonkadv_mcu_4_34[] = { 0x7071,0x7273,0x7475,0x7677,0x7879,0x7a7b,0x7c7d,0x7e7f, 0x4e75 }; // MCU executed command: 0400 0180 0032 - 128 bytes at $200180 -static UINT16 bonkadv_mcu_4_32[] = { +static const UINT16 bonkadv_mcu_4_32[] = { 0x00cc,0xcc0c,0xc0c0,0xc080,0x0484,0xb6a6,0x0404,0x80c0, 0x80b1,0xb1a1,0xa1b2,0xa2b3,0xb3a3,0xa3b1,0xb1b1,0xb1c0, 0xc0a1,0xa1a1,0xa1b2,0xb2a2,0xa290,0x9090,0xb9b9,0xa9a9, @@ -56,7 +56,7 @@ static UINT16 bonkadv_mcu_4_32[] = { 0xc0c0,0xa1a1,0xa1a1,0xb2b2,0xa2a2,0x9090,0x9000,0x0000 }; // MCU executed command: 0400 0280 0031 - 112 bytes at $200280 -static UINT16 bonkadv_mcu_4_31[] = { +static const UINT16 bonkadv_mcu_4_31[] = { 0x1013,0x1411,0x1216,0x1519,0x1a17,0x1824,0x2322,0x211f, 0x201e,0x1d1c,0x1b27,0x2825,0x2629,0x2a2b,0x2e2f,0x2c2d, 0x3130,0x3435,0x3233,0x3f3e,0x3d3c,0x3a3b,0x3938,0x3736, @@ -66,7 +66,7 @@ static UINT16 bonkadv_mcu_4_31[] = { 0x7071,0x6f6e,0x6d6c,0x7879,0x7677,0x7a7b,0x7c7d,0x7e7f }; // MCU executed command: 0400 0E50 0030 - 655 bytes at $200E50 (656 here) -static UINT16 bonkadv_mcu_4_30[] = { +static const UINT16 bonkadv_mcu_4_30[] = { 0x8c00,0x9700,0xa000,0xa700,0xb200,0xb700,0xc000,0xcc00, 0xd600,0xdf00,0xef00,0xf500,0xfd00,0x0501,0x0b01,0x1801, 0x1e01,0x2901,0x3101,0x3701,0x4101,0x4901,0x0b01,0x5d01, @@ -112,7 +112,7 @@ static UINT16 bonkadv_mcu_4_30[] = { 0xff00,0x0005,0x2495,0x96ff,0x0000,0x009a,0xff00,0x0000 }; // MCU executed command: 0400 0400 0033 - 2560 bytes at $200400 -static UINT16 bonkadv_mcu_4_33[] = { +static const UINT16 bonkadv_mcu_4_33[] = { 0x00a4,0x0001,0x00a5,0x005a,0x00a6,0x0074,0x00a7,0x009b, 0x00a8,0x00d0,0x00a9,0x00fe,0x00aa,0x015d,0x00ab,0x01b0, 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, @@ -285,40 +285,40 @@ static UINT16 bonkadv_mcu_4_33[] = { }; // dynamic, per-level (29), in level order // PC=078896 : MCU executed command: 0400 0300 00xx - xx = subcmd -static UINT16 bonkadv_mcu_4_00[] = { 0x0000,0x04C0,0x0000,0x0100,0x0600,0x0100 }; -static UINT16 bonkadv_mcu_4_02[] = { 0x0000,0x0760,0x0000,0x0100,0x0270,0x0100,0x0320,0x01B0, +static const UINT16 bonkadv_mcu_4_00[] = { 0x0000,0x04C0,0x0000,0x0100,0x0600,0x0100 }; +static const UINT16 bonkadv_mcu_4_02[] = { 0x0000,0x0760,0x0000,0x0100,0x0270,0x0100,0x0320,0x01B0, 0x0460,0x01B0,0x0510,0x0100,0x05E0,0x0100,0x0620,0x0120, 0x08A0,0x0120 }; -static UINT16 bonkadv_mcu_4_01[] = { 0x0000,0x0670,0x0000,0x0100,0x0200,0x0100,0x02E0,0x0090, +static const UINT16 bonkadv_mcu_4_01[] = { 0x0000,0x0670,0x0000,0x0100,0x0200,0x0100,0x02E0,0x0090, 0x0400,0x0090,0x04E0,0x0100,0x07B0,0x0100 }; -static UINT16 bonkadv_mcu_4_05[] = { 0x0000,0x0610,0x0000,0x0100,0x0750,0x0100 }; -static UINT16 bonkadv_mcu_4_07[] = { 0x0000,0x03C0,0x0000,0x0100,0x0500,0x0100 }; -static UINT16 bonkadv_mcu_4_06[] = { 0x0000,0x05F0,0x0000,0x0100,0x0730,0x0100 }; -static UINT16 bonkadv_mcu_4_09[] = { 0x0000,0x05C0,0x0000,0x0100,0x0700,0x0100 }; -static UINT16 bonkadv_mcu_4_0D[] = { 0x0000,0x07A0,0x0000,0x0100,0x08E0,0x0100 }; -static UINT16 bonkadv_mcu_4_03[] = { 0x0000,0x0920,0x0000,0x0100,0x0A60,0x0100 }; -static UINT16 bonkadv_mcu_4_08[] = { 0x0000,0x0730,0x0000,0x0100,0x0870,0x0100 }; -static UINT16 bonkadv_mcu_4_04[] = { 0x0000,0x05C0,0x0000,0x0100,0x0200,0x0100,0x0280,0x00C0, +static const UINT16 bonkadv_mcu_4_05[] = { 0x0000,0x0610,0x0000,0x0100,0x0750,0x0100 }; +static const UINT16 bonkadv_mcu_4_07[] = { 0x0000,0x03C0,0x0000,0x0100,0x0500,0x0100 }; +static const UINT16 bonkadv_mcu_4_06[] = { 0x0000,0x05F0,0x0000,0x0100,0x0730,0x0100 }; +static const UINT16 bonkadv_mcu_4_09[] = { 0x0000,0x05C0,0x0000,0x0100,0x0700,0x0100 }; +static const UINT16 bonkadv_mcu_4_0D[] = { 0x0000,0x07A0,0x0000,0x0100,0x08E0,0x0100 }; +static const UINT16 bonkadv_mcu_4_03[] = { 0x0000,0x0920,0x0000,0x0100,0x0A60,0x0100 }; +static const UINT16 bonkadv_mcu_4_08[] = { 0x0000,0x0730,0x0000,0x0100,0x0870,0x0100 }; +static const UINT16 bonkadv_mcu_4_04[] = { 0x0000,0x05C0,0x0000,0x0100,0x0200,0x0100,0x0280,0x00C0, 0x02E0,0x0060,0x03A0,0x0000,0x0700,0x0000 }; -static UINT16 bonkadv_mcu_4_0C[] = { 0x0000,0x06E0,0x0000,0x0100,0x0820,0x0100 }; -static UINT16 bonkadv_mcu_4_0A[] = { 0x0000,0x05A0,0x0000,0x0100,0x06E0,0x0100 }; -static UINT16 bonkadv_mcu_4_0B[] = { 0x0000,0x0470,0x0000,0x0100,0x05B0,0x0100 }; -static UINT16 bonkadv_mcu_4_10[] = { 0x0000,0x06C0,0x0000,0x0100,0x03B0,0x0100,0x0460,0x0050, +static const UINT16 bonkadv_mcu_4_0C[] = { 0x0000,0x06E0,0x0000,0x0100,0x0820,0x0100 }; +static const UINT16 bonkadv_mcu_4_0A[] = { 0x0000,0x05A0,0x0000,0x0100,0x06E0,0x0100 }; +static const UINT16 bonkadv_mcu_4_0B[] = { 0x0000,0x0470,0x0000,0x0100,0x05B0,0x0100 }; +static const UINT16 bonkadv_mcu_4_10[] = { 0x0000,0x06C0,0x0000,0x0100,0x03B0,0x0100,0x0460,0x0050, 0x05E0,0x0050,0x0650,0xFFE0,0x0800,0xFFE0 }; -static UINT16 bonkadv_mcu_4_0E[] = { 0x0000,0x0630,0x0000,0x0100,0x0770,0x0100 }; -static UINT16 bonkadv_mcu_4_13[] = { 0x0000,0x05C0,0x0000,0x0100,0x0700,0x0100 }; -static UINT16 bonkadv_mcu_4_0F[] = { 0x0000,0x05C0,0x0000,0x0100,0x0700,0x0100 }; -static UINT16 bonkadv_mcu_4_11[] = { 0x0000,0x05C0,0x0000,0x0100,0x0700,0x0100 }; -static UINT16 bonkadv_mcu_4_14[] = { 0x0000,0x05C0,0x0000,0x0100,0x0700,0x0100 }; -static UINT16 bonkadv_mcu_4_12[] = { 0x0000,0x05C0,0x0000,0x0100,0x0700,0x0100 }; -static UINT16 bonkadv_mcu_4_17[] = { 0x0000,0x0520,0x0000,0x0100,0x0660,0x0100 }; -static UINT16 bonkadv_mcu_4_1A[] = { 0x0000,0x03C0,0x0000,0x0100,0x0500,0x0100 }; -static UINT16 bonkadv_mcu_4_15[] = { 0x0000,0x02C0,0x0000,0x0100,0x0400,0x0100 }; -static UINT16 bonkadv_mcu_4_18[] = { 0x0000,0x03C0,0x0000,0x0100,0x0500,0x0100 }; -static UINT16 bonkadv_mcu_4_16[] = { 0x0000,0x02F0,0x0000,0x0100,0x0430,0x0100 }; -static UINT16 bonkadv_mcu_4_19[] = { 0x0000,0x03A0,0x0000,0x0100,0x04E0,0x0100 }; -static UINT16 bonkadv_mcu_4_1B[] = { 0x0000,0x0460,0x0000,0x0100,0x05A0,0x0100 }; -static UINT16 bonkadv_mcu_4_1C[] = { 0x0000,0x02C0,0x0000,0x0100,0x0400,0x0100 }; +static const UINT16 bonkadv_mcu_4_0E[] = { 0x0000,0x0630,0x0000,0x0100,0x0770,0x0100 }; +static const UINT16 bonkadv_mcu_4_13[] = { 0x0000,0x05C0,0x0000,0x0100,0x0700,0x0100 }; +static const UINT16 bonkadv_mcu_4_0F[] = { 0x0000,0x05C0,0x0000,0x0100,0x0700,0x0100 }; +static const UINT16 bonkadv_mcu_4_11[] = { 0x0000,0x05C0,0x0000,0x0100,0x0700,0x0100 }; +static const UINT16 bonkadv_mcu_4_14[] = { 0x0000,0x05C0,0x0000,0x0100,0x0700,0x0100 }; +static const UINT16 bonkadv_mcu_4_12[] = { 0x0000,0x05C0,0x0000,0x0100,0x0700,0x0100 }; +static const UINT16 bonkadv_mcu_4_17[] = { 0x0000,0x0520,0x0000,0x0100,0x0660,0x0100 }; +static const UINT16 bonkadv_mcu_4_1A[] = { 0x0000,0x03C0,0x0000,0x0100,0x0500,0x0100 }; +static const UINT16 bonkadv_mcu_4_15[] = { 0x0000,0x02C0,0x0000,0x0100,0x0400,0x0100 }; +static const UINT16 bonkadv_mcu_4_18[] = { 0x0000,0x03C0,0x0000,0x0100,0x0500,0x0100 }; +static const UINT16 bonkadv_mcu_4_16[] = { 0x0000,0x02F0,0x0000,0x0100,0x0430,0x0100 }; +static const UINT16 bonkadv_mcu_4_19[] = { 0x0000,0x03A0,0x0000,0x0100,0x04E0,0x0100 }; +static const UINT16 bonkadv_mcu_4_1B[] = { 0x0000,0x0460,0x0000,0x0100,0x05A0,0x0100 }; +static const UINT16 bonkadv_mcu_4_1C[] = { 0x0000,0x02C0,0x0000,0x0100,0x0400,0x0100 }; /*************************************************************************** @@ -336,30 +336,30 @@ static UINT16 bonkadv_mcu_4_1C[] = { 0x0000,0x02C0,0x0000,0x0100,0x0400,0x0100 } // fighter: order is unclear - cmd 26 is probably the last (ends with 0xff) // --- unknown data --- -static UINT16 bloodwar_mcu_4_01[] = { 0x00E6,0x00C6,0x00E8,0x00D0,0xFC9A,0x05C0,0x0F00,0x08C0, // Warrior 1 +static const UINT16 bloodwar_mcu_4_01[] = { 0x00E6,0x00C6,0x00E8,0x00D0,0xFC9A,0x05C0,0x0F00,0x08C0, // Warrior 1 0x0001,0x0120,0x0090,0x021B,0x00B4,0x0094,0x00AC,0x0094 }; -static UINT16 bloodwar_mcu_4_02[] = { 0x00B4,0x0094,0x00AC,0x0094,0xFCD2,0x03C0,0x1000,0x0900, // Warrior 2 +static const UINT16 bloodwar_mcu_4_02[] = { 0x00B4,0x0094,0x00AC,0x0094,0xFCD2,0x03C0,0x1000,0x0900, // Warrior 2 0x0001,0x0100,0x0080,0x0118,0x00F0,0x00D0,0x00F4,0x00DC }; -static UINT16 bloodwar_mcu_4_03[] = { 0x00F0,0x00D0,0x00F4,0x00DC,0xFC90,0x03C0,0x0C00,0x0CC0, // Warrior 3 +static const UINT16 bloodwar_mcu_4_03[] = { 0x00F0,0x00D0,0x00F4,0x00DC,0xFC90,0x03C0,0x0C00,0x0CC0, // Warrior 3 0x0001,0x0200,0x0100,0x0930,0x00D2,0x00B2,0x00CA,0x00B0 }; -static UINT16 bloodwar_mcu_4_04[] = { 0x00D2,0x00B2,0x00CA,0x00B0,0xFCB5,0x05C0,0x1000,0x0C00, // Warrior 4 +static const UINT16 bloodwar_mcu_4_04[] = { 0x00D2,0x00B2,0x00CA,0x00B0,0xFCB5,0x05C0,0x1000,0x0C00, // Warrior 4 0x0001,0x0140,0x00A0,0x031E,0x00A0,0x0080,0x00DC,0x00C4 }; -static UINT16 bloodwar_mcu_4_05[] = { 0x00A0,0x0080,0x00DC,0x00C4,0xFCA2,0x05C0,0x0AC0,0x0880, // Warrior 5 +static const UINT16 bloodwar_mcu_4_05[] = { 0x00A0,0x0080,0x00DC,0x00C4,0xFCA2,0x05C0,0x0AC0,0x0880, // Warrior 5 0x0001,0x01A0,0x00D0,0x0627,0x00BE,0x009E,0x00C2,0x00A8 }; -static UINT16 bloodwar_mcu_4_06[] = { 0x00BE,0x009E,0x00C2,0x00A8,0xFCBF,0x04C0,0x1100,0x0C00, // Warrior 6 +static const UINT16 bloodwar_mcu_4_06[] = { 0x00BE,0x009E,0x00C2,0x00A8,0xFCBF,0x04C0,0x1100,0x0C00, // Warrior 6 0x0001,0x0180,0x00C0,0x0524,0x00C8,0x00A8,0x00D6,0x009C }; -static UINT16 bloodwar_mcu_4_07[] = { 0x00C8,0x00A8,0x00D6,0x009C,0xFCC8,0x05C0,0x0F40,0x0CC0, // Warrior 7 +static const UINT16 bloodwar_mcu_4_07[] = { 0x00C8,0x00A8,0x00D6,0x009C,0xFCC8,0x05C0,0x0F40,0x0CC0, // Warrior 7 0x0001,0x0160,0x00B0,0x0421,0x00AA,0x008A,0x00A0,0x0086 }; -static UINT16 bloodwar_mcu_4_08[] = { 0x00AA,0x008A,0x00A0,0x0086,0xFCDB,0x05C0,0x1380,0x0F80, // Warrior 8 +static const UINT16 bloodwar_mcu_4_08[] = { 0x00AA,0x008A,0x00A0,0x0086,0xFCDB,0x05C0,0x1380,0x0F80, // Warrior 8 0x0000,0x01E0,0x00F0,0x082D,0x00DC,0x00BC,0x00D6,0x00BC }; -static UINT16 bloodwar_mcu_4_09[] = { 0x00DC,0x00BC,0x00D6,0x00BC,0xFCAC,0x04C0,0x10C0,0x1000, // Warrior 9 +static const UINT16 bloodwar_mcu_4_09[] = { 0x00DC,0x00BC,0x00D6,0x00BC,0xFCAC,0x04C0,0x10C0,0x1000, // Warrior 9 0x0001,0x01C0,0x00E0,0x072A,0xFF08,0xFF02,0x0000,0xFF03 }; // --- palette data --- // number of palettes (>=1) // palette data follows (each palette is 0x200 bytes long) // a negative word will end the palette -static UINT16 bloodwar_mcu_4_0a[] = { // Warrior 1 Player 1 +static const UINT16 bloodwar_mcu_4_0a[] = { // Warrior 1 Player 1 0x000B,0x0000,0x4232,0x56F8,0x2D8D,0x27FF,0x3BFF,0x53FF, 0x63FF,0x381F,0x4C1F,0x581F,0x6C1F,0x7C1F,0x7E1F,0x7EBF, 0x7BDE,0x2DAF,0x296E,0x298E,0x29AE,0x2DAE,0x31CF,0x31D0, @@ -544,7 +544,7 @@ static UINT16 bloodwar_mcu_4_0a[] = { // Warrior 1 Player 1 0x2340,0x2B60,0x3380,0x3FA0,0x47A0,0x4FC1,0x5BC0,0x67E2, 0x6FE4,0x77E6,0x7BEF,0x7FF4,0x7FFB,0x7BDE,0xFFFF,0x000B }; -static UINT16 bloodwar_mcu_4_0b[] = { // Warrior 1 Player 2 +static const UINT16 bloodwar_mcu_4_0b[] = { // Warrior 1 Player 2 0x000B,0x292A,0x4232,0x56F8,0x2D8D,0x2108,0x294A,0x318C, 0x39CE,0x4210,0x4A52,0x5294,0x5AD6,0x6318,0x6B5A,0x739C, 0x7BDE,0x2E2A,0x29E9,0x2609,0x29E9,0x2629,0x2A4A,0x2A4B, @@ -729,7 +729,7 @@ static UINT16 bloodwar_mcu_4_0b[] = { // Warrior 1 Player 2 0x2340,0x2B60,0x3380,0x3FA0,0x47A0,0x4FC1,0x5BC0,0x67E2, 0x6FE4,0x77E6,0x7BEF,0x7FF4,0x7FFB,0x7BDE,0xFFFF,0x0004 }; -static UINT16 bloodwar_mcu_4_0c[] = { // Warrior 5 Player 1 +static const UINT16 bloodwar_mcu_4_0c[] = { // Warrior 5 Player 1 0x0004,0x0000,0x4232,0x56F8,0x2D8D,0x2108,0x294A,0x318C, 0x39CE,0x4210,0x4A52,0x5294,0x5AD6,0x6318,0x6B5A,0x739C, 0x7BDE,0x1422,0x1423,0x2044,0x1803,0x1C23,0x2CA6,0x2445, @@ -810,7 +810,7 @@ static UINT16 bloodwar_mcu_4_0c[] = { // Warrior 5 Player 1 0x270A,0x32F1,0x2EAB,0x3BCF,0x3BD2,0x4BEE,0x53F6,0x5B94, 0x6BB5,0x6FFB,0x7BDE,0xFFFF,0x0004,0x0000,0x4232,0x56F8 }; -static UINT16 bloodwar_mcu_4_0d[] = { // Warrior 5 Player 2 +static const UINT16 bloodwar_mcu_4_0d[] = { // Warrior 5 Player 2 0x0004,0x0000,0x4232,0x56F8,0x2D8D,0x2108,0x294A,0x318C, 0x39CE,0x4210,0x4A52,0x5294,0x5AD6,0x6318,0x6B5A,0x739C, 0x7BDE,0x0C29,0x0C2A,0x184B,0x100A,0x142A,0x24AD,0x1C4C, @@ -891,7 +891,7 @@ static UINT16 bloodwar_mcu_4_0d[] = { // Warrior 5 Player 2 0x270A,0x32F1,0x2EAB,0x3BCF,0x3BD2,0x4BEE,0x53F6,0x5B94, 0x6BB5,0x6FFB,0x7BDE,0xFFFF,0x0005,0x40CE,0x4232,0x56F8 }; -static UINT16 bloodwar_mcu_4_0e[] = { // Warrior 4 Player 2 +static const UINT16 bloodwar_mcu_4_0e[] = { // Warrior 4 Player 2 0x0005,0x40CE,0x4232,0x56F8,0x2D8D,0x1D08,0x254A,0x2D8C, 0x35CE,0x3E10,0x4652,0x4E94,0x56D6,0x5F18,0x675A,0x6F9C, 0x7BDE,0x7BF9,0x6FF5,0x6BD4,0x63F1,0x538D,0x63F2,0x57EE, @@ -934,7 +934,7 @@ static UINT16 bloodwar_mcu_4_0e[] = { // Warrior 4 Player 2 0x4340,0x4760,0x4F80,0x57A1,0x5BC0,0x67E2,0x6FE4,0x77E6, 0x7BEF,0x7FF4,0x7FFB,0x7BDE,0xFFFF,0x0005,0x40CE,0x4232 }; -static UINT16 bloodwar_mcu_4_0f[] = { // Warrior 4 Player 1 +static const UINT16 bloodwar_mcu_4_0f[] = { // Warrior 4 Player 1 0x0005,0x40CE,0x4232,0x56F8,0x2D8D,0x20E9,0x292B,0x316D, 0x39AF,0x41F1,0x4A33,0x5275,0x5AB7,0x62F9,0x6B3B,0x737D, 0x7BDF,0x7FFA,0x73F6,0x6FF5,0x67F2,0x57CE,0x67F3,0x5BEF, @@ -977,7 +977,7 @@ static UINT16 bloodwar_mcu_4_0f[] = { // Warrior 4 Player 1 0x4340,0x4760,0x4F80,0x57A1,0x5BC0,0x67E2,0x6FE4,0x77E6, 0x7BEF,0x7FF4,0x7FFB,0x7BDE,0xFFFF,0x0009,0x0000,0x4232 }; -static UINT16 bloodwar_mcu_4_10[] = { // Warrior 6 Player 1 +static const UINT16 bloodwar_mcu_4_10[] = { // Warrior 6 Player 1 0x0009,0x0000,0x4232,0x56F8,0x2D8D,0x27FF,0x3BFF,0x53FF, 0x63FF,0x401E,0x4C1F,0x581F,0x6C1F,0x7C1F,0x7E1F,0x7EBF, 0x7BDE,0x4BCD,0x47EC,0x43CA,0x3BC8,0x2F45,0x2703,0x22E2, @@ -1046,7 +1046,7 @@ static UINT16 bloodwar_mcu_4_10[] = { // Warrior 6 Player 1 0x7C00,0x7C05,0x780A,0x7C0F,0x7C14,0x7C19,0x7C1F,0x7BDE, 0xFFFF,0x0009,0x0000,0x4232,0x56F8,0x2D8D,0x6C1F,0x7C1F }; -static UINT16 bloodwar_mcu_4_11[] = { // Warrior 6 Player 2 +static const UINT16 bloodwar_mcu_4_11[] = { // Warrior 6 Player 2 0x0009,0x0000,0x4232,0x56F8,0x2D8D,0x6C1F,0x7C1F,0x7E1F, 0x7EBF,0x5C13,0x5C52,0x6432,0x7075,0x7992,0x7DF6,0x7EF9, 0x7BDE,0x52F2,0x4F11,0x4AEF,0x42CD,0x368A,0x2E48,0x2A27, @@ -1115,7 +1115,7 @@ static UINT16 bloodwar_mcu_4_11[] = { // Warrior 6 Player 2 0x7C00,0x7C05,0x780A,0x7C0F,0x7C14,0x7C19,0x7C1F,0x7BDE, 0xFFFF,0x0002,0x0000,0x4232,0x56F8,0x2D8D,0x2108,0x294A }; -static UINT16 bloodwar_mcu_4_12[] = { // Warrior 9 Player 1 +static const UINT16 bloodwar_mcu_4_12[] = { // Warrior 9 Player 1 0x0002,0x0000,0x4232,0x56F8,0x2D8D,0x2108,0x294A,0x318C, 0x39CE,0x4210,0x4A52,0x5294,0x5AD6,0x6318,0x6B5A,0x739C, 0x7BDE,0x1AC2,0x1AE2,0x1B02,0x1703,0x1723,0x1743,0x1763, @@ -1175,7 +1175,7 @@ static UINT16 bloodwar_mcu_4_12[] = { // Warrior 9 Player 1 0x7FB6,0x7FB7,0x7FB8,0x7FB9,0x7FBF,0x7FBB,0x7FFF,0x7FFF, 0x0000,0xFFFF,0x0002,0x0000,0x4232,0x56F8,0x2D8D,0x2108 }; -static UINT16 bloodwar_mcu_4_13[] = { // Warrior 9 Player 2 +static const UINT16 bloodwar_mcu_4_13[] = { // Warrior 9 Player 2 0x0002,0x0000,0x4232,0x56F8,0x2D8D,0x2108,0x294A,0x318C, 0x39CE,0x4210,0x4A52,0x5294,0x5AD6,0x6318,0x6B5A,0x739C, 0x7BDE,0x146D,0x1CAF,0x24EF,0x24EF,0x2910,0x3553,0x3DB7, @@ -1235,7 +1235,7 @@ static UINT16 bloodwar_mcu_4_13[] = { // Warrior 9 Player 2 0x7FB6,0x7FB7,0x7FB8,0x7FB9,0x7FBF,0x7FBB,0x7FFF,0x7FFF, 0x0000,0xFFFF,0x0006,0x0000,0x4232,0x56F8,0x2D8D,0x2108 }; -static UINT16 bloodwar_mcu_4_14[] = { // Warrior 7 Player 1 +static const UINT16 bloodwar_mcu_4_14[] = { // Warrior 7 Player 1 0x0006,0x0000,0x4232,0x56F8,0x2D8D,0x2108,0x294A,0x318C, 0x39CE,0x4210,0x4A52,0x5294,0x5AD6,0x6318,0x6B5A,0x739C, 0x7BDE,0x0D00,0x0D00,0x0D40,0x0D40,0x0D60,0x0D80,0x1140, @@ -1376,7 +1376,7 @@ static UINT16 bloodwar_mcu_4_14[] = { // Warrior 7 Player 1 0x77E2,0x77E4,0x77E6,0x77E8,0x7BEA,0x7BED,0x7BF0,0x7BF3, 0x7BF6,0x7BF9,0x7BFB,0x7FFF,0x0000,0xFFFF,0x0006,0x3CB1 }; -static UINT16 bloodwar_mcu_4_15[] = { // Warrior 7 Player 2 +static const UINT16 bloodwar_mcu_4_15[] = { // Warrior 7 Player 2 0x0006,0x3CB1,0x4232,0x56F8,0x2D8D,0x2108,0x294A,0x318C, 0x39CE,0x4210,0x4A52,0x5294,0x5AD6,0x6318,0x6B5A,0x739C, 0x7BDE,0x1CCB,0x1049,0x184A,0x18E9,0x1CAA,0x1C4C,0x20AE, @@ -1517,7 +1517,7 @@ static UINT16 bloodwar_mcu_4_15[] = { // Warrior 7 Player 2 0x77E2,0x77E4,0x77E6,0x77E8,0x7BEA,0x7BED,0x7BF0,0x7BF3, 0x7BF6,0x7BF9,0x7BFB,0x7FFF,0x0000,0xFFFF,0x0002,0x0000 }; -static UINT16 bloodwar_mcu_4_16[] = { // Warrior 8 Player 1 +static const UINT16 bloodwar_mcu_4_16[] = { // Warrior 8 Player 1 0x0002,0x0000,0x4232,0x56F8,0x2D8D,0x2108,0x294A,0x318C, 0x39CE,0x4210,0x4A52,0x5294,0x5AD6,0x6318,0x6B5A,0x739C, 0x7BDE,0x29A9,0x2DCA,0x31EB,0x360C,0x3A0D,0x3A2D,0x3A4D, @@ -1554,7 +1554,7 @@ static UINT16 bloodwar_mcu_4_16[] = { // Warrior 8 Player 1 0x7BDE,0xFFFF,0x0002,0x0000,0x4232,0x56F8,0x2D8D,0x2108 }; -static UINT16 bloodwar_mcu_4_17[] = { // Warrior 8 Player 2 +static const UINT16 bloodwar_mcu_4_17[] = { // Warrior 8 Player 2 0x0002,0x0000,0x4232,0x56F8,0x2D8D,0x2108,0x294A,0x318C, 0x39CE,0x4210,0x4A52,0x5294,0x5AD6,0x6318,0x6B5A,0x739C, 0x7BDE,0x296A,0x2D8B,0x31AC,0x35CD,0x35EF,0x39F0,0x3A10, @@ -1591,7 +1591,7 @@ static UINT16 bloodwar_mcu_4_17[] = { // Warrior 8 Player 2 0x7BDE,0xFFFF,0x0003,0x0000,0x4232,0x56F8,0x2D8D,0x2108 }; -static UINT16 bloodwar_mcu_4_18[] = { // Warrior 2 Player 2 +static const UINT16 bloodwar_mcu_4_18[] = { // Warrior 2 Player 2 0x0003,0x0000,0x4232,0x56F8,0x2D8D,0x2108,0x294A,0x318C, 0x39CE,0x4210,0x4A52,0x5294,0x5AD6,0x6318,0x6B5A,0x739C, 0x7BDE,0x1524,0x0CC2,0x0CE2,0x0CE3,0x10E3,0x1103,0x14E3, @@ -1651,7 +1651,7 @@ static UINT16 bloodwar_mcu_4_18[] = { // Warrior 2 Player 2 0x294A,0x318C,0x39CE,0x03A0,0x23E0,0x37E0,0x3FE0,0x4FE0, 0x67ED,0x77EE,0x7FFF,0xFFFF,0x0003,0x0000,0x4232,0x56F8 }; -static UINT16 bloodwar_mcu_4_19[] = { // Warrior 2 Player 1 +static const UINT16 bloodwar_mcu_4_19[] = { // Warrior 2 Player 1 0x0003,0x0000,0x4232,0x56F8,0x2D8D,0x2108,0x294A,0x318C, 0x39CE,0x4210,0x4A52,0x5294,0x5AD6,0x6318,0x6B5A,0x739C, 0x7BDE,0x1524,0x0CC2,0x0CE2,0x0CE3,0x10E3,0x1103,0x14E3, @@ -1711,7 +1711,7 @@ static UINT16 bloodwar_mcu_4_19[] = { // Warrior 2 Player 1 0x294A,0x318C,0x39CE,0x03A0,0x23E0,0x37E0,0x3FE0,0x4FE0, 0x67ED,0x77EE,0x7FFF,0xFFFF,0x0005,0x0000,0x4232,0x56F8 }; -static UINT16 bloodwar_mcu_4_1a[] = { // Warrior 3 Player 1 +static const UINT16 bloodwar_mcu_4_1a[] = { // Warrior 3 Player 1 0x0005,0x0000,0x4232,0x56F8,0x2D8D,0x2108,0x294A,0x318C, 0x39CE,0x4210,0x4A52,0x5294,0x5AD6,0x6318,0x6B5A,0x739C, 0x7BDE,0x08A0,0x0D02,0x1142,0x19C2,0x3EEB,0x430D,0x4B6C, @@ -1839,7 +1839,7 @@ static UINT16 bloodwar_mcu_4_1a[] = { // Warrior 3 Player 1 0x0192,0x0194,0x0195,0x2597,0x2998,0x3599,0x3D99,0x0195, 0x0999,0x1199,0x21CF,0x25D4,0xFFFF,0x0005,0x0000,0x4232 }; -static UINT16 bloodwar_mcu_4_1b[] = { // Warrior 3 Player 2 +static const UINT16 bloodwar_mcu_4_1b[] = { // Warrior 3 Player 2 0x0005,0x0000,0x4232,0x56F8,0x2D8D,0x2108,0x294A,0x318C, 0x39CE,0x4210,0x4A52,0x5294,0x5AD6,0x6318,0x6B5A,0x739C, 0x7BDE,0x08A0,0x0D02,0x1142,0x19C2,0x3EEB,0x430D,0x4B6C, @@ -1970,7 +1970,7 @@ static UINT16 bloodwar_mcu_4_1b[] = { // Warrior 3 Player 2 // --- tilemap data --- // tile data (ff means no tiles) followed by routine index (end marker: 0xff00) -static UINT16 bloodwar_mcu_4_1c[] = { // Warrior 8 +static const UINT16 bloodwar_mcu_4_1c[] = { // Warrior 8 0xFF08,0xFF02,0x0000,0xFF03,0x0400,0xFF01,0x0D00,0xFF06, 0x01BF,0xFF06,0x00FF,0xFF06,0x0008,0x2C01,0xFF06,0x0001, 0xFF05,0x0002,0x2C02,0xFF06,0x0001,0xFF05,0x0002,0x2C55, @@ -2033,7 +2033,7 @@ static UINT16 bloodwar_mcu_4_1c[] = { // Warrior 8 0x000A,0x38BD,0xFF06,0x0004,0xFF06,0x000E,0xFF05,0x000A, 0x38C9,0xFF06,0x0004,0xFF06,0x00BF,0xFF00,0xFF08,0xFF02 }; -static UINT16 bloodwar_mcu_4_1d[] = { // Warrior 2 +static const UINT16 bloodwar_mcu_4_1d[] = { // Warrior 2 0xFF08,0xFF02,0x0000,0xFF03,0x0400,0xFF01,0x0000,0xFF06, 0x01BF,0xFF06,0x0003,0x4401,0xFF06,0x0002,0x4401,0xFF05, 0x0001,0x340B,0xFF06,0x0000,0x4401,0xFF06,0x0005,0xFF04, @@ -2180,7 +2180,7 @@ static UINT16 bloodwar_mcu_4_1d[] = { // Warrior 2 0xFF05,0x0007,0x2070,0xFF06,0x0003,0xFF06,0x009F,0xFF00, 0xFF08,0xFF02,0x0000,0xFF03,0x0400,0xFF01,0x0200,0xFF06 }; -static UINT16 bloodwar_mcu_4_1e[] = { // Warrior 3 +static const UINT16 bloodwar_mcu_4_1e[] = { // Warrior 3 0xFF08,0xFF02,0x0000,0xFF03,0x0400,0xFF01,0x0200,0xFF06, 0x01BF,0xFF05,0x000F,0x2C01,0xFF05,0x000F,0x2C01,0xFF05, 0x000F,0x2C11,0xFF05,0x000F,0x2C11,0xFF05,0x0001,0x3C27, @@ -2319,7 +2319,7 @@ static UINT16 bloodwar_mcu_4_1e[] = { // Warrior 3 0x007F,0xFF00,0xFF08,0xFF02,0x0000,0xFF03,0x0200,0xFF01 }; -static UINT16 bloodwar_mcu_4_1f[] = { // Warrior 5 +static const UINT16 bloodwar_mcu_4_1f[] = { // Warrior 5 0xFF08,0xFF02,0x0000,0xFF03,0x0200,0xFF01,0x0800,0xFF06, 0x01BF,0xFF06,0x007F,0xFF06,0x0009,0xFF05,0x0002,0x2801, 0xFF05,0x0004,0x3429,0xFF06,0x0000,0xFF05,0x0002,0x342E, @@ -2402,7 +2402,7 @@ static UINT16 bloodwar_mcu_4_1f[] = { // Warrior 5 0xFF05,0x0001,0x2C6B,0x2C6A,0xFF06,0x000C,0xFF05,0x0001, 0x2C6B,0x2C6A,0xFF06,0x0006,0xFF06,0x003F,0xFF00,0xFF08 }; -static UINT16 bloodwar_mcu_4_20[] = { // Warrior 4 +static const UINT16 bloodwar_mcu_4_20[] = { // Warrior 4 0xFF08,0xFF02,0x0000,0xFF03,0x0400,0xFF01,0x1100,0xFF06, 0x01BF,0xFF06,0x00DF,0xFF06,0x0001,0xFF04,0x0002,0xFF09, 0x0001,0x2402,0xFF04,0x0000,0xFF06,0x0017,0xFF05,0x0001, @@ -2477,7 +2477,7 @@ static UINT16 bloodwar_mcu_4_20[] = { // Warrior 4 0x2111,0xFF05,0x000F,0x2111,0xFF05,0x000F,0x2121,0xFF05, 0x000F,0x2121,0xFF06,0x013F,0xFF00,0xFF08,0xFF02,0x0000 }; -static UINT16 bloodwar_mcu_4_21[] = { // Warrior 6 +static const UINT16 bloodwar_mcu_4_21[] = { // Warrior 6 0xFF08,0xFF02,0x0000,0xFF03,0x0400,0xFF01,0x0F00,0xFF06, 0x01BF,0xFF06,0x005F,0xFF06,0x000F,0x4401,0xFF06,0x000E, 0xFF06,0x000C,0xFF05,0x0005,0x4402,0xFF06,0x000C,0xFF06, @@ -2641,7 +2641,7 @@ static UINT16 bloodwar_mcu_4_21[] = { // Warrior 6 0x30EF,0xFF05,0x000F,0x3141,0xFF05,0x000F,0x3101,0xFF05, 0x000F,0x3151,0xFF05,0x000F,0x3111,0xFF00,0xFF08,0xFF02 }; -static UINT16 bloodwar_mcu_4_22[] = { // Warrior 1 +static const UINT16 bloodwar_mcu_4_22[] = { // Warrior 1 0xFF08,0xFF02,0x0000,0xFF03,0x0300,0xFF01,0x0B00,0xFF06, 0x01BF,0xFF06,0x0001,0x3401,0xFF06,0x0000,0xFF05,0x0002, 0x3402,0xFF06,0x0010,0xFF05,0x0001,0x3440,0xFF06,0x0001, @@ -2764,7 +2764,7 @@ static UINT16 bloodwar_mcu_4_22[] = { // Warrior 1 0x0005,0xFF05,0x0006,0x2CF7,0xFF06,0x0008,0xFF05,0x0006, 0x2CF7,0xFF06,0x0002,0xFF06,0x007F,0xFF00,0xFF08,0xFF02 }; -static UINT16 bloodwar_mcu_4_23[] = { // Warrior 9 +static const UINT16 bloodwar_mcu_4_23[] = { // Warrior 9 0xFF08,0xFF02,0x0000,0xFF03,0x0400,0xFF01,0x0A00,0xFF06, 0x01BF,0xFF06,0x0006,0xFF05,0x0001,0x3C88,0xFF06,0x0005, 0xFF05,0x0001,0x4001,0xFF06,0x0005,0xFF04,0x0002,0xFF09, @@ -2926,7 +2926,7 @@ static UINT16 bloodwar_mcu_4_23[] = { // Warrior 9 0xFF05,0x0007,0x2881,0xFF05,0x0007,0x2881,0xFF05,0x0007, 0x2881,0xFF05,0x0007,0x2881,0xFF06,0x007F,0xFF00,0xFF08 }; -static UINT16 bloodwar_mcu_4_24[] = { // Warrior 7 +static const UINT16 bloodwar_mcu_4_24[] = { // Warrior 7 0xFF08,0xFF02,0x0000,0xFF03,0x0400,0xFF01,0x0300,0xFF06, 0x01BF,0xFF06,0x0000,0x3402,0xFF05,0x0005,0x4C14,0x3402, 0xFF05,0x0006,0x4C14,0xFF05,0x0006,0x4C14,0xFF04,0x0002, @@ -3041,7 +3041,7 @@ static UINT16 bloodwar_mcu_4_24[] = { // Warrior 7 }; // --- fighter data: pointers to ROM --- -static UINT16 bloodwar_mcu_4_25[] = { // Warrior 1 +static const UINT16 bloodwar_mcu_4_25[] = { // Warrior 1 0x0007,0x2B72,0x0007,0x2B9E,0x0007,0x2C52,0x0007,0x2D36, 0x0007,0x3584,0x0007,0x2E3A,0x0007,0x2E54,0x0007,0x2E74, 0x0007,0x2F28,0x0007,0x3022,0x0007,0x35A0,0x0007,0x377C, @@ -3113,7 +3113,7 @@ static UINT16 bloodwar_mcu_4_25[] = { // Warrior 1 0x0007,0x862A,0x0007,0x8644,0x0007,0x869C,0x0007,0x86A6, 0x0007,0xCC3C,0x0007,0xCC68,0x0007,0xCD1C,0x0007,0xCD9A }; -static UINT16 bloodwar_mcu_4_26[] = { // Warrior 2 +static const UINT16 bloodwar_mcu_4_26[] = { // Warrior 2 0x000B,0xB188,0x000B,0xB1C0,0x000B,0xB308,0x000B,0xB590, 0x000B,0xCF38,0x000B,0xBA00,0x000B,0xBA1A,0x000B,0xBA3A, 0x000B,0xBE62,0x000B,0xC4AA,0x000B,0xCF54,0x000B,0xD130, @@ -3181,7 +3181,7 @@ static UINT16 bloodwar_mcu_4_26[] = { // Warrior 2 0x000C,0x1F4A,0x000C,0x1F5E,0x000C,0x1FC2,0x000C,0x1FCC, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF }; -static UINT16 bloodwar_mcu_4_27[] = { // Warrior 3 +static const UINT16 bloodwar_mcu_4_27[] = { // Warrior 3 0x0008,0x631C,0x0008,0x6348,0x0008,0x63EC,0x0008,0x6494, 0x0008,0x6C5C,0x0008,0x6598,0x0008,0x65B2,0x0008,0x65D2, 0x0008,0x6676,0x0008,0x674A,0x0008,0x6C78,0x0008,0x6E54, @@ -3254,7 +3254,7 @@ static UINT16 bloodwar_mcu_4_27[] = { // Warrior 3 0x0008,0xB786,0x0008,0xB8F0,0x0008,0xB912,0x0008,0xB93A, 0x0008,0xF128,0x0008,0xF148,0x0008,0xF1EC,0x0008,0xF2AA }; -static UINT16 bloodwar_mcu_4_28[] = { // Warrior 4 +static const UINT16 bloodwar_mcu_4_28[] = { // Warrior 4 0x0008,0xF128,0x0008,0xF148,0x0008,0xF1EC,0x0008,0xF2AA, 0x0008,0xFA80,0x0008,0xF3AA,0x0008,0xF3C4,0x0008,0xF3E4, 0x0008,0xF4A8,0x0008,0xF56C,0x0008,0xFA9C,0x0008,0xFC78, @@ -3325,7 +3325,7 @@ static UINT16 bloodwar_mcu_4_28[] = { // Warrior 4 0x0009,0x4A2A,0x0009,0x81A8,0x0009,0x81C8,0x0009,0x8270 }; -static UINT16 bloodwar_mcu_4_29[] = { // Warrior 5 +static const UINT16 bloodwar_mcu_4_29[] = { // Warrior 5 0x0007,0xCC3C,0x0007,0xCC68,0x0007,0xCD1C,0x0007,0xCD9A, 0x0007,0xD616,0x0007,0xCE38,0x0007,0xCE52,0x0007,0xCE72, 0x0007,0xCF16,0x0007,0xCFAA,0x0007,0xD632,0x0007,0xD80E, @@ -3396,7 +3396,7 @@ static UINT16 bloodwar_mcu_4_29[] = { // Warrior 5 0x0008,0x1E9A,0x0008,0x1EAC,0x0008,0x631C,0x0008,0x6348 }; -static UINT16 bloodwar_mcu_4_2a[] = { // Warrior 6 +static const UINT16 bloodwar_mcu_4_2a[] = { // Warrior 6 0x000A,0x0E3C,0x000A,0x0E5C,0x000A,0x0F00,0x000A,0x0FA8, 0x000A,0x16E2,0x000A,0x105C,0x000A,0x1076,0x000A,0x1096, 0x000A,0x113A,0x000A,0x11DE,0x000A,0x16FE,0x000A,0x18DA, @@ -3465,7 +3465,7 @@ static UINT16 bloodwar_mcu_4_2a[] = { // Warrior 6 0x000A,0x62DA,0x000A,0x62A0,0x000A,0x62B4,0x000A,0x631E, 0x000A,0x6338,0x000A,0x94A4,0x000A,0x94C4,0x000A,0x9568 }; -static UINT16 bloodwar_mcu_4_2b[] = { // Warrior 7 +static const UINT16 bloodwar_mcu_4_2b[] = { // Warrior 7 0x000A,0x94A4,0x000A,0x94C4,0x000A,0x9568,0x000A,0x9646, 0x000A,0x9DFC,0x000A,0x9746,0x000A,0x9760,0x000A,0x9780, 0x000A,0x9824,0x000A,0x98C8,0x000A,0x9E18,0x000A,0x9FF4, @@ -3533,7 +3533,7 @@ static UINT16 bloodwar_mcu_4_2b[] = { // Warrior 7 0x000A,0xF31E,0x000A,0xF344,0x000A,0xF39C,0x000A,0xF3A6, 0x000B,0x272C,0x000B,0x274C,0x000B,0x284C,0x000B,0x2924 }; -static UINT16 bloodwar_mcu_4_2c[] = { // Warrior 8 +static const UINT16 bloodwar_mcu_4_2c[] = { // Warrior 8 0x000B,0x272C,0x000B,0x274C,0x000B,0x284C,0x000B,0x2924, 0x000B,0x3242,0x000B,0x2A0E,0x000B,0x2A28,0x000B,0x2A48, 0x000B,0x2B4C,0x000B,0x2C1A,0x000B,0x325E,0x000B,0x343A, @@ -3602,7 +3602,7 @@ static UINT16 bloodwar_mcu_4_2c[] = { // Warrior 8 0x000B,0x80C8,0x000B,0x808E,0x000B,0x80A2,0x000B,0x811C, 0x000B,0x813E,0x000B,0xB188,0x000B,0xB1C0,0x000B,0xB308 }; -static UINT16 bloodwar_mcu_4_2d[] = { // Warrior 9 +static const UINT16 bloodwar_mcu_4_2d[] = { // Warrior 9 0x0009,0x81A8,0x0009,0x81C8,0x0009,0x8270,0x0009,0x8328, 0x0009,0x8A98,0x0009,0x8416,0x0009,0x8430,0x0009,0x8450, 0x0009,0x84E8,0x0009,0x8580,0x0009,0x8AB4,0x0009,0x8C90, diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c index fc38517e319..fb62d16167b 100644 --- a/src/mame/machine/leland.c +++ b/src/mame/machine/leland.c @@ -676,7 +676,7 @@ void ataxx_bankswitch(void) void leland_init_eeprom(UINT8 default_val, const UINT16 *data, UINT8 serial_offset, UINT8 serial_type) { - static struct EEPROM_interface eeprom_interface = + static const struct EEPROM_interface eeprom_interface = { 6, 16, @@ -769,7 +769,7 @@ void leland_init_eeprom(UINT8 default_val, const UINT16 *data, UINT8 serial_offs void ataxx_init_eeprom(UINT8 default_val, const UINT16 *data, UINT8 serial_offset) { - static struct EEPROM_interface eeprom_interface = + static const struct EEPROM_interface eeprom_interface = { 7, 16, diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c index dfb2321cf0c..5dc2aae78ee 100644 --- a/src/mame/machine/scramble.c +++ b/src/mame/machine/scramble.c @@ -288,7 +288,7 @@ WRITE8_HANDLER( hunchbks_mirror_w ) } -static ppi8255_interface ppi8255_intf = +static const ppi8255_interface ppi8255_intf = { 2, /* 2 chips */ {input_port_0_r, 0}, /* Port A read */ @@ -300,7 +300,7 @@ static ppi8255_interface ppi8255_intf = }; /* extra chip for sample latch */ -static ppi8255_interface sfx_ppi8255_intf = +static const ppi8255_interface sfx_ppi8255_intf = { 3, /* 3 chips */ {input_port_0_r, 0, soundlatch2_r}, /* Port A read */ @@ -312,7 +312,7 @@ static ppi8255_interface sfx_ppi8255_intf = }; /* extra chip for sample latch */ -static ppi8255_interface monsterz_ppi8255_intf = +static const ppi8255_interface monsterz_ppi8255_intf = { 3, /* 3 chips */ {input_port_0_r, 0, 0}, /* Port A read */ diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c index 1556b2359cf..cc9946c1fdf 100644 --- a/src/mame/machine/simpsons.c +++ b/src/mame/machine/simpsons.c @@ -19,7 +19,7 @@ int simpsons_firq_enabled; static int init_eeprom_count; -static struct EEPROM_interface eeprom_interface = +static const struct EEPROM_interface eeprom_interface = { 7, /* address bits */ 8, /* data bits */ diff --git a/src/mame/machine/slapstic.c b/src/mame/machine/slapstic.c index 189b23d50a0..12183a1075f 100644 --- a/src/mame/machine/slapstic.c +++ b/src/mame/machine/slapstic.c @@ -278,7 +278,7 @@ enum state_type *************************************/ /* slapstic 137412-101: Empire Strikes Back/Tetris (NOT confirmed) */ -static struct slapstic_data slapstic101 = +static const struct slapstic_data slapstic101 = { /* basic banking */ 3, /* starting bank */ @@ -305,7 +305,7 @@ static struct slapstic_data slapstic101 = /* slapstic 137412-103: Marble Madness (confirmed) */ -static struct slapstic_data slapstic103 = +static const struct slapstic_data slapstic103 = { /* basic banking */ 3, /* starting bank */ @@ -332,7 +332,7 @@ static struct slapstic_data slapstic103 = /* slapstic 137412-104: Gauntlet (confirmed) */ -static struct slapstic_data slapstic104 = +static const struct slapstic_data slapstic104 = { /* basic banking */ 3, /* starting bank */ @@ -359,7 +359,7 @@ static struct slapstic_data slapstic104 = /* slapstic 137412-105: Indiana Jones/Paperboy (confirmed) */ -static struct slapstic_data slapstic105 = +static const struct slapstic_data slapstic105 = { /* basic banking */ 3, /* starting bank */ @@ -386,7 +386,7 @@ static struct slapstic_data slapstic105 = /* slapstic 137412-106: Gauntlet II (confirmed) */ -static struct slapstic_data slapstic106 = +static const struct slapstic_data slapstic106 = { /* basic banking */ 3, /* starting bank */ @@ -413,7 +413,7 @@ static struct slapstic_data slapstic106 = /* slapstic 137412-107: Peter Packrat/Xybots/2p Gauntlet/720 (confirmed) */ -static struct slapstic_data slapstic107 = +static const struct slapstic_data slapstic107 = { /* basic banking */ 3, /* starting bank */ @@ -440,7 +440,7 @@ static struct slapstic_data slapstic107 = /* slapstic 137412-108: Road Runner/Super Sprint (confirmed) */ -static struct slapstic_data slapstic108 = +static const struct slapstic_data slapstic108 = { /* basic banking */ 3, /* starting bank */ @@ -467,7 +467,7 @@ static struct slapstic_data slapstic108 = /* slapstic 137412-109: Championship Sprint/Road Blasters (confirmed) */ -static struct slapstic_data slapstic109 = +static const struct slapstic_data slapstic109 = { /* basic banking */ 3, /* starting bank */ @@ -494,7 +494,7 @@ static struct slapstic_data slapstic109 = /* slapstic 137412-110: Road Blasters/APB (confirmed) */ -static struct slapstic_data slapstic110 = +static const struct slapstic_data slapstic110 = { /* basic banking */ 3, /* starting bank */ @@ -528,7 +528,7 @@ static struct slapstic_data slapstic110 = *************************************/ /* slapstic 137412-111: Pit Fighter (confirmed) */ -static struct slapstic_data slapstic111 = +static const struct slapstic_data slapstic111 = { /* basic banking */ 0, /* starting bank */ @@ -554,7 +554,7 @@ static struct slapstic_data slapstic111 = /* slapstic 137412-112: Pit Fighter (Japan) (confirmed) */ -static struct slapstic_data slapstic112 = +static const struct slapstic_data slapstic112 = { /* basic banking */ 0, /* starting bank */ @@ -580,7 +580,7 @@ static struct slapstic_data slapstic112 = /* slapstic 137412-113: Unknown (Europe) (confirmed) */ -static struct slapstic_data slapstic113 = +static const struct slapstic_data slapstic113 = { /* basic banking */ 0, /* starting bank */ @@ -606,7 +606,7 @@ static struct slapstic_data slapstic113 = /* slapstic 137412-114: Unknown (Europe) (unconfirmed) */ -static struct slapstic_data slapstic114 = +static const struct slapstic_data slapstic114 = { /* basic banking */ 0, /* starting bank */ @@ -632,7 +632,7 @@ static struct slapstic_data slapstic114 = /* slapstic 137412-115: Race Drivin' DSK board (confirmed) */ -static struct slapstic_data slapstic115 = +static const struct slapstic_data slapstic115 = { /* basic banking */ 0, /* starting bank */ @@ -658,7 +658,7 @@ static struct slapstic_data slapstic115 = /* slapstic 137412-116: Hydra (confirmed) */ -static struct slapstic_data slapstic116 = +static const struct slapstic_data slapstic116 = { /* basic banking */ 0, /* starting bank */ @@ -684,7 +684,7 @@ static struct slapstic_data slapstic116 = /* slapstic 137412-117: Race Drivin' main board (confirmed) */ -static struct slapstic_data slapstic117 = +static const struct slapstic_data slapstic117 = { /* basic banking */ 0, /* starting bank */ @@ -710,7 +710,7 @@ static struct slapstic_data slapstic117 = /* slapstic 137412-118: Rampart/Vindicators II (confirmed) */ -static struct slapstic_data slapstic118 = +static const struct slapstic_data slapstic118 = { /* basic banking */ 0, /* starting bank */ @@ -743,7 +743,7 @@ static struct slapstic_data slapstic118 = *************************************/ /* master table */ -static struct slapstic_data *slapstic_table[] = +static const struct slapstic_data *const slapstic_table[] = { &slapstic101, /* NOT confirmed! */ NULL, /* never seen */ diff --git a/src/mame/machine/steppers.c b/src/mame/machine/steppers.c index f680079d93f..6566ef41a21 100644 --- a/src/mame/machine/steppers.c +++ b/src/mame/machine/steppers.c @@ -346,7 +346,7 @@ static const int BarcrestStepTab[] = 0, //0001->0110 1->6 0, //0001->0111 1->7 0, //0001->1000 1->8 - -1, //0001->1001 1->9 + -1,//0001->1001 1->9 0, //0001->1010 1->A 0, //0001->1011 1->B 0, //0001->1100 1->C @@ -357,14 +357,14 @@ static const int BarcrestStepTab[] = 0, //0010->0000 2->0 0, //0010->0001 2->1 0, //0010->0010 2->2 - -1, //0010->0011 2->3 + -1,//0010->0011 2->3 0, //0010->0100 2->4 0, //0010->0101 2->5 1, //0010->0110 2->6 0, //0010->0111 2->7 - 0,//0010->1000 2->8 + 0, //0010->1000 2->8 0, //0010->1001 2->9 - 0,//0010->1010 2->A + 0, //0010->1010 2->A 0, //0010->1011 2->B 0, //0010->1100 2->C 0, //0010->1101 2->D @@ -372,7 +372,7 @@ static const int BarcrestStepTab[] = 0, //0010->1111 2->F 0, //0011->0000 3->0 - -1, //0011->0001 3->1 + -1,//0011->0001 3->1 1, //0011->0010 3->2 0, //0011->0011 3->3 0, //0011->0100 3->4 @@ -380,7 +380,7 @@ static const int BarcrestStepTab[] = 2, //0011->0110 3->6 0, //0011->0111 3->7 0, //0011->1000 3->8 - -2, //0011->1001 3->9 + -2,//0011->1001 3->9 0, //0011->1010 3->A 0, //0011->1011 3->B 0, //0011->1100 3->C @@ -390,7 +390,7 @@ static const int BarcrestStepTab[] = 0, //0100->0000 4->0 0, //0100->0001 4->1 - 0,//0100->0010 4->2 + 0, //0100->0010 4->2 0, //0100->0011 4->3 0, //0100->0100 4->4 0, //0100->0101 4->5 @@ -409,9 +409,9 @@ static const int BarcrestStepTab[] = 0, //0101->0001 5->1 0, //0101->0010 5->2 0, //0101->0011 5->3 - 0,//0101->0100 5->4 + 0, //0101->0100 5->4 0, //0101->0101 5->5 - 0,//0101->0110 5->6 + 0, //0101->0110 5->6 0, //0101->0111 5->7 0, //0101->1000 5->8 0, //0101->1001 5->9 @@ -432,7 +432,7 @@ static const int BarcrestStepTab[] = 0, //0110->0111 6->7 0, //0110->1000 6->8 0, //0110->1001 6->9 - 0,//0110->1010 6->A + 0, //0110->1010 6->A 0, //0110->1011 6->B 2, //0110->1100 6->C 0, //0110->1101 6->D @@ -457,7 +457,7 @@ static const int BarcrestStepTab[] = 0, //0111->1111 7->F 0, //1000->0000 8->0 - 0,//1000->0001 8->1 + 0, //1000->0001 8->1 0, //1000->0010 8->2 0, //1000->0011 8->3 0, //1000->0100 8->4 @@ -468,7 +468,7 @@ static const int BarcrestStepTab[] = 1, //1000->1001 8->9 0, //1000->1010 8->A 0, //1000->1011 8->B - -1, //1000->1100 8->C + -1,//1000->1100 8->C 0, //1000->1101 8->D 0, //1000->1110 8->E 0, //1000->1111 8->F @@ -478,14 +478,14 @@ static const int BarcrestStepTab[] = 0, //1001->0010 9->2 2, //1001->0011 9->3 0, //1001->0100 9->4 - 0,//1001->0101 9->5 + 0, //1001->0101 9->5 0, //1001->0110 9->6 0, //1001->0111 9->7 - -1, //1001->1000 9->8 + -1,//1001->1000 9->8 0, //1001->1001 9->9 0, //1001->1010 9->A 0, //1001->1011 9->B - -2, //1001->1100 9->C + -2,//1001->1100 9->C 0, //1001->1101 9->D 0, //1001->1110 9->E 0, //1001->1111 9->F @@ -498,8 +498,8 @@ static const int BarcrestStepTab[] = 0, //1010->0101 A->5 0, //1010->0110 A->6 0, //1010->0111 A->7 - 0,//1010->1000 A->8 - 0,//1010->1001 A->9 + 0, //1010->1000 A->8 + 0, //1010->1001 A->9 0, //1010->1010 A->A 0, //1010->1011 A->B 0, //1010->1100 A->C @@ -528,9 +528,9 @@ static const int BarcrestStepTab[] = 0, //1100->0001 C->1 0, //1100->0010 C->2 0, //1100->0011 C->3 - -1, //1100->0100 C->4 + -1,//1100->0100 C->4 0, //1100->0101 C->5 - -2, //1100->0110 C->6 + -2,//1100->0110 C->6 0, //1100->0111 C->7 1, //1100->1000 C->8 2, //1100->1001 C->9 @@ -605,20 +605,18 @@ void Stepper_init(int id, int type) steppers[id].pattern = 0; steppers[id].old_pattern = 0; steppers[id].step_pos = 0; - steppers[id].max_steps = (48*2)-1; + steppers[id].max_steps = (48*2); steppers[id].type = type; switch ( steppers[id].type ) { - case STEPPER_48STEP_REEL : // STARPOINT RMxxx + case STARPOINT_48STEP_REEL : // STARPOINT RMxxx break; - case BARCREST_48STEP_REEL : // Barcrest reel units have different coil windings - steppers[id].index_pos = 0; - steppers[id].index_len = 16; - steppers[id].index_patt = 0x09; + case BARCREST_48STEP_REEL : // Barcrest reel units have different coil windings and optic tabs + Stepper_set_index(id,0,16,0x09); break; - case STEPPER_144STEPS_DICE : // STARPOINT 1DCU DICE mechanism - steppers[id].max_steps = (144*2)-1; + case STARPOINT_144STEPS_DICE :// STARPOINT 1DCU DICE mechanism + steppers[id].max_steps = (144*2); break; } state_save_register_item("Stepper", id, steppers[id].index_pos); @@ -636,8 +634,8 @@ void Stepper_init(int id, int type) void Stepper_set_index(int id,int position,int length,int pattern) { steppers[id].index_pos = position;//location of first index value in half steps - steppers[id].index_len = length;//number of half steps the index lasts - steppers[id].index_patt = pattern;//hex value of coil pattern + steppers[id].index_len = length; //number of half steps the index lasts + steppers[id].index_patt = pattern; //hex value of coil pattern } int Stepper_get_position(int id) @@ -719,11 +717,11 @@ int Stepper_update(int id, UINT8 pattern) switch ( steppers[id].type ) { default: - case STEPPER_48STEP_REEL : // STARPOINT RMxxx - case STEPPER_144STEPS_DICE : // STARPOINT 1DCU DICE mechanism + case STARPOINT_48STEP_REEL : // STARPOINT RMxxx + case STARPOINT_144STEPS_DICE : // STARPOINT 1DCU DICE mechanism steps = StarpointStepTab[ index ]; break; - case BARCREST_48STEP_REEL : // Barcrest reel units have different optics + case BARCREST_48STEP_REEL : // Barcrest reel units have different windings steps = BarcrestStepTab[ index ]; break; } diff --git a/src/mame/machine/steppers.h b/src/mame/machine/steppers.h index ad6094be1f8..b33da923a56 100644 --- a/src/mame/machine/steppers.h +++ b/src/mame/machine/steppers.h @@ -18,11 +18,11 @@ #ifndef INC_STEPPERS #define INC_STEPPERS -#define MAX_STEPPERS 16 // maximum number of steppers +#define MAX_STEPPERS 8 // maximum number of steppers -#define STEPPER_48STEP_REEL 0 // STARPOINT RMXXX reel unit -#define BARCREST_48STEP_REEL 1 // Barcrest bespoke reel unit -#define STEPPER_144STEPS_DICE 2 // STARPOINT 1DCU DICE mechanism - tech sheet available on request +#define STARPOINT_48STEP_REEL 0 // STARPOINT RMXXX reel unit +#define BARCREST_48STEP_REEL 1 // Barcrest bespoke reel unit +#define STARPOINT_144STEPS_DICE 2 // STARPOINT 1DCU DICE mechanism - tech sheet available on request void Stepper_init( int id, int type); // init a stepper motor diff --git a/src/mame/machine/strtheat.c b/src/mame/machine/strtheat.c index 8c888c9b1e7..0b9fd32df1a 100644 --- a/src/mame/machine/strtheat.c +++ b/src/mame/machine/strtheat.c @@ -180,6 +180,9 @@ static READ8_HANDLER( strtheat_inputport_1_r ) DRIVER_INIT( strtheat ) { + + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, MRA8_BANK1 ); + /* While the PAL supports up to 16 decryption methods, only four are actually used in the PAL. Therefore, we'll take a little memory overhead and decrypt the ROMs using each method in advance. */ |