From 5a5fd2a775fe6dad34f454a4c640a350a48b990c Mon Sep 17 00:00:00 2001 From: Alexey 'Cluster' Avdyukhin Date: Wed, 9 Nov 2022 01:27:54 +0400 Subject: Refactoring, removed unnecessary messages --- tools_sources/CoolgirlCombiner/Game.cs | 4 ---- tools_sources/CoolgirlCombiner/Program.cs | 12 +++++------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/tools_sources/CoolgirlCombiner/Game.cs b/tools_sources/CoolgirlCombiner/Game.cs index 6e97202..86318c5 100644 --- a/tools_sources/CoolgirlCombiner/Game.cs +++ b/tools_sources/CoolgirlCombiner/Game.cs @@ -168,22 +168,18 @@ namespace com.clusterrr.Famicom.CoolGirl if (fix.WillNotWorkOnPal) { Flags |= GameFlags.WillNotWorkOnPal; - Console.WriteLine($"Fix based on checksum: {Path.GetFileName(fileName)} will not work on PAL console"); } if (fix.WillNotWorkOnNtsc) { Flags |= GameFlags.WillNotWorkOnNtsc; - Console.WriteLine($"Fix based on checksum: {Path.GetFileName(fileName)} will not work on NTSC console"); } if (fix.WillNotWorkOnDendy) { Flags |= GameFlags.WillNotWorkOnDendy; - Console.WriteLine($"Fix based on checksum: {Path.GetFileName(fileName)} will not work on Dendy console"); } if (fix.WillNotWorkOnNewFamiclone) { Flags |= GameFlags.WillNotWorkOnNewFamiclone; - Console.WriteLine($"Fix based on checksum: {Path.GetFileName(fileName)} will not work on new famiclones"); } } } diff --git a/tools_sources/CoolgirlCombiner/Program.cs b/tools_sources/CoolgirlCombiner/Program.cs index cfa2146..ac07d55 100644 --- a/tools_sources/CoolgirlCombiner/Program.cs +++ b/tools_sources/CoolgirlCombiner/Program.cs @@ -583,15 +583,15 @@ namespace com.clusterrr.Famicom.CoolGirl { // CHR RAM size is unknown // if CHR RAM banking is supported by mapper - // set maximum size + // set the maximum size if (mapperInfo.ChrRamBanking) - chrBankingSize = 512 * 1024; + chrBankingSize = (int)optionMaxChrRamSize * 1024; else // else banking is disabled chrBankingSize = 0x2000; } else { - // CHR RAM size is specified by NES 2.0 or fixes.json file + // CHR RAM size is specified by NES 2.0 header or fixes.json file chrBankingSize = game.ChrRamSize.Value; } } @@ -895,12 +895,11 @@ namespace com.clusterrr.Famicom.CoolGirl if (!string.IsNullOrEmpty(optionUnifFile)) { Console.Write("Saving UNIF file... "); - var resultNotNull = result.Select(b => b ?? byte.MaxValue).ToArray(); var u = new UnifFile(); u.Version = 5; u.Mapper = "COOLGIRL"; u.Mirroring = MirroringType.MapperControlled; - u.PRG0 = resultNotNull; + u.PRG0 = result.Select(b => b ?? byte.MaxValue).ToArray(); u.Battery = true; u.Save(optionUnifFile); Console.WriteLine("OK"); @@ -922,8 +921,7 @@ namespace com.clusterrr.Famicom.CoolGirl if (!string.IsNullOrEmpty(optionBinFile)) { Console.Write("Saving BIN file... "); - var resultNotNull = result.Select(b => b ?? byte.MaxValue).ToArray(); - File.WriteAllBytes(optionBinFile, resultNotNull); + File.WriteAllBytes(optionBinFile, result.Select(b => b ?? byte.MaxValue).ToArray()); Console.WriteLine("OK"); } } -- cgit v1.2.3