diff options
| -rw-r--r-- | FamicomDumper/Program.cs | 14 | ||||
| -rw-r--r-- | FamicomDumper/Scripting.cs | 18 |
2 files changed, 16 insertions, 16 deletions
diff --git a/FamicomDumper/Program.cs b/FamicomDumper/Program.cs index 24877ae..d9ab320 100644 --- a/FamicomDumper/Program.cs +++ b/FamicomDumper/Program.cs @@ -308,34 +308,34 @@ namespace com.clusterrr.Famicom.Dumper break;
case "write-fds":
if (string.IsNullOrEmpty(filename))
- throw new ArgumentNullException("Please specify ROM filename using --file argument");
+ throw new ArgumentException("Please specify ROM filename using --file argument");
FDS.WriteFDS(dumper, filename, needCheck);
break;
case "write-prg-ram":
case "write-sram":
if (string.IsNullOrEmpty(filename))
- throw new ArgumentNullException("Please specify ROM filename using --file argument");
+ throw new ArgumentException("Please specify ROM filename using --file argument");
WritePrgRam(dumper, filename, mapperName);
break;
case "write-coolboy":
case "write-coolboy-direct":
if (string.IsNullOrEmpty(filename))
- throw new ArgumentNullException("Please specify ROM filename using --file argument");
+ throw new ArgumentException("Please specify ROM filename using --file argument");
new CoolboyWriter(dumper, coolboyGpioMode: false).Write(filename, badSectors, silent, needCheck, writePBBs, ignoreBadSectors);
break;
case "write-coolboy-gpio":
if (string.IsNullOrEmpty(filename))
- throw new ArgumentNullException("Please specify ROM filename using --file argument");
+ throw new ArgumentException("Please specify ROM filename using --file argument");
new CoolboyWriter(dumper, coolboyGpioMode: true).Write(filename, badSectors, silent, needCheck, writePBBs, ignoreBadSectors);
break;
case "write-coolgirl":
if (string.IsNullOrEmpty(filename))
- throw new ArgumentNullException("Please specify ROM filename using --file argument");
+ throw new ArgumentException("Please specify ROM filename using --file argument");
new CoolgirlWriter(dumper).Write(filename, badSectors, silent, needCheck, writePBBs, ignoreBadSectors);
break;
case "write-unrom512":
if (string.IsNullOrEmpty(filename))
- throw new ArgumentNullException("Please specify ROM filename using --file argument");
+ throw new ArgumentException("Please specify ROM filename using --file argument");
new Unrom512Writer(dumper).Write(filename, badSectors, silent, needCheck, writePBBs, ignoreBadSectors);
break;
case "info-coolboy":
@@ -352,7 +352,7 @@ namespace com.clusterrr.Famicom.Dumper break;
case "script":
if (string.IsNullOrEmpty(csFile))
- throw new ArgumentNullException("Please specify C# script using --cs-file argument");
+ throw new ArgumentException("Please specify C# script using --cs-file argument");
break;
case "server":
if (dumper is FamicomDumperLocal d)
diff --git a/FamicomDumper/Scripting.cs b/FamicomDumper/Scripting.cs index dfc7c3a..f0bbb6f 100644 --- a/FamicomDumper/Scripting.cs +++ b/FamicomDumper/Scripting.cs @@ -311,7 +311,7 @@ namespace com.clusterrr.Famicom.Dumper case "filename": filenameParamExists = true; if (string.IsNullOrEmpty(filename) && !parameterInfo.HasDefaultValue) - throw new ArgumentNullException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --file is not specified"); + throw new ArgumentException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --file is not specified"); if (string.IsNullOrEmpty(filename) && parameterInfo.HasDefaultValue) parameters.Add(parameterInfo.DefaultValue!); else @@ -324,7 +324,7 @@ namespace com.clusterrr.Famicom.Dumper case "prgsize": prgSizeParamExists = true; if ((prgSize < 0) && !parameterInfo.HasDefaultValue) - throw new ArgumentNullException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --prg-size is not specified"); + throw new ArgumentException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --prg-size is not specified"); if ((prgSize < 0) && parameterInfo.HasDefaultValue) parameters.Add(parameterInfo.DefaultValue!); else @@ -333,7 +333,7 @@ namespace com.clusterrr.Famicom.Dumper case "chrsize": chrSizeParamExists = true; if ((chrSize < 0) && !parameterInfo.HasDefaultValue) - throw new ArgumentNullException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --chr-size is not specified"); + throw new ArgumentException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --chr-size is not specified"); if ((chrSize < 0) && parameterInfo.HasDefaultValue) parameters.Add(parameterInfo.DefaultValue!); else @@ -342,7 +342,7 @@ namespace com.clusterrr.Famicom.Dumper case "prgramsize": prgRamSizeParamExists = true; if ((prgRamSize < 0) && !parameterInfo.HasDefaultValue) - throw new ArgumentNullException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --prg-ram-size is not specified"); + throw new ArgumentException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --prg-ram-size is not specified"); if ((prgRamSize < 0) && parameterInfo.HasDefaultValue) parameters.Add(parameterInfo.DefaultValue!); else @@ -351,7 +351,7 @@ namespace com.clusterrr.Famicom.Dumper case "chrramsize": chrRamSizeParamExists = true; if ((chrRamSize < 0) && !parameterInfo.HasDefaultValue) - throw new ArgumentNullException(parameterInfo.Name, $"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --chr-ram-size is not specified"); + throw new ArgumentException(parameterInfo.Name, $"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --chr-ram-size is not specified"); if ((chrRamSize < 0) && parameterInfo.HasDefaultValue) parameters.Add(parameterInfo.DefaultValue!); else @@ -360,7 +360,7 @@ namespace com.clusterrr.Famicom.Dumper case "prgnvramsize": prgNvRamSizeParamExists = true; if ((prgNvRamSize < 0) && !parameterInfo.HasDefaultValue) - throw new ArgumentNullException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --prg-nvram-size is not specified"); + throw new ArgumentException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --prg-nvram-size is not specified"); if ((prgNvRamSize < 0) && parameterInfo.HasDefaultValue) parameters.Add(parameterInfo.DefaultValue!); else @@ -369,7 +369,7 @@ namespace com.clusterrr.Famicom.Dumper case "chrnvramsize": chrNvRamSizeParamExists = true; if ((chrNvRamSize < 0) && !parameterInfo.HasDefaultValue) - throw new ArgumentNullException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --chr-nvram-size is not specified"); + throw new ArgumentException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --chr-nvram-size is not specified"); if ((chrNvRamSize < 0) && parameterInfo.HasDefaultValue) parameters.Add(parameterInfo.DefaultValue!); else @@ -378,7 +378,7 @@ namespace com.clusterrr.Famicom.Dumper case "unifname": unifNameParamExists = true; if (string.IsNullOrEmpty(unifName) && !parameterInfo.HasDefaultValue) - throw new ArgumentNullException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --unif-name is not specified"); + throw new ArgumentException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --unif-name is not specified"); if (string.IsNullOrEmpty(unifName) && parameterInfo.HasDefaultValue) parameters.Add(parameterInfo.DefaultValue!); else @@ -387,7 +387,7 @@ namespace com.clusterrr.Famicom.Dumper case "unifauthor": unifAuthorParamExists = true; if (string.IsNullOrEmpty(unifAuthor) && !parameterInfo.HasDefaultValue) - throw new ArgumentNullException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --unif-author is not specified"); + throw new ArgumentException($"{program.Name}.{SCRIPT_START_METHOD} declared with \"{signature}\" parameter but --unif-author is not specified"); if (string.IsNullOrEmpty(unifAuthor) && parameterInfo.HasDefaultValue) parameters.Add(parameterInfo.DefaultValue!); else |