From a58e7a17a6c2da35dbd18ff79c62c7a8114b455a Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 29 Mar 2020 14:37:59 -0500 Subject: [PATCH] DS - bottom screen only option (useful for games like NSMB where pipes can send you to the other screen) --- .../Consoles/Nintendo/NDS/MelonDS_Settable.cs | 3 +++ .../Consoles/Nintendo/NDS/MelonDS_VideoProvider.cs | 1 + BizHawk.sln.DotSettings | 2 ++ 3 files changed, 6 insertions(+) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_Settable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_Settable.cs index e8ba975142..55ba70bee7 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_Settable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_Settable.cs @@ -82,6 +82,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS { Default, TopOnly, + BottomOnly, SideBySideLR, SideBySideRL, Rotate90, @@ -101,6 +102,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS ScreenOptions switch { VideoScreenOptions.TopOnly => null, + VideoScreenOptions.BottomOnly => null, VideoScreenOptions.SideBySideLR => new Point(NativeWidth, 0), VideoScreenOptions.SideBySideRL => new Point(0, 0), VideoScreenOptions.Rotate90 => new Point(0, 0), @@ -125,6 +127,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS ScreenOptions switch { VideoScreenOptions.TopOnly => NativeHeight, + VideoScreenOptions.BottomOnly => NativeHeight, VideoScreenOptions.SideBySideLR => NativeHeight, VideoScreenOptions.SideBySideRL => NativeHeight, VideoScreenOptions.Rotate90 => NativeWidth, diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_VideoProvider.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_VideoProvider.cs index 833a63ca3b..4747179f26 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_VideoProvider.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_VideoProvider.cs @@ -44,6 +44,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS { VideoScreenOptions.Default => ScreenArranger.UprightStack(TopScreen, BottomScreen, _settings.ScreenGap), VideoScreenOptions.TopOnly => ScreenArranger.Copy(TopScreen), + VideoScreenOptions.BottomOnly => ScreenArranger.Copy(BottomScreen), VideoScreenOptions.SideBySideLR => ScreenArranger.UprightSideBySide(TopScreen, BottomScreen, _settings.ScreenGap), VideoScreenOptions.SideBySideRL => ScreenArranger.UprightSideBySide(BottomScreen, TopScreen, _settings.ScreenGap), VideoScreenOptions.Rotate90 => ScreenArranger.Rotate90Stack(TopScreen, BottomScreen, _settings.ScreenGap), diff --git a/BizHawk.sln.DotSettings b/BizHawk.sln.DotSettings index 27c7a28da1..06c2a5cc1b 100644 --- a/BizHawk.sln.DotSettings +++ b/BizHawk.sln.DotSettings @@ -448,6 +448,8 @@ True True True + True + True True True True