diff --git a/.vs/GBAPokemonGameEditor/v14/.suo b/.vs/GBAPokemonGameEditor/v14/.suo
index 4663b24..4e92ea1 100644
Binary files a/.vs/GBAPokemonGameEditor/v14/.suo and b/.vs/GBAPokemonGameEditor/v14/.suo differ
diff --git a/GBAPokemonGameEditor/AttackEditor.vb b/GBAPokemonGameEditor/AttackEditor.vb
index 7450bcc..ea49508 100644
--- a/GBAPokemonGameEditor/AttackEditor.vb
+++ b/GBAPokemonGameEditor/AttackEditor.vb
@@ -17,7 +17,7 @@
 
         ComboBox1.Items.Clear()
 
-        ComboBox1.Items.AddRange(IO.File.ReadAllLines(AppPath & "PGETypeList.txt"))
+        ComboBox1.Items.AddRange(IO.File.ReadAllLines(AppPath & "txt\PGETypeList.txt"))
 
         ComboBox3.Items.Clear()
 
diff --git a/GBAPokemonGameEditor/AttackExpander.Designer.vb b/GBAPokemonGameEditor/AttackExpander.Designer.vb
index c563811..fa635a2 100644
--- a/GBAPokemonGameEditor/AttackExpander.Designer.vb
+++ b/GBAPokemonGameEditor/AttackExpander.Designer.vb
@@ -154,6 +154,7 @@ Partial Class AttackExpander
         'CheckBox4
         '
         Me.CheckBox4.AutoSize = True
+        Me.CheckBox4.Enabled = False
         Me.CheckBox4.Location = New System.Drawing.Point(20, 73)
         Me.CheckBox4.Name = "CheckBox4"
         Me.CheckBox4.Size = New System.Drawing.Size(141, 17)
diff --git a/GBAPokemonGameEditor/AttackExpander.vb b/GBAPokemonGameEditor/AttackExpander.vb
index 6c06ff9..df8694a 100644
--- a/GBAPokemonGameEditor/AttackExpander.vb
+++ b/GBAPokemonGameEditor/AttackExpander.vb
@@ -532,6 +532,9 @@ Public Class AttackExpander
         Dim AttackDescriptionTableBuffer As String
         Dim AttackDescriptionTableNewOffset As String
 
+        Dim ContestDataBuffer As String
+        Dim ContestDataNewOffset As String
+
         If System.IO.File.Exists((LoadedROM).Substring(0, LoadedROM.Length - 4) & ".ini") = True Then
 
             MsgBox("An INI for this ROM has been detected! Values will be updated as needed.")
@@ -891,117 +894,175 @@ Public Class AttackExpander
         WriteHEX(LoadedROM, &H1C3EFC, ReverseHEX(Hex((AttackDescriptionTableNewOffset) + &H8000000)))
         WriteHEX(LoadedROM, &H1D2AC8, ReverseHEX(Hex((AttackDescriptionTableNewOffset) + &H8000000)))
 
+        'Contest Data
+
+
+        ContestDataBuffer = ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "ContestMoveData", "")), System.Globalization.NumberStyles.HexNumber), ((GetString(GetINIFileLocation(), header, "NumberOfAttacks", "")) + 1) * 8)
+
+        'Deletes old data
+
+        If CheckBox3.Checked Then
+            WriteHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "ContestMoveData", "")), System.Globalization.NumberStyles.HexNumber), MakeFreeSpaceString((Len(ContestDataBuffer) / 2)))
+        End If
+
+        countervar = 0
+
+        While countervar < TextBox2.Text
+            countervar = countervar + 1
+
+            ContestDataBuffer = ContestDataBuffer & "0000000000000000"
+
+        End While
+
+
+        ContestDataNewOffset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(ContestDataBuffer) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
+
+        WriteHEX(LoadedROM, ContestDataNewOffset, ContestDataBuffer)
+
+        WriteString(GetINIFileLocation(), header, "ContestMoveData", Hex(ContestDataNewOffset))
+
+        'Repoint contest data
+
+        WriteHEX(LoadedROM, &H0D85F0, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0D9B1C, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0DB318, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0DB3F0, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0DB45C, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0DB4D8, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0DD10C, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0DD2D0, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0DD4D0, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0DDA18, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0E5468, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0E59AC, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0E5BC8, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0E5E58, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0E5EB0, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0E6204, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0E629C, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0E67B0, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H0E697C, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H156F3C, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H157010, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H15710C, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H1571E0, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H15729C, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H157408, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H157B30, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H158104, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H1583B4, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H161414, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H1614AC, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H1C247C, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H1C3E98, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H1C3F2C, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H1C44D0, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H1C4564, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
+        WriteHEX(LoadedROM, &H1D2BC4, ReverseHEX(Hex((ContestDataNewOffset) + &H8000000)))
 
         'Only limiter in ROM patch
 
-        WriteHEX(LoadedROM, &HD14E504, "000000000000")
+        WriteHEX(LoadedROM, &H14E504, "000000000000")
 
         'Move Table hack stuff
         If CheckBox4.Checked And GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then
 
-            'Converts the table to the new format
+            'Converts the table to the New format
 
-            '    Dim pokeloopcounter As Integer = 1
-            '    Dim AttackTable As Integer = Int32.Parse((GetString(GetINIFileLocation(), header, "PokemonAttackTable", "")), System.Globalization.NumberStyles.HexNumber)
-            '    Dim CurLvlUpAttPointer As String = ""
-            '    Dim newmovesoffset As String = ""
+            Dim pokeloopcounter As Integer = 1
+            Dim AttackTable As Integer = Int32.Parse((GetString(GetINIFileLocation(), header, "PokemonAttackTable", "")), System.Globalization.NumberStyles.HexNumber)
+            Dim CurLvlUpAttPointer As String = ""
+            Dim newmovesoffset As String = ""
 
-            '    Dim CurAttacksLooper As Integer
+            Dim CurAttacksLooper As Integer
 
-            '    Dim TempLoadBuff As Integer
-            '    Dim binarybuffer As String
-            '    Dim at As String
-            '    Dim lvl As String
+            Dim TempLoadBuff As Integer
+            Dim binarybuffer As String
+            Dim at As String
+            Dim lvl As String
 
-            '    Dim CurPokeAttacksBuff As String
+            Dim CurPokeAttacksBuff As String
 
 
-            '    MsgBox("Movesets will now be converted. This will take a while...")
+            MsgBox("Movesets will now be converted. This will take a while...")
 
-            '    While (pokeloopcounter < (GetString(GetINIFileLocation(), header, "NumberOfPokemon", "")))
+            While (pokeloopcounter < (GetString(GetINIFileLocation(), header, "NumberOfPokemon", "")))
 
-            '        CurLvlUpAttPointer = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (AttackTable) + (pokeloopcounter * 4), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000)
+                CurLvlUpAttPointer = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (AttackTable) + (pokeloopcounter * 4), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000)
 
-            '        CurAttacksLooper = 0
-            '        CurPokeAttacksBuff = ""
+                CurAttacksLooper = 0
+                CurPokeAttacksBuff = ""
 
-            '        While ReadHEX(LoadedROM, Int32.Parse((CurLvlUpAttPointer), System.Globalization.NumberStyles.HexNumber) + (CurAttacksLooper * 2), 2) = "FFFF" = False
+                While ReadHEX(LoadedROM, Int32.Parse((CurLvlUpAttPointer), System.Globalization.NumberStyles.HexNumber) + (CurAttacksLooper * 2), 2) = "FFFF" = False
 
-            '            TempLoadBuff = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Int32.Parse((CurLvlUpAttPointer), System.Globalization.NumberStyles.HexNumber) + (CurAttacksLooper * 2), 2))), System.Globalization.NumberStyles.HexNumber)
+                    TempLoadBuff = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Int32.Parse((CurLvlUpAttPointer), System.Globalization.NumberStyles.HexNumber) + (CurAttacksLooper * 2), 2))), System.Globalization.NumberStyles.HexNumber)
 
-            '            binarybuffer = Convert.ToString(TempLoadBuff, 2)
+                    binarybuffer = Convert.ToString(TempLoadBuff, 2)
 
-            '            While Len(binarybuffer) < 16
+                    While Len(binarybuffer) < 16
 
-            '                binarybuffer = "0" & binarybuffer
+                        binarybuffer = "0" & binarybuffer
 
-            '            End While
+                    End While
 
-            '            lvl = Mid(binarybuffer, 1, 7)
+                    lvl = Mid(binarybuffer, 1, 7)
 
-            '            at = Mid(binarybuffer, 8, 9)
+                    at = Mid(binarybuffer, 8, 9)
 
-            '            lvl = Convert.ToInt32(lvl, 2)
+                    lvl = Convert.ToInt32(lvl, 2)
 
-            '            at = Convert.ToInt32(at, 2)
+                    at = Convert.ToInt32(at, 2)
 
-            '            lvl = VB.Right("00" & Hex(lvl), 2)
-            '            at = ReverseHEX(VB.Right("0000" & Hex(at), 4))
+                    lvl = VB.Right("00" & Hex(lvl), 2)
+                    at = ReverseHEX(VB.Right("0000" & Hex(at), 4))
 
 
-            '            CurPokeAttacksBuff = CurPokeAttacksBuff & at & lvl
+                    CurPokeAttacksBuff = CurPokeAttacksBuff & at & lvl
 
-            '            CurAttacksLooper = CurAttacksLooper + 1
-            '        End While
+                    CurAttacksLooper = CurAttacksLooper + 1
+                End While
 
-            '        'deletes the old moves
+                'deletes the old moves
 
-            '        If CheckBox2.Checked Then
-            '            WriteHEX(LoadedROM, Int32.Parse(CurLvlUpAttPointer, System.Globalization.NumberStyles.HexNumber), MakeFreeSpaceString((CurAttacksLooper * 2)))
-            '        End If
+                If CheckBox2.Checked Then
+                    WriteHEX(LoadedROM, Int32.Parse(CurLvlUpAttPointer, System.Globalization.NumberStyles.HexNumber), MakeFreeSpaceString((CurAttacksLooper * 2)))
+                End If
 
-            '        CurPokeAttacksBuff = CurPokeAttacksBuff & "0000FF00"
+                CurPokeAttacksBuff = CurPokeAttacksBuff & "0000FF00"
 
-            '        newmovesoffset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(CurPokeAttacksBuff) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
+                newmovesoffset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(CurPokeAttacksBuff) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
 
-            '        WriteHEX(LoadedROM, (AttackTable) + (pokeloopcounter * 4), ReverseHEX(Hex((newmovesoffset) + &H8000000)))
+                WriteHEX(LoadedROM, (AttackTable) + (pokeloopcounter * 4), ReverseHEX(Hex((newmovesoffset) + &H8000000)))
 
-            '        WriteHEX(LoadedROM, newmovesoffset, CurPokeAttacksBuff)
+                WriteHEX(LoadedROM, newmovesoffset, CurPokeAttacksBuff)
 
-            '        pokeloopcounter = pokeloopcounter + 1
-            '    End While
+                pokeloopcounter = pokeloopcounter + 1
+            End While
 
-            '    'Write the routines
+            'Write the routines
 
-            '    Dim routine1 As String = "494689001148401800680F4E063637787900C9194318997854468C4203D0FF290BD00137F4E7084A01373770597809021878084310800249084702480047C04665EB030873EB030822400202" & ReverseHEX(Hex(AttackTable + &H8000000))
-            '    Dim routine2 As String = "8178FF22914225D01202FF32914600235800C0181949891909684718B8785446A04217DC7978387809020143404600930C1C00F017F8FF25009B484504D14046211C00F013F8009B0133032178188078A842DDD101B038BC9846A146AA46F0BC01BC0047F0B581B0024F3847F0B5024F3847C046B5E8030843EC0308" & ReverseHEX(Hex(AttackTable + &H8000000))
-            '    Dim routine3 As String = "6A0052190499501880780399171C0135AC46884249DC0024814214D00124644205982B4946186B46023B3D1C02330134032C08DC3068281802784078000210431A889042F2D1042C2FD1002454451CDA494608683818027841780902114302980288914211D00599194A8E18029B3D1C02330134544508DA3068281802784078000210431A889042F2D154450DD15046013082466200029952184C4620683818017840780002084310806546494608686900491909188878FF28A1D1504606B038BC9846A146AA46F0BC02BC0847C046" & ReverseHEX(Hex(AttackTable + &H8000000))
+            Dim routine1 As String = "294A4D46AB009D1828688078261C94465446A04221D0321C2B1C107801301070107841004018196840188178FF2901D100202AE0A142F0D11B4B49468C00E118164A1078096846008019401880785146161C9C46231C884216D1114A60461918307809684700C0194018417809020078084310803078013030701188404600F011F80004000C0090009801B038BC9846A146AA46F0BC02BC0847C046E8440202E24402022C910608" & ReverseHEX(Hex(AttackTable + &H8000000))
+            Dim routine2 As String = "1948A600801900688178FF2920D00023154837183868C018827851468A4217DC41780902007801430C1C4046009300F017F80E49009B884204D14046211C00F011F8009B03333868C0188078FF28DFD101B038BC9846A146AA46F0BC02BC084740910608D0940608" & ReverseHEX(Hex(AttackTable + &H8000000)) & "FFFFC046"
+            Dim routine3 As String = "00253C4EB9008A19136898780591FF2866D0914604936A0052190499501883780399171C0135AC468B424EDC00246946098843781B0200781843814211D005982C4946186B463D1C02330134032C08DC3068401941780902007808431A888242F2D1042C31D1002454451CDA49460868C019417809020078084302990A88824211D005991B4A8E18029B3D1C02330134544508DA3068401941780902007808431A888242F2D154450FD1504601300006000E82466200029952184C462068C019417809020078084310806546132D07DC494608686900491909188878FF289AD1504606B038BC9846A146AA46F0BC02BC0847C046" & ReverseHEX(Hex(AttackTable + &H8000000))
 
-            '    Dim routine1offset As String = ""
-            '    Dim routine2offset As String = ""
-            '    Dim routine3offset As String = ""
+            Dim routine3offset As String = ""
 
-            '    routine1offset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(routine1) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
+            WriteHEX(LoadedROM, &H69350, "1FD0294C")
+            WriteHEX(LoadedROM, &H69400, "000000000000000000000000000000000000000000000000000000000000000000000000")
 
-            '    WriteHEX(LoadedROM, routine1offset, routine1)
+            WriteHEX(LoadedROM, &H6935A, routine1)
 
-            '    WriteHEX(LoadedROM, &H3EB20, "18490847")
-            '    WriteHEX(LoadedROM, &H3EB84, ReverseHEX(Hex((routine1offset) + &H8000001)))
+            WriteHEX(LoadedROM, &H69300, "000000000000000000000000000000000000000000000000")
 
-            '    routine2offset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(routine2) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
+            WriteHEX(LoadedROM, &H69298, routine2)
 
-            '    WriteHEX(LoadedROM, routine2offset, routine2)
+            WriteHEX(LoadedROM, &H6E1F8, "000000000000000000000000")
 
-            '    WriteHEX(LoadedROM, &H3EA10, "00490847" & ReverseHEX(Hex((routine2offset) + &H8000001)))
+            WriteHEX(LoadedROM, &H6E100, routine3)
 
-            '    routine3offset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(routine3) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
-
-            '    WriteHEX(LoadedROM, routine3offset, routine3)
-
-            '    WriteHEX(LoadedROM, &H43CE8, "004A1047" & ReverseHEX(Hex((routine3offset) + &H8000001)))
 
             '    'Enable the hack in the ini file.
-            '    WriteString(GetINIFileLocation(), header, "MoveTableHack", "True")
+            WriteString(GetINIFileLocation(), header, "MoveTableHack", "True")
 
         End If
 
diff --git a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj
index e2a8397..3fdb257 100644
--- a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj
+++ b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj
@@ -8,9 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FB471B62-6663-4CEA-BC71-1DF4817B877F}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <StartupObject>GBAPokemonGameEditor.My.MyApplication</StartupObject>
-    <RootNamespace>GBAPokemonGameEditor</RootNamespace>
-    <AssemblyName>GBAPokemonGameEditor</AssemblyName>
+    <StartupObject>PokemonGameEditor.My.MyApplication</StartupObject>
+    <RootNamespace>PokemonGameEditor</RootNamespace>
+    <AssemblyName>PokemonGameEditor</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
@@ -43,7 +43,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>GBAPokemonGameEditor.xml</DocumentationFile>
+    <DocumentationFile>PokemonGameEditor.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
@@ -53,7 +53,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>GBAPokemonGameEditor.xml</DocumentationFile>
+    <DocumentationFile>PokemonGameEditor.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/GBAPokemonGameEditor/MainFrm.Designer.vb b/GBAPokemonGameEditor/MainFrm.Designer.vb
index 47f77d4..ea02511 100644
--- a/GBAPokemonGameEditor/MainFrm.Designer.vb
+++ b/GBAPokemonGameEditor/MainFrm.Designer.vb
@@ -654,7 +654,7 @@ Partial Class MainFrm
         Me.MaximizeBox = False
         Me.Name = "MainFrm"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-        Me.Text = "GBA Pokémon Game Editor"
+        Me.Text = "Pokémon Game Editor"
         Me.MenuStrip1.ResumeLayout(False)
         Me.MenuStrip1.PerformLayout()
         Me.GroupBox4.ResumeLayout(False)
diff --git a/GBAPokemonGameEditor/My Project/Application.Designer.vb b/GBAPokemonGameEditor/My Project/Application.Designer.vb
index 22a9d42..4fb33dd 100644
--- a/GBAPokemonGameEditor/My Project/Application.Designer.vb	
+++ b/GBAPokemonGameEditor/My Project/Application.Designer.vb	
@@ -32,12 +32,12 @@ Namespace My
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.GBAPokemonGameEditor.MainFrm
+            Me.MainForm = Global.PokemonGameEditor.MainFrm
         End Sub
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateSplashScreen()
-            Me.SplashScreen = Global.GBAPokemonGameEditor.SplashScreen1
+            Me.SplashScreen = Global.PokemonGameEditor.SplashScreen1
         End Sub
     End Class
 End Namespace
diff --git a/GBAPokemonGameEditor/My Project/Resources.Designer.vb b/GBAPokemonGameEditor/My Project/Resources.Designer.vb
index 45c8e37..b99b630 100644
--- a/GBAPokemonGameEditor/My Project/Resources.Designer.vb	
+++ b/GBAPokemonGameEditor/My Project/Resources.Designer.vb	
@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:4.0.30319.18408
+'     Runtime Version:4.0.30319.42000
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("GBAPokemonGameEditor.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("PokemonGameEditor.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan
diff --git a/GBAPokemonGameEditor/My Project/Settings.Designer.vb b/GBAPokemonGameEditor/My Project/Settings.Designer.vb
index a6878b9..0478b60 100644
--- a/GBAPokemonGameEditor/My Project/Settings.Designer.vb	
+++ b/GBAPokemonGameEditor/My Project/Settings.Designer.vb	
@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:4.0.30319.18408
+'     Runtime Version:4.0.30319.42000
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -64,9 +64,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.GBAPokemonGameEditor.My.MySettings
+        Friend ReadOnly Property Settings() As Global.PokemonGameEditor.My.MySettings
             Get
-                Return Global.GBAPokemonGameEditor.My.MySettings.Default
+                Return Global.PokemonGameEditor.My.MySettings.Default
             End Get
         End Property
     End Module
diff --git a/GBAPokemonGameEditor/SplashScreen1.resx b/GBAPokemonGameEditor/SplashScreen1.resx
index ef23015..0d395bc 100644
--- a/GBAPokemonGameEditor/SplashScreen1.resx
+++ b/GBAPokemonGameEditor/SplashScreen1.resx
@@ -165,7 +165,7 @@
         XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
         fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
         tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAA9UFJREFUeF7svQe4FUXW
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAA9UFJREFUeF7svQe4FUXW
         NdzVfS6COuOo44w553HMOSJJQUBECQZQFMxEkZyzqKgoJgQToiKKOWFAcpIcJEdRxDzqODPvO/tfa1fX
         uX0P1efeQxrne/9+nvX0OZ27umrXXrVDBeaKRyUNQb0ErnhkM5Q49nJs2+EYUgp85xTDXPbw5qj70DZD
         UAp855RAKc8XXPbgfxSmzpAccNu2g/+e+RFcOhh4QILaQC2g5j0S1LhLgov7SlCtpwSVu0hQsb0E57eR
diff --git a/GBAPokemonGameEditor/SplashScreen1.vb b/GBAPokemonGameEditor/SplashScreen1.vb
index 789eceb..369b6d9 100644
--- a/GBAPokemonGameEditor/SplashScreen1.vb
+++ b/GBAPokemonGameEditor/SplashScreen1.vb
@@ -6,7 +6,7 @@
 
     Private Sub SplashScreen1_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
 
-        My.Application.MinimumSplashScreenDisplayTime = 5000
+        My.Application.MinimumSplashScreenDisplayTime = 10000
 
         '    'Set up the dialog text at runtime according to the application's assembly information.  
 
@@ -35,5 +35,4 @@
         '    Copyright.Text = My.Application.Info.Copyright
     End Sub
 
-
 End Class
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
similarity index 61%
rename from GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application
rename to GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
index c333d4d..58a0031 100644
--- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="GBAPokemonGameEditor.application" version="3.3.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <description asmv2:publisher="GBAPokemonGameEditor" asmv2:product="GBAPokemonGameEditor" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="PokemonGameEditor.application" version="3.3.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <description asmv2:publisher="PokemonGameEditor" asmv2:product="PokemonGameEditor" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true">
-    <deploymentProvider codebase="http://gamer2020.0xrh.net/programs/GBAPokemonGameEditor/GBAPokemonGameEditor.application" />
+    <deploymentProvider codebase="http://gamer2020.0xrh.net/programs/GBAPokemonGameEditor/PokemonGameEditor.application" />
   </deployment>
   <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
     <framework targetVersion="4.0" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="GBAPokemonGameEditor.exe.manifest" size="4678">
-      <assemblyIdentity name="GBAPokemonGameEditor.exe" version="3.3.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+    <dependentAssembly dependencyType="install" codebase="PokemonGameEditor.exe.manifest" size="4660">
+      <assemblyIdentity name="PokemonGameEditor.exe" version="3.3.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <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>FREzo5Pr89tXmUxB9nB+ZUlCAIg=</dsig:DigestValue>
+        <dsig:DigestValue>yEKWVz5tA6qxZpILp8cDyoiS11w=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
similarity index 84%
rename from GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe
rename to GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
index dbc92b4..8645ad4 100644
Binary files a/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe differ
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.config b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.config
similarity index 100%
rename from GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.config
rename to GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.config
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
similarity index 85%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest
rename to GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
index 21bf6ea..6859004 100644
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="GBAPokemonGameEditor.exe" version="3.3.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+  <asmv1:assemblyIdentity name="PokemonGameEditor.exe" version="3.3.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
   <description asmv2:iconFile="icon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="GBAPokemonGameEditor" version="3.3.0.0" language="neutral" processorArchitecture="msil" />
-    <commandLine file="GBAPokemonGameEditor.exe" parameters="" />
+    <assemblyIdentity name="PokemonGameEditor" version="3.3.0.0" language="neutral" processorArchitecture="msil" />
+    <commandLine file="PokemonGameEditor.exe" parameters="" />
   </entryPoint>
   <trustInfo>
     <security>
@@ -43,26 +43,17 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="GBAPokemonGameEditor.exe" size="1469440">
-      <assemblyIdentity name="GBAPokemonGameEditor" version="3.3.0.0" language="neutral" processorArchitecture="msil" />
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="1475584">
+      <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>ijo0oxf8y8stOnffLBWwYQHF5YQ=</dsig:DigestValue>
+        <dsig:DigestValue>4wuWFhFZkW4jxmQebop8gflazw4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
-  <file name="GBAPokemonGameEditor.exe.config" size="183">
-    <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>zmtMKrAEuvsQh2jJFtlCNruBIWE=</dsig:DigestValue>
-    </hash>
-  </file>
   <file name="icon.ico" size="38078">
     <hash>
       <dsig:Transforms>
@@ -72,6 +63,15 @@
       <dsig:DigestValue>zSGVcEGIWr3V6kRbwOGSlYIDyTs=</dsig:DigestValue>
     </hash>
   </file>
+  <file name="PokemonGameEditor.exe.config" size="183">
+    <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>zmtMKrAEuvsQh2jJFtlCNruBIWE=</dsig:DigestValue>
+    </hash>
+  </file>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <!-- A list of all Windows versions that this application is designed to work with. Windows will automatically select the most compatible environment.-->
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
similarity index 61%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb
rename to GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
index 9f9dde5..a7685f4 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
similarity index 61%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application
rename to GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
index c333d4d..58a0031 100644
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="GBAPokemonGameEditor.application" version="3.3.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <description asmv2:publisher="GBAPokemonGameEditor" asmv2:product="GBAPokemonGameEditor" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="PokemonGameEditor.application" version="3.3.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <description asmv2:publisher="PokemonGameEditor" asmv2:product="PokemonGameEditor" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true">
-    <deploymentProvider codebase="http://gamer2020.0xrh.net/programs/GBAPokemonGameEditor/GBAPokemonGameEditor.application" />
+    <deploymentProvider codebase="http://gamer2020.0xrh.net/programs/GBAPokemonGameEditor/PokemonGameEditor.application" />
   </deployment>
   <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
     <framework targetVersion="4.0" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="GBAPokemonGameEditor.exe.manifest" size="4678">
-      <assemblyIdentity name="GBAPokemonGameEditor.exe" version="3.3.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+    <dependentAssembly dependencyType="install" codebase="PokemonGameEditor.exe.manifest" size="4660">
+      <assemblyIdentity name="PokemonGameEditor.exe" version="3.3.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <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>FREzo5Pr89tXmUxB9nB+ZUlCAIg=</dsig:DigestValue>
+        <dsig:DigestValue>yEKWVz5tA6qxZpILp8cDyoiS11w=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe
similarity index 100%
rename from GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe
rename to GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.config b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.config
new file mode 100644
index 0000000..3a327fa
--- /dev/null
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+    </startup>
+</configuration>
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
similarity index 85%
rename from GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest
rename to GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
index 21bf6ea..6859004 100644
--- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="GBAPokemonGameEditor.exe" version="3.3.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+  <asmv1:assemblyIdentity name="PokemonGameEditor.exe" version="3.3.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
   <description asmv2:iconFile="icon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="GBAPokemonGameEditor" version="3.3.0.0" language="neutral" processorArchitecture="msil" />
-    <commandLine file="GBAPokemonGameEditor.exe" parameters="" />
+    <assemblyIdentity name="PokemonGameEditor" version="3.3.0.0" language="neutral" processorArchitecture="msil" />
+    <commandLine file="PokemonGameEditor.exe" parameters="" />
   </entryPoint>
   <trustInfo>
     <security>
@@ -43,26 +43,17 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="GBAPokemonGameEditor.exe" size="1469440">
-      <assemblyIdentity name="GBAPokemonGameEditor" version="3.3.0.0" language="neutral" processorArchitecture="msil" />
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="1475584">
+      <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>ijo0oxf8y8stOnffLBWwYQHF5YQ=</dsig:DigestValue>
+        <dsig:DigestValue>4wuWFhFZkW4jxmQebop8gflazw4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
-  <file name="GBAPokemonGameEditor.exe.config" size="183">
-    <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>zmtMKrAEuvsQh2jJFtlCNruBIWE=</dsig:DigestValue>
-    </hash>
-  </file>
   <file name="icon.ico" size="38078">
     <hash>
       <dsig:Transforms>
@@ -72,6 +63,15 @@
       <dsig:DigestValue>zSGVcEGIWr3V6kRbwOGSlYIDyTs=</dsig:DigestValue>
     </hash>
   </file>
+  <file name="PokemonGameEditor.exe.config" size="183">
+    <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>zmtMKrAEuvsQh2jJFtlCNruBIWE=</dsig:DigestValue>
+    </hash>
+  </file>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <!-- A list of all Windows versions that this application is designed to work with. Windows will automatically select the most compatible environment.-->
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.xml b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.xml
similarity index 66%
rename from GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.xml
rename to GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.xml
index de45748..5e84171 100644
--- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.xml
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.xml
@@ -2,21 +2,21 @@
 <doc>
 <assembly>
 <name>
-GBAPokemonGameEditor
+PokemonGameEditor
 </name>
 </assembly>
 <members>
-<member name="T:GBAPokemonGameEditor.My.Resources.Resources">
+<member name="T:PokemonGameEditor.My.Resources.Resources">
 <summary>
   A strongly-typed resource class, for looking up localized strings, etc.
 </summary>
 </member>
-<member name="P:GBAPokemonGameEditor.My.Resources.Resources.ResourceManager">
+<member name="P:PokemonGameEditor.My.Resources.Resources.ResourceManager">
 <summary>
   Returns the cached ResourceManager instance used by this class.
 </summary>
 </member>
-<member name="P:GBAPokemonGameEditor.My.Resources.Resources.Culture">
+<member name="P:PokemonGameEditor.My.Resources.Resources.Culture">
 <summary>
   Overrides the current thread's CurrentUICulture property for all
   resource lookups using this strongly typed resource class.
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe
similarity index 84%
rename from GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe
rename to GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe
index dbc92b4..8645ad4 100644
Binary files a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe and b/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt
index 4705381..63c8cae 100644
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt
+++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt
@@ -145,34 +145,34 @@ C:\Users\JOSEWORK\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x8
 C:\Users\JOSEWORK\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.exe
 C:\Users\JOSEWORK\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.xml
 C:\Users\JOSEWORK\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.pdb
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\GBAPokemonGameEditor.exe.config
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\GBAPokemonGameEditor.exe.manifest
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\GBAPokemonGameEditor.application
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\GBAPokemonGameEditor.exe
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\GBAPokemonGameEditor.pdb
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\GBAPokemonGameEditor.xml
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.AbilityEdit.resources
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.AboutBox1.resources
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.AddOrRemovePrograms.resources
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.AttackEditor.resources
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.BattleFrontierEditor.resources
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.InputAttacks.resources
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.MainFrm.resources
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.movetutor2.resources
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.Resources.resources
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.PokedexDataEditor.resources
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.PokedexOrderEditor.resources
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.Pokemonedit.resources
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.RSEStarterEditor.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\PokemonGameEditor.exe.config
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\PokemonGameEditor.exe.manifest
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\PokemonGameEditor.application
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\PokemonGameEditor.exe
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\PokemonGameEditor.pdb
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\PokemonGameEditor.xml
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.AbilityEdit.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.AboutBox1.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.AddOrRemovePrograms.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.AttackEditor.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.AttackExpander.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.BattleFrontierEditor.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.InputAttacks.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.ItemEditor.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.MainFrm.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.movetutor2.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.Resources.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.PokedexDataEditor.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.PokedexOrderEditor.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.Pokemonedit.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.RSEStarterEditor.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.SplashScreen1.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.TMHMEditor.resources
 C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.vbproj.GenerateResource.Cache
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.TrustInfo.xml
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.exe.manifest
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.application
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.exe
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.xml
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.pdb
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.TMHMEditor.resources
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.ItemEditor.resources
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.AttackExpander.resources
-C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.SplashScreen1.resources
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.TrustInfo.xml
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.exe.manifest
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.application
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.exe
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.xml
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.pdb
+C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
index fcba155..5b1d4f4 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/GBAPokemonGameEditor.AbilityEdit.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.AbilityEdit.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.AbilityEdit.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.AbilityEdit.resources
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.AboutBox1.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.AboutBox1.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.AboutBox1.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.AboutBox1.resources
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.AddOrRemovePrograms.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.AddOrRemovePrograms.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.AddOrRemovePrograms.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.AddOrRemovePrograms.resources
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.AttackEditor.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.AttackEditor.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.AttackEditor.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.AttackEditor.resources
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.AttackExpander.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.AttackExpander.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.AttackExpander.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.AttackExpander.resources
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.BattleFrontierEditor.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.BattleFrontierEditor.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.BattleFrontierEditor.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.BattleFrontierEditor.resources
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.InputAttacks.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.InputAttacks.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.InputAttacks.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.InputAttacks.resources
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.ItemEditor.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.ItemEditor.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.ItemEditor.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.ItemEditor.resources
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.MainFrm.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.MainFrm.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.MainFrm.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.MainFrm.resources
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.PokedexDataEditor.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.PokedexDataEditor.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.PokedexDataEditor.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.PokedexDataEditor.resources
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.PokedexOrderEditor.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.PokedexOrderEditor.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.PokedexOrderEditor.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.PokedexOrderEditor.resources
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.Pokemonedit.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.Pokemonedit.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.Pokemonedit.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.Pokemonedit.resources
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.RSEStarterEditor.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.RSEStarterEditor.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.RSEStarterEditor.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.RSEStarterEditor.resources
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.Resources.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.Resources.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.Resources.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.Resources.resources
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.SplashScreen1.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.SplashScreen1.resources
similarity index 99%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.SplashScreen1.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.SplashScreen1.resources
index b0400cb..7044f22 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.SplashScreen1.resources and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.SplashScreen1.resources differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.TMHMEditor.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.TMHMEditor.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.TMHMEditor.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.TMHMEditor.resources
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.TrustInfo.xml b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.TrustInfo.xml
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.TrustInfo.xml
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.TrustInfo.xml
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
new file mode 100644
index 0000000..58a0031
--- /dev/null
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
+  <assemblyIdentity name="PokemonGameEditor.application" version="3.3.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <description asmv2:publisher="PokemonGameEditor" asmv2:product="PokemonGameEditor" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <deployment install="true" mapFileExtensions="true">
+    <deploymentProvider codebase="http://gamer2020.0xrh.net/programs/GBAPokemonGameEditor/PokemonGameEditor.application" />
+  </deployment>
+  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
+    <framework targetVersion="4.0" profile="Full" supportedRuntime="4.0.30319" />
+  </compatibleFrameworks>
+  <dependency>
+    <dependentAssembly dependencyType="install" codebase="PokemonGameEditor.exe.manifest" size="4660">
+      <assemblyIdentity name="PokemonGameEditor.exe" version="3.3.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+      <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>yEKWVz5tA6qxZpILp8cDyoiS11w=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+</asmv1:assembly>
\ No newline at end of file
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
similarity index 84%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
index dbc92b4..8645ad4 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.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
new file mode 100644
index 0000000..6859004
--- /dev/null
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
+  <asmv1:assemblyIdentity name="PokemonGameEditor.exe" version="3.3.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+  <description asmv2:iconFile="icon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <application />
+  <entryPoint>
+    <assemblyIdentity name="PokemonGameEditor" version="3.3.0.0" language="neutral" processorArchitecture="msil" />
+    <commandLine file="PokemonGameEditor.exe" parameters="" />
+  </entryPoint>
+  <trustInfo>
+    <security>
+      <applicationRequestMinimum>
+        <PermissionSet version="1" class="System.Security.NamedPermissionSet" Name="LocalIntranet" Description="Default rights given to applications on the local intranet" Unrestricted="true" ID="Custom" SameSite="site" />
+        <defaultAssemblyRequest permissionSetReference="Custom" />
+      </applicationRequestMinimum>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+            If you want to change the Windows User Account Control level replace the 
+            requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel node will disable file and registry virtualization.
+            If you want to utilize File and Registry Virtualization for backward 
+            compatibility then delete the requestedExecutionLevel node.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentOS>
+      <osVersionInfo>
+        <os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
+      </osVersionInfo>
+    </dependentOS>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
+      <assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="1475584">
+      <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>4wuWFhFZkW4jxmQebop8gflazw4=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <file name="icon.ico" size="38078">
+    <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>zSGVcEGIWr3V6kRbwOGSlYIDyTs=</dsig:DigestValue>
+    </hash>
+  </file>
+  <file name="PokemonGameEditor.exe.config" size="183">
+    <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>zmtMKrAEuvsQh2jJFtlCNruBIWE=</dsig:DigestValue>
+    </hash>
+  </file>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of all Windows versions that this application is designed to work with. Windows will automatically select the most compatible environment.-->
+      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
+    </application>
+  </compatibility>
+</asmv1:assembly>
\ No newline at end of file
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.movetutor2.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.movetutor2.resources
similarity index 100%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.movetutor2.resources
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.movetutor2.resources
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
similarity index 61%
rename from GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
index 9f9dde5..a7685f4 100644
Binary files a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.xml b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.xml
similarity index 66%
rename from GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.xml
rename to GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.xml
index de45748..5e84171 100644
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.xml
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.xml
@@ -2,21 +2,21 @@
 <doc>
 <assembly>
 <name>
-GBAPokemonGameEditor
+PokemonGameEditor
 </name>
 </assembly>
 <members>
-<member name="T:GBAPokemonGameEditor.My.Resources.Resources">
+<member name="T:PokemonGameEditor.My.Resources.Resources">
 <summary>
   A strongly-typed resource class, for looking up localized strings, etc.
 </summary>
 </member>
-<member name="P:GBAPokemonGameEditor.My.Resources.Resources.ResourceManager">
+<member name="P:PokemonGameEditor.My.Resources.Resources.ResourceManager">
 <summary>
   Returns the cached ResourceManager instance used by this class.
 </summary>
 </member>
-<member name="P:GBAPokemonGameEditor.My.Resources.Resources.Culture">
+<member name="P:PokemonGameEditor.My.Resources.Resources.Culture">
 <summary>
   Overrides the current thread's CurrentUICulture property for all
   resource lookups using this strongly typed resource class.
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll b/GBAPokemonGameEditor/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll
index fed11b3..43bc4f5 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll and b/GBAPokemonGameEditor/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll differ