naomi: spawn needs the region number in its eeprom

flyinghead · flyinghead · commit ab6b95ff4d4a · 2025-09-27T17:28:20.000+02:00
The current region must be set in the eeprom, otherwise the eeprom is reset to default and network settings are ignored. Issue #696
diff --git a/core/hw/naomi/naomi_roms_eeprom.h b/core/hw/naomi/naomi_roms_eeprom.h
@@ -54,15 +54,16 @@ static u8 hmgeo_eeprom_dump[] = {
 	0x00, 0x00
 };
 
+// VMU enabled, network disabled (USA region)
 static u8 spawn_eeprom_dump[] = {
-	0xcc, 0xde, 0x10, 0x42, 0x41, 0x56, 0x35, 0x09, 0x10, 0x00, 0x01, 0x01, 0x01, 0x00, 0x11, 0x11, 0x11, 0x11,
-	0xcc, 0xde, 0x10, 0x42, 0x41, 0x56, 0x35, 0x09, 0x10, 0x00, 0x01, 0x01, 0x01, 0x00, 0x11, 0x11, 0x11, 0x11,
-	0x51, 0x26, 0x20, 0x20, 0x51, 0x26, 0x20, 0x20, 0x17, 0x12, 0x99, 0x19, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
-	0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x03, 0x06, 0x05, 0x00, 0x01, 0x01, 0x06, 0x00, 0x01, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x17, 0x12, 0x99, 0x19, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x00,
+	0x37, 0x99, 0x10, 0x42, 0x41, 0x56, 0x35, 0x18, 0x10, 0x0b, 0x02, 0x01, 0x01, 0x00, 0x11, 0x11, 0x11, 0x11,
+	0x37, 0x99, 0x10, 0x42, 0x41, 0x56, 0x35, 0x18, 0x10, 0x0b, 0x02, 0x01, 0x01, 0x00, 0x11, 0x11, 0x11, 0x11,
+	0x41, 0x7b, 0x20, 0x20, 0x41, 0x7b, 0x20, 0x20, 0x17, 0x12, 0x99, 0x19, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01,
+	0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x03, 0x06, 0x05, 0x00, 0x01, 0x01, 0x06, 0x00, 0x01, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x17, 0x12, 0x99, 0x19, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00,
 	0x00, 0x00, 0x03, 0x03, 0x06, 0x05, 0x00, 0x01, 0x01, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00,
+	0x00, 0x00
 };
 
 static u8 _18wheelr_eeprom_dump[] {
diff --git a/core/network/naomi_network.cpp b/core/network/naomi_network.cpp
@@ -327,6 +327,8 @@ void SetNaomiNetworkConfig(int node)
 	{
 		write_naomi_eeprom(0x44, node == -1 ? 0
 				: node == 0 ? 1 : 2);
+		// the game wants the region there or it resets the eeprom
+		write_naomi_eeprom(0x30, config::Region);
 	}
 	else if (gameId == "SPIKERS BATTLE JAPAN VERSION")
 	{

Original file line number	Diff line number	Diff line change
`@@ -327,6 +327,8 @@ void SetNaomiNetworkConfig(int node)`
`327`	`327`	`{`
`328`	`328`	`write_naomi_eeprom(0x44, node == -1 ? 0`
`329`	`329`	`: node == 0 ? 1 : 2);`
	`330`	`+ // the game wants the region there or it resets the eeprom`
	`331`	`+ write_naomi_eeprom(0x30, config::Region);`
`330`	`332`	`}`
`331`	`333`	`else if (gameId == "SPIKERS BATTLE JAPAN VERSION")`
`332`	`334`	`{`