diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c index 6f6407fe515..d7ac525f570 100644 --- a/src/mame/drivers/igs009.c +++ b/src/mame/drivers/igs009.c @@ -510,41 +510,41 @@ ADDRESS_MAP_END static INPUT_PORTS_START( jingbell ) PORT_START("DSW1") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) + PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("DSW1:1") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x00, "W-Up Bonus" ) + PORT_DIPNAME( 0x02, 0x00, "W-Up Bonus" ) PORT_DIPLOCATION("DSW1:2") PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) // it's shown in attract mode - PORT_DIPNAME( 0x04, 0x04, "Min Bet" ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x04, 0x04, "Min Bet" ) PORT_DIPLOCATION("DSW1:3") PORT_DIPSETTING( 0x04, "1" ) PORT_DIPSETTING( 0x00, "8" ) - PORT_DIPNAME( 0x08, 0x08, "Spin Speed" ) + PORT_DIPNAME( 0x08, 0x08, "Spin Speed" ) PORT_DIPLOCATION("DSW1:4") PORT_DIPSETTING( 0x08, "Slow" ) PORT_DIPSETTING( 0x00, "Quick" ) - PORT_DIPNAME( 0x10, 0x00, "Strip Girl" ) + PORT_DIPNAME( 0x10, 0x00, "Strip Girl" ) PORT_DIPLOCATION("DSW1:5") PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, "Payout Mode" ) + PORT_DIPNAME( 0x20, 0x20, "Payout Mode" ) PORT_DIPLOCATION("DSW1:6") PORT_DIPSETTING( 0x20, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x00, "Auto" ) - PORT_DIPNAME( 0xc0, 0xc0, "Player's Panel" ) + PORT_DIPNAME( 0xc0, 0xc0, "Player's Panel" ) PORT_DIPLOCATION("DSW1:7,8") PORT_DIPSETTING( 0x00, "Type A" ) PORT_DIPSETTING( 0xc0, "Type A" ) PORT_DIPSETTING( 0x80, "Type B" ) PORT_DIPSETTING( 0x40, "Type C" ) PORT_START("DSW2") - PORT_DIPNAME( 0x07, 0x07, "Main Game Rate (%)" ) - PORT_DIPSETTING( 0x07, "89" ) - PORT_DIPSETTING( 0x06, "90" ) - PORT_DIPSETTING( 0x05, "91" ) - PORT_DIPSETTING( 0x04, "92" ) - PORT_DIPSETTING( 0x03, "93" ) - PORT_DIPSETTING( 0x02, "94" ) - PORT_DIPSETTING( 0x01, "95" ) - PORT_DIPSETTING( 0x00, "96" ) - PORT_DIPNAME( 0x38, 0x38, "W-Up Chance (%)" ) + PORT_DIPNAME( 0x07, 0x07, "Main Game Rate (%)" ) PORT_DIPLOCATION("DSW2:1,2,3") + PORT_DIPSETTING( 0x07, "55" ) + PORT_DIPSETTING( 0x06, "60" ) + PORT_DIPSETTING( 0x05, "65" ) + PORT_DIPSETTING( 0x04, "70" ) + PORT_DIPSETTING( 0x03, "75" ) + PORT_DIPSETTING( 0x02, "80" ) + PORT_DIPSETTING( 0x01, "85" ) + PORT_DIPSETTING( 0x00, "90" ) + PORT_DIPNAME( 0x38, 0x38, "W-Up Chance (%)" ) PORT_DIPLOCATION("DSW2:4,5,6") PORT_DIPSETTING( 0x38, "93" ) PORT_DIPSETTING( 0x30, "94" ) PORT_DIPSETTING( 0x28, "95" ) @@ -553,14 +553,14 @@ static INPUT_PORTS_START( jingbell ) PORT_DIPSETTING( 0x10, "98" ) PORT_DIPSETTING( 0x08, "99" ) PORT_DIPSETTING( 0x00, "100" ) - PORT_DIPNAME( 0xc0, 0xc0, "Key In Limit" ) + PORT_DIPNAME( 0xc0, 0xc0, "Key In Limit" ) PORT_DIPLOCATION("DSW2:7,8") PORT_DIPSETTING( 0xc0, "1k" ) PORT_DIPSETTING( 0x80, "3k" ) PORT_DIPSETTING( 0x40, "5k" ) PORT_DIPSETTING( 0x00, "10k" ) PORT_START("DSW3") - PORT_DIPNAME( 0x07, 0x07, "Key In Rate" ) + PORT_DIPNAME( 0x07, 0x07, "Key In Rate" ) PORT_DIPLOCATION("DSW3:1,2,3") PORT_DIPSETTING( 0x07, "1" ) PORT_DIPSETTING( 0x06, "5" ) PORT_DIPSETTING( 0x05, "10" ) @@ -569,7 +569,7 @@ static INPUT_PORTS_START( jingbell ) PORT_DIPSETTING( 0x02, "100" ) PORT_DIPSETTING( 0x01, "200" ) PORT_DIPSETTING( 0x00, "500" ) - PORT_DIPNAME( 0x38, 0x38, "Coin 1 Rate" ) + PORT_DIPNAME( 0x38, 0x38, "Coin 1 Rate" ) PORT_DIPLOCATION("DSW3:4,5,6") PORT_DIPSETTING( 0x38, "1" ) PORT_DIPSETTING( 0x30, "2" ) PORT_DIPSETTING( 0x28, "5" ) @@ -578,20 +578,20 @@ static INPUT_PORTS_START( jingbell ) PORT_DIPSETTING( 0x10, "25" ) PORT_DIPSETTING( 0x08, "50" ) PORT_DIPSETTING( 0x00, "100" ) - PORT_DIPNAME( 0xc0, 0xc0, "System Limit" ) + PORT_DIPNAME( 0xc0, 0xc0, "System Limit" ) PORT_DIPLOCATION("DSW3:7,8") PORT_DIPSETTING( 0xc0, "5k" ) PORT_DIPSETTING( 0x80, "10k" ) PORT_DIPSETTING( 0x40, "30k" ) - PORT_DIPSETTING( 0x00, "50k" ) + PORT_DIPSETTING( 0x00, "Unlimited" ) PORT_START("DSW4") - PORT_DIPNAME( 0x01, 0x01, "Min Play For Fever" ) + PORT_DIPNAME( 0x01, 0x01, "Min Play For Fever" ) PORT_DIPLOCATION("DSW4:1") PORT_DIPSETTING( 0x01, "8" ) PORT_DIPSETTING( 0x00, "16" ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) + PORT_DIPNAME( 0x02, 0x02, "Max Bet" ) PORT_DIPLOCATION("DSW4:2") PORT_DIPSETTING( 0x02, "16" ) PORT_DIPSETTING( 0x00, "32" ) - PORT_DIPNAME( 0x1c, 0x1c, "Coin 2 Rate" ) + PORT_DIPNAME( 0x1c, 0x1c, "Coin 2 Rate" ) PORT_DIPLOCATION("DSW4:3,4,5") PORT_DIPSETTING( 0x1c, "1" ) PORT_DIPSETTING( 0x18, "2" ) PORT_DIPSETTING( 0x14, "5" ) @@ -600,24 +600,39 @@ static INPUT_PORTS_START( jingbell ) PORT_DIPSETTING( 0x08, "40" ) PORT_DIPSETTING( 0x04, "50" ) PORT_DIPSETTING( 0x00, "100" ) - PORT_DIPNAME( 0x60, 0x60, "Key Out Rate" ) + PORT_DIPNAME( 0x60, 0x60, "Key Out Rate" ) PORT_DIPLOCATION("DSW4:6,7") PORT_DIPSETTING( 0x60, "1" ) PORT_DIPSETTING( 0x40, "10" ) PORT_DIPSETTING( 0x20, "50" ) PORT_DIPSETTING( 0x00, "100" ) - PORT_DIPNAME( 0x80, 0x80, "Play Line" ) + PORT_DIPNAME( 0x80, 0x80, "Play Line" ) PORT_DIPLOCATION("DSW4:8") PORT_DIPSETTING( 0x80, "8" ) PORT_DIPSETTING( 0x00, "16" ) +// These are from the manual for v201us - DSW1-DSW4 match but DSW5 doesn't seem to match or actuallly do anything PORT_START("DSW5") - PORT_DIPUNKNOWN( 0x01, 0x01 ) - PORT_DIPUNKNOWN( 0x02, 0x02 ) - PORT_DIPUNKNOWN( 0x04, 0x04 ) - PORT_DIPUNKNOWN( 0x08, 0x08 ) - PORT_DIPUNKNOWN( 0x10, 0x10 ) - PORT_DIPUNKNOWN( 0x20, 0x20 ) - PORT_DIPUNKNOWN( 0x40, 0x40 ) - PORT_DIPUNKNOWN( 0x80, 0x80 ) + PORT_DIPNAME( 0x03, 0x00, "Maximum Play" ) PORT_DIPLOCATION("DSW5:1,2") + PORT_DIPSETTING( 0x00, "64" ) + PORT_DIPSETTING( 0x01, "32" ) + PORT_DIPSETTING( 0x02, "16" ) + PORT_DIPSETTING( 0x03, "8" ) + PORT_DIPNAME( 0x04, 0x04, "Skill Stop" ) PORT_DIPLOCATION("DSW5:3") + PORT_DIPSETTING( 0x04, "On" ) + PORT_DIPSETTING( 0x00, "Off" ) + PORT_DIPNAME( 0x08, 0x00, "Hands Count" ) PORT_DIPLOCATION("DSW5:4") + PORT_DIPSETTING( 0x08, "No" ) + PORT_DIPSETTING( 0x00, "Yes" ) + PORT_DIPNAME( 0x30, 0x00, "Hands Coin Rate" ) PORT_DIPLOCATION("DSW5:5,6") + PORT_DIPSETTING( 0x00, "25" ) + PORT_DIPSETTING( 0x20, "10" ) + PORT_DIPSETTING( 0x10, "5" ) + PORT_DIPSETTING( 0x30, "1" ) + PORT_DIPNAME( 0x40, 0x40, "Hands Coin Value" ) PORT_DIPLOCATION("DSW5:7") + PORT_DIPSETTING( 0x00, "40" ) + PORT_DIPSETTING( 0x40, "20" ) + PORT_DIPNAME( 0x80, 0x80, "Unused" ) PORT_DIPLOCATION("DSW5:8") + PORT_DIPSETTING( 0x00, "On" ) + PORT_DIPSETTING( 0x80, "Off" ) PORT_START("SERVICE") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -634,7 +649,7 @@ static INPUT_PORTS_START( jingbell ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_GAMBLE_KEYIN ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT ) PORT_NAME("Key Down") // pays out + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT ) PORT_NAME("Key Down") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -650,11 +665,11 @@ static INPUT_PORTS_START( jingbell ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("BUTTONS2") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start / H_Dup") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start / Half D-Up Bet") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_LOW ) PORT_NAME("Small") - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Left Bet / D_Dup") + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Left Bet / 2X D-Up Bet") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_GAMBLE_TAKE ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Right Bet / Dup") + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Right Bet / D-Up Bet") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_GAMBLE_HIGH ) PORT_NAME("Big") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c index b8e0e873496..6b84ecd0f94 100644 --- a/src/mess/drivers/pc9801.c +++ b/src/mess/drivers/pc9801.c @@ -1432,14 +1432,14 @@ void pc9801_state::egc_blit_w(UINT32 offset, UINT16 data, UINT16 mem_mask) { dst_off &= 7; if(m_egc.first) - m_egc.count -= dir ? 7 - dst_off : dst_off; + m_egc.count -= dir ? 8 - dst_off : (dst_off + 1); else m_egc.count -= 8; } else { if(m_egc.first) - m_egc.count -= dir ? 15 - dst_off : dst_off; + m_egc.count -= dir ? 16 - dst_off : (dst_off + 1); else m_egc.count -= 16; } @@ -1455,7 +1455,7 @@ void pc9801_state::egc_blit_w(UINT32 offset, UINT16 data, UINT16 mem_mask) UINT16 pc9801_state::egc_blit_r(UINT32 offset, UINT16 mem_mask) { - UINT16 plane_off = offset & 0x13fff; + UINT32 plane_off = offset & 0x13fff; if((m_egc.regs[2] & 0x300) == 0x100) { m_egc.pat[0] = m_video_ram_2[plane_off + 0x4000]; diff --git a/src/mess/machine/victor9kb.c b/src/mess/machine/victor9kb.c index c3625ffe4bf..2774feffffa 100644 --- a/src/mess/machine/victor9kb.c +++ b/src/mess/machine/victor9kb.c @@ -418,7 +418,7 @@ machine_config_constructor victor_9000_keyboard_t::device_mconfig_additions() co INPUT_PORTS_START( victor9k_keyboard ) PORT_START("Y0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("CLR/HOME") PORT_CODE(KEYCODE_HOME) // S12 - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("\xc2\xb1/\xc2\xb0/"UTF8_SMALL_PI) PORT_CODE(KEYCODE_TILDE) // +-, degree, pi // S13 + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME(UTF8_PLUSMINUS" "UTF8_DEGREES" "UTF8_SMALL_PI) PORT_CODE(KEYCODE_TILDE) // +-, degree, pi // S13 PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME(UTF8_UP" SCRL "UTF8_DOWN) PORT_CODE(KEYCODE_SCRLOCK) // unicode arrows // S33 PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("TAB/BACK") PORT_CODE(KEYCODE_TAB) PORT_CHAR(9) // S34 PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("RVS On-Off/ESC") PORT_CODE(KEYCODE_ESC) PORT_CHAR(27) // S54 @@ -510,7 +510,7 @@ INPUT_PORTS_START( victor9k_keyboard ) PORT_START("Y9") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Keypad %") // find a good key for this // S30 - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Keypad \xc3\xb7") PORT_CODE(KEYCODE_SLASH_PAD) // unicode division sign U+00F7 // S31 + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Keypad "UTF8_DIVIDE) PORT_CODE(KEYCODE_SLASH_PAD) // unicode division sign U+00F7 // S31 PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Keypad 8") PORT_CODE(KEYCODE_8_PAD) // S51 PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Keypad 9") PORT_CODE(KEYCODE_9_PAD) // S52 PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Keypad 5") PORT_CODE(KEYCODE_5_PAD) // S72 @@ -519,7 +519,7 @@ INPUT_PORTS_START( victor9k_keyboard ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Keypad Enter") PORT_CODE(KEYCODE_ENTER_PAD) // S94 PORT_START("YA") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Keypad \xc3\x97") PORT_CODE(KEYCODE_ASTERISK) // unicode multiply sign U+00D7 // S32 + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Keypad "UTF8_MULTIPLY) PORT_CODE(KEYCODE_ASTERISK) // unicode multiply sign U+00D7 // S32 PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("F10 [10]") PORT_CODE(KEYCODE_F10) // S11 PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Keypad -") PORT_CODE(KEYCODE_MINUS_PAD) // S53 PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("F9 [9]") PORT_CODE(KEYCODE_F9) // S10