diff --git a/.gitattributes b/.gitattributes
index 39074936e2f..68e3206b6cb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4966,6 +4966,8 @@ src/mame/machine/namcos2.c svneol=native#text/plain
 src/mame/machine/naomi.c svneol=native#text/plain
 src/mame/machine/naomibd.c svneol=native#text/plain
 src/mame/machine/naomibd.h svneol=native#text/plain
+src/mame/machine/naomicrypt.c svneol=native#text/plain
+src/mame/machine/naomicrypt.h svneol=native#text/plain
 src/mame/machine/naomig1.c svneol=native#text/plain
 src/mame/machine/naomig1.h svneol=native#text/plain
 src/mame/machine/naomigd.c svneol=native#text/plain
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index d9735347e83..3059f6b9388 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -2574,7 +2574,7 @@ MACHINE_CONFIG_END
  */
 
 static MACHINE_CONFIG_DERIVED( naomim1, naomi_base )
-	MCFG_NAOMI_M1_BOARD_ADD("rom_board", ":rom_key", "naomibd_eeprom", "maincpu", naomi_g1_irq)
+	MCFG_NAOMI_M1_BOARD_ADD("rom_board", "naomibd_eeprom", "maincpu", naomi_g1_irq)
 MACHINE_CONFIG_END
 
 /*
@@ -2582,7 +2582,7 @@ MACHINE_CONFIG_END
  */
 
 static MACHINE_CONFIG_DERIVED( naomim2, naomi_base )
-	MCFG_NAOMI_M2_BOARD_ADD("rom_board", ":rom_key", "naomibd_eeprom", "maincpu", naomi_g1_irq)
+	MCFG_NAOMI_M2_BOARD_ADD("rom_board", "naomibd_eeprom", "maincpu", naomi_g1_irq)
 MACHINE_CONFIG_END
 
 /*
@@ -2590,7 +2590,7 @@ MACHINE_CONFIG_END
  */
 
 static MACHINE_CONFIG_DERIVED( naomim4, naomi_base )
-	MCFG_NAOMI_M4_BOARD_ADD("rom_board", ":rom_key", "naomibd_eeprom", "maincpu", naomi_g1_irq)
+	MCFG_NAOMI_M4_BOARD_ADD("rom_board", "naomibd_eeprom", "maincpu", naomi_g1_irq)
 MACHINE_CONFIG_END
 
 /*
@@ -3008,9 +3008,6 @@ ROM_START( cspike )
 	ROM_LOAD("mpr-23207.ic10", 0x5000000, 0x0800000, CRC(39f692a1) SHA1(14bc86b48a995378b4dd3609d38b90cddf2d7483) )
 	ROM_LOAD("mpr-23208.ic11", 0x5800000, 0x0800000, CRC(b9494f4b) SHA1(2f35b25edf5210a82d4b67e639eeae11440d065a) )
 	ROM_LOAD("mpr-23209.ic12s",0x6000000, 0x0800000, CRC(560188c0) SHA1(77f14c9a031c6e5414ffa854d20c40115361d715) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "cspike-key.bin", 0, 4, CRC(a3e9c6d0) SHA1(c098eae7aee716fbdca39f0eb1f55bd54d398394) )
 ROM_END
 
 /*
@@ -3052,9 +3049,6 @@ ROM_START( capsnk )
 	ROM_LOAD( "mpr-23508.ic5", 0x4800000, 0x1000000, CRC(0a3590aa) SHA1(84c0e1853f069b003d09b268caee97e58c4dacb6) )
 	ROM_LOAD( "mpr-23509.ic6", 0x5800000, 0x1000000, CRC(281d633d) SHA1(d773be8e95f7bf9212ee1061f3076220d4fce9e0) )
 	ROM_LOAD( "mpr-23510.ic7", 0x6800000, 0x1000000, CRC(b856fef5) SHA1(0634f86740c438b40286256a0269570d24cb845a) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "capsnk-key.bin", 0, 4, CRC(2144df1c) SHA1(9069ca78e7450a285173431b3e52c5c25299e473) )
 ROM_END
 
 // ver 000804
@@ -3071,9 +3065,6 @@ ROM_START( capsnka )
 	ROM_LOAD( "mpr-23508.ic5", 0x4800000, 0x1000000, CRC(0a3590aa) SHA1(84c0e1853f069b003d09b268caee97e58c4dacb6) )
 	ROM_LOAD( "mpr-23509.ic6", 0x5800000, 0x1000000, CRC(281d633d) SHA1(d773be8e95f7bf9212ee1061f3076220d4fce9e0) )
 	ROM_LOAD( "mpr-23510.ic7", 0x6800000, 0x1000000, CRC(b856fef5) SHA1(0634f86740c438b40286256a0269570d24cb845a) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "capsnka-key.bin", 0, 4, CRC(2144df1c) SHA1(9069ca78e7450a285173431b3e52c5c25299e473) )
 ROM_END
 
 /*
@@ -3113,9 +3104,6 @@ ROM_START( csmash )
 	ROM_LOAD("mpr-23425.ic6",   0x3000000, 0x0800000, CRC(47f51da2) SHA1(af5ecd460114caed3a00157ffd3a2df0fbf348c0) )
 	ROM_LOAD("mpr-23426.ic7",   0x3800000, 0x0800000, CRC(7f91b13f) SHA1(2d534f77291ebfedc011bf0e803a1b9243fb477f) )
 	ROM_LOAD("mpr-23427.ic8",   0x4000000, 0x0800000, CRC(5851d525) SHA1(1cb1073542d75a3bcc0d363ed31d49bcaf1fd494) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "csmash-key.bin", 0, 4, CRC(21b1cd6f) SHA1(a74eef5e3475cc6952f4ffe31579769a854b62a9) )
 ROM_END
 
 ROM_START( csmasho )
@@ -3133,9 +3121,6 @@ ROM_START( csmasho )
 	ROM_LOAD("mpr-23425.ic6", 0x3000000, 0x0800000, CRC(47f51da2) SHA1(af5ecd460114caed3a00157ffd3a2df0fbf348c0) )
 	ROM_LOAD("mpr-23426.ic7", 0x3800000, 0x0800000, CRC(7f91b13f) SHA1(2d534f77291ebfedc011bf0e803a1b9243fb477f) )
 	ROM_LOAD("mpr-23427.ic8", 0x4000000, 0x0800000, CRC(5851d525) SHA1(1cb1073542d75a3bcc0d363ed31d49bcaf1fd494) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "csmasho-key.bin", 0, 4, CRC(21b1cd6f) SHA1(a74eef5e3475cc6952f4ffe31579769a854b62a9) )
 ROM_END
 
 /*
@@ -3164,9 +3149,6 @@ ROM_START( deathcox )
 	ROM_LOAD("mpr-23521.ic8", 0x4000000, 0x0800000, CRC(cf8674b8) SHA1(bdd2a0ef98138021707b3dd06b1d9855308ed3ec) )
 	ROM_LOAD("mpr-23522.ic9", 0x4800000, 0x0800000, CRC(7ae6716e) SHA1(658b794ae6e3898885524582a207faa1076a65ca) )
 	ROM_LOAD("mpr-23523.ic10",0x5000000, 0x0800000, CRC(c91efb67) SHA1(3d79870551310da7a641858ffec3840714e9cc22) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "deathcox-key.bin", 0, 4, CRC(aa534c8a) SHA1(fcc45e477c646b51afe7c4168d7246964a1f23b5) )
 ROM_END
 
 /*
@@ -3231,9 +3213,6 @@ ROM_START( doa2 )
 	ROM_LOAD("mpr-22119.ic20",0xa000000, 0x0800000, CRC(d608fa86) SHA1(54c8107cccec8cbb536f13cda5b220b7972190b7) )
 	ROM_LOAD("mpr-22120.ic21",0xa800000, 0x0800000, CRC(a30facb4) SHA1(70415ca34095c795297486bce1f956f6a8d4817f) )
 
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "doa2-key.bin", 0, 4, CRC(43f97c96) SHA1(7d1e6fcca3ca936f33d59d57834c3e4ff74f587d) )
-
 	// on-cart X76F100 eeprom contents
 	ROM_REGION( 0x84, "naomibd_eeprom", 0 )
 	ROM_LOAD( "841-0003.sf",  0x000000, 0x000084, CRC(3a119a17) SHA1(d37a092cca7c9cfc5f2637b355af90a65d04013e) )
@@ -3303,9 +3282,6 @@ ROM_START( doa2m )
 	ROM_LOAD("mpr-22119.ic20",0xa000000, 0x0800000, CRC(d608fa86) SHA1(54c8107cccec8cbb536f13cda5b220b7972190b7) )
 	ROM_LOAD("mpr-22120.ic21",0xa800000, 0x0800000, CRC(a30facb4) SHA1(70415ca34095c795297486bce1f956f6a8d4817f) )
 
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "doa2m-key.bin", 0, 4, CRC(43f97c96) SHA1(7d1e6fcca3ca936f33d59d57834c3e4ff74f587d) )
-
 	// on-cart X76F100 eeprom contents
 	ROM_REGION( 0x84, "naomibd_eeprom", 0 )
 	ROM_LOAD( "841-0003.sf",  0x000000, 0x000084, CRC(3a119a17) SHA1(d37a092cca7c9cfc5f2637b355af90a65d04013e) )
@@ -3359,9 +3335,6 @@ ROM_START( derbyoc )
 	ROM_LOAD("mpr-22096.ic12",  0x6000000, 0x0800000, CRC(d8c41648) SHA1(d465f4b841164da0738336e203c5bc6e1e799a76) )
 	ROM_LOAD("mpr-22097.ic13",  0x6800000, 0x0800000, CRC(f1dedac5) SHA1(9d4499cbafe80dd0b36be617de7994a96e1e9a01) )
 	ROM_LOAD("mpr-22098.ic14",  0x7000000, 0x0800000, CRC(f9824d2e) SHA1(f20f8cc2b1bef9077ede1cb874da8f2a335d39de) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "derbyoc-key.bin", 0, 4, CRC(bc568260) SHA1(6dc4923a730bc0380490519c82f1443226365c3a) )
 ROM_END
 
 ROM_START( derbyocw )
@@ -3554,9 +3527,6 @@ ROM_START( dybb99 )
 	ROM_LOAD("mpr-22138.ic17", 0x8800000, 0x0800000, CRC(59557b9f) SHA1(beda44c65c69110bdf8afb7542ae39913dab54f2) )
 	ROM_LOAD("mpr-22139.ic18", 0x9000000, 0x0800000, CRC(92faa2ca) SHA1(4953f0219c3ae62de0a89473cb7b9dd30b33fcfb) )
 	ROM_LOAD("mpr-22140.ic19", 0x9800000, 0x0800000, CRC(4cb54893) SHA1(a99b39cc3c82c3cf90f794bb8c8ba60638a6f921) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "dybb99-key.bin", 0, 4, CRC(90263797) SHA1(83649c8b3e562bee1f08663e59c5ba8f404ed36c) )
 ROM_END
 
 ROM_START( smlg99 )
@@ -3586,9 +3556,6 @@ ROM_START( smlg99 )
 	ROM_LOAD( "mpr-22056.ic19", 0x9800000, 0x800000, CRC(45a23d29) SHA1(2499637a4b389cda7cc9a7aa21014696bd1dafe2) )
 	ROM_LOAD( "mpr-22057.ic20", 0xa000000, 0x800000, CRC(a056c109) SHA1(637e80c2d605851265430b0fa771a4ad5233be8a) )
 	ROM_LOAD( "mpr-22058.ic21", 0xa800000, 0x800000, CRC(f16edaa0) SHA1(e093f5594df43c592a9acd45002ecc65035c2435) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "smlg99-key.bin", 0, 4, CRC(90263797) SHA1(83649c8b3e562bee1f08663e59c5ba8f404ed36c) )
 ROM_END
 
 /*
@@ -3660,9 +3627,6 @@ ROM_START( f355twin )
 	ROM_LOAD( "mpr-22845.ic19", 0x9800000, 0x800000, CRC(3327aed1) SHA1(8bd81aa79ffe764da5810fe79a317530a4f3c191) )
 	ROM_LOAD( "mpr-22846.ic20", 0xa000000, 0x800000, CRC(d4148f39) SHA1(b6598ce52bcaa42805c581de326c953d27c1b2b4) )
 	ROM_LOAD( "mpr-22847.ic21", 0xa800000, 0x800000, CRC(955ad42e) SHA1(e396ca02b5786557434632c4fac56af3a4a9f8ce) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "f355twin-key.bin", 0, 4, CRC(7d915a40) SHA1(ea441c10673b79237a4e7368948cfad31ed45a26) )
 ROM_END
 
 ROM_START( f355twn2 )
@@ -3692,9 +3656,6 @@ ROM_START( f355twn2 )
 	ROM_LOAD( "mpr-23396.ic19", 0x9800000, 0x800000, CRC(42826956) SHA1(386eca3cda2bddb1825dbae850f0c17d1374eb41) )
 	ROM_LOAD( "mpr-23397.ic20", 0xa000000, 0x800000, CRC(28d2caf6) SHA1(67a3bc19abccf7f211c3aae67e751815857bd564) )
 	ROM_LOAD( "mpr-23398.ic21", 0xa800000, 0x800000, CRC(ea4d4d2a) SHA1(3dc9c7164516ae7f3b988c088ab819d8fd40d75e) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "f355twn2-key.bin", 0, 4, CRC(784fab7a) SHA1(5d9687876b390d35309c0b1404f5717daa533286) )
 ROM_END
 
 ROM_START( alpiltdx )
@@ -3715,9 +3676,6 @@ ROM_START( alpiltdx )
 	ROM_LOAD( "mpr-21737.ic10", 0x5000000, 0x800000, CRC(260aaa98) SHA1(d1082587afe9d79f286df8b107a553ee51c27643) )
 	ROM_LOAD( "mpr-21738.ic11", 0x5800000, 0x800000, CRC(95a592e8) SHA1(862dce467e8805381bab001df68262f1baf3c498) )
 
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "alpiltdx-key.bin", 0, 4, CRC(bb539511) SHA1(dea206e7db23fdabf7b957104ddd1499eff509ff) )
-
 	// on-cart X76F100 eeprom contents
 	ROM_REGION( 0x84, "naomibd_eeprom", 0 )
 	ROM_LOAD( "airlinepdx.sf",  0x000000, 0x000084, CRC(404b2add) SHA1(540c8474806775646ace111a2993397b1419fee3) )
@@ -3740,9 +3698,6 @@ ROM_START( alpilota )
 	ROM_LOAD( "mpr-21736.ic9",  0x4800000, 0x800000, CRC(d74eda63) SHA1(d6794fa433cea9f06dc0a20dc9e10388162e7fd8) )
 	ROM_LOAD( "mpr-21737.ic10", 0x5000000, 0x800000, CRC(260aaa98) SHA1(d1082587afe9d79f286df8b107a553ee51c27643) )
 	ROM_LOAD( "mpr-21738.ic11", 0x5800000, 0x800000, CRC(95a592e8) SHA1(862dce467e8805381bab001df68262f1baf3c498) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "alpilota-key.bin", 0, 4, CRC(bb539511) SHA1(dea206e7db23fdabf7b957104ddd1499eff509ff) )
 ROM_END
 
 ROM_START( hotd2 )
@@ -3871,9 +3826,6 @@ ROM_START( ggram2 )
 	ROM_LOAD("mpr-21829.ic9",  0x4800000, 0x0800000, CRC(c5553df2) SHA1(b97a82ac9133dab4bfd87392f803754b6d00389f) )
 	ROM_LOAD("mpr-21830.ic10", 0x5000000, 0x0800000, CRC(e01ceb86) SHA1(dd5703d7712cfc0053bddfff63e78dda372b6ff2) )
 	ROM_LOAD("mpr-21831.ic11", 0x5800000, 0x0800000, CRC(751848d0) SHA1(9c2267fd3c6f9ea5f2679bb2ca20d511a49b2845) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "ggram2-key.bin", 0, 4, CRC(14283fd8) SHA1(c928382e512e9fb685436020f88b8245b7c60d41) )
 ROM_END
 
 /*
@@ -3941,9 +3893,6 @@ ROM_START( gram2000 )
 
 	ROM_COPY( "rom_board", 0x1400000, 0x0800000, 0x0800000 ) // mirror data so IC1 check can pass
 	//ROM_COPY( "rom_board", 0x1000000, 0x0400000, 0x0c00000 ) // or does it mirror the start of 17/18 from 0x0400000 upwards like this, check on real hw
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "gram2000-key.bin", 0, 4, CRC(179314d9) SHA1(3dbbc04e9ff62800d08c4a239af3a83252a28dc0) )
 ROM_END
 
 ROM_START( tduno2 )
@@ -3958,9 +3907,6 @@ ROM_START( tduno2 )
 	ROM_LOAD32_WORD( "mpr-23066.ic20",  0x2000002, 0x0800000, CRC(4f9c1710) SHA1(7834bab5933a156656756f837c217e7820f2ae63) )
 	ROM_LOAD32_WORD( "mpr-23067.ic21s", 0x3000000, 0x0800000, CRC(32724cd9) SHA1(7bfdd58dd5e69529125a720f51c53ebe526ef2e9) )
 	ROM_LOAD32_WORD( "mpr-23068.ic22",  0x3000002, 0x0800000, CRC(2ce3e0ea) SHA1(805ec80273856ec6e5ee04fdca5fd1407c404f8e) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "tduno2.key",   0x000000, 0x000004, CRC(8e0f0f3b) SHA1(914d3db8746c806d559539cc0851169161d32c04) )
 ROM_END
 
 ROM_START( mtkob2 )
@@ -3975,9 +3921,6 @@ ROM_START( mtkob2 )
 	ROM_LOAD32_WORD( "mpr-24221.ic20",  0x2000002, 0x0800000, CRC(73bf9cc6) SHA1(ab187cc0babd1435f5e8636331818d81de23636f) )
 	ROM_LOAD32_WORD( "mpr-24222.ic21s", 0x3000000, 0x0800000, CRC(7098e728) SHA1(82f4f57efcee3063467c24758cefd406dccb1ea4) )
 	ROM_LOAD32_WORD( "mpr-24223.ic22",  0x3000002, 0x0800000, CRC(eca13c90) SHA1(26a66906bf4ebda8697140d89eb5e493e941e8b2) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "mtkob2-key.bin", 0x000000, 0x000004, CRC(db088208) SHA1(14d65ad2555183a445abcd93907c85df4032b41d) )
 ROM_END
 
 ROM_START( crackndj )
@@ -3996,9 +3939,6 @@ ROM_START( crackndj )
 	ROM_LOAD( "mpr-23532.ic8",  0x7800000, 0x1000000, CRC(bbcddeee) SHA1(8649da1411e404953d5ebd4e459d407eb79b61b1) )
 	ROM_LOAD( "mpr-23533.ic9",  0x8800000, 0x1000000, CRC(fc909c00) SHA1(9cf22a97ea272c4586f3942aefdb803bd0e6ede7) )
 	ROM_LOAD( "mpr-23534.ic10", 0x9800000, 0x1000000, CRC(62ed85b6) SHA1(b88336bc6115c92a839981cb0c0d0a67b1f7eda5) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "crackndj-key.bin", 0, 4, CRC(6269265a) SHA1(e2ab31b0058eb130d8f54d30e86d569687f9a068) )
 ROM_END
 
 ROM_START( samba2k )
@@ -4028,9 +3968,6 @@ ROM_START( samba2k )
 	ROM_LOAD( "mpr-23597.ic19s", 0x9800000, 0x800000, CRC(fb50cfdb) SHA1(2e95407b1c8660ae8e85b2d06c13bdc474b93d6e) )
 	ROM_LOAD( "mpr-23598.ic20s", 0xa000000, 0x800000, CRC(897c2304) SHA1(e21b68fd935092b5bd019e3087647e9612be1169) )
 	ROM_LOAD( "mpr-23599.ic21s", 0xa800000, 0x800000, CRC(f2d1f73f) SHA1(40ac3ef9b1c3797e986fc4a0c593dd4e49df8892) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "samba2k-key.bin", 0, 4, CRC(01c0d74a) SHA1(4461cfd761919ba4bc6f1d1839a880f11eaf8d0f) )
 ROM_END
 
 ROM_START( alienfnt )
@@ -4044,9 +3981,6 @@ ROM_START( alienfnt )
 	ROM_LOAD( "mpr-23583.ic3",   0x2800000, 0x1000000, CRC(878e8efe) SHA1(a48a4ab2816605b817dc62d4080b7dc88100a270) )
 	ROM_LOAD( "mpr-23584.ic4",   0x3800000, 0x1000000, CRC(8d444756) SHA1(89c480f9ed1239c8ae565c85fa0fd50324264b20) )
 	ROM_LOAD( "mpr-23585.ic5",   0x4800000, 0x1000000, CRC(883a6482) SHA1(e3145710df793b7fd67f02707904416210a71978) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "alienfnt-key.bin", 0x000000, 0x000004, CRC(0cac6605) SHA1(7a050f13e3b9a10d6cdb851a8c67006f6548c60a) )
 ROM_END
 
 ROM_START( alienfnta )
@@ -4060,9 +3994,6 @@ ROM_START( alienfnta )
 	ROM_LOAD( "mpr-23583.ic3",   0x2800000, 0x1000000, CRC(878e8efe) SHA1(a48a4ab2816605b817dc62d4080b7dc88100a270) )
 	ROM_LOAD( "mpr-23584.ic4",   0x3800000, 0x1000000, CRC(8d444756) SHA1(89c480f9ed1239c8ae565c85fa0fd50324264b20) )
 	ROM_LOAD( "mpr-23585.ic5",   0x4800000, 0x1000000, CRC(883a6482) SHA1(e3145710df793b7fd67f02707904416210a71978) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "alienfnt-key.bin", 0x000000, 0x000004, CRC(0cac6605) SHA1(7a050f13e3b9a10d6cdb851a8c67006f6548c60a) )
 ROM_END
 
 /*
@@ -4092,9 +4023,6 @@ ROM_START( ggx )
 	ROM_LOAD("mpr-23353.ic12", 0x6000000, 0x0800000, CRC(daa0ca24) SHA1(afce14e213e79add7fded838e71bb4447425906a) )
 	ROM_LOAD("mpr-23354.ic13", 0x6800000, 0x0800000, CRC(cea127f7) SHA1(11f12472ebfc93eb72b764c780e30afd4812dbe9) )
 	ROM_LOAD("mpr-23355.ic14", 0x7000000, 0x0800000, CRC(e809685f) SHA1(dc052b4eb4fdcfdc22c4807316ce34ee7a0d58a6) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "ggx-key.bin", 0, 4, CRC(455a831b) SHA1(1834fc714224ac990a0677e8925493e92a4b5e5e) )
 ROM_END
 
 /*
@@ -4139,9 +4067,6 @@ ROM_START( hmgeo )
 	ROM_LOAD("mpr-23713.ic9", 0x4800000, 0x0800000, CRC(2969bac7) SHA1(5f1cf6ac726c2fe183d66e4022962e44592f9ccd) )
 	ROM_LOAD("mpr-23714.ic10",0x5000000, 0x0800000, CRC(da462c44) SHA1(ca450b6c07f939f96eba7b44c45b4e38abd598aa) )
 	ROM_LOAD("mpr-23715.ic11",0x5800000, 0x0800000, CRC(c750abbd) SHA1(2a5bedc2b21cd3f991c7145ccfd8c7a9e7f647ae) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "hmgeo-key.bin", 0, 4, CRC(78411d2f) SHA1(9809ef35406ea48639cf78d5d366069a06a411f0) )
 ROM_END
 
 /*
@@ -4177,9 +4102,6 @@ ROM_START( gwing2 )
 	ROM_LOAD("mpr-22273.ic3", 0x2800000, 0x1000000, CRC(cd633dcf) SHA1(f044d93802a4ba29d0e70c597d3fbe65da591335) )
 	ROM_LOAD("mpr-22274.ic4", 0x3800000, 0x1000000, CRC(f8daaaf3) SHA1(8854d3f8e3d55715ede33ee918b641e251f752b4) )
 	ROM_LOAD("mpr-22275.ic5", 0x4800000, 0x1000000, CRC(61aa1521) SHA1(7d9f5790e72a9151d128ac7887e236526fdf72a0) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "gwing2-key.bin", 0, 4, CRC(433132ce) SHA1(27f6e6ba2dd28c777317ff085432c2d43b93a603) )
 ROM_END
 
 /*
@@ -4226,9 +4148,6 @@ ROM_START( suchie3 )
 	ROM_LOAD("mpr-21991.ic12",0x6000000, 0x0800000, CRC(d82f834a) SHA1(06902713bdf6f68182749916cacc9ae6528dc355) )
 	ROM_LOAD("mpr-21992.ic13",0x6800000, 0x0800000, CRC(599a2fb8) SHA1(2a0007064ad2ee1e1a0fda1d5676df4ff19a9f2f) )
 	ROM_LOAD("mpr-21993.ic14",0x7000000, 0x0400000, CRC(fb28cf0a) SHA1(d51b1d4514a93074d1f77bd1bc5995739604cf56) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "suchie3-key.bin", 0, 4, CRC(592b5204) SHA1(ba18a5302ea271f58617a9793dfb85a0123080c8) )
 ROM_END
 
 /*
@@ -4292,9 +4211,6 @@ ROM_START( mvsc2 )
 	ROM_LOAD("mpr-23061.ic30",  0x7000000, 0x0800000, CRC(fb1844c4) SHA1(1d1571516a6dbed0c4ded3b80efde9cc9281f66f) )
 	ROM_LOAD("mpr-23083.ic31",  0x7800000, 0x0400000, CRC(c61d2dfe) SHA1(a05fb979ed7c8040de91716fc8814e6bd995efa2) )
 	ROM_LOAD("mpr-23084.ic32",  0x8000000, 0x0400000, CRC(e228cdfd) SHA1(d02a2e3557bd24cf34c5ddb42d41ca15e78ae885) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "mvsc2-key.bin", 0, 4, CRC(76f095b4) SHA1(773fd67e1eb471a989b3ee6e969a3d33bf61e779) )
 ROM_END
 
 /* toy fighter - 1999 sega */
@@ -4316,9 +4232,6 @@ ROM_START( toyfight )
 	ROM_LOAD("mpr-22032.ic8", 0x4000000, 0x0800000, CRC(3c48c9ba) SHA1(00be199b23040f8e81db2ec489ba98cbf615652c) )
 	ROM_LOAD("mpr-22033.ic9", 0x4800000, 0x0800000, CRC(5fe5586e) SHA1(3ff41ae1f81469597684faadd88e62b5e0634352) )
 	ROM_LOAD("mpr-22034.ic10",0x5000000, 0x0800000, CRC(3aa5ce5e) SHA1(f00a906235e4522d6fc2ac771324114346875314) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "toyfight-key.bin", 0, 4, CRC(8e074319) SHA1(b1b88bc57b81c08853d4aa77a5da48e293da4f42) )
 ROM_END
 
 /* Crazy Taxi */
@@ -4341,9 +4254,6 @@ ROM_START( crzytaxi )
 	ROM_LOAD( "mpr-21681.ic13s", 0x6800000, 0x800000, CRC(e5dcde7d) SHA1(8a90d9fb4ce0d2ceb609fcf4c54cf5b55c266c50) )
 	ROM_LOAD( "mpr-21682.ic14s", 0x7000000, 0x800000, CRC(54c0290e) SHA1(6e07ab6e95c29a2aabed0ba1a7af0d7d605e0309) )
 	ROM_LOAD( "mpr-21683.ic15s", 0x7800000, 0x800000, CRC(ac8a27e0) SHA1(8e71d853a102dd6c164d5326e6d157ccfb8c7b36) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "crzytaxi-key.bin", 0, 4, CRC(3d36c13d) SHA1(746e82e7f1d6f4629dde00fb6b32943741b6ec70) )
 ROM_END
 
 /* Jambo! Safari */
@@ -4361,9 +4271,6 @@ ROM_START( jambo )
 	ROM_LOAD( "mpr-22823.ic6",  0x3000000, 0x800000, CRC(00c33e51) SHA1(c55646a146ed259e6c61fd912c93fa784b5e6910) )
 	ROM_LOAD( "mpr-22824.ic7",  0x3800000, 0x800000, CRC(cc55304a) SHA1(e548d8de83469e5816c55dbbb00afbb894282fd6) )
 	ROM_LOAD( "mpr-22825.ic8",  0x4000000, 0x800000, CRC(85bada10) SHA1(b6e15d8f1d6bca12ffa4816ed0393c04ca500fba) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "jambo-key.bin", 0, 4, CRC(e78e9ac8) SHA1(677d7f21c238e12362ad65d6496f285d688fc3a9) )
 ROM_END
 
 /* 18 Wheeler DELUXE (Rev A) */
@@ -4394,9 +4301,6 @@ ROM_START( 18wheelr )
 	ROM_LOAD( "mpr-22182.ic19s", 0x9800000, 0x800000, CRC(c5606c42) SHA1(5871104ff1c7acde0493e13b9a4d0abdf8a40728) )
 	ROM_LOAD( "mpr-22183.ic20s", 0xa000000, 0x800000, CRC(776af308) SHA1(7d29cb4dce75d34c622549fea7e102868d0da60a) )
 
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "18wheelr-key.bin", 0, 4, CRC(046f97f5) SHA1(11eb5cffdd67d460718b63ddee8ff4dfa7d72314) )
-
 	// JVS I/O board 837-13844, code is for a Z80 of unknown type (it's inside the big Sega ASIC)
 	ROM_REGION( 0x20000, "jvsio", ROMREGION_ERASEFF)
 	ROM_LOAD( "epr-21868.ic7", 0x000000, 0x010000, CRC(c306a51f) SHA1(7833b73dc34c4c62401a30637968f46b949ceac0) )
@@ -4436,9 +4340,6 @@ ROM_START( 18wheels )
 	ROM_LOAD( "mpr-22182.ic19s", 0x9800000, 0x800000, CRC(c5606c42) SHA1(5871104ff1c7acde0493e13b9a4d0abdf8a40728) )
 	ROM_LOAD( "mpr-22183.ic20s", 0xa000000, 0x800000, CRC(776af308) SHA1(7d29cb4dce75d34c622549fea7e102868d0da60a) )
 
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "18wheelr-key.bin", 0, 4, CRC(046f97f5) SHA1(11eb5cffdd67d460718b63ddee8ff4dfa7d72314) )
-
 	// JVS I/O board 837-13844, code is for a Z80 of unknown type (it's inside the big Sega ASIC)
 	ROM_REGION( 0x20000, "jvsio", ROMREGION_ERASEFF)
 	ROM_LOAD( "epr-21868.ic7", 0x000000, 0x010000, CRC(c306a51f) SHA1(7833b73dc34c4c62401a30637968f46b949ceac0) )
@@ -4477,9 +4378,6 @@ ROM_START( sstrkfgt )
 	ROM_LOAD( "mpr-23319.ic18s", 0x9000000, 0x800000, CRC(ff42857a) SHA1(adbc025c4e02ad3b15ead9340aee494c16005ad5) )
 	ROM_LOAD( "mpr-23320.ic19s", 0x9800000, 0x800000, CRC(5ec75a45) SHA1(696e5d14678c794dec67246507bd580f7e5b5043) )
 	ROM_LOAD( "mpr-23321.ic20s", 0xa000000, 0x800000, CRC(018627d4) SHA1(2519f39ad046d14f602648fed39bc3719185b55e) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "sstrkfgt-key.bin", 0, 4, CRC(1884e4ee) SHA1(14ec026ed32825252987fed350f19f6e2565aa4d) )
 ROM_END
 
 
@@ -4496,9 +4394,6 @@ ROM_START( sgtetris )
 	ROM_LOAD( "mpr-22913.ic4", 0x2000000, 0x800000, CRC(1fbdc41a) SHA1(eb8b9577b7677b9e9aec05ae950dee516ae15bf5) )
 	ROM_LOAD( "mpr-22914.ic5", 0x2800000, 0x800000, CRC(77844b60) SHA1(65d71febb8a160d00778ac7b53e082253cad9834) )
 	ROM_LOAD( "mpr-22915.ic6", 0x3000000, 0x800000, CRC(e48148ac) SHA1(c1273353eeaf9bb6b185f133281d7d04271bc895) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "sgtetris-key.bin", 0, 4, CRC(03bf7ea1) SHA1(0229c1f9a6eca65b09e3571768a1fbf3c1dad6b1) )
 ROM_END
 
 /*
@@ -4554,9 +4449,6 @@ ROM_START( slasho )
 	ROM_LOAD("mpr-23338.ic15s",0x7800000, 0x0800000, CRC(323e4db2) SHA1(c5484589c1613110faef6cf8b8f4def8867a8226) )
 	ROM_LOAD("mpr-23339.ic16s",0x8000000, 0x0800000, CRC(fd8c2736) SHA1(34ae1a4e35b4aac6666719fb4fc0959bd64ff3d6) )
 	ROM_LOAD("mpr-23340.ic17s",0x8800000, 0x0800000, CRC(001604f8) SHA1(615ec027d383d44d4aadb1175be6320e4139d7d1) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "slasho-key.bin", 0, 4, CRC(78e31e35) SHA1(a0b06cb7fbb0b2f1734831fc3e6a8315c0e78edd) )
 ROM_END
 
 
@@ -4612,9 +4504,6 @@ ROM_START( pjustic )
 	ROM_LOAD( "mpr-23545.ic9",  0x8800000, 0x1000000, CRC(60bd692f) SHA1(37b508f4a821d832eafff81574e7df3fe1c729f8) )
 	ROM_LOAD( "mpr-23546.ic10", 0x9800000, 0x1000000, CRC(85db2248) SHA1(37845c269a2e65ee6181a8e7500c2e7dd9b2e343) )
 	ROM_LOAD( "mpr-23547.ic11", 0xa800000, 0x1000000, CRC(18b369c7) SHA1(b61cb3fda8cc685865684f7afc7dad0b29d93ca5) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "pjustic-key.bin", 0, 4, CRC(4a2bcbaa) SHA1(a9434482498f97605f76d08f749685452651a753) )
 ROM_END
 
 /*
@@ -4653,9 +4542,6 @@ ROM_START( pstone )
 	ROM_LOAD("mpr-21594.ic6", 0x3000000, 0x0800000, CRC(ddfa0467) SHA1(e758eae50035d5f18d99dbed728513e306d9566f) )
 	ROM_LOAD("mpr-21595.ic7", 0x3800000, 0x0800000, CRC(7ab218f7) SHA1(c5c022e63f926cce09d49331647cde20e8e42ab3) )
 	ROM_LOAD("mpr-21596.ic8", 0x4000000, 0x0800000, CRC(f27dbdc5) SHA1(d54717d62897546968de2f049239f68bee49bdd8) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "pstone-key.bin", 0, 4, CRC(7386d0de) SHA1(72f6b552440e470344f707e349d100d9ba21b69d) )
 ROM_END
 
 /*
@@ -4697,9 +4583,6 @@ ROM_START( pstone2 )
 	ROM_LOAD("mpr-23124.ic7", 0x3800000, 0x0800000, CRC(508c0207) SHA1(e50d97a17cdd6771fbc63a254a4d638e7daa8f57) )
 	ROM_LOAD("mpr-23125.ic8", 0x4000000, 0x0800000, CRC(b9938bbc) SHA1(d55d7adecb5a5a4a276a5a17c12808085d980fd9) )
 	ROM_LOAD("mpr-23126.ic9", 0x4800000, 0x0800000, CRC(fbb0325b) SHA1(21b965519d7508d84344641d43e8af2c3ca29ba4) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "pstone2-key.bin", 0, 4, CRC(3858144b) SHA1(f5fb9157b38969c986f8abbe8ed3f95e788e45c0) )
 ROM_END
 
 
@@ -4763,9 +4646,6 @@ ROM_START( otrigger )
 	ROM_LOAD("mpr-22158.ic17s",0x8800000, 0x0800000, CRC(f5d96fe9) SHA1(d5d0ac3d6b7c9b851a18b22d5fb599710c684a76) )
 	ROM_LOAD("mpr-22159.ic18s",0x9000000, 0x0800000, CRC(f8b5e99d) SHA1(bb174a6a80967d0ff05c3a7512e4f0f9c921d130) )
 	ROM_LOAD("mpr-22160.ic19s",0x9800000, 0x0800000, CRC(579eef4e) SHA1(bfcabd57f623647053afcedcabfbc74e5736819f) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "otrigger-key.bin", 0, 4, CRC(79ebd41a) SHA1(3545dacdeac66b46e8706565f0eca784291040d1) )
 ROM_END
 
 /*
@@ -4803,9 +4683,6 @@ ROM_START( qmegamis )
 	ROM_LOAD32_WORD("mpr-23226.ic32", 0x8000002, 0x0800000, CRC(cd5da506) SHA1(2e76c8892c1d389b0f12a0046213f43d2ab07d78) ) //ic 17
 
 	ROM_COPY( "rom_board", 0x1400000, 0x0800000, 0x0800000 ) // mirror data for IC1 (no test on this game, but layout is the same as gram2000)
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "qmegamis-key.bin", 0, 4, CRC(b08650c0) SHA1(9e6b0fac6fb05209da9e01bb1a5437949d218078) )
 ROM_END
 
 /*
@@ -4858,9 +4735,6 @@ ROM_START( samba )
 	ROM_LOAD("mpr-22963.ic14s",0x7000000, 0x0800000, CRC(a53e9919) SHA1(d81eb79bc706f85ebfbc56a9b2889ae62d629e8e) )
 	ROM_LOAD("mpr-22964.ic15s",0x7800000, 0x0800000, CRC(f581d5a3) SHA1(8cf769f5b0a48951246bb60e9cf58232bcee7bc8) )
 	ROM_LOAD("mpr-22965.ic16s",0x8000000, 0x0800000, CRC(8f7bfa8a) SHA1(19f137b1552978d232785c4408805b71835585c6) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "samba-key.bin", 0, 4, CRC(e17e3603) SHA1(5611615064a93cc9d957cc4edd12c716a72cd7f2) )
 ROM_END
 
 // prototype - only works with US BIOS
@@ -4886,9 +4760,6 @@ ROM_START( sambap )
 	ROM_LOAD("mpr-22963.ic14s",0x7000000, 0x0800000, CRC(a53e9919) SHA1(d81eb79bc706f85ebfbc56a9b2889ae62d629e8e) )
 	ROM_LOAD("mpr-22964.ic15s",0x7800000, 0x0800000, CRC(f581d5a3) SHA1(8cf769f5b0a48951246bb60e9cf58232bcee7bc8) )
 	ROM_LOAD("mpr-22965.ic16s",0x8000000, 0x0800000, CRC(8f7bfa8a) SHA1(19f137b1552978d232785c4408805b71835585c6) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "samba-key.bin", 0, 4, CRC(e17e3603) SHA1(5611615064a93cc9d957cc4edd12c716a72cd7f2) )
 ROM_END
 
 /*
@@ -4940,27 +4811,8 @@ ROM_START( shootpl )
 	ROM_LOAD32_WORD("opr-24061.ic18",  0x0800002, 0x0800000, CRC(e934267c) SHA1(fdbe2b80e309aa8d9fefd2634aef20153735019d) )
 	ROM_LOAD32_WORD("opr-24062.ic19s", 0x1800000, 0x0800000, CRC(26e32af4) SHA1(49412a04198175240ef9adb4b7afb8a628eb127d) )
 	ROM_LOAD32_WORD("opr-24063.ic20",  0x1800002, 0x0800000, CRC(683fdcff) SHA1(890816ef1b3e604e16289998cf66e221ef75a0fe) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "shootpl-key.bin", 0, 4, CRC(03c30b17) SHA1(e8e8659aa27b3d1cac2268850d3973d9afeaeba9) )
 ROM_END
 
-// SHOOTOUT POOL (the original, the above set is a sequel)
-ROM_START( shootopl )
-	NAOMI_BIOS
-	NAOMI_DEFAULT_EEPROM
-
-	ROM_REGION( 0x2800000, "rom_board", ROMREGION_ERASEFF)
-	ROM_LOAD( "epr-23844.ic22", 0x000000, 0x400000, CRC(5c229638) SHA1(9185f9f2369bb2423faff4222419001ac9037d3f) )
-	ROM_RELOAD( 0x400000, 0x400000)
-	ROM_LOAD32_WORD( "mpr-23840.17s", 0x0800000, 0x800000, CRC(985e5ff4) SHA1(a6f529b1855cc2aef3bed8503746c2e38061f944) )
-	ROM_LOAD32_WORD( "mpr-23841.18",  0x0800002, 0x800000, CRC(255fc335) SHA1(34ffec963880383bb9c02642f73ba3c852699831) )
-	ROM_LOAD32_WORD( "mpr-23842.19s", 0x1800000, 0x800000, CRC(80724895) SHA1(ed4fa1160b35b3987702c0178bd31c3c5db69e6e) )
-	ROM_LOAD32_WORD( "mpr-23843.20",  0x1800002, 0x800000, CRC(3574f616) SHA1(40130e8f98fb31c98428d444b79491f6a06ac208) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "shootopl-key.bin", 0, 4, CRC(45547e02) SHA1(4f79f478ff1eea14bc939a67ff570143cb56a4bf) )
-ROM_END
 
 /* Shootout Pool Medal */
 ROM_START( shootplm )
@@ -4974,9 +4826,20 @@ ROM_START( shootplm )
 	ROM_LOAD32_WORD( "opr-24175.ic18",  0x0800002, 0x800000, CRC(e66e6345) SHA1(28a372168419c9352cb7fc5285bbd37bd37f3b71) )
 	ROM_LOAD32_WORD( "opr-24176.ic19s", 0x1800000, 0x800000, CRC(1277bca8) SHA1(e1bd9d1a6f4170a9c29658f95e9e96caf4b0cb84) )
 	ROM_LOAD32_WORD( "opr-24177.ic20",  0x1800002, 0x800000, CRC(122eac82) SHA1(2acf00686d682e0f354708fa597933a0d6de4a6f) )
+ROM_END
 
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "shootpl-key.bin", 0, 4, CRC(03c30b17) SHA1(e8e8659aa27b3d1cac2268850d3973d9afeaeba9) )
+// SHOOTOUT POOL (the original, the above game is a sequel)
+ROM_START( shootopl )
+	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
+
+	ROM_REGION( 0x2800000, "rom_board", ROMREGION_ERASEFF)
+	ROM_LOAD( "epr-23844.ic22", 0x000000, 0x400000, CRC(5c229638) SHA1(9185f9f2369bb2423faff4222419001ac9037d3f) )
+	ROM_RELOAD( 0x400000, 0x400000)
+	ROM_LOAD32_WORD( "mpr-23840.17s", 0x0800000, 0x800000, CRC(985e5ff4) SHA1(a6f529b1855cc2aef3bed8503746c2e38061f944) )
+	ROM_LOAD32_WORD( "mpr-23841.18",  0x0800002, 0x800000, CRC(255fc335) SHA1(34ffec963880383bb9c02642f73ba3c852699831) )
+	ROM_LOAD32_WORD( "mpr-23842.19s", 0x1800000, 0x800000, CRC(80724895) SHA1(ed4fa1160b35b3987702c0178bd31c3c5db69e6e) )
+	ROM_LOAD32_WORD( "mpr-23843.20",  0x1800002, 0x800000, CRC(3574f616) SHA1(40130e8f98fb31c98428d444b79491f6a06ac208) )
 ROM_END
 
 /* Oinori-daimyoujin Matsuri (medal) */
@@ -5034,9 +4897,6 @@ ROM_START( spawn )
 	ROM_LOAD("mpr-22974.ic8",  0x4000000, 0x0800000, CRC(20983c51) SHA1(f7321abf8bf5f2a7329c98174e5cf9b1ebf596b2) )
 	ROM_LOAD("mpr-22975.ic9",  0x4800000, 0x0800000, CRC(0d3c70d1) SHA1(22920bc5fd1dda760b5cb17482e9181be899bc08) )
 	ROM_LOAD("mpr-22976.ic10", 0x5000000, 0x0800000, CRC(092d8063) SHA1(14fafd3f4c4f2b37172453d1c815fb9b8f4814f4) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "spawn-key.bin", 0, 4, CRC(dd211f09) SHA1(d436cd5009744c4c69fb94c84837103b4ca1c9a7) )
 ROM_END
 
 /*
@@ -5167,9 +5027,6 @@ ROM_START( virnbao )
 	ROM_LOAD("mpr-22946.ic19",0x9800000, 0x0800000, CRC(c79696c5) SHA1(4a9ac8b4ae1ce5d196e6c74fecc241b74aebc4ab) )
 	ROM_LOAD("mpr-22947.ic20",0xa000000, 0x0800000, CRC(5e5eb595) SHA1(401d4a11d436988d716bb014b36233f171dc576d) )
 	ROM_LOAD("mpr-22948.ic21",0xa800000, 0x0800000, CRC(1b0de917) SHA1(fd1742ea9bb2f1ce871ee3266171f26634e1c8e7) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "virnbao-key.bin", 0, 4, CRC(980e3be8) SHA1(234a2f8ee408144d2c51e8083d0a033eea6026e0) )
 ROM_END
 
 ROM_START( virnbap )
@@ -5249,9 +5106,6 @@ ROM_START( vs2_2k )
 	ROM_LOAD("mpr-21921.ic13s",0x6800000, 0x0800000, CRC(d6346491) SHA1(830971cbc14cab022a09ad4c6e11ee49c550e308) )
 	ROM_LOAD("mpr-21922.ic14s",0x7000000, 0x0800000, CRC(a1901e1e) SHA1(2281f91ac696cc14886bcdf4b0685ce2f5bb8117) )
 	ROM_LOAD("mpr-21923.ic15s",0x7800000, 0x0400000, CRC(d127d9a5) SHA1(78c95357344ea15469b84fa8b1332e76521892cd) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "vs2_2k-key.bin", 0, 4, CRC(f9fb4716) SHA1(83277f61e97fc6c4d8d27b903bde0acdfb0c7dbc) )
 ROM_END
 
 /*
@@ -5295,9 +5149,6 @@ ROM_START( vtennis )
 	ROM_LOAD("mpr-22924.ic9", 0x4800000, 0x0800000, CRC(ecde9d57) SHA1(1fbe7fdf66a56f4f1765baf113dff95142bfd114) )
 	ROM_LOAD("mpr-22925.ic10",0x5000000, 0x0800000, CRC(81057e42) SHA1(d41137ae28c64dbdb50150db8cf25851bc0709c4) )
 	ROM_LOAD("mpr-22926.ic11",0x5800000, 0x0800000, CRC(57eec89d) SHA1(dd8f9a9155e51ee5260f559449fb0ea245077952) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "vtennis-key.bin", 0, 4, CRC(f355af89) SHA1(581a9b0f8c2f3606006e85e136f9cf0ea908c773) )
 ROM_END
 
 /*
@@ -5321,9 +5172,6 @@ ROM_START( wwfroyal )
 	ROM_LOAD( "mpr-22267.ic6", 0x5800000, 0x1000000, CRC(67ec1027) SHA1(2432b33983bbc9b07477459adb5ee1a62b6c0ea3) )
 	ROM_LOAD( "mpr-22268.ic7", 0x6800000, 0x1000000, CRC(536f5eea) SHA1(f1de8624f82595adf75693b604fb026bf3f778ee) )
 	ROM_LOAD( "mpr-22269.ic8", 0x7800000, 0x1000000, CRC(6c0cf740) SHA1(da10b33a6e54afbe1d7e52801216e7119b0b33b1) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "wwfroyal-key.bin", 0, 4, CRC(e14721b1) SHA1(1f2f447bbc4b1e0b016c5ac545d1d805abc61ebd) )
 ROM_END
 
 ROM_START( sl2007 )
@@ -5335,9 +5183,6 @@ ROM_START( sl2007 )
 	ROM_LOAD( "ic9.bin",    0x4000000, 0x4000000, CRC(5475556e) SHA1(b895125b7c9f01723df42b44073c206cb43871ac) )
 	ROM_LOAD( "ic10.bin",   0x8000000, 0x4000000, CRC(133c742c) SHA1(89f857a31731dc918afc72b6cb716f5c77cb9d6e) )
 	ROM_LOAD( "ic11.bin",   0xc000000, 0x4000000, CRC(562fb88e) SHA1(172678e3e27cfad7f7e6217c4653a4ba119bfbdf) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "sl2007-key.bin", 0, 4, CRC(d5d1e807) SHA1(8a0cc371729c622bb05c5d26b3e39ec31d29ace1) )
 ROM_END
 
 ROM_START( asndynmt )
@@ -5349,9 +5194,6 @@ ROM_START( asndynmt )
 	ROM_LOAD( "fpr-24383.ic9",  0x4000000, 0x4000000, CRC(8ac2fe5d) SHA1(1c606140ffb2720433bdb0d225ef3c70e2260d27) )
 	ROM_LOAD( "fpr-24384.ic10", 0x8000000, 0x4000000, CRC(2e9116c4) SHA1(58903a33c4ce72a1f75aefcab94393fc2e8bd2d9) )
 	ROM_LOAD( "fpr-24385.ic11", 0xc000000, 0x4000000, CRC(2b79f45d) SHA1(db97d980bf1590df4b983a4b7786977687238ef5) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "asndynmt-key.bin", 0, 4, CRC(bf5396a9) SHA1(0b27fdc800143fb977cb2f1e937078d7a7006939) )
 ROM_END
 
 ROM_START( illvelo )
@@ -5363,9 +5205,6 @@ ROM_START( illvelo )
 	ROM_LOAD( "illvelo.ic9",  0x4000000, 0x4000000, CRC(2a880b08) SHA1(87c8e742b8f0658fee91ea97c61b1b9d5dbb25f5) )
 	ROM_LOAD( "illvelo.ic10", 0x8000000, 0x4000000, CRC(c02040f9) SHA1(27ad2cb45e8a516433917f060ca9798412bb95f7) )
 	ROM_LOAD( "illvelo.ic11", 0xc000000, 0x4000000, CRC(b2eb30ed) SHA1(44fac4bedde4df04b9572ac665d3ac2c5cd00c7d) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "illvelo-key.bin", 0, 4, CRC(e164952f) SHA1(6c0dfe567640e1e843a5d7bf858a24c101dfcf95) )
 ROM_END
 
 ROM_START( mbaa )
@@ -5379,9 +5218,6 @@ ROM_START( mbaa )
 	ROM_LOAD( "ic11.bin",     0x0c000000, 0x4000000, CRC(211ac347) SHA1(9d8348db90971204e5d60f2d561fcca33ee7c264) )
 	ROM_LOAD( "ic12.bin",     0x10000000, 0x4000000, CRC(b8a6bff2) SHA1(befbc2e917b3107f1c4bfb9169623282ff97bfb2) )
 	ROM_LOAD( "ic13.bin",     0x14000000, 0x4000000, CRC(4886329f) SHA1(6ccf6fb83cfdbef3f85f6c06e641c38ff434d605) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "mbaa-key.bin", 0x000000, 0x000004, CRC(f4ad909f) SHA1(27ba44592c2642b5862a24f68c755ad4115e6047) )
 ROM_END
 
 ROM_START( ausfache )
@@ -5391,9 +5227,6 @@ ROM_START( ausfache )
 	ROM_REGION( 0x8000000, "rom_board", ROMREGION_ERASEFF)
 	ROM_LOAD( "ic8.bin",    0x0000000, 0x4000000, CRC(f6a16173) SHA1(7167885ce27a99bce286ba71128b4a2c8363015a) )
 	ROM_LOAD( "ic9.bin",    0x4000000, 0x4000000, CRC(18c994d7) SHA1(159e1425b2fc645133814b0d26d93a90e9849b1a) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "ausfache-key.bin", 0, 4, CRC(93cdc793) SHA1(f0a0c321a3bdf8ca87cbd840a168a9057c08f16a) )
 ROM_END
 
 ROM_START( pokasuka )
@@ -5409,9 +5242,6 @@ ROM_START( pokasuka )
 
 	ROM_REGION( 0x200000, "ioboard", 0) // touch screen I/O board, program disassembles as little-endian SH-4
 	ROM_LOAD( "fpr24351.ic14", 0x000000, 0x200000, CRC(4d1b7b89) SHA1(965b8c6b5a2e7b3f1b1e2eac19c86000c3b66754) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "pokasuka-key.bin", 0, 4, CRC(f00bcd61) SHA1(b8315b851656c2e0b7853979988d1c44eab0886b) )
 ROM_END
 
 /*
@@ -5483,9 +5313,6 @@ ROM_START( zombrvn )
 	ROM_LOAD("mpr-21724.ic17",0x8800000, 0x0800000, CRC(f048aeb7) SHA1(39b7bf0ce65f6e13aa0ae5fd6a142959b9ce5acf) )
 	ROM_LOAD("mpr-21725.ic18",0x9000000, 0x0800000, CRC(2202077b) SHA1(0893a85379f994277083c0bc5b178dd34508f816) )
 	ROM_LOAD("mpr-21726.ic19",0x9800000, 0x0800000, CRC(429bf290) SHA1(6733e1bcf100e73ab43273f6feedc187fcaa55d4) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "zombrvn-key.bin", 0, 4, CRC(572d3944) SHA1(16ae634d85169851b9deae3c03b5dd4d4bf2794a) )
 ROM_END
 
 ROM_START( gunsur2 )
@@ -5530,9 +5357,6 @@ ROM_START( gunsur2e )
 	ROM_LOAD( "bhf1ma13.6n",  0xd000000, 0x1000000, CRC(055718ad) SHA1(355c4780231a4361aa6237dd34819b60d9df0fc7) )
 	ROM_LOAD( "bhf1ma14.6m",  0xe000000, 0x1000000, CRC(d06c9bd7) SHA1(54668a2fd31059976890da92709c18f308634887) )
 	ROM_LOAD( "bhf1ma15.6l",  0xf000000, 0x1000000, CRC(db3c396b) SHA1(da0e125d627ce890906ca100081ab0685e11c0ef) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "bhf2-key.bin", 0x0000000, 0x0000004, CRC(9899e931) SHA1(c0837262b9069b33d0e72b418e80b5f0da8b9251) )
 ROM_END
 
 ROM_START( wldkicks )
@@ -5553,9 +5377,6 @@ ROM_START( wldkicks )
 	ROM_LOAD( "wk1ma9.4d",   0x8000000, 0x1000000, CRC(1d227a05) SHA1(9f816bcdf0279785e0b37ab2f3c5eb5912114dd5) )
 	ROM_LOAD( "wk1ma10.4c",  0x9000000, 0x1000000, CRC(29635a54) SHA1(a3109d0f8f271e2183316846df2a6a819f6a9b20) )
 	ROM_LOAD( "wk1ma11.4b",  0xa000000, 0x1000000, CRC(e96f312c) SHA1(0a92640277111aef5c6e9dab4218a8ae2196ce61) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "wldkicks-key.bin", 0, 4, CRC(c1e3000b) SHA1(36c2546833effe9452e2b3f7d31335fc5e349f49) )
 ROM_END
 
 ROM_START( toukon4 )
@@ -5580,9 +5401,6 @@ ROM_START( toukon4 )
 	ROM_LOAD( "trf1ma13.6n", 0xd000000, 0x1000000, CRC(e52d41fe) SHA1(e1769d42d6048f9621ca289af3ddeca7c14cee00) )
 	ROM_LOAD( "trf1ma14.6m", 0xe000000, 0x1000000, CRC(87cb31a0) SHA1(27aef9ac571a0b5e3a76e4ee22f5bc5d0ae962f2) )
 	ROM_LOAD( "trf1ma15.6l", 0xf000000, 0x1000000, CRC(42d318c5) SHA1(f9fe82ffbfc51fcb52333f94c55a7092e7124fb4) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "tr4ae-key.bin", 0x000000, 0x000004, CRC(986a7cee) SHA1(70c3ff80f86de6a0655251658c66a156fb644995) )
 ROM_END
 
 ROM_START( ninjaslt )
@@ -5607,9 +5425,6 @@ ROM_START( ninjaslt )
 	// in the ROM test - it is not bad and does not need a redump)
 	ROM_COPY( "rom_board", 0x800000, 0x000000, 0x800000 )
 
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "nja3-key.bin", 0x000000, 0x000004, CRC(e6997eb0) SHA1(c866a5069e28939be5a8fc867bc14791decac3c8) )
-
 	ROM_REGION( 0x20000, "jyu_io", 0 )  // H8/3334-based I/O board ROM, eventually should be separated out
 	ROM_LOAD( "jyu1_prg0a.ic3", 0x000000, 0x020000, CRC(aec4dbc1) SHA1(bddd4f345baf7f594998a39c09da18b3834f0ac2) )
 ROM_END
@@ -5636,9 +5451,6 @@ ROM_START( ninjaslt4 )
 	// in the ROM test - it is not bad and does not need a redump)
 	ROM_COPY( "rom_board", 0x800000, 0x000000, 0x800000 )
 
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "nja3-key.bin", 0x000000, 0x000004, CRC(e6997eb0) SHA1(c866a5069e28939be5a8fc867bc14791decac3c8) )
-
 	ROM_REGION( 0x20000, "jyu_io", 0 )  // H8/3334-based I/O board ROM, eventually should be separated out
 	ROM_LOAD( "jyu1_prg0a.ic3", 0x000000, 0x020000, CRC(aec4dbc1) SHA1(bddd4f345baf7f594998a39c09da18b3834f0ac2) )
 ROM_END
@@ -5660,9 +5472,6 @@ ROM_START( mazan )
 	ROM_LOAD( "maz1ma6.4f",  0x6000000, 0x1000000, CRC(a6593c36) SHA1(627bf19d960037ea92b673b786a9da7208acd447) )
 	ROM_LOAD( "maz1ma7.4e",  0x7000000, 0x1000000, CRC(6103ad9c) SHA1(e4abbb5867cae6a9bf9067ab3a091ef7b18fa0cd) )
 	ROM_LOAD( "maz1ma8.4d",  0x8000000, 0x1000000, CRC(d46c9f40) SHA1(45eec7fa3d4261f12438e841254fa75d572331b3) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "maz1-key.bin", 0x000000, 0x000004, CRC(79ebd41a) SHA1(3545dacdeac66b46e8706565f0eca784291040d1) )
 ROM_END
 
 ROM_START( vtenis2c )
@@ -5689,9 +5498,6 @@ ROM_START( vtenis2c )
 	ROM_LOAD32_WORD( "mpr-22322.32",   0x7800002, 0x800000, CRC(21bf1caf) SHA1(bc1828db2f5f71ef87153a81b49b2ba72ba176e1) )
 	ROM_LOAD32_WORD( "mpr-22323.33s",  0x8800000, 0x800000, CRC(0bd632ab) SHA1(21acab5336dd0ba317839176f2557df95917729e) )
 	ROM_LOAD32_WORD( "mpr-22324.34",   0x8800002, 0x800000, CRC(ff2571d4) SHA1(c2cbb2345163bbf1973e63cefb9a952e5a52a6cf) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "vtenis2c-key.bin", 0, 4, CRC(b8c5b510) SHA1(f36d037a62a576e71211093e075f0ffa7e312c2d) )
 ROM_END
 
 ROM_START( kick4csh )
@@ -5717,9 +5523,6 @@ ROM_START( kick4csh )
 	ROM_LOAD32_WORD( "opr-24234a.ic31",  0x8000000, 0x800000, CRC(f78deb2a) SHA1(7103333c7f388545ebba8e8bb9443ec5ea90589b) )
 	ROM_LOAD32_WORD( "opr-24235a.ic32s", 0x8000002, 0x800000, CRC(a2bb0d26) SHA1(bafd66250f8ad472eaa179bd73edc0dc22b681f5) )
 	ROM_LOAD( "25lc040.ic13s", 0x9000000, 0x000084, CRC(19d77c96) SHA1(1d82af6b11f7fde93a3c4dd3561f1f2ab74c8d65) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "kick4csh-key.bin", 0, 4, CRC(889d2ea1) SHA1(daf7acf41b6bc607d443a93221a3e4554b99547f) )
 ROM_END
 
 ROM_START( wrungp )
@@ -5753,9 +5556,6 @@ ROM_START( gundmct )
 	ROM_LOAD( "mpr-23635.ic8",  0x7800000, 0x1000000, CRC(f9279277) SHA1(823ae02a754ca8a8effdb957ccc6726765fc29b8) )
 	ROM_LOAD( "mpr-23636.ic9",  0x8800000, 0x1000000, CRC(57199e9f) SHA1(73a6f20ee7b3133ed4c6286e477e2ff9757106bd) )
 	ROM_LOAD( "mpr-23637.ic10", 0x9800000, 0x1000000, CRC(737b5dff) SHA1(0a405b711ffb096a3e6d52ececed73a5f93ebf02) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "gundmct-key.bin", 0, 4, CRC(0dee7a39) SHA1(24eef111ad7d8ad984e38b63101d01463b36542e) )
 ROM_END
 
 ROM_START( puyoda )
@@ -5785,9 +5585,6 @@ ROM_START( puyoda )
 	ROM_LOAD( "mpr-22203.ic18", 0x9000000, 0x800000, CRC(881d6316) SHA1(c7a26404759afac346c63e39b35bf408f1a897a6) )
 	ROM_LOAD( "mpr-22204.ic19", 0x9800000, 0x800000, CRC(2c5e5140) SHA1(7887fc19459dc85ca78256e0c50c762eea001e51) )
 	ROM_LOAD( "mpr-22205.ic20", 0xa000000, 0x800000, CRC(7d523ae5) SHA1(7495082b7e83b6ee8f47660baba4c604d8ba2ff1) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "puyoda-key.bin", 0, 4, CRC(245bb259) SHA1(7ab675779ebf01ad3a78edd39cb287b71acd8bb5) )
 ROM_END
 
 ROM_START( zerogu2 )
@@ -5801,9 +5598,6 @@ ROM_START( zerogu2 )
 	ROM_LOAD( "mpr23686.ic3", 0x2800000, 0x1000000, CRC(a61b4d49) SHA1(842c54ad4e8192e491152ae5bb08daf5dd6b8c6c) )
 	ROM_LOAD( "mpr23687.ic4", 0x3800000, 0x1000000, CRC(e125439a) SHA1(07e7339f3f53aeb0ebddf7a8ac3eb6d8f3fe9de6) )
 	ROM_LOAD( "mpr23688.ic5", 0x4800000, 0x1000000, CRC(38412edf) SHA1(9cae06cf46e134531f47e64deedace449664f69a) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "zerogu2-key.bin", 0, 4, CRC(f2460eb3) SHA1(69ec4e3933e60caa6a0ac44a855a40deed337d92) )
 ROM_END
 
 ROM_START( inunoos )
@@ -5847,9 +5641,6 @@ ROM_START( ringout )
 	ROM_LOAD( "mpr-21776.ic8",  0x4000000, 0x800000, CRC(22fc33dc) SHA1(922c41f7fb22b26037446bdfb4f9788a8e0c3e46) )
 	ROM_LOAD( "mpr-21777.ic9",  0x4800000, 0x800000, CRC(6d22d29d) SHA1(382dcd62065437b34fe101144b1c047eb261f047) )
 	ROM_LOAD( "mpr-21778.ic10", 0x5000000, 0x800000, CRC(c5308e61) SHA1(e51f8026351d5ffbda2a5bed39aeef543366febf) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "ringout-key.bin", 0, 4, CRC(8f8c4eb2) SHA1(9bc59c69d04d9ce876415af048f39095ed680a5e) )
 ROM_END
 
 ROM_START( vonot )
@@ -5871,9 +5662,6 @@ ROM_START( vonot )
 	ROM_LOAD( "mpr-23195.ic11", 0x5800000, 0x800000, CRC(9e708834) SHA1(2f454688ea5b8b041bbfffaa12047afad01d020f) )
 	ROM_LOAD( "mpr-23196.ic12", 0x6000000, 0x800000, CRC(c86a5b9b) SHA1(4b8dda85003289e1464e12c3abf449bb8df20e3a) )
 	ROM_LOAD( "mpr-23197.ic13", 0x6800000, 0x800000, CRC(5adea0bd) SHA1(f8614ba83d5f61556c3db1a1796a02ed2c51ce2a) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "vonot-key.bin", 0, 4, CRC(021ac707) SHA1(af57844331226d3b1722aedca1a7aef024468b39) )
 ROM_END
 
 ROM_START( derbyo2k )
@@ -7191,9 +6979,6 @@ ROM_START( vf4cart )
 	ROM_LOAD( "mpr-23782.ic9",  0x8800000, 0x1000000, CRC(4f72e901) SHA1(a1d231c446d2c34e5a7e7145754b2313a2d03fd4) )
 	ROM_LOAD( "mpr-23783.ic10", 0x9800000, 0x1000000, CRC(c8d4f6f9) SHA1(9e9df605c050b3780d7df34bd5041d30bc084d2d) )
 	ROM_LOAD( "mpr-23784.ic11", 0xa800000, 0x1000000, CRC(f74f2fee) SHA1(84b07baa6d116727e66ef27e24ba6484c3393891) )
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "vf4cart-key.bin", 0, 4, CRC(22838e16) SHA1(afee674dce3cfdd20360c30da2da5ba69f8d4682) )
 ROM_END
 
 ROM_START( kingrt66 )
@@ -7287,9 +7072,6 @@ ROM_START( vf4evoct )
 	ROM_LOAD32_WORD( "mpr-23931.ic36s", 0xa000002, 0x800000, CRC(12ecd2f0) SHA1(3222d4d9d3e30c297a072a8888c28503306db40c) )
 
 	ROM_COPY( "rom_board", 0x1400000, 0x0800000, 0x0800000 ) // mirror data so IC1 check can pass
-
-	ROM_REGION( 4, "rom_key", 0 )
-	ROM_LOAD( "vf4evoct-key.bin", 0, 4, CRC(c37dae2b) SHA1(c42dc01b5918db36e7eb2aca523e2f4df567725a) )
 ROM_END
 
 ROM_START( clubkrte )
diff --git a/src/mame/machine/naomibd.h b/src/mame/machine/naomibd.h
index 7a8804af9e7..10a38210fd1 100644
--- a/src/mame/machine/naomibd.h
+++ b/src/mame/machine/naomibd.h
@@ -2,6 +2,7 @@
 #define _NAOMIBD_H_
 
 #include "machine/naomig1.h"
+#include "machine/naomicrypt.h"
 
 #define MCFG_NAOMI_BOARD_ADD(_tag, type, _eeprom_tag, _maincpu_tag, _irq_cb)    \
 	MCFG_NAOMI_G1_ADD(_tag, type, _maincpu_tag, _irq_cb)                        \
diff --git a/src/mame/machine/naomicrypt.c b/src/mame/machine/naomicrypt.c
new file mode 100644
index 00000000000..37e3429577c
--- /dev/null
+++ b/src/mame/machine/naomicrypt.c
@@ -0,0 +1,131 @@
+
+/* Naomi cartridge encryption
+
+ see naomim1.c, naomim2.c and naomim4.c for implementation details
+
+ The keys here are totally arbitrary and have nothing to do with the real keys.
+
+ Atomiswave is significantly different and not listed here.
+ Naomi GD-ROMs use DES encryption, and the keys are stored as part of the PIC dumps instead.
+
+ the Naomi schemes are clearly related to CPS2
+ the ST-V scheme could also be related to this.
+
+ */
+
+
+#include "emu.h"
+#include "naomicrypt.h"
+
+struct game_keys
+{
+	const char *name;             /* game driver name */
+	const UINT32 key;
+
+};
+
+static const struct game_keys keys_table[] =
+{
+
+	// name				key              gameid #		  year
+// M2
+	{ "wldkicks",        0x00ae2901 }, // 25209801    2000
+	{ "toukon4",         0x012e2901 }, // 25349801    2000
+	{ "ninjaslt",        0x000ca510 }, // 25469801    2000
+	{ "ninjaslt4",       0x000ca510 }, // ^
+	{ "gunsur2e",        0x000680d0 }, // 25709801    2001
+	{ "mazan",           0x000fea94 }, // 25869812    2002
+	{ "f355twin",        0x0006efd4 }, // 834-13950   1999
+	{ "alpiltdx",        0x00070e41 }, // 834-?????   1999
+	{ "alpilota",        0x00070e41 }, // ^
+
+	{ "f355twn2",        0x001666c6 }, // 834-?????   2001
+	{ "crzytaxi",        0x000d2f45 }, // 840-0002    1999
+	{ "zombrvn",         0x00012b41 }, // 840-0003    1999
+	{ "ggram2",          0x00074a61 }, // 840-0007    1999
+	{ "vs2_2k",          0x00088b08 }, // 840-0010    1999
+	{ "toyfight",        0x0002ca85 }, // 840-0011    1999
+	{ "smlg99",          0x00048a01 }, // 840-0012    1999 
+	{ "jambo",           0x000fab95 }, // 840-0013    1999
+	{ "vtennis",         0x0003eb15 }, // 840-0015    1999
+	{ "derbyoc",         0x000fee35 }, // 840-0016    1999
+	{ "otrigger",        0x000fea94 }, // 840-0017    1999
+	{ "sgtetris",        0x0008ae51 }, // 840-0018    1999
+	{ "dybb99",          0x00048a01 }, // 840-0019    1999
+	{ "samba",           0x000a8b5d }, // 840-0020    1999
+	{ "sambap",          0x000a8b5d }, // 840-0020    1999
+	{ "virnbao",         0x00068b58 }, // 840-0021    2000
+	{ "tduno2",          0x2f6f0f8d }, // 840-0022    2000
+	{ "18wheelr",        0x0007cf54 }, // 840-0023    2000
+	{ "18wheels",        0x0007cf54 }, // ^
+	{ "vonot",           0x00010715 }, // 840-0028    2000
+	{ "sstrkfgt",        0x00132303 }, // 840-0035    2000
+	{ "wwfroyal",        0x001627c3 }, // 840-0040    2000
+	{ "slasho",          0x001a66ca }, // 840-0041    2000
+	{ "crackndj",        0x001c2347 }, // 840-0043    2000
+	{ "csmash",          0x00103347 }, // 840-0044    2000
+	{ "csmasho",         0x00103347 }, // ^
+	{ "samba2k",         0x001702cf }, // 840-0047    2000
+	{ "alienfnt",        0x00174343 }, // 840-0048    2001
+	{ "alienfnta",       0x00174343 }, // ^
+	{ "ringout",         0x000b1e40 }, // 840-004C    1999
+	{ "vf4cart",         0x02ef2f96 }, // 840-0080    2002
+	{ "pstone",          0x000e69c1 }, // 841-0001    1999
+	{ "suchie3",         0x000368e1 }, // 841-0002    1999
+	{ "doa2",            0x0008ad01 }, // 841-0003    1999
+	{ "doa2m",           0x0008ad01 }, // ^
+	{ "spawn",           0x00078d01 }, // 841-0005    1999
+	{ "puyoda",          0x000acd40 }, // 841-0006    1999
+	{ "pstone2",         0x000b8dc0 }, // 841-0008    2000
+	{ "capsnk",          0x00000000 }, // 841-0011    2000
+	{ "capsnka",         0x00000000 }, // ^
+	{ "cspike",          0x000e2010 }, // 841-0012    2000 
+	{ "ggx",             0x00076110 }, // 841-0013    2000
+	{ "gwing2",          0x000b25d0 }, // 841-0014    2000
+	{ "pjustic",         0x000725d0 }, // 841-0015    2000
+	{ "deathcox",        0x000b64d0 }, // 841-0016    2000
+	{ "gundmct",         0x000e8010 }, // 841-0017    2001
+	{ "zerogu2",         0x0007c010 }, // 841-0020    2001 
+	{ "hmgeo",           0x00038510 }, // HMG016007   2001
+// M1
+	{ "qmegamis",        0x96489bcd }, // 840-0030    2000
+	{ "gram2000",        0x3f5c807f }, // 840-0039    2000
+	{ "vtenis2c",        0x43472d2d }, // 840-0084    2001
+	{ "shootopl",        0xa77cf3a0 }, // 840-0098    2002
+	{ "shootpl",         0xcde98d9d }, // 840-0128    2002
+	{ "shootplm",        0xcde98d9d }, // ^
+	{ "vf4evoct",        0xcdb05b1e }, // 840-0106    2002
+	{ "mvsc2",           0x7c6e8bc1 }, // 841-0007-02 2000
+	{ "kick4csh",        0xc9570882 }, // 840-0140    2004
+	{ "mtkob2",          0x3892fb3a }, // 840-0150    2003
+// M4
+	{ "pokasuka",		0x4792bcde }, // 840-0170	  2007
+	{ "asndynmt",		0x00008784 }, // 840-0175	  2007
+	{ "sl2007",			0x88c274c7 }, // 841-0057	  2007
+	{ "ausfache",		0x092b6007 }, // 841-0058	  2008
+	{ "illvelo",		0xf3a5982c }, // 841-0059	  2008
+	{ "mbaa",			0xab0f2aba }, // 841-0061	  2008
+	{ NULL, 0 }    // end of table
+};
+
+
+UINT32 get_naomi_key(running_machine &machine)
+{
+
+	const char *gamename = machine.system().name;
+	const struct game_keys *k = &keys_table[0];
+	
+	while (k->name)
+	{
+		if (strcmp(k->name, gamename) == 0)
+		{
+			// we have a proper key so return it
+			return k->key;
+		}
+		++k;
+	}
+
+	printf("get_naomi_key : KEY NOT FOUND\n");
+	
+	return 0;
+}
\ No newline at end of file
diff --git a/src/mame/machine/naomicrypt.h b/src/mame/machine/naomicrypt.h
new file mode 100644
index 00000000000..46ec80527af
--- /dev/null
+++ b/src/mame/machine/naomicrypt.h
@@ -0,0 +1,5 @@
+/* naomicrypt.h */
+
+
+UINT32 get_naomi_key(running_machine &machine);
+
diff --git a/src/mame/machine/naomim1.c b/src/mame/machine/naomim1.c
index 16d2389d032..9966e2c9696 100644
--- a/src/mame/machine/naomim1.c
+++ b/src/mame/machine/naomim1.c
@@ -13,13 +13,10 @@ ADDRESS_MAP_END
 naomi_m1_board::naomi_m1_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: naomi_board(mconfig, NAOMI_M1_BOARD, "NAOMI-M1-BOARD", tag, owner, clock)
 {
-	key_tag = 0;
 }
 
-void naomi_m1_board::static_set_tags(device_t &device, const char *_key_tag)
+void naomi_m1_board::static_set_tags(device_t &device)
 {
-	naomi_m1_board &dev = downcast<naomi_m1_board &>(device);
-	dev.key_tag = _key_tag;
 }
 
 READ16_MEMBER(naomi_m1_board::actel_id_r)
@@ -31,8 +28,8 @@ void naomi_m1_board::device_start()
 {
 	naomi_board::device_start();
 
-	const UINT8 *key_data = memregion(key_tag)->base();
-	key = (key_data[0] << 24) | (key_data[1] << 16) | (key_data[2] << 8) | key_data[3];
+	key = get_naomi_key(machine());
+
 	buffer = auto_alloc_array(machine(), UINT8, BUFFER_SIZE);
 
 	save_pointer(NAME(buffer), BUFFER_SIZE);
diff --git a/src/mame/machine/naomim1.h b/src/mame/machine/naomim1.h
index 6cf2173f848..1facf9f46f2 100644
--- a/src/mame/machine/naomim1.h
+++ b/src/mame/machine/naomim1.h
@@ -3,16 +3,16 @@
 
 #include "naomibd.h"
 
-#define MCFG_NAOMI_M1_BOARD_ADD(_tag, _key_tag, _eeprom_tag, _maincpu_tag, _irq_cb) \
+#define MCFG_NAOMI_M1_BOARD_ADD(_tag, _eeprom_tag, _maincpu_tag, _irq_cb) \
 	MCFG_NAOMI_BOARD_ADD(_tag, NAOMI_M1_BOARD, _eeprom_tag, _maincpu_tag, _irq_cb) \
-	naomi_m1_board::static_set_tags(*device, _key_tag);
+	naomi_m1_board::static_set_tags(*device);
 
 class naomi_m1_board : public naomi_board
 {
 public:
 	naomi_m1_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 
-	static void static_set_tags(device_t &device, const char *_key_tag);
+	static void static_set_tags(device_t &device);
 
 	virtual DECLARE_ADDRESS_MAP(submap, 16);
 
@@ -29,7 +29,6 @@ protected:
 private:
 	enum { BUFFER_SIZE = 32768 };
 
-	const char *key_tag;
 	UINT32 key;
 
 	UINT8 *buffer;
diff --git a/src/mame/machine/naomim2.c b/src/mame/machine/naomim2.c
index 82f91ad18f7..7dbc204a8c9 100644
--- a/src/mame/machine/naomim2.c
+++ b/src/mame/machine/naomim2.c
@@ -7,21 +7,17 @@ const device_type NAOMI_M2_BOARD = &device_creator<naomi_m2_board>;
 naomi_m2_board::naomi_m2_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: naomi_board(mconfig, NAOMI_M2_BOARD, "NAOMI-M2-BOARD", tag, owner, clock)
 {
-	key_tag = 0;
 }
 
-void naomi_m2_board::static_set_tags(device_t &device, const char *_key_tag)
+void naomi_m2_board::static_set_tags(device_t &device)
 {
-	naomi_m2_board &dev = downcast<naomi_m2_board &>(device);
-	dev.key_tag = _key_tag;
 }
 
 void naomi_m2_board::device_start()
 {
 	naomi_board::device_start();
 
-	const UINT8 *key_data = memregion(key_tag)->base();
-	key = (key_data[0] << 24) | (key_data[1] << 16) | (key_data[2] << 8) | key_data[3];
+	key = get_naomi_key(machine());
 
 	ram = auto_alloc_array(machine(), UINT8, RAM_SIZE);
 	buffer = auto_alloc_array(machine(), UINT8, BUFFER_SIZE);
diff --git a/src/mame/machine/naomim2.h b/src/mame/machine/naomim2.h
index e4e6cbe871e..fdeada1a5e3 100644
--- a/src/mame/machine/naomim2.h
+++ b/src/mame/machine/naomim2.h
@@ -3,16 +3,16 @@
 
 #include "naomibd.h"
 
-#define MCFG_NAOMI_M2_BOARD_ADD(_tag, _key_tag, _eeprom_tag, _maincpu_tag, _irq_cb) \
+#define MCFG_NAOMI_M2_BOARD_ADD(_tag, _eeprom_tag, _maincpu_tag, _irq_cb) \
 	MCFG_NAOMI_BOARD_ADD(_tag, NAOMI_M2_BOARD, _eeprom_tag, _maincpu_tag, _irq_cb) \
-	naomi_m2_board::static_set_tags(*device, _key_tag);
+	naomi_m2_board::static_set_tags(*device);
 
 class naomi_m2_board : public naomi_board
 {
 public:
 	naomi_m2_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 
-	static void static_set_tags(device_t &device, const char *_key_tag);
+	static void static_set_tags(device_t &device);
 
 protected:
 	virtual void device_start();
@@ -29,7 +29,6 @@ private:
 		FLAG_COMPRESSED = 0x10000, FLAG_LINE_SIZE_512 = 0x20000
 	};
 
-	const char *key_tag;
 	UINT32 key;
 
 	UINT8 *ram, *buffer, *line_buffer, *line_buffer_prev;
diff --git a/src/mame/machine/naomim4.c b/src/mame/machine/naomim4.c
index 1a1e37ee1c4..0151ca70356 100644
--- a/src/mame/machine/naomim4.c
+++ b/src/mame/machine/naomim4.c
@@ -22,6 +22,9 @@
 
 const device_type NAOMI_M4_BOARD = &device_creator<naomi_m4_board>;
 
+
+
+
 const UINT8 naomi_m4_board::k_sboxes[4][16] = {
 	{13,14,1,11,7,9,10,0,15,6,4,5,8,2,12,3},
 	{12,3,14,6,7,15,2,13,1,4,11,0,9,10,8,5},
@@ -32,22 +35,20 @@ const UINT8 naomi_m4_board::k_sboxes[4][16] = {
 naomi_m4_board::naomi_m4_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
 	: naomi_board(mconfig, NAOMI_M4_BOARD, "NAOMI-M1-BOARD", tag, owner, clock)
 {
-	key_tag = 0;
 }
 
-void naomi_m4_board::static_set_tags(device_t &device, const char *_key_tag)
+void naomi_m4_board::static_set_tags(device_t &device)
 {
-	naomi_m4_board &dev = downcast<naomi_m4_board &>(device);
-	dev.key_tag = _key_tag;
 }
 
 void naomi_m4_board::device_start()
 {
 	naomi_board::device_start();
 
-	const UINT8 *key_data = memregion(key_tag)->base();
-	key = (key_data[2] << 8) | key_data[3];
-	iv = (key_data[0] << 8) | key_data[1];
+	UINT32 tempkey = get_naomi_key(machine()); 
+	iv = (tempkey >> 16) &0xffff;
+	key = tempkey & 0xffff;
+
 	buffer = auto_alloc_array(machine(), UINT8, BUFFER_SIZE);
 	enc_init();
 
diff --git a/src/mame/machine/naomim4.h b/src/mame/machine/naomim4.h
index 82529b07da2..572af6b0404 100644
--- a/src/mame/machine/naomim4.h
+++ b/src/mame/machine/naomim4.h
@@ -3,16 +3,16 @@
 
 #include "naomibd.h"
 
-#define MCFG_NAOMI_M4_BOARD_ADD(_tag, _key_tag, _eeprom_tag, _maincpu_tag, _irq_cb) \
+#define MCFG_NAOMI_M4_BOARD_ADD(_tag, _eeprom_tag, _maincpu_tag, _irq_cb) \
 	MCFG_NAOMI_BOARD_ADD(_tag, NAOMI_M4_BOARD, _eeprom_tag, _maincpu_tag, _irq_cb) \
-	naomi_m4_board::static_set_tags(*device, _key_tag);
+	naomi_m4_board::static_set_tags(*device);
 
 class naomi_m4_board : public naomi_board
 {
 public:
 	naomi_m4_board(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 
-	static void static_set_tags(device_t &device, const char *_key_tag);
+	static void static_set_tags(device_t &device);
 
 protected:
 	virtual void device_start();
@@ -27,7 +27,6 @@ private:
 
 	static const UINT8 k_sboxes[4][16];
 
-	const char *key_tag;
 	UINT16 key, iv;
 	UINT16 *one_round;
 
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index 093cb4a3f4f..e09b0ddd65c 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -1268,7 +1268,9 @@ $(MAMEOBJ)/sega.a: \
 	$(DRIVERS)/model2.o $(VIDEO)/model2.o \
 	$(DRIVERS)/model3.o $(VIDEO)/model3.o $(MACHINE)/model3.o \
 	$(DRIVERS)/naomi.o $(MACHINE)/dc.o $(VIDEO)/dc.o $(MACHINE)/naomi.o \
-	$(MACHINE)/naomig1.o $(MACHINE)/naomibd.o $(MACHINE)/naomirom.o $(MACHINE)/naomigd.o $(MACHINE)/naomim1.o $(MACHINE)/naomim2.o $(MACHINE)/naomim4.o $(MACHINE)/awboard.o \
+	$(MACHINE)/naomig1.o $(MACHINE)/naomibd.o $(MACHINE)/naomirom.o $(MACHINE)/naomigd.o \
+	$(MACHINE)/naomicrypt.o $(MACHINE)/naomim1.o $(MACHINE)/naomim2.o $(MACHINE)/naomim4.o \
+	$(MACHINE)/awboard.o \
 	$(MACHINE)/mie.o $(MACHINE)/maple-dc.o $(MACHINE)/mapledev.o $(MACHINE)/dc-ctrl.o $(MACHINE)/jvs13551.o \
 	$(DRIVERS)/triforce.o \
 	$(DRIVERS)/puckpkmn.o \