From ab6caa70d26c4d7cd9a8845ab846227fa4a26124 Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Mon, 16 Mar 2020 16:16:32 -0400 Subject: [PATCH] VBM import: import gambatte movie if gambatte is the loaded core --- BizHawk.Client.Common/movie/import/VbmImport.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/BizHawk.Client.Common/movie/import/VbmImport.cs b/BizHawk.Client.Common/movie/import/VbmImport.cs index 24944017df..c34fdca34c 100644 --- a/BizHawk.Client.Common/movie/import/VbmImport.cs +++ b/BizHawk.Client.Common/movie/import/VbmImport.cs @@ -3,6 +3,7 @@ using System.IO; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Nintendo.GBA; using BizHawk.Emulation.Cores.Nintendo.GBHawk; +using BizHawk.Emulation.Cores.Nintendo.Gameboy; namespace BizHawk.Client.Common.movie.import { @@ -276,10 +277,15 @@ namespace BizHawk.Client.Common.movie.import } else { - Global.Config.GbUseGbHawk = true; - Result.Movie.SyncSettingsJson = ConfigService.SaveWithType(new GBHawk.GBSyncSettings()); - } - + if (Global.Config.GbUseGbHawk || Global.Config.UseSubGBHawk) + { + Result.Movie.SyncSettingsJson = ConfigService.SaveWithType(new GBHawk.GBSyncSettings()); + } + else + { + Result.Movie.SyncSettingsJson = ConfigService.SaveWithType(new Gameboy.GambatteSyncSettings()); + } + } } private static SimpleController GbController()