From 9dc75a17e5eb365104600f63efa9a37f873ef72f Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Thu, 3 Mar 2011 20:01:36 +0000 Subject: [PATCH] Fix SKROM char size, and checking in some movie playback stuff --- BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs | 2 +- BizHawk.MultiClient/MainForm.cs | 2 +- BizHawk.MultiClient/RenderPanel.cs | 2 +- BizHawk.MultiClient/movie/Movie.cs | 4 ++++ BizHawk.MultiClient/output/gamedb.txt | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs index 5e6c45bcd1..b2772fa791 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs @@ -218,7 +218,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.Boards RomInfo.PRAM_Size = 0; break; case "SKROM": - romInfo.CHR_Size = 128; + romInfo.CHR_Size = 16; RomInfo.PRAM_Size = 8; RomInfo.CRAM_Size = 0; break; diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 3546e4511f..7dec5490d9 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -655,7 +655,7 @@ namespace BizHawk.MultiClient else if (!Global.Config.MuteFrameAdvance) genSound = true; if (InputLog.GetMovieMode() == MOVIEMODE.PLAY) - Global.Emulator.SetControllersAsMnemonic(InputLog.GetInputFrame(Global.Emulator.Frame)); + Global.Emulator.SetControllersAsMnemonic(InputLog.GetInputFrame(Global.Emulator.Frame)+ 1); Global.Emulator.FrameAdvance(!throttle.skipnextframe); RamWatch1.UpdateValues(); RamSearch1.UpdateValues(); diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs index 946036a69c..ef5818fbb7 100644 --- a/BizHawk.MultiClient/RenderPanel.cs +++ b/BizHawk.MultiClient/RenderPanel.cs @@ -268,7 +268,7 @@ namespace BizHawk.MultiClient { if (Global.MainForm.InputLog.GetMovieMode() == MOVIEMODE.PLAY) //TODO: use user movie not input log (input log will never be allowed to be played back) { - return Global.Emulator.Frame.ToString() + "/" + Global.MainForm.InputLog.GetMovieLength().ToString(); + return Global.Emulator.Frame.ToString() + " " + Global.MainForm.InputLog.lastLog.ToString() + "/" + Global.MainForm.InputLog.GetMovieLength().ToString(); } else { diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs index 60297b31de..066356f25a 100644 --- a/BizHawk.MultiClient/movie/Movie.cs +++ b/BizHawk.MultiClient/movie/Movie.cs @@ -17,10 +17,13 @@ namespace BizHawk.MultiClient private MOVIEMODE MovieMode = new MOVIEMODE(); + public int lastLog; + public Movie(string filename, MOVIEMODE m) { Filename = filename; //TODO: Validate that file is writable MovieMode = m; + lastLog = 0; } public void StopMovie() @@ -54,6 +57,7 @@ namespace BizHawk.MultiClient public string GetInputFrame(int frame) { + lastLog = frame; if (frame < Log.GetMovieLength()) return Log.GetFrame(frame); else diff --git a/BizHawk.MultiClient/output/gamedb.txt b/BizHawk.MultiClient/output/gamedb.txt index d57eaac0e4..fed01e2bcc 100644 --- a/BizHawk.MultiClient/output/gamedb.txt +++ b/BizHawk.MultiClient/output/gamedb.txt @@ -2338,7 +2338,7 @@ D9A1631D5C32D35594B9484862A26CBA Legend of Zelda, The (Rev 0) (U) NES board=SN B2D2D9ED68B3E5E0D29053EA525BD37C Metroid (U) NES board=SNROM;PRG=8 E12F3FD85F96F9A61FE38626A1B5CEFA Spot (J) NES board=SNROM;PRG=8 44F5B716CF5EE0164C151106D0E68DCE Spot (U) NES board=SNROM;PRG=8 -88C0493FB1146834836C0FF4F3E06E45 Zelda II - The Adventure of Link (U) NES board=SKROM;PRG=8;CHR=16 +88C0493FB1146834836C0FF4F3E06E45 Zelda II - The Adventure of Link (U) NES board=SKROM;PRG=8 ;UNROM 29E5E1A5F8B400773EF9D959044456B2 3-D Battles of World Running (U) NES board=UNROM;mirror=V;PRG=8