mirror of
https://github.com/holub/mame
synced 2025-07-05 09:57:47 +03:00
Merge branch 'master' of https://github.com/mamedev/mame
This commit is contained in:
commit
33036a64cc
@ -477,6 +477,7 @@ The games seem to use them to mark platforms, kill zones and no-go areas.
|
|||||||
#define CPS_B_21_QS4 0x2e,0x0c01, -1, -1, -1, -1, 0x1c,0x1e,0x08, 0x16,{0x00,0x02,0x28,0x2a},0x2c, {0x04,0x08,0x10,0x00,0x00}
|
#define CPS_B_21_QS4 0x2e,0x0c01, -1, -1, -1, -1, 0x1c,0x1e,0x08, 0x16,{0x00,0x02,0x28,0x2a},0x2c, {0x04,0x08,0x10,0x00,0x00}
|
||||||
#define CPS_B_21_QS5 0x1e,0x0c02, -1, -1, -1, -1, 0x0c, -1, -1, 0x2a,{0x2c,0x2e,0x30,0x32},0x1c, {0x04,0x08,0x10,0x00,0x00}
|
#define CPS_B_21_QS5 0x1e,0x0c02, -1, -1, -1, -1, 0x0c, -1, -1, 0x2a,{0x2c,0x2e,0x30,0x32},0x1c, {0x04,0x08,0x10,0x00,0x00}
|
||||||
#define HACK_B_1 -1, -1, -1, -1, -1, -1, -1, -1, -1, 0x14,{0x12,0x10,0x0e,0x0c},0x0a, {0x0e,0x0e,0x0e,0x30,0x30}
|
#define HACK_B_1 -1, -1, -1, -1, -1, -1, -1, -1, -1, 0x14,{0x12,0x10,0x0e,0x0c},0x0a, {0x0e,0x0e,0x0e,0x30,0x30}
|
||||||
|
#define HACK_B_2 -1, -1, __not_applicable__, 0x28,{0x26,0x24,0x22,0x20},0x22, {0x20,0x04,0x08,0x12,0x12}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
CPS_B_21_DEF is CPS-B-21 at default settings (no battery)
|
CPS_B_21_DEF is CPS-B-21 at default settings (no battery)
|
||||||
@ -1478,7 +1479,7 @@ static const struct CPS1config cps1_config_table[]=
|
|||||||
{"3wondersu", CPS_B_21_BT1, mapper_RT24B },
|
{"3wondersu", CPS_B_21_BT1, mapper_RT24B },
|
||||||
{"wonder3", CPS_B_21_BT1, mapper_RT22B }, // equivalent to RT24B
|
{"wonder3", CPS_B_21_BT1, mapper_RT22B }, // equivalent to RT24B
|
||||||
{"3wondersb", CPS_B_21_BT1, mapper_RT24B, 0x36, 0, 0, 0x88 }, // same as 3wonders except some registers are hard wired rather than written to
|
{"3wondersb", CPS_B_21_BT1, mapper_RT24B, 0x36, 0, 0, 0x88 }, // same as 3wonders except some registers are hard wired rather than written to
|
||||||
{"3wondersh", CPS_B_02 , mapper_RT24B }, /* Not 100% sure of the CPS B-ID */
|
{"3wondersh", HACK_B_2, mapper_RT24B }, // one port is changed from 3wonders, and no protection
|
||||||
{"kod", CPS_B_21_BT2, mapper_KD29B, 0x36, 0, 0x34 },
|
{"kod", CPS_B_21_BT2, mapper_KD29B, 0x36, 0, 0x34 },
|
||||||
{"kodr1", CPS_B_21_BT2, mapper_KD29B, 0x36, 0, 0x34 },
|
{"kodr1", CPS_B_21_BT2, mapper_KD29B, 0x36, 0, 0x34 },
|
||||||
{"kodu", CPS_B_21_BT2, mapper_KD29B, 0x36, 0, 0x34 },
|
{"kodu", CPS_B_21_BT2, mapper_KD29B, 0x36, 0, 0x34 },
|
||||||
@ -1767,7 +1768,7 @@ READ16_MEMBER(cps_state::cps1_cps_b_r)
|
|||||||
{
|
{
|
||||||
if (offset == 0x10/2)
|
if (offset == 0x10/2)
|
||||||
{
|
{
|
||||||
// UNKNOWN--only mmatrix appears to read this, and I'm not sure if the result is actuallyused
|
// UNKNOWN--only mmatrix appears to read this, and I'm not sure if the result is actually used
|
||||||
return m_cps_b_regs[0x10 / 2];
|
return m_cps_b_regs[0x10 / 2];
|
||||||
}
|
}
|
||||||
if (offset == 0x12/2)
|
if (offset == 0x12/2)
|
||||||
|
Loading…
Reference in New Issue
Block a user