Auto Suggestion disabled in combo boxes.

2026-07-09 05:15:29 -05:00 · 2017-01-01 11:38:05 -05:00 · 2017-01-01 11:38:05 -05:00 · 12418d950e
commit 12418d950e
parent a81db274be
16 changed files with 199 additions and 117 deletions
--- a/GBAPokemonGameEditor.v12.suo
+++ b/GBAPokemonGameEditor.v12.suo
--- a/GBAPokemonGameEditor/PokedexListEditor.Designer.vb
+++ b/GBAPokemonGameEditor/PokedexListEditor.Designer.vb
@ -24,9 +24,9 @@ Partial Class PokedexListEditor
    Private Sub InitializeComponent()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(PokedexListEditor))
        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.ComboBox1 = New System.Windows.Forms.ComboBox()
        Me.Button1 = New System.Windows.Forms.Button()
        Me.ListBox1 = New System.Windows.Forms.ListBox()
-        Me.ComboBox1 = New System.Windows.Forms.ComboBox()
        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
        Me.ComboBox2 = New System.Windows.Forms.ComboBox()
        Me.Button2 = New System.Windows.Forms.Button()
@ -50,18 +50,30 @@ Partial Class PokedexListEditor
        Me.GroupBox1.Controls.Add(Me.ComboBox1)
        Me.GroupBox1.Controls.Add(Me.Button1)
        Me.GroupBox1.Controls.Add(Me.ListBox1)
-        Me.GroupBox1.Location = New System.Drawing.Point(12, 12)
+        Me.GroupBox1.Location = New System.Drawing.Point(16, 15)
+        Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(138, 171)
+        Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GroupBox1.Size = New System.Drawing.Size(184, 210)
        Me.GroupBox1.TabIndex = 0
        Me.GroupBox1.TabStop = False
        Me.GroupBox1.Text = "Alphabetical"
        '
+        'ComboBox1
+        '
+        Me.ComboBox1.FormattingEnabled = True
+        Me.ComboBox1.Location = New System.Drawing.Point(8, 148)
+        Me.ComboBox1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.ComboBox1.Name = "ComboBox1"
+        Me.ComboBox1.Size = New System.Drawing.Size(159, 24)
+        Me.ComboBox1.TabIndex = 2
+        '
        'Button1
        '
-        Me.Button1.Location = New System.Drawing.Point(6, 142)
+        Me.Button1.Location = New System.Drawing.Point(8, 175)
+        Me.Button1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(120, 23)
+        Me.Button1.Size = New System.Drawing.Size(160, 28)
        Me.Button1.TabIndex = 1
        Me.Button1.Text = "Save"
        Me.Button1.UseVisualStyleBackColor = True
@ -69,27 +81,23 @@ Partial Class PokedexListEditor
        'ListBox1
        '
        Me.ListBox1.FormattingEnabled = True
-        Me.ListBox1.Location = New System.Drawing.Point(6, 19)
+        Me.ListBox1.ItemHeight = 16
+        Me.ListBox1.Location = New System.Drawing.Point(8, 23)
+        Me.ListBox1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.ListBox1.Name = "ListBox1"
-        Me.ListBox1.Size = New System.Drawing.Size(120, 95)
+        Me.ListBox1.Size = New System.Drawing.Size(159, 116)
        Me.ListBox1.TabIndex = 0
        '
-        'ComboBox1
-        '
-        Me.ComboBox1.FormattingEnabled = True
-        Me.ComboBox1.Location = New System.Drawing.Point(6, 120)
-        Me.ComboBox1.Name = "ComboBox1"
-        Me.ComboBox1.Size = New System.Drawing.Size(120, 21)
-        Me.ComboBox1.TabIndex = 2
-        '
        'GroupBox2
        '
        Me.GroupBox2.Controls.Add(Me.ComboBox2)
        Me.GroupBox2.Controls.Add(Me.Button2)
        Me.GroupBox2.Controls.Add(Me.ListBox2)
-        Me.GroupBox2.Location = New System.Drawing.Point(156, 12)
+        Me.GroupBox2.Location = New System.Drawing.Point(208, 15)
+        Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(138, 171)
+        Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GroupBox2.Size = New System.Drawing.Size(184, 210)
        Me.GroupBox2.TabIndex = 3
        Me.GroupBox2.TabStop = False
        Me.GroupBox2.Text = "Lightest"
@ -97,16 +105,18 @@ Partial Class PokedexListEditor
        'ComboBox2
        '
        Me.ComboBox2.FormattingEnabled = True
-        Me.ComboBox2.Location = New System.Drawing.Point(6, 120)
+        Me.ComboBox2.Location = New System.Drawing.Point(8, 148)
+        Me.ComboBox2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.ComboBox2.Name = "ComboBox2"
-        Me.ComboBox2.Size = New System.Drawing.Size(120, 21)
+        Me.ComboBox2.Size = New System.Drawing.Size(159, 24)
        Me.ComboBox2.TabIndex = 2
        '
        'Button2
        '
-        Me.Button2.Location = New System.Drawing.Point(6, 142)
+        Me.Button2.Location = New System.Drawing.Point(8, 175)
+        Me.Button2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(120, 23)
+        Me.Button2.Size = New System.Drawing.Size(160, 28)
        Me.Button2.TabIndex = 1
        Me.Button2.Text = "Save"
        Me.Button2.UseVisualStyleBackColor = True
@ -114,9 +124,11 @@ Partial Class PokedexListEditor
        'ListBox2
        '
        Me.ListBox2.FormattingEnabled = True
-        Me.ListBox2.Location = New System.Drawing.Point(6, 19)
+        Me.ListBox2.ItemHeight = 16
+        Me.ListBox2.Location = New System.Drawing.Point(8, 23)
+        Me.ListBox2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.ListBox2.Name = "ListBox2"
-        Me.ListBox2.Size = New System.Drawing.Size(120, 95)
+        Me.ListBox2.Size = New System.Drawing.Size(159, 116)
        Me.ListBox2.TabIndex = 0
        '
        'GroupBox3
@ -124,9 +136,11 @@ Partial Class PokedexListEditor
        Me.GroupBox3.Controls.Add(Me.ComboBox3)
        Me.GroupBox3.Controls.Add(Me.Button3)
        Me.GroupBox3.Controls.Add(Me.ListBox3)
-        Me.GroupBox3.Location = New System.Drawing.Point(300, 12)
+        Me.GroupBox3.Location = New System.Drawing.Point(400, 15)
+        Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.GroupBox3.Name = "GroupBox3"
-        Me.GroupBox3.Size = New System.Drawing.Size(138, 171)
+        Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GroupBox3.Size = New System.Drawing.Size(184, 210)
        Me.GroupBox3.TabIndex = 4
        Me.GroupBox3.TabStop = False
        Me.GroupBox3.Text = "Smallest"
@ -134,16 +148,18 @@ Partial Class PokedexListEditor
        'ComboBox3
        '
        Me.ComboBox3.FormattingEnabled = True
-        Me.ComboBox3.Location = New System.Drawing.Point(6, 120)
+        Me.ComboBox3.Location = New System.Drawing.Point(8, 148)
+        Me.ComboBox3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.ComboBox3.Name = "ComboBox3"
-        Me.ComboBox3.Size = New System.Drawing.Size(120, 21)
+        Me.ComboBox3.Size = New System.Drawing.Size(159, 24)
        Me.ComboBox3.TabIndex = 2
        '
        'Button3
        '
-        Me.Button3.Location = New System.Drawing.Point(6, 142)
+        Me.Button3.Location = New System.Drawing.Point(8, 175)
+        Me.Button3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.Button3.Name = "Button3"
-        Me.Button3.Size = New System.Drawing.Size(120, 23)
+        Me.Button3.Size = New System.Drawing.Size(160, 28)
        Me.Button3.TabIndex = 1
        Me.Button3.Text = "Save"
        Me.Button3.UseVisualStyleBackColor = True
@ -151,9 +167,11 @@ Partial Class PokedexListEditor
        'ListBox3
        '
        Me.ListBox3.FormattingEnabled = True
-        Me.ListBox3.Location = New System.Drawing.Point(6, 19)
+        Me.ListBox3.ItemHeight = 16
+        Me.ListBox3.Location = New System.Drawing.Point(8, 23)
+        Me.ListBox3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.ListBox3.Name = "ListBox3"
-        Me.ListBox3.Size = New System.Drawing.Size(120, 95)
+        Me.ListBox3.Size = New System.Drawing.Size(159, 116)
        Me.ListBox3.TabIndex = 0
        '
        'GroupBox4
@ -161,9 +179,11 @@ Partial Class PokedexListEditor
        Me.GroupBox4.Controls.Add(Me.ComboBox4)
        Me.GroupBox4.Controls.Add(Me.Button4)
        Me.GroupBox4.Controls.Add(Me.ListBox4)
-        Me.GroupBox4.Location = New System.Drawing.Point(444, 12)
+        Me.GroupBox4.Location = New System.Drawing.Point(592, 15)
+        Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.GroupBox4.Name = "GroupBox4"
-        Me.GroupBox4.Size = New System.Drawing.Size(138, 171)
+        Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GroupBox4.Size = New System.Drawing.Size(184, 210)
        Me.GroupBox4.TabIndex = 5
        Me.GroupBox4.TabStop = False
        Me.GroupBox4.Text = "Type"
@ -171,16 +191,18 @@ Partial Class PokedexListEditor
        'ComboBox4
        '
        Me.ComboBox4.FormattingEnabled = True
-        Me.ComboBox4.Location = New System.Drawing.Point(6, 120)
+        Me.ComboBox4.Location = New System.Drawing.Point(8, 148)
+        Me.ComboBox4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.ComboBox4.Name = "ComboBox4"
-        Me.ComboBox4.Size = New System.Drawing.Size(120, 21)
+        Me.ComboBox4.Size = New System.Drawing.Size(159, 24)
        Me.ComboBox4.TabIndex = 2
        '
        'Button4
        '
-        Me.Button4.Location = New System.Drawing.Point(6, 142)
+        Me.Button4.Location = New System.Drawing.Point(8, 175)
+        Me.Button4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.Button4.Name = "Button4"
-        Me.Button4.Size = New System.Drawing.Size(120, 23)
+        Me.Button4.Size = New System.Drawing.Size(160, 28)
        Me.Button4.TabIndex = 1
        Me.Button4.Text = "Save"
        Me.Button4.UseVisualStyleBackColor = True
@ -188,22 +210,25 @@ Partial Class PokedexListEditor
        'ListBox4
        '
        Me.ListBox4.FormattingEnabled = True
-        Me.ListBox4.Location = New System.Drawing.Point(6, 19)
+        Me.ListBox4.ItemHeight = 16
+        Me.ListBox4.Location = New System.Drawing.Point(8, 23)
+        Me.ListBox4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.ListBox4.Name = "ListBox4"
-        Me.ListBox4.Size = New System.Drawing.Size(120, 95)
+        Me.ListBox4.Size = New System.Drawing.Size(159, 116)
        Me.ListBox4.TabIndex = 0
        '
        'PokedexListEditor
        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(593, 199)
+        Me.ClientSize = New System.Drawing.Size(791, 245)
        Me.Controls.Add(Me.GroupBox4)
        Me.Controls.Add(Me.GroupBox3)
        Me.Controls.Add(Me.GroupBox2)
        Me.Controls.Add(Me.GroupBox1)
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
        Me.MaximizeBox = False
        Me.Name = "PokedexListEditor"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
--- a/GBAPokemonGameEditor/Pokemonedit.Designer.vb
+++ b/GBAPokemonGameEditor/Pokemonedit.Designer.vb
@ -1295,7 +1295,6 @@ Partial Class Pokemonedit
        '
        'Ab2
        '
-        Me.Ab2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
        Me.Ab2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.Ab2.FormattingEnabled = True
        Me.Ab2.Location = New System.Drawing.Point(8, 57)
@ -1306,7 +1305,6 @@ Partial Class Pokemonedit
        '
        'Ab1
        '
-        Me.Ab1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
        Me.Ab1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.Ab1.FormattingEnabled = True
        Me.Ab1.Location = New System.Drawing.Point(8, 23)
@ -1644,7 +1642,6 @@ Partial Class Pokemonedit
        '
        'ComboBox3
        '
-        Me.ComboBox3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
        Me.ComboBox3.FormattingEnabled = True
        Me.ComboBox3.Location = New System.Drawing.Point(275, 229)
        Me.ComboBox3.Margin = New System.Windows.Forms.Padding(4)
@ -1738,7 +1735,6 @@ Partial Class Pokemonedit
        '
        'ComboBox1
        '
-        Me.ComboBox1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
        Me.ComboBox1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.ComboBox1.FormattingEnabled = True
        Me.ComboBox1.Location = New System.Drawing.Point(509, 151)
@ -1784,7 +1780,6 @@ Partial Class Pokemonedit
        '
        'EvoItem
        '
-        Me.EvoItem.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
        Me.EvoItem.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.EvoItem.FormattingEnabled = True
        Me.EvoItem.Location = New System.Drawing.Point(245, 155)
@ -1857,7 +1852,6 @@ Partial Class Pokemonedit
        '
        'EvoPKMNames
        '
-        Me.EvoPKMNames.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
        Me.EvoPKMNames.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.EvoPKMNames.FormattingEnabled = True
        Me.EvoPKMNames.Location = New System.Drawing.Point(313, 39)
@ -1948,7 +1942,6 @@ Partial Class Pokemonedit
        '
        'NewAt
        '
-        Me.NewAt.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
        Me.NewAt.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.NewAt.FormattingEnabled = True
        Me.NewAt.Location = New System.Drawing.Point(48, 235)
@ -2972,7 +2965,6 @@ Partial Class Pokemonedit
        '
        'PKMNames
        '
-        Me.PKMNames.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
        Me.PKMNames.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.PKMNames.FormattingEnabled = True
        Me.PKMNames.Location = New System.Drawing.Point(8, 23)
--- a/GBAPokemonGameEditor/TrainerEditor.Designer.vb
+++ b/GBAPokemonGameEditor/TrainerEditor.Designer.vb
@ -27,7 +27,8 @@ Partial Class TrainerEditor
        Me.TrainerIndexTextBox = New System.Windows.Forms.TextBox()
        Me.Label1 = New System.Windows.Forms.Label()
        Me.TrainerListComboBox = New System.Windows.Forms.ComboBox()
-        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        Me.ClssRnmBttn = New System.Windows.Forms.Button()
+        Me.ClssTxtBx = New System.Windows.Forms.TextBox()
        Me.Button22 = New System.Windows.Forms.Button()
        Me.Button21 = New System.Windows.Forms.Button()
        Me.MusicTextBox = New System.Windows.Forms.TextBox()
@ -45,13 +46,17 @@ Partial Class TrainerEditor
        Me.SaveBttn = New System.Windows.Forms.Button()
        Me.SaveFileDialog = New System.Windows.Forms.SaveFileDialog()
        Me.fileOpenDialog = New System.Windows.Forms.OpenFileDialog()
-        Me.ClssRnmBttn = New System.Windows.Forms.Button()
-        Me.ClssTxtBx = New System.Windows.Forms.TextBox()
+        Me.TabControl1 = New System.Windows.Forms.TabControl()
+        Me.TabPage1 = New System.Windows.Forms.TabPage()
+        Me.TabPage2 = New System.Windows.Forms.TabPage()
+        Me.TabPage3 = New System.Windows.Forms.TabPage()
        Me.GroupBox1.SuspendLayout()
-        Me.GroupBox2.SuspendLayout()
        Me.GroupBox3.SuspendLayout()
        CType(Me.PicNumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TrainerPic, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.TabControl1.SuspendLayout()
+        Me.TabPage1.SuspendLayout()
+        Me.TabPage2.SuspendLayout()
        Me.SuspendLayout()
        '
        'GroupBox1
@ -84,7 +89,6 @@ Partial Class TrainerEditor
        '
        'TrainerListComboBox
        '
-        Me.TrainerListComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
        Me.TrainerListComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.TrainerListComboBox.FormattingEnabled = True
        Me.TrainerListComboBox.Location = New System.Drawing.Point(6, 21)
@ -92,32 +96,25 @@ Partial Class TrainerEditor
        Me.TrainerListComboBox.Size = New System.Drawing.Size(142, 24)
        Me.TrainerListComboBox.TabIndex = 0
        '
-        'GroupBox2
+        'ClssRnmBttn
        '
-        Me.GroupBox2.Controls.Add(Me.ClssRnmBttn)
-        Me.GroupBox2.Controls.Add(Me.ClssTxtBx)
-        Me.GroupBox2.Controls.Add(Me.Button22)
-        Me.GroupBox2.Controls.Add(Me.Button21)
-        Me.GroupBox2.Controls.Add(Me.MusicTextBox)
-        Me.GroupBox2.Controls.Add(Me.Label4)
-        Me.GroupBox2.Controls.Add(Me.GroupBox3)
-        Me.GroupBox2.Controls.Add(Me.ClassComboBox)
-        Me.GroupBox2.Controls.Add(Me.Label3)
-        Me.GroupBox2.Controls.Add(Me.RnmBttn)
-        Me.GroupBox2.Controls.Add(Me.TNameTextBox)
-        Me.GroupBox2.Controls.Add(Me.Label2)
-        Me.GroupBox2.Controls.Add(Me.PicNumericUpDown)
-        Me.GroupBox2.Controls.Add(Me.TrainerPic)
-        Me.GroupBox2.Location = New System.Drawing.Point(189, 12)
-        Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(356, 273)
-        Me.GroupBox2.TabIndex = 1
-        Me.GroupBox2.TabStop = False
-        Me.GroupBox2.Text = "Trainer Data"
+        Me.ClssRnmBttn.Location = New System.Drawing.Point(64, 65)
+        Me.ClssRnmBttn.Name = "ClssRnmBttn"
+        Me.ClssRnmBttn.Size = New System.Drawing.Size(181, 34)
+        Me.ClssRnmBttn.TabIndex = 23
+        Me.ClssRnmBttn.Text = "Rename Class"
+        Me.ClssRnmBttn.UseVisualStyleBackColor = True
+        '
+        'ClssTxtBx
+        '
+        Me.ClssTxtBx.Location = New System.Drawing.Point(64, 40)
+        Me.ClssTxtBx.Name = "ClssTxtBx"
+        Me.ClssTxtBx.Size = New System.Drawing.Size(181, 22)
+        Me.ClssTxtBx.TabIndex = 22
        '
        'Button22
        '
-        Me.Button22.Location = New System.Drawing.Point(16, 185)
+        Me.Button22.Location = New System.Drawing.Point(7, 171)
        Me.Button22.Margin = New System.Windows.Forms.Padding(4)
        Me.Button22.Name = "Button22"
        Me.Button22.Size = New System.Drawing.Size(85, 43)
@ -127,7 +124,7 @@ Partial Class TrainerEditor
        '
        'Button21
        '
-        Me.Button21.Location = New System.Drawing.Point(16, 136)
+        Me.Button21.Location = New System.Drawing.Point(7, 122)
        Me.Button21.Margin = New System.Windows.Forms.Padding(4)
        Me.Button21.Name = "Button21"
        Me.Button21.Size = New System.Drawing.Size(85, 43)
@ -137,7 +134,7 @@ Partial Class TrainerEditor
        '
        'MusicTextBox
        '
-        Me.MusicTextBox.Location = New System.Drawing.Point(258, 148)
+        Me.MusicTextBox.Location = New System.Drawing.Point(255, 53)
        Me.MusicTextBox.Name = "MusicTextBox"
        Me.MusicTextBox.Size = New System.Drawing.Size(86, 22)
        Me.MusicTextBox.TabIndex = 19
@ -145,7 +142,7 @@ Partial Class TrainerEditor
        'Label4
        '
        Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(204, 151)
+        Me.Label4.Location = New System.Drawing.Point(201, 56)
        Me.Label4.Name = "Label4"
        Me.Label4.Size = New System.Drawing.Size(48, 17)
        Me.Label4.TabIndex = 18
@ -155,7 +152,7 @@ Partial Class TrainerEditor
        '
        Me.GroupBox3.Controls.Add(Me.RadioButton2)
        Me.GroupBox3.Controls.Add(Me.RadioButton1)
-        Me.GroupBox3.Location = New System.Drawing.Point(111, 146)
+        Me.GroupBox3.Location = New System.Drawing.Point(108, 51)
        Me.GroupBox3.Name = "GroupBox3"
        Me.GroupBox3.Size = New System.Drawing.Size(87, 82)
        Me.GroupBox3.TabIndex = 17
@ -191,7 +188,7 @@ Partial Class TrainerEditor
        Me.ClassComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
        Me.ClassComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.ClassComboBox.FormattingEnabled = True
-        Me.ClassComboBox.Location = New System.Drawing.Point(163, 51)
+        Me.ClassComboBox.Location = New System.Drawing.Point(64, 10)
        Me.ClassComboBox.Name = "ClassComboBox"
        Me.ClassComboBox.Size = New System.Drawing.Size(181, 24)
        Me.ClassComboBox.TabIndex = 16
@ -199,7 +196,7 @@ Partial Class TrainerEditor
        'Label3
        '
        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(108, 54)
+        Me.Label3.Location = New System.Drawing.Point(9, 13)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(46, 17)
        Me.Label3.TabIndex = 15
@ -207,7 +204,7 @@ Partial Class TrainerEditor
        '
        'RnmBttn
        '
-        Me.RnmBttn.Location = New System.Drawing.Point(269, 21)
+        Me.RnmBttn.Location = New System.Drawing.Point(266, 13)
        Me.RnmBttn.Name = "RnmBttn"
        Me.RnmBttn.Size = New System.Drawing.Size(75, 24)
        Me.RnmBttn.TabIndex = 14
@ -216,7 +213,7 @@ Partial Class TrainerEditor
        '
        'TNameTextBox
        '
-        Me.TNameTextBox.Location = New System.Drawing.Point(163, 21)
+        Me.TNameTextBox.Location = New System.Drawing.Point(160, 13)
        Me.TNameTextBox.Name = "TNameTextBox"
        Me.TNameTextBox.Size = New System.Drawing.Size(100, 22)
        Me.TNameTextBox.TabIndex = 13
@ -224,7 +221,7 @@ Partial Class TrainerEditor
        'Label2
        '
        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(108, 24)
+        Me.Label2.Location = New System.Drawing.Point(105, 16)
        Me.Label2.Name = "Label2"
        Me.Label2.Size = New System.Drawing.Size(49, 17)
        Me.Label2.TabIndex = 12
@ -232,14 +229,14 @@ Partial Class TrainerEditor
        '
        'PicNumericUpDown
        '
-        Me.PicNumericUpDown.Location = New System.Drawing.Point(16, 107)
+        Me.PicNumericUpDown.Location = New System.Drawing.Point(7, 93)
        Me.PicNumericUpDown.Name = "PicNumericUpDown"
        Me.PicNumericUpDown.Size = New System.Drawing.Size(85, 22)
        Me.PicNumericUpDown.TabIndex = 11
        '
        'TrainerPic
        '
-        Me.TrainerPic.Location = New System.Drawing.Point(16, 21)
+        Me.TrainerPic.Location = New System.Drawing.Point(7, 7)
        Me.TrainerPic.Margin = New System.Windows.Forms.Padding(4)
        Me.TrainerPic.Name = "TrainerPic"
        Me.TrainerPic.Size = New System.Drawing.Size(85, 79)
@ -260,29 +257,67 @@ Partial Class TrainerEditor
        '
        Me.fileOpenDialog.FileName = "OpenFileDialog1"
        '
-        'ClssRnmBttn
+        'TabControl1
        '
-        Me.ClssRnmBttn.Location = New System.Drawing.Point(163, 106)
-        Me.ClssRnmBttn.Name = "ClssRnmBttn"
-        Me.ClssRnmBttn.Size = New System.Drawing.Size(181, 34)
-        Me.ClssRnmBttn.TabIndex = 23
-        Me.ClssRnmBttn.Text = "Rename Class"
-        Me.ClssRnmBttn.UseVisualStyleBackColor = True
+        Me.TabControl1.Controls.Add(Me.TabPage1)
+        Me.TabControl1.Controls.Add(Me.TabPage2)
+        Me.TabControl1.Controls.Add(Me.TabPage3)
+        Me.TabControl1.Location = New System.Drawing.Point(179, 12)
+        Me.TabControl1.Name = "TabControl1"
+        Me.TabControl1.SelectedIndex = 0
+        Me.TabControl1.Size = New System.Drawing.Size(368, 306)
+        Me.TabControl1.TabIndex = 3
        '
-        'ClssTxtBx
+        'TabPage1
        '
-        Me.ClssTxtBx.Location = New System.Drawing.Point(163, 81)
-        Me.ClssTxtBx.Name = "ClssTxtBx"
-        Me.ClssTxtBx.Size = New System.Drawing.Size(181, 22)
-        Me.ClssTxtBx.TabIndex = 22
+        Me.TabPage1.Controls.Add(Me.TrainerPic)
+        Me.TabPage1.Controls.Add(Me.PicNumericUpDown)
+        Me.TabPage1.Controls.Add(Me.Button22)
+        Me.TabPage1.Controls.Add(Me.Label2)
+        Me.TabPage1.Controls.Add(Me.RnmBttn)
+        Me.TabPage1.Controls.Add(Me.Button21)
+        Me.TabPage1.Controls.Add(Me.TNameTextBox)
+        Me.TabPage1.Controls.Add(Me.MusicTextBox)
+        Me.TabPage1.Controls.Add(Me.Label4)
+        Me.TabPage1.Controls.Add(Me.GroupBox3)
+        Me.TabPage1.Location = New System.Drawing.Point(4, 25)
+        Me.TabPage1.Name = "TabPage1"
+        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage1.Size = New System.Drawing.Size(360, 277)
+        Me.TabPage1.TabIndex = 0
+        Me.TabPage1.Text = "Trainer Data"
+        Me.TabPage1.UseVisualStyleBackColor = True
+        '
+        'TabPage2
+        '
+        Me.TabPage2.Controls.Add(Me.ClssRnmBttn)
+        Me.TabPage2.Controls.Add(Me.Label3)
+        Me.TabPage2.Controls.Add(Me.ClassComboBox)
+        Me.TabPage2.Controls.Add(Me.ClssTxtBx)
+        Me.TabPage2.Location = New System.Drawing.Point(4, 25)
+        Me.TabPage2.Name = "TabPage2"
+        Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage2.Size = New System.Drawing.Size(360, 277)
+        Me.TabPage2.TabIndex = 1
+        Me.TabPage2.Text = "Trainer Class"
+        Me.TabPage2.UseVisualStyleBackColor = True
+        '
+        'TabPage3
+        '
+        Me.TabPage3.Location = New System.Drawing.Point(4, 25)
+        Me.TabPage3.Name = "TabPage3"
+        Me.TabPage3.Size = New System.Drawing.Size(360, 277)
+        Me.TabPage3.TabIndex = 2
+        Me.TabPage3.Text = "Pokemon Data"
+        Me.TabPage3.UseVisualStyleBackColor = True
        '
        'TrainerEditor
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(559, 297)
+        Me.ClientSize = New System.Drawing.Size(559, 328)
+        Me.Controls.Add(Me.TabControl1)
        Me.Controls.Add(Me.SaveBttn)
-        Me.Controls.Add(Me.GroupBox2)
        Me.Controls.Add(Me.GroupBox1)
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
@ -292,12 +327,15 @@ Partial Class TrainerEditor
        Me.Text = "Trainer Editor"
        Me.GroupBox1.ResumeLayout(False)
        Me.GroupBox1.PerformLayout()
-        Me.GroupBox2.ResumeLayout(False)
-        Me.GroupBox2.PerformLayout()
        Me.GroupBox3.ResumeLayout(False)
        Me.GroupBox3.PerformLayout()
        CType(Me.PicNumericUpDown, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TrainerPic, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.TabControl1.ResumeLayout(False)
+        Me.TabPage1.ResumeLayout(False)
+        Me.TabPage1.PerformLayout()
+        Me.TabPage2.ResumeLayout(False)
+        Me.TabPage2.PerformLayout()
        Me.ResumeLayout(False)

    End Sub
@ -305,7 +343,6 @@ Partial Class TrainerEditor
    Friend WithEvents TrainerIndexTextBox As System.Windows.Forms.TextBox
    Friend WithEvents Label1 As System.Windows.Forms.Label
    Friend WithEvents TrainerListComboBox As System.Windows.Forms.ComboBox
-    Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
    Friend WithEvents PicNumericUpDown As System.Windows.Forms.NumericUpDown
    Friend WithEvents TrainerPic As System.Windows.Forms.PictureBox
    Friend WithEvents RnmBttn As System.Windows.Forms.Button
@ -325,4 +362,8 @@ Partial Class TrainerEditor
    Friend WithEvents fileOpenDialog As System.Windows.Forms.OpenFileDialog
    Friend WithEvents ClssRnmBttn As System.Windows.Forms.Button
    Friend WithEvents ClssTxtBx As System.Windows.Forms.TextBox
+    Friend WithEvents TabControl1 As System.Windows.Forms.TabControl
+    Friend WithEvents TabPage1 As System.Windows.Forms.TabPage
+    Friend WithEvents TabPage2 As System.Windows.Forms.TabPage
+    Friend WithEvents TabPage3 As System.Windows.Forms.TabPage
 End Class
--- a/GBAPokemonGameEditor/TrainerEditor.vb
+++ b/GBAPokemonGameEditor/TrainerEditor.vb
@ -1,4 +1,5 @@
-Public Class TrainerEditor
+Imports VB = Microsoft.VisualBasic
+Public Class TrainerEditor

    Private Sub TrainerEditor_Load(sender As Object, e As EventArgs) Handles MyBase.Load

@ -58,11 +59,13 @@

        MusicGenBin = (Convert.ToString(MusicGen, 2))

-        While Len(MusicGenBin) < 8
+        'While Len(MusicGenBin) < 8

-            MusicGenBin = "0" & MusicGenBin
+        '    MusicGenBin = "0" & MusicGenBin

-        End While
+        'End While
+
+        MusicGenBin = VB.Right("00000000" & MusicGenBin, 8)

        If GetChar(MusicGenBin, 1) = "0" Then
            RadioButton1.Checked = True
@ -70,6 +73,8 @@
            RadioButton2.Checked = True
        End If

+        MusicTextBox.Text = Convert.ToInt32(MusicGenBin.Remove(0, 1), 2)
+
        TrainerIndexTextBox.Text = TrainerListComboBox.SelectedIndex + 1
    End Sub

@ -115,6 +120,9 @@
    Private Sub SaveBttn_Click(sender As Object, e As EventArgs) Handles SaveBttn.Click

        Dim offvar As Integer
+        Dim MusicGen As Integer
+        Dim MusicGenBin As String = ""
+        Dim Musictextbx As Integer

        offvar = Int32.Parse((GetString(GetINIFileLocation(), header, "TrainerTable", "")), System.Globalization.NumberStyles.HexNumber)

@ -124,6 +132,22 @@

        WriteHEX(LoadedROM, offvar + 1, Hex(ClassComboBox.SelectedIndex))

+        Musictextbx = MusicTextBox.Text
+
+        If RadioButton1.Checked = True Then
+
+            MusicGenBin = "1" & VB.Right("0000000" & Convert.ToString(Musictextbx, 2), 7)
+
+        ElseIf RadioButton2.Checked = True Then
+
+            MusicGenBin = "0" & VB.Right("0000000" & Convert.ToString(Musictextbx, 2), 7)
+
+        End If
+
+        MusicGen = Convert.ToInt32(MusicGenBin, 2)
+
+        WriteHEX(LoadedROM, offvar + 2, Hex(MusicGen))
+
    End Sub

    Private Sub Button22_Click(sender As Object, e As EventArgs) Handles Button22.Click
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
@ -16,7 +16,7 @@
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>PcGwtOmeMHQurJC5Copp3oSKyKO019IfGy0/IfZSlUU=</dsig:DigestValue>
+        <dsig:DigestValue>ae8ShbDZQ+FItkLwyD2O243Y6kNMFqK/2UbjudDdZAM=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
@ -43,14 +43,14 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2108928">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2110464">
      <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>GbAPoEYhRE9qj7q+yxi06M/f9ZBK+h6B10xLQERDeiE=</dsig:DigestValue>
+        <dsig:DigestValue>SZf0p50sxqiBjI8x/Ki7JIiFrJ9eyqPdhfry4Hy+SQw=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
@ -16,7 +16,7 @@
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>PcGwtOmeMHQurJC5Copp3oSKyKO019IfGy0/IfZSlUU=</dsig:DigestValue>
+        <dsig:DigestValue>ae8ShbDZQ+FItkLwyD2O243Y6kNMFqK/2UbjudDdZAM=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
@ -43,14 +43,14 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2108928">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2110464">
      <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>GbAPoEYhRE9qj7q+yxi06M/f9ZBK+h6B10xLQERDeiE=</dsig:DigestValue>
+        <dsig:DigestValue>SZf0p50sxqiBjI8x/Ki7JIiFrJ9eyqPdhfry4Hy+SQw=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
+++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
@ -16,7 +16,7 @@
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>PcGwtOmeMHQurJC5Copp3oSKyKO019IfGy0/IfZSlUU=</dsig:DigestValue>
+        <dsig:DigestValue>ae8ShbDZQ+FItkLwyD2O243Y6kNMFqK/2UbjudDdZAM=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
@ -43,14 +43,14 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2108928">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2110464">
      <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>GbAPoEYhRE9qj7q+yxi06M/f9ZBK+h6B10xLQERDeiE=</dsig:DigestValue>
+        <dsig:DigestValue>SZf0p50sxqiBjI8x/Ki7JIiFrJ9eyqPdhfry4Hy+SQw=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb