From 264c7d1cbcc99a3a6ee427d650580d923e976c2a Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 3 Feb 2019 20:01:56 -0800 Subject: [PATCH] Replace null return val Closes #2255 --- PKHeX.Core/Saves/SAV6.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Saves/SAV6.cs b/PKHeX.Core/Saves/SAV6.cs index adaf206ed..2e314a1dd 100644 --- a/PKHeX.Core/Saves/SAV6.cs +++ b/PKHeX.Core/Saves/SAV6.cs @@ -712,8 +712,8 @@ public int[] RecentItems } } - public override string JPEGTitle => JPEG < 0 ? null : Util.TrimFromZero(Encoding.Unicode.GetString(Data, JPEG, 0x1A)); - public override byte[] JPEGData => JPEG < 0 || Data[JPEG + 0x54] != 0xFF ? null : GetData(JPEG + 0x54, 0xE004); + public override string JPEGTitle => JPEG < 0 ? string.Empty : Util.TrimFromZero(Encoding.Unicode.GetString(Data, JPEG, 0x1A)); + public override byte[] JPEGData => JPEG < 0 || Data[JPEG + 0x54] != 0xFF ? Array.Empty() : GetData(JPEG + 0x54, 0xE004); // Inventory public override InventoryPouch[] Inventory