ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

partially revert previous commit (seems that throwing in this callback causes a stack overflow? wtf? throwing normally works in nyma firmware handling which is in a callback so this is odd) 

add proper gg firmware entry
This commit is contained in:
CasualPokePlayer 2024-04-29 23:58:58 -07:00
parent 66e38506f6
commit 60fb92f685
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
View File

@ -77,6 +77,7 @@ namespace BizHawk.Client.EmuHawk
["C64"] = "C64",
["GEN"] = "Genesis",
["SMS"] = "Sega Master System",
["GG"] = "Sega Game Gear",
["PSX"] = "PlayStation",
["Jaguar"] = "Jaguar",
["Lynx"] = "Lynx",

3
src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
View File

@ -349,6 +349,9 @@ namespace BizHawk.Emulation.Common
Option("SMS", "Japan", in sms_jp_21);
Option("SMS", "Korea", in sms_kr);
// GG
FirmwareAndOption("914AA165E3D879F060BE77870D345B60CFEB4EDE", 1024, "GG", "Majesco", "GG_majesco.gg", "GG BIOS (USA/Majesco)");
// PSX
// http://forum.fobby.net/index.php?t=msg&goto=2763 [f]
// http://www.psxdev.net/forum/viewtopic.php?f=69&t=56 [p]

9
src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
View File

@ -255,7 +255,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
"CD_BIOS_EU" => new(system: VSystemID.Raw.GEN, firmware: "CD_BIOS_EU"),
"CD_BIOS_JP" => new(system: VSystemID.Raw.GEN, firmware: "CD_BIOS_JP"),
"CD_BIOS_US" => new(system: VSystemID.Raw.GEN, firmware: "CD_BIOS_US"),
"GG_BIOS" => new(system: VSystemID.Raw.SMS, firmware: "Japan"),
"GG_BIOS" => new(system: VSystemID.Raw.GG, firmware: "Majesco"),
"MS_BIOS_EU" => new(system: VSystemID.Raw.SMS, firmware: "Export"),
"MS_BIOS_JP" => new(system: VSystemID.Raw.SMS, firmware: "Japan"),
"MS_BIOS_US" => new(system: VSystemID.Raw.SMS, firmware: "Export"),
@ -265,7 +265,12 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
if (firmwareID != null)
{
// this path will be the most common PEBKAC error, so be a bit more vocal about the problem
srcdata = CoreComm.CoreFileProvider.GetFirmwareOrThrow(firmwareID.Value, "GPGX firmwares are required.");
srcdata = CoreComm.CoreFileProvider.GetFirmware(firmwareID.Value, "GPGX firmwares are required.");
if (srcdata == null)
{
Console.WriteLine($"Frontend couldn't satisfy firmware request {firmwareID}");
return 0;
}
}
else
{