diff --git a/GBAPokemonGameEditor.v12.suo b/GBAPokemonGameEditor.v12.suo
index 3d74fd7..fce1b7d 100644
Binary files a/GBAPokemonGameEditor.v12.suo and b/GBAPokemonGameEditor.v12.suo differ
diff --git a/GBAPokemonGameEditor/ChangeNameFunctions.vb b/GBAPokemonGameEditor/ChangeNameFunctions.vb
index 1cda75e..a1d4853 100644
--- a/GBAPokemonGameEditor/ChangeNameFunctions.vb
+++ b/GBAPokemonGameEditor/ChangeNameFunctions.vb
@@ -314,4 +314,29 @@ Module ChangeNameFunctions
ChangeTrainerName = NewName
End Function
+
+ Public Function ChangeTrainerClassName(ByVal Index As Integer, ByVal NewName As String)
+ Dim offvar As Long
+
+ offvar = Int32.Parse((GetString(GetINIFileLocation(), header, "TrainerClasses", "")), System.Globalization.NumberStyles.HexNumber)
+ If header3 = "J" Then
+
+ Else
+
+ FileNum = FreeFile()
+ FileOpen(FileNum, LoadedROM, OpenMode.Binary)
+ Dim PokeName As String = "xxxxxxxxxxxxx"
+ Dim filler As Byte = "&HFF"
+ PokeName = NameAsc2Sapp(NewName)
+ FilePut(FileNum, PokeName, offvar + 1 + (Index * 13))
+ FilePut(FileNum, filler, offvar + 1 + (Index * 13) + Len(NewName))
+
+
+ End If
+ FileClose(FileNum)
+ ChangeTrainerClassName = NewName
+
+ End Function
+
+
End Module
diff --git a/GBAPokemonGameEditor/TrainerEditor.Designer.vb b/GBAPokemonGameEditor/TrainerEditor.Designer.vb
index 7a002e0..3a8c658 100644
--- a/GBAPokemonGameEditor/TrainerEditor.Designer.vb
+++ b/GBAPokemonGameEditor/TrainerEditor.Designer.vb
@@ -28,28 +28,30 @@ Partial Class TrainerEditor
Me.Label1 = New System.Windows.Forms.Label()
Me.TrainerListComboBox = New System.Windows.Forms.ComboBox()
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+ Me.Button22 = New System.Windows.Forms.Button()
+ Me.Button21 = New System.Windows.Forms.Button()
+ Me.MusicTextBox = New System.Windows.Forms.TextBox()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+ Me.RadioButton2 = New System.Windows.Forms.RadioButton()
+ Me.RadioButton1 = New System.Windows.Forms.RadioButton()
+ Me.ClassComboBox = New System.Windows.Forms.ComboBox()
+ Me.Label3 = New System.Windows.Forms.Label()
Me.RnmBttn = New System.Windows.Forms.Button()
Me.TNameTextBox = New System.Windows.Forms.TextBox()
Me.Label2 = New System.Windows.Forms.Label()
Me.PicNumericUpDown = New System.Windows.Forms.NumericUpDown()
Me.TrainerPic = New System.Windows.Forms.PictureBox()
Me.SaveBttn = New System.Windows.Forms.Button()
- Me.Label3 = New System.Windows.Forms.Label()
- Me.ClassComboBox = New System.Windows.Forms.ComboBox()
- Me.GroupBox3 = New System.Windows.Forms.GroupBox()
- Me.RadioButton1 = New System.Windows.Forms.RadioButton()
- Me.RadioButton2 = New System.Windows.Forms.RadioButton()
- Me.Label4 = New System.Windows.Forms.Label()
- Me.MusicTextBox = New System.Windows.Forms.TextBox()
- Me.Button22 = New System.Windows.Forms.Button()
- Me.Button21 = New System.Windows.Forms.Button()
Me.SaveFileDialog = New System.Windows.Forms.SaveFileDialog()
Me.fileOpenDialog = New System.Windows.Forms.OpenFileDialog()
+ Me.ClssRnmBttn = New System.Windows.Forms.Button()
+ Me.ClssTxtBx = New System.Windows.Forms.TextBox()
Me.GroupBox1.SuspendLayout()
Me.GroupBox2.SuspendLayout()
+ Me.GroupBox3.SuspendLayout()
CType(Me.PicNumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TrainerPic, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.GroupBox3.SuspendLayout()
Me.SuspendLayout()
'
'GroupBox1
@@ -92,6 +94,8 @@ Partial Class TrainerEditor
'
'GroupBox2
'
+ Me.GroupBox2.Controls.Add(Me.ClssRnmBttn)
+ Me.GroupBox2.Controls.Add(Me.ClssTxtBx)
Me.GroupBox2.Controls.Add(Me.Button22)
Me.GroupBox2.Controls.Add(Me.Button21)
Me.GroupBox2.Controls.Add(Me.MusicTextBox)
@@ -111,11 +115,101 @@ Partial Class TrainerEditor
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Trainer Data"
'
+ 'Button22
+ '
+ Me.Button22.Location = New System.Drawing.Point(16, 185)
+ Me.Button22.Margin = New System.Windows.Forms.Padding(4)
+ Me.Button22.Name = "Button22"
+ Me.Button22.Size = New System.Drawing.Size(85, 43)
+ Me.Button22.TabIndex = 21
+ Me.Button22.Text = "Export Sprite"
+ Me.Button22.UseVisualStyleBackColor = True
+ '
+ 'Button21
+ '
+ Me.Button21.Location = New System.Drawing.Point(16, 136)
+ Me.Button21.Margin = New System.Windows.Forms.Padding(4)
+ Me.Button21.Name = "Button21"
+ Me.Button21.Size = New System.Drawing.Size(85, 43)
+ Me.Button21.TabIndex = 20
+ Me.Button21.Text = "Import Sprite"
+ Me.Button21.UseVisualStyleBackColor = True
+ '
+ 'MusicTextBox
+ '
+ Me.MusicTextBox.Location = New System.Drawing.Point(258, 148)
+ Me.MusicTextBox.Name = "MusicTextBox"
+ Me.MusicTextBox.Size = New System.Drawing.Size(86, 22)
+ Me.MusicTextBox.TabIndex = 19
+ '
+ 'Label4
+ '
+ Me.Label4.AutoSize = True
+ Me.Label4.Location = New System.Drawing.Point(204, 151)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(48, 17)
+ Me.Label4.TabIndex = 18
+ Me.Label4.Text = "Music:"
+ '
+ 'GroupBox3
+ '
+ Me.GroupBox3.Controls.Add(Me.RadioButton2)
+ Me.GroupBox3.Controls.Add(Me.RadioButton1)
+ Me.GroupBox3.Location = New System.Drawing.Point(111, 146)
+ Me.GroupBox3.Name = "GroupBox3"
+ Me.GroupBox3.Size = New System.Drawing.Size(87, 82)
+ Me.GroupBox3.TabIndex = 17
+ Me.GroupBox3.TabStop = False
+ Me.GroupBox3.Text = "Gender"
+ '
+ 'RadioButton2
+ '
+ Me.RadioButton2.AutoSize = True
+ Me.RadioButton2.ForeColor = System.Drawing.Color.DeepPink
+ Me.RadioButton2.Location = New System.Drawing.Point(6, 48)
+ Me.RadioButton2.Name = "RadioButton2"
+ Me.RadioButton2.Size = New System.Drawing.Size(75, 21)
+ Me.RadioButton2.TabIndex = 1
+ Me.RadioButton2.TabStop = True
+ Me.RadioButton2.Text = "Female"
+ Me.RadioButton2.UseVisualStyleBackColor = True
+ '
+ 'RadioButton1
+ '
+ Me.RadioButton1.AutoSize = True
+ Me.RadioButton1.ForeColor = System.Drawing.Color.DodgerBlue
+ Me.RadioButton1.Location = New System.Drawing.Point(6, 21)
+ Me.RadioButton1.Name = "RadioButton1"
+ Me.RadioButton1.Size = New System.Drawing.Size(59, 21)
+ Me.RadioButton1.TabIndex = 0
+ Me.RadioButton1.TabStop = True
+ Me.RadioButton1.Text = "Male"
+ Me.RadioButton1.UseVisualStyleBackColor = True
+ '
+ 'ClassComboBox
+ '
+ Me.ClassComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
+ Me.ClassComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
+ Me.ClassComboBox.FormattingEnabled = True
+ Me.ClassComboBox.Location = New System.Drawing.Point(163, 51)
+ Me.ClassComboBox.Name = "ClassComboBox"
+ Me.ClassComboBox.Size = New System.Drawing.Size(181, 24)
+ Me.ClassComboBox.TabIndex = 16
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = True
+ Me.Label3.Location = New System.Drawing.Point(108, 54)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(46, 17)
+ Me.Label3.TabIndex = 15
+ Me.Label3.Text = "Class:"
+ '
'RnmBttn
'
- Me.RnmBttn.Location = New System.Drawing.Point(269, 22)
+ Me.RnmBttn.Location = New System.Drawing.Point(269, 21)
Me.RnmBttn.Name = "RnmBttn"
- Me.RnmBttn.Size = New System.Drawing.Size(75, 23)
+ Me.RnmBttn.Size = New System.Drawing.Size(75, 24)
Me.RnmBttn.TabIndex = 14
Me.RnmBttn.Text = "Rename"
Me.RnmBttn.UseVisualStyleBackColor = True
@@ -162,100 +256,26 @@ Partial Class TrainerEditor
Me.SaveBttn.Text = "Save"
Me.SaveBttn.UseVisualStyleBackColor = True
'
- 'Label3
- '
- Me.Label3.AutoSize = True
- Me.Label3.Location = New System.Drawing.Point(108, 54)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(46, 17)
- Me.Label3.TabIndex = 15
- Me.Label3.Text = "Class:"
- '
- 'ClassComboBox
- '
- Me.ClassComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append
- Me.ClassComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
- Me.ClassComboBox.FormattingEnabled = True
- Me.ClassComboBox.Location = New System.Drawing.Point(163, 51)
- Me.ClassComboBox.Name = "ClassComboBox"
- Me.ClassComboBox.Size = New System.Drawing.Size(181, 24)
- Me.ClassComboBox.TabIndex = 16
- '
- 'GroupBox3
- '
- Me.GroupBox3.Controls.Add(Me.RadioButton2)
- Me.GroupBox3.Controls.Add(Me.RadioButton1)
- Me.GroupBox3.Location = New System.Drawing.Point(111, 78)
- Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Size = New System.Drawing.Size(87, 82)
- Me.GroupBox3.TabIndex = 17
- Me.GroupBox3.TabStop = False
- Me.GroupBox3.Text = "Gender"
- '
- 'RadioButton1
- '
- Me.RadioButton1.AutoSize = True
- Me.RadioButton1.ForeColor = System.Drawing.Color.DodgerBlue
- Me.RadioButton1.Location = New System.Drawing.Point(6, 21)
- Me.RadioButton1.Name = "RadioButton1"
- Me.RadioButton1.Size = New System.Drawing.Size(59, 21)
- Me.RadioButton1.TabIndex = 0
- Me.RadioButton1.TabStop = True
- Me.RadioButton1.Text = "Male"
- Me.RadioButton1.UseVisualStyleBackColor = True
- '
- 'RadioButton2
- '
- Me.RadioButton2.AutoSize = True
- Me.RadioButton2.ForeColor = System.Drawing.Color.DeepPink
- Me.RadioButton2.Location = New System.Drawing.Point(6, 48)
- Me.RadioButton2.Name = "RadioButton2"
- Me.RadioButton2.Size = New System.Drawing.Size(75, 21)
- Me.RadioButton2.TabIndex = 1
- Me.RadioButton2.TabStop = True
- Me.RadioButton2.Text = "Female"
- Me.RadioButton2.UseVisualStyleBackColor = True
- '
- 'Label4
- '
- Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(204, 83)
- Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(48, 17)
- Me.Label4.TabIndex = 18
- Me.Label4.Text = "Music:"
- '
- 'MusicTextBox
- '
- Me.MusicTextBox.Location = New System.Drawing.Point(258, 80)
- Me.MusicTextBox.Name = "MusicTextBox"
- Me.MusicTextBox.Size = New System.Drawing.Size(86, 22)
- Me.MusicTextBox.TabIndex = 19
- '
- 'Button22
- '
- Me.Button22.Location = New System.Drawing.Point(16, 185)
- Me.Button22.Margin = New System.Windows.Forms.Padding(4)
- Me.Button22.Name = "Button22"
- Me.Button22.Size = New System.Drawing.Size(85, 43)
- Me.Button22.TabIndex = 21
- Me.Button22.Text = "Export Sprite"
- Me.Button22.UseVisualStyleBackColor = True
- '
- 'Button21
- '
- Me.Button21.Location = New System.Drawing.Point(16, 136)
- Me.Button21.Margin = New System.Windows.Forms.Padding(4)
- Me.Button21.Name = "Button21"
- Me.Button21.Size = New System.Drawing.Size(85, 43)
- Me.Button21.TabIndex = 20
- Me.Button21.Text = "Import Sprite"
- Me.Button21.UseVisualStyleBackColor = True
- '
'fileOpenDialog
'
Me.fileOpenDialog.FileName = "OpenFileDialog1"
'
+ 'ClssRnmBttn
+ '
+ Me.ClssRnmBttn.Location = New System.Drawing.Point(163, 106)
+ Me.ClssRnmBttn.Name = "ClssRnmBttn"
+ Me.ClssRnmBttn.Size = New System.Drawing.Size(181, 34)
+ Me.ClssRnmBttn.TabIndex = 23
+ Me.ClssRnmBttn.Text = "Rename Class"
+ Me.ClssRnmBttn.UseVisualStyleBackColor = True
+ '
+ 'ClssTxtBx
+ '
+ Me.ClssTxtBx.Location = New System.Drawing.Point(163, 81)
+ Me.ClssTxtBx.Name = "ClssTxtBx"
+ Me.ClssTxtBx.Size = New System.Drawing.Size(181, 22)
+ Me.ClssTxtBx.TabIndex = 22
+ '
'TrainerEditor
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
@@ -274,10 +294,10 @@ Partial Class TrainerEditor
Me.GroupBox1.PerformLayout()
Me.GroupBox2.ResumeLayout(False)
Me.GroupBox2.PerformLayout()
- CType(Me.PicNumericUpDown, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.TrainerPic, System.ComponentModel.ISupportInitialize).EndInit()
Me.GroupBox3.ResumeLayout(False)
Me.GroupBox3.PerformLayout()
+ CType(Me.PicNumericUpDown, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.TrainerPic, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
End Sub
@@ -303,4 +323,6 @@ Partial Class TrainerEditor
Friend WithEvents Button21 As System.Windows.Forms.Button
Friend WithEvents SaveFileDialog As System.Windows.Forms.SaveFileDialog
Friend WithEvents fileOpenDialog As System.Windows.Forms.OpenFileDialog
+ Friend WithEvents ClssRnmBttn As System.Windows.Forms.Button
+ Friend WithEvents ClssTxtBx As System.Windows.Forms.TextBox
End Class
diff --git a/GBAPokemonGameEditor/TrainerEditor.vb b/GBAPokemonGameEditor/TrainerEditor.vb
index d0a673a..aa2d542 100644
--- a/GBAPokemonGameEditor/TrainerEditor.vb
+++ b/GBAPokemonGameEditor/TrainerEditor.vb
@@ -240,4 +240,30 @@
Me.Enabled = True
End If
End Sub
+
+ Private Sub ClassComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ClassComboBox.SelectedIndexChanged
+ ClssTxtBx.Text = ClassComboBox.SelectedItem
+ End Sub
+
+ Private Sub ClssRnmBttn_Click(sender As Object, e As EventArgs) Handles ClssRnmBttn.Click
+ Dim savevar As Integer = ClassComboBox.SelectedIndex
+
+ ChangeTrainerClassName(ClassComboBox.SelectedIndex, ClssTxtBx.Text)
+
+ Dim LoopVar As Integer
+
+ LoopVar = 0
+
+ ClassComboBox.Items.Clear()
+
+ While LoopVar < (GetString(GetINIFileLocation(), header, "NumberOfTrainerClasses", "")) = True
+
+ ClassComboBox.Items.Add(GetTrainerClass(LoopVar))
+
+ LoopVar = LoopVar + 1
+
+ End While
+
+ ClassComboBox.SelectedIndex = savevar
+ End Sub
End Class
\ No newline at end of file
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
index 02dca76..8e91fb8 100644
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
@@ -16,7 +16,7 @@
- INy26ZEbtRzsSrFSzHGQliTCtLGj51mfKFtceB3M5Mc=
+ 3TxVWYoe+kqQZSib6bxSfq1FzgU0RiRaCZ/XHtmFujw=
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
index eae8f4a..3229dbf 100644
Binary files a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe differ
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
index a714104..d10ae7d 100644
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
@@ -43,14 +43,14 @@
-
+
- zZ0HRcsKc+ZblHEUS8rtC9WTkzKW5KAaPJTFbmBeNuo=
+ eyr6E/mTvOOe8NLpS0lK7c82HfZrVFy68ymHS1KCX3I=
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
index 6bd4668..14653ae 100644
Binary files a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb differ
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
index 02dca76..8e91fb8 100644
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
@@ -16,7 +16,7 @@
- INy26ZEbtRzsSrFSzHGQliTCtLGj51mfKFtceB3M5Mc=
+ 3TxVWYoe+kqQZSib6bxSfq1FzgU0RiRaCZ/XHtmFujw=
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
index a714104..d10ae7d 100644
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
@@ -43,14 +43,14 @@
-
+
- zZ0HRcsKc+ZblHEUS8rtC9WTkzKW5KAaPJTFbmBeNuo=
+ eyr6E/mTvOOe8NLpS0lK7c82HfZrVFy68ymHS1KCX3I=
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
index 0d4841f..000da5a 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
index 02dca76..8e91fb8 100644
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
@@ -16,7 +16,7 @@
- INy26ZEbtRzsSrFSzHGQliTCtLGj51mfKFtceB3M5Mc=
+ 3TxVWYoe+kqQZSib6bxSfq1FzgU0RiRaCZ/XHtmFujw=
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
index eae8f4a..3229dbf 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
index a714104..d10ae7d 100644
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
@@ -43,14 +43,14 @@
-
+
- zZ0HRcsKc+ZblHEUS8rtC9WTkzKW5KAaPJTFbmBeNuo=
+ eyr6E/mTvOOe8NLpS0lK7c82HfZrVFy68ymHS1KCX3I=
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
index 6bd4668..14653ae 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ