diff --git a/.vs/GBAPokemonGameEditor/v14/.suo b/.vs/GBAPokemonGameEditor/v14/.suo
index bb30ff3..4ac63a1 100644
Binary files a/.vs/GBAPokemonGameEditor/v14/.suo and b/.vs/GBAPokemonGameEditor/v14/.suo differ
diff --git a/GBAPokemonGameEditor/AttackEditor.Designer.vb b/GBAPokemonGameEditor/AttackEditor.Designer.vb
index eb0acfc..f5088f6 100644
--- a/GBAPokemonGameEditor/AttackEditor.Designer.vb
+++ b/GBAPokemonGameEditor/AttackEditor.Designer.vb
@@ -63,12 +63,16 @@ Partial Class AttackEditor
         Me.Effects = New System.Windows.Forms.ComboBox()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.TabPage2 = New System.Windows.Forms.TabPage()
-        Me.TextBox10 = New System.Windows.Forms.TextBox()
-        Me.Label16 = New System.Windows.Forms.Label()
-        Me.TextBox11 = New System.Windows.Forms.TextBox()
-        Me.Label17 = New System.Windows.Forms.Label()
-        Me.ComboBox6 = New System.Windows.Forms.ComboBox()
+        Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+        Me.Button5 = New System.Windows.Forms.Button()
         Me.Label15 = New System.Windows.Forms.Label()
+        Me.ComboBox6 = New System.Windows.Forms.ComboBox()
+        Me.Label17 = New System.Windows.Forms.Label()
+        Me.TextBox10 = New System.Windows.Forms.TextBox()
+        Me.TextBox11 = New System.Windows.Forms.TextBox()
+        Me.Label16 = New System.Windows.Forms.Label()
+        Me.TextBox13 = New System.Windows.Forms.TextBox()
+        Me.TextBox12 = New System.Windows.Forms.TextBox()
         Me.TextBox8 = New System.Windows.Forms.TextBox()
         Me.Label13 = New System.Windows.Forms.Label()
         Me.TextBox9 = New System.Windows.Forms.TextBox()
@@ -81,26 +85,26 @@ Partial Class AttackEditor
         Me.GroupBox4 = New System.Windows.Forms.GroupBox()
         Me.Button4 = New System.Windows.Forms.Button()
         Me.AnimationPointer = New System.Windows.Forms.TextBox()
-        Me.TextBox12 = New System.Windows.Forms.TextBox()
-        Me.TextBox13 = New System.Windows.Forms.TextBox()
-        Me.GroupBox5 = New System.Windows.Forms.GroupBox()
-        Me.Button5 = New System.Windows.Forms.Button()
+        Me.Label20 = New System.Windows.Forms.Label()
+        Me.AttackListIndex = New System.Windows.Forms.TextBox()
         Me.GroupBox1.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
         Me.GroupBox3.SuspendLayout()
         Me.TabPage2.SuspendLayout()
-        Me.GroupBox4.SuspendLayout()
         Me.GroupBox5.SuspendLayout()
+        Me.GroupBox4.SuspendLayout()
         Me.SuspendLayout()
         '
         'GroupBox1
         '
+        Me.GroupBox1.Controls.Add(Me.AttackListIndex)
+        Me.GroupBox1.Controls.Add(Me.Label20)
         Me.GroupBox1.Controls.Add(Me.ComboBox3)
         Me.GroupBox1.Location = New System.Drawing.Point(12, 23)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(137, 58)
+        Me.GroupBox1.Size = New System.Drawing.Size(137, 74)
         Me.GroupBox1.TabIndex = 23
         Me.GroupBox1.TabStop = False
         Me.GroupBox1.Text = "Attack Selection:"
@@ -118,7 +122,7 @@ Partial Class AttackEditor
         '
         Me.GroupBox2.Controls.Add(Me.Button1)
         Me.GroupBox2.Controls.Add(Me.TextBox1)
-        Me.GroupBox2.Location = New System.Drawing.Point(12, 87)
+        Me.GroupBox2.Location = New System.Drawing.Point(12, 102)
         Me.GroupBox2.Name = "GroupBox2"
         Me.GroupBox2.Size = New System.Drawing.Size(137, 83)
         Me.GroupBox2.TabIndex = 24
@@ -264,6 +268,7 @@ Partial Class AttackEditor
         Me.TextBox7.Location = New System.Drawing.Point(287, 257)
         Me.TextBox7.Multiline = True
         Me.TextBox7.Name = "TextBox7"
+        Me.TextBox7.ReadOnly = True
         Me.TextBox7.Size = New System.Drawing.Size(147, 74)
         Me.TextBox7.TabIndex = 24
         '
@@ -501,37 +506,39 @@ Partial Class AttackEditor
         Me.TabPage2.Text = "Contest Data"
         Me.TabPage2.UseVisualStyleBackColor = True
         '
-        'TextBox10
+        'GroupBox5
         '
-        Me.TextBox10.Location = New System.Drawing.Point(103, 71)
-        Me.TextBox10.Name = "TextBox10"
-        Me.TextBox10.Size = New System.Drawing.Size(40, 20)
-        Me.TextBox10.TabIndex = 19
+        Me.GroupBox5.Controls.Add(Me.Button5)
+        Me.GroupBox5.Controls.Add(Me.Label15)
+        Me.GroupBox5.Controls.Add(Me.ComboBox6)
+        Me.GroupBox5.Controls.Add(Me.Label17)
+        Me.GroupBox5.Controls.Add(Me.TextBox10)
+        Me.GroupBox5.Controls.Add(Me.TextBox11)
+        Me.GroupBox5.Controls.Add(Me.Label16)
+        Me.GroupBox5.Location = New System.Drawing.Point(6, 138)
+        Me.GroupBox5.Name = "GroupBox5"
+        Me.GroupBox5.Size = New System.Drawing.Size(448, 138)
+        Me.GroupBox5.TabIndex = 22
+        Me.GroupBox5.TabStop = False
+        Me.GroupBox5.Text = "Move Effect"
         '
-        'Label16
+        'Button5
         '
-        Me.Label16.AutoSize = True
-        Me.Label16.Location = New System.Drawing.Point(11, 74)
-        Me.Label16.Name = "Label16"
-        Me.Label16.Size = New System.Drawing.Size(29, 13)
-        Me.Label16.TabIndex = 18
-        Me.Label16.Text = "Jam:"
+        Me.Button5.Location = New System.Drawing.Point(306, 91)
+        Me.Button5.Name = "Button5"
+        Me.Button5.Size = New System.Drawing.Size(120, 33)
+        Me.Button5.TabIndex = 20
+        Me.Button5.Text = "Save Effect"
+        Me.Button5.UseVisualStyleBackColor = True
         '
-        'TextBox11
+        'Label15
         '
-        Me.TextBox11.Location = New System.Drawing.Point(103, 45)
-        Me.TextBox11.Name = "TextBox11"
-        Me.TextBox11.Size = New System.Drawing.Size(40, 20)
-        Me.TextBox11.TabIndex = 17
-        '
-        'Label17
-        '
-        Me.Label17.AutoSize = True
-        Me.Label17.Location = New System.Drawing.Point(11, 48)
-        Me.Label17.Name = "Label17"
-        Me.Label17.Size = New System.Drawing.Size(43, 13)
-        Me.Label17.TabIndex = 16
-        Me.Label17.Text = "Appeal:"
+        Me.Label15.AutoSize = True
+        Me.Label15.Location = New System.Drawing.Point(11, 20)
+        Me.Label15.Name = "Label15"
+        Me.Label15.Size = New System.Drawing.Size(38, 13)
+        Me.Label15.TabIndex = 14
+        Me.Label15.Text = "Effect:"
         '
         'ComboBox6
         '
@@ -543,14 +550,51 @@ Partial Class AttackEditor
         Me.ComboBox6.Size = New System.Drawing.Size(323, 21)
         Me.ComboBox6.TabIndex = 15
         '
-        'Label15
+        'Label17
         '
-        Me.Label15.AutoSize = True
-        Me.Label15.Location = New System.Drawing.Point(11, 20)
-        Me.Label15.Name = "Label15"
-        Me.Label15.Size = New System.Drawing.Size(38, 13)
-        Me.Label15.TabIndex = 14
-        Me.Label15.Text = "Effect:"
+        Me.Label17.AutoSize = True
+        Me.Label17.Location = New System.Drawing.Point(11, 48)
+        Me.Label17.Name = "Label17"
+        Me.Label17.Size = New System.Drawing.Size(43, 13)
+        Me.Label17.TabIndex = 16
+        Me.Label17.Text = "Appeal:"
+        '
+        'TextBox10
+        '
+        Me.TextBox10.Location = New System.Drawing.Point(103, 71)
+        Me.TextBox10.Name = "TextBox10"
+        Me.TextBox10.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox10.TabIndex = 19
+        '
+        'TextBox11
+        '
+        Me.TextBox11.Location = New System.Drawing.Point(103, 45)
+        Me.TextBox11.Name = "TextBox11"
+        Me.TextBox11.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox11.TabIndex = 17
+        '
+        'Label16
+        '
+        Me.Label16.AutoSize = True
+        Me.Label16.Location = New System.Drawing.Point(11, 74)
+        Me.Label16.Name = "Label16"
+        Me.Label16.Size = New System.Drawing.Size(29, 13)
+        Me.Label16.TabIndex = 18
+        Me.Label16.Text = "Jam:"
+        '
+        'TextBox13
+        '
+        Me.TextBox13.Location = New System.Drawing.Point(201, 105)
+        Me.TextBox13.Name = "TextBox13"
+        Me.TextBox13.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox13.TabIndex = 21
+        '
+        'TextBox12
+        '
+        Me.TextBox12.Location = New System.Drawing.Point(155, 105)
+        Me.TextBox12.Name = "TextBox12"
+        Me.TextBox12.Size = New System.Drawing.Size(40, 20)
+        Me.TextBox12.TabIndex = 20
         '
         'TextBox8
         '
@@ -624,7 +668,7 @@ Partial Class AttackEditor
         '
         'Button3
         '
-        Me.Button3.Location = New System.Drawing.Point(18, 279)
+        Me.Button3.Location = New System.Drawing.Point(18, 294)
         Me.Button3.Name = "Button3"
         Me.Button3.Size = New System.Drawing.Size(120, 33)
         Me.Button3.TabIndex = 26
@@ -635,7 +679,7 @@ Partial Class AttackEditor
         '
         Me.GroupBox4.Controls.Add(Me.Button4)
         Me.GroupBox4.Controls.Add(Me.AnimationPointer)
-        Me.GroupBox4.Location = New System.Drawing.Point(12, 180)
+        Me.GroupBox4.Location = New System.Drawing.Point(12, 195)
         Me.GroupBox4.Name = "GroupBox4"
         Me.GroupBox4.Size = New System.Drawing.Size(137, 83)
         Me.GroupBox4.TabIndex = 27
@@ -658,44 +702,22 @@ Partial Class AttackEditor
         Me.AnimationPointer.Size = New System.Drawing.Size(121, 20)
         Me.AnimationPointer.TabIndex = 0
         '
-        'TextBox12
+        'Label20
         '
-        Me.TextBox12.Location = New System.Drawing.Point(155, 105)
-        Me.TextBox12.Name = "TextBox12"
-        Me.TextBox12.Size = New System.Drawing.Size(40, 20)
-        Me.TextBox12.TabIndex = 20
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(6, 49)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(36, 13)
+        Me.Label20.TabIndex = 24
+        Me.Label20.Text = "Index:"
         '
-        'TextBox13
+        'AttackListIndex
         '
-        Me.TextBox13.Location = New System.Drawing.Point(201, 105)
-        Me.TextBox13.Name = "TextBox13"
-        Me.TextBox13.Size = New System.Drawing.Size(40, 20)
-        Me.TextBox13.TabIndex = 21
-        '
-        'GroupBox5
-        '
-        Me.GroupBox5.Controls.Add(Me.Button5)
-        Me.GroupBox5.Controls.Add(Me.Label15)
-        Me.GroupBox5.Controls.Add(Me.ComboBox6)
-        Me.GroupBox5.Controls.Add(Me.Label17)
-        Me.GroupBox5.Controls.Add(Me.TextBox10)
-        Me.GroupBox5.Controls.Add(Me.TextBox11)
-        Me.GroupBox5.Controls.Add(Me.Label16)
-        Me.GroupBox5.Location = New System.Drawing.Point(6, 138)
-        Me.GroupBox5.Name = "GroupBox5"
-        Me.GroupBox5.Size = New System.Drawing.Size(448, 138)
-        Me.GroupBox5.TabIndex = 22
-        Me.GroupBox5.TabStop = False
-        Me.GroupBox5.Text = "Move Effect"
-        '
-        'Button5
-        '
-        Me.Button5.Location = New System.Drawing.Point(306, 91)
-        Me.Button5.Name = "Button5"
-        Me.Button5.Size = New System.Drawing.Size(120, 33)
-        Me.Button5.TabIndex = 20
-        Me.Button5.Text = "Save Effect"
-        Me.Button5.UseVisualStyleBackColor = True
+        Me.AttackListIndex.Location = New System.Drawing.Point(46, 46)
+        Me.AttackListIndex.Name = "AttackListIndex"
+        Me.AttackListIndex.ReadOnly = True
+        Me.AttackListIndex.Size = New System.Drawing.Size(40, 20)
+        Me.AttackListIndex.TabIndex = 25
         '
         'AttackEditor
         '
@@ -714,6 +736,7 @@ Partial Class AttackEditor
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "Attack Editor"
         Me.GroupBox1.ResumeLayout(False)
+        Me.GroupBox1.PerformLayout()
         Me.GroupBox2.ResumeLayout(False)
         Me.GroupBox2.PerformLayout()
         Me.TabControl1.ResumeLayout(False)
@@ -723,10 +746,10 @@ Partial Class AttackEditor
         Me.GroupBox3.PerformLayout()
         Me.TabPage2.ResumeLayout(False)
         Me.TabPage2.PerformLayout()
-        Me.GroupBox4.ResumeLayout(False)
-        Me.GroupBox4.PerformLayout()
         Me.GroupBox5.ResumeLayout(False)
         Me.GroupBox5.PerformLayout()
+        Me.GroupBox4.ResumeLayout(False)
+        Me.GroupBox4.PerformLayout()
         Me.ResumeLayout(False)
 
     End Sub
@@ -792,4 +815,6 @@ Partial Class AttackEditor
     Friend WithEvents TextBox12 As System.Windows.Forms.TextBox
     Friend WithEvents GroupBox5 As System.Windows.Forms.GroupBox
     Friend WithEvents Button5 As System.Windows.Forms.Button
+    Friend WithEvents AttackListIndex As TextBox
+    Friend WithEvents Label20 As Label
 End Class
diff --git a/GBAPokemonGameEditor/AttackEditor.vb b/GBAPokemonGameEditor/AttackEditor.vb
index 3eed292..2d1e92f 100644
--- a/GBAPokemonGameEditor/AttackEditor.vb
+++ b/GBAPokemonGameEditor/AttackEditor.vb
@@ -14,6 +14,10 @@
         Dim LoopVar As Integer
         LoopVar = 1
 
+        ComboBox1.Items.Clear()
+
+        ComboBox1.Items.AddRange(IO.File.ReadAllLines(AppPath & "PGETypeList.txt"))
+
         ComboBox3.Items.Clear()
 
         While LoopVar < (GetString(AppPath & "ini\roms.ini", header, "NumberOfAttacks", "")) + 1 = True
@@ -40,6 +44,8 @@
 
         AnimationPointer.Text = Hex(Val("&H" & ReverseHEX(ReadHEX(LoadedROM, (AttackAni) + (ComboBox3.SelectedIndex * 4) + 4, 4))) - &H8000000)
 
+        AttackListIndex.Text = ComboBox3.SelectedIndex + 1
+
         TextBox1.Text = GetAttackName(ComboBox3.SelectedIndex + 1)
 
         TextBox6.Text = Hex(Val("&H" & ReverseHEX(ReadHEX(LoadedROM, (AttackDesc) + (ComboBox3.SelectedIndex * 4), 4))) - &H8000000)
diff --git a/GBAPokemonGameEditor/GetNameFunctions.vb b/GBAPokemonGameEditor/GetNameFunctions.vb
index 2da5e38..f40f6f5 100644
--- a/GBAPokemonGameEditor/GetNameFunctions.vb
+++ b/GBAPokemonGameEditor/GetNameFunctions.vb
@@ -127,9 +127,9 @@ Module GetNameFunctions
 
             FileNum = FreeFile()
             FileOpen(FileNum, LoadedROM, OpenMode.Binary)
-            Dim AbilityName As String = "xxxxxxxxxxxxx"
-            FileGet(FileNum, AbilityName, offvar + 1 + (13 * Index))
-            b$ = Sapp2Asc(AbilityName, False)
+            Dim AttackName As String = "xxxxxxxxxxxxx"
+            FileGet(FileNum, AttackName, offvar + 1 + (13 * Index))
+            b$ = Sapp2Asc(AttackName, False)
             While InStr(1, b$, "\x") : b$ = LSet(b$, Len(b$) - 1) : End While
             b$ = LSet(b$, Len(b$) - 1)
 
diff --git a/GBAPokemonGameEditor/Pokemonedit.Designer.vb b/GBAPokemonGameEditor/Pokemonedit.Designer.vb
index cfb19f5..af003ae 100644
--- a/GBAPokemonGameEditor/Pokemonedit.Designer.vb
+++ b/GBAPokemonGameEditor/Pokemonedit.Designer.vb
@@ -168,6 +168,8 @@ Partial Class Pokemonedit
         Me.Button9 = New System.Windows.Forms.Button()
         Me.FolderBrowserDialog = New System.Windows.Forms.FolderBrowserDialog()
         Me.ProgressBar = New System.Windows.Forms.ProgressBar()
+        Me.Label24 = New System.Windows.Forms.Label()
+        Me.PokemonListIndex = New System.Windows.Forms.TextBox()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
         Me.GroupBox21.SuspendLayout()
@@ -1506,7 +1508,7 @@ Partial Class Pokemonedit
         '
         'Button1
         '
-        Me.Button1.Location = New System.Drawing.Point(8, 199)
+        Me.Button1.Location = New System.Drawing.Point(8, 235)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(130, 41)
         Me.Button1.TabIndex = 2
@@ -1517,7 +1519,7 @@ Partial Class Pokemonedit
         '
         Me.GroupBox18.Controls.Add(Me.ChangePKMName)
         Me.GroupBox18.Controls.Add(Me.CurPKMName)
-        Me.GroupBox18.Location = New System.Drawing.Point(8, 121)
+        Me.GroupBox18.Location = New System.Drawing.Point(8, 157)
         Me.GroupBox18.Name = "GroupBox18"
         Me.GroupBox18.Size = New System.Drawing.Size(130, 72)
         Me.GroupBox18.TabIndex = 7
@@ -1543,10 +1545,12 @@ Partial Class Pokemonedit
         '
         'GroupBox19
         '
+        Me.GroupBox19.Controls.Add(Me.PokemonListIndex)
+        Me.GroupBox19.Controls.Add(Me.Label24)
         Me.GroupBox19.Controls.Add(Me.PKMNames)
         Me.GroupBox19.Location = New System.Drawing.Point(8, 49)
         Me.GroupBox19.Name = "GroupBox19"
-        Me.GroupBox19.Size = New System.Drawing.Size(130, 66)
+        Me.GroupBox19.Size = New System.Drawing.Size(130, 98)
         Me.GroupBox19.TabIndex = 8
         Me.GroupBox19.TabStop = False
         Me.GroupBox19.Text = "Pokemon Selection"
@@ -1563,7 +1567,7 @@ Partial Class Pokemonedit
         '
         'Button7
         '
-        Me.Button7.Location = New System.Drawing.Point(8, 246)
+        Me.Button7.Location = New System.Drawing.Point(8, 282)
         Me.Button7.Name = "Button7"
         Me.Button7.Size = New System.Drawing.Size(130, 41)
         Me.Button7.TabIndex = 9
@@ -1572,7 +1576,7 @@ Partial Class Pokemonedit
         '
         'Button8
         '
-        Me.Button8.Location = New System.Drawing.Point(8, 293)
+        Me.Button8.Location = New System.Drawing.Point(8, 329)
         Me.Button8.Name = "Button8"
         Me.Button8.Size = New System.Drawing.Size(130, 41)
         Me.Button8.TabIndex = 10
@@ -1585,7 +1589,7 @@ Partial Class Pokemonedit
         '
         'Button9
         '
-        Me.Button9.Location = New System.Drawing.Point(8, 340)
+        Me.Button9.Location = New System.Drawing.Point(8, 376)
         Me.Button9.Name = "Button9"
         Me.Button9.Size = New System.Drawing.Size(130, 41)
         Me.Button9.TabIndex = 11
@@ -1600,6 +1604,23 @@ Partial Class Pokemonedit
         Me.ProgressBar.TabIndex = 12
         Me.ProgressBar.Visible = False
         '
+        'Label24
+        '
+        Me.Label24.AutoSize = True
+        Me.Label24.Location = New System.Drawing.Point(6, 69)
+        Me.Label24.Name = "Label24"
+        Me.Label24.Size = New System.Drawing.Size(36, 13)
+        Me.Label24.TabIndex = 8
+        Me.Label24.Text = "Index:"
+        '
+        'PokemonListIndex
+        '
+        Me.PokemonListIndex.Location = New System.Drawing.Point(48, 66)
+        Me.PokemonListIndex.Name = "PokemonListIndex"
+        Me.PokemonListIndex.ReadOnly = True
+        Me.PokemonListIndex.Size = New System.Drawing.Size(40, 20)
+        Me.PokemonListIndex.TabIndex = 9
+        '
         'Pokemonedit
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1675,6 +1696,7 @@ Partial Class Pokemonedit
         Me.GroupBox18.ResumeLayout(False)
         Me.GroupBox18.PerformLayout()
         Me.GroupBox19.ResumeLayout(False)
+        Me.GroupBox19.PerformLayout()
         Me.ResumeLayout(False)
 
     End Sub
@@ -1823,4 +1845,6 @@ Partial Class Pokemonedit
     Friend WithEvents GroupBox8 As System.Windows.Forms.GroupBox
     Friend WithEvents EggType2 As System.Windows.Forms.ComboBox
     Friend WithEvents EggType1 As System.Windows.Forms.ComboBox
+    Friend WithEvents PokemonListIndex As TextBox
+    Friend WithEvents Label24 As Label
 End Class
diff --git a/GBAPokemonGameEditor/Pokemonedit.resx b/GBAPokemonGameEditor/Pokemonedit.resx
index 8131bc1..35e147d 100644
--- a/GBAPokemonGameEditor/Pokemonedit.resx
+++ b/GBAPokemonGameEditor/Pokemonedit.resx
@@ -126,6 +126,9 @@
   <metadata name="FolderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>405, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
diff --git a/GBAPokemonGameEditor/Pokemonedit.vb b/GBAPokemonGameEditor/Pokemonedit.vb
index 3ae3602..8fc3369 100644
--- a/GBAPokemonGameEditor/Pokemonedit.vb
+++ b/GBAPokemonGameEditor/Pokemonedit.vb
@@ -32,6 +32,11 @@ Public Class Pokemonedit
 
     Private Sub Pokemonedit_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load
 
+        Type1.Items.Clear()
+        Type2.Items.Clear()
+
+        Type1.Items.AddRange(IO.File.ReadAllLines(AppPath & "PGETypeList.txt"))
+        Type2.Items.AddRange(IO.File.ReadAllLines(AppPath & "PGETypeList.txt"))
 
         Dim LoopVar As Integer
 
@@ -965,7 +970,9 @@ Public Class Pokemonedit
 
 
     Private Sub PKMNames_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles PKMNames.SelectedIndexChanged
+
         i = PKMNames.SelectedIndex
+        PokemonListIndex.Text = PKMNames.SelectedIndex + 1
 
 
         Baseload()
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application
index 0614a5a..e1a8fbb 100644
--- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application
+++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.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>htoGmoX9lr0HbT9rMyQtQsKgKpU=</dsig:DigestValue>
+        <dsig:DigestValue>STogN6weQlBLOR+vEzS7Z6OfwP8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe
index be5be31..ad528d6 100644
Binary files a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe and b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe differ
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest
index 7312dda..132a678 100644
--- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest
@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="GBAPokemonGameEditor.exe" size="424448">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="GBAPokemonGameEditor.exe" size="425984">
       <assemblyIdentity name="GBAPokemonGameEditor" version="3.1.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>/crq1XRNuNRb7v7Ae77yam8TW/w=</dsig:DigestValue>
+        <dsig:DigestValue>waJWObZlyE6WeJEsWE2s3DjiIr8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb
index e483dd6..ea93a42 100644
Binary files a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb and b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb differ
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application
index 0614a5a..e1a8fbb 100644
--- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application
+++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.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>htoGmoX9lr0HbT9rMyQtQsKgKpU=</dsig:DigestValue>
+        <dsig:DigestValue>STogN6weQlBLOR+vEzS7Z6OfwP8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest
index 7312dda..132a678 100644
--- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest
@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="GBAPokemonGameEditor.exe" size="424448">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="GBAPokemonGameEditor.exe" size="425984">
       <assemblyIdentity name="GBAPokemonGameEditor" version="3.1.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>/crq1XRNuNRb7v7Ae77yam8TW/w=</dsig:DigestValue>
+        <dsig:DigestValue>waJWObZlyE6WeJEsWE2s3DjiIr8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/bin/Debug/PGETypeList.txt b/GBAPokemonGameEditor/bin/Debug/PGETypeList.txt
new file mode 100644
index 0000000..5742588
--- /dev/null
+++ b/GBAPokemonGameEditor/bin/Debug/PGETypeList.txt
@@ -0,0 +1,19 @@
+Normal
+Fighting
+Flying
+Poison
+Ground
+Rock
+Bug
+Ghost
+Steel
+???
+Fire
+Water
+Grass
+Electric
+Psychic
+Ice
+Dragon
+Dark
+Fairy
\ No newline at end of file
diff --git a/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe
index be5be31..ad528d6 100644
Binary files a/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe and b/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application
index 0614a5a..e1a8fbb 100644
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application
+++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.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>htoGmoX9lr0HbT9rMyQtQsKgKpU=</dsig:DigestValue>
+        <dsig:DigestValue>STogN6weQlBLOR+vEzS7Z6OfwP8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe
index be5be31..ad528d6 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest
index 7312dda..132a678 100644
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest
@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="GBAPokemonGameEditor.exe" size="424448">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="GBAPokemonGameEditor.exe" size="425984">
       <assemblyIdentity name="GBAPokemonGameEditor" version="3.1.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>/crq1XRNuNRb7v7Ae77yam8TW/w=</dsig:DigestValue>
+        <dsig:DigestValue>waJWObZlyE6WeJEsWE2s3DjiIr8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb
index e483dd6..ea93a42 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
index aaaacbf..634fe7c 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache differ