diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs index 0ab243d6c1..171cde7608 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs @@ -79,16 +79,21 @@ namespace BizHawk.Emulation.Consoles.Nintendo mirroring[3] = d; } - protected void SetMirrorType(int pad_h, int pad_v) + public static EMirrorType CalculateMirrorType(int pad_h, int pad_v) { if (pad_h == 0) if (pad_v == 0) - SetMirrorType(EMirrorType.OneScreenA); - else SetMirrorType(EMirrorType.Horizontal); + return EMirrorType.OneScreenA; + else return EMirrorType.Horizontal; else if (pad_v == 0) - SetMirrorType(EMirrorType.Vertical); - else SetMirrorType(EMirrorType.OneScreenB); + return EMirrorType.Vertical; + else return EMirrorType.OneScreenB; + } + + protected void SetMirrorType(int pad_h, int pad_v) + { + SetMirrorType(CalculateMirrorType(pad_h, pad_v)); } public void SetMirrorType(EMirrorType mirrorType) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs index 69f1bb4149..beb09dd396 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs @@ -429,7 +429,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo LoadWriteLine("Since this is iNES we can (somewhat) confidently parse PRG/CHR banks to hash."); LoadWriteLine("headerless rom hash: {0}", hash_sha1); - LoadWriteLine("headerless rom hash: {0}", hash_md5); + LoadWriteLine("headerless rom hash: {0}", hash_md5); if (iNesHeaderInfo.prg_size == 16) { @@ -444,6 +444,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo var hash = "sha1:" + Util.Hash_SHA1(bytes, 0, bytes.Length); LoadWriteLine(" PRG (8KB) + CHR hash: {0}", hash); hash_sha1_several.Add(hash); + hash = "md5:" + Util.Hash_MD5(bytes, 0, bytes.Length); + LoadWriteLine(" PRG (8KB) + CHR hash: {0}", hash); } Type boardType = null; diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs index c98b824870..f44b59bf6d 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs @@ -188,7 +188,8 @@ static string ClassifyTable = @" //let's not put a lot of hacks in here. that's what the databases are for. //for example of one not to add: videomation hack to change vram = 8 -> 16 - report.WriteLine("map={0},pr={1},ch={2},wr={3},vr={4},ba={5},mir={6}", ret.mapper, ret.prg_size, ret.chr_size, ret.wram_size, ret.vram_size, ret.wram_battery ? 1 : 0, mirroring); + string mirror_memo = mirroring == 0 ? "horz" : (mirroring == 1 ? "vert" : "4screen"); + report.WriteLine("map={0},pr={1},ch={2},wr={3},vr={4},ba={5},mir={6}({7})", ret.mapper, ret.prg_size, ret.chr_size, ret.wram_size, ret.vram_size, ret.wram_battery ? 1 : 0, mirroring, mirror_memo); return ret; } diff --git a/BizHawk.MultiClient/output/ffmpeg.exe b/BizHawk.MultiClient/output/ffmpeg.exe old mode 100644 new mode 100755 diff --git a/SubWCRev.bat b/SubWCRev.bat old mode 100644 new mode 100755 diff --git a/SubWCRev.exe b/SubWCRev.exe old mode 100644 new mode 100755 diff --git a/intl3_tsvn32.dll b/intl3_tsvn32.dll old mode 100644 new mode 100755 diff --git a/libapr_tsvn32.dll b/libapr_tsvn32.dll old mode 100644 new mode 100755 diff --git a/libaprutil_tsvn32.dll b/libaprutil_tsvn32.dll old mode 100644 new mode 100755 diff --git a/libsasl32.dll b/libsasl32.dll old mode 100644 new mode 100755 diff --git a/libsvn_tsvn32.dll b/libsvn_tsvn32.dll old mode 100644 new mode 100755