diff --git a/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs b/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs index 2815d3240c..5ea3ac732c 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs @@ -176,6 +176,11 @@ namespace BizHawk.Client.Common var _gameboy = (Emulation.Cores.Nintendo.Gameboy.Gameboy)Global.Emulator; Header[HeaderKeys.CYCLECOUNT] = _gameboy.CycleCount.ToString(); } + else if (Global.Emulator is Emulation.Cores.Nintendo.SubGBHawk.SubGBHawk) + { + var _subgb = (Emulation.Cores.Nintendo.SubGBHawk.SubGBHawk)Global.Emulator; + Header[HeaderKeys.VBLANKCOUNT] = _subgb.VBL_CNT.ToString(); + } var file = new FileInfo(fn); if (!file.Directory.Exists) diff --git a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs index 75eff16637..1454004384 100644 --- a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs +++ b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs @@ -6,6 +6,7 @@ using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Nintendo.Gameboy; using BizHawk.Emulation.Cores.Nintendo.GBHawk; using BizHawk.Emulation.Cores.Nintendo.SubNESHawk; +using BizHawk.Emulation.Cores.Nintendo.SubGBHawk; using BizHawk.Emulation.Cores.Sega.MasterSystem; using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; using BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive; @@ -365,7 +366,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions movie.HeaderEntries.Add("Is32X", "1"); } - if (Global.Emulator is SubNESHawk) + if ((Global.Emulator is SubNESHawk) || (Global.Emulator is SubGBHawk)) { movie.HeaderEntries.Add(HeaderKeys.VBLANKCOUNT, "0"); } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index f7da21a81d..7561afc487 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -254,7 +254,8 @@ namespace BizHawk.Client.EmuHawk if (Emulator.Frame != CurrentTasMovie.InputLogLength - 1) { if (Emulator is Emulation.Cores.Nintendo.SubNESHawk.SubNESHawk - || Emulator is Emulation.Cores.Nintendo.Gameboy.Gameboy) + || Emulator is Emulation.Cores.Nintendo.Gameboy.Gameboy + || Emulator is Emulation.Cores.Nintendo.SubGBHawk.SubGBHawk) { var result = MessageBox.Show("This core requires emulation to be on the last frame when writing the movie, otherwise movie length may appear incorrect.\nSeek there?", "Export movie", MessageBoxButtons.OKCancel, MessageBoxIcon.Question); if (result == DialogResult.OK)