From dd910e6aa1cd5ba55a4e3fc22af7b483d5a1d16e Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 8 Dec 2015 06:19:34 -0800 Subject: [PATCH] Tweak set override logic If the method defines whether or not the sub should be called, that will be used. Else, it will use the global setting. --- Misc/SAV6.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Misc/SAV6.cs b/Misc/SAV6.cs index afc1401aa..f6474ea8e 100644 --- a/Misc/SAV6.cs +++ b/Misc/SAV6.cs @@ -467,9 +467,9 @@ public PK6 getPK6Stored(int offset) } public void setPK6Party(PK6 pk6, int offset, bool? trade = null, bool? dex = null) { - if (SetUpdatePK6 || (trade ?? false)) + if (trade ?? SetUpdatePK6) setPK6(pk6); - if (SetUpdateDex || (dex ?? false)) + if (dex ?? SetUpdateDex) setDex(pk6); byte[] ek6 = encryptArray(pk6.Data); @@ -479,9 +479,9 @@ public void setPK6Party(PK6 pk6, int offset, bool? trade = null, bool? dex = nul } public void setPK6Stored(PK6 pk6, int offset, bool? trade = null, bool? dex = null) { - if (SetUpdatePK6 || (trade ?? false)) + if (trade ?? SetUpdatePK6) setPK6(pk6); - if (SetUpdateDex || (dex ?? false)) + if (dex ?? SetUpdateDex) setDex(pk6); byte[] ek6 = encryptArray(pk6.Data); @@ -492,9 +492,9 @@ public void setPK6Stored(PK6 pk6, int offset, bool? trade = null, bool? dex = nu public void setEK6Stored(byte[] ek6, int offset, bool? trade = null, bool? dex = null) { PK6 pk6 = new PK6(decryptArray(ek6)); - if (SetUpdatePK6 || (trade ?? false)) + if (trade ?? SetUpdatePK6) setPK6(pk6); - if (SetUpdateDex || (dex ?? false)) + if (dex ?? SetUpdateDex) setDex(pk6); Array.Resize(ref ek6, PK6.SIZE_STORED);