diff --git a/GBAPokemonGameEditor.v12.suo b/GBAPokemonGameEditor.v12.suo index 69cff41..9fd4653 100644 Binary files a/GBAPokemonGameEditor.v12.suo and b/GBAPokemonGameEditor.v12.suo differ diff --git a/GBAPokemonGameEditor/Pokemonedit.vb b/GBAPokemonGameEditor/Pokemonedit.vb index aea0627..919d7f0 100644 --- a/GBAPokemonGameEditor/Pokemonedit.vb +++ b/GBAPokemonGameEditor/Pokemonedit.vb @@ -3968,4 +3968,12 @@ Public Class Pokemonedit End If End Sub + + Private Sub Label15_Click(sender As Object, e As EventArgs) Handles Label15.Click + + End Sub + + Private Sub EvoItemPic_Click(sender As Object, e As EventArgs) Handles EvoItemPic.Click + + End Sub End Class \ No newline at end of file diff --git a/GBAPokemonGameEditor/TrainerEditor.Designer.vb b/GBAPokemonGameEditor/TrainerEditor.Designer.vb index db0d64d..7da3f1c 100644 --- a/GBAPokemonGameEditor/TrainerEditor.Designer.vb +++ b/GBAPokemonGameEditor/TrainerEditor.Designer.vb @@ -48,24 +48,51 @@ Partial Class TrainerEditor Me.fileOpenDialog = New System.Windows.Forms.OpenFileDialog() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.AITextBox = New System.Windows.Forms.TextBox() + Me.Label5 = New System.Windows.Forms.Label() + Me.DblCheckBox = New System.Windows.Forms.CheckBox() + Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.TrainerItem4 = New System.Windows.Forms.ComboBox() + Me.TrainerItem3 = New System.Windows.Forms.ComboBox() + Me.TrainerItem2 = New System.Windows.Forms.ComboBox() + Me.TrainerItem1 = New System.Windows.Forms.ComboBox() 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.AttackComboBox4 = New System.Windows.Forms.ComboBox() + Me.AttackComboBox3 = New System.Windows.Forms.ComboBox() + Me.AttackComboBox2 = New System.Windows.Forms.ComboBox() + Me.AttackComboBox1 = New System.Windows.Forms.ComboBox() + Me.Label10 = New System.Windows.Forms.Label() + Me.Label9 = New System.Windows.Forms.Label() + Me.TnPkmItmPictureBox = New System.Windows.Forms.PictureBox() + Me.TnPkmItmComboBox = New System.Windows.Forms.ComboBox() + Me.TnPkmPictureBox = New System.Windows.Forms.PictureBox() + Me.TnPkmComboBox = New System.Windows.Forms.ComboBox() + Me.PkmSlts = New System.Windows.Forms.ListBox() + Me.PokeDataFormatTextBox = New System.Windows.Forms.TextBox() + Me.Label8 = New System.Windows.Forms.Label() + Me.PokeNumTextBox = New System.Windows.Forms.TextBox() + Me.Label7 = New System.Windows.Forms.Label() + Me.RpntPkDtBttn = New System.Windows.Forms.Button() + Me.PointerPokeDataTextBox = New System.Windows.Forms.TextBox() + Me.Label6 = New System.Windows.Forms.Label() + Me.Label11 = New System.Windows.Forms.Label() + Me.Label12 = New System.Windows.Forms.Label() + Me.PkmLvlTextBox = New System.Windows.Forms.TextBox() + Me.Label13 = New System.Windows.Forms.Label() + Me.PkmnEvsTextBox = New System.Windows.Forms.TextBox() + Me.PkmnSvBttn = New System.Windows.Forms.Button() Me.GroupBox1.SuspendLayout() Me.GroupBox3.SuspendLayout() CType(Me.PicNumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TrainerPic, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() - Me.TabPage2.SuspendLayout() Me.GroupBox2.SuspendLayout() + Me.TabPage2.SuspendLayout() + Me.TabPage3.SuspendLayout() + CType(Me.TnPkmItmPictureBox, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TnPkmPictureBox, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GroupBox1 @@ -274,7 +301,7 @@ 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, 323) + Me.TabControl1.Size = New System.Drawing.Size(368, 465) Me.TabControl1.TabIndex = 3 ' 'TabPage1 @@ -296,33 +323,36 @@ 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, 294) + Me.TabPage1.Size = New System.Drawing.Size(360, 364) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Trainer Data" Me.TabPage1.UseVisualStyleBackColor = True ' - 'TabPage2 + 'AITextBox ' - Me.TabPage2.Controls.Add(Me.ClssRnmBttn) - Me.TabPage2.Controls.Add(Me.Label3) - Me.TabPage2.Controls.Add(Me.ClassComboBox) - Me.TabPage2.Controls.Add(Me.ClssTxtBx) - Me.TabPage2.Location = New System.Drawing.Point(4, 25) - Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(360, 277) - Me.TabPage2.TabIndex = 1 - Me.TabPage2.Text = "Trainer Class" - Me.TabPage2.UseVisualStyleBackColor = True + 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 ' - 'TabPage3 + 'Label5 ' - Me.TabPage3.Location = New System.Drawing.Point(4, 25) - Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(360, 277) - Me.TabPage3.TabIndex = 2 - Me.TabPage3.Text = "Pokemon Data" - Me.TabPage3.UseVisualStyleBackColor = True + 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:" + ' + '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 ' 'GroupBox2 ' @@ -337,21 +367,13 @@ Partial Class TrainerEditor Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "Trainer Items" ' - 'TrainerItem1 + 'TrainerItem4 ' - 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 + 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 ' 'TrainerItem3 ' @@ -361,45 +383,286 @@ Partial Class TrainerEditor Me.TrainerItem3.Size = New System.Drawing.Size(157, 24) Me.TrainerItem3.TabIndex = 2 ' - 'TrainerItem4 + 'TrainerItem2 ' - 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 + 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 ' - 'DblCheckBox + 'TrainerItem1 ' - 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 + 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 ' - 'Label5 + 'TabPage2 ' - 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:" + Me.TabPage2.Controls.Add(Me.ClssRnmBttn) + Me.TabPage2.Controls.Add(Me.Label3) + Me.TabPage2.Controls.Add(Me.ClassComboBox) + Me.TabPage2.Controls.Add(Me.ClssTxtBx) + Me.TabPage2.Location = New System.Drawing.Point(4, 25) + Me.TabPage2.Name = "TabPage2" + Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage2.Size = New System.Drawing.Size(360, 364) + Me.TabPage2.TabIndex = 1 + Me.TabPage2.Text = "Trainer Class" + Me.TabPage2.UseVisualStyleBackColor = True ' - 'AITextBox + 'TabPage3 ' - 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 + Me.TabPage3.Controls.Add(Me.PkmnSvBttn) + Me.TabPage3.Controls.Add(Me.PkmnEvsTextBox) + Me.TabPage3.Controls.Add(Me.Label13) + Me.TabPage3.Controls.Add(Me.PkmLvlTextBox) + Me.TabPage3.Controls.Add(Me.Label12) + Me.TabPage3.Controls.Add(Me.Label11) + Me.TabPage3.Controls.Add(Me.AttackComboBox4) + Me.TabPage3.Controls.Add(Me.AttackComboBox3) + Me.TabPage3.Controls.Add(Me.AttackComboBox2) + Me.TabPage3.Controls.Add(Me.AttackComboBox1) + Me.TabPage3.Controls.Add(Me.Label10) + Me.TabPage3.Controls.Add(Me.Label9) + Me.TabPage3.Controls.Add(Me.TnPkmItmPictureBox) + Me.TabPage3.Controls.Add(Me.TnPkmItmComboBox) + Me.TabPage3.Controls.Add(Me.TnPkmPictureBox) + Me.TabPage3.Controls.Add(Me.TnPkmComboBox) + Me.TabPage3.Controls.Add(Me.PkmSlts) + Me.TabPage3.Controls.Add(Me.PokeDataFormatTextBox) + Me.TabPage3.Controls.Add(Me.Label8) + Me.TabPage3.Controls.Add(Me.PokeNumTextBox) + Me.TabPage3.Controls.Add(Me.Label7) + Me.TabPage3.Controls.Add(Me.RpntPkDtBttn) + Me.TabPage3.Controls.Add(Me.PointerPokeDataTextBox) + Me.TabPage3.Controls.Add(Me.Label6) + Me.TabPage3.Location = New System.Drawing.Point(4, 25) + Me.TabPage3.Name = "TabPage3" + Me.TabPage3.Size = New System.Drawing.Size(360, 436) + Me.TabPage3.TabIndex = 2 + Me.TabPage3.Text = "Pokemon Data" + Me.TabPage3.UseVisualStyleBackColor = True + ' + 'AttackComboBox4 + ' + Me.AttackComboBox4.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems + Me.AttackComboBox4.FormattingEnabled = True + Me.AttackComboBox4.Location = New System.Drawing.Point(173, 326) + Me.AttackComboBox4.Margin = New System.Windows.Forms.Padding(4) + Me.AttackComboBox4.Name = "AttackComboBox4" + Me.AttackComboBox4.Size = New System.Drawing.Size(138, 24) + Me.AttackComboBox4.TabIndex = 40 + ' + 'AttackComboBox3 + ' + Me.AttackComboBox3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems + Me.AttackComboBox3.FormattingEnabled = True + Me.AttackComboBox3.Location = New System.Drawing.Point(173, 294) + Me.AttackComboBox3.Margin = New System.Windows.Forms.Padding(4) + Me.AttackComboBox3.Name = "AttackComboBox3" + Me.AttackComboBox3.Size = New System.Drawing.Size(138, 24) + Me.AttackComboBox3.TabIndex = 39 + ' + 'AttackComboBox2 + ' + Me.AttackComboBox2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems + Me.AttackComboBox2.FormattingEnabled = True + Me.AttackComboBox2.Location = New System.Drawing.Point(173, 262) + Me.AttackComboBox2.Margin = New System.Windows.Forms.Padding(4) + Me.AttackComboBox2.Name = "AttackComboBox2" + Me.AttackComboBox2.Size = New System.Drawing.Size(138, 24) + Me.AttackComboBox2.TabIndex = 38 + ' + 'AttackComboBox1 + ' + Me.AttackComboBox1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems + Me.AttackComboBox1.FormattingEnabled = True + Me.AttackComboBox1.Location = New System.Drawing.Point(173, 230) + Me.AttackComboBox1.Margin = New System.Windows.Forms.Padding(4) + Me.AttackComboBox1.Name = "AttackComboBox1" + Me.AttackComboBox1.Size = New System.Drawing.Size(138, 24) + Me.AttackComboBox1.TabIndex = 37 + ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(17, 230) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(125, 17) + Me.Label10.TabIndex = 36 + Me.Label10.Text = "Pokemon Species:" + ' + 'Label9 + ' + Me.Label9.AutoSize = True + Me.Label9.Location = New System.Drawing.Point(170, 108) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(38, 17) + Me.Label9.TabIndex = 35 + Me.Label9.Text = "Item:" + ' + 'TnPkmItmPictureBox + ' + Me.TnPkmItmPictureBox.Location = New System.Drawing.Point(173, 162) + Me.TnPkmItmPictureBox.Margin = New System.Windows.Forms.Padding(4) + Me.TnPkmItmPictureBox.Name = "TnPkmItmPictureBox" + Me.TnPkmItmPictureBox.Size = New System.Drawing.Size(32, 30) + Me.TnPkmItmPictureBox.TabIndex = 34 + Me.TnPkmItmPictureBox.TabStop = False + ' + 'TnPkmItmComboBox + ' + Me.TnPkmItmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems + Me.TnPkmItmComboBox.FormattingEnabled = True + Me.TnPkmItmComboBox.Location = New System.Drawing.Point(173, 129) + Me.TnPkmItmComboBox.Margin = New System.Windows.Forms.Padding(4) + Me.TnPkmItmComboBox.Name = "TnPkmItmComboBox" + Me.TnPkmItmComboBox.Size = New System.Drawing.Size(138, 24) + Me.TnPkmItmComboBox.TabIndex = 33 + ' + 'TnPkmPictureBox + ' + Me.TnPkmPictureBox.Location = New System.Drawing.Point(45, 288) + Me.TnPkmPictureBox.Margin = New System.Windows.Forms.Padding(4) + Me.TnPkmPictureBox.Name = "TnPkmPictureBox" + Me.TnPkmPictureBox.Size = New System.Drawing.Size(85, 79) + Me.TnPkmPictureBox.TabIndex = 31 + Me.TnPkmPictureBox.TabStop = False + ' + 'TnPkmComboBox + ' + Me.TnPkmComboBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems + Me.TnPkmComboBox.FormattingEnabled = True + Me.TnPkmComboBox.Location = New System.Drawing.Point(20, 256) + Me.TnPkmComboBox.Margin = New System.Windows.Forms.Padding(4) + Me.TnPkmComboBox.Name = "TnPkmComboBox" + Me.TnPkmComboBox.Size = New System.Drawing.Size(138, 24) + Me.TnPkmComboBox.TabIndex = 30 + ' + 'PkmSlts + ' + Me.PkmSlts.FormattingEnabled = True + Me.PkmSlts.ItemHeight = 16 + Me.PkmSlts.Location = New System.Drawing.Point(20, 108) + Me.PkmSlts.Name = "PkmSlts" + Me.PkmSlts.Size = New System.Drawing.Size(138, 116) + Me.PkmSlts.TabIndex = 29 + ' + 'PokeDataFormatTextBox + ' + Me.PokeDataFormatTextBox.Location = New System.Drawing.Point(173, 13) + Me.PokeDataFormatTextBox.Name = "PokeDataFormatTextBox" + Me.PokeDataFormatTextBox.Size = New System.Drawing.Size(43, 22) + Me.PokeDataFormatTextBox.TabIndex = 28 + ' + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Location = New System.Drawing.Point(17, 16) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(153, 17) + Me.Label8.TabIndex = 27 + Me.Label8.Text = "Pokemon Data Format:" + ' + 'PokeNumTextBox + ' + Me.PokeNumTextBox.Location = New System.Drawing.Point(173, 41) + Me.PokeNumTextBox.Name = "PokeNumTextBox" + Me.PokeNumTextBox.Size = New System.Drawing.Size(43, 22) + Me.PokeNumTextBox.TabIndex = 26 + ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Location = New System.Drawing.Point(17, 44) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(141, 17) + Me.Label7.TabIndex = 25 + Me.Label7.Text = "Number of Pokemon:" + ' + 'RpntPkDtBttn + ' + Me.RpntPkDtBttn.Location = New System.Drawing.Point(222, 65) + Me.RpntPkDtBttn.Name = "RpntPkDtBttn" + Me.RpntPkDtBttn.Size = New System.Drawing.Size(75, 31) + Me.RpntPkDtBttn.TabIndex = 24 + Me.RpntPkDtBttn.Text = "Repoint" + Me.RpntPkDtBttn.UseVisualStyleBackColor = True + ' + 'PointerPokeDataTextBox + ' + Me.PointerPokeDataTextBox.Location = New System.Drawing.Point(80, 69) + Me.PointerPokeDataTextBox.Name = "PointerPokeDataTextBox" + Me.PointerPokeDataTextBox.Size = New System.Drawing.Size(136, 22) + Me.PointerPokeDataTextBox.TabIndex = 23 + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Location = New System.Drawing.Point(17, 72) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(57, 17) + Me.Label6.TabIndex = 0 + Me.Label6.Text = "Pointer:" + ' + 'Label11 + ' + Me.Label11.AutoSize = True + Me.Label11.Location = New System.Drawing.Point(170, 204) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(58, 17) + Me.Label11.TabIndex = 41 + Me.Label11.Text = "Attacks:" + ' + 'Label12 + ' + Me.Label12.AutoSize = True + Me.Label12.Location = New System.Drawing.Point(17, 389) + Me.Label12.Name = "Label12" + Me.Label12.Size = New System.Drawing.Size(46, 17) + Me.Label12.TabIndex = 42 + Me.Label12.Text = "Level:" + ' + 'PkmLvlTextBox + ' + Me.PkmLvlTextBox.Location = New System.Drawing.Point(69, 386) + Me.PkmLvlTextBox.Name = "PkmLvlTextBox" + Me.PkmLvlTextBox.Size = New System.Drawing.Size(35, 22) + Me.PkmLvlTextBox.TabIndex = 43 + ' + 'Label13 + ' + Me.Label13.AutoSize = True + Me.Label13.Location = New System.Drawing.Point(170, 363) + Me.Label13.Name = "Label13" + Me.Label13.Size = New System.Drawing.Size(37, 17) + Me.Label13.TabIndex = 44 + Me.Label13.Text = "EVs:" + ' + 'PkmnEvsTextBox + ' + Me.PkmnEvsTextBox.Location = New System.Drawing.Point(213, 360) + Me.PkmnEvsTextBox.Name = "PkmnEvsTextBox" + Me.PkmnEvsTextBox.Size = New System.Drawing.Size(42, 22) + Me.PkmnEvsTextBox.TabIndex = 45 + ' + 'PkmnSvBttn + ' + Me.PkmnSvBttn.Location = New System.Drawing.Point(173, 398) + Me.PkmnSvBttn.Name = "PkmnSvBttn" + Me.PkmnSvBttn.Size = New System.Drawing.Size(138, 25) + Me.PkmnSvBttn.TabIndex = 46 + Me.PkmnSvBttn.Text = "Save Pokemon" + Me.PkmnSvBttn.UseVisualStyleBackColor = True ' '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, 345) + Me.ClientSize = New System.Drawing.Size(557, 481) Me.Controls.Add(Me.TabControl1) Me.Controls.Add(Me.SaveBttn) Me.Controls.Add(Me.GroupBox1) @@ -418,9 +681,13 @@ Partial Class TrainerEditor Me.TabControl1.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) Me.TabPage1.PerformLayout() + Me.GroupBox2.ResumeLayout(False) Me.TabPage2.ResumeLayout(False) Me.TabPage2.PerformLayout() - Me.GroupBox2.ResumeLayout(False) + Me.TabPage3.ResumeLayout(False) + Me.TabPage3.PerformLayout() + CType(Me.TnPkmItmPictureBox, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TnPkmPictureBox, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -459,4 +726,28 @@ Partial Class TrainerEditor Friend WithEvents DblCheckBox As System.Windows.Forms.CheckBox Friend WithEvents AITextBox As System.Windows.Forms.TextBox Friend WithEvents Label5 As System.Windows.Forms.Label + Friend WithEvents RpntPkDtBttn As System.Windows.Forms.Button + Friend WithEvents PointerPokeDataTextBox As System.Windows.Forms.TextBox + Friend WithEvents Label6 As System.Windows.Forms.Label + Friend WithEvents PokeNumTextBox As System.Windows.Forms.TextBox + Friend WithEvents Label7 As System.Windows.Forms.Label + Friend WithEvents PokeDataFormatTextBox As System.Windows.Forms.TextBox + Friend WithEvents Label8 As System.Windows.Forms.Label + Friend WithEvents PkmSlts As System.Windows.Forms.ListBox + Friend WithEvents TnPkmPictureBox As System.Windows.Forms.PictureBox + Friend WithEvents TnPkmComboBox As System.Windows.Forms.ComboBox + Friend WithEvents TnPkmItmPictureBox As System.Windows.Forms.PictureBox + Friend WithEvents TnPkmItmComboBox As System.Windows.Forms.ComboBox + Friend WithEvents Label10 As System.Windows.Forms.Label + Friend WithEvents Label9 As System.Windows.Forms.Label + Friend WithEvents AttackComboBox4 As System.Windows.Forms.ComboBox + Friend WithEvents AttackComboBox3 As System.Windows.Forms.ComboBox + Friend WithEvents AttackComboBox2 As System.Windows.Forms.ComboBox + Friend WithEvents AttackComboBox1 As System.Windows.Forms.ComboBox + Friend WithEvents PkmLvlTextBox As System.Windows.Forms.TextBox + Friend WithEvents Label12 As System.Windows.Forms.Label + Friend WithEvents Label11 As System.Windows.Forms.Label + Friend WithEvents PkmnEvsTextBox As System.Windows.Forms.TextBox + Friend WithEvents Label13 As System.Windows.Forms.Label + Friend WithEvents PkmnSvBttn As System.Windows.Forms.Button End Class diff --git a/GBAPokemonGameEditor/TrainerEditor.vb b/GBAPokemonGameEditor/TrainerEditor.vb index da1256e..f707276 100644 --- a/GBAPokemonGameEditor/TrainerEditor.vb +++ b/GBAPokemonGameEditor/TrainerEditor.vb @@ -11,11 +11,54 @@ Public Class TrainerEditor While LoopVar < (GetString(GetINIFileLocation(), header, "NumberOfTrainerClasses", "")) = True - ClassComboBox.Items.Add(GetTrainerClass(LoopVar)) LoopVar = LoopVar + 1 End While + LoopVar = 0 + + TnPkmComboBox.Items.Clear() + + While LoopVar < (GetString(GetINIFileLocation(), header, "NumberOfPokemon", "")) - 1 = True + + LoopVar = LoopVar + 1 + + TnPkmComboBox.Items.Add(GetPokemonName(LoopVar)) + + End While + + LoopVar = 0 + + AttackComboBox1.Items.Clear() + AttackComboBox2.Items.Clear() + AttackComboBox3.Items.Clear() + AttackComboBox4.Items.Clear() + + While LoopVar < (GetString(GetINIFileLocation(), header, "NumberOfAttacks", "")) + 1 = True + + + AttackComboBox1.Items.Add(GetAttackName(LoopVar)) + AttackComboBox2.Items.Add(GetAttackName(LoopVar)) + AttackComboBox3.Items.Add(GetAttackName(LoopVar)) + AttackComboBox4.Items.Add(GetAttackName(LoopVar)) + + LoopVar = LoopVar + 1 + + End While + + LoopVar = 0 + + TnPkmItmComboBox.Items.Clear() + + While LoopVar < (GetString(GetINIFileLocation(), header, "NumberOfItems", "")) = True + + TnPkmItmComboBox.Items.Add(GetItemName(LoopVar)) + + LoopVar = LoopVar + 1 + + End While + + LoopVar = 0 TrainerListComboBox.Items.Clear() @@ -105,7 +148,26 @@ Public Class TrainerEditor AITextBox.Text = Int32.Parse((ReadHEX(LoadedROM, offvar + 28, 1)), System.Globalization.NumberStyles.HexNumber) + 'Pokemon Tab Stuff + + PointerPokeDataTextBox.Text = (Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, offvar + 36, 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000)) + PokeNumTextBox.Text = Int32.Parse((ReadHEX(LoadedROM, offvar + 32, 1)), System.Globalization.NumberStyles.HexNumber) + PokeDataFormatTextBox.Text = Int32.Parse(ReadHEX(LoadedROM, offvar, 1), System.Globalization.NumberStyles.HexNumber) + + PkmSlts.Items.Clear() + + While PkmSlts.Items.Count < PokeNumTextBox.Text + + PkmSlts.Items.Add("Pokemon Slot" & (PkmSlts.Items.Count + 1)) + + End While + + PkmSlts.SelectedIndex = 0 + + 'end of Pokemon Tab Stuff + TrainerIndexTextBox.Text = TrainerListComboBox.SelectedIndex + 1 + End Sub Private Sub TrainerIndexTextBox_TextChanged(sender As Object, e As EventArgs) Handles TrainerIndexTextBox.TextChanged @@ -167,6 +229,9 @@ Public Class TrainerEditor WriteHEX(LoadedROM, offvar + 20, ReverseHEX(VB.Right("0000" & Hex(TrainerItem3.SelectedIndex), 4))) WriteHEX(LoadedROM, offvar + 22, ReverseHEX(VB.Right("0000" & Hex(TrainerItem4.SelectedIndex), 4))) + WriteHEX(LoadedROM, offvar + 32, Hex(PokeNumTextBox.Text)) + WriteHEX(LoadedROM, offvar, Hex(PokeDataFormatTextBox.Text)) + If DblCheckBox.Checked = False Then WriteHEX(LoadedROM, offvar + 24, "00") @@ -339,4 +404,159 @@ Public Class TrainerEditor ClassComboBox.SelectedIndex = savevar End Sub + + Private Sub RpntPkDtBttn_Click(sender As Object, e As EventArgs) Handles RpntPkDtBttn.Click + + Dim offvar As Integer + + offvar = Int32.Parse((GetString(GetINIFileLocation(), header, "TrainerTable", "")), System.Globalization.NumberStyles.HexNumber) + offvar = offvar + (40 * (TrainerListComboBox.SelectedIndex + 1)) + + WriteHEX(LoadedROM, offvar + 36, ReverseHEX(Hex(Int32.Parse(((PointerPokeDataTextBox.Text)), System.Globalization.NumberStyles.HexNumber) + &H8000000))) + + 'Pokemon Tab Stuff + + PointerPokeDataTextBox.Text = (Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, offvar + 36, 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000)) + PokeNumTextBox.Text = Int32.Parse((ReadHEX(LoadedROM, offvar + 32, 1)), System.Globalization.NumberStyles.HexNumber) + PokeDataFormatTextBox.Text = Int32.Parse(ReadHEX(LoadedROM, offvar, 1), System.Globalization.NumberStyles.HexNumber) + + PkmSlts.Items.Clear() + + While PkmSlts.Items.Count < PokeNumTextBox.Text + + PkmSlts.Items.Add("Pokemon Slot" & (PkmSlts.Items.Count + 1)) + + End While + + PkmSlts.SelectedIndex = 0 + + 'end of Pokemon Tab Stuff + + End Sub + + Private Sub TnPkmComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TnPkmComboBox.SelectedIndexChanged + + If GetString(AppPath & "GBAPGESettings.ini", "Settings", "DisablePKMImages", "0") = "0" Then + + If TnPkmComboBox.SelectedIndex + 1 > 0 Then + GetAndDrawFrontPokemonPic(TnPkmPictureBox, TnPkmComboBox.SelectedIndex + 1) + Else + TnPkmPictureBox.Image = Nothing + End If + End If + + End Sub + + Private Sub TnPkmItmComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TnPkmItmComboBox.SelectedIndexChanged + + If TnPkmItmComboBox.SelectedIndex > -1 Then + If header2 = "BPR" Or header2 = "BPG" Then + + GetAndDrawItemPic(TnPkmItmPictureBox, TnPkmItmComboBox.SelectedIndex) + + ElseIf header2 = "BPE" Then + + GetAndDrawItemPic(TnPkmItmPictureBox, TnPkmItmComboBox.SelectedIndex) + + ElseIf header2 = "AXP" Or header2 = "AXV" Then + + TnPkmItmPictureBox.Image = Nothing + + End If + + Else + TnPkmItmPictureBox.Image = Nothing + End If + + End Sub + + Private Sub PkmSlts_SelectedIndexChanged(sender As Object, e As EventArgs) Handles PkmSlts.SelectedIndexChanged + Dim offvar As Integer + Dim offvar2 As Integer + Dim curtype As Integer + + offvar = Int32.Parse((GetString(GetINIFileLocation(), header, "TrainerTable", "")), System.Globalization.NumberStyles.HexNumber) + offvar = offvar + (40 * (TrainerListComboBox.SelectedIndex + 1)) + + offvar2 = ((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, offvar + 36, 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000)) + + curtype = Int32.Parse(ReadHEX(LoadedROM, offvar, 1), System.Globalization.NumberStyles.HexNumber) + + If curtype = 0 Then + + PkmnEvsTextBox.Text = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + PkmLvlTextBox.Text = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 2 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + TnPkmComboBox.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 4 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) - 1 + + TnPkmItmComboBox.SelectedIndex = -1 + AttackComboBox1.SelectedIndex = -1 + AttackComboBox2.SelectedIndex = -1 + AttackComboBox3.SelectedIndex = -1 + AttackComboBox4.SelectedIndex = -1 + + TnPkmItmComboBox.Enabled = False + AttackComboBox1.Enabled = False + AttackComboBox2.Enabled = False + AttackComboBox3.Enabled = False + AttackComboBox4.Enabled = False + + ElseIf curtype = 1 Then + + PkmnEvsTextBox.Text = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + PkmLvlTextBox.Text = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 2 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + TnPkmComboBox.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 4 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) - 1 + + AttackComboBox1.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 6 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + AttackComboBox2.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 8 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + AttackComboBox3.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 10 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + AttackComboBox4.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 12 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + + TnPkmItmComboBox.SelectedIndex = -1 + + TnPkmItmComboBox.Enabled = False + AttackComboBox1.Enabled = True + AttackComboBox2.Enabled = True + AttackComboBox3.Enabled = True + AttackComboBox4.Enabled = True + + ElseIf curtype = 2 Then + + PkmnEvsTextBox.Text = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + PkmLvlTextBox.Text = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 2 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + TnPkmComboBox.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 4 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) - 1 + + TnPkmItmComboBox.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 6 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + + AttackComboBox1.SelectedIndex = -1 + AttackComboBox2.SelectedIndex = -1 + AttackComboBox3.SelectedIndex = -1 + AttackComboBox4.SelectedIndex = -1 + + TnPkmItmComboBox.Enabled = True + AttackComboBox1.Enabled = False + AttackComboBox2.Enabled = False + AttackComboBox3.Enabled = False + AttackComboBox4.Enabled = False + + ElseIf curtype = 3 Then + + PkmnEvsTextBox.Text = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + PkmLvlTextBox.Text = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 2 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + TnPkmComboBox.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 4 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) - 1 + + TnPkmItmComboBox.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 6 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + AttackComboBox1.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 8 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + AttackComboBox2.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 10 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + AttackComboBox3.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 12 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + AttackComboBox4.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, offvar2 + 14 + (PkmSlts.SelectedIndex * 16), 2)), System.Globalization.NumberStyles.HexNumber) + + TnPkmItmComboBox.Enabled = True + AttackComboBox1.Enabled = True + AttackComboBox2.Enabled = True + AttackComboBox3.Enabled = True + AttackComboBox4.Enabled = True + + End If + + 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 1fc84a2..fbc204f 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - p2dmPUsfJRI+ZQGOGeuf4Lh1YyJAx89QBb9NnFQdKY0= + ylng2iCbHSUycsYXXuzcxH49DEiDNqVz5PX2K3dTSoY= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe index afc2801..bb99cfc 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 0cab6d9..e929774 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - lSUZoGPXs7PnBWobJD30CQMn+6BTMXOTfiDGFzIluA4= + tUX9tHdEdda5dQq/lRvqCWUmgAoFB0nwusR8W8P9U2k= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb index 0f654a4..2b2aca3 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 1fc84a2..fbc204f 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application @@ -16,7 +16,7 @@ - p2dmPUsfJRI+ZQGOGeuf4Lh1YyJAx89QBb9NnFQdKY0= + ylng2iCbHSUycsYXXuzcxH49DEiDNqVz5PX2K3dTSoY= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest index 0cab6d9..e929774 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest @@ -43,14 +43,14 @@ - + - lSUZoGPXs7PnBWobJD30CQMn+6BTMXOTfiDGFzIluA4= + tUX9tHdEdda5dQq/lRvqCWUmgAoFB0nwusR8W8P9U2k= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache index b3ee42c..ebdf2a5 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 1fc84a2..fbc204f 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - p2dmPUsfJRI+ZQGOGeuf4Lh1YyJAx89QBb9NnFQdKY0= + ylng2iCbHSUycsYXXuzcxH49DEiDNqVz5PX2K3dTSoY= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe index afc2801..bb99cfc 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 0cab6d9..e929774 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - lSUZoGPXs7PnBWobJD30CQMn+6BTMXOTfiDGFzIluA4= + tUX9tHdEdda5dQq/lRvqCWUmgAoFB0nwusR8W8P9U2k= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb index 0f654a4..2b2aca3 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ