Move tutor editor updated!

Move tutor editor has been updated. It now supports having added more moves to the move tutors.
2026-08-28 13:24:18 -05:00 · 2016-01-24 01:07:44 -05:00
parent c03c30af02
commit 366d27025f
19 changed files with 113 additions and 765 deletions
--- a/.vs/GBAPokemonGameEditor/v14/.suo
+++ b/.vs/GBAPokemonGameEditor/v14/.suo
--- a/GBAPokemonGameEditor/Pokemonedit.vb
+++ b/GBAPokemonGameEditor/Pokemonedit.vb
@@ -1809,7 +1809,7 @@ Public Class Pokemonedit
            MTattacks = Int32.Parse((GetString(GetINIFileLocation(), header, "MoveTutorAttacks", "")), System.Globalization.NumberStyles.HexNumber)

            MTCom.Enabled = True
-            While LoopVar < 32
+            While LoopVar < (Val(GetString(GetINIFileLocation(), header, "NumberOfMoveTutorAttacks", "")))
                MTCom.Items.Add(GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, MTattacks + ((LoopVar) * 2), 2))), System.Globalization.NumberStyles.HexNumber)))
                LoopVar = LoopVar + 1

@@ -1819,7 +1819,7 @@ Public Class Pokemonedit

            MTCom.Enabled = True

-            While LoopVar < 16
+            While LoopVar < (Val(GetString(GetINIFileLocation(), header, "NumberOfMoveTutorAttacks", "")))
                MTCom.Items.Add(GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, MTattacks + ((LoopVar) * 2), 2))), System.Globalization.NumberStyles.HexNumber)))
                LoopVar = LoopVar + 1

@@ -1837,12 +1837,13 @@ Public Class Pokemonedit
        Dim blah As Integer
        Dim curchar As String

-        If header2 = "BPE" Then
+        'If header2 = "BPE" Then
+        If header2 = "BPE" Or header2 = "BPR" Or header2 = "BPG" Then
            MTCompoLoc = Int32.Parse((GetString(GetINIFileLocation(), header, "MoveTutorCompatibility", "")), System.Globalization.NumberStyles.HexNumber)


-            For emloop = 0 To 1
-                blah = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, MTCompoLoc + 4 + (PKMNames.SelectedIndex * 4) + (emloop * 2), 2))), System.Globalization.NumberStyles.HexNumber)
+            For emloop = 0 To (((Val(GetString(GetINIFileLocation(), header, "NumberOfMoveTutorAttacks", ""))) / 16) - 1)
+                blah = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, MTCompoLoc + (((Val(GetString(GetINIFileLocation(), header, "NumberOfMoveTutorAttacks", ""))) / 8)) + (PKMNames.SelectedIndex * (((Val(GetString(GetINIFileLocation(), header, "NumberOfMoveTutorAttacks", ""))) / 8))) + (emloop * 2), 2))), System.Globalization.NumberStyles.HexNumber)
                binarythebitch = (Convert.ToString(blah, 2))
                While Len(binarythebitch) < 16

@@ -1868,33 +1869,33 @@ Public Class Pokemonedit
                End While
            Next emloop

-        ElseIf header2 = "BPR" Or header2 = "BPG" Then
-            MTCompoLoc = Int32.Parse((GetString(GetINIFileLocation(), header, "MoveTutorCompatibility", "")), System.Globalization.NumberStyles.HexNumber)
+            'ElseIf header2 = "BPR" Or header2 = "BPG" Then
+            '    MTCompoLoc = Int32.Parse((GetString(GetINIFileLocation(), header, "MoveTutorCompatibility", "")), System.Globalization.NumberStyles.HexNumber)

-            blah = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, MTCompoLoc + 2 + (PKMNames.SelectedIndex * 2), 2))), System.Globalization.NumberStyles.HexNumber)
-            binarythebitch = (Convert.ToString(blah, 2))
-            While Len(binarythebitch) < 16
+            '    blah = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, MTCompoLoc + 2 + (PKMNames.SelectedIndex * 2), 2))), System.Globalization.NumberStyles.HexNumber)
+            '    binarythebitch = (Convert.ToString(blah, 2))
+            '    While Len(binarythebitch) < 16

-                binarythebitch = "0" & binarythebitch
+            '        binarythebitch = "0" & binarythebitch

-            End While
-            LoopVar = 0
+            '    End While
+            '    LoopVar = 0

-            While LoopVar < 16
-                curchar = GetChar(binarythebitch, LoopVar + 1)
+            '    While LoopVar < 16
+            '        curchar = GetChar(binarythebitch, LoopVar + 1)


-                If curchar = "1" Then
-                    MTCom.SetItemChecked(15 - LoopVar, True)
+            '        If curchar = "1" Then
+            '            MTCom.SetItemChecked(15 - LoopVar, True)


-                ElseIf curchar = "0" Then
+            '        ElseIf curchar = "0" Then

-                    MTCom.SetItemChecked(15 - LoopVar, False)
-                End If
+            '            MTCom.SetItemChecked(15 - LoopVar, False)
+            '        End If

-                LoopVar = LoopVar + 1
-            End While
+            '        LoopVar = LoopVar + 1
+            '    End While
        Else
        End If

@@ -1912,8 +1913,9 @@ Public Class Pokemonedit
        'Dim blah As Integer
        'Dim curchar As String

-        If header2 = "BPE" Then
-            For emloop = 0 To 1
+        'If header2 = "BPE" Then
+        If header2 = "BPE" Or header2 = "BPR" Or header2 = "BPG" Then
+            For emloop = 0 To (((Val(GetString(GetINIFileLocation(), header, "NumberOfMoveTutorAttacks", ""))) / 16) - 1)
                binarytowrite = ""
                For looper = 0 To 15

@@ -1928,25 +1930,25 @@ Public Class Pokemonedit
                Next looper

                bytetowrite = Hex(Convert.ToInt32(binarytowrite, 2))
-                WriteHEX(LoadedROM, MTCompoLoc + 4 + (PKMNames.SelectedIndex * 4) + (emloop * 2), ReverseHEX(bytetowrite))
+                WriteHEX(LoadedROM, MTCompoLoc + (((Val(GetString(GetINIFileLocation(), header, "NumberOfMoveTutorAttacks", ""))) / 8)) + (PKMNames.SelectedIndex * (((Val(GetString(GetINIFileLocation(), header, "NumberOfMoveTutorAttacks", ""))) / 8))) + (emloop * 2), ReverseHEX(VB.Right("0000" & bytetowrite, 4)))
            Next emloop

-        ElseIf header2 = "BPR" Or header2 = "BPG" Then
-            binarytowrite = ""
-                For looper = 0 To 15
+            'ElseIf header2 = "BPR" Or header2 = "BPG" Then
+            '    binarytowrite = ""
+            '        For looper = 0 To 15

-                If MTCom.GetItemChecked((0 * 16) + 15 - looper) = True Then
-                    binarytowrite = binarytowrite & "1"
+            '        If MTCom.GetItemChecked((0 * 16) + 15 - looper) = True Then
+            '            binarytowrite = binarytowrite & "1"

-                ElseIf MTCom.GetItemChecked((0 * 16) + 15 - looper) = False Then
-                    binarytowrite = binarytowrite & "0"
+            '        ElseIf MTCom.GetItemChecked((0 * 16) + 15 - looper) = False Then
+            '            binarytowrite = binarytowrite & "0"

-                End If
+            '        End If

-                Next looper
+            '        Next looper

-                bytetowrite = Hex(Convert.ToInt32(binarytowrite, 2))
-            WriteHEX(LoadedROM, MTCompoLoc + 2 + (PKMNames.SelectedIndex * 2) + (0 * 2), ReverseHEX(bytetowrite))
+            '        bytetowrite = Hex(Convert.ToInt32(binarytowrite, 2))
+            '    WriteHEX(LoadedROM, MTCompoLoc + 2 + (PKMNames.SelectedIndex * 2) + (0 * 2), ReverseHEX(bytetowrite))

        Else
        End If
--- 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#sha1" />
-        <dsig:DigestValue>dmxmZqC3lB1fAtfZ/mtThipMKaQ=</dsig:DigestValue>
+        <dsig:DigestValue>jWCwoT8KCqzZSq0pEsj8/y7AQ68=</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="1479680">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="1463808">
      <assemblyIdentity name="PokemonGameEditor" version="3.3.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#sha1" />
-        <dsig:DigestValue>Hfbh8iSw+yPSWA4weY4mwYINHjM=</dsig:DigestValue>
+        <dsig:DigestValue>Tfc6DsWEYTXqAZ25cPAe2MLNbEw=</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#sha1" />
-        <dsig:DigestValue>dmxmZqC3lB1fAtfZ/mtThipMKaQ=</dsig:DigestValue>
+        <dsig:DigestValue>jWCwoT8KCqzZSq0pEsj8/y7AQ68=</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="1479680">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="1463808">
      <assemblyIdentity name="PokemonGameEditor" version="3.3.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#sha1" />
-        <dsig:DigestValue>Hfbh8iSw+yPSWA4weY4mwYINHjM=</dsig:DigestValue>
+        <dsig:DigestValue>Tfc6DsWEYTXqAZ25cPAe2MLNbEw=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe
+++ b/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe
--- a/GBAPokemonGameEditor/bin/Debug/ini/roms.ini
+++ b/GBAPokemonGameEditor/bin/Debug/ini/roms.ini
@@ -365,6 +365,7 @@ ItemIMGData=3D4294
 NumberOfItems=375
 NumberOfAttacks=354
 MoveTutorAttacks=459B60
+NumberOfMoveTutorAttacks=16
 PokemonNames=245EE0
 NumberOfPokemon=412
 NationalDexTable=251FEE
@@ -521,6 +522,7 @@ Evolution12Param=level
 Evolution13Param=evolvesbutnoparms
 Evolution14Param=level
 Evolution15Param=evolvesbutnoparms
+
 [BPGE]
 ROMName=Pok<EFBFBD>mon Leaf Green (English)
 ItemData=3DAE64
@@ -530,6 +532,7 @@ ItemIMGData=3D40D0
 NumberOfItems=375
 NumberOfAttacks=354
 MoveTutorAttacks=459580
+NumberOfMoveTutorAttacks=16
 PokemonNames=245EBC
 NumberOfPokemon=412
 NationalDexTable=251FCA
@@ -694,6 +697,7 @@ ItemIMGData=614410
 NumberOfItems=377
 NumberOfAttacks=354
 MoveTutorAttacks=61500C
+NumberOfMoveTutorAttacks=32
 PokemonNames=3185C8
 NumberOfPokemon=412
 NationalDexTable=31DC82
--- a/GBAPokemonGameEditor/movetutor2.Designer.vb
+++ b/GBAPokemonGameEditor/movetutor2.Designer.vb
@@ -23,509 +23,56 @@ Partial Class movetutor2
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(movetutor2))
-        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
-        Me.ComboBox16 = New System.Windows.Forms.ComboBox()
-        Me.ComboBox15 = New System.Windows.Forms.ComboBox()
-        Me.ComboBox14 = New System.Windows.Forms.ComboBox()
-        Me.ComboBox13 = New System.Windows.Forms.ComboBox()
-        Me.ComboBox12 = New System.Windows.Forms.ComboBox()
-        Me.ComboBox11 = New System.Windows.Forms.ComboBox()
-        Me.ComboBox10 = New System.Windows.Forms.ComboBox()
-        Me.ComboBox9 = New System.Windows.Forms.ComboBox()
-        Me.ComboBox8 = New System.Windows.Forms.ComboBox()
-        Me.ComboBox7 = New System.Windows.Forms.ComboBox()
-        Me.ComboBox6 = New System.Windows.Forms.ComboBox()
-        Me.ComboBox5 = New System.Windows.Forms.ComboBox()
-        Me.ComboBox4 = New System.Windows.Forms.ComboBox()
-        Me.ComboBox3 = New System.Windows.Forms.ComboBox()
-        Me.ComboBox2 = New System.Windows.Forms.ComboBox()
-        Me.ComboBox1 = New System.Windows.Forms.ComboBox()
        Me.Button2 = New System.Windows.Forms.Button()
-        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-        Me.Combo16 = New System.Windows.Forms.ComboBox()
-        Me.Combo15 = New System.Windows.Forms.ComboBox()
-        Me.Combo14 = New System.Windows.Forms.ComboBox()
-        Me.Combo13 = New System.Windows.Forms.ComboBox()
-        Me.Combo12 = New System.Windows.Forms.ComboBox()
-        Me.Combo11 = New System.Windows.Forms.ComboBox()
-        Me.Combo10 = New System.Windows.Forms.ComboBox()
-        Me.Combo9 = New System.Windows.Forms.ComboBox()
-        Me.Combo8 = New System.Windows.Forms.ComboBox()
-        Me.Combo7 = New System.Windows.Forms.ComboBox()
-        Me.Combo6 = New System.Windows.Forms.ComboBox()
-        Me.Combo5 = New System.Windows.Forms.ComboBox()
-        Me.Combo4 = New System.Windows.Forms.ComboBox()
-        Me.Combo3 = New System.Windows.Forms.ComboBox()
-        Me.Combo2 = New System.Windows.Forms.ComboBox()
        Me.Combo1 = New System.Windows.Forms.ComboBox()
-        Me.GroupBox2.SuspendLayout()
-        Me.GroupBox1.SuspendLayout()
+        Me.ListBox1 = New System.Windows.Forms.ListBox()
        Me.SuspendLayout()
        '
-        'GroupBox2
-        '
-        Me.GroupBox2.Controls.Add(Me.ComboBox16)
-        Me.GroupBox2.Controls.Add(Me.ComboBox15)
-        Me.GroupBox2.Controls.Add(Me.ComboBox14)
-        Me.GroupBox2.Controls.Add(Me.ComboBox13)
-        Me.GroupBox2.Controls.Add(Me.ComboBox12)
-        Me.GroupBox2.Controls.Add(Me.ComboBox11)
-        Me.GroupBox2.Controls.Add(Me.ComboBox10)
-        Me.GroupBox2.Controls.Add(Me.ComboBox9)
-        Me.GroupBox2.Controls.Add(Me.ComboBox8)
-        Me.GroupBox2.Controls.Add(Me.ComboBox7)
-        Me.GroupBox2.Controls.Add(Me.ComboBox6)
-        Me.GroupBox2.Controls.Add(Me.ComboBox5)
-        Me.GroupBox2.Controls.Add(Me.ComboBox4)
-        Me.GroupBox2.Controls.Add(Me.ComboBox3)
-        Me.GroupBox2.Controls.Add(Me.ComboBox2)
-        Me.GroupBox2.Controls.Add(Me.ComboBox1)
-        Me.GroupBox2.Location = New System.Drawing.Point(294, 12)
-        Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(276, 249)
-        Me.GroupBox2.TabIndex = 17
-        Me.GroupBox2.TabStop = False
-        Me.GroupBox2.Text = "Emerald Only"
-        '
-        'ComboBox16
-        '
-        Me.ComboBox16.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox16.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox16.Enabled = False
-        Me.ComboBox16.FormattingEnabled = True
-        Me.ComboBox16.Location = New System.Drawing.Point(144, 218)
-        Me.ComboBox16.Name = "ComboBox16"
-        Me.ComboBox16.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox16.TabIndex = 15
-        '
-        'ComboBox15
-        '
-        Me.ComboBox15.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox15.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox15.Enabled = False
-        Me.ComboBox15.FormattingEnabled = True
-        Me.ComboBox15.Location = New System.Drawing.Point(144, 191)
-        Me.ComboBox15.Name = "ComboBox15"
-        Me.ComboBox15.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox15.TabIndex = 14
-        '
-        'ComboBox14
-        '
-        Me.ComboBox14.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox14.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox14.Enabled = False
-        Me.ComboBox14.FormattingEnabled = True
-        Me.ComboBox14.Location = New System.Drawing.Point(144, 164)
-        Me.ComboBox14.Name = "ComboBox14"
-        Me.ComboBox14.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox14.TabIndex = 13
-        '
-        'ComboBox13
-        '
-        Me.ComboBox13.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox13.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox13.Enabled = False
-        Me.ComboBox13.FormattingEnabled = True
-        Me.ComboBox13.Location = New System.Drawing.Point(144, 137)
-        Me.ComboBox13.Name = "ComboBox13"
-        Me.ComboBox13.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox13.TabIndex = 12
-        '
-        'ComboBox12
-        '
-        Me.ComboBox12.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox12.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox12.Enabled = False
-        Me.ComboBox12.FormattingEnabled = True
-        Me.ComboBox12.Location = New System.Drawing.Point(144, 110)
-        Me.ComboBox12.Name = "ComboBox12"
-        Me.ComboBox12.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox12.TabIndex = 11
-        '
-        'ComboBox11
-        '
-        Me.ComboBox11.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox11.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox11.Enabled = False
-        Me.ComboBox11.FormattingEnabled = True
-        Me.ComboBox11.Location = New System.Drawing.Point(144, 83)
-        Me.ComboBox11.Name = "ComboBox11"
-        Me.ComboBox11.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox11.TabIndex = 10
-        '
-        'ComboBox10
-        '
-        Me.ComboBox10.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox10.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox10.Enabled = False
-        Me.ComboBox10.FormattingEnabled = True
-        Me.ComboBox10.Location = New System.Drawing.Point(144, 56)
-        Me.ComboBox10.Name = "ComboBox10"
-        Me.ComboBox10.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox10.TabIndex = 9
-        '
-        'ComboBox9
-        '
-        Me.ComboBox9.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox9.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox9.Enabled = False
-        Me.ComboBox9.FormattingEnabled = True
-        Me.ComboBox9.Location = New System.Drawing.Point(144, 29)
-        Me.ComboBox9.Name = "ComboBox9"
-        Me.ComboBox9.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox9.TabIndex = 8
-        '
-        'ComboBox8
-        '
-        Me.ComboBox8.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox8.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox8.Enabled = False
-        Me.ComboBox8.FormattingEnabled = True
-        Me.ComboBox8.Location = New System.Drawing.Point(6, 218)
-        Me.ComboBox8.Name = "ComboBox8"
-        Me.ComboBox8.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox8.TabIndex = 7
-        '
-        'ComboBox7
-        '
-        Me.ComboBox7.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox7.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox7.Enabled = False
-        Me.ComboBox7.FormattingEnabled = True
-        Me.ComboBox7.Location = New System.Drawing.Point(6, 191)
-        Me.ComboBox7.Name = "ComboBox7"
-        Me.ComboBox7.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox7.TabIndex = 6
-        '
-        'ComboBox6
-        '
-        Me.ComboBox6.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox6.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox6.Enabled = False
-        Me.ComboBox6.FormattingEnabled = True
-        Me.ComboBox6.Location = New System.Drawing.Point(6, 164)
-        Me.ComboBox6.Name = "ComboBox6"
-        Me.ComboBox6.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox6.TabIndex = 5
-        '
-        'ComboBox5
-        '
-        Me.ComboBox5.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox5.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox5.Enabled = False
-        Me.ComboBox5.FormattingEnabled = True
-        Me.ComboBox5.Location = New System.Drawing.Point(6, 137)
-        Me.ComboBox5.Name = "ComboBox5"
-        Me.ComboBox5.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox5.TabIndex = 4
-        '
-        'ComboBox4
-        '
-        Me.ComboBox4.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox4.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox4.Enabled = False
-        Me.ComboBox4.FormattingEnabled = True
-        Me.ComboBox4.Location = New System.Drawing.Point(6, 110)
-        Me.ComboBox4.Name = "ComboBox4"
-        Me.ComboBox4.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox4.TabIndex = 3
-        '
-        'ComboBox3
-        '
-        Me.ComboBox3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox3.Enabled = False
-        Me.ComboBox3.FormattingEnabled = True
-        Me.ComboBox3.Location = New System.Drawing.Point(6, 83)
-        Me.ComboBox3.Name = "ComboBox3"
-        Me.ComboBox3.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox3.TabIndex = 2
-        '
-        'ComboBox2
-        '
-        Me.ComboBox2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox2.Enabled = False
-        Me.ComboBox2.FormattingEnabled = True
-        Me.ComboBox2.Location = New System.Drawing.Point(6, 56)
-        Me.ComboBox2.Name = "ComboBox2"
-        Me.ComboBox2.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox2.TabIndex = 1
-        '
-        'ComboBox1
-        '
-        Me.ComboBox1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.ComboBox1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.ComboBox1.Enabled = False
-        Me.ComboBox1.FormattingEnabled = True
-        Me.ComboBox1.Location = New System.Drawing.Point(6, 29)
-        Me.ComboBox1.Name = "ComboBox1"
-        Me.ComboBox1.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox1.TabIndex = 0
-        '
        'Button2
        '
-        Me.Button2.Enabled = False
-        Me.Button2.Location = New System.Drawing.Point(449, 267)
+        Me.Button2.Location = New System.Drawing.Point(55, 179)
        Me.Button2.Name = "Button2"
        Me.Button2.Size = New System.Drawing.Size(121, 25)
        Me.Button2.TabIndex = 16
        Me.Button2.Text = "Save"
        Me.Button2.UseVisualStyleBackColor = True
        '
-        'GroupBox1
-        '
-        Me.GroupBox1.Controls.Add(Me.Combo16)
-        Me.GroupBox1.Controls.Add(Me.Combo15)
-        Me.GroupBox1.Controls.Add(Me.Combo14)
-        Me.GroupBox1.Controls.Add(Me.Combo13)
-        Me.GroupBox1.Controls.Add(Me.Combo12)
-        Me.GroupBox1.Controls.Add(Me.Combo11)
-        Me.GroupBox1.Controls.Add(Me.Combo10)
-        Me.GroupBox1.Controls.Add(Me.Combo9)
-        Me.GroupBox1.Controls.Add(Me.Combo8)
-        Me.GroupBox1.Controls.Add(Me.Combo7)
-        Me.GroupBox1.Controls.Add(Me.Combo6)
-        Me.GroupBox1.Controls.Add(Me.Combo5)
-        Me.GroupBox1.Controls.Add(Me.Combo4)
-        Me.GroupBox1.Controls.Add(Me.Combo3)
-        Me.GroupBox1.Controls.Add(Me.Combo2)
-        Me.GroupBox1.Controls.Add(Me.Combo1)
-        Me.GroupBox1.Location = New System.Drawing.Point(12, 12)
-        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(271, 249)
-        Me.GroupBox1.TabIndex = 15
-        Me.GroupBox1.TabStop = False
-        Me.GroupBox1.Text = "Move Tutor Moves"
-        '
-        'Combo16
-        '
-        Me.Combo16.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Combo16.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo16.Enabled = False
-        Me.Combo16.FormattingEnabled = True
-        Me.Combo16.Location = New System.Drawing.Point(142, 218)
-        Me.Combo16.Name = "Combo16"
-        Me.Combo16.Size = New System.Drawing.Size(121, 21)
-        Me.Combo16.TabIndex = 15
-        '
-        'Combo15
-        '
-        Me.Combo15.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Combo15.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo15.Enabled = False
-        Me.Combo15.FormattingEnabled = True
-        Me.Combo15.Location = New System.Drawing.Point(142, 191)
-        Me.Combo15.Name = "Combo15"
-        Me.Combo15.Size = New System.Drawing.Size(121, 21)
-        Me.Combo15.TabIndex = 14
-        '
-        'Combo14
-        '
-        Me.Combo14.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Combo14.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo14.Enabled = False
-        Me.Combo14.FormattingEnabled = True
-        Me.Combo14.Location = New System.Drawing.Point(142, 164)
-        Me.Combo14.Name = "Combo14"
-        Me.Combo14.Size = New System.Drawing.Size(121, 21)
-        Me.Combo14.TabIndex = 13
-        '
-        'Combo13
-        '
-        Me.Combo13.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Combo13.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo13.Enabled = False
-        Me.Combo13.FormattingEnabled = True
-        Me.Combo13.Location = New System.Drawing.Point(142, 137)
-        Me.Combo13.Name = "Combo13"
-        Me.Combo13.Size = New System.Drawing.Size(121, 21)
-        Me.Combo13.TabIndex = 12
-        '
-        'Combo12
-        '
-        Me.Combo12.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Combo12.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo12.Enabled = False
-        Me.Combo12.FormattingEnabled = True
-        Me.Combo12.Location = New System.Drawing.Point(142, 110)
-        Me.Combo12.Name = "Combo12"
-        Me.Combo12.Size = New System.Drawing.Size(121, 21)
-        Me.Combo12.TabIndex = 11
-        '
-        'Combo11
-        '
-        Me.Combo11.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Combo11.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo11.Enabled = False
-        Me.Combo11.FormattingEnabled = True
-        Me.Combo11.Location = New System.Drawing.Point(142, 83)
-        Me.Combo11.Name = "Combo11"
-        Me.Combo11.Size = New System.Drawing.Size(121, 21)
-        Me.Combo11.TabIndex = 10
-        '
-        'Combo10
-        '
-        Me.Combo10.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Combo10.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo10.Enabled = False
-        Me.Combo10.FormattingEnabled = True
-        Me.Combo10.Location = New System.Drawing.Point(142, 56)
-        Me.Combo10.Name = "Combo10"
-        Me.Combo10.Size = New System.Drawing.Size(121, 21)
-        Me.Combo10.TabIndex = 9
-        '
-        'Combo9
-        '
-        Me.Combo9.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Combo9.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo9.Enabled = False
-        Me.Combo9.FormattingEnabled = True
-        Me.Combo9.Location = New System.Drawing.Point(142, 29)
-        Me.Combo9.Name = "Combo9"
-        Me.Combo9.Size = New System.Drawing.Size(121, 21)
-        Me.Combo9.TabIndex = 8
-        '
-        'Combo8
-        '
-        Me.Combo8.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Combo8.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo8.Enabled = False
-        Me.Combo8.FormattingEnabled = True
-        Me.Combo8.Location = New System.Drawing.Point(6, 218)
-        Me.Combo8.Name = "Combo8"
-        Me.Combo8.Size = New System.Drawing.Size(121, 21)
-        Me.Combo8.TabIndex = 7
-        '
-        'Combo7
-        '
-        Me.Combo7.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Combo7.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo7.Enabled = False
-        Me.Combo7.FormattingEnabled = True
-        Me.Combo7.Location = New System.Drawing.Point(6, 191)
-        Me.Combo7.Name = "Combo7"
-        Me.Combo7.Size = New System.Drawing.Size(121, 21)
-        Me.Combo7.TabIndex = 6
-        '
-        'Combo6
-        '
-        Me.Combo6.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Combo6.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo6.Enabled = False
-        Me.Combo6.FormattingEnabled = True
-        Me.Combo6.Location = New System.Drawing.Point(6, 164)
-        Me.Combo6.Name = "Combo6"
-        Me.Combo6.Size = New System.Drawing.Size(121, 21)
-        Me.Combo6.TabIndex = 5
-        '
-        'Combo5
-        '
-        Me.Combo5.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Combo5.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo5.Enabled = False
-        Me.Combo5.FormattingEnabled = True
-        Me.Combo5.Location = New System.Drawing.Point(6, 137)
-        Me.Combo5.Name = "Combo5"
-        Me.Combo5.Size = New System.Drawing.Size(121, 21)
-        Me.Combo5.TabIndex = 4
-        '
-        'Combo4
-        '
-        Me.Combo4.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Combo4.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo4.Enabled = False
-        Me.Combo4.FormattingEnabled = True
-        Me.Combo4.Location = New System.Drawing.Point(6, 110)
-        Me.Combo4.Name = "Combo4"
-        Me.Combo4.Size = New System.Drawing.Size(121, 21)
-        Me.Combo4.TabIndex = 3
-        '
-        'Combo3
-        '
-        Me.Combo3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Combo3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo3.Enabled = False
-        Me.Combo3.FormattingEnabled = True
-        Me.Combo3.Location = New System.Drawing.Point(6, 83)
-        Me.Combo3.Name = "Combo3"
-        Me.Combo3.Size = New System.Drawing.Size(121, 21)
-        Me.Combo3.TabIndex = 2
-        '
-        'Combo2
-        '
-        Me.Combo2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.Combo2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo2.Enabled = False
-        Me.Combo2.FormattingEnabled = True
-        Me.Combo2.Location = New System.Drawing.Point(6, 56)
-        Me.Combo2.Name = "Combo2"
-        Me.Combo2.Size = New System.Drawing.Size(121, 21)
-        Me.Combo2.TabIndex = 1
-        '
        'Combo1
        '
        Me.Combo1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
        Me.Combo1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
-        Me.Combo1.Enabled = False
        Me.Combo1.FormattingEnabled = True
-        Me.Combo1.Location = New System.Drawing.Point(6, 29)
+        Me.Combo1.Location = New System.Drawing.Point(54, 152)
        Me.Combo1.Name = "Combo1"
        Me.Combo1.Size = New System.Drawing.Size(121, 21)
        Me.Combo1.TabIndex = 0
        '
+        'ListBox1
+        '
+        Me.ListBox1.FormattingEnabled = True
+        Me.ListBox1.Location = New System.Drawing.Point(55, 12)
+        Me.ListBox1.Name = "ListBox1"
+        Me.ListBox1.Size = New System.Drawing.Size(120, 134)
+        Me.ListBox1.TabIndex = 16
+        '
        'movetutor2
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(583, 302)
-        Me.Controls.Add(Me.GroupBox2)
+        Me.ClientSize = New System.Drawing.Size(232, 212)
+        Me.Controls.Add(Me.ListBox1)
        Me.Controls.Add(Me.Button2)
-        Me.Controls.Add(Me.GroupBox1)
+        Me.Controls.Add(Me.Combo1)
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
        Me.MaximizeBox = False
        Me.Name = "movetutor2"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.Text = "Move Tutor Editor"
-        Me.GroupBox2.ResumeLayout(False)
-        Me.GroupBox1.ResumeLayout(False)
        Me.ResumeLayout(False)

    End Sub
-    Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
-    Friend WithEvents ComboBox16 As System.Windows.Forms.ComboBox
-    Friend WithEvents ComboBox15 As System.Windows.Forms.ComboBox
-    Friend WithEvents ComboBox14 As System.Windows.Forms.ComboBox
-    Friend WithEvents ComboBox13 As System.Windows.Forms.ComboBox
-    Friend WithEvents ComboBox12 As System.Windows.Forms.ComboBox
-    Friend WithEvents ComboBox11 As System.Windows.Forms.ComboBox
-    Friend WithEvents ComboBox10 As System.Windows.Forms.ComboBox
-    Friend WithEvents ComboBox9 As System.Windows.Forms.ComboBox
-    Friend WithEvents ComboBox8 As System.Windows.Forms.ComboBox
-    Friend WithEvents ComboBox7 As System.Windows.Forms.ComboBox
-    Friend WithEvents ComboBox6 As System.Windows.Forms.ComboBox
-    Friend WithEvents ComboBox5 As System.Windows.Forms.ComboBox
-    Friend WithEvents ComboBox4 As System.Windows.Forms.ComboBox
-    Friend WithEvents ComboBox3 As System.Windows.Forms.ComboBox
-    Friend WithEvents ComboBox2 As System.Windows.Forms.ComboBox
-    Friend WithEvents ComboBox1 As System.Windows.Forms.ComboBox
    Friend WithEvents Button2 As System.Windows.Forms.Button
-    Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
-    Friend WithEvents Combo16 As System.Windows.Forms.ComboBox
-    Friend WithEvents Combo15 As System.Windows.Forms.ComboBox
-    Friend WithEvents Combo14 As System.Windows.Forms.ComboBox
-    Friend WithEvents Combo13 As System.Windows.Forms.ComboBox
-    Friend WithEvents Combo12 As System.Windows.Forms.ComboBox
-    Friend WithEvents Combo11 As System.Windows.Forms.ComboBox
-    Friend WithEvents Combo10 As System.Windows.Forms.ComboBox
-    Friend WithEvents Combo9 As System.Windows.Forms.ComboBox
-    Friend WithEvents Combo8 As System.Windows.Forms.ComboBox
-    Friend WithEvents Combo7 As System.Windows.Forms.ComboBox
-    Friend WithEvents Combo6 As System.Windows.Forms.ComboBox
-    Friend WithEvents Combo5 As System.Windows.Forms.ComboBox
-    Friend WithEvents Combo4 As System.Windows.Forms.ComboBox
-    Friend WithEvents Combo3 As System.Windows.Forms.ComboBox
-    Friend WithEvents Combo2 As System.Windows.Forms.ComboBox
    Friend WithEvents Combo1 As System.Windows.Forms.ComboBox
+    Friend WithEvents ListBox1 As ListBox
 End Class
--- a/GBAPokemonGameEditor/movetutor2.vb
+++ b/GBAPokemonGameEditor/movetutor2.vb
@@ -12,79 +12,6 @@ Public Class movetutor2

        If header2 = "BPR" Or header2 = "BPG" Or header2 = "BPE" Then

-            Combo1.Enabled = True 'enables the combo boxes
-            Combo2.Enabled = True
-            Combo3.Enabled = True
-            Combo4.Enabled = True
-            Combo5.Enabled = True
-            Combo6.Enabled = True
-            Combo7.Enabled = True
-            Combo8.Enabled = True
-            Combo9.Enabled = True
-            Combo10.Enabled = True
-            Combo11.Enabled = True
-            Combo12.Enabled = True
-            Combo13.Enabled = True
-            Combo14.Enabled = True
-            Combo15.Enabled = True
-            Combo16.Enabled = True
-
-            If header2 = "BPE" Then
-
-                ComboBox1.Enabled = True 'enables the ComboBox boxes
-                ComboBox2.Enabled = True
-                ComboBox3.Enabled = True
-                ComboBox4.Enabled = True
-                ComboBox5.Enabled = True
-                ComboBox6.Enabled = True
-                ComboBox7.Enabled = True
-                ComboBox8.Enabled = True
-                ComboBox9.Enabled = True
-                ComboBox10.Enabled = True
-                ComboBox11.Enabled = True
-                ComboBox12.Enabled = True
-                ComboBox13.Enabled = True
-                ComboBox14.Enabled = True
-                ComboBox15.Enabled = True
-                ComboBox16.Enabled = True
-            End If
-
-            Button2.Enabled = True
-
-            Combo1.Items.Clear() 'Clears the combo boxes
-            Combo2.Items.Clear()
-            Combo3.Items.Clear()
-            Combo4.Items.Clear()
-            Combo5.Items.Clear()
-            Combo6.Items.Clear()
-            Combo7.Items.Clear()
-            Combo8.Items.Clear()
-            Combo9.Items.Clear()
-            Combo10.Items.Clear()
-            Combo11.Items.Clear()
-            Combo12.Items.Clear()
-            Combo13.Items.Clear()
-            Combo14.Items.Clear()
-            Combo15.Items.Clear()
-            Combo16.Items.Clear()
-
-            ComboBox1.Items.Clear()
-            ComboBox2.Items.Clear()
-            ComboBox3.Items.Clear()
-            ComboBox4.Items.Clear()
-            ComboBox5.Items.Clear()
-            ComboBox6.Items.Clear()
-            ComboBox7.Items.Clear()
-            ComboBox8.Items.Clear()
-            ComboBox9.Items.Clear()
-            ComboBox10.Items.Clear()
-            ComboBox11.Items.Clear()
-            ComboBox12.Items.Clear()
-            ComboBox13.Items.Clear()
-            ComboBox14.Items.Clear()
-            ComboBox15.Items.Clear()
-            ComboBox16.Items.Clear()
-
            Offset = Int32.Parse((GetString(GetINIFileLocation(), header, "MoveTutorAttacks", "")), System.Globalization.NumberStyles.HexNumber)


@@ -92,217 +19,80 @@ Public Class movetutor2

            Dim curattack As String

+            Combo1.Items.Clear() 'Clears the combo boxes
+
            While loopything < (Val(GetString(GetINIFileLocation(), header, "NumberOfAttacks", "")) + 1)


                curattack = GetAttackName(loopything)

                Combo1.Items.Add(curattack) 'adds the attacks to the comboboxes
-                Combo2.Items.Add(curattack)
-                Combo3.Items.Add(curattack)
-                Combo4.Items.Add(curattack)
-                Combo5.Items.Add(curattack)
-                Combo6.Items.Add(curattack)
-                Combo7.Items.Add(curattack)
-                Combo8.Items.Add(curattack)
-                Combo9.Items.Add(curattack)
-                Combo10.Items.Add(curattack)
-                Combo11.Items.Add(curattack)
-                Combo12.Items.Add(curattack)
-                Combo13.Items.Add(curattack)
-                Combo14.Items.Add(curattack)
-                Combo15.Items.Add(curattack)
-                Combo16.Items.Add(curattack)

-                If header2 = "BPE" Then
+                loopything = loopything + 1
+            End While
+
+            loopything = 0
+
+            ListBox1.Items.Clear()
+
+            While loopything < (Val(GetString(GetINIFileLocation(), header, "NumberOfMoveTutorAttacks", "")))
+
+                ListBox1.Items.Add(GetAttackName(Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + (2 * loopything), 2)))), System.Globalization.NumberStyles.HexNumber)))

-                    ComboBox1.Items.Add(curattack)
-                    ComboBox2.Items.Add(curattack)
-                    ComboBox3.Items.Add(curattack)
-                    ComboBox4.Items.Add(curattack)
-                    ComboBox5.Items.Add(curattack)
-                    ComboBox6.Items.Add(curattack)
-                    ComboBox7.Items.Add(curattack)
-                    ComboBox8.Items.Add(curattack)
-                    ComboBox9.Items.Add(curattack)
-                    ComboBox10.Items.Add(curattack)
-                    ComboBox11.Items.Add(curattack)
-                    ComboBox12.Items.Add(curattack)
-                    ComboBox13.Items.Add(curattack)
-                    ComboBox14.Items.Add(curattack)
-                    ComboBox15.Items.Add(curattack)
-                    ComboBox16.Items.Add(curattack)
-                End If
                loopything = loopything + 1
            End While


-            Combo1.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset, 2)))), System.Globalization.NumberStyles.HexNumber)
-            Combo2.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 1, 2)))), System.Globalization.NumberStyles.HexNumber)
-            Combo3.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 3, 2)))), System.Globalization.NumberStyles.HexNumber)
-            Combo4.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 5, 2)))), System.Globalization.NumberStyles.HexNumber)
-            Combo5.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 7, 2)))), System.Globalization.NumberStyles.HexNumber)
-            Combo6.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 9, 2)))), System.Globalization.NumberStyles.HexNumber)
-            Combo7.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 11, 2)))), System.Globalization.NumberStyles.HexNumber)
-            Combo8.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 13, 2)))), System.Globalization.NumberStyles.HexNumber)
-            Combo9.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 15, 2)))), System.Globalization.NumberStyles.HexNumber)
-            Combo10.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 17, 2)))), System.Globalization.NumberStyles.HexNumber)
-            Combo11.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 19, 2)))), System.Globalization.NumberStyles.HexNumber)
-            Combo12.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 21, 2)))), System.Globalization.NumberStyles.HexNumber)
-            Combo13.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 23, 2)))), System.Globalization.NumberStyles.HexNumber)
-            Combo14.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 25, 2)))), System.Globalization.NumberStyles.HexNumber)
-            Combo15.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 27, 2)))), System.Globalization.NumberStyles.HexNumber)
-            Combo16.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 29, 2)))), System.Globalization.NumberStyles.HexNumber)
-
-            If header2 = "BPE" Then
-
-                ComboBox1.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 31, 2)))), System.Globalization.NumberStyles.HexNumber)
-                ComboBox2.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 33, 2)))), System.Globalization.NumberStyles.HexNumber)
-                ComboBox3.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 35, 2)))), System.Globalization.NumberStyles.HexNumber)
-                ComboBox4.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 37, 2)))), System.Globalization.NumberStyles.HexNumber)
-                ComboBox5.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 39, 2)))), System.Globalization.NumberStyles.HexNumber)
-                ComboBox6.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 41, 2)))), System.Globalization.NumberStyles.HexNumber)
-                ComboBox7.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 43, 2)))), System.Globalization.NumberStyles.HexNumber)
-                ComboBox8.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 45, 2)))), System.Globalization.NumberStyles.HexNumber)
-                ComboBox9.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 47, 2)))), System.Globalization.NumberStyles.HexNumber)
-                ComboBox10.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 49, 2)))), System.Globalization.NumberStyles.HexNumber)
-                ComboBox11.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 51, 2)))), System.Globalization.NumberStyles.HexNumber)
-                ComboBox12.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 53, 2)))), System.Globalization.NumberStyles.HexNumber)
-                ComboBox13.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 55, 2)))), System.Globalization.NumberStyles.HexNumber)
-                ComboBox14.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 57, 2)))), System.Globalization.NumberStyles.HexNumber)
-                ComboBox15.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 59, 2)))), System.Globalization.NumberStyles.HexNumber)
-                ComboBox16.SelectedIndex = Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + 61, 2)))), System.Globalization.NumberStyles.HexNumber)
-
-            End If
-
            Me.Cursor = Cursors.Arrow
-            'MainFrm.Visible = False
+
+            ListBox1.SelectedIndex = 0
+

        Else
-Label2:
+
            'If the ROM is not supported this code will run
            Combo1.Enabled = False
-            Combo2.Enabled = False
-            Combo3.Enabled = False
-            Combo4.Enabled = False
-            Combo5.Enabled = False
-            Combo6.Enabled = False
-            Combo7.Enabled = False
-            Combo8.Enabled = False
-            Combo9.Enabled = False
-            Combo10.Enabled = False
-            Combo11.Enabled = False
-            Combo12.Enabled = False
-            Combo13.Enabled = False
-            Combo14.Enabled = False
-            Combo15.Enabled = False
-            Combo16.Enabled = False

            Button2.Enabled = False

            Combo1.Items.Clear() 'Clears the combo boxes
-            Combo2.Items.Clear()
-            Combo3.Items.Clear()
-            Combo4.Items.Clear()
-            Combo5.Items.Clear()
-            Combo6.Items.Clear()
-            Combo7.Items.Clear()
-            Combo8.Items.Clear()
-            Combo9.Items.Clear()
-            Combo10.Items.Clear()
-            Combo11.Items.Clear()
-            Combo12.Items.Clear()
-            Combo13.Items.Clear()
-            Combo14.Items.Clear()
-            Combo15.Items.Clear()
-            Combo16.Items.Clear()

-            ComboBox1.Enabled = False
-            ComboBox2.Enabled = False
-            ComboBox3.Enabled = False
-            ComboBox4.Enabled = False
-            ComboBox5.Enabled = False
-            ComboBox6.Enabled = False
-            ComboBox7.Enabled = False
-            ComboBox8.Enabled = False
-            ComboBox9.Enabled = False
-            ComboBox10.Enabled = False
-            ComboBox11.Enabled = False
-            ComboBox12.Enabled = False
-            ComboBox13.Enabled = False
-            ComboBox14.Enabled = False
-            ComboBox15.Enabled = False
-            ComboBox16.Enabled = False
-
-            ComboBox1.Items.Clear()
-            ComboBox2.Items.Clear()
-            ComboBox3.Items.Clear()
-            ComboBox4.Items.Clear()
-            ComboBox5.Items.Clear()
-            ComboBox6.Items.Clear()
-            ComboBox7.Items.Clear()
-            ComboBox8.Items.Clear()
-            ComboBox9.Items.Clear()
-            ComboBox10.Items.Clear()
-            ComboBox11.Items.Clear()
-            ComboBox12.Items.Clear()
-            ComboBox13.Items.Clear()
-            ComboBox14.Items.Clear()
-            ComboBox15.Items.Clear()
-            ComboBox16.Items.Clear()

            MsgBox("Unsupported ROM!")
            'Lets the person know the ROM isn't supported.
            End
+
        End If
   
    End Sub

    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
-        If header3 = "J" Then
-            MessageBox.Show("Support for this language has not been added yet!")
-            End

-        Else
+        Dim indexbuff As Integer

-            WriteHEX(LoadedROM, Offset - 1, ReverseHEX(VB.Right("0000" & Hex(Combo1.SelectedIndex), 4)))
-            WriteHEX(LoadedROM, Offset - 1 + 2, ReverseHEX(VB.Right("0000" & Hex(Combo2.SelectedIndex), 4)))
-            WriteHEX(LoadedROM, Offset - 1 + 4, ReverseHEX(VB.Right("0000" & Hex(Combo3.SelectedIndex), 4)))
-            WriteHEX(LoadedROM, Offset - 1 + 6, ReverseHEX(VB.Right("0000" & Hex(Combo4.SelectedIndex), 4)))
-            WriteHEX(LoadedROM, Offset - 1 + 8, ReverseHEX(VB.Right("0000" & Hex(Combo5.SelectedIndex), 4)))
-            WriteHEX(LoadedROM, Offset - 1 + 10, ReverseHEX(VB.Right("0000" & Hex(Combo6.SelectedIndex), 4)))
-            WriteHEX(LoadedROM, Offset - 1 + 12, ReverseHEX(VB.Right("0000" & Hex(Combo7.SelectedIndex), 4)))
-            WriteHEX(LoadedROM, Offset - 1 + 14, ReverseHEX(VB.Right("0000" & Hex(Combo8.SelectedIndex), 4)))
-            WriteHEX(LoadedROM, Offset - 1 + 16, ReverseHEX(VB.Right("0000" & Hex(Combo9.SelectedIndex), 4)))
-            WriteHEX(LoadedROM, Offset - 1 + 18, ReverseHEX(VB.Right("0000" & Hex(Combo10.SelectedIndex), 4)))
-            WriteHEX(LoadedROM, Offset - 1 + 20, ReverseHEX(VB.Right("0000" & Hex(Combo11.SelectedIndex), 4)))
-            WriteHEX(LoadedROM, Offset - 1 + 22, ReverseHEX(VB.Right("0000" & Hex(Combo12.SelectedIndex), 4)))
-            WriteHEX(LoadedROM, Offset - 1 + 24, ReverseHEX(VB.Right("0000" & Hex(Combo13.SelectedIndex), 4)))
-            WriteHEX(LoadedROM, Offset - 1 + 26, ReverseHEX(VB.Right("0000" & Hex(Combo14.SelectedIndex), 4)))
-            WriteHEX(LoadedROM, Offset - 1 + 28, ReverseHEX(VB.Right("0000" & Hex(Combo15.SelectedIndex), 4)))
-            WriteHEX(LoadedROM, Offset - 1 + 30, ReverseHEX(VB.Right("0000" & Hex(Combo16.SelectedIndex), 4)))
+        indexbuff = ListBox1.SelectedIndex

-            If header2 = "BPE" Then
-                WriteHEX(LoadedROM, Offset - 1 + 32, ReverseHEX(VB.Right("0000" & Hex(ComboBox1.SelectedIndex), 4)))
-                WriteHEX(LoadedROM, Offset - 1 + 34, ReverseHEX(VB.Right("0000" & Hex(ComboBox2.SelectedIndex), 4)))
-                WriteHEX(LoadedROM, Offset - 1 + 36, ReverseHEX(VB.Right("0000" & Hex(ComboBox3.SelectedIndex), 4)))
-                WriteHEX(LoadedROM, Offset - 1 + 38, ReverseHEX(VB.Right("0000" & Hex(ComboBox4.SelectedIndex), 4)))
-                WriteHEX(LoadedROM, Offset - 1 + 40, ReverseHEX(VB.Right("0000" & Hex(ComboBox5.SelectedIndex), 4)))
-                WriteHEX(LoadedROM, Offset - 1 + 42, ReverseHEX(VB.Right("0000" & Hex(ComboBox6.SelectedIndex), 4)))
-                WriteHEX(LoadedROM, Offset - 1 + 44, ReverseHEX(VB.Right("0000" & Hex(ComboBox7.SelectedIndex), 4)))
-                WriteHEX(LoadedROM, Offset - 1 + 46, ReverseHEX(VB.Right("0000" & Hex(ComboBox8.SelectedIndex), 4)))
-                WriteHEX(LoadedROM, Offset - 1 + 48, ReverseHEX(VB.Right("0000" & Hex(ComboBox9.SelectedIndex), 4)))
-                WriteHEX(LoadedROM, Offset - 1 + 50, ReverseHEX(VB.Right("0000" & Hex(ComboBox10.SelectedIndex), 4)))
-                WriteHEX(LoadedROM, Offset - 1 + 52, ReverseHEX(VB.Right("0000" & Hex(ComboBox11.SelectedIndex), 4)))
-                WriteHEX(LoadedROM, Offset - 1 + 54, ReverseHEX(VB.Right("0000" & Hex(ComboBox12.SelectedIndex), 4)))
-                WriteHEX(LoadedROM, Offset - 1 + 56, ReverseHEX(VB.Right("0000" & Hex(ComboBox13.SelectedIndex), 4)))
-                WriteHEX(LoadedROM, Offset - 1 + 58, ReverseHEX(VB.Right("0000" & Hex(ComboBox14.SelectedIndex), 4)))
-                WriteHEX(LoadedROM, Offset - 1 + 60, ReverseHEX(VB.Right("0000" & Hex(ComboBox15.SelectedIndex), 4)))
-                WriteHEX(LoadedROM, Offset - 1 + 62, ReverseHEX(VB.Right("0000" & Hex(ComboBox16.SelectedIndex), 4)))
-            End If
+        WriteHEX(LoadedROM, Offset + (2 * ListBox1.SelectedIndex), ReverseHEX(VB.Right("0000" & Hex(Combo1.SelectedIndex), 4)))
+
+        Dim loopything As String = 0
+
+        ListBox1.Items.Clear()
+
+        While loopything < (Val(GetString(GetINIFileLocation(), header, "NumberOfMoveTutorAttacks", "")))
+
+            ListBox1.Items.Add(GetAttackName(Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + (2 * loopything), 2)))), System.Globalization.NumberStyles.HexNumber)))
+
+            loopything = loopything + 1
+        End While
+
+
+        Me.Cursor = Cursors.Arrow
+
+        ListBox1.SelectedIndex = indexbuff

-        End If
    End Sub

-
+    Private Sub ListBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBox1.SelectedIndexChanged
+        Combo1.SelectedIndex = ((Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, Offset + (2 * ListBox1.SelectedIndex), 2)))), System.Globalization.NumberStyles.HexNumber)))
+    End Sub
 End Class
--- 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#sha1" />
-        <dsig:DigestValue>dmxmZqC3lB1fAtfZ/mtThipMKaQ=</dsig:DigestValue>
+        <dsig:DigestValue>jWCwoT8KCqzZSq0pEsj8/y7AQ68=</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="1479680">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="1463808">
      <assemblyIdentity name="PokemonGameEditor" version="3.3.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#sha1" />
-        <dsig:DigestValue>Hfbh8iSw+yPSWA4weY4mwYINHjM=</dsig:DigestValue>
+        <dsig:DigestValue>Tfc6DsWEYTXqAZ25cPAe2MLNbEw=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
--- a/README.md
+++ b/README.md
@@ -61,16 +61,15 @@ TM/HM Editor

 Ability to use a seperate ini

+Ability to add more attacks.
+
 Planned Features
 =================

 Ability to add more Pokemon.

-Ability to add more attacks.
-
 Ability to add more items.

-Attack effect and animation database?

 Program Requirements
 ====================
@@ -139,6 +138,8 @@ Bulbapedia

 Agastya

+Wichu
+
 Downloads
 ================================
 https://github.com/Gamer2020/PokemonGameEditor/releases
--- a/roms.ini
+++ b/roms.ini
@@ -365,6 +365,7 @@ ItemIMGData=3D4294
 NumberOfItems=375
 NumberOfAttacks=354
 MoveTutorAttacks=459B60
+NumberOfMoveTutorAttacks=16
 PokemonNames=245EE0
 NumberOfPokemon=412
 NationalDexTable=251FEE
@@ -521,6 +522,7 @@ Evolution12Param=level
 Evolution13Param=evolvesbutnoparms
 Evolution14Param=level
 Evolution15Param=evolvesbutnoparms
+
 [BPGE]
 ROMName=Pok<EFBFBD>mon Leaf Green (English)
 ItemData=3DAE64
@@ -530,6 +532,7 @@ ItemIMGData=3D40D0
 NumberOfItems=375
 NumberOfAttacks=354
 MoveTutorAttacks=459580
+NumberOfMoveTutorAttacks=16
 PokemonNames=245EBC
 NumberOfPokemon=412
 NationalDexTable=251FCA
@@ -694,6 +697,7 @@ ItemIMGData=614410
 NumberOfItems=377
 NumberOfAttacks=354
 MoveTutorAttacks=61500C
+NumberOfMoveTutorAttacks=32
 PokemonNames=3185C8
 NumberOfPokemon=412
 NationalDexTable=31DC82