Fix Icon Import

Icon import will now choose palettes correctly
2026-07-05 01:30:48 -05:00 · 2019-01-21 22:17:30 -05:00 · 2019-01-21 22:17:30 -05:00 · adb25ff66d
commit adb25ff66d
parent f18db2c4ea
35 changed files with 974 additions and 811 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
@ -33,6 +33,7 @@ Partial Class EggMoveEditor
        Me.Button4 = New System.Windows.Forms.Button()
        Me.Button5 = New System.Windows.Forms.Button()
        Me.Button6 = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
        CType(Me.FrntPic, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
@ -136,11 +137,21 @@ Partial Class EggMoveEditor
        Me.Button6.Text = "Save"
        Me.Button6.UseVisualStyleBackColor = True
        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(392, 241)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(226, 140)
+        Me.Label1.TabIndex = 15
+        Me.Label1.Text = resources.GetString("Label1.Text")
+        '
        'EggMoveEditor
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(624, 403)
+        Me.Controls.Add(Me.Label1)
        Me.Controls.Add(Me.Button6)
        Me.Controls.Add(Me.Button5)
        Me.Controls.Add(Me.Button4)
@ -160,6 +171,7 @@ Partial Class EggMoveEditor
        Me.Text = "Egg Move Editor"
        CType(Me.FrntPic, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
+        Me.PerformLayout()

    End Sub

@ -173,4 +185,5 @@ Partial Class EggMoveEditor
    Friend WithEvents Button4 As Button
    Friend WithEvents Button5 As Button
    Friend WithEvents Button6 As Button
+    Friend WithEvents Label1 As Label
 End Class
--- a/GBAPokemonGameEditor/EggMoveEditor.resx
+++ b/GBAPokemonGameEditor/EggMoveEditor.resx
@ -117,6 +117,16 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <data name="Label1.Text" xml:space="preserve">
+    <value>WIP: Does not repoint data 
+         even if it is longer than 
+         the original table. Should 
+         work fine for data as long 
+         as, or shorter than 
+         the original table.
+BACK-UP BEFORE USE
+</value>
+  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
--- a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj
+++ b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj
@ -79,7 +79,7 @@
    <ManifestKeyFile>GBAPokemonGameEditor_TemporaryKey.pfx</ManifestKeyFile>
  </PropertyGroup>
  <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
+    <GenerateManifests>false</GenerateManifests>
  </PropertyGroup>
  <PropertyGroup>
    <SignManifests>false</SignManifests>
@ -206,10 +206,10 @@
    <Compile Include="mMain.vb" />
    <Compile Include="modSearchFreeSpace.vb" />
    <Compile Include="modTextSapp.vb" />
-    <Compile Include="movetutor2.Designer.vb">
-      <DependentUpon>movetutor2.vb</DependentUpon>
+    <Compile Include="MoveTutorEditor.Designer.vb">
+      <DependentUpon>MoveTutorEditor.vb</DependentUpon>
    </Compile>
-    <Compile Include="movetutor2.vb">
+    <Compile Include="MoveTutorEditor.vb">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="My Project\AssemblyInfo.vb" />
@ -335,8 +335,8 @@
    <EmbeddedResource Include="MainFrm.resx">
      <DependentUpon>MainFrm.vb</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="movetutor2.resx">
-      <DependentUpon>movetutor2.vb</DependentUpon>
+    <EmbeddedResource Include="MoveTutorEditor.resx">
+      <DependentUpon>MoveTutorEditor.vb</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="My Project\Resources.resx">
      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
--- a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj.user
+++ b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj.user
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <EnableSecurityDebugging>false</EnableSecurityDebugging>
+  </PropertyGroup>
+</Project>
--- a/GBAPokemonGameEditor/ImportDataFunctions.vb
+++ b/GBAPokemonGameEditor/ImportDataFunctions.vb
@ -592,10 +592,8 @@ Module ImportDataFunctions
        End If

        Try
-            SynchSprite(FrontSprite, ONormalFrontBitmap, OShinyFrontBitmap)
            SynchSprite(BackSprite, ONormalBackBitmap, OShinyBackBitmap)
        Catch
-            SynchSpriteOverflow(FrontSprite, ONormalFrontBitmap, OShinyFrontBitmap)
            SynchSpriteOverflow(BackSprite, ONormalBackBitmap, OShinyBackBitmap)
        End Try

@ -605,17 +603,19 @@ Module ImportDataFunctions
            Catch
                SynchSprite2Overflow(AnimationNormalSprite, ONormalFrontBitmapAnimation, OShinyFrontBitmapAnimation)
            End Try
+            SaveAnimationSpriteToFreeSpace(PokemonIndex, AnimationNormalSprite)
+        Else
+            Try
+                SynchSprite(FrontSprite, ONormalFrontBitmap, OShinyFrontBitmap)
+            Catch
+                SynchSpriteOverflow(FrontSprite, ONormalFrontBitmap, OShinyFrontBitmap)
+            End Try
+            SaveFrontSpriteToFreeSpace(PokemonIndex, FrontSprite, FrontPalette)
        End If

        mainbitmap.Dispose()
-
-        SaveFrontSpriteToFreeSpace(PokemonIndex, FrontSprite, FrontPalette)
        SaveBackSpriteToFreeSpace(PokemonIndex, BackSprite, BackPalette)

-        If LoadAnimationFlag = True Then
-            SaveAnimationSpriteToFreeSpace(PokemonIndex, AnimationNormalSprite)
-        End If
-
    End Sub

    Private Sub SynchSprite(ByRef SpriteArray As Byte(), ByRef NormalSprite As Bitmap, ByRef ShinySprite As Bitmap)
@ -776,8 +776,6 @@ Module ImportDataFunctions

    Public Sub ImportPokemonIcon(filename As String, PokemonIndex As Integer)

-        Dim iconpals(2)() As Color
-
        Dim importimg As New Bitmap(filename)


@ -794,21 +792,52 @@ Module ImportDataFunctions
        Dim pOffset As Integer = Int32.Parse(GetString(GetINIFileLocation(), header, "IconPals", ""), System.Globalization.NumberStyles.HexNumber)

        Dim hexstring As String = ""
+        'Dim ImgNewOffset
+        'Dim ImgBytes As Byte()
+        'Dim ImgString As String
+
+        Dim individualPalettes As Boolean = False
+
+        Try
+            pOffset = Int32.Parse(GetString(GetINIFileLocation(), header, "IconPointerTable2", ""), System.Globalization.NumberStyles.HexNumber)
+            individualPalettes = True
+        Catch
+
+        End Try
+
+        Dim iconpals(Pokemonedit.IconPalCount - 1)() As Color

        Using fs As New FileStream(LoadedROM, FileMode.Open, FileAccess.Read)
            Using r As New BinaryReader(fs)

+                Dim indexvar As Integer = 0
+
                fs.Position = sOffset
                sOffset = r.ReadInt32 - &H8000000

-                fs.Position = pOffset
+                If Not individualPalettes Then

-                Dim indexvar As Integer = 0
+                    fs.Position = pOffset

-                Do
-                    iconpals(indexvar) = LoadPaletteFromROM(fs)
-                    indexvar += 1
-                Loop While (indexvar <= 2)
+                    Do
+                        iconpals(indexvar) = LoadPaletteFromROM(fs)
+                        indexvar += 1
+                    Loop While (indexvar <= 2)
+
+                Else
+
+                    Dim pTable As Integer = pOffset
+
+                    Do
+                        fs.Position = pTable + (8 * indexvar)
+                        pOffset = r.ReadInt32 - &H8000000
+                        fs.Position = pOffset
+                        iconpals(indexvar) = LoadPaletteFromROM(fs)
+                        indexvar += 1
+                    Loop While (indexvar <= Pokemonedit.IconPalCount - 1)
+
+
+                End If

                fs.Close()
                r.Close()
@ -909,8 +938,8 @@ Module ImportDataFunctions

        Dim hexstring As String = ""
        Dim ImgNewOffset
-        Dim ImgBytes As Byte()
-        Dim ImgString As String
+        'Dim ImgBytes As Byte()
+        'Dim ImgString As String

        Dim individualPalettes As Boolean = False

@ -930,9 +959,6 @@ Module ImportDataFunctions

                If Not individualPalettes Then

-                    fs.Position = sOffset
-                    sOffset = r.ReadInt32 - &H8000000
-
                    fs.Position = pOffset

                    Do
@ -964,15 +990,12 @@ Module ImportDataFunctions
        palval = GetClosestPalette(importimg, iconpals)

        ConvertBitmapToPalette(importimg, iconpals(palval), True)
-        ImgBytes = ConvertStringToByteArray(CompressLz77String(ConvertByteArrayToString(SaveBitmapToArray(importimg, iconpals(palval)))))
-        ImgString = ByteArrayToHexString(ImgBytes)
+        'ImgBytes = ConvertStringToByteArray(CompressLz77String(ConvertByteArrayToString(SaveBitmapToArray(importimg, iconpals(palval)))))
+        'ImgString = ByteArrayToHexString(ImgBytes)
        hexstring = ByteArrayToHexString(SaveBitmapToArray(importimg, iconpals(palval)))
        ImgNewOffset = SearchFreeSpaceFourAligned(LoadedROM, &HFF, ((Len(hexstring) / 2)), "&H" & GetString(GetINIFileLocation(), header, "B00000", "B00000"))
        WriteHEX(LoadedROM, ImgNewOffset, hexstring)

-
-        sOffset = Int32.Parse(GetString(GetINIFileLocation(), header, "IconPointerTable", ""), System.Globalization.NumberStyles.HexNumber) + (PokemonIndex * 4)
-
        WriteHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "IconPalTable", "")), System.Globalization.NumberStyles.HexNumber) + PokemonIndex, Hex(palval))
        WriteHEX(LoadedROM, sOffset, ReverseHEX(Hex((ImgNewOffset) + &H8000000)))
    End Sub
--- a/GBAPokemonGameEditor/MainFrm.vb
+++ b/GBAPokemonGameEditor/MainFrm.vb
@ -396,7 +396,8 @@ Public Class MainFrm
    Private Sub Button5_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button5.Click
        'Me.Visible = False
        Me.Cursor = Cursors.WaitCursor
-        movetutor2.Show()
+        MoveTutorEditor.Show()
+        MoveTutorEditor.BringToFront()
        Me.Cursor = Cursors.Arrow
    End Sub

@ -404,6 +405,7 @@ Public Class MainFrm
        'Me.Visible = False
        Me.Cursor = Cursors.WaitCursor
        PokedexOrderEditor.Show()
+        PokedexOrderEditor.BringToFront()
        Me.Cursor = Cursors.Arrow
    End Sub

@ -411,6 +413,7 @@ Public Class MainFrm
        ' Me.Visible = False
        Me.Cursor = Cursors.WaitCursor
        Pokemonedit.Show()
+        Pokemonedit.BringToFront()
        Me.Cursor = Cursors.Arrow
    End Sub

@ -437,6 +440,7 @@ Public Class MainFrm
        Me.Cursor = Cursors.WaitCursor
        'Me.Visible = False
        AttackEditor.Show()
+        AttackEditor.BringToFront()
        Me.Cursor = Cursors.Arrow
    End Sub

@ -446,6 +450,7 @@ Public Class MainFrm
        'Me.Visible = False
        Me.Cursor = Cursors.WaitCursor
        AbilityEdit.Show()
+        AbilityEdit.BringToFront()
        Me.Cursor = Cursors.Arrow
    End Sub

@ -554,6 +559,7 @@ Public Class MainFrm
        'Me.Visible = False
        Me.Cursor = Cursors.WaitCursor
        RSEStarterEditor.Show()
+        RSEStarterEditor.BringToFront()
        Me.Cursor = Cursors.Arrow
    End Sub

@ -561,6 +567,7 @@ Public Class MainFrm
        'Me.Visible = False
        Me.Cursor = Cursors.WaitCursor
        PokedexDataEditor.Show()
+        PokedexDataEditor.BringToFront()
        Me.Cursor = Cursors.Arrow
    End Sub

@ -569,6 +576,7 @@ Public Class MainFrm
        'Me.Visible = False
        Me.Cursor = Cursors.WaitCursor
        BattleFrontierEditor.Show()
+        BattleFrontierEditor.BringToFront()
        Me.Cursor = Cursors.Arrow
    End Sub

--- a/GBAPokemonGameEditor/MoveTutorEditor.Designer.vb
+++ b/GBAPokemonGameEditor/MoveTutorEditor.Designer.vb
@ -1,5 +1,5 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class movetutor2
+Partial Class MoveTutorEditor
    Inherits System.Windows.Forms.Form

    'Form overrides dispose to clean up the component list.
@ -22,7 +22,7 @@ Partial Class movetutor2
    'Do not modify it using the code editor.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(movetutor2))
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(MoveTutorEditor))
        Me.Button2 = New System.Windows.Forms.Button()
        Me.Combo1 = New System.Windows.Forms.ComboBox()
        Me.ListBox1 = New System.Windows.Forms.ListBox()
@ -66,7 +66,7 @@ Partial Class movetutor2
        '
        Me.Button3.Location = New System.Drawing.Point(269, 58)
        Me.Button3.Name = "Button3"
-        Me.Button3.Size = New System.Drawing.Size(75, 31)
+        Me.Button3.Size = New System.Drawing.Size(75, 33)
        Me.Button3.TabIndex = 20
        Me.Button3.Text = "Export"
        Me.Button3.UseVisualStyleBackColor = True
@ -75,7 +75,7 @@ Partial Class movetutor2
        '
        Me.Button1.Location = New System.Drawing.Point(4, 58)
        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(75, 31)
+        Me.Button1.Size = New System.Drawing.Size(75, 33)
        Me.Button1.TabIndex = 19
        Me.Button1.Text = "Import"
        Me.Button1.UseVisualStyleBackColor = True
@ -84,7 +84,7 @@ Partial Class movetutor2
        '
        Me.fileOpenDialog.FileName = "OpenFileDialog1"
        '
-        'movetutor2
+        'MoveTutorEditor
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
@ -98,7 +98,7 @@ Partial Class movetutor2
        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 = "movetutor2"
+        Me.Name = "MoveTutorEditor"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.Text = "Move Tutor Editor"
        Me.ResumeLayout(False)
--- a/GBAPokemonGameEditor/MoveTutorEditor.resx
+++ b/GBAPokemonGameEditor/MoveTutorEditor.resx
--- a/GBAPokemonGameEditor/MoveTutorEditor.vb
+++ b/GBAPokemonGameEditor/MoveTutorEditor.vb
@ -1,7 +1,7 @@
 Option Strict Off
 Option Explicit Off
 Imports VB = Microsoft.VisualBasic
-Public Class movetutor2
+Public Class MoveTutorEditor


    Dim Offset As Integer
--- a/GBAPokemonGameEditor/PokedexListEditor.vb
+++ b/GBAPokemonGameEditor/PokedexListEditor.vb
@ -40,30 +40,39 @@ Public Class PokedexListEditor

            LoopVar = 0

-            While LoopVar < (GetString(GetINIFileLocation(), header, "NumberOfPokemon", "")) - 1 = True
+            Dim PokedexNumToSpecies As List(Of Integer) = AllPokedexNumbertoSpecies()
+
+            For Looper As Integer = 0 To PokedexNumToSpecies.Count() - 1
+                ListBox1.Items.Add(GetPokemonName(PokedexNumToSpecies(Looper)))
+            Next
+
+            If header2 <> "BPE" Then
+                While LoopVar < (GetString(GetINIFileLocation(), header, "NumberOfPokemon", "")) - 1 = True


-                ListBox1.Items.Add(GetPokemonName(PokedexNumbertoSpecies(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "PokedexAlphabetTable", "")), System.Globalization.NumberStyles.HexNumber) + (LoopVar * 2), 2))), System.Globalization.NumberStyles.HexNumber))))

-                If header2 <> "BPE" Then
                    ListBox4.Items.Add(GetPokemonName((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "PokedexTypeTable", "")), System.Globalization.NumberStyles.HexNumber) + (LoopVar * 2), 2))), System.Globalization.NumberStyles.HexNumber))))

-                End If

-                LoopVar = LoopVar + 1

-            End While
+                    LoopVar = LoopVar + 1
+
+                End While
+            End If

            LoopVar = 0

-            While LoopVar < (GetString(GetINIFileLocation(), header, "NumberOfDexEntries", "")) - 1
+            Dim PokedexNumToSpeciesLight As List(Of Integer) = AllPokedexNumbertoSpecies("PokedexLightestTable", "NumberOfDexEntries")

-                ListBox2.Items.Add(GetPokemonName(PokedexNumbertoSpecies(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "PokedexLightestTable", "")), System.Globalization.NumberStyles.HexNumber) + (LoopVar * 2), 2))), System.Globalization.NumberStyles.HexNumber))))
-                ListBox3.Items.Add(GetPokemonName(PokedexNumbertoSpecies(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "PokedexSmallestTable", "")), System.Globalization.NumberStyles.HexNumber) + (LoopVar * 2), 2))), System.Globalization.NumberStyles.HexNumber))))
+            For Looper As Integer = 0 To PokedexNumToSpeciesLight.Count() - 1
+                ListBox2.Items.Add(GetPokemonName(PokedexNumToSpeciesLight(Looper)))
+            Next

+            Dim PokedexNumToSpeciesSmall As List(Of Integer) = AllPokedexNumbertoSpecies("PokedexSmallestTable", "NumberOfDexEntries")

-                LoopVar = LoopVar + 1
-            End While
+            For Looper As Integer = 0 To PokedexNumToSpeciesSmall.Count() - 1
+                ListBox3.Items.Add(GetPokemonName(PokedexNumToSpeciesSmall(Looper)))
+            Next

            ListBox1.SelectedIndex = 0
            ListBox2.SelectedIndex = 0
--- a/GBAPokemonGameEditor/Pokemonedit.Designer.vb
+++ b/GBAPokemonGameEditor/Pokemonedit.Designer.vb
--- a/GBAPokemonGameEditor/Pokemonedit.resx
+++ b/GBAPokemonGameEditor/Pokemonedit.resx
@ -129,12 +129,6 @@
  <metadata name="FolderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>405, 17</value>
  </metadata>
-  <metadata name="HoverInfo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>603, 17</value>
-  </metadata>
-  <metadata name="HoverInfo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>603, 17</value>
-  </metadata>
  <data name="Button14.ToolTip" xml:space="preserve">
    <value>Import All Pokemon:

--- a/GBAPokemonGameEditor/WichuSpriteFunctions.vb
+++ b/GBAPokemonGameEditor/WichuSpriteFunctions.vb
@ -253,6 +253,19 @@ Module WichuSpriteFunctions
        Dim num As Integer = -1
        Dim num7 As Integer = (palettes.Length - 1)
        Dim i As Integer = 0
+        Dim blankColor As Color = Color.FromArgb(&H0)
+
+
+        Dim tempPal As List(Of Color) = New List(Of Color)
+
+        For Each color In bitmapPalette
+            If Not color.ToArgb() = blankColor.ToArgb() Then
+                tempPal.Add(color)
+            End If
+        Next
+        ReDim bitmapPalette(tempPal.Count)
+        bitmapPalette = tempPal.ToArray()
+
        Do While (i <= num7)
            Dim num4 As Integer = 0
            Dim num8 As Integer = (bitmapPalette.Length - 1)
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.config
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.config
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+    </startup>
+</configuration>
--- 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/mMain.vb
+++ b/GBAPokemonGameEditor/mMain.vb
@ -209,15 +209,16 @@ Module mMain
        Dim bytesloaded As Byte()

        bytesloaded = IO.File.ReadAllBytes(LoadedROM)
+        Dim NationalDexTable As Integer = Int32.Parse(GetString(GetINIFileLocation(), header, "NationalDexTable", ""), System.Globalization.NumberStyles.HexNumber)

        ' If DexNumber = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "NationalDexTable", "")), System.Globalization.NumberStyles.HexNumber) + ((DexNumber - 1) * 2), 2))), System.Globalization.NumberStyles.HexNumber) Then
-        If DexNumber = Int32.Parse((ReverseHEX(Get2Bytes(bytesloaded, Int32.Parse((GetString(GetINIFileLocation(), header, "NationalDexTable", "")), System.Globalization.NumberStyles.HexNumber) + ((DexNumber - 1) * 2)))), System.Globalization.NumberStyles.HexNumber) Then
+        If DexNumber = Int32.Parse((ReverseHEX(Get2Bytes(bytesloaded, NationalDexTable + ((DexNumber - 1) * 2)))), System.Globalization.NumberStyles.HexNumber) Then

            curval = DexNumber - 1

        Else
            '  While DexNumber <> Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "NationalDexTable", "")), System.Globalization.NumberStyles.HexNumber) + (curval * 2), 2))), System.Globalization.NumberStyles.HexNumber)
-            While DexNumber <> Int32.Parse((ReverseHEX(Get2Bytes(bytesloaded, Int32.Parse((GetString(GetINIFileLocation(), header, "NationalDexTable", "")), System.Globalization.NumberStyles.HexNumber) + (curval * 2)))), System.Globalization.NumberStyles.HexNumber)
+            While DexNumber <> Int32.Parse((ReverseHEX(Get2Bytes(bytesloaded, NationalDexTable + (curval * 2)))), System.Globalization.NumberStyles.HexNumber)

                curval = curval + 1
            End While
@ -225,6 +226,42 @@ Module mMain
        PokedexNumbertoSpecies = curval + 1
    End Function

+    Public Function AllPokedexNumbertoSpecies(Optional DexTableName As String = "PokedexAlphabetTable", Optional PkmnCountName As String = "NumberOfPokemon") As List(Of Integer)
+
+        Dim curval As Integer = 0
+        Dim MaxPkmn As Integer = Int32.Parse(GetString(GetINIFileLocation(), header, PkmnCountName, "")) - 1
+        Dim Dexnumbers As String = ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, DexTableName, "")), System.Globalization.NumberStyles.HexNumber), MaxPkmn * 2)
+        Dim bytesloaded As Byte()
+        Dim PkmnList As List(Of Integer) = New List(Of Integer)
+        Dim DexNumber As Integer = 0
+        Dim NationalDexTable As Integer = Int32.Parse(GetString(GetINIFileLocation(), header, "NationalDexTable", ""), System.Globalization.NumberStyles.HexNumber)
+
+        bytesloaded = IO.File.ReadAllBytes(LoadedROM)
+
+        For LoopVar As Integer = 0 To MaxPkmn - 1
+            DexNumber = Int32.Parse(ReverseHEX(Dexnumbers.Substring(LoopVar * 4, 4)), System.Globalization.NumberStyles.HexNumber)
+
+            ' If DexNumber = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "NationalDexTable", "")), System.Globalization.NumberStyles.HexNumber) + ((DexNumber - 1) * 2), 2))), System.Globalization.NumberStyles.HexNumber) Then
+            If DexNumber = Int32.Parse((ReverseHEX(Get2Bytes(bytesloaded, NationalDexTable + ((DexNumber - 1) * 2)))), System.Globalization.NumberStyles.HexNumber) Then
+
+                curval = DexNumber - 1
+
+            Else
+                '  While DexNumber <> Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "NationalDexTable", "")), System.Globalization.NumberStyles.HexNumber) + (curval * 2), 2))), System.Globalization.NumberStyles.HexNumber)
+                While DexNumber <> Int32.Parse((ReverseHEX(Get2Bytes(bytesloaded, NationalDexTable + (curval * 2)))), System.Globalization.NumberStyles.HexNumber)
+
+                    curval = curval + 1
+
+                End While
+            End If
+
+            PkmnList.Add(curval + 1)
+            curval = 0
+        Next
+
+        AllPokedexNumbertoSpecies = PkmnList
+    End Function
+
    Public Function Get2Bytes(bytesin As Byte(), local As Integer) As String

        Get2Bytes = MakeProperByte(bytesin(local)) & MakeProperByte(bytesin(local + 1))
--- a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
--- a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.CoreCompileInputs.cache
+++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.CoreCompileInputs.cache
@ -1 +1 @@
-3c28dccb3590a299f877aecd8a64b5acf689d462
+302e1968ba2c5026d2d388fde540996acfec2ab2
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt
+++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt
@ -264,3 +264,37 @@ C:\Users\manma\Desktop\Shortcuts\Github\PokemonGameEditor\GBAPokemonGameEditor\o
 C:\Users\manma\Desktop\Shortcuts\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.exe
 C:\Users\manma\Desktop\Shortcuts\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.xml
 C:\Users\manma\Desktop\Shortcuts\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.pdb
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\PokemonGameEditor.exe.config
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\PokemonGameEditor.exe
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\PokemonGameEditor.pdb
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\PokemonGameEditor.xml
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.AbilityAdder.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.AbilityEdit.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.AboutBox1.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.AddOrRemovePrograms.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.AttackEditor.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.AttackAdder.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.BattleFrontierEditor.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.EggMoveEditor.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.HabitatEditor.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.InputAttacks.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.ItemEditor.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.MainFrm.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.MoveTutorEditor.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.Resources.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.PokedexDataEditor.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.PokedexListEditor.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.PokedexOrderEditor.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.PokemonAdder.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.Pokemonedit.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.RomExpander.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.RSEStarterEditor.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.SplashScreen1.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.TMHMEditor.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.TradeEditor.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.TrainerEditor.resources
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.vbproj.GenerateResource.cache
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.vbproj.CoreCompileInputs.cache
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.exe
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.xml
+C:\Users\manma\Documents\PokeDev\PGE-Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.pdb
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
+++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.cache
+++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.cache
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbprojAssemblyReference.cache
+++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbprojAssemblyReference.cache
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.EggMoveEditor.resources
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.EggMoveEditor.resources
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.MoveTutorEditor.resources
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.MoveTutorEditor.resources
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.TrustInfo.xml
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.TrustInfo.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><trustInfo xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2"><security><applicationRequestMinimum><PermissionSet version="1" class="System.Security.NamedPermissionSet" Name="LocalIntranet" Description="Default rights given to applications on the local intranet" ID="Custom" SameSite="site"><IPermission Read="USERNAME" version="1" class="System.Security.Permissions.EnvironmentPermission, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /><IPermission version="1" class="System.Security.Permissions.FileDialogPermission, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" Unrestricted="true" /><IPermission version="1" Permanent="True" Expiry="9223372036854775807" UserQuota="9223372036854775807" Allowed="AssemblyIsolationByUser" class="System.Security.Permissions.IsolatedStorageFilePermission, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /><IPermission version="1" class="System.Security.Permissions.ReflectionPermission, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" Flags="ReflectionEmit, RestrictedMemberAccess" /><IPermission version="1" class="System.Security.Permissions.SecurityPermission, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" Flags="Assertion, Execution, BindingRedirects" /><IPermission version="1" class="System.Security.Permissions.UIPermission, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" Unrestricted="true" /><IPermission version="1" class="System.Drawing.Printing.PrintingPermission, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Level="DefaultPrinting" /><IPermission version="1" class="System.Security.Permissions.MediaPermission, WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" Audio="SafeAudio" Image="SafeImage" Video="SafeVideo" /><IPermission version="1" class="System.Security.Permissions.WebBrowserPermission, WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" Level="Safe" /><IPermission version="1" class="System.Net.DnsPermission, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" Unrestricted="true" /><IPermission version="1" class="System.Security.Permissions.TypeDescriptorPermission, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" Unrestricted="true" /></PermissionSet><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" />
-
-         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>
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
--- a/GBAPokemonGameEditor/obj/x86/Debug/TempPE/My
+++ b/GBAPokemonGameEditor/obj/x86/Debug/TempPE/My