diff --git a/GBAPokemonGameEditor.v12.suo b/GBAPokemonGameEditor.v12.suo index 69cff41..74c82f8 100644 Binary files a/GBAPokemonGameEditor.v12.suo and b/GBAPokemonGameEditor.v12.suo differ diff --git a/GBAPokemonGameEditor/AboutBox1.Designer.vb b/GBAPokemonGameEditor/AboutBox1.Designer.vb index 4400b1a..0dbe924 100644 --- a/GBAPokemonGameEditor/AboutBox1.Designer.vb +++ b/GBAPokemonGameEditor/AboutBox1.Designer.vb @@ -35,16 +35,18 @@ Partial Class AboutBox1 ' Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image) Me.PictureBox1.Location = New System.Drawing.Point(0, 0) + Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(500, 200) + Me.PictureBox1.Size = New System.Drawing.Size(667, 246) Me.PictureBox1.TabIndex = 0 Me.PictureBox1.TabStop = False ' 'OKButton ' - Me.OKButton.Location = New System.Drawing.Point(413, 267) + Me.OKButton.Location = New System.Drawing.Point(551, 329) + Me.OKButton.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.OKButton.Name = "OKButton" - Me.OKButton.Size = New System.Drawing.Size(75, 23) + Me.OKButton.Size = New System.Drawing.Size(100, 28) Me.OKButton.TabIndex = 1 Me.OKButton.Text = "OK" Me.OKButton.UseVisualStyleBackColor = True @@ -52,45 +54,49 @@ Partial Class AboutBox1 'LabelVersion ' Me.LabelVersion.AutoSize = True - Me.LabelVersion.Location = New System.Drawing.Point(207, 256) + Me.LabelVersion.Location = New System.Drawing.Point(276, 315) + Me.LabelVersion.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.LabelVersion.Name = "LabelVersion" - Me.LabelVersion.Size = New System.Drawing.Size(42, 13) + Me.LabelVersion.Size = New System.Drawing.Size(56, 17) Me.LabelVersion.TabIndex = 2 Me.LabelVersion.Text = "Version" ' 'LabelCopyright ' Me.LabelCopyright.AutoSize = True - Me.LabelCopyright.Location = New System.Drawing.Point(121, 214) + Me.LabelCopyright.Location = New System.Drawing.Point(161, 263) + Me.LabelCopyright.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.LabelCopyright.Name = "LabelCopyright" - Me.LabelCopyright.Size = New System.Drawing.Size(247, 13) + Me.LabelCopyright.Size = New System.Drawing.Size(329, 17) Me.LabelCopyright.TabIndex = 3 - Me.LabelCopyright.Text = "Copyright © 2016 Gamer2020 All Rights Reserved." + Me.LabelCopyright.Text = "Copyright © 2017 Gamer2020 All Rights Reserved." ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(154, 235) + Me.Label1.Location = New System.Drawing.Point(205, 289) + Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(179, 13) + Me.Label1.Size = New System.Drawing.Size(237, 17) Me.Label1.TabIndex = 4 Me.Label1.Text = "Contact: lostatlife2020@hotmail.com" ' 'AboutBox1 ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(500, 300) + Me.ClientSize = New System.Drawing.Size(667, 369) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.LabelCopyright) Me.Controls.Add(Me.LabelVersion) Me.Controls.Add(Me.OKButton) Me.Controls.Add(Me.PictureBox1) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "AboutBox1" - Me.Padding = New System.Windows.Forms.Padding(9) + Me.Padding = New System.Windows.Forms.Padding(12, 11, 12, 11) Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "AboutBox1" diff --git a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj index 65286b3..b8a7797 100644 --- a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj +++ b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj @@ -31,7 +31,7 @@ true publish.htm 0 - 3.7.0.0 + 3.8.0.0 false true true diff --git a/GBAPokemonGameEditor/MainFrm.Designer.vb b/GBAPokemonGameEditor/MainFrm.Designer.vb index 54df5bd..c025e9c 100644 --- a/GBAPokemonGameEditor/MainFrm.Designer.vb +++ b/GBAPokemonGameEditor/MainFrm.Designer.vb @@ -59,6 +59,7 @@ Partial Class MainFrm Me.Button36 = New System.Windows.Forms.Button() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.Button12 = New System.Windows.Forms.Button() Me.Button11 = New System.Windows.Forms.Button() Me.Button10 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() @@ -85,7 +86,6 @@ Partial Class MainFrm Me.Button1 = New System.Windows.Forms.Button() Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.Label1 = New System.Windows.Forms.Label() - Me.Button12 = New System.Windows.Forms.Button() Me.MenuStrip1.SuspendLayout() Me.GroupBox4.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -116,18 +116,18 @@ Partial Class MainFrm 'OpenToolStripMenuItem ' Me.OpenToolStripMenuItem.Name = "OpenToolStripMenuItem" - Me.OpenToolStripMenuItem.Size = New System.Drawing.Size(181, 26) + Me.OpenToolStripMenuItem.Size = New System.Drawing.Size(120, 26) Me.OpenToolStripMenuItem.Text = "&Open" ' 'ToolStripMenuItem2 ' Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" - Me.ToolStripMenuItem2.Size = New System.Drawing.Size(178, 6) + Me.ToolStripMenuItem2.Size = New System.Drawing.Size(117, 6) ' 'ExitToolStripMenuItem ' Me.ExitToolStripMenuItem.Name = "ExitToolStripMenuItem" - Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(181, 26) + Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(120, 26) Me.ExitToolStripMenuItem.Text = "E&xit" ' 'SettingsToolStripMenuItem @@ -192,9 +192,9 @@ Partial Class MainFrm ' Me.GroupBox4.Controls.Add(Me.Label2) Me.GroupBox4.Location = New System.Drawing.Point(16, 33) - Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4) Me.GroupBox4.Size = New System.Drawing.Size(337, 78) Me.GroupBox4.TabIndex = 10 Me.GroupBox4.TabStop = False @@ -211,7 +211,7 @@ Partial Class MainFrm 'Button4 ' Me.Button4.Location = New System.Drawing.Point(361, 39) - Me.Button4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button4.Margin = New System.Windows.Forms.Padding(4) Me.Button4.Name = "Button4" Me.Button4.Size = New System.Drawing.Size(221, 64) Me.Button4.TabIndex = 1 @@ -226,7 +226,7 @@ Partial Class MainFrm ' Me.Button5.Enabled = False Me.Button5.Location = New System.Drawing.Point(3, 7) - Me.Button5.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button5.Margin = New System.Windows.Forms.Padding(4) Me.Button5.Name = "Button5" Me.Button5.Size = New System.Drawing.Size(108, 68) Me.Button5.TabIndex = 14 @@ -237,7 +237,7 @@ Partial Class MainFrm ' Me.Button6.Enabled = False Me.Button6.Location = New System.Drawing.Point(120, 7) - Me.Button6.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button6.Margin = New System.Windows.Forms.Padding(4) Me.Button6.Name = "Button6" Me.Button6.Size = New System.Drawing.Size(108, 68) Me.Button6.TabIndex = 15 @@ -248,7 +248,7 @@ Partial Class MainFrm ' Me.Button7.Enabled = False Me.Button7.Location = New System.Drawing.Point(236, 7) - Me.Button7.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button7.Margin = New System.Windows.Forms.Padding(4) Me.Button7.Name = "Button7" Me.Button7.Size = New System.Drawing.Size(108, 68) Me.Button7.TabIndex = 16 @@ -260,7 +260,7 @@ Partial Class MainFrm ' Me.Button24.Enabled = False Me.Button24.Location = New System.Drawing.Point(3, 84) - Me.Button24.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button24.Margin = New System.Windows.Forms.Padding(4) Me.Button24.Name = "Button24" Me.Button24.Size = New System.Drawing.Size(108, 68) Me.Button24.TabIndex = 34 @@ -272,7 +272,7 @@ Partial Class MainFrm ' Me.Button25.Enabled = False Me.Button25.Location = New System.Drawing.Point(352, 7) - Me.Button25.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button25.Margin = New System.Windows.Forms.Padding(4) Me.Button25.Name = "Button25" Me.Button25.Size = New System.Drawing.Size(108, 68) Me.Button25.TabIndex = 35 @@ -283,7 +283,7 @@ Partial Class MainFrm ' Me.Button26.Enabled = False Me.Button26.Location = New System.Drawing.Point(468, 7) - Me.Button26.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button26.Margin = New System.Windows.Forms.Padding(4) Me.Button26.Name = "Button26" Me.Button26.Size = New System.Drawing.Size(105, 68) Me.Button26.TabIndex = 36 @@ -294,7 +294,7 @@ Partial Class MainFrm ' Me.Button27.Enabled = False Me.Button27.Location = New System.Drawing.Point(4, 9) - Me.Button27.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button27.Margin = New System.Windows.Forms.Padding(4) Me.Button27.Name = "Button27" Me.Button27.Size = New System.Drawing.Size(108, 68) Me.Button27.TabIndex = 37 @@ -305,7 +305,7 @@ Partial Class MainFrm ' Me.Button28.Enabled = False Me.Button28.Location = New System.Drawing.Point(120, 9) - Me.Button28.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button28.Margin = New System.Windows.Forms.Padding(4) Me.Button28.Name = "Button28" Me.Button28.Size = New System.Drawing.Size(108, 68) Me.Button28.TabIndex = 38 @@ -316,7 +316,7 @@ Partial Class MainFrm ' Me.Button29.Enabled = False Me.Button29.Location = New System.Drawing.Point(236, 9) - Me.Button29.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button29.Margin = New System.Windows.Forms.Padding(4) Me.Button29.Name = "Button29" Me.Button29.Size = New System.Drawing.Size(108, 68) Me.Button29.TabIndex = 39 @@ -327,7 +327,7 @@ Partial Class MainFrm ' Me.Button30.Enabled = False Me.Button30.Location = New System.Drawing.Point(352, 9) - Me.Button30.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button30.Margin = New System.Windows.Forms.Padding(4) Me.Button30.Name = "Button30" Me.Button30.Size = New System.Drawing.Size(108, 68) Me.Button30.TabIndex = 40 @@ -338,7 +338,7 @@ Partial Class MainFrm ' Me.Button31.Enabled = False Me.Button31.Location = New System.Drawing.Point(468, 9) - Me.Button31.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button31.Margin = New System.Windows.Forms.Padding(4) Me.Button31.Name = "Button31" Me.Button31.Size = New System.Drawing.Size(105, 68) Me.Button31.TabIndex = 41 @@ -349,7 +349,7 @@ Partial Class MainFrm ' Me.Button32.Enabled = False Me.Button32.Location = New System.Drawing.Point(120, 84) - Me.Button32.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button32.Margin = New System.Windows.Forms.Padding(4) Me.Button32.Name = "Button32" Me.Button32.Size = New System.Drawing.Size(108, 68) Me.Button32.TabIndex = 42 @@ -360,7 +360,7 @@ Partial Class MainFrm ' Me.Button33.Enabled = False Me.Button33.Location = New System.Drawing.Point(236, 84) - Me.Button33.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button33.Margin = New System.Windows.Forms.Padding(4) Me.Button33.Name = "Button33" Me.Button33.Size = New System.Drawing.Size(108, 68) Me.Button33.TabIndex = 43 @@ -371,7 +371,7 @@ Partial Class MainFrm ' Me.Button34.Enabled = False Me.Button34.Location = New System.Drawing.Point(352, 84) - Me.Button34.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button34.Margin = New System.Windows.Forms.Padding(4) Me.Button34.Name = "Button34" Me.Button34.Size = New System.Drawing.Size(108, 68) Me.Button34.TabIndex = 44 @@ -382,7 +382,7 @@ Partial Class MainFrm ' Me.Button35.Enabled = False Me.Button35.Location = New System.Drawing.Point(468, 84) - Me.Button35.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button35.Margin = New System.Windows.Forms.Padding(4) Me.Button35.Name = "Button35" Me.Button35.Size = New System.Drawing.Size(105, 68) Me.Button35.TabIndex = 45 @@ -393,7 +393,7 @@ Partial Class MainFrm ' Me.Button36.Enabled = False Me.Button36.Location = New System.Drawing.Point(3, 159) - Me.Button36.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button36.Margin = New System.Windows.Forms.Padding(4) Me.Button36.Name = "Button36" Me.Button36.Size = New System.Drawing.Size(107, 68) Me.Button36.TabIndex = 46 @@ -406,7 +406,7 @@ Partial Class MainFrm Me.TabControl1.Controls.Add(Me.TabPage3) Me.TabControl1.Controls.Add(Me.TabPage1) Me.TabControl1.Location = New System.Drawing.Point(8, 118) - Me.TabControl1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.TabControl1.Margin = New System.Windows.Forms.Padding(4) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 Me.TabControl1.Size = New System.Drawing.Size(592, 343) @@ -430,19 +430,30 @@ Partial Class MainFrm Me.TabPage2.Controls.Add(Me.Button32) Me.TabPage2.Controls.Add(Me.Button26) Me.TabPage2.Location = New System.Drawing.Point(4, 25) - Me.TabPage2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.TabPage2.Margin = New System.Windows.Forms.Padding(4) Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.TabPage2.Padding = New System.Windows.Forms.Padding(4) Me.TabPage2.Size = New System.Drawing.Size(584, 314) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Internal Programs" Me.TabPage2.UseVisualStyleBackColor = True ' + 'Button12 + ' + Me.Button12.Enabled = False + Me.Button12.Location = New System.Drawing.Point(468, 159) + Me.Button12.Margin = New System.Windows.Forms.Padding(4) + Me.Button12.Name = "Button12" + Me.Button12.Size = New System.Drawing.Size(105, 68) + Me.Button12.TabIndex = 50 + Me.Button12.Text = "Trainer Editor" + Me.Button12.UseVisualStyleBackColor = True + ' 'Button11 ' Me.Button11.Enabled = False Me.Button11.Location = New System.Drawing.Point(352, 159) - Me.Button11.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button11.Margin = New System.Windows.Forms.Padding(4) Me.Button11.Name = "Button11" Me.Button11.Size = New System.Drawing.Size(108, 68) Me.Button11.TabIndex = 49 @@ -453,7 +464,7 @@ Partial Class MainFrm ' Me.Button10.Enabled = False Me.Button10.Location = New System.Drawing.Point(236, 159) - Me.Button10.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button10.Margin = New System.Windows.Forms.Padding(4) Me.Button10.Name = "Button10" Me.Button10.Size = New System.Drawing.Size(108, 68) Me.Button10.TabIndex = 48 @@ -464,7 +475,7 @@ Partial Class MainFrm ' Me.Button2.Enabled = False Me.Button2.Location = New System.Drawing.Point(120, 159) - Me.Button2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button2.Margin = New System.Windows.Forms.Padding(4) Me.Button2.Name = "Button2" Me.Button2.Size = New System.Drawing.Size(108, 68) Me.Button2.TabIndex = 47 @@ -494,7 +505,7 @@ Partial Class MainFrm Me.TabPage3.Controls.Add(Me.Button30) Me.TabPage3.Controls.Add(Me.Button31) Me.TabPage3.Location = New System.Drawing.Point(4, 25) - Me.TabPage3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.TabPage3.Margin = New System.Windows.Forms.Padding(4) Me.TabPage3.Name = "TabPage3" Me.TabPage3.Size = New System.Drawing.Size(584, 314) Me.TabPage3.TabIndex = 2 @@ -505,7 +516,7 @@ Partial Class MainFrm ' Me.Button47.Enabled = False Me.Button47.Location = New System.Drawing.Point(4, 234) - Me.Button47.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button47.Margin = New System.Windows.Forms.Padding(4) Me.Button47.Name = "Button47" Me.Button47.Size = New System.Drawing.Size(108, 68) Me.Button47.TabIndex = 52 @@ -516,7 +527,7 @@ Partial Class MainFrm ' Me.Button48.Enabled = False Me.Button48.Location = New System.Drawing.Point(120, 234) - Me.Button48.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button48.Margin = New System.Windows.Forms.Padding(4) Me.Button48.Name = "Button48" Me.Button48.Size = New System.Drawing.Size(108, 68) Me.Button48.TabIndex = 53 @@ -527,7 +538,7 @@ Partial Class MainFrm ' Me.Button49.Enabled = False Me.Button49.Location = New System.Drawing.Point(236, 234) - Me.Button49.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button49.Margin = New System.Windows.Forms.Padding(4) Me.Button49.Name = "Button49" Me.Button49.Size = New System.Drawing.Size(108, 68) Me.Button49.TabIndex = 54 @@ -538,7 +549,7 @@ Partial Class MainFrm ' Me.Button50.Enabled = False Me.Button50.Location = New System.Drawing.Point(352, 234) - Me.Button50.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button50.Margin = New System.Windows.Forms.Padding(4) Me.Button50.Name = "Button50" Me.Button50.Size = New System.Drawing.Size(108, 68) Me.Button50.TabIndex = 55 @@ -549,7 +560,7 @@ Partial Class MainFrm ' Me.Button51.Enabled = False Me.Button51.Location = New System.Drawing.Point(468, 234) - Me.Button51.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button51.Margin = New System.Windows.Forms.Padding(4) Me.Button51.Name = "Button51" Me.Button51.Size = New System.Drawing.Size(105, 68) Me.Button51.TabIndex = 56 @@ -560,7 +571,7 @@ Partial Class MainFrm ' Me.Button42.Enabled = False Me.Button42.Location = New System.Drawing.Point(4, 159) - Me.Button42.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button42.Margin = New System.Windows.Forms.Padding(4) Me.Button42.Name = "Button42" Me.Button42.Size = New System.Drawing.Size(108, 68) Me.Button42.TabIndex = 47 @@ -571,7 +582,7 @@ Partial Class MainFrm ' Me.Button43.Enabled = False Me.Button43.Location = New System.Drawing.Point(120, 159) - Me.Button43.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button43.Margin = New System.Windows.Forms.Padding(4) Me.Button43.Name = "Button43" Me.Button43.Size = New System.Drawing.Size(108, 68) Me.Button43.TabIndex = 48 @@ -582,7 +593,7 @@ Partial Class MainFrm ' Me.Button44.Enabled = False Me.Button44.Location = New System.Drawing.Point(236, 159) - Me.Button44.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button44.Margin = New System.Windows.Forms.Padding(4) Me.Button44.Name = "Button44" Me.Button44.Size = New System.Drawing.Size(108, 68) Me.Button44.TabIndex = 49 @@ -593,7 +604,7 @@ Partial Class MainFrm ' Me.Button45.Enabled = False Me.Button45.Location = New System.Drawing.Point(352, 159) - Me.Button45.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button45.Margin = New System.Windows.Forms.Padding(4) Me.Button45.Name = "Button45" Me.Button45.Size = New System.Drawing.Size(108, 68) Me.Button45.TabIndex = 50 @@ -604,7 +615,7 @@ Partial Class MainFrm ' Me.Button46.Enabled = False Me.Button46.Location = New System.Drawing.Point(468, 159) - Me.Button46.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button46.Margin = New System.Windows.Forms.Padding(4) Me.Button46.Name = "Button46" Me.Button46.Size = New System.Drawing.Size(105, 68) Me.Button46.TabIndex = 51 @@ -615,7 +626,7 @@ Partial Class MainFrm ' Me.Button37.Enabled = False Me.Button37.Location = New System.Drawing.Point(4, 84) - Me.Button37.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button37.Margin = New System.Windows.Forms.Padding(4) Me.Button37.Name = "Button37" Me.Button37.Size = New System.Drawing.Size(108, 68) Me.Button37.TabIndex = 42 @@ -626,7 +637,7 @@ Partial Class MainFrm ' Me.Button38.Enabled = False Me.Button38.Location = New System.Drawing.Point(120, 84) - Me.Button38.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button38.Margin = New System.Windows.Forms.Padding(4) Me.Button38.Name = "Button38" Me.Button38.Size = New System.Drawing.Size(108, 68) Me.Button38.TabIndex = 43 @@ -637,7 +648,7 @@ Partial Class MainFrm ' Me.Button39.Enabled = False Me.Button39.Location = New System.Drawing.Point(236, 84) - Me.Button39.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button39.Margin = New System.Windows.Forms.Padding(4) Me.Button39.Name = "Button39" Me.Button39.Size = New System.Drawing.Size(108, 68) Me.Button39.TabIndex = 44 @@ -648,7 +659,7 @@ Partial Class MainFrm ' Me.Button40.Enabled = False Me.Button40.Location = New System.Drawing.Point(352, 84) - Me.Button40.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button40.Margin = New System.Windows.Forms.Padding(4) Me.Button40.Name = "Button40" Me.Button40.Size = New System.Drawing.Size(108, 68) Me.Button40.TabIndex = 45 @@ -659,7 +670,7 @@ Partial Class MainFrm ' Me.Button41.Enabled = False Me.Button41.Location = New System.Drawing.Point(468, 84) - Me.Button41.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button41.Margin = New System.Windows.Forms.Padding(4) Me.Button41.Name = "Button41" Me.Button41.Size = New System.Drawing.Size(105, 68) Me.Button41.TabIndex = 46 @@ -673,9 +684,9 @@ Partial Class MainFrm Me.TabPage1.Controls.Add(Me.Button3) Me.TabPage1.Controls.Add(Me.Button1) Me.TabPage1.Location = New System.Drawing.Point(4, 25) - Me.TabPage1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.TabPage1.Margin = New System.Windows.Forms.Padding(4) Me.TabPage1.Name = "TabPage1" - Me.TabPage1.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.TabPage1.Padding = New System.Windows.Forms.Padding(4) Me.TabPage1.Size = New System.Drawing.Size(584, 314) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Patchers and Expanders" @@ -685,7 +696,7 @@ Partial Class MainFrm ' Me.Button9.Enabled = False Me.Button9.Location = New System.Drawing.Point(236, 7) - Me.Button9.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button9.Margin = New System.Windows.Forms.Padding(4) Me.Button9.Name = "Button9" Me.Button9.Size = New System.Drawing.Size(108, 68) Me.Button9.TabIndex = 36 @@ -696,7 +707,7 @@ Partial Class MainFrm ' Me.Button8.Enabled = False Me.Button8.Location = New System.Drawing.Point(4, 84) - Me.Button8.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button8.Margin = New System.Windows.Forms.Padding(4) Me.Button8.Name = "Button8" Me.Button8.Size = New System.Drawing.Size(108, 68) Me.Button8.TabIndex = 35 @@ -708,7 +719,7 @@ Partial Class MainFrm ' Me.Button3.Enabled = False Me.Button3.Location = New System.Drawing.Point(120, 7) - Me.Button3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button3.Margin = New System.Windows.Forms.Padding(4) Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(108, 68) Me.Button3.TabIndex = 16 @@ -719,7 +730,7 @@ Partial Class MainFrm ' Me.Button1.Enabled = False Me.Button1.Location = New System.Drawing.Point(4, 7) - Me.Button1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button1.Margin = New System.Windows.Forms.Padding(4) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(108, 68) Me.Button1.TabIndex = 15 @@ -730,9 +741,9 @@ Partial Class MainFrm ' Me.GroupBox1.Controls.Add(Me.Label1) Me.GroupBox1.Location = New System.Drawing.Point(16, 469) - Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4) Me.GroupBox1.Size = New System.Drawing.Size(577, 46) Me.GroupBox1.TabIndex = 48 Me.GroupBox1.TabStop = False @@ -745,18 +756,7 @@ Partial Class MainFrm Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(333, 17) Me.Label1.TabIndex = 0 - Me.Label1.Text = "Copyright © 2016 Gamer2020 All Rights Reserved. " - ' - 'Button12 - ' - Me.Button12.Enabled = False - Me.Button12.Location = New System.Drawing.Point(468, 159) - Me.Button12.Margin = New System.Windows.Forms.Padding(4) - Me.Button12.Name = "Button12" - Me.Button12.Size = New System.Drawing.Size(105, 68) - Me.Button12.TabIndex = 50 - Me.Button12.Text = "Trainer Editor" - Me.Button12.UseVisualStyleBackColor = True + Me.Label1.Text = "Copyright © 2017 Gamer2020 All Rights Reserved. " ' 'MainFrm ' @@ -772,7 +772,7 @@ Partial Class MainFrm Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.MainMenuStrip = Me.MenuStrip1 - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.Name = "MainFrm" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen diff --git a/GBAPokemonGameEditor/My Project/AssemblyInfo.vb b/GBAPokemonGameEditor/My Project/AssemblyInfo.vb index d64628f..45eed6c 100644 --- a/GBAPokemonGameEditor/My Project/AssemblyInfo.vb +++ b/GBAPokemonGameEditor/My Project/AssemblyInfo.vb @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/GBAPokemonGameEditor/Pokemonedit.vb b/GBAPokemonGameEditor/Pokemonedit.vb index aea0627..2a99f17 100644 --- a/GBAPokemonGameEditor/Pokemonedit.vb +++ b/GBAPokemonGameEditor/Pokemonedit.vb @@ -73,6 +73,16 @@ Public Class Pokemonedit End While + + LoopVar = 0 + + While LoopVar < (GetString(GetINIFileLocation(), header, "NumberOfMapLabels", "")) + + ComboBox2.Items.Add(GetMapLabelName(LoopVar)) + + LoopVar = LoopVar + 1 + End While + LoopVar = 0 NewAt.Items.Clear() @@ -3968,4 +3978,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..b8e65a5 100644 --- a/GBAPokemonGameEditor/TrainerEditor.Designer.vb +++ b/GBAPokemonGameEditor/TrainerEditor.Designer.vb @@ -48,24 +48,55 @@ 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.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.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.SaveMnyRt = New System.Windows.Forms.Button() + Me.MoneyRateTextBox = New System.Windows.Forms.TextBox() + Me.Label14 = New System.Windows.Forms.Label() + Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.PkmnSvBttn = New System.Windows.Forms.Button() + Me.PkmnEvsTextBox = New System.Windows.Forms.TextBox() + Me.Label13 = New System.Windows.Forms.Label() + Me.PkmLvlTextBox = New System.Windows.Forms.TextBox() + Me.Label12 = New System.Windows.Forms.Label() + Me.Label11 = New System.Windows.Forms.Label() + 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.Label15 = New System.Windows.Forms.Label() 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 +305,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 +327,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, 436) 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 +371,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 +387,324 @@ 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.Label15) + Me.TabPage2.Controls.Add(Me.SaveMnyRt) + Me.TabPage2.Controls.Add(Me.MoneyRateTextBox) + Me.TabPage2.Controls.Add(Me.Label14) + 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, 436) + Me.TabPage2.TabIndex = 1 + Me.TabPage2.Text = "Trainer Class" + Me.TabPage2.UseVisualStyleBackColor = True ' - 'AITextBox + 'SaveMnyRt ' - 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.SaveMnyRt.Location = New System.Drawing.Point(64, 164) + Me.SaveMnyRt.Name = "SaveMnyRt" + Me.SaveMnyRt.Size = New System.Drawing.Size(181, 34) + Me.SaveMnyRt.TabIndex = 26 + Me.SaveMnyRt.Text = "Save" + Me.SaveMnyRt.UseVisualStyleBackColor = True + ' + 'MoneyRateTextBox + ' + Me.MoneyRateTextBox.Location = New System.Drawing.Point(164, 112) + Me.MoneyRateTextBox.Name = "MoneyRateTextBox" + Me.MoneyRateTextBox.Size = New System.Drawing.Size(81, 22) + Me.MoneyRateTextBox.TabIndex = 25 + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Location = New System.Drawing.Point(61, 115) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(88, 17) + Me.Label14.TabIndex = 24 + Me.Label14.Text = "Money Rate:" + ' + 'TabPage3 + ' + 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 + ' + '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 + ' + '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 + ' + '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:" + ' + '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 + ' + '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:" + ' + '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:" + ' + '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:" + ' + 'Label15 + ' + Me.Label15.AutoSize = True + Me.Label15.Location = New System.Drawing.Point(61, 144) + Me.Label15.Name = "Label15" + Me.Label15.Size = New System.Drawing.Size(98, 17) + Me.Label15.TabIndex = 27 + Me.Label15.Text = "Prize Money: " ' '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 +723,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 +768,32 @@ 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 + Friend WithEvents SaveMnyRt As System.Windows.Forms.Button + Friend WithEvents MoneyRateTextBox As System.Windows.Forms.TextBox + Friend WithEvents Label14 As System.Windows.Forms.Label + Friend WithEvents Label15 As System.Windows.Forms.Label End Class diff --git a/GBAPokemonGameEditor/TrainerEditor.vb b/GBAPokemonGameEditor/TrainerEditor.vb index da1256e..ac5cc4d 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() @@ -54,58 +97,83 @@ Public Class TrainerEditor Private Sub TrainerListComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TrainerListComboBox.SelectedIndexChanged - Dim offvar As Integer - Dim MusicGen As Integer - Dim MusicGenBin As String + If TrainerListComboBox.SelectedIndex <> -1 Then - PicNumericUpDown.Value = 1 - PicNumericUpDown.Value = 0 - PicNumericUpDown.Maximum = (GetString(GetINIFileLocation(), header, "NumberOfTrainerImages", "")) + Dim offvar As Integer + Dim MusicGen As Integer + Dim MusicGenBin As String - offvar = Int32.Parse((GetString(GetINIFileLocation(), header, "TrainerTable", "")), System.Globalization.NumberStyles.HexNumber) + PicNumericUpDown.Value = 1 + PicNumericUpDown.Value = 0 + PicNumericUpDown.Maximum = (GetString(GetINIFileLocation(), header, "NumberOfTrainerImages", "")) - offvar = offvar + (40 * (TrainerListComboBox.SelectedIndex + 1)) + offvar = Int32.Parse((GetString(GetINIFileLocation(), header, "TrainerTable", "")), System.Globalization.NumberStyles.HexNumber) - TNameTextBox.Text = GetTrainerName(TrainerListComboBox.SelectedIndex + 1) + offvar = offvar + (40 * (TrainerListComboBox.SelectedIndex + 1)) - PicNumericUpDown.Value = Int32.Parse(ReadHEX(LoadedROM, offvar + 3, 1), System.Globalization.NumberStyles.HexNumber) + TNameTextBox.Text = GetTrainerName(TrainerListComboBox.SelectedIndex + 1) - ClassComboBox.SelectedIndex = Int32.Parse(ReadHEX(LoadedROM, offvar + 1, 1), System.Globalization.NumberStyles.HexNumber) + PicNumericUpDown.Value = Int32.Parse(ReadHEX(LoadedROM, offvar + 3, 1), System.Globalization.NumberStyles.HexNumber) - MusicGen = Int32.Parse(ReadHEX(LoadedROM, offvar + 2, 1), System.Globalization.NumberStyles.HexNumber) + ClassComboBox.SelectedIndex = Int32.Parse(ReadHEX(LoadedROM, offvar + 1, 1), System.Globalization.NumberStyles.HexNumber) - MusicGenBin = (Convert.ToString(MusicGen, 2)) + MusicGen = Int32.Parse(ReadHEX(LoadedROM, offvar + 2, 1), System.Globalization.NumberStyles.HexNumber) - 'While Len(MusicGenBin) < 8 + MusicGenBin = (Convert.ToString(MusicGen, 2)) - ' MusicGenBin = "0" & MusicGenBin + 'While Len(MusicGenBin) < 8 - 'End While + ' MusicGenBin = "0" & MusicGenBin - MusicGenBin = VB.Right("00000000" & MusicGenBin, 8) + 'End While + + MusicGenBin = VB.Right("00000000" & MusicGenBin, 8) + + If GetChar(MusicGenBin, 1) = "0" Then + RadioButton1.Checked = True + ElseIf GetChar(MusicGenBin, 1) = "1" Then + RadioButton2.Checked = True + End If + + 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) + + '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 + + CalcPrizeMoney() + + 'end of Pokemon Tab Stuff + + TrainerIndexTextBox.Text = TrainerListComboBox.SelectedIndex + 1 - If GetChar(MusicGenBin, 1) = "0" Then - RadioButton1.Checked = True - ElseIf GetChar(MusicGenBin, 1) = "1" Then - RadioButton2.Checked = True End If - 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 Private Sub TrainerIndexTextBox_TextChanged(sender As Object, e As EventArgs) Handles TrainerIndexTextBox.TextChanged @@ -154,6 +222,8 @@ Public Class TrainerEditor Dim MusicGenBin As String = "" Dim Musictextbx As Integer + Dim loadedindex As Integer + offvar = Int32.Parse((GetString(GetINIFileLocation(), header, "TrainerTable", "")), System.Globalization.NumberStyles.HexNumber) offvar = offvar + (40 * (TrainerListComboBox.SelectedIndex + 1)) @@ -167,6 +237,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") @@ -195,7 +268,9 @@ Public Class TrainerEditor WriteHEX(LoadedROM, offvar + 2, Hex(MusicGen)) - + loadedindex = TrainerListComboBox.SelectedIndex + TrainerListComboBox.SelectedIndex = -1 + TrainerListComboBox.SelectedIndex = loadedindex End Sub @@ -315,6 +390,22 @@ Public Class TrainerEditor End Sub Private Sub ClassComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ClassComboBox.SelectedIndexChanged + + Dim offvar As Integer + + Dim looper As Integer = 0 + + offvar = Int32.Parse((GetString(GetINIFileLocation(), header, "TrainerMoneyTable", "")), System.Globalization.NumberStyles.HexNumber) + + While ClassComboBox.SelectedIndex <> Int32.Parse(ReadHEX(LoadedROM, offvar + (looper * 4), 1), System.Globalization.NumberStyles.HexNumber) And 255 <> Int32.Parse(ReadHEX(LoadedROM, offvar + (looper * 4), 1), System.Globalization.NumberStyles.HexNumber) + + + looper = looper + 1 + + End While + + MoneyRateTextBox.Text = Int32.Parse(ReadHEX(LoadedROM, offvar + (looper * 4) + 1, 1), System.Globalization.NumberStyles.HexNumber) + ClssTxtBx.Text = ClassComboBox.SelectedItem End Sub @@ -339,4 +430,268 @@ 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 + + CalcPrizeMoney() + + '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 + + Private Sub PkmnSvBttn_Click(sender As Object, e As EventArgs) Handles PkmnSvBttn.Click + + 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 + + WriteHEX(LoadedROM, offvar2 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(PkmnEvsTextBox.Text), 4))) + WriteHEX(LoadedROM, offvar2 + 2 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(PkmLvlTextBox.Text), 4))) + WriteHEX(LoadedROM, offvar2 + 4 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(TnPkmComboBox.SelectedIndex + 1), 4))) + + ElseIf curtype = 1 Then + + WriteHEX(LoadedROM, offvar2 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(PkmnEvsTextBox.Text), 4))) + WriteHEX(LoadedROM, offvar2 + 2 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(PkmLvlTextBox.Text), 4))) + WriteHEX(LoadedROM, offvar2 + 4 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(TnPkmComboBox.SelectedIndex + 1), 4))) + + WriteHEX(LoadedROM, offvar2 + 6 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(AttackComboBox1.SelectedIndex), 4))) + WriteHEX(LoadedROM, offvar2 + 8 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(AttackComboBox2.SelectedIndex), 4))) + WriteHEX(LoadedROM, offvar2 + 10 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(AttackComboBox3.SelectedIndex), 4))) + WriteHEX(LoadedROM, offvar2 + 12 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(AttackComboBox4.SelectedIndex), 4))) + + ElseIf curtype = 2 Then + + WriteHEX(LoadedROM, offvar2 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(PkmnEvsTextBox.Text), 4))) + WriteHEX(LoadedROM, offvar2 + 2 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(PkmLvlTextBox.Text), 4))) + WriteHEX(LoadedROM, offvar2 + 4 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(TnPkmComboBox.SelectedIndex + 1), 4))) + + WriteHEX(LoadedROM, offvar2 + 6 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(TnPkmItmComboBox.SelectedIndex), 4))) + + ElseIf curtype = 3 Then + + WriteHEX(LoadedROM, offvar2 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(PkmnEvsTextBox.Text), 4))) + WriteHEX(LoadedROM, offvar2 + 2 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(PkmLvlTextBox.Text), 4))) + WriteHEX(LoadedROM, offvar2 + 4 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(TnPkmComboBox.SelectedIndex + 1), 4))) + + WriteHEX(LoadedROM, offvar2 + 6 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(TnPkmItmComboBox.SelectedIndex), 4))) + + WriteHEX(LoadedROM, offvar2 + 8 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(AttackComboBox1.SelectedIndex), 4))) + WriteHEX(LoadedROM, offvar2 + 10 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(AttackComboBox2.SelectedIndex), 4))) + WriteHEX(LoadedROM, offvar2 + 12 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(AttackComboBox3.SelectedIndex), 4))) + WriteHEX(LoadedROM, offvar2 + 14 + (PkmSlts.SelectedIndex * 16), ReverseHEX(VB.Right("0000" & Hex(AttackComboBox4.SelectedIndex), 4))) + + End If + + End Sub + + Private Sub SaveMnyRt_Click(sender As Object, e As EventArgs) Handles SaveMnyRt.Click + Dim offvar As Integer + + Dim looper As Integer = 0 + + offvar = Int32.Parse((GetString(GetINIFileLocation(), header, "TrainerMoneyTable", "")), System.Globalization.NumberStyles.HexNumber) + + While ClassComboBox.SelectedIndex <> Int32.Parse(ReadHEX(LoadedROM, offvar + (looper * 4), 1), System.Globalization.NumberStyles.HexNumber) And 255 <> Int32.Parse(ReadHEX(LoadedROM, offvar + (looper * 4), 1), System.Globalization.NumberStyles.HexNumber) + + + looper = looper + 1 + + End While + + WriteHEX(LoadedROM, offvar + (looper * 4) + 1, Hex(MoneyRateTextBox.Text)) + + End Sub + + Private Sub MoneyRateTextBox_TextChanged(sender As Object, e As EventArgs) Handles MoneyRateTextBox.TextChanged + + CalcPrizeMoney() + + End Sub + + Private Sub CalcPrizeMoney() + + Dim offvar As Integer + Dim offvar2 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)) + + Dim num As Integer = 0 + Dim num2 As Integer = 8 + + If PokeDataFormatTextBox.Text <> "" And MoneyRateTextBox.Text <> "" Then + + If PokeDataFormatTextBox.Text = 1 Or PokeDataFormatTextBox.Text = 3 Then + num2 = &H10 + End If + If (PkmSlts.Items.Count > 0) Then + num = (4 * Int32.Parse(ReadHEX(LoadedROM, ((((offvar2) + (num2 * PkmSlts.Items.Count)) - num2) + 2), 1), System.Globalization.NumberStyles.HexNumber)) + End If + Label15.Text = ("Prize Money: " & ((num * MoneyRateTextBox.Text))) + + End If + + End Sub + End Class \ No newline at end of file diff --git a/GBAPokemonGameEditor/WichuRomFunctions.vb b/GBAPokemonGameEditor/WichuRomFunctions.vb index 07fb836..3871707 100644 --- a/GBAPokemonGameEditor/WichuRomFunctions.vb +++ b/GBAPokemonGameEditor/WichuRomFunctions.vb @@ -141,7 +141,7 @@ Module WichuRomFunctions Public Function FromRSChar(ByVal ch As Byte) As Object Dim array As Byte() = New Byte() {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &HFE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &HAB, 0, 0, &HB7, &H5B, 0, 180, &H5C, &H5D, &HB9, &H2E, &HB8, &HAE, &HAD, &HBA, &HA1, &HA2, &HA3, &HA4, &HA5, &HA6, &HA7, &HA8, &HA9, 170, 240, &H36, 0, &H35, 0, &HAC, 0, &HBB, &HBC, &HBD, 190, &HBF, &HC0, &HC1, &HC2, &HC3, &HC4, &HC5, &HC6, &HC7, 200, &HC9, &HCA, &HCB, &HCC, &HCD, &HCE, &HCF, &HD0, &HD1, 210, &HD3, &HD4, 0, 0, 0, 0, 0, &HB3, &HD5, &HD6, &HD7, &HD8, &HD9, &HDA, &HDB, 220, &HDD, &HDE, &HDF, &HE0, &HE1, &HE2, &HE3, &HE4, &HE5, 230, &HE7, &HE8, &HE9, &HEA, &HEB, &HEC, &HED, &HEE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &H52, 0, 0, 0, 0, 0, 0, 0, 0, &H2B, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &H2A, 0, 0, 0, 0, &H51, 1, 2, 0, 0, &HF1, 0, 0, 4, 5, 6, 7, 8, 9, 90, 11, 12, 0, 20, 13, 14, 15, 0, &HF2, 0, 0, &H11, &H12, &H13, &HF3, 0, 0, &H15, &H16, &H17, &H68, 0, &HF4, 0, 0, &H19, &H1A, &H1B, &H1C, &H1D, 30, &H6F, &H20, &H21, 0, &H29, &H22, &H23, &H24, 0, &HF5, 0, 0, &H26, &H27, 40, &HF6, 0, 0, 0, 0} 'Dim index As Integer = array.IndexOf(Of Byte)(array, ch) - Dim index As Integer = array.IndexOf(array, ch) + Dim index As Integer = System.Array.IndexOf(array, ch) If (index = -1) Then index = 0 End If diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application index 1fc84a2..2bab9ec 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application @@ -1,6 +1,6 @@  - + @@ -10,13 +10,13 @@ - + - p2dmPUsfJRI+ZQGOGeuf4Lh1YyJAx89QBb9NnFQdKY0= + xd50aTWRTRGUVR/smbYM5VR7xVADbJqpcwGRx2aRAfI= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe index afc2801..a79b164 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..8c0c933 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest @@ -1,10 +1,10 @@  - + - + @@ -43,14 +43,14 @@ - - + + - lSUZoGPXs7PnBWobJD30CQMn+6BTMXOTfiDGFzIluA4= + /EOBJtiqvTjj+BrKFAp/wGP2ypb7Xry95eyGQdXf/iY= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb index 0f654a4..10cbb35 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..2bab9ec 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application @@ -1,6 +1,6 @@  - + @@ -10,13 +10,13 @@ - + - p2dmPUsfJRI+ZQGOGeuf4Lh1YyJAx89QBb9NnFQdKY0= + xd50aTWRTRGUVR/smbYM5VR7xVADbJqpcwGRx2aRAfI= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest index 0cab6d9..8c0c933 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest @@ -1,10 +1,10 @@  - + - + @@ -43,14 +43,14 @@ - - + + - lSUZoGPXs7PnBWobJD30CQMn+6BTMXOTfiDGFzIluA4= + /EOBJtiqvTjj+BrKFAp/wGP2ypb7Xry95eyGQdXf/iY= diff --git a/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe deleted file mode 100644 index 405df0b..0000000 Binary files a/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe and /dev/null differ diff --git a/GBAPokemonGameEditor/bin/Debug/ini/roms.ini b/GBAPokemonGameEditor/bin/Debug/ini/roms.ini index c96cc12..bdcaffc 100644 --- a/GBAPokemonGameEditor/bin/Debug/ini/roms.ini +++ b/GBAPokemonGameEditor/bin/Debug/ini/roms.ini @@ -560,11 +560,11 @@ ItemAnimationTable=45FD54 TrainerTable=23EAC8 NumberOfTrainers=742 TrainerClasses=23E558 -NumberOfTrainerClasses=6B +NumberOfTrainerClasses=107 TrainerImageTable=23957C NumberOfTrainerImages=147 TrainerPaletteTable=239A1C -TrainerClassMoney=24F220 +TrainerMoneyTable=24F220 DexSizeTrainerSprite=135 TradeData=26CF8C NumberOfTrades=9 @@ -745,11 +745,11 @@ HabitatTable=0 TrainerTable=23EACC NumberOfTrainers=742 TrainerClasses=23E534 -NumberOfTrainerClasses=6B +NumberOfTrainerClasses=107 TrainerImageTable=239558 NumberOfTrainerImages=147 TrainerPaletteTable=2399F8 -TrainerClassMoney=24F1FC +TrainerMoneyTable=24F1FC [BPEE] ROMName=Pokémon Emerald (English) @@ -1009,12 +1009,40 @@ Evolution12Param=level Evolution13Param=evolvesbutnoparms Evolution14Param=level Evolution15Param=evolvesbasedonvalue +EvolutionName16=Knows Move +Evolution16Param=attack +EvolutionName17=In certain map +Evolution17Param=mapname +EvolutionName18=Level-up at day +Evolution18Param=level +EvolutionName19=Level-up at night +Evolution19Param=level +EvolutionName20=Holding item at day +Evolution20Param=item +EvolutionName21=Holding item at night +Evolution21Param=item +EvolutionName22=Level-up if male +Evolution22Param=level +EvolutionName23=Level-up if female +Evolution23Param=level +EvolutionName24=Level-up if raining +Evolution24Param=level +EvolutionName25=Specific Pokemon in party +Evolution25Param=species +EvolutionName26=Level-up if pokemon with type in party +Evolution26Param=bankandmap +EvolutionName27=Using item if male +Evolution27Param=item +EvolutionName28=Using item if female +Evolution28Param=item EvolutionName252=Wish Mega Evolution Evolution252Param=attack EvolutionName251=Mega Evolution Evolution251Param=item EvolutionName255=Revert Megas Evolution255Param=evolvesbutnoparms +EvolutionName253=Primal Reversion +Evolution253Param=evolvesbasedonvalue EggMoveTable=32ADD8 EggMoveTableLimiter=70464 TrainerTable=310030 @@ -1024,6 +1052,7 @@ NumberOfTrainerClasses=66 TrainerImageTable=305654 NumberOfTrainerImages=92 TrainerPaletteTable=30593C +TrainerMoneyTable=31AEB8 DexSizeTrainerSprite=71 TradeData=338ED0 NumberOfTrades=4 diff --git a/GBAPokemonGameEditor/modTextSapp.vb b/GBAPokemonGameEditor/modTextSapp.vb index bf6a19d..7c83019 100644 --- a/GBAPokemonGameEditor/modTextSapp.vb +++ b/GBAPokemonGameEditor/modTextSapp.vb @@ -6,6 +6,8 @@ Module modTextSapp o = "" Y = "" + Dim i As Integer + Dim m As Boolean For i = 1 To Len(asciistring) m = False @@ -373,6 +375,9 @@ Module modTextSapp Public Function Sapp2Asc(ByVal sappstring As String, Optional ByVal japanese As Boolean = False) As String Dim Y As String Dim n As Boolean + + Dim i As Integer + o = "" For i = 1 To Len(sappstring) X = IIf(Mid(sappstring, i, 1) = "", 0, Asc(Mid(sappstring, i, 1))) @@ -787,6 +792,8 @@ Module modTextSapp o = "" Y = "" + Dim i As Integer + Dim m As Boolean For i = 1 To Len(asciistring) m = False diff --git a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index ca5ba6d..0b247cc 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache and b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt index 51b99c5..d26e506 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt +++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt @@ -213,6 +213,7 @@ D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.SplashScreen1.resources D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.TMHMEditor.resources D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.TradeEditor.resources +D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.TrainerEditor.resources D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.vbproj.GenerateResource.Cache D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.TrustInfo.xml D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.exe.manifest @@ -221,4 +222,3 @@ D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.xml D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.pdb D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache -D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.TrainerEditor.resources diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache index b3ee42c..bdaceea 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/GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache index fb8c7ae..3e73083 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application index 1fc84a2..2bab9ec 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application @@ -1,6 +1,6 @@  - + @@ -10,13 +10,13 @@ - + - p2dmPUsfJRI+ZQGOGeuf4Lh1YyJAx89QBb9NnFQdKY0= + xd50aTWRTRGUVR/smbYM5VR7xVADbJqpcwGRx2aRAfI= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe index afc2801..a79b164 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..8c0c933 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest @@ -1,10 +1,10 @@  - + - + @@ -43,14 +43,14 @@ - - + + - lSUZoGPXs7PnBWobJD30CQMn+6BTMXOTfiDGFzIluA4= + /EOBJtiqvTjj+BrKFAp/wGP2ypb7Xry95eyGQdXf/iY= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb index 0f654a4..10cbb35 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ diff --git a/LICENSE b/LICENSE index ff155ec..e39de09 100644 --- a/LICENSE +++ b/LICENSE @@ -4,7 +4,7 @@ This is the license agreement for the program Pokemon Game Editor. By using the 2. This program has undergone testing and it is in a working condition but you alone are responsible for what this program does to your computer, files, and anything that results from the program's use. -3. The creators of this program have no obligation to offer support of any kind for this program. Any support offered is done as a courtesy with no standard expentancy of quality. Support is currently offered through the Github page. +3. The creators of this program have no obligation to offer support of any kind for this program. Any support offered is done as a courtesy with no standard expentancy of quality. Support is currently offered through the Github page and no where else. 4. This is a free program. If you paid for it you have been ripped off and should try to get your money back. diff --git a/README.md b/README.md index 8d31c0c..ec7d12b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,3 @@ -Please use the lastest beta! -================= - ![alt tag](https://raw.githubusercontent.com/Gamer2020/PokemonGameEditor/master/Screenshots/PGEBANNER.png) Pokemon Game Editor, commonly know as PGE, is an all in one tool started in 2010 by Gamer2020 for hacking the Game Boy Advanced Pokemon games. The program continues to evolve over the years and has had 60,000+ downloads. It has even inspired several copycat programs hence the slogan "Accept no Imitations!" was adopted. The program is currently developed in VB.Net with Visual Studio 2013. @@ -91,11 +88,11 @@ Pokedex List Editor. Pokemon Cry Exporting. +Trainer Editor. + Planned Features A.K.A TODO List ========================= -Trainer Editor (Started) - Pokemon Cry Importing OW Editor @@ -142,7 +139,7 @@ Gamer2020 Issues ================= -Running added programs on Linux not implemented yet and possibly won't be for a while. +Running added programs on Linux not implemented yet and possibly won't be for a while. Also keep in kind that the program hasn't been tested under Linux in a long time. Credits ================= @@ -189,6 +186,8 @@ doom-desire DizzyEggg +KDSKardabox + EddyHg80 Downloads diff --git a/roms.ini b/roms.ini index c96cc12..bdcaffc 100644 --- a/roms.ini +++ b/roms.ini @@ -560,11 +560,11 @@ ItemAnimationTable=45FD54 TrainerTable=23EAC8 NumberOfTrainers=742 TrainerClasses=23E558 -NumberOfTrainerClasses=6B +NumberOfTrainerClasses=107 TrainerImageTable=23957C NumberOfTrainerImages=147 TrainerPaletteTable=239A1C -TrainerClassMoney=24F220 +TrainerMoneyTable=24F220 DexSizeTrainerSprite=135 TradeData=26CF8C NumberOfTrades=9 @@ -745,11 +745,11 @@ HabitatTable=0 TrainerTable=23EACC NumberOfTrainers=742 TrainerClasses=23E534 -NumberOfTrainerClasses=6B +NumberOfTrainerClasses=107 TrainerImageTable=239558 NumberOfTrainerImages=147 TrainerPaletteTable=2399F8 -TrainerClassMoney=24F1FC +TrainerMoneyTable=24F1FC [BPEE] ROMName=Pokémon Emerald (English) @@ -1009,12 +1009,40 @@ Evolution12Param=level Evolution13Param=evolvesbutnoparms Evolution14Param=level Evolution15Param=evolvesbasedonvalue +EvolutionName16=Knows Move +Evolution16Param=attack +EvolutionName17=In certain map +Evolution17Param=mapname +EvolutionName18=Level-up at day +Evolution18Param=level +EvolutionName19=Level-up at night +Evolution19Param=level +EvolutionName20=Holding item at day +Evolution20Param=item +EvolutionName21=Holding item at night +Evolution21Param=item +EvolutionName22=Level-up if male +Evolution22Param=level +EvolutionName23=Level-up if female +Evolution23Param=level +EvolutionName24=Level-up if raining +Evolution24Param=level +EvolutionName25=Specific Pokemon in party +Evolution25Param=species +EvolutionName26=Level-up if pokemon with type in party +Evolution26Param=bankandmap +EvolutionName27=Using item if male +Evolution27Param=item +EvolutionName28=Using item if female +Evolution28Param=item EvolutionName252=Wish Mega Evolution Evolution252Param=attack EvolutionName251=Mega Evolution Evolution251Param=item EvolutionName255=Revert Megas Evolution255Param=evolvesbutnoparms +EvolutionName253=Primal Reversion +Evolution253Param=evolvesbasedonvalue EggMoveTable=32ADD8 EggMoveTableLimiter=70464 TrainerTable=310030 @@ -1024,6 +1052,7 @@ NumberOfTrainerClasses=66 TrainerImageTable=305654 NumberOfTrainerImages=92 TrainerPaletteTable=30593C +TrainerMoneyTable=31AEB8 DexSizeTrainerSprite=71 TradeData=338ED0 NumberOfTrades=4