diff --git a/GBAPokemonGameEditor.v12.suo b/GBAPokemonGameEditor.v12.suo
index 158fe6b..c1d6c5e 100644
Binary files a/GBAPokemonGameEditor.v12.suo and b/GBAPokemonGameEditor.v12.suo differ
diff --git a/GBAPokemonGameEditor/PokedexOrderEditor.vb b/GBAPokemonGameEditor/PokedexOrderEditor.vb
index 9978e90..0e4d166 100644
--- a/GBAPokemonGameEditor/PokedexOrderEditor.vb
+++ b/GBAPokemonGameEditor/PokedexOrderEditor.vb
@@ -10,7 +10,7 @@ Public Class PokedexOrderEditor
 
         Offset2 = Int32.Parse((GetString(GetINIFileLocation(), header, "SecondDexTable", "")), System.Globalization.NumberStyles.HexNumber)
 
-        If header = "BPEE" Then
+        If header2 = "BPE" Then
 
             Offset3 = Int32.Parse((GetString(GetINIFileLocation(), header, "HoenntoNationalDex", "")), System.Globalization.NumberStyles.HexNumber)
 
@@ -31,7 +31,7 @@ Public Class PokedexOrderEditor
 
         End While
 
-        If header = "BPEE" Then
+        If header2 = "BPE" Then
             GroupBox4.Enabled = True
         Else
             GroupBox4.Enabled = False
@@ -58,14 +58,14 @@ Public Class PokedexOrderEditor
         'makes i be the list index so that the location of the pokemon's dex number can be calculated
         WriteHEX(LoadedROM, Offset1 + (i * 2), ReverseHEX(VB.Right("0000" & Hex(ListBox2.SelectedIndex), 4)))
         WriteHEX(LoadedROM, Offset2 + (i * 2), ReverseHEX(VB.Right("0000" & Hex(ListBox3.SelectedIndex), 4)))
-        If header = "BPEE" Then
+        If header2 = "BPE" Then
             WriteHEX(LoadedROM, Offset3 + ((ListBox3.SelectedIndex - 1) * 2), ReverseHEX(VB.Right("0000" & Hex(ListBox4.SelectedIndex), 4)))
         End If
     End Sub
 
     Private Sub ListBox3_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBox3.SelectedIndexChanged
 
-        If header = "BPEE" Then
+        If header2 = "BPE" Then
 
             ListBox4.SelectedIndex = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Offset3 + ((ListBox3.SelectedIndex - 1) * 2), 2))), System.Globalization.NumberStyles.HexNumber)
         Else
diff --git a/GBAPokemonGameEditor/Pokemonedit.Designer.vb b/GBAPokemonGameEditor/Pokemonedit.Designer.vb
index 6c6e183..0bcd96b 100644
--- a/GBAPokemonGameEditor/Pokemonedit.Designer.vb
+++ b/GBAPokemonGameEditor/Pokemonedit.Designer.vb
@@ -274,6 +274,8 @@ Partial Class Pokemonedit
         Me.Button30 = New System.Windows.Forms.Button()
         Me.Button38 = New System.Windows.Forms.Button()
         Me.Button39 = New System.Windows.Forms.Button()
+        Me.TextBox7 = New System.Windows.Forms.TextBox()
+        Me.Label57 = New System.Windows.Forms.Label()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
         Me.GroupBox26.SuspendLayout()
@@ -1974,7 +1976,7 @@ Partial Class Pokemonedit
         Me.GroupBox31.Controls.Add(Me.Scale1)
         Me.GroupBox31.Controls.Add(Me.Label43)
         Me.GroupBox31.Controls.Add(Me.Label44)
-        Me.GroupBox31.Location = New System.Drawing.Point(7, 151)
+        Me.GroupBox31.Location = New System.Drawing.Point(7, 188)
         Me.GroupBox31.Margin = New System.Windows.Forms.Padding(4)
         Me.GroupBox31.Name = "GroupBox31"
         Me.GroupBox31.Padding = New System.Windows.Forms.Padding(4)
@@ -2367,6 +2369,8 @@ Partial Class Pokemonedit
         '
         'GroupBox28
         '
+        Me.GroupBox28.Controls.Add(Me.TextBox7)
+        Me.GroupBox28.Controls.Add(Me.Label57)
         Me.GroupBox28.Controls.Add(Me.TextBox4)
         Me.GroupBox28.Controls.Add(Me.TextBox3)
         Me.GroupBox28.Controls.Add(Me.Button16)
@@ -2376,7 +2380,7 @@ Partial Class Pokemonedit
         Me.GroupBox28.Margin = New System.Windows.Forms.Padding(4)
         Me.GroupBox28.Name = "GroupBox28"
         Me.GroupBox28.Padding = New System.Windows.Forms.Padding(4)
-        Me.GroupBox28.Size = New System.Drawing.Size(184, 130)
+        Me.GroupBox28.Size = New System.Drawing.Size(184, 166)
         Me.GroupBox28.TabIndex = 1
         Me.GroupBox28.TabStop = False
         Me.GroupBox28.Text = "Pokedex Order"
@@ -2399,7 +2403,7 @@ Partial Class Pokemonedit
         '
         'Button16
         '
-        Me.Button16.Location = New System.Drawing.Point(27, 87)
+        Me.Button16.Location = New System.Drawing.Point(26, 129)
         Me.Button16.Margin = New System.Windows.Forms.Padding(4)
         Me.Button16.Name = "Button16"
         Me.Button16.Size = New System.Drawing.Size(143, 28)
@@ -2413,9 +2417,9 @@ Partial Class Pokemonedit
         Me.Label26.Location = New System.Drawing.Point(23, 62)
         Me.Label26.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label26.Name = "Label26"
-        Me.Label26.Size = New System.Drawing.Size(100, 17)
+        Me.Label26.Size = New System.Drawing.Size(54, 17)
         Me.Label26.TabIndex = 1
-        Me.Label26.Text = "Second Table:"
+        Me.Label26.Text = "Hoenn:"
         '
         'Label25
         '
@@ -3020,6 +3024,24 @@ Partial Class Pokemonedit
         Me.Button39.Text = "Import All Cries"
         Me.Button39.UseVisualStyleBackColor = True
         '
+        'TextBox7
+        '
+        Me.TextBox7.Location = New System.Drawing.Point(125, 91)
+        Me.TextBox7.Margin = New System.Windows.Forms.Padding(4)
+        Me.TextBox7.Name = "TextBox7"
+        Me.TextBox7.Size = New System.Drawing.Size(44, 22)
+        Me.TextBox7.TabIndex = 6
+        '
+        'Label57
+        '
+        Me.Label57.AutoSize = True
+        Me.Label57.Location = New System.Drawing.Point(24, 96)
+        Me.Label57.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label57.Name = "Label57"
+        Me.Label57.Size = New System.Drawing.Size(96, 17)
+        Me.Label57.TabIndex = 5
+        Me.Label57.Text = "Hoenn to Nat:"
+        '
         'Pokemonedit
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
@@ -3396,4 +3418,6 @@ Partial Class Pokemonedit
     Friend WithEvents Button33 As System.Windows.Forms.Button
     Friend WithEvents Button38 As System.Windows.Forms.Button
     Friend WithEvents Button39 As System.Windows.Forms.Button
+    Friend WithEvents TextBox7 As System.Windows.Forms.TextBox
+    Friend WithEvents Label57 As System.Windows.Forms.Label
 End Class
diff --git a/GBAPokemonGameEditor/Pokemonedit.vb b/GBAPokemonGameEditor/Pokemonedit.vb
index 2867e11..46b54d9 100644
--- a/GBAPokemonGameEditor/Pokemonedit.vb
+++ b/GBAPokemonGameEditor/Pokemonedit.vb
@@ -2449,6 +2449,15 @@ Public Class Pokemonedit
 
             TextBox5.Text = GetPokedexTypeName(TextBox3.Text)
 
+            If header = "BPE" Then
+                TextBox7.Enabled = True
+
+                '  TextBox7.Text = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Offset3 + ((TextBox4.Text - 1) * 2), 2))), System.Globalization.NumberStyles.HexNumber)
+
+            Else
+                TextBox7.Enabled = False
+            End If
+
         Else
 
             GroupBox32.Enabled = False
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
index e0e5070..cf838bc 100644
--- 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>2cBIgLRemu5C5EZVbHFFGjia2z3z9Wm9VP4oG+XWKr4=</dsig:DigestValue>
+        <dsig:DigestValue>gsAdPmVolhrGsvHPX0yAuG8rRvQXP1mN/bnaVgGsn2w=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
index 5df7498..9803538 100644
Binary files a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe differ
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
index cacc3d2..b7ff7c0 100644
--- 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="2042880">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2043904">
       <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>SxluNxN6kZkh8IccOvNWULgK6cEMWJQZ70wZWpm7/90=</dsig:DigestValue>
+        <dsig:DigestValue>4CMKqvs4i4K5Bcjnty8A2SL1CyS2caQkR29jA9zrMsE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
index 9d99575..8745dd7 100644
Binary files a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb differ
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
index e0e5070..cf838bc 100644
--- 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>2cBIgLRemu5C5EZVbHFFGjia2z3z9Wm9VP4oG+XWKr4=</dsig:DigestValue>
+        <dsig:DigestValue>gsAdPmVolhrGsvHPX0yAuG8rRvQXP1mN/bnaVgGsn2w=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
index cacc3d2..b7ff7c0 100644
--- 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="2042880">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2043904">
       <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>SxluNxN6kZkh8IccOvNWULgK6cEMWJQZ70wZWpm7/90=</dsig:DigestValue>
+        <dsig:DigestValue>4CMKqvs4i4K5Bcjnty8A2SL1CyS2caQkR29jA9zrMsE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
index 8156c05..e5b9888 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
index e0e5070..cf838bc 100644
--- 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>2cBIgLRemu5C5EZVbHFFGjia2z3z9Wm9VP4oG+XWKr4=</dsig:DigestValue>
+        <dsig:DigestValue>gsAdPmVolhrGsvHPX0yAuG8rRvQXP1mN/bnaVgGsn2w=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
index 5df7498..9803538 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
index cacc3d2..b7ff7c0 100644
--- 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="2042880">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2043904">
       <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>SxluNxN6kZkh8IccOvNWULgK6cEMWJQZ70wZWpm7/90=</dsig:DigestValue>
+        <dsig:DigestValue>4CMKqvs4i4K5Bcjnty8A2SL1CyS2caQkR29jA9zrMsE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
index 9d99575..8745dd7 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ
diff --git a/roms.ini b/roms.ini
index 53ada52..ed892a9 100644
--- a/roms.ini
+++ b/roms.ini
@@ -767,6 +767,7 @@ PokemonNames=3185C8
 NumberOfPokemon=412
 NationalDexTable=31DC82
 SecondDexTable=31D94C
+HoenntoNationalDex=31DFB8
 PokedexData=56B5B0
 NumberOfDexEntries=387
 PokemonData=3203CC