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

Fix SKROM char size, and checking in some movie playback stuff

This commit is contained in:
andres.delikat 2011-03-03 20:01:36 +00:00
parent f4ca525343
commit 9dc75a17e5
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs
View File

@ -218,7 +218,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.Boards
RomInfo.PRAM_Size = 0; RomInfo.PRAM_Size = 0;
break; break;
case "SKROM": case "SKROM":
romInfo.CHR_Size = 128; romInfo.CHR_Size = 16;
RomInfo.PRAM_Size = 8; RomInfo.PRAM_Size = 8;
RomInfo.CRAM_Size = 0; RomInfo.CRAM_Size = 0;
break; break;

2
BizHawk.MultiClient/MainForm.cs
View File

@ -655,7 +655,7 @@ namespace BizHawk.MultiClient
else if (!Global.Config.MuteFrameAdvance) else if (!Global.Config.MuteFrameAdvance)
genSound = true; genSound = true;
if (InputLog.GetMovieMode() == MOVIEMODE.PLAY) 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); Global.Emulator.FrameAdvance(!throttle.skipnextframe);
RamWatch1.UpdateValues(); RamWatch1.UpdateValues();
RamSearch1.UpdateValues(); RamSearch1.UpdateValues();

2
BizHawk.MultiClient/RenderPanel.cs
View File

@ -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) 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 else
{ {

4
BizHawk.MultiClient/movie/Movie.cs
View File

@ -17,10 +17,13 @@ namespace BizHawk.MultiClient
private MOVIEMODE MovieMode = new MOVIEMODE(); private MOVIEMODE MovieMode = new MOVIEMODE();
public int lastLog;
public Movie(string filename, MOVIEMODE m) public Movie(string filename, MOVIEMODE m)
{ {
Filename = filename; //TODO: Validate that file is writable Filename = filename; //TODO: Validate that file is writable
MovieMode = m; MovieMode = m;
lastLog = 0;
} }
public void StopMovie() public void StopMovie()
@ -54,6 +57,7 @@ namespace BizHawk.MultiClient
public string GetInputFrame(int frame) public string GetInputFrame(int frame)
{ {
lastLog = frame;
if (frame < Log.GetMovieLength()) if (frame < Log.GetMovieLength())
return Log.GetFrame(frame); return Log.GetFrame(frame);
else else

2
BizHawk.MultiClient/output/gamedb.txt
View File

@ -2338,7 +2338,7 @@ D9A1631D5C32D35594B9484862A26CBA Legend of Zelda, The (Rev 0) (U) NES board=SN
B2D2D9ED68B3E5E0D29053EA525BD37C Metroid (U) NES board=SNROM;PRG=8 B2D2D9ED68B3E5E0D29053EA525BD37C Metroid (U) NES board=SNROM;PRG=8
E12F3FD85F96F9A61FE38626A1B5CEFA Spot (J) NES board=SNROM;PRG=8 E12F3FD85F96F9A61FE38626A1B5CEFA Spot (J) NES board=SNROM;PRG=8
44F5B716CF5EE0164C151106D0E68DCE Spot (U) 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 ;UNROM
29E5E1A5F8B400773EF9D959044456B2 3-D Battles of World Running (U) NES board=UNROM;mirror=V;PRG=8 29E5E1A5F8B400773EF9D959044456B2 3-D Battles of World Running (U) NES board=UNROM;mirror=V;PRG=8