mirror of
https://github.com/holub/mame
synced 2025-04-20 23:42:22 +03:00
Merge branch 'master' of https://github.com/mamedev/mame
This commit is contained in:
commit
7c03cff3a3
@ -204,6 +204,12 @@ static INPUT_PORTS_START( iteagle )
|
||||
PORT_DIPSETTING(0x4000, "High" )
|
||||
PORT_DIPSETTING(0x0000, "Not Detected" )
|
||||
|
||||
PORT_START("TRACKX1")
|
||||
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
|
||||
|
||||
PORT_START("TRACKY1")
|
||||
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
|
||||
|
||||
PORT_START("VERSION")
|
||||
PORT_DIPNAME( 0x0F00, 0x0000, "GAME" )
|
||||
PORT_DIPNAME( 0x00F0, 0x0000, "MAJOR" )
|
||||
@ -214,10 +220,10 @@ INPUT_PORTS_END
|
||||
static INPUT_PORTS_START( gtfore02 )
|
||||
PORT_INCLUDE(iteagle)
|
||||
|
||||
PORT_START("TRACKX1")
|
||||
PORT_MODIFY("TRACKX1")
|
||||
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_PLAYER(1)
|
||||
|
||||
PORT_START("TRACKY1")
|
||||
PORT_MODIFY("TRACKY1")
|
||||
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(1)
|
||||
|
||||
PORT_MODIFY("VERSION")
|
||||
@ -260,11 +266,11 @@ static INPUT_PORTS_START( carnking )
|
||||
PORT_DIPNAME( 0x0F00, 0x0600, "GAME" )
|
||||
PORT_DIPNAME( 0x00F0, 0x0030, "MAJOR" )
|
||||
|
||||
PORT_START("TRACKX1")
|
||||
PORT_MODIFY("TRACKX1")
|
||||
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
|
||||
//PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(1) PORT_PLAYER(1)
|
||||
|
||||
PORT_START("TRACKY1")
|
||||
PORT_MODIFY("TRACKY1")
|
||||
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
|
||||
//PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(1) PORT_PLAYER(1)
|
||||
|
||||
|
@ -2589,6 +2589,7 @@ ROM_START( sammymdl )
|
||||
ROM_REGION( 0x1000000, "oki", ROMREGION_ERASEFF )
|
||||
|
||||
ROM_REGION( 0x40000, "maincpu", ROMREGION_ERASEFF )
|
||||
ROM_COPY( "mainbios", 0x0000, 0x0000, 0x40000 )
|
||||
|
||||
ROM_REGION( 0x200000, "sprites", ROMREGION_ERASEFF )
|
||||
ROM_END
|
||||
@ -2815,7 +2816,7 @@ GAME( 1998, tbeastw2, 0, gegege, sigma_3b, sigmab98_state, tbeastw2, RO
|
||||
GAME( 1997, ucytokyu, 0, gegege, sigma_js, sigmab98_state, ucytokyu, ROT0, "Sigma", "Uchuu Tokkyuu Medalian", GAME_IMPERFECT_GRAPHICS ) // Banpresto + others in the ROM
|
||||
GAME( 2000, dashhero, 0, dashhero, sigma_1b, sigmab98_state, dashhero, ROT0, "Sigma", "Minna Ganbare! Dash Hero", GAME_IMPERFECT_GRAPHICS | GAME_NOT_WORKING ) // 1999 in the rom
|
||||
// Sammy Medal Games:
|
||||
GAME( 2000, sammymdl, 0, sammymdl, sammymdl, driver_device, 0, ROT0, "Sammy", "Sammy Medal Game System Bios", GAME_IS_BIOS_ROOT )
|
||||
GAME( 2000, sammymdl, 0, sammymdl, sammymdl, sigmab98_state, animalc, ROT0, "Sammy", "Sammy Medal Game System Bios", GAME_IS_BIOS_ROOT )
|
||||
GAME( 2000, animalc, sammymdl, animalc, sammymdl, sigmab98_state, animalc, ROT0, "Sammy", "Animal Catch", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 2000, itazuram, sammymdl, itazuram, sammymdl, sigmab98_state, itazuram, ROT0, "Sammy", "Itazura Monkey", GAME_IMPERFECT_GRAPHICS )
|
||||
GAME( 2000, pyenaget, sammymdl, pyenaget, sammymdl, sigmab98_state, haekaka, ROT0, "Sammy", "Pye-nage Taikai", GAME_IMPERFECT_GRAPHICS )
|
||||
|
Loading…
Reference in New Issue
Block a user