From 1114b97c4bb105d5b4508bc92754117e87dd7ea2 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 6 Sep 2020 11:21:23 -0700 Subject: [PATCH] Fix bool value naming for gen8 block editor Was previously showing RaidArmor for pre-Armor saves, as the reference of a zero-length array was the same as the bools. Just sanity check since all block chunks have length. --- PKHeX.Core/Saves/MemeCrypto/SCBlockMetadata.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/PKHeX.Core/Saves/MemeCrypto/SCBlockMetadata.cs b/PKHeX.Core/Saves/MemeCrypto/SCBlockMetadata.cs index 91293e062..37c9a06b2 100644 --- a/PKHeX.Core/Saves/MemeCrypto/SCBlockMetadata.cs +++ b/PKHeX.Core/Saves/MemeCrypto/SCBlockMetadata.cs @@ -83,11 +83,14 @@ private string GetBlockHint(SCBlock z, int i) public string? GetBlockName(SCBlock block, out SaveBlock? saveBlock) { // See if we have a Block object for this block - var obj = BlockList.FirstOrDefault(z => ReferenceEquals(z.Key.Data, block.Data)); - if (obj.Key != null) + if (block.Data.Length != 0) { - saveBlock = obj.Key; - return obj.Value; + var obj = BlockList.FirstOrDefault(z => ReferenceEquals(z.Key.Data, block.Data)); + if (obj.Key != null) + { + saveBlock = obj.Key; + return obj.Value; + } } // See if it's a single-value declaration