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

add some GBA related path config stuff. gbabios.rom will now attempt to load from GBA firmwares directory.

This commit is contained in:
goyuken 2012-11-20 03:17:53 +00:00
parent 28b1766ac8
commit db8590e55b
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs
View File

@ -21,11 +21,13 @@ namespace BizHawk.Emulation.Consoles.Nintendo.GBA
public ControllerDefinition ControllerDefinition { get { return GBAController; } }
public IController Controller { get; set; }
public void Load(byte[] rom)
public void Load(byte[] rom, byte[] bios)
{
if (bios.Length != 16384)
throw new Exception("GBA bios must be exactly 16384 bytes!");
Init();
LibMeteor.libmeteor_reset();
LibMeteor.libmeteor_loadbios(File.ReadAllBytes("gbabios.rom"), 16384);
LibMeteor.libmeteor_loadbios(bios, (uint)bios.Length);
LibMeteor.libmeteor_loadrom(rom, (uint)rom.Length);
}

8
BizHawk.MultiClient/Config.cs
View File

@ -99,6 +99,14 @@ namespace BizHawk.MultiClient
public string PathSNESCheats = Path.Combine(".", "Cheats");
public string PathSNESFirmwares = Path.Combine(".", "Firmwares");
public string BaseGBA = Path.Combine(".", "GBA");
public string PathGBAROMs = ".";
public string PathGBASavestates = Path.Combine(".", "State");
public string PathGBASaveRAM = Path.Combine(".", "SaveRAM");
public string PathGBAScreenshots = Path.Combine(".", "Screenshots");
public string PathGBACheats = Path.Combine(".", "Cheats");
public string PathGBAFirmwares = Path.Combine(".", "Firmwares");
public string BaseSMS = Path.Combine(".", "SMS");
public string PathSMSROMs = ".";
public string PathSMSSavestates = Path.Combine(".", "State");

18
BizHawk.MultiClient/MainForm.cs
View File

@ -1809,12 +1809,12 @@ namespace BizHawk.MultiClient
break;
case "A78":
string ntsc_biospath = PathManager.MakeAbsolutePath(Global.Config.PathAtari7800NTSCBIOS, "A78");
string pal_biospath = PathManager.MakeAbsolutePath(Global.Config.PathAtari7800PALBIOS, "A78");
string pal_biospath = PathManager.MakeAbsolutePath(Global.Config.PathAtari7800PALBIOS, "A78");
string hsbiospath = PathManager.MakeAbsolutePath(Global.Config.PathAtari7800HighScoreBIOS, "A78");
byte[] NTSC_BIOS7800 = File.ReadAllBytes(ntsc_biospath);
byte[] PAL_BIOS7800 = File.ReadAllBytes(pal_biospath);
byte[] HighScoreBIOS = File.ReadAllBytes(hsbiospath);
Atari7800 a78 = new Atari7800(game, rom.RomData, NTSC_BIOS7800, PAL_BIOS7800, HighScoreBIOS);
nextEmulator = a78;
break;
@ -1825,8 +1825,20 @@ namespace BizHawk.MultiClient
nextEmulator = c64;
break;
case "GBA":
string gbabiospath = Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathGBAFirmwares, "GBA"), "gbabios.rom");
byte[] gbabios = null;
if (File.Exists(gbabiospath))
{
gbabios = File.ReadAllBytes(gbabiospath);
}
else
{
MessageBox.Show(string.Format("Couldn't open GBA BIOS: {0}\nCheck your firmware config", gbabiospath));
throw new Exception();
}
GBA gba = new GBA();
gba.Load(rom.RomData);
gba.Load(rom.RomData, gbabios);
nextEmulator = gba;
break;
}

2
BizHawk.MultiClient/config/PathManager.cs
View File

@ -99,6 +99,8 @@ namespace BizHawk.MultiClient
return Global.Config.BaseSNES;
case "Coleco":
return Global.Config.BaseCOL;
case "GBA":
return Global.Config.BaseGBA;
case "NULL":
default:
return "";