Pokemon Sprite Imports - Efficient

Added checkbox to allow efficient data import. (It takes the output string into an array, and checks it againtsevery move. Only searching for free space in folders with no other foles.
2026-04-24 07:06:58 -05:00 · 2018-08-04 02:11:31 -04:00 · 2018-08-04 02:11:31 -04:00 · f610b0b64c
commit f610b0b64c
parent 3aebedf721
18 changed files with 223 additions and 64 deletions
--- a/.vs/GBAPokemonGameEditor/v15/.suo
+++ b/.vs/GBAPokemonGameEditor/v15/.suo
--- a/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide
+++ b/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide
--- a/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-shm
+++ b/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-shm
--- a/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-wal
+++ b/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-wal
--- a/GBAPokemonGameEditor/ChangeImageFunctions.vb
+++ b/GBAPokemonGameEditor/ChangeImageFunctions.vb
@ -10,8 +10,8 @@ Module ChangeImageFunctions
        Dim ImgBytes As Byte()
        Dim PalBytes As Byte()

-        Dim ImgNewOffset As String
-        Dim PalNewOffset As String
+        Dim ImgNewOffset As String = ""
+        Dim PalNewOffset As String = ""

        ImgBytes = ConvertStringToByteArray(CompressLz77String(ConvertByteArrayToString(Sprite)))
        PalBytes = ConvertStringToByteArray(CompressLz77String(ConvertPaletteToString(pallete)))
@ -19,16 +19,51 @@ Module ChangeImageFunctions
        ImgString = ByteArrayToHexString(ImgBytes)
        PalString = ByteArrayToHexString(PalBytes)

-        ImgNewOffset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(ImgString) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
+        Dim alreadyInsertedPic As Boolean = False
+        Dim alreadyInsertedPal As Boolean = False
+        If Pokemonedit.CheckBox1.Checked Then
+            If Pokemonedit.PicStrings.Count > 0 Then
+                Dim countNum As Integer = 0
+                For Each oldPic As String In Pokemonedit.PicStrings
+                    If String.Compare(ImgString, oldPic) = 0 Then
+                        alreadyInsertedPic = True
+                        ImgNewOffset = Pokemonedit.PicOffsets(countNum)
+                        Exit For
+                    End If

-        WriteHEX(LoadedROM, ImgNewOffset, ImgString)
+                    countNum += 1
+                Next
+            End If
+
+            If Pokemonedit.PicStrings.Count > 0 Then
+                Dim countNum As Integer = 0
+                For Each oldPal As String In Pokemonedit.PalStrings
+                    If String.Compare(PalString, oldPal) = 0 Then
+                        alreadyInsertedPal = True
+                        PalNewOffset = Pokemonedit.PalOffsets(countNum)
+                        Exit For
+                    End If
+
+                    countNum += 1
+                Next
+            End If
+        End If
+
+
+        If Not alreadyInsertedPic Then
+            ImgNewOffset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(ImgString) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
+            Pokemonedit.PicStrings.Add(ImgString)
+            Pokemonedit.PicOffsets.Add(ImgNewOffset)
+            WriteHEX(LoadedROM, ImgNewOffset, ImgString)
+        End If
+        If Not alreadyInsertedPal Then
+            PalNewOffset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(PalString) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
+            Pokemonedit.PalStrings.Add(PalString)
+            Pokemonedit.PalOffsets.Add(PalNewOffset)
+            WriteHEX(LoadedROM, PalNewOffset, PalString)
+        End If

        WriteHEX(LoadedROM, sOffset, ReverseHEX(Hex((ImgNewOffset) + &H8000000)))
-
-        PalNewOffset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(PalString) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
-
-        WriteHEX(LoadedROM, PalNewOffset, PalString)
-
        WriteHEX(LoadedROM, pOffset, ReverseHEX(Hex((PalNewOffset) + &H8000000)))

    End Sub
@ -43,8 +78,8 @@ Module ChangeImageFunctions
        Dim ImgBytes As Byte()
        Dim PalBytes As Byte()

-        Dim ImgNewOffset As String
-        Dim PalNewOffset As String
+        Dim ImgNewOffset As String = ""
+        Dim PalNewOffset As String = ""

        ImgBytes = ConvertStringToByteArray(CompressLz77String(ConvertByteArrayToString(Sprite)))
        PalBytes = ConvertStringToByteArray(CompressLz77String(ConvertPaletteToString(pallete)))
@ -52,16 +87,51 @@ Module ChangeImageFunctions
        ImgString = ByteArrayToHexString(ImgBytes)
        PalString = ByteArrayToHexString(PalBytes)

-        ImgNewOffset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(ImgString) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
+        Dim alreadyInsertedPic As Boolean = False
+        Dim alreadyInsertedPal As Boolean = False
+        If Pokemonedit.CheckBox1.Checked Then
+            If Pokemonedit.PicStrings.Count > 0 Then
+                Dim countNum As Integer = 0
+                For Each oldPic As String In Pokemonedit.PicStrings
+                    If String.Compare(ImgString, oldPic) = 0 Then
+                        alreadyInsertedPic = True
+                        ImgNewOffset = Pokemonedit.PicOffsets(countNum)
+                        Exit For
+                    End If

-        WriteHEX(LoadedROM, ImgNewOffset, ImgString)
+                    countNum += 1
+                Next
+            End If
+
+            If Pokemonedit.PicStrings.Count > 0 Then
+                Dim countNum As Integer = 0
+                For Each oldPal As String In Pokemonedit.PalStrings
+                    If String.Compare(PalString, oldPal) = 0 Then
+                        alreadyInsertedPal = True
+                        PalNewOffset = Pokemonedit.PalOffsets(countNum)
+                        Exit For
+                    End If
+
+                    countNum += 1
+                Next
+            End If
+        End If
+
+
+        If Not alreadyInsertedPic Then
+            ImgNewOffset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(ImgString) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
+            Pokemonedit.PicStrings.Add(ImgString)
+            Pokemonedit.PicOffsets.Add(ImgNewOffset)
+            WriteHEX(LoadedROM, ImgNewOffset, ImgString)
+        End If
+        If Not alreadyInsertedPal Then
+            PalNewOffset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(PalString) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
+            Pokemonedit.PalStrings.Add(PalString)
+            Pokemonedit.PalOffsets.Add(PalNewOffset)
+            WriteHEX(LoadedROM, PalNewOffset, PalString)
+        End If

        WriteHEX(LoadedROM, sOffset, ReverseHEX(Hex((ImgNewOffset) + &H8000000)))
-
-        PalNewOffset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(PalString) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
-
-        WriteHEX(LoadedROM, PalNewOffset, PalString)
-
        WriteHEX(LoadedROM, pOffset, ReverseHEX(Hex((PalNewOffset) + &H8000000)))

    End Sub
--- a/GBAPokemonGameEditor/ImportDataFunctions.vb
+++ b/GBAPokemonGameEditor/ImportDataFunctions.vb
@ -54,7 +54,7 @@ Module ImportDataFunctions
        Dim FrontAnimationTable As String = ""
        Dim BackAnimTable As String = ""
        Dim AnimDelayTable As String = ""
-
+        Dim EggMoveList As String = ""

        'Load data

@ -113,7 +113,7 @@ Module ImportDataFunctions
        NationalDexNumber = GetString(INIFileName, "Pokemon", "NationalDexNumber", "0")
        SecondDexNumber = GetString(INIFileName, "Pokemon", "SecondDexNumber", "0")

-        If NationalDexNumber < (GetString(GetINIFileLocation(), header, "NumberOfDexEntries", "")) And NationalDexNumber <> 0 Then
+        If Int32.Parse(NationalDexNumber) < Int32.Parse(GetString(GetINIFileLocation(), header, "NumberOfDexEntries", "")) And NationalDexNumber <> 0 Then
            PokedexDescription = Asc2Sapp(GetString(INIFileName, "Pokemon", "PokedexDescription", "Description\x")) & " "
            Hght = GetString(INIFileName, "Pokemon", "Hght", "1")
            Wght = GetString(INIFileName, "Pokemon", "Wght", "1")
@ -138,9 +138,28 @@ Module ImportDataFunctions

        WriteHEX(LoadedROM, (Int32.Parse((GetString(GetINIFileLocation(), header, "PokemonEvolutions", "")), System.Globalization.NumberStyles.HexNumber)) + ((PokemonIndex) * (8 * (GetString(GetINIFileLocation(), header, "NumberOfEvolutionsPerPokemon", "")))), EvolutionData)

-        lvlupattacksoffset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(lvlupattacks) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
+        Dim alreadyInsertedAtk As Boolean = False
+        If Pokemonedit.CheckBox1.Checked Then
+            If Pokemonedit.AtkStrings.Count > 0 Then
+                Dim countNum As Integer = 0
+                For Each oldAtk As String In Pokemonedit.AtkStrings
+                    If String.Compare(lvlupattacks, oldAtk) = 0 Then
+                        alreadyInsertedAtk = True
+                        lvlupattacksoffset = Pokemonedit.AtkOffsets(countNum)
+                        Exit For
+                    End If

-        WriteHEX(LoadedROM, lvlupattacksoffset, lvlupattacks)
+                    countNum += 1
+                Next
+            End If
+        End If
+
+        If Not alreadyInsertedAtk Then
+            lvlupattacksoffset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(lvlupattacks) / 2)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
+            Pokemonedit.AtkStrings.Add(lvlupattacks)
+            Pokemonedit.AtkOffsets.Add(lvlupattacksoffset)
+            WriteHEX(LoadedROM, lvlupattacksoffset, lvlupattacks)
+        End If

        WriteHEX(LoadedROM, (Int32.Parse((GetString(GetINIFileLocation(), header, "PokemonAttackTable", "")), System.Globalization.NumberStyles.HexNumber)) + (PokemonIndex * 4), ReverseHEX(Hex(((lvlupattacksoffset)) + &H8000000)))

@ -150,7 +169,7 @@ Module ImportDataFunctions

        WriteHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "TMHMCompatibility", "")), System.Globalization.NumberStyles.HexNumber) + (PokemonIndex * (Val(GetString(GetINIFileLocation(), header, "TMHMLenPerPoke", "")))), TMHMCompatibility)

-        If NationalDexNumber < (GetString(GetINIFileLocation(), header, "NumberOfDexEntries", "")) And NationalDexNumber <> 0 Then
+        If Int32.Parse(NationalDexNumber) < Int32.Parse(GetString(GetINIFileLocation(), header, "NumberOfDexEntries", "")) And NationalDexNumber <> 0 Then

            If header2 = "AXP" Or header2 = "AXV" Then

@ -196,16 +215,36 @@ Module ImportDataFunctions
                WriteHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "PokedexData", "")), System.Globalization.NumberStyles.HexNumber) + 26 + (NationalDexNumber * SkipVar), ReverseHEX(VB.Right("0000" & Hex(Scale2), 4)))
                WriteHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "PokedexData", "")), System.Globalization.NumberStyles.HexNumber) + 28 + (NationalDexNumber * SkipVar), ReverseHEX(VB.Right("0000" & Hex(Offset_2), 4)))

+                Dim alreadyInserted As Boolean = False
+                If Pokemonedit.CheckBox1.Checked Then
+                    Dim countNum As Integer = 0
+                    If Pokemonedit.DexDescps.Count > 0 Then
+                        For Each desc As String In Pokemonedit.DexDescps
+                            If String.Compare(PokedexDescription, desc) = 0 Then
+                                alreadyInserted = True
+                                PokedexDescriptionOff = Pokemonedit.DexOffsets(countNum)
+                            End If

-                PokedexDescriptionOff = SearchFreeSpaceFourAligned(LoadedROM, &HFF, (Len(PokedexDescription)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))
+                            countNum += 1
+                        Next
+                    End If
+                End If

-                FileNum = FreeFile()

-                FileOpen(FileNum, LoadedROM, OpenMode.Binary)
+                If Not alreadyInserted Then
+                    PokedexDescriptionOff = SearchFreeSpaceFourAligned(LoadedROM, &HFF, (Len(PokedexDescription)), "&H" & GetString(GetINIFileLocation(), header, "StartSearchingForSpaceOffset", "800000"))

-                FilePut(FileNum, PokedexDescription, ("&H" & Hex(PokedexDescriptionOff)) + 1, False)
+                    Pokemonedit.DexDescps.Add(PokedexDescription)
+                    Pokemonedit.DexOffsets.Add(PokedexDescriptionOff)

-                FileClose(FileNum)
+                    FileNum = FreeFile()
+
+                    FileOpen(FileNum, LoadedROM, OpenMode.Binary)
+
+                    FilePut(FileNum, PokedexDescription, ("&H" & Hex(PokedexDescriptionOff)) + 1, False)
+
+                    FileClose(FileNum)
+                End If

                WriteHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "PokedexData", "")), System.Globalization.NumberStyles.HexNumber) + 4 + 12 + (NationalDexNumber * SkipVar), ReverseHEX(Hex(Val("&H" & (Hex(PokedexDescriptionOff))) + &H8000000)))

--- a/GBAPokemonGameEditor/Pokemonedit.Designer.vb
+++ b/GBAPokemonGameEditor/Pokemonedit.Designer.vb
@ -44,6 +44,7 @@ Partial Class Pokemonedit
        Me.Button5 = New System.Windows.Forms.Button()
        Me.FootPrintPointer = New System.Windows.Forms.TextBox()
        Me.GroupBox16 = New System.Windows.Forms.GroupBox()
+        Me.Button40 = New System.Windows.Forms.Button()
        Me.Button22 = New System.Windows.Forms.Button()
        Me.Button21 = New System.Windows.Forms.Button()
        Me.IconPicBox = New System.Windows.Forms.PictureBox()
@ -226,7 +227,6 @@ Partial Class Pokemonedit
        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
        Me.Clr1 = New System.Windows.Forms.ComboBox()
        Me.TabPage6 = New System.Windows.Forms.TabPage()
-        Me.Button43 = New System.Windows.Forms.Button()
        Me.GroupBox35 = New System.Windows.Forms.GroupBox()
        Me.Button35 = New System.Windows.Forms.Button()
        Me.Button36 = New System.Windows.Forms.Button()
@ -284,8 +284,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.Button40 = New System.Windows.Forms.Button()
        Me.Button41 = New System.Windows.Forms.Button()
+        Me.CheckBox1 = New System.Windows.Forms.CheckBox()
        Me.TabControl1.SuspendLayout()
        Me.TabPage1.SuspendLayout()
        Me.GroupBox26.SuspendLayout()
@ -599,6 +599,16 @@ Partial Class Pokemonedit
        Me.GroupBox16.TabStop = False
        Me.GroupBox16.Text = "Icons"
        '
+        'Button40
+        '
+        Me.Button40.Location = New System.Drawing.Point(118, 195)
+        Me.Button40.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.Button40.Name = "Button40"
+        Me.Button40.Size = New System.Drawing.Size(87, 39)
+        Me.Button40.TabIndex = 15
+        Me.Button40.Text = "Imp/Rep"
+        Me.Button40.UseVisualStyleBackColor = True
+        '
        'Button22
        '
        Me.Button22.Location = New System.Drawing.Point(22, 240)
@ -2547,7 +2557,6 @@ Partial Class Pokemonedit
        '
        'TabPage6
        '
-        Me.TabPage6.Controls.Add(Me.Button43)
        Me.TabPage6.Controls.Add(Me.GroupBox35)
        Me.TabPage6.Controls.Add(Me.GroupBox34)
        Me.TabPage6.Controls.Add(Me.GroupBox21)
@ -2560,16 +2569,6 @@ Partial Class Pokemonedit
        Me.TabPage6.Text = "Cry Data"
        Me.TabPage6.UseVisualStyleBackColor = True
        '
-        'Button43
-        '
-        Me.Button43.Location = New System.Drawing.Point(19, 682)
-        Me.Button43.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
-        Me.Button43.Name = "Button43"
-        Me.Button43.Size = New System.Drawing.Size(237, 41)
-        Me.Button43.TabIndex = 29
-        Me.Button43.Text = "Import And Repoint All"
-        Me.Button43.UseVisualStyleBackColor = True
-        '
        'GroupBox35
        '
        Me.GroupBox35.Controls.Add(Me.Button35)
@ -3133,7 +3132,6 @@ Partial Class Pokemonedit
        '
        'Button39
        '
-        Me.Button39.Enabled = False
        Me.Button39.Location = New System.Drawing.Point(12, 720)
        Me.Button39.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.Button39.Name = "Button39"
@ -3142,16 +3140,6 @@ Partial Class Pokemonedit
        Me.Button39.Text = "Import All Cries"
        Me.Button39.UseVisualStyleBackColor = True
        '
-        'Button40
-        '
-        Me.Button40.Location = New System.Drawing.Point(118, 195)
-        Me.Button40.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.Button40.Name = "Button40"
-        Me.Button40.Size = New System.Drawing.Size(87, 39)
-        Me.Button40.TabIndex = 15
-        Me.Button40.Text = "Imp/Rep"
-        Me.Button40.UseVisualStyleBackColor = True
-        '
        'Button41
        '
        Me.Button41.Location = New System.Drawing.Point(154, 592)
@ -3162,11 +3150,22 @@ Partial Class Pokemonedit
        Me.Button41.Text = "Rep."
        Me.Button41.UseVisualStyleBackColor = True
        '
+        'CheckBox1
+        '
+        Me.CheckBox1.AutoSize = True
+        Me.CheckBox1.Location = New System.Drawing.Point(12, 788)
+        Me.CheckBox1.Name = "CheckBox1"
+        Me.CheckBox1.Size = New System.Drawing.Size(151, 24)
+        Me.CheckBox1.TabIndex = 23
+        Me.CheckBox1.Text = "Efficient Imports"
+        Me.CheckBox1.UseVisualStyleBackColor = True
+        '
        'Pokemonedit
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(1173, 862)
+        Me.Controls.Add(Me.CheckBox1)
        Me.Controls.Add(Me.Button41)
        Me.Controls.Add(Me.Button38)
        Me.Controls.Add(Me.Button39)
@ -3286,6 +3285,7 @@ Partial Class Pokemonedit
        Me.GroupBox19.ResumeLayout(False)
        Me.GroupBox19.PerformLayout()
        Me.ResumeLayout(False)
+        Me.PerformLayout()

    End Sub
    Friend WithEvents TabControl1 As System.Windows.Forms.TabControl
@ -3548,7 +3548,7 @@ Partial Class Pokemonedit
    Friend WithEvents Label59 As System.Windows.Forms.Label
    Friend WithEvents TextBox8 As System.Windows.Forms.TextBox
    Friend WithEvents Label58 As System.Windows.Forms.Label
-    Friend WithEvents Button43 As Button
    Friend WithEvents Button40 As Button
    Friend WithEvents Button41 As Button
+    Friend WithEvents CheckBox1 As CheckBox
 End Class
--- a/GBAPokemonGameEditor/Pokemonedit.vb
+++ b/GBAPokemonGameEditor/Pokemonedit.vb
@ -36,6 +36,15 @@ Public Class Pokemonedit
    Dim Tab5LoadedMon As Integer
    Dim Tab6LoadedMon As Integer

+    Public Shared PicStrings As List(Of String)
+    Public Shared PicOffsets As List(Of String)
+    Public Shared PalStrings As List(Of String)
+    Public Shared PalOffsets As List(Of String)
+    Public Shared DexDescps As List(Of String)
+    Public Shared DexOffsets As List(Of String)
+    Public Shared AtkStrings As List(Of String)
+    Public Shared AtkOffsets As List(Of String)
+
    Private Sub Pokemonedit_FormClosed(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosedEventArgs) Handles Me.FormClosed
        MainFrm.Visible = True
    End Sub
@ -177,6 +186,23 @@ Public Class Pokemonedit
        PKMNames.SelectedIndex = 0

        Me.Cursor = Cursors.Arrow
+
+        PicStrings = New List(Of String)
+        PicOffsets = New List(Of String)
+        PalStrings = New List(Of String)
+        PalOffsets = New List(Of String)
+        DexDescps = New List(Of String)
+        DexOffsets = New List(Of String)
+        AtkStrings = New List(Of String)
+        AtkOffsets = New List(Of String)
+
+        Tab1LoadedMon = PKMNames.SelectedIndex + 1
+        Tab2LoadedMon = -1
+        Tab3LoadedMon = -1
+        Tab4LoadedMon = -1
+        Tab5LoadedMon = -1
+        Tab6LoadedMon = -1
+
    End Sub


@ -854,8 +880,6 @@ Public Class Pokemonedit

        EvoData = Int32.Parse((GetString(GetINIFileLocation(), header, "PokemonEvolutions", "")), System.Globalization.NumberStyles.HexNumber)

-
-
        'Reset the evolution stuff!

        EvoTypes.SelectedIndex = -1
@ -1086,7 +1110,11 @@ Public Class Pokemonedit
        If GetString(AppPath & "GBAPGESettings.ini", "Settings", "DisablePKMImages", "0") = "0" Then

            If EvoPKMNames.SelectedIndex + 1 > 0 Then
+                EvoPokePic.Invalidate()
+
                GetAndDrawFrontPokemonPic(EvoPokePic, EvoPKMNames.SelectedIndex + 1)
+
+                EvoPokePic.Update()
            Else
                EvoPokePic.Image = Nothing
            End If
@ -1095,6 +1123,8 @@ Public Class Pokemonedit

    Private Sub EvoItem_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles EvoItem.SelectedIndexChanged
        If EvoItem.SelectedIndex > -1 Then
+            EvoItemPic.Invalidate()
+
            If header2 = "BPR" Or header2 = "BPG" Then

                GetAndDrawItemPic(EvoItemPic, EvoItem.SelectedIndex)
@ -1109,6 +1139,7 @@ Public Class Pokemonedit

            End If

+            EvoItemPic.Update()
        Else
            EvoItemPic.Image = Nothing
        End If
@ -4067,9 +4098,15 @@ Public Class Pokemonedit

        ElseIf TabControl1.SelectedTab Is TabPage3 And Not Tab3LoadedMon = PKMNames.SelectedIndex + 1 Then

+            EvoItemPic.Invalidate()
+            EvoItemPic.Invalidate()
+            EvoItemPic.Update()
+            EvoItemPic.Update()
+
            Tab3LoadedMon = PKMNames.SelectedIndex + 1

        ElseIf TabControl1.SelectedTab Is TabPage4 And Not Tab4LoadedMon = PKMNames.SelectedIndex + 1 Then
+            lvlupattacks.BeginUpdate()

            TMHMCOMLoad()

@ -4079,12 +4116,27 @@ Public Class Pokemonedit

            lvlupattacks.SelectedIndex = 0

+            TMHMCom.Invalidate()
+            MTCom.Invalidate()
+            LvlUpAttPointer.Invalidate()
+
+            TMHMCom.Update()
+            MTCom.Update()
+            LvlUpAttPointer.Update()
+            lvlupattacks.EndUpdate()
+
+            lvlupattacks.Invalidate()
+            lvlupattacks.Update()
+
            Tab4LoadedMon = PKMNames.SelectedIndex + 1

        ElseIf TabControl1.SelectedTab Is TabPage5 And Not Tab5LoadedMon = PKMNames.SelectedIndex + 1 Then
+            Description1.Invalidate()

            LoadDexData()

+            Description1.Update()
+
            Tab5LoadedMon = PKMNames.SelectedIndex + 1

        End If
@ -4135,7 +4187,7 @@ Public Class Pokemonedit
        'Me.Enabled = True
    End Sub

-    Private Sub Button43_Click(sender As Object, e As EventArgs) Handles Button43.Click
+    Private Sub Button39_Click(sender As Object, e As EventArgs) Handles Button39.Click
        FolderBrowserDialog.Description = "Select folder to import cries from:"


@ -4324,8 +4376,6 @@ Public Class Pokemonedit

                LoopVar = LoopVar + 1

-
-
                If System.IO.File.Exists(FolderBrowserDialog.SelectedPath & "\" & LoopVar & ".png") Then
                    ImportPokemonIconNewOffset(FolderBrowserDialog.SelectedPath & "\" & LoopVar & ".png", LoopVar)
                ElseIf System.IO.File.Exists(FolderBrowserDialog.SelectedPath & "\" & VB.Right("000" & LoopVar, 3) & ".png") And LoopVar < 1000 Then
--- 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>IJqIfSj+q2GUE9RHzIIJXL8gGMj3fvFMRuhAIcubK70=</dsig:DigestValue>
+        <dsig:DigestValue>ePjmzcNYEee7PIv5KUrfLfCHzbaq5HIYsgdotH5ZvR8=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
@ -43,14 +43,14 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2094592">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2096640">
      <assemblyIdentity name="PokemonGameEditor" version="3.8.1.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>dyCtcOu7k0Fu/5vfcAW1cfLkzpItbrnKPzpDivRuhK8=</dsig:DigestValue>
+        <dsig:DigestValue>vVjxd+Xyi+P07L43P8QiG5Ey5gPdrYAVcbgxWCRSQzM=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
--- a/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe
+++ b/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
+++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
@ -16,7 +16,7 @@
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>IJqIfSj+q2GUE9RHzIIJXL8gGMj3fvFMRuhAIcubK70=</dsig:DigestValue>
+        <dsig:DigestValue>ePjmzcNYEee7PIv5KUrfLfCHzbaq5HIYsgdotH5ZvR8=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
@ -43,14 +43,14 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2094592">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2096640">
      <assemblyIdentity name="PokemonGameEditor" version="3.8.1.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>dyCtcOu7k0Fu/5vfcAW1cfLkzpItbrnKPzpDivRuhK8=</dsig:DigestValue>
+        <dsig:DigestValue>vVjxd+Xyi+P07L43P8QiG5Ey5gPdrYAVcbgxWCRSQzM=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb