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

GBA - do bio file path, not firmwares folder path

This commit is contained in:
adelikat 2012-11-25 03:47:58 +00:00
parent b1ab7bd9f1
commit 9de7ee3336
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/Config.cs
View File

@ -108,7 +108,6 @@ namespace BizHawk.MultiClient
public string PathGBASaveRAM = Path.Combine(".", "SaveRAM"); public string PathGBASaveRAM = Path.Combine(".", "SaveRAM");
public string PathGBAScreenshots = Path.Combine(".", "Screenshots"); public string PathGBAScreenshots = Path.Combine(".", "Screenshots");
public string PathGBACheats = Path.Combine(".", "Cheats"); public string PathGBACheats = Path.Combine(".", "Cheats");
public string PathGBAFirmwares = Path.Combine(".", "Firmwares");
public string BaseSMS = Path.Combine(".", "SMS"); public string BaseSMS = Path.Combine(".", "SMS");
public string PathSMSROMs = "."; public string PathSMSROMs = ".";
@ -196,6 +195,7 @@ namespace BizHawk.MultiClient
public string LogPath = "."; public string LogPath = ".";
//BIOS Paths //BIOS Paths
public string PathGBABIOS = Path.Combine(".", "gbabios.rom");
public string PathPCEBios = Path.Combine(".", "PCECDBios.pce"); public string PathPCEBios = Path.Combine(".", "PCECDBios.pce");
public string PathCOLBios = Path.Combine(".", "ColecoBios.bin"); public string PathCOLBios = Path.Combine(".", "ColecoBios.bin");
public string PathINTVGROM = Path.Combine(".", "grom.bin"); public string PathINTVGROM = Path.Combine(".", "grom.bin");

5
BizHawk.MultiClient/MainForm.cs
View File

@ -1831,6 +1831,7 @@ namespace BizHawk.MultiClient
if (!colfile.Exists) if (!colfile.Exists)
{ {
MessageBox.Show("Unable to find the required ColecoVision BIOS file - \n" + colbiosPath, "Unable to load BIOS", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("Unable to find the required ColecoVision BIOS file - \n" + colbiosPath, "Unable to load BIOS", MessageBoxButtons.OK, MessageBoxIcon.Error);
throw new Exception();
} }
else else
{ {
@ -1870,7 +1871,7 @@ namespace BizHawk.MultiClient
nextEmulator = c64; nextEmulator = c64;
break; break;
case "GBA": case "GBA":
string gbabiospath = Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathGBAFirmwares, "GBA"), "gbabios.rom"); string gbabiospath = PathManager.MakeAbsolutePath(Global.Config.PathGBABIOS, "GBA");
byte[] gbabios = null; byte[] gbabios = null;
if (File.Exists(gbabiospath)) if (File.Exists(gbabiospath))
@ -1879,7 +1880,7 @@ namespace BizHawk.MultiClient
} }
else else
{ {
MessageBox.Show(string.Format("Couldn't open GBA BIOS: {0}\nCheck your firmware config", gbabiospath)); MessageBox.Show("Unable to find the required GBA BIOS file - \n" + gbabios, "Unable to load BIOS", MessageBoxButtons.OK, MessageBoxIcon.Error);
throw new Exception(); throw new Exception();
} }
GBA gba = new GBA(); GBA gba = new GBA();

9
BizHawk.MultiClient/config/PathConfig.cs
View File

@ -126,7 +126,7 @@ namespace BizHawk.MultiClient
GBASaveRAMBox.Text = Global.Config.PathGBASaveRAM; GBASaveRAMBox.Text = Global.Config.PathGBASaveRAM;
GBAScreenshotsBox.Text = Global.Config.PathGBAScreenshots; GBAScreenshotsBox.Text = Global.Config.PathGBAScreenshots;
GBACheatsBox.Text = Global.Config.PathGBACheats; GBACheatsBox.Text = Global.Config.PathGBACheats;
GBAFirmwaresBox.Text = Global.Config.PathGBAFirmwares; GBAFirmwaresBox.Text = Global.Config.PathGBABIOS;
TI83BaseBox.Text = Global.Config.BaseTI83; TI83BaseBox.Text = Global.Config.BaseTI83;
TI83ROMsBox.Text = Global.Config.PathTI83ROMs; TI83ROMsBox.Text = Global.Config.PathTI83ROMs;
@ -307,7 +307,7 @@ namespace BizHawk.MultiClient
Global.Config.PathGBASaveRAM = GBASaveRAMBox.Text; Global.Config.PathGBASaveRAM = GBASaveRAMBox.Text;
Global.Config.PathGBAScreenshots = GBAScreenshotsBox.Text; Global.Config.PathGBAScreenshots = GBAScreenshotsBox.Text;
Global.Config.PathGBACheats = GBACheatsBox.Text; Global.Config.PathGBACheats = GBACheatsBox.Text;
Global.Config.PathGBAFirmwares = GBAFirmwaresBox.Text; Global.Config.PathGBABIOS = GBAFirmwaresBox.Text;
Global.Config.BaseTI83 = TI83BaseBox.Text; Global.Config.BaseTI83 = TI83BaseBox.Text;
Global.Config.PathTI83ROMs = TI83ROMsBox.Text; Global.Config.PathTI83ROMs = TI83ROMsBox.Text;
@ -1038,7 +1038,10 @@ namespace BizHawk.MultiClient
private void GBABrowseFirmwares_Click(object sender, EventArgs e) private void GBABrowseFirmwares_Click(object sender, EventArgs e)
{ {
BrowseFolder(GBAFirmwaresBox, GBAFirmwaresDescription.Text); BrowseForBios(
"GBA BIOS (*.rom)|*.rom|All Files|*.*",
Global.Config.PathGBABIOS, "GBA",
GBAFirmwaresBox);
} }
} }
} }