From 319a671a6de6deb2f4ae3602158b008fcd5ae9cc Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Mon, 29 Aug 2022 17:38:27 -0700
Subject: [PATCH] Simplify munchlax tree list usage

---
 PKHeX.Core/Saves/SAV4Sinnoh.cs                       |  4 ++--
 .../Subforms/Save Editors/Gen4/SAV_HoneyTree.cs      | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/PKHeX.Core/Saves/SAV4Sinnoh.cs b/PKHeX.Core/Saves/SAV4Sinnoh.cs
index fb0a88041..047bf7eba 100644
--- a/PKHeX.Core/Saves/SAV4Sinnoh.cs
+++ b/PKHeX.Core/Saves/SAV4Sinnoh.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using static System.Buffers.Binary.BinaryPrimitives;
 
 namespace PKHeX.Core;
@@ -229,5 +229,5 @@ public enum PoketchApp
 
 public readonly record struct MunchlaxTreeSet4(int Tree1, int Tree2, int Tree3, int Tree4)
 {
-    public int[] ToArray() => new[] { Tree1, Tree2, Tree3, Tree4 };
+    public bool Contains(int tree) => tree == Tree1 || tree == Tree2 || tree == Tree3 || tree == Tree4;
 }
diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_HoneyTree.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_HoneyTree.cs
index 4916c2b4b..2b1ac0080 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_HoneyTree.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen4/SAV_HoneyTree.cs	
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Windows.Forms;
 using PKHeX.Core;
 
@@ -24,15 +23,20 @@ public SAV_HoneyTree(SAV4Sinnoh sav)
         };
 
         // Get Munchlax tree for this savegame in screen
-        MunchlaxTrees = SAV.GetMunchlaxTrees().ToArray();
+        MunchlaxTrees = SAV.GetMunchlaxTrees();
 
         const string sep = "- ";
-        L_Tree0.Text = string.Join(Environment.NewLine, MunchlaxTrees.Select(z => sep + CB_TreeList.Items[z]));
+        var names = CB_TreeList.Items;
+        L_Tree0.Text = string.Join(Environment.NewLine,
+            sep + names[MunchlaxTrees.Tree1],
+            sep + names[MunchlaxTrees.Tree2],
+            sep + names[MunchlaxTrees.Tree3],
+            sep + names[MunchlaxTrees.Tree4]);
 
         CB_TreeList.SelectedIndex = 0;
     }
 
-    private readonly int[] MunchlaxTrees;
+    private readonly MunchlaxTreeSet4 MunchlaxTrees;
     private readonly ushort[][] Table;
     private int entry;
     private bool loading;