From c4e98313c85e14b538e8337f211e0280f62fde24 Mon Sep 17 00:00:00 2001
From: AdAstra-LD <76622070+AdAstra-LD@users.noreply.github.com>
Date: Sun, 17 Jul 2022 22:46:44 +0200
Subject: [PATCH] Improved datasources of trainer editor controls

---
 DS_Map/Main Window.cs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs
index 8f49104..d2ea7b9 100644
--- a/DS_Map/Main Window.cs	
+++ b/DS_Map/Main Window.cs	
@@ -8174,25 +8174,24 @@ namespace DSPRE {
             string[] moveNames = RomInfo.GetAttackNames();
 
             foreach(Control c in trainerItemsGroupBox.Controls) {
-                ComboBox cbox = c as ComboBox;
-                cbox.Items.Clear();
-                cbox.Items.AddRange(itemNames);
+                if (c is ComboBox) {
+                    (c as ComboBox).DataSource = new BindingSource(itemNames, string.Empty);
+                }
             }
 
             foreach (ComboBox CB in partyPokemonComboboxList) {
-                CB.Items.Clear();
-                CB.Items.AddRange(pokeNames);
+                CB.DataSource = new BindingSource(pokeNames, string.Empty);
             }
 
             foreach (ComboBox CB in partyItemsComboboxList) {
-                CB.Items.Clear();
-                CB.Items.AddRange(itemNames);
+                CB.DataSource = new BindingSource(itemNames, string.Empty);
             }
 
             foreach (GroupBox movesGroup in partyMovesGroupboxList) {
-                foreach (ComboBox CB in movesGroup.Controls) {
-                    CB.Items.Clear();
-                    CB.Items.AddRange(moveNames);
+                foreach (Control c in movesGroup.Controls) {
+                    if (c is ComboBox) {
+                        (c as ComboBox).DataSource = new BindingSource(moveNames, string.Empty);
+                    }
                 }
             }