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

SubGBHawk: misc. movie stuff

This commit is contained in:
alyosha-tas 2020-02-23 19:20:49 -05:00
parent f73c65d704
commit 961f682cdc
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
View File

@ -176,6 +176,11 @@ namespace BizHawk.Client.Common
var _gameboy = (Emulation.Cores.Nintendo.Gameboy.Gameboy)Global.Emulator; var _gameboy = (Emulation.Cores.Nintendo.Gameboy.Gameboy)Global.Emulator;
Header[HeaderKeys.CYCLECOUNT] = _gameboy.CycleCount.ToString(); 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); var file = new FileInfo(fn);
if (!file.Directory.Exists) if (!file.Directory.Exists)

3
BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
View File

@ -6,6 +6,7 @@ using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Nintendo.Gameboy; using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Nintendo.GBHawk; using BizHawk.Emulation.Cores.Nintendo.GBHawk;
using BizHawk.Emulation.Cores.Nintendo.SubNESHawk; using BizHawk.Emulation.Cores.Nintendo.SubNESHawk;
using BizHawk.Emulation.Cores.Nintendo.SubGBHawk;
using BizHawk.Emulation.Cores.Sega.MasterSystem; using BizHawk.Emulation.Cores.Sega.MasterSystem;
using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; using BizHawk.Emulation.Cores.Consoles.Sega.gpgx;
using BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive; using BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive;
@ -365,7 +366,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
movie.HeaderEntries.Add("Is32X", "1"); 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"); movie.HeaderEntries.Add(HeaderKeys.VBLANKCOUNT, "0");
} }

3
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
View File

@ -254,7 +254,8 @@ namespace BizHawk.Client.EmuHawk
if (Emulator.Frame != CurrentTasMovie.InputLogLength - 1) if (Emulator.Frame != CurrentTasMovie.InputLogLength - 1)
{ {
if (Emulator is Emulation.Cores.Nintendo.SubNESHawk.SubNESHawk 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); 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) if (result == DialogResult.OK)