Converted naomi to eepromdev. Default main board EEPROM is now loaded

instead of generated.

src/mame/drivers/naomi.c

@@ -1047,7 +1047,7 @@ Notes:
 #include "driver.h"
 #include "cpu/arm7/arm7.h"
 #include "video/generic.h"
-#include "machine/eeprom.h"
+#include "machine/eepromdev.h"
 #include "machine/intelfsh.h"
 #include "includes/naomibd.h"
 #include "includes/naomi.h"
@@ -1135,42 +1135,19 @@ static NVRAM_HANDLER( naomi_eeproms )
 	{
 		/* JVS 'eeprom' */
 		mame_fwrite(file,maple0x86data1,0x80);
-
-		// mainboard eeprom?
-		eeprom_save(file);
 	}
 	else
 	{
-		eeprom_init(machine, &eeprom_interface_93C46);
 		if (file)
 		{
-			UINT8 tmp[0x80];
-
 			/* JVS 'eeprom' */
 			mame_fread(file,maple0x86data1,0x80);
-
-			mame_fread(file,&tmp,0x80);
-			eeprom_set_data((UINT8 *)tmp, 0x80);
-
-			// mainboard eeprom?
-            eeprom_load(file);
-
 		}
-        	else
+       	else
 		{
-		//  int a;
-
-			UINT32 length, size;
-			UINT8 *dat;
 			const UINT8* jvseeprom_default = NULL;
 			int i;
 
-			dat = (UINT8 *)eeprom_get_data_pointer(&length, &size);
-			memset(dat, 0, length * size);
-
-			// mainboard eeprom?
-			eeprom_set_data((UINT8 *)"\011\241                              0000000000000000", 48);  // 2*checksum 30*unknown 16*serial
-
 			// some games require defaults to boot (vertical, 1 player etc.)
 			for (i=0; i<ARRAY_LENGTH(jvseeprom_default_game); i++)
 				if (!strcmp(machine->gamedrv->name, jvseeprom_default_game[i].name))
@@ -1197,23 +1174,23 @@ static NVRAM_HANDLER( naomi_eeproms )
 	}
 }
 
-static READ64_HANDLER( eeprom_93c46a_r )
+static READ64_DEVICE_HANDLER( eeprom_93c46a_r )
 {
 	int res;
 
 	/* bit 3 is EEPROM data */
-	res = eeprom_read_bit() << 4;
+	res = eepromdev_read_bit(device) << 4;
 	return res;
 }
 
-static WRITE64_HANDLER( eeprom_93c46a_w )
+static WRITE64_DEVICE_HANDLER( eeprom_93c46a_w )
 {
 	/* bit 4 is data */
 	/* bit 2 is clock */
 	/* bit 5 is cs */
-	eeprom_write_bit(data & 0x8);
-	eeprom_set_cs_line((data & 0x20) ? CLEAR_LINE : ASSERT_LINE);
-	eeprom_set_clock_line((data & 0x4) ? ASSERT_LINE : CLEAR_LINE);
+	eepromdev_write_bit(device, data & 0x8);
+	eepromdev_set_cs_line(device, (data & 0x20) ? CLEAR_LINE : ASSERT_LINE);
+	eepromdev_set_clock_line(device, (data & 0x4) ? ASSERT_LINE : CLEAR_LINE);
 }
 
 /* Dreamcast MAP
@@ -1356,7 +1333,7 @@ ADDRESS_MAP_END
 
 
 static ADDRESS_MAP_START( naomi_port, ADDRESS_SPACE_IO, 64 )
-	AM_RANGE(0x00, 0x0f) AM_READWRITE(eeprom_93c46a_r, eeprom_93c46a_w)
+	AM_RANGE(0x00, 0x0f) AM_DEVREADWRITE("main_eeprom", eeprom_93c46a_r, eeprom_93c46a_w)
 ADDRESS_MAP_END
 
 /*
@@ -1817,6 +1794,9 @@ static MACHINE_DRIVER_START( naomi_base )
 	MDRV_MACHINE_START( dc )
 	MDRV_MACHINE_RESET( naomi )
 
+	MDRV_EEPROM_93C46_ADD("main_eeprom")
+	MDRV_EEPROM_DEFAULT_VALUE(0)
+	
 	MDRV_NVRAM_HANDLER(naomi_eeproms)
 
 	/* video hardware */
@@ -1875,6 +1855,7 @@ MACHINE_DRIVER_END
 
 static MACHINE_DRIVER_START( aw )
 	MDRV_IMPORT_FROM(naomi_base)
+//	MDRV_DEVICE_REMOVE("main_eeprom")
 	MDRV_CPU_MODIFY("maincpu")
 	MDRV_CPU_PROGRAM_MAP(aw_map)
 	MDRV_NVRAM_HANDLER(aw_nvram)
@@ -2094,16 +2075,22 @@ Region byte encoding is as follows:
 	ROM_SYSTEM_BIOS( 0, "bios0", "Atomiswave BIOS" ) \
 	ROM_LOAD16_WORD_SWAP_BIOS( 0, "bios.ic23_l", 0x000000, 0x010000, BAD_DUMP CRC(e5693ce3) SHA1(1bde3ed87af64b0f675ebd47f12a53e1fc5709c1) ) /* Might be bad.. especially. bytes 0x0000, 0x6000, 0x8000 which gave different reads */
 
+/* default EEPROM values, same works for all games */ 
+#define NAOMI_DEFAULT_EEPROM \
+	ROM_REGION16_BE( 0x80, "main_eeprom", 0 ) \
+	ROM_LOAD16_WORD("eeprom-naomi-main-default.bin", 0x0000, 0x0080, CRC(fea29cbb) SHA1(4099f1747aafa07db34f6e072cd9bfaa83bae10e) )
 
 ROM_START( naomi )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x8400000, "user1", ROMREGION_ERASE)
 ROM_END
 
 ROM_START( naomigd )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x8400000, "user1", ROMREGION_ERASE)
 ROM_END
@@ -2111,6 +2098,7 @@ ROM_END
 ROM_START( hod2bios )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	HOTD2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x8400000, "user1", ROMREGION_ERASE)
 ROM_END
@@ -2118,6 +2106,7 @@ ROM_END
 ROM_START( f355bios )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	F355_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x8400000, "user1", ROMREGION_ERASE)
 ROM_END
@@ -2125,12 +2114,14 @@ ROM_END
 ROM_START( airlbios )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	AIRLINE_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x8400000, "user1", ROMREGION_ERASE)
 ROM_END
 
 ROM_START( naomi2 )
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x8400000, "user1", ROMREGION_ERASE)
 ROM_END
@@ -2178,6 +2169,7 @@ IC12    64M     BA24    102F
 ROM_START( cspike )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x6800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-23210.ic22", 0x0000000, 0x0400000, CRC(a15c54b5) SHA1(5c7872244d3d648e4c04751f120d0e9d47239921) )
@@ -2225,6 +2217,7 @@ IC13    64M     A12E    8DE4
 ROM_START( capsnk )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x7800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD( "epr-23511.ic22", 0x000000, 0x400000, CRC(3dbf8eb2) SHA1(1f7b89ba99e018cc85022fa852d56d4e345e1bd2) )
@@ -2268,6 +2261,7 @@ ROM_END
 ROM_START( capsnka )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x7800000, "user1", ROMREGION_ERASEFF)
         ROM_LOAD( "epr23511a.ic22", 0x000000, 0x400000, CRC(fe00650f) SHA1(ca8e9e9178ed2b6598bdea83be1bf0dd7aa509f9) )
@@ -2332,6 +2326,7 @@ Serial: BCHE-01A0803
 ROM_START( csmash )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x4800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-23428a.ic22", 0x0000000, 0x400000, CRC(d628dbce) SHA1(91ec1296ead572a64c37f8ac2c1a96742f19d50b) )
@@ -2352,6 +2347,7 @@ ROM_END
 ROM_START( csmasho )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x4800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-23428.ic22", 0x0000000, 0x400000, CRC(f8597496) SHA1(2bb9f25b63b7410934ae4b1e052e1308a5c5a57f) )
@@ -2381,6 +2377,7 @@ EXP: DEATH CRIMSON OX
 ROM_START( deathcox )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x5800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-23524.ic22",0x0000000, 0x0400000, CRC(edc20e44) SHA1(6167ee86624f5b78b3ced0dd82259e83053f4f9d) )
@@ -2433,6 +2430,7 @@ IC21    64M     002C    8ECA
 ROM_START( doa2 )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-22121.ic22",0x0000000, 0x0400000,  CRC(30f93b5e) SHA1(0e33383e7ab9a721dab4708b063598f2e9c9f2e7) ) // partially encrypted
@@ -2521,6 +2519,7 @@ Serial: BALH-13A0175
 ROM_START( doa2m )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("doa2verm.ic22", 0x0000000, 0x0400000,  CRC(94b16f08) SHA1(225cd3e5dd5f21facf0a1d5e66fa17db8497573d) )
@@ -2602,6 +2601,7 @@ Serial: BAXE-02A1386
 ROM_START( derbyoc )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x7800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-22099b.ic22", 0x0000000, 0x0400000, CRC(5e708879) SHA1(fada4f4bf29fc8f77f354167f8db4f904610fe1a) )
@@ -2631,6 +2631,7 @@ EXP: DERBY OWNERS CLUB II-IN EXPORT
 ROM_START( derbyoc2 )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-22306.ic22",  0x0000000, 0x0400000, CRC(fcac20eb) SHA1(26cec9f615cd18ce7fccfc5e273e42c58dea1995) )
@@ -2697,6 +2698,7 @@ Protection notes (same code snippet seen in Zombie Revenge):
 ROM_START( dybbnao )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-21575.ic22",0x0000000, 0x0200000, CRC(ba61e248) SHA1(3cce5d8b307038515d7da7ec567bfa2e3aafc274) )
@@ -2759,6 +2761,7 @@ Serial: BBDE-01A0097
 ROM_START( dybb99 )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xa000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-22141b.ic22",0x0000000, 0x0200000, CRC(6d0e0785) SHA1(aa19e7bac4c266771d1e65cffa534a49d7566f51) )
@@ -2786,6 +2789,7 @@ ROM_END
 ROM_START( smlg99 )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
         ROM_LOAD( "epr-22059.ic22", 0x0000000, 0x200000, CRC(5784f970) SHA1(e9ec692206a95cc260521154305693f6022190bc) )
@@ -2824,6 +2828,7 @@ EXP: F355 CHALLENGE EXPORT
 ROM_START( f355 )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	F355_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-21902.ic22",0x0000000, 0x0400000, CRC(04e8acec) SHA1(82e20f99876b13b77c0393ef545316f9eeb2c29c) )
@@ -2854,6 +2859,7 @@ ROM_END		 					 									// ROM reads different each time and fails test mode on
 ROM_START( f355twin )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	F355_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
         ROM_LOAD( "epr22848.ic22", 0x0000000, 0x800000, CRC(54de0bd5) SHA1(5f6be36d2d39eea681ecac14358b92eaf4bf6c1e) )
@@ -2883,6 +2889,7 @@ ROM_END
 ROM_START( f355twn2 )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	F355_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
         ROM_LOAD( "epr23399.ic22", 0x0000000, 0x400000, CRC(36de514c) SHA1(1c32064169c233156921fdf170c1958dc0f8a750) )
@@ -2912,6 +2919,7 @@ ROM_END
 ROM_START( alpiltdx )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	AIRLINE_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD( "epr21787b.ic22", 0x0000000, 0x400000, CRC(56893156) SHA1(8e56e0633f92b1f50105421b7eb8428f51a78b27) )
@@ -2935,6 +2943,7 @@ ROM_END
 ROM_START( alpilota )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	AIRLINE_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD( "epr-21739a.ic22", 0x000000, 0x400000, CRC(08f22bab) SHA1(fedc80eef7c824381fd834cc04202383c9340c4f) )
@@ -2954,6 +2963,7 @@ ROM_END
 ROM_START( hotd2 )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	HOTD2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xa800000, "user1", ROMREGION_ERASEFF)
         ROM_LOAD( "epr-21585.ic22", 0x0000000, 0x200000, CRC(b23d1a0c) SHA1(9e77980d1aa980c879886e53cc76a16d7a9d43a1) )
@@ -2995,6 +3005,7 @@ Serial: BAJE-01A0021
 ROM_START( ggram2 )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x6000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-21820.ic22", 0x0000000, 0x0200000, CRC(0a198278) SHA1(0df5fc8b56ddafc66d92cb3923b851a5717b551d) )
@@ -3052,6 +3063,7 @@ Serial: BCCG-21A0451
 ROM_START( gram2000 )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-23377.ic11",        0x0000000, 0x0400000, CRC(4ca3149c) SHA1(9d25fc659658b416202b033754669be2f3abcdbe) )
@@ -3088,6 +3100,7 @@ EXP: DISABLE
 ROM_START( ggx )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x7800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-23356.ic22", 0x0000000, 0x0400000, CRC(ed2d289f) SHA1(d4f73c6cd25f320616e21f1ff0cdc0a566185dcb) )
@@ -3157,6 +3170,7 @@ IC11    64M     4F77    EEFE
 ROM_START( hmgeo )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x6000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-23716a.ic22", 0x0000000, 0x0400000,  CRC(c5cb0d3b) SHA1(20de8f5ee183e996ccde77b10564a302939662db) )
@@ -3227,6 +3241,7 @@ e055c key 37ca read count 400, write 404
 ROM_START( gwing2 )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x5800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-22270.ic22",0x0000000, 0x0200000,  CRC(876b3c97) SHA1(eb171d4a0521c3bea42b4aae3607faec63e10581) )
@@ -3285,6 +3300,7 @@ IC14    32M     81F9    DA1B
 ROM_START( suchie3 )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x7800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-21979.ic22",0x0000000, 0x0200000, CRC(335c9e25) SHA1(476790fdd99a8c13336e795b4a39b071ed86a97c) )
@@ -3314,6 +3330,7 @@ EXP: SHANGRI-LA
 ROM_START( shangril )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x6800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-22060.ic22", 0x0000000, 0x0400000, CRC(5ae18595) SHA1(baaf8fd948b07ab9970571fecebc3c4fab5d4897) )
@@ -3345,6 +3362,7 @@ So the Naomi regular board test item is unreliable in this circumstance.
 ROM_START( mvsc2 )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x8900000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-23085a.ic11", 0x0000000, 0x0400000, CRC(5d5b7ad1) SHA1(f58c31b245fc33fa541f9f074548402a63f7c3d3) )
@@ -3380,6 +3398,7 @@ ROM_END
 ROM_START( toyfight )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x8000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-22035.ic22",0x0000000, 0x0400000, CRC(dbc76493) SHA1(a9772bdb62610a39adf2b9f397781bcddda3e635) )
@@ -3405,6 +3424,7 @@ ROM_END
 ROM_START( crzytaxi )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x8800000, "user1", ROMREGION_ERASEFF)
         ROM_LOAD( "epr21684.bin",   0x0000000, 0x400000, CRC(f1de77b7) SHA1(4490b828534db6676b2d0129498fd7694eb9e5ff) )
@@ -3430,6 +3450,7 @@ ROM_END
 ROM_START( jambo )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x8800000, "user1", ROMREGION_ERASEFF)
         ROM_LOAD( "epr22826a.bin", 0x0000000, 0x400000, CRC(18f8f3bc) SHA1(417f2282c9970775e51b56d2eeb671a50ca293a7) )
@@ -3450,6 +3471,7 @@ ROM_END
 ROM_START( 18wheelr )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xa800000, "user1", ROMREGION_ERASEFF)
         ROM_LOAD( "epr22185.bin",   0x0000000, 0x400000, CRC(219b29b0) SHA1(2f32caf3906fc1408fd8126a500e74c682ff20fa) )
@@ -3492,6 +3514,7 @@ ROM_END
 ROM_START( sgtetris )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x3800000, "user1", ROMREGION_ERASEFF)
         ROM_LOAD( "epr-22909.ic22", 0x000000, 0x200000, CRC(486b2fdf) SHA1(da54fec42b7ac16f73b2b9f166b9b2ab45426fd7) )
@@ -3539,6 +3562,7 @@ IC17 64M    6586    1F3F
 ROM_START( slasho )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x9000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-23341.ic22", 0x0000000, 0x0400000, CRC(477fa123) SHA1(d2474766dcd0b0e5fe317a858534829eb1c26789) )
@@ -3601,6 +3625,7 @@ Serial: BCLE-01A2130
 ROM_START( pjustic )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-23548a.ic22", 0x0000000, 0x0400000,  CRC(f4ccf1ec) SHA1(97485b2a4b9452ffeea2501f42d20d718410e716) )
@@ -3650,6 +3675,7 @@ prot
 ROM_START( pstone )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x4800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-21597.ic22",0x0000000, 0x0200000, CRC(62c7acc0) SHA1(bb61641a7f3650757132cde379447bdc9bd91c78) )
@@ -3689,6 +3715,7 @@ Serial: BBJE-01A1613
 ROM_START( pstone2 )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x5000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-23127.ic22", 0x0000000, 0x0400000,  CRC(185761d6) SHA1(8c91b594dd59313d249c9da7b39dee21d3c9082e) )
@@ -3771,6 +3798,7 @@ Serial (from 2 carts): BAZE-01A0288
 ROM_START( otrigger )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xa000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-22163.ic22", 0x0000000, 0x0400000, CRC(3bdafb6a) SHA1(c4c5a4ba94d85c4353df22d70bb08be67e9c22c3) )
@@ -3808,6 +3836,7 @@ EXP: AH! MY GODDESS QUIZ GAME--
 ROM_START( qmegamis )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x9000200, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-23227.ic11", 0x0000000, 0x0400000, CRC(3f76087e) SHA1(664d28ef95394590b186e7badaf96ddaf781c104) ) //ic 22
@@ -3865,6 +3894,7 @@ IC16    64M     A10B    DDB4
 ROM_START( samba )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x8800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-22966b.ic22",0x0000000, 0x0400000, CRC(893116b8) SHA1(35cb4f40690ff21af5ab7cc5adbc53228d6fb0b3) )
@@ -3898,6 +3928,7 @@ EXP: SEGA MARINE FISHING IN EXPORT
 ROM_START( smarinef )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x6800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-22221.ic22",0x0000000, 0x0400000, CRC(9d984375) SHA1(fe1185d70b4bc1529e3579fd6b2b678c7d548400) )
@@ -3927,6 +3958,7 @@ EXP: SHOOTOUT POOL PRIZE
 ROM_START( shootpl )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x2800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-a-24065.rom0.ic11",0x0000000, 0x0400000, CRC(622a9ba0) SHA1(2f4963b8447ecda78fea0107497c2811f075c07a) )
@@ -3941,6 +3973,7 @@ ROM_END
 ROM_START( shootopl )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x2800000, "user1", ROMREGION_ERASEFF)
         ROM_LOAD( "epr23844.bin", 0x000000, 0x400000, CRC(5c229638) SHA1(9185f9f2369bb2423faff4222419001ac9037d3f) )
@@ -3978,6 +4011,7 @@ Serial: BAVE-02A1305
 ROM_START( spawn )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x5800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-22977b.ic22",0x0000000, 0x0400000, CRC(814ff5d1) SHA1(5a0a9e55878927f98750000eb7d9391cbecfe21d) )
@@ -4005,6 +4039,7 @@ EXP: THE TYPING OF THE DEAD
 ROM_START( totd )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-23021a.ic22", 0x0000000, 0x0400000,  CRC(07d21033) SHA1(d1e619d13c1c01648eb1a6964aad1554dd16c6d5) )
@@ -4068,6 +4103,7 @@ IC21    64M AD60    2F74
 ROM_START( virnba )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-23073.ic22",0x0000000, 0x0400000, CRC(ce5c3d28) SHA1(ca3eeae1cf78435787338bb7b3e71301c0f71dd9) )
@@ -4097,6 +4133,7 @@ ROM_END
 ROM_START( virnbao )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-22949.ic22",0x0000000, 0x0400000, CRC(fd91447e) SHA1(0759d6517aeb684d0cb809c1ae1350615cc0aecc) )
@@ -4153,6 +4190,7 @@ IC15    32M     0DF9    FC01    MPR21928
 ROM_START( vs2_2k )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x8000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-21929.ic22", 0x0000000, 0x0400000, CRC(831af08a) SHA1(af4c74623be823fd061765cede354c6a9722fd10) )
@@ -4199,6 +4237,7 @@ IC11    64M F590    D280
 ROM_START( vtennis )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x6000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-22927.ic22", 0x0000000, 0x0400000,  CRC(89781723) SHA1(cf644aa66abcec6964d77485a0292f11ba80dd0d) )
@@ -4226,6 +4265,7 @@ EXP: ROYAL RUMBLE
 ROM_START( wwfroyal )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x8800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-22261.ic22", 0x0000000, 0x0400000, CRC(60e5a6cd) SHA1(d74ee8318e40190231b94030176223da8305c053) )
@@ -4287,6 +4327,7 @@ Protection notes:
 ROM_START( zombrvn )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xa000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-21707.ic22", 0x0000000, 0x0200000,  CRC(4daa11e9) SHA1(2dc219a5e0d0b41cce6d07631baff0495c479e13) )
@@ -4317,6 +4358,7 @@ ROM_END
 ROM_START( gunsur2 )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASEFF)
         ROM_LOAD( "bhf1vere.2f",  0x0000000, 0x0800000, CRC(121ea283) SHA1(e4bf2b90fa3d42727b8393ffa2c5a8863914a630) )
@@ -4339,6 +4381,7 @@ ROM_END
 ROM_START( vtenis2c )
 	ROM_REGION( 0x200000, "maincpu", 0)
 	NAOMI_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASEFF)
         ROM_LOAD( "epr22327a.bin", 0x000000, 0x400000, CRC(e949004c) SHA1(54db84c3e1db30b233612f68dcd094b597deffd0) )
@@ -4570,6 +4613,7 @@ GAME( 1999, alpilota, alpiltdx, naomi,    naomi,    0,     ROT0, "Sega",
 
 ROM_START( gundmgd )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4585,6 +4629,7 @@ ROM_END
 
 ROM_START( sfz3ugd )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4599,6 +4644,7 @@ ROM_END
 
 ROM_START( cvsgd )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4614,6 +4660,7 @@ ROM_END
 
 ROM_START( gundmxgd )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4629,6 +4676,7 @@ ROM_END
 
 ROM_START( cvs2gd )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4643,6 +4691,7 @@ ROM_END
 
 ROM_START( ikaruga )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4658,6 +4707,7 @@ ROM_END
 
 ROM_START( ggxx )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4673,6 +4723,7 @@ ROM_END
 
 ROM_START( moeru )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4688,6 +4739,7 @@ ROM_END
 
 ROM_START( chocomk )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4703,6 +4755,7 @@ ROM_END
 
 ROM_START( quizqgd )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4718,6 +4771,7 @@ ROM_END
 
 ROM_START( ggxxrl )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4733,6 +4787,7 @@ ROM_END
 
 ROM_START( tetkiwam )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4748,6 +4803,7 @@ ROM_END
 
 ROM_START( shikgam2 )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4763,6 +4819,7 @@ ROM_END
 
 ROM_START( usagui )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4778,6 +4835,7 @@ ROM_END
 
 ROM_START( bdrdown )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4793,6 +4851,7 @@ ROM_END
 
 ROM_START( psyvar2 )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4808,6 +4867,7 @@ ROM_END
 
 ROM_START( cfield )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4824,6 +4884,7 @@ ROM_END
 
 ROM_START( trizeal )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4840,6 +4901,7 @@ ROM_END
 
 ROM_START( meltybld )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4855,6 +4917,7 @@ ROM_END
 
 ROM_START( senko )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4869,6 +4932,7 @@ ROM_END
 
 ROM_START( senkoo )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4884,6 +4948,7 @@ ROM_END
 
 ROM_START( ss2005 )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4899,6 +4964,7 @@ ROM_END
 
 ROM_START( radirgy )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4914,6 +4980,7 @@ ROM_END
 
 ROM_START( ggxxsla )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4929,6 +4996,7 @@ ROM_END
 
 ROM_START( kurucham )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4944,6 +5012,7 @@ ROM_END
 
 ROM_START( undefeat )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4959,6 +5028,7 @@ ROM_END
 
 ROM_START( meltyb )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4973,6 +5043,7 @@ ROM_END
 
 ROM_START( meltyba )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -4988,6 +5059,7 @@ ROM_END
 
 ROM_START( trgheart )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5003,6 +5075,7 @@ ROM_END
 
 ROM_START( jingystm )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5019,6 +5092,7 @@ ROM_END
 
 ROM_START( karous )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5034,6 +5108,7 @@ ROM_END
 
 ROM_START( takoron )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5072,6 +5147,7 @@ PIC
 
 ROM_START( confmiss )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5085,6 +5161,7 @@ ROM_END
 
 ROM_START( sprtjam )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5100,6 +5177,7 @@ ROM_END
 
 ROM_START( slashout )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5115,6 +5193,7 @@ ROM_END
 
 ROM_START( spkrbtl )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5151,6 +5230,7 @@ PIC
 
 ROM_START( monkeyba )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5192,6 +5272,7 @@ Notes:
 
 ROM_START( dygolf )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5210,6 +5291,7 @@ ROM_END
 
 ROM_START( wsbbgd )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5225,6 +5307,7 @@ ROM_END
 
 ROM_START( vtennisg )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5239,6 +5322,7 @@ ROM_END
 
 ROM_START( keyboard )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5252,6 +5336,7 @@ ROM_END
 
 ROM_START( vathlete )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5290,6 +5375,7 @@ PIC
 
 ROM_START( vtennis2 )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5303,6 +5389,7 @@ ROM_END
 
 ROM_START( lupinsho )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5316,6 +5403,7 @@ ROM_END
 
 ROM_START( luptype )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5352,6 +5440,7 @@ PIC
 */
 ROM_START( mok )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5365,6 +5454,7 @@ ROM_END
 
 ROM_START( ngdup23a )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5379,6 +5469,7 @@ ROM_END
 
 ROM_START( ngdup23c )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5394,6 +5485,7 @@ ROM_END
 
 ROM_START( puyofev )
 	NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5520,6 +5612,7 @@ GAME( 2003, puyofev,   naomigd,  naomigd,  naomi,    naomi,  ROT0, "Sega",
 
 ROM_START( vstrik3c )
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD("epr-23663.ic22", 0x0000000, 0x0400000, CRC(7007fec7) SHA1(523168f0b218d0bd5c815d65bf0caba2c8468c9d) )
@@ -5549,6 +5642,7 @@ ROM_END
 
 ROM_START( wldrider )
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xa800000, "user1", ROMREGION_ERASEFF)
 	ROM_LOAD( "epr-23622.ic22", 0x0000000, 0x0400000, CRC(8acafa5b) SHA1(c92bcd40bad6ba8efd1edbfd7e439fb2b3c67fb0) )
@@ -5566,6 +5660,7 @@ ROM_END
 
 ROM_START( vf4cart )
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb800000, "user1", ROMREGION_ERASEFF)
         ROM_LOAD( "epr-23785.ic22", 0x0000000, 0x0400000, CRC(9bd98d4b) SHA1(3b0622625317cd6b2736c5b4a23484fb8bf39e4b) )
@@ -5595,6 +5690,7 @@ ROM_END
 */
 ROM_START( vf4evoct )
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
         ROM_LOAD( "epr-23934.ic11",  0x0000000, 0x400000, CRC(656a7d84) SHA1(e407ddc923b399de99cb06a8831ef8fb328cfe64) )
@@ -5622,6 +5718,7 @@ ROM_END
 
 ROM_START( clubkrte )
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0xb800000, "user1", ROMREGION_ERASEFF)
         ROM_LOAD( "epr-23704.ic22", 0x0000000, 0x0400000, CRC(ff700a0d) SHA1(e2db0d2bd7dc88b3a487077e8ce56eb6cfd9b02d) )
@@ -5646,6 +5743,7 @@ ROM_END
 
 ROM_START( vstrik3 )
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5660,6 +5758,7 @@ ROM_END
 
 ROM_START( vf4 )
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5674,6 +5773,7 @@ ROM_END
 
 ROM_START( vf4b )
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5688,6 +5788,7 @@ ROM_END
 
 ROM_START( vf4c )
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5703,6 +5804,7 @@ ROM_END
 
 ROM_START( vf4evo )
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5717,6 +5819,7 @@ ROM_END
 
 ROM_START( vf4evoa )
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5731,6 +5834,7 @@ ROM_END
 
 ROM_START( initdv2j )
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5743,6 +5847,7 @@ ROM_END
 
 ROM_START( vf4tuned ) // are there multiple files on this GD-ROM? it only compresses to 500 meg when the rom file is closer to half tha
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5757,6 +5862,7 @@ ROM_END
 
 ROM_START( vf4tunedd )
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5772,6 +5878,7 @@ ROM_END
 
 ROM_START( vf4tuneda )
 	NAOMI2_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5812,6 +5919,7 @@ PIC
 ROM_START( beachspi )
 	NAOMI2_BIOS
 //  NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5827,6 +5935,7 @@ ROM_END
 ROM_START( initd )
 	NAOMI2_BIOS
 //  NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5842,6 +5951,7 @@ ROM_END
 ROM_START( initdexp )
 	NAOMI2_BIOS
 //  NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?
 
@@ -5855,6 +5965,7 @@ ROM_END
 ROM_START( initdv3j )
 	NAOMI2_BIOS
 //  NAOMIGD_BIOS
+	NAOMI_DEFAULT_EEPROM
 
 	ROM_REGION( 0x10000000, "user1", ROMREGION_ERASE) // allocate max size in init instead?