diff --git a/BizHawk.Client.Common/config/Config.cs b/BizHawk.Client.Common/config/Config.cs index 4a40de741c..1cc616a7d3 100644 --- a/BizHawk.Client.Common/config/Config.cs +++ b/BizHawk.Client.Common/config/Config.cs @@ -451,10 +451,6 @@ namespace BizHawk.Client.Common public int PCEBGViewerWndy = -1; public int PCEBGViewerRefreshRate = 16; - // SMS Graphics settings - public bool SMSDispBG = true; - public bool SMSDispOBJ = true; - // Coleco Settings public bool ColecoSkipBiosIntro = false; @@ -640,6 +636,9 @@ namespace BizHawk.Client.Common public bool SmsSpriteLimit = false; public bool GGShowClippedRegions = false; public bool GGHighlightActiveDisplayRegion = false; + // SMS Graphics settings + public bool SMSDispBG = true; + public bool SMSDispOBJ = true; // PCEngine Settings //public bool PceSpriteLimit = false; diff --git a/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.Designer.cs b/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.Designer.cs index 3b35ff5e4d..d197ef581f 100644 --- a/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.Designer.cs +++ b/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.Designer.cs @@ -40,8 +40,10 @@ | System.Windows.Forms.AnchorStyles.Right))); this.propertyGrid1.Location = new System.Drawing.Point(3, 3); this.propertyGrid1.Name = "propertyGrid1"; + this.propertyGrid1.PropertySort = System.Windows.Forms.PropertySort.Alphabetical; this.propertyGrid1.Size = new System.Drawing.Size(318, 276); this.propertyGrid1.TabIndex = 0; + this.propertyGrid1.ToolbarVisible = false; // // buttonDefaults // diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs index 02ace73a60..061a6c2f15 100644 --- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs +++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs @@ -196,7 +196,8 @@ namespace BizHawk.Emulation.Cores.PCEngine Cpu.WriteMemory21 = WriteMemoryPopulous; } - if (Settings.SpriteLimit || game.NotInDatabase) + // the gamedb can force sprite limit on, ignoring settings + if (Settings.SpriteLimit || game["ForceSpriteLimit"] || game.NotInDatabase) { VDC1.PerformSpriteLimit = true; if (VDC2 != null) @@ -209,7 +210,8 @@ namespace BizHawk.Emulation.Cores.PCEngine PSG.MaxVolume = int.Parse(game.OptionValue("PsgVol")); if (game["AdpcmVol"]) ADPCM.MaxVolume = int.Parse(game.OptionValue("AdpcmVol")); - if (Settings.EqualizeVolume || (game.NotInDatabase && TurboCD)) + // the gamedb can also force equalizevolumes on + if (Settings.EqualizeVolume || game["EqualizeVolumes"] || (game.NotInDatabase && TurboCD)) SoundMixer.EqualizeVolumes(); // Ok, yes, HBlankPeriod's only purpose is game-specific hax. @@ -628,7 +630,7 @@ namespace BizHawk.Emulation.Cores.PCEngine public PCESettings Settings = new PCESettings(); - public object GetSettings() { return Settings.Clone(); } + public object GetSettings() { return Settings.Clone(); } public object GetSyncSettings() { return null; } public bool PutSettings(object o) {