diff --git a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs index 3de704ae99..99c3d3963f 100644 --- a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs +++ b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs @@ -331,11 +331,6 @@ namespace BizHawk.Client.Common.MovieConversionExtensions movie.HeaderEntries.Add("IsSegaCDMode", "1"); } - if (Global.Emulator is PicoDrive && (Global.Emulator as PicoDrive).Is32X) - { - movie.HeaderEntries.Add("Is32X", "1"); - } - movie.Core = ((CoreAttributes)Attribute .GetCustomAttribute(Global.Emulator.GetType(), typeof(CoreAttributes))) .CoreName; diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/LibPicoDrive.cs b/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/LibPicoDrive.cs index 1de83d1360..820ce63e14 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/LibPicoDrive.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/LibPicoDrive.cs @@ -35,5 +35,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive [BizImport(CC)] public abstract bool IsPal(); + + [BizImport(CC)] + public abstract bool Is32xActive(); } } diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/PicoDrive.cs b/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/PicoDrive.cs index 7aeee775e4..729cb8e993 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/PicoDrive.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/PicoDrive.cs @@ -110,13 +110,12 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive DeterministicEmulation = deterministic; _core.SetCDReadCallback(_cdcallback); - Is32X = game["32X"]; _isPal = _core.IsPal(); VsyncNumerator = _isPal ? 53203424 : 53693175; VsyncDenominator = _isPal ? 3420 * 313 : 3420 * 262; } - public bool Is32X { get; } + public bool Is32xActive => _core.Is32xActive(); public static readonly ControllerDefinition PicoDriveController = new ControllerDefinition { diff --git a/output/dll/picodrive.wbx.gz b/output/dll/picodrive.wbx.gz index 9467ea2c3d..223c8d42e9 100644 Binary files a/output/dll/picodrive.wbx.gz and b/output/dll/picodrive.wbx.gz differ diff --git a/waterbox/picodrive/bizhawk.c b/waterbox/picodrive/bizhawk.c index ade18e5147..3c74e29978 100644 --- a/waterbox/picodrive/bizhawk.c +++ b/waterbox/picodrive/bizhawk.c @@ -284,6 +284,10 @@ ECL_EXPORT int IsPal(void) { return Pico.m.pal; } +ECL_EXPORT int Is32xActive(void) +{ + return !!(PicoAHW & PAHW_32X); +} int main(void) {