Icon Palette Expansion Fix and Egg Move Editor Update

Added further support for expanded icon palettes. If a rom uses icon palettes repointed to multiple locations, add the line 'IconPointerTable2 = x' where x is the offset for the table of pointers to each palette. Also, the egg move editor is mid-update. It should still work as long as you don't expand the table and save, as there is no repointing functionality yet. I will be adding that soon hopefully. NOTE: No changes are made to the egg move table until you hit save.
2026-04-22 16:27:22 -05:00 · 2018-12-01 15:45:03 -05:00 · 2018-12-01 15:45:03 -05:00 · e104a8a0f2
commit e104a8a0f2
parent 583e47eeae
18 changed files with 294 additions and 72 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/EggMoveEditor.Designer.vb
+++ b/GBAPokemonGameEditor/EggMoveEditor.Designer.vb
@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class EggMoveEditor
    Inherits System.Windows.Forms.Form

    'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
        Try
            If disposing AndAlso components IsNot Nothing Then
@ -20,7 +20,7 @@ Partial Class EggMoveEditor
    'NOTE: The following procedure is required by the Windows Form Designer
    'It can be modified using the Windows Form Designer.  
    'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(EggMoveEditor))
        Me.ListBox1 = New System.Windows.Forms.ListBox()
@ -29,31 +29,40 @@ Partial Class EggMoveEditor
        Me.ComboBox1 = New System.Windows.Forms.ComboBox()
        Me.ComboBox2 = New System.Windows.Forms.ComboBox()
        Me.FrntPic = New System.Windows.Forms.PictureBox()
+        Me.Button3 = New System.Windows.Forms.Button()
+        Me.Button4 = New System.Windows.Forms.Button()
+        Me.Button5 = New System.Windows.Forms.Button()
+        Me.Button6 = New System.Windows.Forms.Button()
        CType(Me.FrntPic, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'ListBox1
        '
        Me.ListBox1.FormattingEnabled = True
-        Me.ListBox1.Location = New System.Drawing.Point(12, 12)
+        Me.ListBox1.ItemHeight = 20
+        Me.ListBox1.Location = New System.Drawing.Point(18, 18)
+        Me.ListBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.ListBox1.Name = "ListBox1"
-        Me.ListBox1.Size = New System.Drawing.Size(154, 238)
+        Me.ListBox1.Size = New System.Drawing.Size(229, 364)
        Me.ListBox1.TabIndex = 0
        '
        'Button1
        '
-        Me.Button1.Location = New System.Drawing.Point(182, 12)
+        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.System
+        Me.Button1.Location = New System.Drawing.Point(273, 18)
+        Me.Button1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(75, 23)
+        Me.Button1.Size = New System.Drawing.Size(112, 35)
        Me.Button1.TabIndex = 1
        Me.Button1.Text = "Insert"
        Me.Button1.UseVisualStyleBackColor = True
        '
        'Button2
        '
-        Me.Button2.Location = New System.Drawing.Point(182, 126)
+        Me.Button2.Location = New System.Drawing.Point(273, 194)
+        Me.Button2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(75, 23)
+        Me.Button2.Size = New System.Drawing.Size(112, 35)
        Me.Button2.TabIndex = 2
        Me.Button2.Text = "Insert"
        Me.Button2.UseVisualStyleBackColor = True
@ -62,33 +71,80 @@ Partial Class EggMoveEditor
        '
        Me.ComboBox1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.ComboBox1.FormattingEnabled = True
-        Me.ComboBox1.Location = New System.Drawing.Point(272, 14)
+        Me.ComboBox1.Location = New System.Drawing.Point(408, 22)
+        Me.ComboBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.ComboBox1.Name = "ComboBox1"
-        Me.ComboBox1.Size = New System.Drawing.Size(121, 21)
+        Me.ComboBox1.Size = New System.Drawing.Size(180, 28)
        Me.ComboBox1.TabIndex = 3
        '
        'ComboBox2
        '
        Me.ComboBox2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.ComboBox2.FormattingEnabled = True
-        Me.ComboBox2.Location = New System.Drawing.Point(272, 128)
+        Me.ComboBox2.Location = New System.Drawing.Point(408, 197)
+        Me.ComboBox2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.ComboBox2.Name = "ComboBox2"
-        Me.ComboBox2.Size = New System.Drawing.Size(121, 21)
+        Me.ComboBox2.Size = New System.Drawing.Size(180, 28)
        Me.ComboBox2.TabIndex = 4
        '
        'FrntPic
        '
-        Me.FrntPic.Location = New System.Drawing.Point(300, 41)
+        Me.FrntPic.Location = New System.Drawing.Point(450, 63)
+        Me.FrntPic.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.FrntPic.Name = "FrntPic"
-        Me.FrntPic.Size = New System.Drawing.Size(64, 64)
+        Me.FrntPic.Size = New System.Drawing.Size(96, 98)
        Me.FrntPic.TabIndex = 10
        Me.FrntPic.TabStop = False
        '
+        'Button3
+        '
+        Me.Button3.Location = New System.Drawing.Point(273, 58)
+        Me.Button3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.Button3.Name = "Button3"
+        Me.Button3.Size = New System.Drawing.Size(112, 35)
+        Me.Button3.TabIndex = 11
+        Me.Button3.Text = "Replace"
+        Me.Button3.UseVisualStyleBackColor = True
+        '
+        'Button4
+        '
+        Me.Button4.Location = New System.Drawing.Point(273, 126)
+        Me.Button4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(112, 35)
+        Me.Button4.TabIndex = 12
+        Me.Button4.Text = "Delete"
+        Me.Button4.UseVisualStyleBackColor = True
+        '
+        'Button5
+        '
+        Me.Button5.Location = New System.Drawing.Point(273, 234)
+        Me.Button5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.Button5.Name = "Button5"
+        Me.Button5.Size = New System.Drawing.Size(112, 35)
+        Me.Button5.TabIndex = 13
+        Me.Button5.Text = "Replace"
+        Me.Button5.UseVisualStyleBackColor = True
+        '
+        'Button6
+        '
+        Me.Button6.Location = New System.Drawing.Point(273, 347)
+        Me.Button6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.Button6.Name = "Button6"
+        Me.Button6.Size = New System.Drawing.Size(112, 35)
+        Me.Button6.TabIndex = 14
+        Me.Button6.Text = "Save"
+        Me.Button6.UseVisualStyleBackColor = True
+        '
        'EggMoveEditor
        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(416, 262)
+        Me.ClientSize = New System.Drawing.Size(624, 403)
+        Me.Controls.Add(Me.Button6)
+        Me.Controls.Add(Me.Button5)
+        Me.Controls.Add(Me.Button4)
+        Me.Controls.Add(Me.Button3)
        Me.Controls.Add(Me.FrntPic)
        Me.Controls.Add(Me.ComboBox2)
        Me.Controls.Add(Me.ComboBox1)
@ -97,6 +153,7 @@ Partial Class EggMoveEditor
        Me.Controls.Add(Me.ListBox1)
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.MaximizeBox = False
        Me.Name = "EggMoveEditor"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
@ -112,4 +169,8 @@ Partial Class EggMoveEditor
    Friend WithEvents ComboBox1 As ComboBox
    Friend WithEvents ComboBox2 As ComboBox
    Friend WithEvents FrntPic As PictureBox
+    Friend WithEvents Button3 As Button
+    Friend WithEvents Button4 As Button
+    Friend WithEvents Button5 As Button
+    Friend WithEvents Button6 As Button
 End Class
--- a/GBAPokemonGameEditor/EggMoveEditor.vb
+++ b/GBAPokemonGameEditor/EggMoveEditor.vb
@ -1,6 +1,10 @@
-Imports VB = Microsoft.VisualBasic
+Imports System.IO
+Imports VB = Microsoft.VisualBasic

 Public Class EggMoveEditor
+
+    Dim EggMoveList As List(Of Integer)
+
    Private Sub EggMoveEditor_Load(sender As Object, e As EventArgs) Handles MyBase.Load


@ -11,9 +15,26 @@ Public Class EggMoveEditor

        Looper = 0

-        While ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "EggMoveTable", "")), System.Globalization.NumberStyles.HexNumber) + (Looper * 2), 2) = "FFFF" = False
+        EggMoveList = New List(Of Integer)

-            CurEntry = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Int32.Parse(((GetString(GetINIFileLocation(), header, "EggMoveTable", ""))), System.Globalization.NumberStyles.HexNumber) + (Looper * 2), 2))), System.Globalization.NumberStyles.HexNumber)
+        Dim sOffset As Integer = Int32.Parse((GetString(GetINIFileLocation(), header, "EggMoveTable", "")), System.Globalization.NumberStyles.HexNumber)
+        Dim EggMoveString As String = ""
+
+        Using fs As New FileStream(LoadedROM, FileMode.Open, FileAccess.Read)
+            Using r As New BinaryReader(fs)
+
+                fs.Position = sOffset
+
+                Do
+                    EggMoveString += VB.Right("0000" & Hex(Int32.Parse(r.ReadInt16)), 4)
+                Loop While EggMoveString.Substring(EggMoveString.Length - 4, 4).CompareTo("FFFF") <> 0
+
+            End Using
+        End Using
+
+        While EggMoveString.Substring(Looper * 4, 4) = "FFFF" = False
+
+            CurEntry = Int32.Parse(EggMoveString.Substring(Looper * 4, 4), System.Globalization.NumberStyles.HexNumber)

            If CurEntry > 20000 Then

@ -24,6 +45,8 @@ Public Class EggMoveEditor
                ListBox1.Items.Add("     " & GetAttackName(CurEntry))

            End If
+
+            EggMoveList.Add(CurEntry)
            Looper = Looper + 1
        End While

@ -65,10 +88,10 @@ Public Class EggMoveEditor
        GetAndDrawFrontPokemonPic(FrntPic, ComboBox1.SelectedIndex + 1)
    End Sub

-    Private Sub ListBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBox1.SelectedIndexChanged
+    Private Sub ListBox1_SelectedIndexChanged() Handles ListBox1.SelectedIndexChanged
        Dim CurEntry As Integer

-        CurEntry = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Int32.Parse(((GetString(GetINIFileLocation(), header, "EggMoveTable", ""))), System.Globalization.NumberStyles.HexNumber) + (ListBox1.SelectedIndex * 2), 2))), System.Globalization.NumberStyles.HexNumber)
+        CurEntry = EggMoveList(ListBox1.SelectedIndex)

        If CurEntry > 20000 Then

@ -78,71 +101,131 @@ Public Class EggMoveEditor

            ComboBox2.SelectedIndex = CurEntry

+            Dim tempLoop As Integer = ListBox1.SelectedIndex
+            Dim tempBuffer As Integer = CurEntry
+
+
+            While tempLoop >= 0 And tempBuffer < 20000
+                tempBuffer = EggMoveList(tempLoop)
+                tempLoop -= 1
+            End While
+
+            If tempBuffer > 20000 Then
+                ComboBox1.SelectedIndex = ((tempBuffer - 20000) - 1)
+            End If
+
        End If
    End Sub

    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        Dim bufferCombo2 As Integer = ComboBox2.SelectedIndex

-        Dim IndexBuff As Integer = ListBox1.SelectedIndex
-
-        Dim Looper As Integer
-        Dim CurEntry As Integer
-
-        WriteHEX(LoadedROM, Int32.Parse(((GetString(GetINIFileLocation(), header, "EggMoveTable", ""))), System.Globalization.NumberStyles.HexNumber) + (ListBox1.SelectedIndex * 2), ReverseHEX(VB.Right("0000" & Hex(ComboBox1.SelectedIndex + 20001), 4)))
-
-        ListBox1.Items.Clear()
-
-        Looper = 0
-
-        While ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "EggMoveTable", "")), System.Globalization.NumberStyles.HexNumber) + (Looper * 2), 2) = "FFFF" = False
-
-            CurEntry = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Int32.Parse(((GetString(GetINIFileLocation(), header, "EggMoveTable", ""))), System.Globalization.NumberStyles.HexNumber) + (Looper * 2), 2))), System.Globalization.NumberStyles.HexNumber)
-
-            If CurEntry > 20000 Then
-
-                ListBox1.Items.Add(GetPokemonName(CurEntry - 20000))
-
-            Else
-
-                ListBox1.Items.Add("     " & GetAttackName(CurEntry))
-
-            End If
-            Looper = Looper + 1
-        End While
-
-        ListBox1.SelectedIndex = IndexBuff
+        EggMoveList.Insert(ListBox1.SelectedIndex, ComboBox1.SelectedIndex + 20001)
+        ReloadEggMoves()
+        ComboBox2.SelectedIndex = bufferCombo2

    End Sub

    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click

+        EggMoveList.Insert(ListBox1.SelectedIndex, ComboBox2.SelectedIndex)
+        ReloadEggMoves()
+
+    End Sub
+
+    Private Sub ReloadEggMoves()
+        Dim bufferList As ListBox.ObjectCollection = New ListBox.ObjectCollection(New ListBox)
+
+        Dim Looper As Integer = 0
+        Dim AtBottom As Boolean = False
        Dim IndexBuff As Integer = ListBox1.SelectedIndex

-        Dim Looper As Integer
-        Dim CurEntry As Integer
+        Dim NumberOfVisibleItems As Integer = Math.Ceiling(ListBox1.Height / ListBox1.ItemHeight)
+        Dim BottomIndex As Integer = 0 ' last visible index
+        If ListBox1.Items.Count - 1 > NumberOfVisibleItems Then
+            BottomIndex = ListBox1.TopIndex + NumberOfVisibleItems - 2
+        End If

-        WriteHEX(LoadedROM, Int32.Parse(((GetString(GetINIFileLocation(), header, "EggMoveTable", ""))), System.Globalization.NumberStyles.HexNumber) + (ListBox1.SelectedIndex * 2), ReverseHEX(VB.Right("0000" & Hex(ComboBox2.SelectedIndex), 4)))
+        If BottomIndex >= ListBox1.Items.Count() - 1 Then
+            AtBottom = True
+        End If

-        ListBox1.Items.Clear()
-
-        Looper = 0
-
-        While ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "EggMoveTable", "")), System.Globalization.NumberStyles.HexNumber) + (Looper * 2), 2) = "FFFF" = False
-
-            CurEntry = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Int32.Parse(((GetString(GetINIFileLocation(), header, "EggMoveTable", ""))), System.Globalization.NumberStyles.HexNumber) + (Looper * 2), 2))), System.Globalization.NumberStyles.HexNumber)
+        For Each CurEntry In EggMoveList

            If CurEntry > 20000 Then

-                ListBox1.Items.Add(GetPokemonName(CurEntry - 20000))
+                bufferList.Add(GetPokemonName(CurEntry - 20000))

            Else

-                ListBox1.Items.Add("     " & GetAttackName(CurEntry))
+                bufferList.Add("     " & GetAttackName(CurEntry))

            End If
-            Looper = Looper + 1
-        End While

-        ListBox1.SelectedIndex = IndexBuff
+            Looper = Looper + 1
+
+        Next
+
+        ListBox1.Items.Clear()
+        ListBox1.Items.AddRange(bufferList)
+
+        If AtBottom Then
+            ListBox1.SelectedIndex = ListBox1.Items.Count() - 1
+        End If
+
+        If ListBox1.Items.Count() - 1 >= BottomIndex Then
+            ListBox1.SelectedIndex = BottomIndex
+        Else
+            ListBox1.SelectedIndex = ListBox1.Items.Count() - 1
+        End If
+
+        If ListBox1.Items.Count() - 1 >= IndexBuff Then
+            ListBox1.SelectedIndex = IndexBuff
+        End If
+
+    End Sub
+
+    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
+        Dim bufferCombo2 As Integer = ComboBox2.SelectedIndex
+        EggMoveList(ListBox1.SelectedIndex) = ComboBox1.SelectedIndex + 20001
+        ReloadEggMoves()
+        ComboBox2.SelectedIndex = bufferCombo2
+    End Sub
+
+    Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
+        EggMoveList(ListBox1.SelectedIndex) = ComboBox2.SelectedIndex
+        ReloadEggMoves()
+    End Sub
+
+    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
+
+        ListBox1_SelectedIndexChanged()
+
+        Dim bufferCombo1 As Integer = ComboBox1.SelectedIndex
+        Dim bufferCombo2 As Integer = ComboBox2.SelectedIndex
+
+        EggMoveList.RemoveAt(ListBox1.SelectedIndex)
+        ReloadEggMoves()
+
+        ComboBox1.SelectedIndex = bufferCombo1
+        ComboBox2.SelectedIndex = bufferCombo2
+
+    End Sub
+
+    Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
+        Dim bufferString As String = ""
+        Dim tempLoop As Integer = 0
+
+        For Each EggMove In EggMoveList
+
+            bufferString += ReverseHEX(VB.Right("0000" & Hex(EggMove), 4))
+
+            tempLoop += 1
+        Next
+
+        bufferString += "FFFF"
+
+        WriteHEX(LoadedROM, Int32.Parse(((GetString(GetINIFileLocation(), header, "EggMoveTable", ""))), System.Globalization.NumberStyles.HexNumber), bufferString)
+
    End Sub
 End Class
--- a/GBAPokemonGameEditor/GetImageFunctions.vb
+++ b/GBAPokemonGameEditor/GetImageFunctions.vb
@ -854,6 +854,17 @@ ErrorHandle:
        Dim Palette15(&HFFF) As Byte
        Dim Palette32() As Color
        Dim bSprite As Bitmap
+
+        Dim individualPalettes As Boolean = False
+        Dim pTableOffset As Integer = 0
+
+        Try
+            pTableOffset = Int32.Parse(GetString(GetINIFileLocation(), header, "IconPointerTable2", ""), System.Globalization.NumberStyles.HexNumber) + ((palindex * 8))
+            individualPalettes = True
+        Catch
+
+        End Try
+
        Using fs As New FileStream(LoadedROM, FileMode.Open, FileAccess.Read)
            Using r As New BinaryReader(fs)
                fs.Position = sOffset
@ -866,7 +877,15 @@ ErrorHandle:
                ReDim Temp(&HFFF)
                'fs.Position = pOffset
                'pOffset = r.ReadInt32 - &H8000000
-                fs.Position = pOffset
+
+                If Not individualPalettes Then
+                    fs.Position = pOffset
+                Else
+                    fs.Position = pTableOffset
+                    pOffset = r.ReadInt32 - &H8000000
+                    fs.Position = pOffset
+                End If
+
                r.Read(Temp, 0, &HFFF)
                'LZ77UnComp(Temp, Palette15)

@ -890,6 +909,17 @@ ErrorHandle:
        Dim Palette15(&HFFF) As Byte
        Dim Palette32() As Color
        Dim bSprite As Bitmap
+
+        Dim individualPalettes As Boolean = False
+        Dim pTableOffset As Integer = 0
+
+        Try
+            pTableOffset = Int32.Parse(GetString(GetINIFileLocation(), header, "IconPointerTable2", ""), System.Globalization.NumberStyles.HexNumber) + ((palindex * 8))
+            individualPalettes = True
+        Catch
+
+        End Try
+
        Using fs As New FileStream(LoadedROM, FileMode.Open, FileAccess.Read)
            Using r As New BinaryReader(fs)
                fs.Position = sOffset
@ -903,6 +933,15 @@ ErrorHandle:
                'fs.Position = pOffset
                'pOffset = r.ReadInt32 - &H8000000
                fs.Position = pOffset
+
+                If Not individualPalettes Then
+                    fs.Position = pOffset
+                Else
+                    fs.Position = pTableOffset
+                    pOffset = r.ReadInt32 - &H8000000
+                    fs.Position = pOffset
+                End If
+
                r.Read(Temp, 0, &HFFF)
                'LZ77UnComp(Temp, Palette15)

--- 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>/TMXH7TbOoTD6/KT2qbzyHQ4cnH0Ds1OXY4mjlznt0o=</dsig:DigestValue>
+        <dsig:DigestValue>oZKsscV6XweG+loQmZbBDiZO0BQCP7F/TfwY0asCaA8=</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="2118144">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2120704">
      <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>BYPNOtnl6NqIhYpRJO9FGh9OiSYT8Bh3DCHX8BPYuk0=</dsig:DigestValue>
+        <dsig:DigestValue>FERwyly55XAx5w762wu7/jegdIJ2KFH+zg+3gAm1/30=</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/bin/Debug/errors.txt
+++ b/GBAPokemonGameEditor/bin/Debug/errors.txt
@ -0,0 +1,39 @@
+Error! IconPalCount is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPalCount is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
+Error! IconPointerTable2 is missing for ROM BPRE!
--- 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>/TMXH7TbOoTD6/KT2qbzyHQ4cnH0Ds1OXY4mjlznt0o=</dsig:DigestValue>
+        <dsig:DigestValue>oZKsscV6XweG+loQmZbBDiZO0BQCP7F/TfwY0asCaA8=</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="2118144">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2120704">
      <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>BYPNOtnl6NqIhYpRJO9FGh9OiSYT8Bh3DCHX8BPYuk0=</dsig:DigestValue>
+        <dsig:DigestValue>FERwyly55XAx5w762wu7/jegdIJ2KFH+zg+3gAm1/30=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb