Trainer data tab complete.

I just need to finish the trainer class and Pokemon tabs.
2026-04-20 23:37:22 -05:00 · 2017-01-01 23:13:18 -05:00 · 2017-01-01 23:13:18 -05:00 · 98816f8cb6
commit 98816f8cb6
parent 12418d950e
16 changed files with 161 additions and 23 deletions
--- a/GBAPokemonGameEditor.v12.suo
+++ b/GBAPokemonGameEditor.v12.suo
--- a/GBAPokemonGameEditor/Pokemonedit.vb
+++ b/GBAPokemonGameEditor/Pokemonedit.vb
@ -119,8 +119,6 @@ Public Class Pokemonedit

            LoopVar = LoopVar + 1

-
-
        End While

        LoopVar = 0
--- a/GBAPokemonGameEditor/TrainerEditor.Designer.vb
+++ b/GBAPokemonGameEditor/TrainerEditor.Designer.vb
@ -50,6 +50,14 @@ Partial Class TrainerEditor
        Me.TabPage1 = New System.Windows.Forms.TabPage()
        Me.TabPage2 = New System.Windows.Forms.TabPage()
        Me.TabPage3 = New System.Windows.Forms.TabPage()
+        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        Me.TrainerItem1 = New System.Windows.Forms.ComboBox()
+        Me.TrainerItem2 = New System.Windows.Forms.ComboBox()
+        Me.TrainerItem3 = New System.Windows.Forms.ComboBox()
+        Me.TrainerItem4 = New System.Windows.Forms.ComboBox()
+        Me.DblCheckBox = New System.Windows.Forms.CheckBox()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.AITextBox = New System.Windows.Forms.TextBox()
        Me.GroupBox1.SuspendLayout()
        Me.GroupBox3.SuspendLayout()
        CType(Me.PicNumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit()
@ -57,6 +65,7 @@ Partial Class TrainerEditor
        Me.TabControl1.SuspendLayout()
        Me.TabPage1.SuspendLayout()
        Me.TabPage2.SuspendLayout()
+        Me.GroupBox2.SuspendLayout()
        Me.SuspendLayout()
        '
        'GroupBox1
@ -265,11 +274,15 @@ Partial Class TrainerEditor
        Me.TabControl1.Location = New System.Drawing.Point(179, 12)
        Me.TabControl1.Name = "TabControl1"
        Me.TabControl1.SelectedIndex = 0
-        Me.TabControl1.Size = New System.Drawing.Size(368, 306)
+        Me.TabControl1.Size = New System.Drawing.Size(368, 323)
        Me.TabControl1.TabIndex = 3
        '
        'TabPage1
        '
+        Me.TabPage1.Controls.Add(Me.AITextBox)
+        Me.TabPage1.Controls.Add(Me.Label5)
+        Me.TabPage1.Controls.Add(Me.DblCheckBox)
+        Me.TabPage1.Controls.Add(Me.GroupBox2)
        Me.TabPage1.Controls.Add(Me.TrainerPic)
        Me.TabPage1.Controls.Add(Me.PicNumericUpDown)
        Me.TabPage1.Controls.Add(Me.Button22)
@ -283,7 +296,7 @@ Partial Class TrainerEditor
        Me.TabPage1.Location = New System.Drawing.Point(4, 25)
        Me.TabPage1.Name = "TabPage1"
        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(360, 277)
+        Me.TabPage1.Size = New System.Drawing.Size(360, 294)
        Me.TabPage1.TabIndex = 0
        Me.TabPage1.Text = "Trainer Data"
        Me.TabPage1.UseVisualStyleBackColor = True
@ -311,11 +324,82 @@ Partial Class TrainerEditor
        Me.TabPage3.Text = "Pokemon Data"
        Me.TabPage3.UseVisualStyleBackColor = True
        '
+        'GroupBox2
+        '
+        Me.GroupBox2.Controls.Add(Me.TrainerItem4)
+        Me.GroupBox2.Controls.Add(Me.TrainerItem3)
+        Me.GroupBox2.Controls.Add(Me.TrainerItem2)
+        Me.GroupBox2.Controls.Add(Me.TrainerItem1)
+        Me.GroupBox2.Location = New System.Drawing.Point(108, 139)
+        Me.GroupBox2.Name = "GroupBox2"
+        Me.GroupBox2.Size = New System.Drawing.Size(179, 144)
+        Me.GroupBox2.TabIndex = 22
+        Me.GroupBox2.TabStop = False
+        Me.GroupBox2.Text = "Trainer Items"
+        '
+        'TrainerItem1
+        '
+        Me.TrainerItem1.FormattingEnabled = True
+        Me.TrainerItem1.Location = New System.Drawing.Point(6, 21)
+        Me.TrainerItem1.Name = "TrainerItem1"
+        Me.TrainerItem1.Size = New System.Drawing.Size(157, 24)
+        Me.TrainerItem1.TabIndex = 0
+        '
+        'TrainerItem2
+        '
+        Me.TrainerItem2.FormattingEnabled = True
+        Me.TrainerItem2.Location = New System.Drawing.Point(6, 51)
+        Me.TrainerItem2.Name = "TrainerItem2"
+        Me.TrainerItem2.Size = New System.Drawing.Size(157, 24)
+        Me.TrainerItem2.TabIndex = 1
+        '
+        'TrainerItem3
+        '
+        Me.TrainerItem3.FormattingEnabled = True
+        Me.TrainerItem3.Location = New System.Drawing.Point(6, 81)
+        Me.TrainerItem3.Name = "TrainerItem3"
+        Me.TrainerItem3.Size = New System.Drawing.Size(157, 24)
+        Me.TrainerItem3.TabIndex = 2
+        '
+        'TrainerItem4
+        '
+        Me.TrainerItem4.FormattingEnabled = True
+        Me.TrainerItem4.Location = New System.Drawing.Point(6, 111)
+        Me.TrainerItem4.Name = "TrainerItem4"
+        Me.TrainerItem4.Size = New System.Drawing.Size(157, 24)
+        Me.TrainerItem4.TabIndex = 3
+        '
+        'DblCheckBox
+        '
+        Me.DblCheckBox.AutoSize = True
+        Me.DblCheckBox.Location = New System.Drawing.Point(204, 83)
+        Me.DblCheckBox.Name = "DblCheckBox"
+        Me.DblCheckBox.Size = New System.Drawing.Size(115, 21)
+        Me.DblCheckBox.TabIndex = 23
+        Me.DblCheckBox.Text = "Double Battle"
+        Me.DblCheckBox.UseVisualStyleBackColor = True
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Location = New System.Drawing.Point(201, 107)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(24, 17)
+        Me.Label5.TabIndex = 24
+        Me.Label5.Text = "AI:"
+        '
+        'AITextBox
+        '
+        Me.AITextBox.Location = New System.Drawing.Point(255, 104)
+        Me.AITextBox.Name = "AITextBox"
+        Me.AITextBox.Size = New System.Drawing.Size(86, 22)
+        Me.AITextBox.TabIndex = 25
+        '
        'TrainerEditor
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(559, 328)
+        Me.ClientSize = New System.Drawing.Size(559, 345)
        Me.Controls.Add(Me.TabControl1)
        Me.Controls.Add(Me.SaveBttn)
        Me.Controls.Add(Me.GroupBox1)
@ -336,6 +420,7 @@ Partial Class TrainerEditor
        Me.TabPage1.PerformLayout()
        Me.TabPage2.ResumeLayout(False)
        Me.TabPage2.PerformLayout()
+        Me.GroupBox2.ResumeLayout(False)
        Me.ResumeLayout(False)

    End Sub
@ -366,4 +451,12 @@ Partial Class TrainerEditor
    Friend WithEvents TabPage1 As System.Windows.Forms.TabPage
    Friend WithEvents TabPage2 As System.Windows.Forms.TabPage
    Friend WithEvents TabPage3 As System.Windows.Forms.TabPage
+    Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
+    Friend WithEvents TrainerItem4 As System.Windows.Forms.ComboBox
+    Friend WithEvents TrainerItem3 As System.Windows.Forms.ComboBox
+    Friend WithEvents TrainerItem2 As System.Windows.Forms.ComboBox
+    Friend WithEvents TrainerItem1 As System.Windows.Forms.ComboBox
+    Friend WithEvents DblCheckBox As System.Windows.Forms.CheckBox
+    Friend WithEvents AITextBox As System.Windows.Forms.TextBox
+    Friend WithEvents Label5 As System.Windows.Forms.Label
 End Class
--- a/GBAPokemonGameEditor/TrainerEditor.vb
+++ b/GBAPokemonGameEditor/TrainerEditor.vb
@ -26,10 +26,27 @@ Public Class TrainerEditor

            TrainerListComboBox.Items.Add(GetTrainerName(LoopVar))

+        End While

+        LoopVar = 0
+
+        TrainerItem1.Items.Clear()
+        TrainerItem2.Items.Clear()
+        TrainerItem3.Items.Clear()
+        TrainerItem4.Items.Clear()
+
+        While LoopVar < (GetString(GetINIFileLocation(), header, "NumberOfItems", "")) = True
+
+            TrainerItem1.Items.Add(GetItemName(LoopVar))
+            TrainerItem2.Items.Add(GetItemName(LoopVar))
+            TrainerItem3.Items.Add(GetItemName(LoopVar))
+            TrainerItem4.Items.Add(GetItemName(LoopVar))
+
+            LoopVar = LoopVar + 1

        End While

+
        TrainerListComboBox.SelectedIndex = 0


@ -75,6 +92,19 @@ Public Class TrainerEditor

        MusicTextBox.Text = Convert.ToInt32(MusicGenBin.Remove(0, 1), 2)

+        TrainerItem1.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar + 16, 2)), System.Globalization.NumberStyles.HexNumber)
+        TrainerItem2.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar + 18, 2)), System.Globalization.NumberStyles.HexNumber)
+        TrainerItem3.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar + 20, 2)), System.Globalization.NumberStyles.HexNumber)
+        TrainerItem4.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar + 22, 2)), System.Globalization.NumberStyles.HexNumber)
+
+        If (ReadHEX(LoadedROM, offvar + 24, 1)) = "00" Then
+            DblCheckBox.Checked = False
+        ElseIf (ReadHEX(LoadedROM, offvar + 24, 1)) = "01" Then
+            DblCheckBox.Checked = True
+        End If
+
+        AITextBox.Text = Int32.Parse((ReadHEX(LoadedROM, offvar + 28, 1)), System.Globalization.NumberStyles.HexNumber)
+
        TrainerIndexTextBox.Text = TrainerListComboBox.SelectedIndex + 1
    End Sub

@ -132,15 +162,32 @@ Public Class TrainerEditor

        WriteHEX(LoadedROM, offvar + 1, Hex(ClassComboBox.SelectedIndex))

+        WriteHEX(LoadedROM, offvar + 16, ReverseHEX(VB.Right("0000" & Hex(TrainerItem1.SelectedIndex), 4)))
+        WriteHEX(LoadedROM, offvar + 18, ReverseHEX(VB.Right("0000" & Hex(TrainerItem2.SelectedIndex), 4)))
+        WriteHEX(LoadedROM, offvar + 20, ReverseHEX(VB.Right("0000" & Hex(TrainerItem3.SelectedIndex), 4)))
+        WriteHEX(LoadedROM, offvar + 22, ReverseHEX(VB.Right("0000" & Hex(TrainerItem4.SelectedIndex), 4)))
+
+        If DblCheckBox.Checked = False Then
+
+            WriteHEX(LoadedROM, offvar + 24, "00")
+
+        ElseIf DblCheckBox.Checked = True Then
+
+            WriteHEX(LoadedROM, offvar + 24, "01")
+
+        End If
+
+        WriteHEX(LoadedROM, offvar + 28, Hex(AITextBox.Text))
+
        Musictextbx = MusicTextBox.Text

        If RadioButton1.Checked = True Then

-            MusicGenBin = "1" & VB.Right("0000000" & Convert.ToString(Musictextbx, 2), 7)
+            MusicGenBin = "0" & VB.Right("0000000" & Convert.ToString(Musictextbx, 2), 7)

        ElseIf RadioButton2.Checked = True Then

-            MusicGenBin = "0" & VB.Right("0000000" & Convert.ToString(Musictextbx, 2), 7)
+            MusicGenBin = "1" & VB.Right("0000000" & Convert.ToString(Musictextbx, 2), 7)

        End If

@ -148,6 +195,8 @@ Public Class TrainerEditor

        WriteHEX(LoadedROM, offvar + 2, Hex(MusicGen))

+
+
    End Sub

    Private Sub Button22_Click(sender As Object, e As EventArgs) Handles Button22.Click
--- 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>ae8ShbDZQ+FItkLwyD2O243Y6kNMFqK/2UbjudDdZAM=</dsig:DigestValue>
+        <dsig:DigestValue>p2dmPUsfJRI+ZQGOGeuf4Lh1YyJAx89QBb9NnFQdKY0=</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="2110464">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2114048">
      <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>SZf0p50sxqiBjI8x/Ki7JIiFrJ9eyqPdhfry4Hy+SQw=</dsig:DigestValue>
+        <dsig:DigestValue>lSUZoGPXs7PnBWobJD30CQMn+6BTMXOTfiDGFzIluA4=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
@ -16,7 +16,7 @@
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>ae8ShbDZQ+FItkLwyD2O243Y6kNMFqK/2UbjudDdZAM=</dsig:DigestValue>
+        <dsig:DigestValue>p2dmPUsfJRI+ZQGOGeuf4Lh1YyJAx89QBb9NnFQdKY0=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
@ -43,14 +43,14 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2110464">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2114048">
      <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>SZf0p50sxqiBjI8x/Ki7JIiFrJ9eyqPdhfry4Hy+SQw=</dsig:DigestValue>
+        <dsig:DigestValue>lSUZoGPXs7PnBWobJD30CQMn+6BTMXOTfiDGFzIluA4=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- 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>ae8ShbDZQ+FItkLwyD2O243Y6kNMFqK/2UbjudDdZAM=</dsig:DigestValue>
+        <dsig:DigestValue>p2dmPUsfJRI+ZQGOGeuf4Lh1YyJAx89QBb9NnFQdKY0=</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="2110464">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2114048">
      <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>SZf0p50sxqiBjI8x/Ki7JIiFrJ9eyqPdhfry4Hy+SQw=</dsig:DigestValue>
+        <dsig:DigestValue>lSUZoGPXs7PnBWobJD30CQMn+6BTMXOTfiDGFzIluA4=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
--- a/README.md
+++ b/README.md
@ -89,12 +89,14 @@ Trade Editor.

 Pokedex List Editor.

+Pokemon Cry Exporting.
+
 Planned Features A.K.A TODO List
 =========================

-Trainer Editor
+Trainer Editor (Started)

-Pokemon Cry Importing/Exporting
+Pokemon Cry Importing

 OW Editor

@ -102,9 +104,7 @@ Finish the Battle Frontier Editor

 Improved Item Editor

-Item Adder
-
-Code Pokemon Adder for Emerald
+Toolbar mode

 Program Requirements
 ====================
@ -122,8 +122,6 @@ Recommended Programs

 This is a list of recommended programs that should be used with PGE for the best possible ROM hacking experience.

-MEH - https://github.com/shinyquagsire23/MEH
-
 Unofficial_XSE - https://github.com/Gamer2020/Unofficial_XSE/releases

 FSF - https://code.google.com/p/toolsfactory/downloads/detail?name=FreeSpaceFinder-2.0.1.0.zip&can=2&q=