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

fix some things related to sgb movies

This commit is contained in:
zeromus 2012-10-05 18:20:27 +00:00
parent e3e15d2136
commit a00081386d
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.MultiClient/MainForm.cs
View File

@ -1488,7 +1488,7 @@ namespace BizHawk.MultiClient
}
else
{
MessageBox.Show("Couldn't open sgb.smc from the configured SNES firmwares path, which is:\n\n" + PathManager.MakeAbsolutePath(Global.Config.PathSNESFirmwares, "SNES") + "\n\nPlease make sure it is available and try again.\n\nWe're going to disable SGB for now; please re-enable it when you've set up the file.");
MessageBox.Show("Couldn't open sgb.sfc from the configured SNES firmwares path, which is:\n\n" + PathManager.MakeAbsolutePath(Global.Config.PathSNESFirmwares, "SNES") + "\n\nPlease make sure it is available and try again.\n\nWe're going to disable SGB for now; please re-enable it when you've set up the file.");
Global.Config.GB_AsSGB = false;
game.System = "GB";
goto RETRY;
@ -1502,6 +1502,7 @@ namespace BizHawk.MultiClient
}
if (sgbrom != null)
{
game.System = "SNES";
game.AddOption("SGB");
var snes = new LibsnesCore();
nextEmulator = snes;

6
BizHawk.MultiClient/RecordMovie.cs
View File

@ -9,6 +9,7 @@ using System.Windows.Forms;
using System.IO;
using BizHawk.Emulation.Consoles.GB;
using BizHawk.Emulation.Consoles.Nintendo.SNES;
namespace BizHawk.MultiClient
{
@ -83,6 +84,11 @@ namespace BizHawk.MultiClient
MovieToRecord.Header.SetHeaderLine(MovieHeader.GB_GBA_IN_CGB, Global.Config.GB_GBACGB.ToString());
}
if (Global.Emulator is LibsnesCore)
{
MovieToRecord.Header.SetHeaderLine(MovieHeader.SGB, Global.Config.GB_ForceDMG.ToString());
}
if (StartFromCombo.SelectedItem.ToString() == "Now")
{
MovieToRecord.StartsFromSavestate = true;

1
BizHawk.MultiClient/movie/MovieHeader.cs
View File

@ -32,6 +32,7 @@ namespace BizHawk.MultiClient
//Gameboy Settings that affect sync
public const string GB_FORCEDMG = "Force_DMG_Mode";
public const string GB_GBA_IN_CGB = "GBA_In_CGB";
public const string SGB = "SGB"; //a snes movie will set this to indicate that it's actually SGB
public static string MovieVersion = "BizHawk v0.0.1";

3
BizHawk.MultiClient/movie/MovieImport.cs
View File

@ -1010,7 +1010,8 @@ namespace BizHawk.MultiClient
break;
case "sgb_ntsc":
case "sgb_pal":
platform = "SGB";
platform = "SNES";
m.Header.SetHeaderLine(MovieHeader.SGB, true.ToString());
break;
}
bool pal = (gametype == "snes_pal" || gametype == "sgb_pal");