diff --git a/BizHawk.Emulation.Common/Database/Database.cs b/BizHawk.Emulation.Common/Database/Database.cs index 65de2f94a1..b181d62a0a 100644 --- a/BizHawk.Emulation.Common/Database/Database.cs +++ b/BizHawk.Emulation.Common/Database/Database.cs @@ -81,7 +81,7 @@ namespace BizHawk.Emulation.Common case RomStatus.Overdump: sb.Append("O"); break; - case RomStatus.BIOS: + case RomStatus.Bios: sb.Append("I"); break; case RomStatus.Homebrew: @@ -155,7 +155,7 @@ namespace BizHawk.Emulation.Common game.Status = RomStatus.Overdump; break; case "I": - game.Status = RomStatus.BIOS; + game.Status = RomStatus.Bios; break; case "D": game.Status = RomStatus.Homebrew; diff --git a/BizHawk.Emulation.Common/Enums.cs b/BizHawk.Emulation.Common/Enums.cs index 0fce749fd6..6a119f8609 100644 --- a/BizHawk.Emulation.Common/Enums.cs +++ b/BizHawk.Emulation.Common/Enums.cs @@ -3,12 +3,22 @@ /// /// DisplayType, used in IEmulator /// - public enum DisplayType { NTSC, PAL, DENDY } + public enum DisplayType + { + NTSC, + PAL, + Dendy + } /// - /// The type/increment of stepping in the Step method of IDebuggable + /// The type/increment of stepping in the Step method of /// - public enum StepType { Into, Out, Over } + public enum StepType + { + Into, + Out, + Over + } /// /// In the game database, the status of the rom found in the database @@ -21,7 +31,7 @@ TranslatedRom, Hack, Unknown, - BIOS, + Bios, Overdump, NotInDatabase } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs index 5052193482..651db7e1c7 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs @@ -226,14 +226,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES cpu_sequence = cpu_sequence_NTSC; break; // this is in bootgod, but not used at all - case Common.DisplayType.DENDY: + case Common.DisplayType.Dendy: apu = new APU(this, apu, false); ppu.region = PPU.Region.Dendy; CoreComm.VsyncNum = 50; CoreComm.VsyncDen = 1; cpuclockrate = 1773448; cpu_sequence = cpu_sequence_NTSC; - _display_type = DisplayType.DENDY; + _display_type = DisplayType.Dendy; break; default: throw new Exception("Unknown displaytype!"); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs index 12283d547c..4584035153 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs @@ -764,7 +764,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES switch (fromrom) { case NESSyncSettings.Region.Dendy: - _display_type = Common.DisplayType.DENDY; + _display_type = Common.DisplayType.Dendy; break; case NESSyncSettings.Region.NTSC: _display_type = Common.DisplayType.NTSC; diff --git a/BizHawk.sln.DotSettings b/BizHawk.sln.DotSettings index b1adb191be..853c6b4c68 100644 --- a/BizHawk.sln.DotSettings +++ b/BizHawk.sln.DotSettings @@ -42,8 +42,10 @@ MGBA NES NMI + NTSC OBJ OR + PAL PC PCECD PSP