summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/jpmsys5sw.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-05-07 23:18:47 +1000
committer Vas Crabb <vas@vastheman.com>2017-05-14 21:44:11 +1000
commit0f0d39ef81562c75e79176dd3bebb1e491ca39d5 (patch)
tree201cee7fdf55ee800f83859a92efd2cfe66cf2b3 /src/mame/drivers/jpmsys5sw.cpp
parente6c4be2b4d71c7a6c95be0bae111eb416ff0f9e7 (diff)
Move static data out of devices into the device types. This is a significant change, so please pay attention.
The core changes are: * Short name, full name and source file are no longer members of device_t, they are part of the device type * MACHINE_COFIG_START no longer needs a driver class * MACHINE_CONFIG_DERIVED_CLASS is no longer necessary * Specify the state class you want in the GAME/COMP/CONS line * The compiler will work out the base class where the driver init member is declared * There is one static device type object per driver rather than one per machine configuration Use DECLARE_DEVICE_TYPE or DECLARE_DEVICE_TYPE_NS to declare device type. * DECLARE_DEVICE_TYPE forward-declares teh device type and class, and declares extern object finders. * DECLARE_DEVICE_TYPE_NS is for devices classes in namespaces - it doesn't forward-declare the device type. Use DEFINE_DEVICE_TYPE or DEFINE_DEVICE_TYPE_NS to define device types. * These macros declare storage for the static data, and instantiate the device type and device finder templates. The rest of the changes are mostly just moving stuff out of headers that shouldn't be there, renaming stuff for consistency, and scoping stuff down where appropriate. Things I've actually messed with substantially: * More descriptive names for a lot of devices * Untangled the fantasy sound from the driver state, which necessitates breaking up sound/flip writes * Changed DECO BSMT2000 ready callback into a device delegate * Untangled Microprose 3D noise from driver state * Used object finders for CoCo multipak, KC85 D002, and Irem sound subdevices * Started to get TI-99 stuff out of the TI-990 directory and arrange bus devices properly * Started to break out common parts of Samsung ARM SoC devices * Turned some of FM, SID, SCSP DSP, EPIC12 and Voodoo cores into something resmbling C++ * Tried to make Z180 table allocation/setup a bit safer * Converted generic keyboard/terminal to not use WRITE8 - space/offset aren't relevant * Dynamically allocate generic terminal buffer so derived devices (e.g. teleprinter) can specify size * Imporved encapsulation of Z80DART channels * Refactored the SPC7110 bit table generator loop to make it more readable * Added wrappers for SNES PPU operations so members can be made protected * Factored out some boilerplate for YM chips with PSG * toaplan2 gfx * stic/intv resolution * Video System video * Out Run/Y-board sprite alignment * GIC video hookup * Amstrad CPC ROM box members * IQ151 ROM cart region * MSX cart IRQ callback resolution time * SMS passthrough control devices starting subslots I've smoke-tested several drivers, but I've probably missed something. Things I've missed will likely blow up spectacularly with failure to bind errors and the like. Let me know if there's more subtle breakage (could have happened in FM or Voodoo). And can everyone please, please try to keep stuff clean. In particular, please stop polluting the global namespace. Keep things out of headers that don't need to be there, and use things that can be scoped down rather than macros. It feels like an uphill battle trying to get this stuff under control while more of it's added.
Diffstat (limited to 'src/mame/drivers/jpmsys5sw.cpp')
-rw-r--r--src/mame/drivers/jpmsys5sw.cpp372
1 files changed, 186 insertions, 186 deletions
diff --git a/src/mame/drivers/jpmsys5sw.cpp b/src/mame/drivers/jpmsys5sw.cpp
index 14d0f3bf66f..f1ff1c6c530 100644
--- a/src/mame/drivers/jpmsys5sw.cpp
+++ b/src/mame/drivers/jpmsys5sw.cpp
@@ -1410,228 +1410,228 @@ ROM_END
#define GAME_FLAGS MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL|MACHINE_NO_SOUND|MACHINE_CLICKABLE_ARTWORK
-GAME( 199?, j5tstal , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "JPM System 5 Alpha Display Test Utility (JPM) (SYSTEM5)", GAME_FLAGS )
-GAME( 199?, j5tst1 , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "JPM System 5 Test Set (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5tst2 , j5tst1 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "JPM System 5 Test Set (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5tstal , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "JPM System 5 Alpha Display Test Utility (JPM) (SYSTEM5)", GAME_FLAGS )
+GAME( 199?, j5tst1 , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "JPM System 5 Test Set (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5tst2 , j5tst1 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "JPM System 5 Test Set (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
/* SAA based board */
-GAME( 199?, j5fifth , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "5th Avenue (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
+GAME( 199?, j5fifth , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "5th Avenue (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
-GAME( 199?, j5clbnud , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Club Nudger (JPM) (SYSTEM5-SAA, set 1)", GAME_FLAGS )
-GAME( 199?, j5clbnuda , j5clbnud , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Club Nudger (JPM) (SYSTEM5-SAA, set 2)", GAME_FLAGS )
+GAME( 199?, j5clbnud , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Club Nudger (JPM) (SYSTEM5-SAA, set 1)", GAME_FLAGS )
+GAME( 199?, j5clbnuda , j5clbnud , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Club Nudger (JPM) (SYSTEM5-SAA, set 2)", GAME_FLAGS )
-GAMEL( 199?, j5firebl , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Fireball (JPM) (SYSTEM5-SAA, set 1)", GAME_FLAGS, layout_j5firebl )
-GAMEL( 199?, j5firebla , j5firebl , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Fireball (JPM) (SYSTEM5-SAA, set 2)", GAME_FLAGS, layout_j5firebl )
-GAMEL( 199?, j5fireblb , j5firebl , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Fireball (JPM) (SYSTEM5-SAA, set 3)", GAME_FLAGS, layout_j5firebl )
+GAMEL( 199?, j5firebl , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fireball (JPM) (SYSTEM5-SAA, set 1)", GAME_FLAGS, layout_j5firebl )
+GAMEL( 199?, j5firebla , j5firebl , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fireball (JPM) (SYSTEM5-SAA, set 2)", GAME_FLAGS, layout_j5firebl )
+GAMEL( 199?, j5fireblb , j5firebl , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fireball (JPM) (SYSTEM5-SAA, set 3)", GAME_FLAGS, layout_j5firebl )
-GAME( 199?, j5frmag , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Fruit Magic (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
+GAME( 199?, j5frmag , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fruit Magic (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
-GAME( 199?, j5goldbr , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Golden Bars (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
+GAME( 199?, j5goldbr , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Golden Bars (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
-GAME( 199?, j5reelgh , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Reel Ghost (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
+GAME( 199?, j5reelgh , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Reel Ghost (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
-GAME( 199?, j5sup4 , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Super 4 (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
+GAME( 199?, j5sup4 , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Super 4 (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
-GAMEL( 199?, j5suphi , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Super Hi-Lo (JPM) (SYSTEM5-SAA)", GAME_FLAGS, layout_j5suphi )
+GAMEL( 199?, j5suphi , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Super Hi-Lo (JPM) (SYSTEM5-SAA)", GAME_FLAGS, layout_j5suphi )
-GAMEL( 199?, j5swop , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Swop A Fruit Club (JPM) (SYSTEM5-SAA)", GAME_FLAGS, layout_j5swop )
+GAMEL( 199?, j5swop , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Swop A Fruit Club (JPM) (SYSTEM5-SAA)", GAME_FLAGS, layout_j5swop )
-GAME( 199?, j5td , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Tumbling Dice (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
+GAME( 199?, j5td , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Tumbling Dice (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
/* YM based board */
-GAME( 199?, j5ar80 , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 1)", GAME_FLAGS ) // This was also listed as by 'Crystal'. There was Crystal ROM in the set, but it wasn't an JPM SYS5 rom...
-GAME( 199?, j5ar80a , j5ar80 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5ar80b , j5ar80 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5ar80c , j5ar80 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-GAME( 199?, j5ar80d , j5ar80 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
-
-GAMEL( 199?, j5ar80cl , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5ar80cla )
-GAMEL( 199?, j5ar80cla , j5ar80cl , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5ar80cla )
-GAMEL( 199?, j5ar80clb , j5ar80cl , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5ar80cla )
-GAMEL( 199?, j5ar80clc , j5ar80cl , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5ar80cla )
-
-GAME( 199?, j5buc , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Buccaneer (JPM) (SYSTEM5)", GAME_FLAGS )
-
-GAMEL( 199?, j5cir , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5cira )
-GAMEL( 199?, j5cira , j5cir , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5cira )
-GAMEL( 199?, j5cirb , j5cir , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5cira )
-GAMEL( 199?, j5circ , j5cir , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5cira )
-GAMEL( 199?, j5cird , j5cir , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5cira )
-GAMEL( 199?, j5cire , j5cir , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5cira )
-
-
-GAME( 199?, j5daytn , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Daytona (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5daytna , j5daytn , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Daytona (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-
-GAME( 199?, j5daycls , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Daytona Classic (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5dayclsa , j5daycls , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Daytona Classic (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-
-GAME( 199?, j5dirty , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5dirtya , j5dirty , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5dirtyb , j5dirty , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5dirtyc , j5dirty , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-
-GAME( 199?, j5fairgd , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS ) // or just 'Fairground' ?
-GAME( 199?, j5fairgda , j5fairgd , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5fairgdb , j5fairgd , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5fairgdc , j5fairgd , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-GAME( 199?, j5fairgdd , j5fairgd , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
-GAME( 199?, j5fairgde , j5fairgd , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
-
-GAMEL( 199?, j5fair , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5faira , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairb , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairc , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5faird , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5faire , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairf , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 7)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairg , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 8)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairh , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 9)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairi , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 10)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairj , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 11)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairk , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 12)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairl , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 13)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairm , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 14)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairn , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 15)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairo , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 16)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairp , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 17)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairq , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 18)", GAME_FLAGS, layout_j5fairp )
-
-GAME( 199?, j5filth , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5filtha , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5filthb , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5filthc , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-GAME( 199?, j5filthd , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
-GAME( 199?, j5filthe , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
-GAME( 199?, j5filthf , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 7)", GAME_FLAGS )
-GAME( 199?, j5filthg , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 8)", GAME_FLAGS )
-GAME( 199?, j5filthh , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 9)", GAME_FLAGS )
-GAME( 199?, j5filthi , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 10)", GAME_FLAGS )
-GAME( 199?, j5filthj , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 11)", GAME_FLAGS )
-
-
-GAME( 199?, j5hagar , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5hagara , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5hagarb , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5hagarc , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-GAME( 199?, j5hagard , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
-GAME( 199?, j5hagare , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
-GAME( 199?, j5hagarf , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 7)", GAME_FLAGS )
-GAME( 199?, j5hagarg , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 8)", GAME_FLAGS )
-GAME( 199?, j5hagarh , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 9)", GAME_FLAGS )
-GAME( 199?, j5hagari , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 10)", GAME_FLAGS )
-GAME( 199?, j5hagarj , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 11)", GAME_FLAGS )
-
-GAME( 199?, j5hagsho , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5hagshoa , j5hagsho , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5hagshob , j5hagsho , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5hagshoc , j5hagsho , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+GAME( 199?, j5ar80 , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 1)", GAME_FLAGS ) // This was also listed as by 'Crystal'. There was Crystal ROM in the set, but it wasn't an JPM SYS5 rom...
+GAME( 199?, j5ar80a , j5ar80 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5ar80b , j5ar80 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5ar80c , j5ar80 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+GAME( 199?, j5ar80d , j5ar80 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
+
+GAMEL( 199?, j5ar80cl , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5ar80cla )
+GAMEL( 199?, j5ar80cla , j5ar80cl , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5ar80cla )
+GAMEL( 199?, j5ar80clb , j5ar80cl , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5ar80cla )
+GAMEL( 199?, j5ar80clc , j5ar80cl , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5ar80cla )
+
+GAME( 199?, j5buc , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Buccaneer (JPM) (SYSTEM5)", GAME_FLAGS )
+
+GAMEL( 199?, j5cir , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5cira )
+GAMEL( 199?, j5cira , j5cir , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5cira )
+GAMEL( 199?, j5cirb , j5cir , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5cira )
+GAMEL( 199?, j5circ , j5cir , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5cira )
+GAMEL( 199?, j5cird , j5cir , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5cira )
+GAMEL( 199?, j5cire , j5cir , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5cira )
+
+
+GAME( 199?, j5daytn , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Daytona (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5daytna , j5daytn , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Daytona (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+
+GAME( 199?, j5daycls , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Daytona Classic (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5dayclsa , j5daycls , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Daytona Classic (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+
+GAME( 199?, j5dirty , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5dirtya , j5dirty , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5dirtyb , j5dirty , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5dirtyc , j5dirty , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+
+GAME( 199?, j5fairgd , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS ) // or just 'Fairground' ?
+GAME( 199?, j5fairgda , j5fairgd , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5fairgdb , j5fairgd , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5fairgdc , j5fairgd , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+GAME( 199?, j5fairgdd , j5fairgd , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
+GAME( 199?, j5fairgde , j5fairgd , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
+
+GAMEL( 199?, j5fair , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5faira , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairb , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairc , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5faird , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5faire , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairf , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 7)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairg , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 8)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairh , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 9)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairi , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 10)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairj , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 11)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairk , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 12)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairl , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 13)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairm , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 14)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairn , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 15)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairo , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 16)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairp , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 17)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairq , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 18)", GAME_FLAGS, layout_j5fairp )
+
+GAME( 199?, j5filth , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5filtha , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5filthb , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5filthc , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+GAME( 199?, j5filthd , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
+GAME( 199?, j5filthe , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
+GAME( 199?, j5filthf , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 7)", GAME_FLAGS )
+GAME( 199?, j5filthg , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 8)", GAME_FLAGS )
+GAME( 199?, j5filthh , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 9)", GAME_FLAGS )
+GAME( 199?, j5filthi , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 10)", GAME_FLAGS )
+GAME( 199?, j5filthj , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 11)", GAME_FLAGS )
+
+
+GAME( 199?, j5hagar , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5hagara , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5hagarb , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5hagarc , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+GAME( 199?, j5hagard , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
+GAME( 199?, j5hagare , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
+GAME( 199?, j5hagarf , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 7)", GAME_FLAGS )
+GAME( 199?, j5hagarg , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 8)", GAME_FLAGS )
+GAME( 199?, j5hagarh , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 9)", GAME_FLAGS )
+GAME( 199?, j5hagari , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 10)", GAME_FLAGS )
+GAME( 199?, j5hagarj , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 11)", GAME_FLAGS )
+
+GAME( 199?, j5hagsho , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5hagshoa , j5hagsho , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5hagshob , j5hagsho , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5hagshoc , j5hagsho , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-GAMEL( 199?, j5holly , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5hollyc )
-GAMEL( 199?, j5hollya , j5holly , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5hollyc )
-GAMEL( 199?, j5hollyb , j5holly , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5hollyc )
-GAMEL( 199?, j5hollyc , j5holly , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5hollyc )
-GAMEL( 199?, j5hollyd , j5holly , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5hollyc )
-GAMEL( 199?, j5hollye , j5holly , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5hollyc )
+GAMEL( 199?, j5holly , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5hollyc )
+GAMEL( 199?, j5hollya , j5holly , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5hollyc )
+GAMEL( 199?, j5hollyb , j5holly , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5hollyc )
+GAMEL( 199?, j5hollyc , j5holly , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5hollyc )
+GAMEL( 199?, j5hollyd , j5holly , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5hollyc )
+GAMEL( 199?, j5hollye , j5holly , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5hollyc )
-GAMEL( 199?, j5hotdog , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hot Dogs (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5hotdoga )
-GAMEL( 199?, j5hotdoga , j5hotdog , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hot Dogs (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5hotdoga )
+GAMEL( 199?, j5hotdog , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hot Dogs (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5hotdoga )
+GAMEL( 199?, j5hotdoga , j5hotdog , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hot Dogs (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5hotdoga )
-GAMEL( 199?, j5indsum , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Indian Summer (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5indsum )
-
-
-GAMEL( 199?, j5intr , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5intr )
-GAMEL( 199?, j5intra , j5intr , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5intr )
-GAMEL( 199?, j5intrb , j5intr , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5intr )
-GAMEL( 199?, j5intrc , j5intr , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5intr )
-
-GAME( 199?, j5jokgld , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5jokglda , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5jokgldb , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5jokgldc , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-GAME( 199?, j5jokgldd , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
-GAME( 199?, j5jokglde , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
-GAME( 199?, j5jokgldf , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 7)", GAME_FLAGS )
-GAME( 199?, j5jokgldg , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 8)", GAME_FLAGS )
-GAME( 199?, j5jokgldh , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 9)", GAME_FLAGS )
-
-GAMEL( 199?, j5nite , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Nite Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5nite )
-GAMEL( 199?, j5nitea , j5nite , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Nite Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5nite )
-
-GAMEL( 199?, j5palm , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Palm Springs (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5palma ) // doesn't behave well
-GAMEL( 199?, j5palma , j5palm , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Palm Springs (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5palma )
-
-GAME( 199?, j5phnx , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Phoenix (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5phnxa , j5phnx , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Phoenix (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-
-GAMEL( 199?, j5popeye , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5popeye ) // (20p/8 GBP Token) ?
-GAMEL( 199?, j5popeyea , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyeb , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyec , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyed , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyee , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyef , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 7)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyeg , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 8)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyeh , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 9)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyei , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 10)", GAME_FLAGS, layout_j5popeye )
-
-GAME( 199?, j5popth , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye's Treasure Hunt (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5poptha , j5popth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye's Treasure Hunt (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5popthb , j5popth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye's Treasure Hunt (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-
-GAME( 199?, j5popprz , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Prize Popeye Vending (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5popprza , j5popprz , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Prize Popeye Vending (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-
-
-GAME( 199?, j5roul , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Roulette (JPM) (SYSTEM5)", GAME_FLAGS )
+GAMEL( 199?, j5indsum , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Indian Summer (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5indsum )
+
+
+GAMEL( 199?, j5intr , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5intr )
+GAMEL( 199?, j5intra , j5intr , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5intr )
+GAMEL( 199?, j5intrb , j5intr , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5intr )
+GAMEL( 199?, j5intrc , j5intr , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5intr )
+
+GAME( 199?, j5jokgld , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5jokglda , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5jokgldb , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5jokgldc , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+GAME( 199?, j5jokgldd , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
+GAME( 199?, j5jokglde , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
+GAME( 199?, j5jokgldf , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 7)", GAME_FLAGS )
+GAME( 199?, j5jokgldg , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 8)", GAME_FLAGS )
+GAME( 199?, j5jokgldh , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 9)", GAME_FLAGS )
+
+GAMEL( 199?, j5nite , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Nite Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5nite )
+GAMEL( 199?, j5nitea , j5nite , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Nite Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5nite )
+
+GAMEL( 199?, j5palm , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Palm Springs (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5palma ) // doesn't behave well
+GAMEL( 199?, j5palma , j5palm , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Palm Springs (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5palma )
+
+GAME( 199?, j5phnx , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Phoenix (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5phnxa , j5phnx , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Phoenix (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+
+GAMEL( 199?, j5popeye , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5popeye ) // (20p/8 GBP Token) ?
+GAMEL( 199?, j5popeyea , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyeb , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyec , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyed , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyee , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyef , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 7)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyeg , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 8)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyeh , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 9)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyei , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 10)", GAME_FLAGS, layout_j5popeye )
+
+GAME( 199?, j5popth , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye's Treasure Hunt (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5poptha , j5popth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye's Treasure Hunt (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5popthb , j5popth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye's Treasure Hunt (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+
+GAME( 199?, j5popprz , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Prize Popeye Vending (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5popprza , j5popprz , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Prize Popeye Vending (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+
+
+GAME( 199?, j5roul , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Roulette (JPM) (SYSTEM5)", GAME_FLAGS )
-GAME( 199?, j5roulcl , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5roulcla , j5roulcl , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5roulclb , j5roulcl , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5roulclc , j5roulcl , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+GAME( 199?, j5roulcl , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5roulcla , j5roulcl , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5roulclb , j5roulcl , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5roulclc , j5roulcl , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-GAME( 199?, j5slvree , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Silver Reels (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5slvreea , j5slvree , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Silver Reels (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5slvree , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Silver Reels (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5slvreea , j5slvree , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Silver Reels (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5slvstr , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Silver Streak (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5slvstra , j5slvstr , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Silver Streak (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5slvstrb , j5slvstr , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Silver Streak (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5slvstr , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Silver Streak (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5slvstra , j5slvstr , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Silver Streak (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5slvstrb , j5slvstr , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Silver Streak (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5street , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Streetwise (JPM) (SYSTEM5)", GAME_FLAGS ) // doesn't behave well
+GAME( 199?, j5street , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Streetwise (JPM) (SYSTEM5)", GAME_FLAGS ) // doesn't behave well
-GAMEL( 199?, j5supbar , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Super Bars (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5supbara )
-GAMEL( 199?, j5supbara , j5supbar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Super Bars (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5supbara )
+GAMEL( 199?, j5supbar , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Super Bars (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5supbara )
+GAMEL( 199?, j5supbara , j5supbar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Super Bars (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5supbara )
-GAMEL( 199?, j5term , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Terminator (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5term )
+GAMEL( 199?, j5term , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Terminator (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5term )
-GAMEL( 199?, j5topshp , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Top Of The Shop Club (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5topshp )
+GAMEL( 199?, j5topshp , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Top Of The Shop Club (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5topshp )
-GAMEL( 199?, j5trail , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Trailblazer Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5trail )
-GAMEL( 199?, j5traila , j5trail , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Trailblazer Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5trail )
-GAMEL( 199?, j5trailb , j5trail , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Trailblazer Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5trail )
+GAMEL( 199?, j5trail , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Trailblazer Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5trail )
+GAMEL( 199?, j5traila , j5trail , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Trailblazer Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5trail )
+GAMEL( 199?, j5trailb , j5trail , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Trailblazer Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5trail )
-GAMEL( 199?, j5uj , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Union Jackpot (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5ujb )
-GAMEL( 199?, j5uja , j5uj , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Union Jackpot (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5ujb )
-GAMEL( 199?, j5ujb , j5uj , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Union Jackpot (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5ujb )
+GAMEL( 199?, j5uj , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Union Jackpot (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5ujb )
+GAMEL( 199?, j5uja , j5uj , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Union Jackpot (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5ujb )
+GAMEL( 199?, j5ujb , j5uj , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Union Jackpot (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5ujb )
-GAMEL( 199?, j5wsc , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Wall Street Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5wsc )
-GAMEL( 199?, j5wsca , j5wsc , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Wall Street Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5wsc )
+GAMEL( 199?, j5wsc , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Wall Street Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5wsc )
+GAMEL( 199?, j5wsca , j5wsc , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Wall Street Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5wsc )
-GAMEL( 199?, j5movie , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "Crystal", "Movie Magic Club (Crystal) (SYSTEM5)", GAME_FLAGS, layout_j5movie ) // apparently by Crystal
+GAMEL( 199?, j5movie , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "Crystal", "Movie Magic Club (Crystal) (SYSTEM5)", GAME_FLAGS, layout_j5movie ) // apparently by Crystal
-GAME( 199?, j5nudfic , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Nudge Fiction (JPM) (SYSTEM5)", GAME_FLAGS )
+GAME( 199?, j5nudfic , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Nudge Fiction (JPM) (SYSTEM5)", GAME_FLAGS )
-GAME( 199?, j5revo , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Revolver (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5revoa , j5revo , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Revolver (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5revo , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Revolver (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5revoa , j5revo , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Revolver (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAMEL( 199?, j5sizl , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Sizzling (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5sizl )
+GAMEL( 199?, j5sizl , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Sizzling (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5sizl )
-GAME( 199?, j5hilos , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hi Lo Silver (JPM) (SYSTEM5)", GAME_FLAGS )
+GAME( 199?, j5hilos , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hi Lo Silver (JPM) (SYSTEM5)", GAME_FLAGS )