From b8655d880ca8bb3248e056cee0527fdad85741ba Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Tue, 2 Jun 2020 16:27:02 +1000 Subject: [PATCH] Update ext. tools to master HelloWorld needed watch changes from 593474b73, AutoGenConfig needed ApiHawk impl move from 3609037be --- ExternalToolProjects/AutoGenConfig/AutoGenConfigForm.cs | 1 + ExternalToolProjects/HelloWorld/CustomMainForm.cs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ExternalToolProjects/AutoGenConfig/AutoGenConfigForm.cs b/ExternalToolProjects/AutoGenConfig/AutoGenConfigForm.cs index 09133b1e61..1fee932c99 100644 --- a/ExternalToolProjects/AutoGenConfig/AutoGenConfigForm.cs +++ b/ExternalToolProjects/AutoGenConfig/AutoGenConfigForm.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Windows.Forms; using BizHawk.Client.Common; +using BizHawk.Client.EmuHawk; using static BizHawk.Experiment.AutoGenConfig.ConfigEditorUIGenerators; diff --git a/ExternalToolProjects/HelloWorld/CustomMainForm.cs b/ExternalToolProjects/HelloWorld/CustomMainForm.cs index 03af0e1520..9b617c1a1e 100644 --- a/ExternalToolProjects/HelloWorld/CustomMainForm.cs +++ b/ExternalToolProjects/HelloWorld/CustomMainForm.cs @@ -77,7 +77,7 @@ namespace HelloWorld if (Global.Game.Name != "Null") { - Watches.RefreshDomains(_memoryDomains); + Watches.RefreshDomains(_memoryDomains, Global.Config.RamWatchDefinePrevious); label_Game.Text = $"You're playing {Global.Game.Name}"; label_GameHash.Text = $"Hash: {Global.Game.Hash}"; } @@ -96,7 +96,7 @@ namespace HelloWorld { return; } - Watches.UpdateValues(); + Watches.UpdateValues(Global.Config.RamWatchDefinePrevious); label_Watch1.Text = $"First watch ({Watches[0].AddressString}) current value: {Watches[0].ValueString}"; label_Watch2.Text = $"Second watch ({Watches[1].AddressString}) current value: {Watches[1].ValueString}"; label_Watch3.Text = $"Third watch ({Watches[2].AddressString}) current value: {Watches[2].ValueString}";