diff --git a/GBAPokemonGameEditor.v12.suo b/GBAPokemonGameEditor.v12.suo index fed774c..3fb411b 100644 Binary files a/GBAPokemonGameEditor.v12.suo and b/GBAPokemonGameEditor.v12.suo differ diff --git a/GBAPokemonGameEditor/CryFunctions.vb b/GBAPokemonGameEditor/CryFunctions.vb new file mode 100644 index 0000000..5e7a95f --- /dev/null +++ b/GBAPokemonGameEditor/CryFunctions.vb @@ -0,0 +1,116 @@ + +'These functions are based off the ones found in this project: https://github.com/doom-desire/Cry-Editor +'Credit goes to doom-desire for these functions. + +Module CryFunctions + + Structure Cry + Public Index As Integer + Public Offset As Integer + + Public Compressed As Boolean + Public Looped As Boolean + Public SampleRate As Integer + Public LoopStart As Integer + Public Size As Integer + + Public Data As SByte() + End Structure + + Public Function LoadCry(index As Integer, cryTable As Integer) As Cry + + Dim CryToLoad As New Cry + + 'If ledrom Is Nothing Then + ' Return False + 'End If + + ' load cry table entry + 'ledrom.Seek(cryTable + index * 12) + + 'Dim someValue = ledrom.ReadInt32() + 'Dim cryOffset = ledrom.ReadPointer() + 'Dim cryShape = ledrom.ReadInt32() + + Dim someValue = Int32.Parse(ReverseHEX((ReadHEX(LoadedROM, (cryTable) + (index * 12), 4))), System.Globalization.NumberStyles.HexNumber) + Dim cryOffset = (Int32.Parse(ReverseHEX((ReadHEX(LoadedROM, (cryTable) + (index * 12) + 4, 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000) + Dim cryShape = Int32.Parse(ReverseHEX((ReadHEX(LoadedROM, (cryTable) + (index * 12) + 8, 4))), System.Globalization.NumberStyles.HexNumber) + + + 'If cryOffset = 0 Then + ' Return False + 'End If + + ' load cry data + 'ledrom.Seek(cryOffset) + + CryToLoad.Offset = cryOffset + CryToLoad.Index = index + + + 'CryToLoad.Compressed = ledrom.ReadUInt16() = &H1 + 'CryToLoad.Looped = ledrom.ReadUInt16() = &H4000 + 'CryToLoad.SampleRate = ledrom.ReadInt32() >> 10 + 'CryToLoad.LoopStart = ledrom.ReadInt32() + 'CryToLoad.Size = ledrom.ReadInt32() + 1 + + CryToLoad.Compressed = Int16.Parse(ReverseHEX((ReadHEX(LoadedROM, (cryOffset) + 0, 2))), System.Globalization.NumberStyles.HexNumber) = &H1 + CryToLoad.Looped = Int16.Parse(ReverseHEX((ReadHEX(LoadedROM, (cryOffset) + 2, 2))), System.Globalization.NumberStyles.HexNumber) = &H4000 + CryToLoad.SampleRate = Int32.Parse(ReverseHEX((ReadHEX(LoadedROM, (cryOffset) + 4, 4))), System.Globalization.NumberStyles.HexNumber) >> 10 + CryToLoad.LoopStart = Int32.Parse(ReverseHEX((ReadHEX(LoadedROM, (cryOffset) + 8, 4))), System.Globalization.NumberStyles.HexNumber) + CryToLoad.Size = Int32.Parse(ReverseHEX((ReadHEX(LoadedROM, (cryOffset) + 12, 4))), System.Globalization.NumberStyles.HexNumber) + 1 + + 'If Not CryToLoad.Compressed Then + ' ' uncompressed, 1 sample per 1 byte of size + ' CryToLoad.Data = New SByte(CryToLoad.Size - 1) {} + ' For i As Integer = 0 To CryToLoad.Size - 1 + ' CryToLoad.Data(i) = ledrom.ReadSByte() + ' Next + 'Else + ' ' compressed, a bit of a hassle + ' Dim lookup = New SByte() {0, 1, 4, 9, 16, 25, _ + ' 36, 49, -64, -49, -36, -25, _ + ' -16, -9, -4, -1} + ' Dim start = ledrom.Position + + ' Dim alignment As Integer = 0, size As Integer = 0 + ' Dim pcmLevel As SByte = 0 + + ' Dim data = New List(Of SByte)() + ' While True + ' If alignment = 0 Then + ' pcmLevel = ledrom.ReadSByte() + ' data.Add(pcmLevel) + + ' alignment = &H20 + ' End If + + ' Dim input = ledrom.ReadByte() + ' If alignment < &H20 Then + ' ' first nybble + ' pcmLevel += lookup(input >> 4) + ' data.Add(pcmLevel) + ' End If + + ' ' second nybble + ' pcmLevel += lookup(input And &HF) + ' data.Add(pcmLevel) + + ' ' exit when currentSize >= cry.Size + ' size += 2 + ' If size >= CryToLoad.Size Then + ' Exit While + ' End If + + ' alignment -= 1 + ' End While + + ' CryToLoad.Data = data.ToArray() + ' ' bytes needed to recompress + ' CryToLoad.Size = ledrom.Position - start + 'End If + + Return CryToLoad + End Function + +End Module diff --git a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj index f408a22..86a57de 100644 --- a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj +++ b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj @@ -161,6 +161,7 @@ + EggMoveEditor.vb @@ -254,6 +255,7 @@ Form + RomExpander.vb diff --git a/GBAPokemonGameEditor/Pokemonedit.Designer.vb b/GBAPokemonGameEditor/Pokemonedit.Designer.vb index 344c91a..b449c70 100644 --- a/GBAPokemonGameEditor/Pokemonedit.Designer.vb +++ b/GBAPokemonGameEditor/Pokemonedit.Designer.vb @@ -37,15 +37,6 @@ Partial Class Pokemonedit Me.Label49 = New System.Windows.Forms.Label() Me.Label48 = New System.Windows.Forms.Label() Me.Label47 = New System.Windows.Forms.Label() - Me.GroupBox21 = New System.Windows.Forms.GroupBox() - Me.Label46 = New System.Windows.Forms.Label() - Me.CryPointer2 = New System.Windows.Forms.TextBox() - Me.Button13 = New System.Windows.Forms.Button() - Me.CryConver = New System.Windows.Forms.TextBox() - Me.Label18 = New System.Windows.Forms.Label() - Me.Label17 = New System.Windows.Forms.Label() - Me.Button6 = New System.Windows.Forms.Button() - Me.CryPointer = New System.Windows.Forms.TextBox() Me.GroupBox20 = New System.Windows.Forms.GroupBox() Me.Button24 = New System.Windows.Forms.Button() Me.Button23 = New System.Windows.Forms.Button() @@ -225,6 +216,25 @@ Partial Class Pokemonedit Me.Label25 = New System.Windows.Forms.Label() Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.Clr1 = New System.Windows.Forms.ComboBox() + Me.TabPage5 = New System.Windows.Forms.TabPage() + Me.GroupBox35 = New System.Windows.Forms.GroupBox() + Me.Label54 = New System.Windows.Forms.Label() + Me.Button31 = New System.Windows.Forms.Button() + Me.Label52 = New System.Windows.Forms.Label() + Me.Label46 = New System.Windows.Forms.Label() + Me.CryComp2 = New System.Windows.Forms.TextBox() + Me.CryPointer2 = New System.Windows.Forms.TextBox() + Me.GroupBox34 = New System.Windows.Forms.GroupBox() + Me.Label53 = New System.Windows.Forms.Label() + Me.Label17 = New System.Windows.Forms.Label() + Me.CryPointer = New System.Windows.Forms.TextBox() + Me.Label51 = New System.Windows.Forms.Label() + Me.Button6 = New System.Windows.Forms.Button() + Me.CryComp1 = New System.Windows.Forms.TextBox() + Me.GroupBox21 = New System.Windows.Forms.GroupBox() + Me.Button13 = New System.Windows.Forms.Button() + Me.CryConver = New System.Windows.Forms.TextBox() + Me.Label18 = New System.Windows.Forms.Label() Me.Button1 = New System.Windows.Forms.Button() Me.GroupBox18 = New System.Windows.Forms.GroupBox() Me.Button15 = New System.Windows.Forms.Button() @@ -248,10 +258,8 @@ Partial Class Pokemonedit Me.Button28 = New System.Windows.Forms.Button() Me.Button29 = New System.Windows.Forms.Button() Me.Button30 = New System.Windows.Forms.Button() - Me.CryComp1 = New System.Windows.Forms.TextBox() - Me.Label51 = New System.Windows.Forms.Label() - Me.Label52 = New System.Windows.Forms.Label() - Me.CryComp2 = New System.Windows.Forms.TextBox() + Me.Label55 = New System.Windows.Forms.Label() + Me.Label56 = New System.Windows.Forms.Label() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() Me.GroupBox26.SuspendLayout() @@ -260,7 +268,6 @@ Partial Class Pokemonedit CType(Me.EnemyAltitudeSelect, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EnemyYSelect, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PlayerYSelect, System.ComponentModel.ISupportInitialize).BeginInit() - Me.GroupBox21.SuspendLayout() Me.GroupBox20.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox16.SuspendLayout() @@ -309,6 +316,10 @@ Partial Class Pokemonedit Me.GroupBox29.SuspendLayout() Me.GroupBox28.SuspendLayout() Me.GroupBox2.SuspendLayout() + Me.TabPage5.SuspendLayout() + Me.GroupBox35.SuspendLayout() + Me.GroupBox34.SuspendLayout() + Me.GroupBox21.SuspendLayout() Me.GroupBox18.SuspendLayout() Me.GroupBox19.SuspendLayout() Me.SuspendLayout() @@ -320,10 +331,12 @@ Partial Class Pokemonedit Me.TabControl1.Controls.Add(Me.TabPage3) Me.TabControl1.Controls.Add(Me.TabPage4) Me.TabControl1.Controls.Add(Me.TabPage6) - Me.TabControl1.Location = New System.Drawing.Point(148, 27) + Me.TabControl1.Controls.Add(Me.TabPage5) + Me.TabControl1.Location = New System.Drawing.Point(197, 33) + Me.TabControl1.Margin = New System.Windows.Forms.Padding(4) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(622, 500) + Me.TabControl1.Size = New System.Drawing.Size(829, 615) Me.TabControl1.TabIndex = 1 ' 'TabPage1 @@ -332,51 +345,56 @@ Partial Class Pokemonedit Me.TabPage1.Controls.Add(Me.Button20) Me.TabPage1.Controls.Add(Me.Button19) Me.TabPage1.Controls.Add(Me.GroupBox33) - Me.TabPage1.Controls.Add(Me.GroupBox21) Me.TabPage1.Controls.Add(Me.GroupBox20) Me.TabPage1.Controls.Add(Me.GroupBox16) Me.TabPage1.Controls.Add(Me.GroupBox15) Me.TabPage1.Controls.Add(Me.GroupBox14) - Me.TabPage1.Location = New System.Drawing.Point(4, 22) + Me.TabPage1.Location = New System.Drawing.Point(4, 25) + Me.TabPage1.Margin = New System.Windows.Forms.Padding(4) Me.TabPage1.Name = "TabPage1" - Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(614, 474) + Me.TabPage1.Padding = New System.Windows.Forms.Padding(4) + Me.TabPage1.Size = New System.Drawing.Size(821, 586) Me.TabPage1.TabIndex = 0 - Me.TabPage1.Text = "Media Data" + Me.TabPage1.Text = "Sprites" Me.TabPage1.UseVisualStyleBackColor = True ' 'GroupBox26 ' Me.GroupBox26.Controls.Add(Me.ItmAnmtn) - Me.GroupBox26.Location = New System.Drawing.Point(449, 202) + Me.GroupBox26.Location = New System.Drawing.Point(599, 249) + Me.GroupBox26.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox26.Name = "GroupBox26" - Me.GroupBox26.Size = New System.Drawing.Size(134, 50) + Me.GroupBox26.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox26.Size = New System.Drawing.Size(179, 62) Me.GroupBox26.TabIndex = 6 Me.GroupBox26.TabStop = False Me.GroupBox26.Text = "Item Animation (FR/LG)" ' 'ItmAnmtn ' - Me.ItmAnmtn.Location = New System.Drawing.Point(15, 19) + Me.ItmAnmtn.Location = New System.Drawing.Point(20, 23) + Me.ItmAnmtn.Margin = New System.Windows.Forms.Padding(4) Me.ItmAnmtn.MaxLength = 10 Me.ItmAnmtn.Name = "ItmAnmtn" - Me.ItmAnmtn.Size = New System.Drawing.Size(95, 20) + Me.ItmAnmtn.Size = New System.Drawing.Size(125, 22) Me.ItmAnmtn.TabIndex = 12 ' 'Button20 ' - Me.Button20.Location = New System.Drawing.Point(6, 35) + Me.Button20.Location = New System.Drawing.Point(8, 43) + Me.Button20.Margin = New System.Windows.Forms.Padding(4) Me.Button20.Name = "Button20" - Me.Button20.Size = New System.Drawing.Size(178, 23) + Me.Button20.Size = New System.Drawing.Size(237, 28) Me.Button20.TabIndex = 9 Me.Button20.Text = "Export A-series Sprite Sheet" Me.Button20.UseVisualStyleBackColor = True ' 'Button19 ' - Me.Button19.Location = New System.Drawing.Point(6, 6) + Me.Button19.Location = New System.Drawing.Point(8, 7) + Me.Button19.Margin = New System.Windows.Forms.Padding(4) Me.Button19.Name = "Button19" - Me.Button19.Size = New System.Drawing.Size(178, 23) + Me.Button19.Size = New System.Drawing.Size(237, 28) Me.Button19.TabIndex = 8 Me.Button19.Text = "Import A-series Sprite Sheet" Me.Button19.UseVisualStyleBackColor = True @@ -390,9 +408,11 @@ Partial Class Pokemonedit Me.GroupBox33.Controls.Add(Me.Label49) Me.GroupBox33.Controls.Add(Me.Label48) Me.GroupBox33.Controls.Add(Me.Label47) - Me.GroupBox33.Location = New System.Drawing.Point(179, 202) + Me.GroupBox33.Location = New System.Drawing.Point(239, 249) + Me.GroupBox33.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox33.Name = "GroupBox33" - Me.GroupBox33.Size = New System.Drawing.Size(264, 245) + Me.GroupBox33.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox33.Size = New System.Drawing.Size(352, 302) Me.GroupBox33.TabIndex = 7 Me.GroupBox33.TabStop = False Me.GroupBox33.Text = "Battle Sprite Position" @@ -400,153 +420,73 @@ Partial Class Pokemonedit 'BackgroundBox ' Me.BackgroundBox.BackColor = System.Drawing.Color.Transparent - Me.BackgroundBox.Location = New System.Drawing.Point(13, 73) + Me.BackgroundBox.Location = New System.Drawing.Point(17, 90) + Me.BackgroundBox.Margin = New System.Windows.Forms.Padding(4) Me.BackgroundBox.Name = "BackgroundBox" - Me.BackgroundBox.Size = New System.Drawing.Size(240, 160) + Me.BackgroundBox.Size = New System.Drawing.Size(320, 197) Me.BackgroundBox.TabIndex = 6 Me.BackgroundBox.TabStop = False ' 'EnemyAltitudeSelect ' - Me.EnemyAltitudeSelect.Location = New System.Drawing.Point(111, 47) + Me.EnemyAltitudeSelect.Location = New System.Drawing.Point(148, 58) + Me.EnemyAltitudeSelect.Margin = New System.Windows.Forms.Padding(4) Me.EnemyAltitudeSelect.Maximum = New Decimal(New Integer() {127, 0, 0, 0}) Me.EnemyAltitudeSelect.Minimum = New Decimal(New Integer() {127, 0, 0, -2147483648}) Me.EnemyAltitudeSelect.Name = "EnemyAltitudeSelect" - Me.EnemyAltitudeSelect.Size = New System.Drawing.Size(43, 20) + Me.EnemyAltitudeSelect.Size = New System.Drawing.Size(57, 22) Me.EnemyAltitudeSelect.TabIndex = 5 ' 'EnemyYSelect ' - Me.EnemyYSelect.Location = New System.Drawing.Point(62, 47) + Me.EnemyYSelect.Location = New System.Drawing.Point(83, 58) + Me.EnemyYSelect.Margin = New System.Windows.Forms.Padding(4) Me.EnemyYSelect.Maximum = New Decimal(New Integer() {127, 0, 0, 0}) Me.EnemyYSelect.Minimum = New Decimal(New Integer() {127, 0, 0, -2147483648}) Me.EnemyYSelect.Name = "EnemyYSelect" - Me.EnemyYSelect.Size = New System.Drawing.Size(43, 20) + Me.EnemyYSelect.Size = New System.Drawing.Size(57, 22) Me.EnemyYSelect.TabIndex = 4 ' 'PlayerYSelect ' - Me.PlayerYSelect.Location = New System.Drawing.Point(13, 47) + Me.PlayerYSelect.Location = New System.Drawing.Point(17, 58) + Me.PlayerYSelect.Margin = New System.Windows.Forms.Padding(4) Me.PlayerYSelect.Maximum = New Decimal(New Integer() {127, 0, 0, 0}) Me.PlayerYSelect.Minimum = New Decimal(New Integer() {127, 0, 0, -2147483648}) Me.PlayerYSelect.Name = "PlayerYSelect" - Me.PlayerYSelect.Size = New System.Drawing.Size(43, 20) + Me.PlayerYSelect.Size = New System.Drawing.Size(57, 22) Me.PlayerYSelect.TabIndex = 3 ' 'Label49 ' Me.Label49.AutoSize = True - Me.Label49.Location = New System.Drawing.Point(114, 22) + Me.Label49.Location = New System.Drawing.Point(152, 27) + Me.Label49.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label49.Name = "Label49" - Me.Label49.Size = New System.Drawing.Size(77, 13) + Me.Label49.Size = New System.Drawing.Size(102, 17) Me.Label49.TabIndex = 2 Me.Label49.Text = "Enemy Altitude" ' 'Label48 ' Me.Label48.AutoSize = True - Me.Label48.Location = New System.Drawing.Point(62, 22) + Me.Label48.Location = New System.Drawing.Point(83, 27) + Me.Label48.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label48.Name = "Label48" - Me.Label48.Size = New System.Drawing.Size(49, 13) + Me.Label48.Size = New System.Drawing.Size(64, 17) Me.Label48.TabIndex = 1 Me.Label48.Text = "Enemy Y" ' 'Label47 ' Me.Label47.AutoSize = True - Me.Label47.Location = New System.Drawing.Point(10, 22) + Me.Label47.Location = New System.Drawing.Point(13, 27) + Me.Label47.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label47.Name = "Label47" - Me.Label47.Size = New System.Drawing.Size(46, 13) + Me.Label47.Size = New System.Drawing.Size(61, 17) Me.Label47.TabIndex = 0 Me.Label47.Text = "Player Y" ' - 'GroupBox21 - ' - Me.GroupBox21.Controls.Add(Me.Label52) - Me.GroupBox21.Controls.Add(Me.CryComp2) - Me.GroupBox21.Controls.Add(Me.Label51) - Me.GroupBox21.Controls.Add(Me.CryComp1) - Me.GroupBox21.Controls.Add(Me.Label46) - Me.GroupBox21.Controls.Add(Me.CryPointer2) - Me.GroupBox21.Controls.Add(Me.Button13) - Me.GroupBox21.Controls.Add(Me.CryConver) - Me.GroupBox21.Controls.Add(Me.Label18) - Me.GroupBox21.Controls.Add(Me.Label17) - Me.GroupBox21.Controls.Add(Me.Button6) - Me.GroupBox21.Controls.Add(Me.CryPointer) - Me.GroupBox21.Location = New System.Drawing.Point(6, 253) - Me.GroupBox21.Name = "GroupBox21" - Me.GroupBox21.Size = New System.Drawing.Size(167, 201) - Me.GroupBox21.TabIndex = 5 - Me.GroupBox21.TabStop = False - Me.GroupBox21.Text = "Cry" - ' - 'Label46 - ' - Me.Label46.AutoSize = True - Me.Label46.Location = New System.Drawing.Point(7, 126) - Me.Label46.Name = "Label46" - Me.Label46.Size = New System.Drawing.Size(73, 13) - Me.Label46.TabIndex = 18 - Me.Label46.Text = "Growl Pointer:" - ' - 'CryPointer2 - ' - Me.CryPointer2.Location = New System.Drawing.Point(83, 123) - Me.CryPointer2.Name = "CryPointer2" - Me.CryPointer2.Size = New System.Drawing.Size(68, 20) - Me.CryPointer2.TabIndex = 17 - ' - 'Button13 - ' - Me.Button13.Location = New System.Drawing.Point(83, 43) - Me.Button13.Name = "Button13" - Me.Button13.Size = New System.Drawing.Size(68, 21) - Me.Button13.TabIndex = 16 - Me.Button13.Text = "Save" - Me.Button13.UseVisualStyleBackColor = True - ' - 'CryConver - ' - Me.CryConver.Location = New System.Drawing.Point(83, 18) - Me.CryConver.Name = "CryConver" - Me.CryConver.Size = New System.Drawing.Size(68, 20) - Me.CryConver.TabIndex = 15 - ' - 'Label18 - ' - Me.Label18.AutoSize = True - Me.Label18.Location = New System.Drawing.Point(7, 21) - Me.Label18.Name = "Label18" - Me.Label18.Size = New System.Drawing.Size(63, 13) - Me.Label18.TabIndex = 14 - Me.Label18.Text = "Conversion:" - ' - 'Label17 - ' - Me.Label17.AutoSize = True - Me.Label17.Location = New System.Drawing.Point(7, 72) - Me.Label17.Name = "Label17" - Me.Label17.Size = New System.Drawing.Size(61, 13) - Me.Label17.TabIndex = 13 - Me.Label17.Text = "Cry Pointer:" - ' - 'Button6 - ' - Me.Button6.Location = New System.Drawing.Point(10, 169) - Me.Button6.Name = "Button6" - Me.Button6.Size = New System.Drawing.Size(140, 21) - Me.Button6.TabIndex = 12 - Me.Button6.Text = "Repoint + Save" - Me.Button6.UseVisualStyleBackColor = True - ' - 'CryPointer - ' - Me.CryPointer.Location = New System.Drawing.Point(83, 69) - Me.CryPointer.Name = "CryPointer" - Me.CryPointer.Size = New System.Drawing.Size(68, 20) - Me.CryPointer.TabIndex = 11 - ' 'GroupBox20 ' Me.GroupBox20.Controls.Add(Me.Button24) @@ -554,54 +494,61 @@ Partial Class Pokemonedit Me.GroupBox20.Controls.Add(Me.PictureBox1) Me.GroupBox20.Controls.Add(Me.Button5) Me.GroupBox20.Controls.Add(Me.FootPrintPointer) - Me.GroupBox20.Location = New System.Drawing.Point(449, 258) + Me.GroupBox20.Location = New System.Drawing.Point(599, 318) + Me.GroupBox20.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox20.Name = "GroupBox20" - Me.GroupBox20.Size = New System.Drawing.Size(147, 124) + Me.GroupBox20.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox20.Size = New System.Drawing.Size(196, 153) Me.GroupBox20.TabIndex = 4 Me.GroupBox20.TabStop = False Me.GroupBox20.Text = "FootPrint" ' 'Button24 ' - Me.Button24.Location = New System.Drawing.Point(15, 93) + Me.Button24.Location = New System.Drawing.Point(20, 114) + Me.Button24.Margin = New System.Windows.Forms.Padding(4) Me.Button24.Name = "Button24" - Me.Button24.Size = New System.Drawing.Size(68, 21) + Me.Button24.Size = New System.Drawing.Size(91, 26) Me.Button24.TabIndex = 15 Me.Button24.Text = "Export" Me.Button24.UseVisualStyleBackColor = True ' 'Button23 ' - Me.Button23.Location = New System.Drawing.Point(15, 69) + Me.Button23.Location = New System.Drawing.Point(20, 85) + Me.Button23.Margin = New System.Windows.Forms.Padding(4) Me.Button23.Name = "Button23" - Me.Button23.Size = New System.Drawing.Size(68, 21) + Me.Button23.Size = New System.Drawing.Size(91, 26) Me.Button23.TabIndex = 14 Me.Button23.Text = "Import" Me.Button23.UseVisualStyleBackColor = True ' 'PictureBox1 ' - Me.PictureBox1.Location = New System.Drawing.Point(102, 25) + Me.PictureBox1.Location = New System.Drawing.Point(136, 31) + Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4) Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(32, 32) + Me.PictureBox1.Size = New System.Drawing.Size(43, 39) Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage Me.PictureBox1.TabIndex = 13 Me.PictureBox1.TabStop = False ' 'Button5 ' - Me.Button5.Location = New System.Drawing.Point(15, 45) + Me.Button5.Location = New System.Drawing.Point(20, 55) + Me.Button5.Margin = New System.Windows.Forms.Padding(4) Me.Button5.Name = "Button5" - Me.Button5.Size = New System.Drawing.Size(68, 21) + Me.Button5.Size = New System.Drawing.Size(91, 26) Me.Button5.TabIndex = 12 Me.Button5.Text = "Repoint" Me.Button5.UseVisualStyleBackColor = True ' 'FootPrintPointer ' - Me.FootPrintPointer.Location = New System.Drawing.Point(15, 19) + Me.FootPrintPointer.Location = New System.Drawing.Point(20, 23) + Me.FootPrintPointer.Margin = New System.Windows.Forms.Padding(4) Me.FootPrintPointer.Name = "FootPrintPointer" - Me.FootPrintPointer.Size = New System.Drawing.Size(68, 20) + Me.FootPrintPointer.Size = New System.Drawing.Size(89, 22) Me.FootPrintPointer.TabIndex = 11 ' 'GroupBox16 @@ -612,36 +559,41 @@ Partial Class Pokemonedit Me.GroupBox16.Controls.Add(Me.IconPal) Me.GroupBox16.Controls.Add(Me.Button4) Me.GroupBox16.Controls.Add(Me.IconPointer) - Me.GroupBox16.Location = New System.Drawing.Point(6, 60) + Me.GroupBox16.Location = New System.Drawing.Point(8, 74) + Me.GroupBox16.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox16.Name = "GroupBox16" - Me.GroupBox16.Size = New System.Drawing.Size(150, 187) + Me.GroupBox16.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox16.Size = New System.Drawing.Size(200, 230) Me.GroupBox16.TabIndex = 3 Me.GroupBox16.TabStop = False Me.GroupBox16.Text = "Icons" ' 'Button22 ' - Me.Button22.Location = New System.Drawing.Point(15, 156) + Me.Button22.Location = New System.Drawing.Point(20, 192) + Me.Button22.Margin = New System.Windows.Forms.Padding(4) Me.Button22.Name = "Button22" - Me.Button22.Size = New System.Drawing.Size(122, 25) + Me.Button22.Size = New System.Drawing.Size(163, 31) Me.Button22.TabIndex = 14 Me.Button22.Text = "Export" Me.Button22.UseVisualStyleBackColor = True ' 'Button21 ' - Me.Button21.Location = New System.Drawing.Point(15, 126) + Me.Button21.Location = New System.Drawing.Point(20, 155) + Me.Button21.Margin = New System.Windows.Forms.Padding(4) Me.Button21.Name = "Button21" - Me.Button21.Size = New System.Drawing.Size(122, 25) + Me.Button21.Size = New System.Drawing.Size(163, 31) Me.Button21.TabIndex = 13 Me.Button21.Text = "Import" Me.Button21.UseVisualStyleBackColor = True ' 'IconPicBox ' - Me.IconPicBox.Location = New System.Drawing.Point(105, 18) + Me.IconPicBox.Location = New System.Drawing.Point(140, 22) + Me.IconPicBox.Margin = New System.Windows.Forms.Padding(4) Me.IconPicBox.Name = "IconPicBox" - Me.IconPicBox.Size = New System.Drawing.Size(32, 64) + Me.IconPicBox.Size = New System.Drawing.Size(43, 79) Me.IconPicBox.TabIndex = 12 Me.IconPicBox.TabStop = False ' @@ -650,25 +602,28 @@ Partial Class Pokemonedit Me.IconPal.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.IconPal.FormattingEnabled = True Me.IconPal.Items.AddRange(New Object() {"Pal 0", "Pal 1", "Pal 2"}) - Me.IconPal.Location = New System.Drawing.Point(15, 56) + Me.IconPal.Location = New System.Drawing.Point(20, 69) + Me.IconPal.Margin = New System.Windows.Forms.Padding(4) Me.IconPal.Name = "IconPal" - Me.IconPal.Size = New System.Drawing.Size(68, 21) + Me.IconPal.Size = New System.Drawing.Size(89, 24) Me.IconPal.TabIndex = 2 ' 'Button4 ' - Me.Button4.Location = New System.Drawing.Point(15, 95) + Me.Button4.Location = New System.Drawing.Point(20, 117) + Me.Button4.Margin = New System.Windows.Forms.Padding(4) Me.Button4.Name = "Button4" - Me.Button4.Size = New System.Drawing.Size(122, 25) + Me.Button4.Size = New System.Drawing.Size(163, 31) Me.Button4.TabIndex = 1 Me.Button4.Text = "Repoint + Save" Me.Button4.UseVisualStyleBackColor = True ' 'IconPointer ' - Me.IconPointer.Location = New System.Drawing.Point(15, 18) + Me.IconPointer.Location = New System.Drawing.Point(20, 22) + Me.IconPointer.Margin = New System.Windows.Forms.Padding(4) Me.IconPointer.Name = "IconPointer" - Me.IconPointer.Size = New System.Drawing.Size(68, 20) + Me.IconPointer.Size = New System.Drawing.Size(89, 22) Me.IconPointer.TabIndex = 0 ' 'GroupBox15 @@ -677,44 +632,50 @@ Partial Class Pokemonedit Me.GroupBox15.Controls.Add(Me.AniPic) Me.GroupBox15.Controls.Add(Me.Button2) Me.GroupBox15.Controls.Add(Me.AnimationPointer) - Me.GroupBox15.Location = New System.Drawing.Point(449, 7) + Me.GroupBox15.Location = New System.Drawing.Point(599, 9) + Me.GroupBox15.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox15.Name = "GroupBox15" - Me.GroupBox15.Size = New System.Drawing.Size(159, 189) + Me.GroupBox15.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox15.Size = New System.Drawing.Size(212, 233) Me.GroupBox15.TabIndex = 2 Me.GroupBox15.TabStop = False Me.GroupBox15.Text = "Animation (Emerald Only)" ' 'AniPic2 ' - Me.AniPic2.Location = New System.Drawing.Point(85, 49) + Me.AniPic2.Location = New System.Drawing.Point(113, 60) + Me.AniPic2.Margin = New System.Windows.Forms.Padding(4) Me.AniPic2.Name = "AniPic2" - Me.AniPic2.Size = New System.Drawing.Size(64, 128) + Me.AniPic2.Size = New System.Drawing.Size(85, 158) Me.AniPic2.TabIndex = 13 Me.AniPic2.TabStop = False ' 'AniPic ' - Me.AniPic.Location = New System.Drawing.Point(12, 49) + Me.AniPic.Location = New System.Drawing.Point(16, 60) + Me.AniPic.Margin = New System.Windows.Forms.Padding(4) Me.AniPic.Name = "AniPic" - Me.AniPic.Size = New System.Drawing.Size(64, 128) + Me.AniPic.Size = New System.Drawing.Size(85, 158) Me.AniPic.TabIndex = 12 Me.AniPic.TabStop = False ' 'Button2 ' Me.Button2.Enabled = False - Me.Button2.Location = New System.Drawing.Point(12, 22) + Me.Button2.Location = New System.Drawing.Point(16, 27) + Me.Button2.Margin = New System.Windows.Forms.Padding(4) Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(68, 21) + Me.Button2.Size = New System.Drawing.Size(91, 26) Me.Button2.TabIndex = 11 Me.Button2.Text = "Repoint" Me.Button2.UseVisualStyleBackColor = True ' 'AnimationPointer ' - Me.AnimationPointer.Location = New System.Drawing.Point(85, 22) + Me.AnimationPointer.Location = New System.Drawing.Point(113, 27) + Me.AnimationPointer.Margin = New System.Windows.Forms.Padding(4) Me.AnimationPointer.Name = "AnimationPointer" - Me.AnimationPointer.Size = New System.Drawing.Size(64, 20) + Me.AnimationPointer.Size = New System.Drawing.Size(84, 22) Me.AnimationPointer.TabIndex = 10 ' 'GroupBox14 @@ -732,115 +693,130 @@ Partial Class Pokemonedit Me.GroupBox14.Controls.Add(Me.Label11) Me.GroupBox14.Controls.Add(Me.Label10) Me.GroupBox14.Controls.Add(Me.Label9) - Me.GroupBox14.Location = New System.Drawing.Point(194, 7) + Me.GroupBox14.Location = New System.Drawing.Point(259, 9) + Me.GroupBox14.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox14.Name = "GroupBox14" - Me.GroupBox14.Size = New System.Drawing.Size(249, 189) + Me.GroupBox14.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox14.Size = New System.Drawing.Size(332, 233) Me.GroupBox14.TabIndex = 1 Me.GroupBox14.TabStop = False Me.GroupBox14.Text = "Sprite Pointers" ' 'BckPic2 ' - Me.BckPic2.Location = New System.Drawing.Point(175, 90) + Me.BckPic2.Location = New System.Drawing.Point(233, 111) + Me.BckPic2.Margin = New System.Windows.Forms.Padding(4) Me.BckPic2.Name = "BckPic2" - Me.BckPic2.Size = New System.Drawing.Size(64, 64) + Me.BckPic2.Size = New System.Drawing.Size(85, 79) Me.BckPic2.TabIndex = 12 Me.BckPic2.TabStop = False ' 'FrntPic2 ' - Me.FrntPic2.Location = New System.Drawing.Point(175, 13) + Me.FrntPic2.Location = New System.Drawing.Point(233, 16) + Me.FrntPic2.Margin = New System.Windows.Forms.Padding(4) Me.FrntPic2.Name = "FrntPic2" - Me.FrntPic2.Size = New System.Drawing.Size(64, 64) + Me.FrntPic2.Size = New System.Drawing.Size(85, 79) Me.FrntPic2.TabIndex = 11 Me.FrntPic2.TabStop = False ' 'BckPic ' - Me.BckPic.Location = New System.Drawing.Point(96, 90) + Me.BckPic.Location = New System.Drawing.Point(128, 111) + Me.BckPic.Margin = New System.Windows.Forms.Padding(4) Me.BckPic.Name = "BckPic" - Me.BckPic.Size = New System.Drawing.Size(64, 64) + Me.BckPic.Size = New System.Drawing.Size(85, 79) Me.BckPic.TabIndex = 10 Me.BckPic.TabStop = False ' 'FrntPic ' - Me.FrntPic.Location = New System.Drawing.Point(96, 13) + Me.FrntPic.Location = New System.Drawing.Point(128, 16) + Me.FrntPic.Margin = New System.Windows.Forms.Padding(4) Me.FrntPic.Name = "FrntPic" - Me.FrntPic.Size = New System.Drawing.Size(64, 64) + Me.FrntPic.Size = New System.Drawing.Size(85, 79) Me.FrntPic.TabIndex = 9 Me.FrntPic.TabStop = False ' 'Button3 ' - Me.Button3.Location = New System.Drawing.Point(96, 157) + Me.Button3.Location = New System.Drawing.Point(128, 193) + Me.Button3.Margin = New System.Windows.Forms.Padding(4) Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(142, 21) + Me.Button3.Size = New System.Drawing.Size(189, 26) Me.Button3.TabIndex = 8 Me.Button3.Text = "Repoint" Me.Button3.UseVisualStyleBackColor = True ' 'ShinyPointer ' - Me.ShinyPointer.Location = New System.Drawing.Point(13, 158) + Me.ShinyPointer.Location = New System.Drawing.Point(17, 194) + Me.ShinyPointer.Margin = New System.Windows.Forms.Padding(4) Me.ShinyPointer.Name = "ShinyPointer" - Me.ShinyPointer.Size = New System.Drawing.Size(68, 20) + Me.ShinyPointer.Size = New System.Drawing.Size(89, 22) Me.ShinyPointer.TabIndex = 7 ' 'BackPointer ' - Me.BackPointer.Location = New System.Drawing.Point(13, 119) + Me.BackPointer.Location = New System.Drawing.Point(17, 146) + Me.BackPointer.Margin = New System.Windows.Forms.Padding(4) Me.BackPointer.Name = "BackPointer" - Me.BackPointer.Size = New System.Drawing.Size(68, 20) + Me.BackPointer.Size = New System.Drawing.Size(89, 22) Me.BackPointer.TabIndex = 6 ' 'NormalPointer ' - Me.NormalPointer.Location = New System.Drawing.Point(13, 80) + Me.NormalPointer.Location = New System.Drawing.Point(17, 98) + Me.NormalPointer.Margin = New System.Windows.Forms.Padding(4) Me.NormalPointer.Name = "NormalPointer" - Me.NormalPointer.Size = New System.Drawing.Size(68, 20) + Me.NormalPointer.Size = New System.Drawing.Size(89, 22) Me.NormalPointer.TabIndex = 5 ' 'FrontPointer ' - Me.FrontPointer.Location = New System.Drawing.Point(13, 41) + Me.FrontPointer.Location = New System.Drawing.Point(17, 50) + Me.FrontPointer.Margin = New System.Windows.Forms.Padding(4) Me.FrontPointer.Name = "FrontPointer" - Me.FrontPointer.Size = New System.Drawing.Size(68, 20) + Me.FrontPointer.Size = New System.Drawing.Size(89, 22) Me.FrontPointer.TabIndex = 4 ' 'Label12 ' Me.Label12.AutoSize = True - Me.Label12.Location = New System.Drawing.Point(10, 142) + Me.Label12.Location = New System.Drawing.Point(13, 175) + Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(54, 13) + Me.Label12.Size = New System.Drawing.Size(71, 17) Me.Label12.TabIndex = 3 Me.Label12.Text = "Shiny Pal:" ' 'Label11 ' Me.Label11.AutoSize = True - Me.Label11.Location = New System.Drawing.Point(10, 103) + Me.Label11.Location = New System.Drawing.Point(13, 127) + Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(65, 13) + Me.Label11.Size = New System.Drawing.Size(84, 17) Me.Label11.TabIndex = 2 Me.Label11.Text = "Back Sprite:" ' 'Label10 ' Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(10, 64) + Me.Label10.Location = New System.Drawing.Point(13, 79) + Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(61, 13) + Me.Label10.Size = New System.Drawing.Size(81, 17) Me.Label10.TabIndex = 1 Me.Label10.Text = "Normal Pal:" ' 'Label9 ' Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(10, 25) + Me.Label9.Location = New System.Drawing.Point(13, 31) + Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(64, 13) + Me.Label9.Size = New System.Drawing.Size(86, 17) Me.Label9.TabIndex = 0 Me.Label9.Text = "Front Sprite:" ' @@ -859,10 +835,11 @@ Partial Class Pokemonedit Me.TabPage2.Controls.Add(Me.GroupBox5) Me.TabPage2.Controls.Add(Me.GroupBox4) Me.TabPage2.Controls.Add(Me.GroupBox3) - Me.TabPage2.Location = New System.Drawing.Point(4, 22) + Me.TabPage2.Location = New System.Drawing.Point(4, 25) + Me.TabPage2.Margin = New System.Windows.Forms.Padding(4) Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(614, 474) + Me.TabPage2.Padding = New System.Windows.Forms.Padding(4) + Me.TabPage2.Size = New System.Drawing.Size(821, 586) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Base Stats" Me.TabPage2.UseVisualStyleBackColor = True @@ -873,18 +850,21 @@ Partial Class Pokemonedit Me.GroupBox11.Controls.Add(Me.SHCombo1) Me.GroupBox11.Controls.Add(Me.SH2) Me.GroupBox11.Controls.Add(Me.SH1) - Me.GroupBox11.Location = New System.Drawing.Point(379, 268) + Me.GroupBox11.Location = New System.Drawing.Point(505, 330) + Me.GroupBox11.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox11.Name = "GroupBox11" - Me.GroupBox11.Size = New System.Drawing.Size(189, 78) + Me.GroupBox11.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox11.Size = New System.Drawing.Size(252, 96) Me.GroupBox11.TabIndex = 3 Me.GroupBox11.TabStop = False Me.GroupBox11.Text = "Steps to hatch" ' 'SHVal ' - Me.SHVal.Location = New System.Drawing.Point(102, 50) + Me.SHVal.Location = New System.Drawing.Point(136, 62) + Me.SHVal.Margin = New System.Windows.Forms.Padding(4) Me.SHVal.Name = "SHVal" - Me.SHVal.Size = New System.Drawing.Size(74, 20) + Me.SHVal.Size = New System.Drawing.Size(97, 22) Me.SHVal.TabIndex = 3 ' 'SHCombo1 @@ -892,17 +872,19 @@ Partial Class Pokemonedit Me.SHCombo1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.SHCombo1.FormattingEnabled = True Me.SHCombo1.Items.AddRange(New Object() {"Instant", "1280 steps", "2560 steps", "3840 steps", "5120 steps", "6400 steps", "7680 steps", "8960 steps", "10240 steps", "20480 steps", "30720 steps"}) - Me.SHCombo1.Location = New System.Drawing.Point(102, 15) + Me.SHCombo1.Location = New System.Drawing.Point(136, 18) + Me.SHCombo1.Margin = New System.Windows.Forms.Padding(4) Me.SHCombo1.Name = "SHCombo1" - Me.SHCombo1.Size = New System.Drawing.Size(74, 21) + Me.SHCombo1.Size = New System.Drawing.Size(97, 24) Me.SHCombo1.TabIndex = 2 ' 'SH2 ' Me.SH2.AutoSize = True - Me.SH2.Location = New System.Drawing.Point(6, 51) + Me.SH2.Location = New System.Drawing.Point(8, 63) + Me.SH2.Margin = New System.Windows.Forms.Padding(4) Me.SH2.Name = "SH2" - Me.SH2.Size = New System.Drawing.Size(63, 17) + Me.SH2.Size = New System.Drawing.Size(80, 21) Me.SH2.TabIndex = 1 Me.SH2.TabStop = True Me.SH2.Text = "Custom:" @@ -911,9 +893,10 @@ Partial Class Pokemonedit 'SH1 ' Me.SH1.AutoSize = True - Me.SH1.Location = New System.Drawing.Point(6, 19) + Me.SH1.Location = New System.Drawing.Point(8, 23) + Me.SH1.Margin = New System.Windows.Forms.Padding(4) Me.SH1.Name = "SH1" - Me.SH1.Size = New System.Drawing.Size(71, 17) + Me.SH1.Size = New System.Drawing.Size(91, 21) Me.SH1.TabIndex = 0 Me.SH1.TabStop = True Me.SH1.Text = "Standard:" @@ -922,28 +905,33 @@ Partial Class Pokemonedit 'GroupBox27 ' Me.GroupBox27.Controls.Add(Me.PadBase) - Me.GroupBox27.Location = New System.Drawing.Point(232, 248) + Me.GroupBox27.Location = New System.Drawing.Point(309, 305) + Me.GroupBox27.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox27.Name = "GroupBox27" - Me.GroupBox27.Size = New System.Drawing.Size(72, 49) + Me.GroupBox27.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox27.Size = New System.Drawing.Size(96, 60) Me.GroupBox27.TabIndex = 10 Me.GroupBox27.TabStop = False Me.GroupBox27.Text = "Pad Bytes" ' 'PadBase ' - Me.PadBase.Location = New System.Drawing.Point(11, 19) + Me.PadBase.Location = New System.Drawing.Point(15, 23) + Me.PadBase.Margin = New System.Windows.Forms.Padding(4) Me.PadBase.MaxLength = 4 Me.PadBase.Name = "PadBase" - Me.PadBase.Size = New System.Drawing.Size(51, 20) + Me.PadBase.Size = New System.Drawing.Size(67, 22) Me.PadBase.TabIndex = 16 ' 'GroupBox8 ' Me.GroupBox8.Controls.Add(Me.EggType2) Me.GroupBox8.Controls.Add(Me.EggType1) - Me.GroupBox8.Location = New System.Drawing.Point(12, 354) + Me.GroupBox8.Location = New System.Drawing.Point(16, 436) + Me.GroupBox8.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox8.Name = "GroupBox8" - Me.GroupBox8.Size = New System.Drawing.Size(139, 78) + Me.GroupBox8.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox8.Size = New System.Drawing.Size(185, 96) Me.GroupBox8.TabIndex = 2 Me.GroupBox8.TabStop = False Me.GroupBox8.Text = "Egg Groups" @@ -953,9 +941,10 @@ Partial Class Pokemonedit Me.EggType2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.EggType2.FormattingEnabled = True Me.EggType2.Items.AddRange(New Object() {"-------", "Monster", "Water 1", "Bug", "Flying", "Field", "Fairy", "Plant", "HumanShape", "Water 3", "Mineral", "Chaos", "Water 2", "Ditto", "Dragon", "Can't Breed"}) - Me.EggType2.Location = New System.Drawing.Point(6, 46) + Me.EggType2.Location = New System.Drawing.Point(8, 57) + Me.EggType2.Margin = New System.Windows.Forms.Padding(4) Me.EggType2.Name = "EggType2" - Me.EggType2.Size = New System.Drawing.Size(121, 21) + Me.EggType2.Size = New System.Drawing.Size(160, 24) Me.EggType2.TabIndex = 1 ' 'EggType1 @@ -963,9 +952,10 @@ Partial Class Pokemonedit Me.EggType1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.EggType1.FormattingEnabled = True Me.EggType1.Items.AddRange(New Object() {"-------", "Monster", "Water 1", "Bug", "Flying", "Field", "Fairy", "Plant", "HumanShape", "Water 3", "Mineral", "Chaos", "Water 2", "Ditto", "Dragon", "Can't Breed"}) - Me.EggType1.Location = New System.Drawing.Point(6, 19) + Me.EggType1.Location = New System.Drawing.Point(8, 23) + Me.EggType1.Margin = New System.Windows.Forms.Padding(4) Me.EggType1.Name = "EggType1" - Me.EggType1.Size = New System.Drawing.Size(121, 21) + Me.EggType1.Size = New System.Drawing.Size(160, 24) Me.EggType1.TabIndex = 0 ' 'GroupBox13 @@ -974,18 +964,21 @@ Partial Class Pokemonedit Me.GroupBox13.Controls.Add(Me.GCombo1) Me.GroupBox13.Controls.Add(Me.G2) Me.GroupBox13.Controls.Add(Me.G1) - Me.GroupBox13.Location = New System.Drawing.Point(12, 248) + Me.GroupBox13.Location = New System.Drawing.Point(16, 305) + Me.GroupBox13.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox13.Name = "GroupBox13" - Me.GroupBox13.Size = New System.Drawing.Size(211, 100) + Me.GroupBox13.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox13.Size = New System.Drawing.Size(281, 123) Me.GroupBox13.TabIndex = 9 Me.GroupBox13.TabStop = False Me.GroupBox13.Text = "Gender Ratio" ' 'GVal ' - Me.GVal.Location = New System.Drawing.Point(113, 42) + Me.GVal.Location = New System.Drawing.Point(151, 52) + Me.GVal.Margin = New System.Windows.Forms.Padding(4) Me.GVal.Name = "GVal" - Me.GVal.Size = New System.Drawing.Size(75, 20) + Me.GVal.Size = New System.Drawing.Size(99, 22) Me.GVal.TabIndex = 3 ' 'GCombo1 @@ -993,17 +986,19 @@ Partial Class Pokemonedit Me.GCombo1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.GCombo1.FormattingEnabled = True Me.GCombo1.Items.AddRange(New Object() {"100% Male", "87% Male", "75% Male", "65% Male", "50% Male", "65% Female", "75% Female", "87% Female", "100% Female", "Genderless"}) - Me.GCombo1.Location = New System.Drawing.Point(113, 16) + Me.GCombo1.Location = New System.Drawing.Point(151, 20) + Me.GCombo1.Margin = New System.Windows.Forms.Padding(4) Me.GCombo1.Name = "GCombo1" - Me.GCombo1.Size = New System.Drawing.Size(75, 21) + Me.GCombo1.Size = New System.Drawing.Size(99, 24) Me.GCombo1.TabIndex = 2 ' 'G2 ' Me.G2.AutoSize = True - Me.G2.Location = New System.Drawing.Point(17, 43) + Me.G2.Location = New System.Drawing.Point(23, 53) + Me.G2.Margin = New System.Windows.Forms.Padding(4) Me.G2.Name = "G2" - Me.G2.Size = New System.Drawing.Size(63, 17) + Me.G2.Size = New System.Drawing.Size(80, 21) Me.G2.TabIndex = 1 Me.G2.TabStop = True Me.G2.Text = "Custom:" @@ -1012,9 +1007,10 @@ Partial Class Pokemonedit 'G1 ' Me.G1.AutoSize = True - Me.G1.Location = New System.Drawing.Point(17, 20) + Me.G1.Location = New System.Drawing.Point(23, 25) + Me.G1.Margin = New System.Windows.Forms.Padding(4) Me.G1.Name = "G1" - Me.G1.Size = New System.Drawing.Size(71, 17) + Me.G1.Size = New System.Drawing.Size(91, 21) Me.G1.TabIndex = 0 Me.G1.TabStop = True Me.G1.Text = "Standard:" @@ -1026,9 +1022,11 @@ Partial Class Pokemonedit Me.GroupBox12.Controls.Add(Me.HPVal) Me.GroupBox12.Controls.Add(Me.HP2) Me.GroupBox12.Controls.Add(Me.HP1) - Me.GroupBox12.Location = New System.Drawing.Point(379, 162) + Me.GroupBox12.Location = New System.Drawing.Point(505, 199) + Me.GroupBox12.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox12.Name = "GroupBox12" - Me.GroupBox12.Size = New System.Drawing.Size(200, 100) + Me.GroupBox12.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox12.Size = New System.Drawing.Size(267, 123) Me.GroupBox12.TabIndex = 8 Me.GroupBox12.TabStop = False Me.GroupBox12.Text = "Base Happiness" @@ -1038,24 +1036,27 @@ Partial Class Pokemonedit Me.HPCombo1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.HPCombo1.FormattingEnabled = True Me.HPCombo1.Items.AddRange(New Object() {"Lowest (0)", "Low (35)", "Normal (70)", "Medium-High (90)", "High (100)", "Very High (140)", "Max (255)"}) - Me.HPCombo1.Location = New System.Drawing.Point(102, 19) + Me.HPCombo1.Location = New System.Drawing.Point(136, 23) + Me.HPCombo1.Margin = New System.Windows.Forms.Padding(4) Me.HPCombo1.Name = "HPCombo1" - Me.HPCombo1.Size = New System.Drawing.Size(78, 21) + Me.HPCombo1.Size = New System.Drawing.Size(103, 24) Me.HPCombo1.TabIndex = 3 ' 'HPVal ' - Me.HPVal.Location = New System.Drawing.Point(102, 44) + Me.HPVal.Location = New System.Drawing.Point(136, 54) + Me.HPVal.Margin = New System.Windows.Forms.Padding(4) Me.HPVal.Name = "HPVal" - Me.HPVal.Size = New System.Drawing.Size(79, 20) + Me.HPVal.Size = New System.Drawing.Size(104, 22) Me.HPVal.TabIndex = 2 ' 'HP2 ' Me.HP2.AutoSize = True - Me.HP2.Location = New System.Drawing.Point(6, 47) + Me.HP2.Location = New System.Drawing.Point(8, 58) + Me.HP2.Margin = New System.Windows.Forms.Padding(4) Me.HP2.Name = "HP2" - Me.HP2.Size = New System.Drawing.Size(63, 17) + Me.HP2.Size = New System.Drawing.Size(80, 21) Me.HP2.TabIndex = 1 Me.HP2.TabStop = True Me.HP2.Text = "Custom:" @@ -1064,9 +1065,10 @@ Partial Class Pokemonedit 'HP1 ' Me.HP1.AutoSize = True - Me.HP1.Location = New System.Drawing.Point(6, 21) + Me.HP1.Location = New System.Drawing.Point(8, 26) + Me.HP1.Margin = New System.Windows.Forms.Padding(4) Me.HP1.Name = "HP1" - Me.HP1.Size = New System.Drawing.Size(71, 17) + Me.HP1.Size = New System.Drawing.Size(91, 21) Me.HP1.TabIndex = 0 Me.HP1.TabStop = True Me.HP1.Text = "Standard:" @@ -1075,9 +1077,11 @@ Partial Class Pokemonedit 'GroupBox10 ' Me.GroupBox10.Controls.Add(Me.Grate) - Me.GroupBox10.Location = New System.Drawing.Point(224, 104) + Me.GroupBox10.Location = New System.Drawing.Point(299, 128) + Me.GroupBox10.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox10.Name = "GroupBox10" - Me.GroupBox10.Size = New System.Drawing.Size(142, 52) + Me.GroupBox10.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox10.Size = New System.Drawing.Size(189, 64) Me.GroupBox10.TabIndex = 7 Me.GroupBox10.TabStop = False Me.GroupBox10.Text = "Growth Rate" @@ -1087,35 +1091,41 @@ Partial Class Pokemonedit Me.Grate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.Grate.FormattingEnabled = True Me.Grate.Items.AddRange(New Object() {"1,000,000", "600,000", "1,640,000", "1,059,860", "800,000", "1,250,000"}) - Me.Grate.Location = New System.Drawing.Point(6, 19) + Me.Grate.Location = New System.Drawing.Point(8, 23) + Me.Grate.Margin = New System.Windows.Forms.Padding(4) Me.Grate.Name = "Grate" - Me.Grate.Size = New System.Drawing.Size(121, 21) + Me.Grate.Size = New System.Drawing.Size(160, 24) Me.Grate.TabIndex = 0 ' 'GroupBox9 ' Me.GroupBox9.Controls.Add(Me.Bexp) - Me.GroupBox9.Location = New System.Drawing.Point(149, 162) + Me.GroupBox9.Location = New System.Drawing.Point(199, 199) + Me.GroupBox9.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox9.Name = "GroupBox9" - Me.GroupBox9.Size = New System.Drawing.Size(69, 50) + Me.GroupBox9.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox9.Size = New System.Drawing.Size(92, 62) Me.GroupBox9.TabIndex = 6 Me.GroupBox9.TabStop = False Me.GroupBox9.Text = "Base Exp." ' 'Bexp ' - Me.Bexp.Location = New System.Drawing.Point(19, 20) + Me.Bexp.Location = New System.Drawing.Point(25, 25) + Me.Bexp.Margin = New System.Windows.Forms.Padding(4) Me.Bexp.Name = "Bexp" - Me.Bexp.Size = New System.Drawing.Size(33, 20) + Me.Bexp.Size = New System.Drawing.Size(43, 22) Me.Bexp.TabIndex = 0 ' 'GroupBox7 ' Me.GroupBox7.Controls.Add(Me.Ev2) Me.GroupBox7.Controls.Add(Me.Ev1) - Me.GroupBox7.Location = New System.Drawing.Point(224, 162) + Me.GroupBox7.Location = New System.Drawing.Point(299, 199) + Me.GroupBox7.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox7.Name = "GroupBox7" - Me.GroupBox7.Size = New System.Drawing.Size(142, 80) + Me.GroupBox7.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox7.Size = New System.Drawing.Size(189, 98) Me.GroupBox7.TabIndex = 5 Me.GroupBox7.TabStop = False Me.GroupBox7.Text = "EVs" @@ -1125,9 +1135,10 @@ Partial Class Pokemonedit Me.Ev2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.Ev2.FormattingEnabled = True Me.Ev2.Items.AddRange(New Object() {"Nothing", "1 SpA", "2 SpA", "3 SpA", "1 SpD", "1 SpD, 1 SpA", "1 SpD, 2 SpA", "1 SpD, 3 SpA", "2 SpD", "2 SpD, 1 SpA", "2 SpD, 2 SpA", "2 SpD, 3 SpA", "3 SpD", "3 SpD, 1 SpA", "3 SpD, 2 SpA", "3 SpD, 3 SpA"}) - Me.Ev2.Location = New System.Drawing.Point(15, 47) + Me.Ev2.Location = New System.Drawing.Point(20, 58) + Me.Ev2.Margin = New System.Windows.Forms.Padding(4) Me.Ev2.Name = "Ev2" - Me.Ev2.Size = New System.Drawing.Size(121, 21) + Me.Ev2.Size = New System.Drawing.Size(160, 24) Me.Ev2.TabIndex = 1 ' 'Ev1 @@ -1135,18 +1146,21 @@ Partial Class Pokemonedit Me.Ev1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.Ev1.FormattingEnabled = True Me.Ev1.Items.AddRange(New Object() {"Nothing", "1 HP", "2 HP", "3 HP", "1 Atk", "1 HP, 1 Atk", "2 HP, 1 Atk", "3 HP, 1 Atk", "2 Atk", "1 HP, 2 Atk", "2 HP, 2 Atk", "3 HP, 2 Atk", "3 Atk", "1 HP, 3 Atk", "2 HP, 3 Atk", "3 HP, 3 Atk", "1 Def", "1 Def, 1 HP", "1 Def, 2 HP", "1 Def, 3 HP", "1 Def, 1 Atk", "1 Def, 1 HP, 1 Atk", "1 Def, 2 HP, 1 Atk", "1 Def, 3 HP, 1 Atk", "1 Def, 2 Atk", "1 Def, 1 HP, 2 Atk", "1 Def, 2 HP, 2 Atk", "1 Def, 3 HP, 2 Atk", "1 Def, 3 Atk", "1 Def, 1 HP, 3 Atk", "1 Def, 2 HP, 3 Atk", "1 Def, 3 HP, 3 Atk", "2 Def", "2 Def, 1 HP", "2 Def, 2 HP", "2 Def, 3 HP", "2 Def, 1 Atk", "2 Def, 1 HP, 1 Atk", "2 Def, 2 HP, 1 Atk", "2 Def, 3 HP, 1 Atk", "2 Def, 2 Atk", "2 Def, 1 HP, 2 Atk", "2 Def, 2 HP, 2 Atk", "2 Def, 3 HP, 2 Atk", "2 Def, 3 Atk", "2 Def, 1 HP, 3 Atk", "2 Def, 2 HP, 3 Atk", "2 Def, 3 HP, 3 Atk", "3 Def", "3 Def, 1 HP", "3 Def, 2 HP", "3 Def, 3 Hp", "3 Def, 1 Atk", "3 Def, 1 HP, 1 Atk", "3 Def, 2 HP, 1 Atk", "3 Def, 3 HP, 1 Atk", "3 Def, 2 Atk", "3 Def, 1 HP, 2 Atk", "3 Def, 2 HP, 2 Atk", "3 Def, 3 HP, 2 Atk", "3 Def, 3 Atk", "3 Def, 1 HP, 3 Atk", "3 Def, 2 HP, 3 Atk", "3 Def, 3 HP, 3 Atk", "1 Spe", "1 Spe, 1 HP", "1 Spe, 2 HP", "1 Spe, 3 HP", "1 Spe, 1 Atk", "1 Spe, 1 HP, 1 Atk", "1 Spe, 2 HP, 1 Atk", "1 Spe, 3 HP, 1 Atk", "1 Spe, 2 Atk", "1 Spe, 1 HP, 2 Atk", "1 Spe, 2 HP, 2 Atk", "1 Spe, 3 HP, 2 Atk", "1 Spe, 3 Atk", "1 Spe, 1 HP, 3 Atk", "1 Spe, 2 HP, 3 Atk", "1 Spe, 3 HP, 3 Atk", "1 Spe, 1 Def", "1 Spe, 1 HP, 1 Def", "1 Spe, 2 HP, 1 Def", "1 Spe, 3 HP, 1 Def", "1 Spe, 1 Atk, 1 Def", "1 Spe, 1 HP, 1 Atk, 1 Def", "1 Spe, 2 HP, 1 Atk, 1 Def", "1 Spe, 3 HP, 1 Atk, 1 Def", "1 Spe, 2 Atk, 1 Def", "1 Spe, 1 HP, 2 Atk, 1 Def", "1 Spe, 2 HP, 2 Atk, 1 Def", "1 Spe, 3 HP, 2 Atk, 1 Def", "1 Spe, 3 Atk, 1 Def", "1 Spe, 1 HP, 3 Atk, 1 Def", "1 Spe, 2 HP, 3 Atk, 1 Def", "1 Spe, 3 HP, 3 Atk, 1 Def", "1 Spe, 2 Def", "1 Spe, 1 HP, 2 Def", "1 Spe, 2 HP, 2 Def", "1 Spe, 3 HP, 2 Def", "1 Spe, 1 Atk, 2 Def", "1 Spe, 1 HP, 1 Atk, 2 Def", "1 Spe, 2 HP, 1 Atk, 2 Def", "1 Spe, 3 HP, 1 Atk, 2 Def", "1 Spe, 2 Atk, 2 Def", "1 Spe, 1 HP, 2 Atk, 2 Def", "1 Spe, 2 HP, 2 Atk, 2 Def", "1 Spe, 3 HP, 2 Atk, 2 Def", "1 Spe, 3 Atk, 2 Def", "1 Spe, 1 HP, 3 Atk, 2 Def", "1 Spe, 2 HP, 3 Atk, 2 Def", "1 Spe, 3 HP, 3 Atk, 2 Def", "1 Spe, 3 Def", "1 Spe, 1 HP, 3 Def", "1 Spe, 2 HP, 3 Def", "1 Spe, 3 HP, 3 Def", "1 Spe, 1 Atk, 3 Def", "1 Spe, 1 HP, 1 Atk, 3 Def", "1 Spe, 2 HP, 1 Atk, 3 Def", "1 Spe, 3 HP, 1 Atk, 3 Def", "1 Spe, 2 Atk, 3 Def", "1 Spe, 1 HP, 2 Atk, 3 Def", "1 Spe, 2 HP, 2 Atk, 3 Def", "1 Spe, 3 HP, 2 Atk, 3 Def", "1 Spe, 3 Atk, 3 Def", "1 Spe, 1 HP, 3 Atk, 3 Def", "1 Spe, 2 HP, 3 Atk, 3 Def", "1 Spe, 3 HP, 3 Atk, 3 Def", "2 Spe", "2 Spe, 1 HP", "2 Spe, 2 HP", "2 Spe, 3 HP", "2 Spe, 1 Atk", "2 Spe, 1 HP, 1 Atk", "2 Spe, 2 HP, 1 Atk", "2 Spe, 3 HP, 1 Atk", "2 Spe, 2 Atk", "2 Spe, 1 HP, 2 Atk", "2 Spe, 2 HP, 2 Atk", "2 Spe, 3 HP, 2 Atk", "2 Spe, 3 Atk", "2 Spe, 1 HP, 3 Atk", "2 Spe, 2 HP, 3 Atk", "2 Spe, 3 HP, 3 Atk", "2 Spe, 1 Def", "2 Spe, 1 HP, 1 Def", "2 Spe, 2 HP, 1 Def", "2 Spe, 3 HP, 1 Def", "2 Spe, 1 Atk, 1 Def", "2 Spe, 1 HP, 1 Atk, 1 Def", "2 Spe, 2 HP, 1 Atk, 1 Def", "2 Spe, 3 HP, 1 Atk, 1 Def", "2 SPe, 2 Atk, 1 Def", "2 Spe, 1 HP, 2 Atk, 1 Def", "2 Spe, 2 HP, 2 Atk, 1 Def", "2 Spe, 3 HP, 2 Atk, 1 Def", "2 Spe, 3 Atk, 1 Def", "2 Spe, 1 HP, 3 Atk, 1 Def", "2 Spe, 2 HP, 3 Atk, 1 Def", "2 Spe, 3 HP, 3 Atk, 1 Def", "2 Spe, 2 Def", "2 Spe, 1 HP, 2 Def", "2 Spe, 2 HP, 2 Def", "2 Spe, 3 HP, 2 Def", "2 Spe, 1 Atk, 2 Def", "2 Spe, 1 HP, 1 Atk, 2 Def", "2 Spe, 2 HP, 1 Atk, 2 Def", "2 Spe, 3 HP, 1 Atk, 2 Def", "2 Spe, 2 Atk, 2 Def", "2 Spe, 1 HP, 2 Atk, 2 Def", "2 Spe, 2 HP, 2 Atk, 2 Def", "2 Spe, 3 HP, 2 Atk, 2 Def", "2 Spe, 3 Atk, 2 Def", "2 Spe, 1 HP, 3 Atk, 2 Def", "2 Spe, 2 HP, 3 Atk, 2 Def", "2 Spe, 3 HP, 3 Atk, 2 Def", "2 Spe, 3 Def", "2 Spe, 1 HP, 3 Def", "2 Spe, 2 HP, 3 Def", "2 Spe, 3 HP, 3 Def", "2 Spe, 1 Atk, 3 Def", "2 Spe, 1 HP, 1 Atk, 3 Def", "2 Spe, 2 HP, 1 Atk, 3 Def", "2 Spe, 3 HP, 1 Atk, 3 Def", "2 Spe, 2 Atk, 3 Def", "2 Spe, 1 HP, 2 Atk, 3 Def", "2 Spe, 2 HP, 2 Atk, 3 Def", "2 Spe, 3 HP, 2 Atk, 3 Def", "2 Spe, 3 Atk, 3 Def", "2 Spe, 1 HP, 3 Atk, 3 Def", "2 Spe, 2 HP, 3 Atk, 3 Def", "2 Spe, 3 HP, 3 Atk, 3 Def", "3 Spe", "3 Spe, 1 HP", "3 Spe, 2 HP", "3 Spe, 3 HP", "3 Spe, 1 Atk", "3 Spe, 1 HP, 1 Atk", "3 Spe, 2 HP, 1 Atk", "3 Spe, 3 HP, 1 Atk", "3 Spe, 2 Atk", "3 Spe, 1 HP, 2 Atk", "3 Spe, 2 HP, 2 Atk", "3 Spe, 3 HP, 2 Atk", "3 Spe, 3 Atk", "3 Spe, 1 HP, 3 Atk", "3 Spe, 2 HP, 3 Atk", "3 Spe, 3 HP, 3 Atk", "3 Spe, 1 Def", "3 Spe, 1 HP, 1 Def", "3 Spe, 2 HP, 1 Def", "3 Spe, 3 HP, 1 Def", "3 Spe, 1 Atk, 1 Def", "3 Spe, 1 HP, 1 Atk, 1 Def", "3 Spe, 2 HP, 1 Atk, 1 Def", "3 Spe, 3 HP, 1 Atk, 1 Def", "3 Spe, 2 Atk, 1 Def", "3 Spe, 1 HP, 2 Atk, 1 Def", "3 Spe, 2 HP, 2 Atk, 1 Def", "3 Spe, 3 HP, 2 Atk, 1 Def", "3 Spe, 3 Atk, 1 Def", "3 Spe, 1 HP, 3 Atk, 1 Def", "3 Spe, 2 HP, 3 Atk, 1 Def", "3 Spe, 3 HP, 3 Atk, 1 Def", "3 Spe, 2 Def", "3 Spe, 1 HP, 2 Def", "3 Spe, 2 HP, 2 Def", "3 Spe, 3 HP, 2 Def", "3 Spe, 1 Atk, 2 Def", "3 Spe, 1 HP, 1 Atk, 2 Def", "3 Spe, 2 HP, 1 Atk, 2 Def", "3 Spe, 3 HP, 1 Atk, 2 Def", "3 Spe, 2 Atk, 2 Def", "3 Spe, 1 HP, 2 Atk, 2 Def", "3 Spe, 2 HP, 2 Atk, 2 Def", "3 Spe, 3 HP, 2 Atk, 2 Def", "3 Spe, 3 Atk, 2 Def", "3 Spe, 1 HP, 3 Atk, 2 Def", "3 Spe, 2 HP, 3 Atk, 2 Def", "3 Spe, 3 HP, 3 Atk, 2 Def", "3 Spe, 3 Def", "3 Spe, 1 HP, 3 Def", "3 Spe, 2 HP, 3 Def", "3 Spe, 3 HP, 3 Def", "3 Spe, 1 Atk, 3 Def", "3 Spe, 1 HP, 1 Atk, 3 Def", "3 Spe, 2 HP, 1 Atk, 3 Def", "3 Spe, 3 HP, 1 ATk, 3 Def", "3 Spe, 2 Atk, 3 Def", "3 Spe, 1 HP, 2 Atk, 3 Def", "3 Spe, 2 HP, 2 Atk, 3 Def", "3 Spe, 3 HP, 2 ATk, 3 Def", "3 Spe, 3 Atk, 3 Def", "3 Spe, 1 HP, 3 Atk, 3 Def", "3 Spe, 2 HP, 3 Atk, 3 Def", "3 Spe, 3 HP, 3 Atk, 3 Def"}) - Me.Ev1.Location = New System.Drawing.Point(15, 20) + Me.Ev1.Location = New System.Drawing.Point(20, 25) + Me.Ev1.Margin = New System.Windows.Forms.Padding(4) Me.Ev1.Name = "Ev1" - Me.Ev1.Size = New System.Drawing.Size(121, 21) + Me.Ev1.Size = New System.Drawing.Size(160, 24) Me.Ev1.TabIndex = 0 ' 'GroupBox1 ' Me.GroupBox1.Controls.Add(Me.Lft1) Me.GroupBox1.Controls.Add(Me.Rght1) - Me.GroupBox1.Location = New System.Drawing.Point(243, 318) + Me.GroupBox1.Location = New System.Drawing.Point(324, 391) + Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(100, 74) + Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox1.Size = New System.Drawing.Size(133, 91) Me.GroupBox1.TabIndex = 0 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Status Screen" @@ -1154,9 +1168,10 @@ Partial Class Pokemonedit 'Lft1 ' Me.Lft1.AutoSize = True - Me.Lft1.Location = New System.Drawing.Point(15, 42) + Me.Lft1.Location = New System.Drawing.Point(20, 52) + Me.Lft1.Margin = New System.Windows.Forms.Padding(4) Me.Lft1.Name = "Lft1" - Me.Lft1.Size = New System.Drawing.Size(70, 17) + Me.Lft1.Size = New System.Drawing.Size(88, 21) Me.Lft1.TabIndex = 1 Me.Lft1.TabStop = True Me.Lft1.Text = "Face Left" @@ -1165,9 +1180,10 @@ Partial Class Pokemonedit 'Rght1 ' Me.Rght1.AutoSize = True - Me.Rght1.Location = New System.Drawing.Point(15, 19) + Me.Rght1.Location = New System.Drawing.Point(20, 23) + Me.Rght1.Margin = New System.Windows.Forms.Padding(4) Me.Rght1.Name = "Rght1" - Me.Rght1.Size = New System.Drawing.Size(77, 17) + Me.Rght1.Size = New System.Drawing.Size(97, 21) Me.Rght1.TabIndex = 0 Me.Rght1.TabStop = True Me.Rght1.Text = "Face Right" @@ -1177,9 +1193,11 @@ Partial Class Pokemonedit ' Me.GroupBox6.Controls.Add(Me.Ab2) Me.GroupBox6.Controls.Add(Me.Ab1) - Me.GroupBox6.Location = New System.Drawing.Point(6, 162) + Me.GroupBox6.Location = New System.Drawing.Point(8, 199) + Me.GroupBox6.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox6.Name = "GroupBox6" - Me.GroupBox6.Size = New System.Drawing.Size(137, 80) + Me.GroupBox6.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox6.Size = New System.Drawing.Size(183, 98) Me.GroupBox6.TabIndex = 4 Me.GroupBox6.TabStop = False Me.GroupBox6.Text = "Abilities" @@ -1189,9 +1207,10 @@ Partial Class Pokemonedit Me.Ab2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems Me.Ab2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.Ab2.FormattingEnabled = True - Me.Ab2.Location = New System.Drawing.Point(6, 46) + Me.Ab2.Location = New System.Drawing.Point(8, 57) + Me.Ab2.Margin = New System.Windows.Forms.Padding(4) Me.Ab2.Name = "Ab2" - Me.Ab2.Size = New System.Drawing.Size(121, 21) + Me.Ab2.Size = New System.Drawing.Size(160, 24) Me.Ab2.TabIndex = 1 ' 'Ab1 @@ -1199,18 +1218,21 @@ Partial Class Pokemonedit Me.Ab1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems Me.Ab1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.Ab1.FormattingEnabled = True - Me.Ab1.Location = New System.Drawing.Point(6, 19) + Me.Ab1.Location = New System.Drawing.Point(8, 23) + Me.Ab1.Margin = New System.Windows.Forms.Padding(4) Me.Ab1.Name = "Ab1" - Me.Ab1.Size = New System.Drawing.Size(121, 21) + Me.Ab1.Size = New System.Drawing.Size(160, 24) Me.Ab1.TabIndex = 0 ' 'GroupBox5 ' Me.GroupBox5.Controls.Add(Me.Type2) Me.GroupBox5.Controls.Add(Me.Type1) - Me.GroupBox5.Location = New System.Drawing.Point(423, 19) + Me.GroupBox5.Location = New System.Drawing.Point(564, 23) + Me.GroupBox5.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox5.Name = "GroupBox5" - Me.GroupBox5.Size = New System.Drawing.Size(136, 79) + Me.GroupBox5.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox5.Size = New System.Drawing.Size(181, 97) Me.GroupBox5.TabIndex = 3 Me.GroupBox5.TabStop = False Me.GroupBox5.Text = "Types" @@ -1220,9 +1242,10 @@ Partial Class Pokemonedit Me.Type2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.Type2.FormattingEnabled = True Me.Type2.Items.AddRange(New Object() {"Normal", "Fighting", "Flying", "Poison", "Ground", "Rock", "Bug", "Ghost", "Steel", "???", "Fire", "Water", "Grass", "Electric", "Psychic", "Ice", "Dragon", "Dark"}) - Me.Type2.Location = New System.Drawing.Point(6, 50) + Me.Type2.Location = New System.Drawing.Point(8, 62) + Me.Type2.Margin = New System.Windows.Forms.Padding(4) Me.Type2.Name = "Type2" - Me.Type2.Size = New System.Drawing.Size(121, 21) + Me.Type2.Size = New System.Drawing.Size(160, 24) Me.Type2.TabIndex = 1 ' 'Type1 @@ -1230,9 +1253,10 @@ Partial Class Pokemonedit Me.Type1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.Type1.FormattingEnabled = True Me.Type1.Items.AddRange(New Object() {"Normal", "Fighting", "Flying", "Poison", "Ground", "Rock", "Bug", "Ghost", "Steel", "???", "Fire", "Water", "Grass", "Electric", "Psychic", "Ice", "Dragon", "Dark"}) - Me.Type1.Location = New System.Drawing.Point(6, 22) + Me.Type1.Location = New System.Drawing.Point(8, 27) + Me.Type1.Margin = New System.Windows.Forms.Padding(4) Me.Type1.Name = "Type1" - Me.Type1.Size = New System.Drawing.Size(121, 21) + Me.Type1.Size = New System.Drawing.Size(160, 24) Me.Type1.TabIndex = 0 ' 'GroupBox4 @@ -1241,26 +1265,30 @@ Partial Class Pokemonedit Me.GroupBox4.Controls.Add(Me.HeldItem1) Me.GroupBox4.Controls.Add(Me.Item2) Me.GroupBox4.Controls.Add(Me.Item1) - Me.GroupBox4.Location = New System.Drawing.Point(224, 19) + Me.GroupBox4.Location = New System.Drawing.Point(299, 23) + Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.Size = New System.Drawing.Size(190, 79) + Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox4.Size = New System.Drawing.Size(253, 97) Me.GroupBox4.TabIndex = 2 Me.GroupBox4.TabStop = False Me.GroupBox4.Text = "Held Items" ' 'HeldItem2 ' - Me.HeldItem2.Location = New System.Drawing.Point(16, 50) + Me.HeldItem2.Location = New System.Drawing.Point(21, 62) + Me.HeldItem2.Margin = New System.Windows.Forms.Padding(4) Me.HeldItem2.Name = "HeldItem2" - Me.HeldItem2.Size = New System.Drawing.Size(24, 24) + Me.HeldItem2.Size = New System.Drawing.Size(32, 30) Me.HeldItem2.TabIndex = 3 Me.HeldItem2.TabStop = False ' 'HeldItem1 ' - Me.HeldItem1.Location = New System.Drawing.Point(16, 23) + Me.HeldItem1.Location = New System.Drawing.Point(21, 28) + Me.HeldItem1.Margin = New System.Windows.Forms.Padding(4) Me.HeldItem1.Name = "HeldItem1" - Me.HeldItem1.Size = New System.Drawing.Size(24, 24) + Me.HeldItem1.Size = New System.Drawing.Size(32, 30) Me.HeldItem1.TabIndex = 2 Me.HeldItem1.TabStop = False ' @@ -1269,9 +1297,10 @@ Partial Class Pokemonedit Me.Item2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems Me.Item2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.Item2.FormattingEnabled = True - Me.Item2.Location = New System.Drawing.Point(63, 50) + Me.Item2.Location = New System.Drawing.Point(84, 62) + Me.Item2.Margin = New System.Windows.Forms.Padding(4) Me.Item2.Name = "Item2" - Me.Item2.Size = New System.Drawing.Size(121, 21) + Me.Item2.Size = New System.Drawing.Size(160, 24) Me.Item2.TabIndex = 1 ' 'Item1 @@ -1279,9 +1308,10 @@ Partial Class Pokemonedit Me.Item1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems Me.Item1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.Item1.FormattingEnabled = True - Me.Item1.Location = New System.Drawing.Point(63, 23) + Me.Item1.Location = New System.Drawing.Point(84, 28) + Me.Item1.Margin = New System.Windows.Forms.Padding(4) Me.Item1.Name = "Item1" - Me.Item1.Size = New System.Drawing.Size(121, 21) + Me.Item1.Size = New System.Drawing.Size(160, 24) Me.Item1.TabIndex = 0 ' 'GroupBox3 @@ -1302,148 +1332,167 @@ Partial Class Pokemonedit Me.GroupBox3.Controls.Add(Me.Label3) Me.GroupBox3.Controls.Add(Me.Label2) Me.GroupBox3.Controls.Add(Me.Label1) - Me.GroupBox3.Location = New System.Drawing.Point(6, 19) + Me.GroupBox3.Location = New System.Drawing.Point(8, 23) + Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(212, 137) + Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox3.Size = New System.Drawing.Size(283, 169) Me.GroupBox3.TabIndex = 1 Me.GroupBox3.TabStop = False Me.GroupBox3.Text = "Base Stats" ' 'RunBase ' - Me.RunBase.Location = New System.Drawing.Point(161, 97) + Me.RunBase.Location = New System.Drawing.Point(215, 119) + Me.RunBase.Margin = New System.Windows.Forms.Padding(4) Me.RunBase.Name = "RunBase" - Me.RunBase.Size = New System.Drawing.Size(33, 20) + Me.RunBase.Size = New System.Drawing.Size(43, 22) Me.RunBase.TabIndex = 15 ' 'CatchBase ' - Me.CatchBase.Location = New System.Drawing.Point(161, 71) + Me.CatchBase.Location = New System.Drawing.Point(215, 87) + Me.CatchBase.Margin = New System.Windows.Forms.Padding(4) Me.CatchBase.Name = "CatchBase" - Me.CatchBase.Size = New System.Drawing.Size(33, 20) + Me.CatchBase.Size = New System.Drawing.Size(43, 22) Me.CatchBase.TabIndex = 14 ' 'SpDefBase ' - Me.SpDefBase.Location = New System.Drawing.Point(161, 46) + Me.SpDefBase.Location = New System.Drawing.Point(215, 57) + Me.SpDefBase.Margin = New System.Windows.Forms.Padding(4) Me.SpDefBase.Name = "SpDefBase" - Me.SpDefBase.Size = New System.Drawing.Size(33, 20) + Me.SpDefBase.Size = New System.Drawing.Size(43, 22) Me.SpDefBase.TabIndex = 13 ' 'SpAttBase ' - Me.SpAttBase.Location = New System.Drawing.Point(161, 22) + Me.SpAttBase.Location = New System.Drawing.Point(215, 27) + Me.SpAttBase.Margin = New System.Windows.Forms.Padding(4) Me.SpAttBase.Name = "SpAttBase" - Me.SpAttBase.Size = New System.Drawing.Size(33, 20) + Me.SpAttBase.Size = New System.Drawing.Size(43, 22) Me.SpAttBase.TabIndex = 12 ' 'SpeedBase ' - Me.SpeedBase.Location = New System.Drawing.Point(58, 97) + Me.SpeedBase.Location = New System.Drawing.Point(77, 119) + Me.SpeedBase.Margin = New System.Windows.Forms.Padding(4) Me.SpeedBase.Name = "SpeedBase" - Me.SpeedBase.Size = New System.Drawing.Size(34, 20) + Me.SpeedBase.Size = New System.Drawing.Size(44, 22) Me.SpeedBase.TabIndex = 11 ' 'DefBase ' - Me.DefBase.Location = New System.Drawing.Point(59, 71) + Me.DefBase.Location = New System.Drawing.Point(79, 87) + Me.DefBase.Margin = New System.Windows.Forms.Padding(4) Me.DefBase.Name = "DefBase" - Me.DefBase.Size = New System.Drawing.Size(33, 20) + Me.DefBase.Size = New System.Drawing.Size(43, 22) Me.DefBase.TabIndex = 10 ' 'AtBase ' - Me.AtBase.Location = New System.Drawing.Point(59, 46) + Me.AtBase.Location = New System.Drawing.Point(79, 57) + Me.AtBase.Margin = New System.Windows.Forms.Padding(4) Me.AtBase.Name = "AtBase" - Me.AtBase.Size = New System.Drawing.Size(33, 20) + Me.AtBase.Size = New System.Drawing.Size(43, 22) Me.AtBase.TabIndex = 9 ' 'HpBase ' - Me.HpBase.Location = New System.Drawing.Point(59, 22) + Me.HpBase.Location = New System.Drawing.Point(79, 27) + Me.HpBase.Margin = New System.Windows.Forms.Padding(4) Me.HpBase.Name = "HpBase" - Me.HpBase.Size = New System.Drawing.Size(33, 20) + Me.HpBase.Size = New System.Drawing.Size(43, 22) Me.HpBase.TabIndex = 8 ' 'Label8 ' Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(98, 100) + Me.Label8.Location = New System.Drawing.Point(131, 123) + Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(56, 13) + Me.Label8.Size = New System.Drawing.Size(72, 17) Me.Label8.TabIndex = 7 Me.Label8.Text = "Run Rate:" ' 'Label7 ' Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(98, 74) + Me.Label7.Location = New System.Drawing.Point(131, 91) + Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(64, 13) + Me.Label7.Size = New System.Drawing.Size(82, 17) Me.Label7.TabIndex = 6 Me.Label7.Text = "Catch Rate:" ' 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(98, 53) + Me.Label6.Location = New System.Drawing.Point(131, 65) + Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(66, 13) + Me.Label6.Size = New System.Drawing.Size(86, 17) Me.Label6.TabIndex = 5 Me.Label6.Text = "Sp.Defense:" ' 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(98, 25) + Me.Label5.Location = New System.Drawing.Point(131, 31) + Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(57, 13) + Me.Label5.Size = New System.Drawing.Size(72, 17) Me.Label5.TabIndex = 4 Me.Label5.Text = "Sp.Attack:" ' 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(11, 100) + Me.Label4.Location = New System.Drawing.Point(15, 123) + Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(41, 13) + Me.Label4.Size = New System.Drawing.Size(53, 17) Me.Label4.TabIndex = 3 Me.Label4.Text = "Speed:" ' 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(11, 74) + Me.Label3.Location = New System.Drawing.Point(15, 91) + Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(50, 13) + Me.Label3.Size = New System.Drawing.Size(65, 17) Me.Label3.TabIndex = 2 Me.Label3.Text = "Defense:" ' 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(11, 49) + Me.Label2.Location = New System.Drawing.Point(15, 60) + Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(41, 13) + Me.Label2.Size = New System.Drawing.Size(51, 17) Me.Label2.TabIndex = 1 Me.Label2.Text = "Attack:" ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(11, 25) + Me.Label1.Location = New System.Drawing.Point(15, 31) + Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(25, 13) + Me.Label1.Size = New System.Drawing.Size(31, 17) Me.Label1.TabIndex = 0 Me.Label1.Text = "HP:" ' 'TabPage3 ' Me.TabPage3.Controls.Add(Me.GroupBox17) - Me.TabPage3.Location = New System.Drawing.Point(4, 22) + Me.TabPage3.Location = New System.Drawing.Point(4, 25) + Me.TabPage3.Margin = New System.Windows.Forms.Padding(4) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage3.Size = New System.Drawing.Size(614, 474) + Me.TabPage3.Padding = New System.Windows.Forms.Padding(4) + Me.TabPage3.Size = New System.Drawing.Size(821, 586) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Evolution data" Me.TabPage3.UseVisualStyleBackColor = True @@ -1475,109 +1524,123 @@ Partial Class Pokemonedit Me.GroupBox17.Controls.Add(Me.EvoTypes) Me.GroupBox17.Controls.Add(Me.EvoSlots) Me.GroupBox17.Controls.Add(Me.EvoPKMNames) - Me.GroupBox17.Location = New System.Drawing.Point(6, 8) + Me.GroupBox17.Location = New System.Drawing.Point(8, 10) + Me.GroupBox17.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox17.Name = "GroupBox17" - Me.GroupBox17.Size = New System.Drawing.Size(571, 277) + Me.GroupBox17.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox17.Size = New System.Drawing.Size(761, 341) Me.GroupBox17.TabIndex = 2 Me.GroupBox17.TabStop = False Me.GroupBox17.Text = "Evolutions" ' 'TextBox6 ' - Me.TextBox6.Location = New System.Drawing.Point(422, 241) + Me.TextBox6.Location = New System.Drawing.Point(563, 297) + Me.TextBox6.Margin = New System.Windows.Forms.Padding(4) Me.TextBox6.Name = "TextBox6" - Me.TextBox6.Size = New System.Drawing.Size(40, 20) + Me.TextBox6.Size = New System.Drawing.Size(52, 22) Me.TextBox6.TabIndex = 34 ' 'Label50 ' Me.Label50.AutoSize = True - Me.Label50.Location = New System.Drawing.Point(379, 244) + Me.Label50.Location = New System.Drawing.Point(505, 300) + Me.Label50.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label50.Name = "Label50" - Me.Label50.Size = New System.Drawing.Size(37, 13) + Me.Label50.Size = New System.Drawing.Size(48, 17) Me.Label50.TabIndex = 33 Me.Label50.Text = "Value:" ' 'ComboBox3 ' Me.ComboBox3.FormattingEnabled = True - Me.ComboBox3.Location = New System.Drawing.Point(206, 186) + Me.ComboBox3.Location = New System.Drawing.Point(275, 229) + Me.ComboBox3.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox3.Name = "ComboBox3" - Me.ComboBox3.Size = New System.Drawing.Size(99, 21) + Me.ComboBox3.Size = New System.Drawing.Size(131, 24) Me.ComboBox3.TabIndex = 32 ' 'Label19 ' Me.Label19.AutoSize = True - Me.Label19.Location = New System.Drawing.Point(148, 186) + Me.Label19.Location = New System.Drawing.Point(197, 229) + Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label19.Name = "Label19" - Me.Label19.Size = New System.Drawing.Size(41, 13) + Me.Label19.Size = New System.Drawing.Size(51, 17) Me.Label19.TabIndex = 31 Me.Label19.Text = "Attack:" ' 'TextBox2 ' - Me.TextBox2.Location = New System.Drawing.Point(269, 244) + Me.TextBox2.Location = New System.Drawing.Point(359, 300) + Me.TextBox2.Margin = New System.Windows.Forms.Padding(4) Me.TextBox2.Name = "TextBox2" - Me.TextBox2.Size = New System.Drawing.Size(36, 20) + Me.TextBox2.Size = New System.Drawing.Size(47, 22) Me.TextBox2.TabIndex = 30 ' 'TextBox1 ' - Me.TextBox1.Location = New System.Drawing.Point(184, 244) + Me.TextBox1.Location = New System.Drawing.Point(245, 300) + Me.TextBox1.Margin = New System.Windows.Forms.Padding(4) Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(32, 20) + Me.TextBox1.Size = New System.Drawing.Size(41, 22) Me.TextBox1.TabIndex = 29 ' 'Label20 ' Me.Label20.AutoSize = True - Me.Label20.Location = New System.Drawing.Point(148, 244) + Me.Label20.Location = New System.Drawing.Point(197, 300) + Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label20.Name = "Label20" - Me.Label20.Size = New System.Drawing.Size(35, 13) + Me.Label20.Size = New System.Drawing.Size(44, 17) Me.Label20.TabIndex = 28 Me.Label20.Text = "Bank:" ' 'Label21 ' Me.Label21.AutoSize = True - Me.Label21.Location = New System.Drawing.Point(232, 244) + Me.Label21.Location = New System.Drawing.Point(309, 300) + Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label21.Name = "Label21" - Me.Label21.Size = New System.Drawing.Size(31, 13) + Me.Label21.Size = New System.Drawing.Size(39, 17) Me.Label21.TabIndex = 27 Me.Label21.Text = "Map:" ' 'ComboBox2 ' Me.ComboBox2.FormattingEnabled = True - Me.ComboBox2.Location = New System.Drawing.Point(206, 213) + Me.ComboBox2.Location = New System.Drawing.Point(275, 262) + Me.ComboBox2.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox2.Name = "ComboBox2" - Me.ComboBox2.Size = New System.Drawing.Size(99, 21) + Me.ComboBox2.Size = New System.Drawing.Size(131, 24) Me.ComboBox2.TabIndex = 26 ' 'Label22 ' Me.Label22.AutoSize = True - Me.Label22.Location = New System.Drawing.Point(148, 211) + Me.Label22.Location = New System.Drawing.Point(197, 260) + Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label22.Name = "Label22" - Me.Label22.Size = New System.Drawing.Size(60, 13) + Me.Label22.Size = New System.Drawing.Size(78, 17) Me.Label22.TabIndex = 25 Me.Label22.Text = "Map name:" ' 'Label23 ' Me.Label23.AutoSize = True - Me.Label23.Location = New System.Drawing.Point(379, 101) + Me.Label23.Location = New System.Drawing.Point(505, 124) + Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label23.Name = "Label23" - Me.Label23.Size = New System.Drawing.Size(108, 13) + Me.Label23.Size = New System.Drawing.Size(143, 17) Me.Label23.TabIndex = 24 Me.Label23.Text = "Species Requirement" ' 'PictureBox2 ' - Me.PictureBox2.Location = New System.Drawing.Point(382, 153) + Me.PictureBox2.Location = New System.Drawing.Point(509, 188) + Me.PictureBox2.Margin = New System.Windows.Forms.Padding(4) Me.PictureBox2.Name = "PictureBox2" - Me.PictureBox2.Size = New System.Drawing.Size(64, 64) + Me.PictureBox2.Size = New System.Drawing.Size(85, 79) Me.PictureBox2.TabIndex = 23 Me.PictureBox2.TabStop = False ' @@ -1586,40 +1649,45 @@ Partial Class Pokemonedit Me.ComboBox1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend Me.ComboBox1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems Me.ComboBox1.FormattingEnabled = True - Me.ComboBox1.Location = New System.Drawing.Point(382, 123) + Me.ComboBox1.Location = New System.Drawing.Point(509, 151) + Me.ComboBox1.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox1.Name = "ComboBox1" - Me.ComboBox1.Size = New System.Drawing.Size(121, 21) + Me.ComboBox1.Size = New System.Drawing.Size(160, 24) Me.ComboBox1.TabIndex = 22 ' 'EvoBasePokePic ' - Me.EvoBasePokePic.Location = New System.Drawing.Point(150, 19) + Me.EvoBasePokePic.Location = New System.Drawing.Point(200, 23) + Me.EvoBasePokePic.Margin = New System.Windows.Forms.Padding(4) Me.EvoBasePokePic.Name = "EvoBasePokePic" - Me.EvoBasePokePic.Size = New System.Drawing.Size(64, 64) + Me.EvoBasePokePic.Size = New System.Drawing.Size(85, 79) Me.EvoBasePokePic.TabIndex = 11 Me.EvoBasePokePic.TabStop = False ' 'EvoItemPic ' - Me.EvoItemPic.Location = New System.Drawing.Point(184, 153) + Me.EvoItemPic.Location = New System.Drawing.Point(245, 188) + Me.EvoItemPic.Margin = New System.Windows.Forms.Padding(4) Me.EvoItemPic.Name = "EvoItemPic" - Me.EvoItemPic.Size = New System.Drawing.Size(24, 24) + Me.EvoItemPic.Size = New System.Drawing.Size(32, 30) Me.EvoItemPic.TabIndex = 10 Me.EvoItemPic.TabStop = False ' 'EvoPokePic ' - Me.EvoPokePic.Location = New System.Drawing.Point(382, 16) + Me.EvoPokePic.Location = New System.Drawing.Point(509, 20) + Me.EvoPokePic.Margin = New System.Windows.Forms.Padding(4) Me.EvoPokePic.Name = "EvoPokePic" - Me.EvoPokePic.Size = New System.Drawing.Size(64, 64) + Me.EvoPokePic.Size = New System.Drawing.Size(85, 79) Me.EvoPokePic.TabIndex = 9 Me.EvoPokePic.TabStop = False ' 'EvoLevel ' - Me.EvoLevel.Location = New System.Drawing.Point(184, 102) + Me.EvoLevel.Location = New System.Drawing.Point(245, 126) + Me.EvoLevel.Margin = New System.Windows.Forms.Padding(4) Me.EvoLevel.Name = "EvoLevel" - Me.EvoLevel.Size = New System.Drawing.Size(25, 20) + Me.EvoLevel.Size = New System.Drawing.Size(32, 22) Me.EvoLevel.TabIndex = 8 ' 'EvoItem @@ -1627,44 +1695,49 @@ Partial Class Pokemonedit Me.EvoItem.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems Me.EvoItem.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.EvoItem.FormattingEnabled = True - Me.EvoItem.Location = New System.Drawing.Point(184, 126) + Me.EvoItem.Location = New System.Drawing.Point(245, 155) + Me.EvoItem.Margin = New System.Windows.Forms.Padding(4) Me.EvoItem.Name = "EvoItem" - Me.EvoItem.Size = New System.Drawing.Size(121, 21) + Me.EvoItem.Size = New System.Drawing.Size(160, 24) Me.EvoItem.TabIndex = 7 ' 'Label16 ' Me.Label16.AutoSize = True - Me.Label16.Location = New System.Drawing.Point(148, 101) + Me.Label16.Location = New System.Drawing.Point(197, 124) + Me.Label16.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label16.Name = "Label16" - Me.Label16.Size = New System.Drawing.Size(36, 13) + Me.Label16.Size = New System.Drawing.Size(46, 17) Me.Label16.TabIndex = 6 Me.Label16.Text = "Level:" ' 'Label15 ' Me.Label15.AutoSize = True - Me.Label15.Location = New System.Drawing.Point(148, 126) + Me.Label15.Location = New System.Drawing.Point(197, 155) + Me.Label15.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label15.Name = "Label15" - Me.Label15.Size = New System.Drawing.Size(30, 13) + Me.Label15.Size = New System.Drawing.Size(38, 17) Me.Label15.TabIndex = 5 Me.Label15.Text = "Item:" ' 'Label14 ' Me.Label14.AutoSize = True - Me.Label14.Location = New System.Drawing.Point(232, 16) + Me.Label14.Location = New System.Drawing.Point(309, 20) + Me.Label14.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(55, 13) + Me.Label14.Size = New System.Drawing.Size(70, 17) Me.Label14.TabIndex = 4 Me.Label14.Text = "Evolve to:" ' 'Label13 ' Me.Label13.AutoSize = True - Me.Label13.Location = New System.Drawing.Point(6, 102) + Me.Label13.Location = New System.Drawing.Point(8, 126) + Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label13.Name = "Label13" - Me.Label13.Size = New System.Drawing.Size(54, 13) + Me.Label13.Size = New System.Drawing.Size(71, 17) Me.Label13.TabIndex = 3 Me.Label13.Text = "Condition:" ' @@ -1673,18 +1746,21 @@ Partial Class Pokemonedit Me.EvoTypes.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.EvoTypes.FormattingEnabled = True Me.EvoTypes.Items.AddRange(New Object() {"None", "Happiness", "Happiness (Day)", "Happiness (Night)", "Level", "Trade", "Trade w/ Item", "Item", "Atk > Def", "Atk = Def", "Atk < Def", "High Personality", "Low Personality", "Allow Pokemon Creation", "Create Extra Pokemon", "Max Beauty"}) - Me.EvoTypes.Location = New System.Drawing.Point(7, 123) + Me.EvoTypes.Location = New System.Drawing.Point(9, 151) + Me.EvoTypes.Margin = New System.Windows.Forms.Padding(4) Me.EvoTypes.Name = "EvoTypes" - Me.EvoTypes.Size = New System.Drawing.Size(121, 21) + Me.EvoTypes.Size = New System.Drawing.Size(160, 24) Me.EvoTypes.TabIndex = 2 ' 'EvoSlots ' Me.EvoSlots.FormattingEnabled = True + Me.EvoSlots.ItemHeight = 16 Me.EvoSlots.Items.AddRange(New Object() {"Evolution 1", "Evolution 2", "Evolution 3", "Evolution 4", "Evolution 5"}) - Me.EvoSlots.Location = New System.Drawing.Point(7, 19) + Me.EvoSlots.Location = New System.Drawing.Point(9, 23) + Me.EvoSlots.Margin = New System.Windows.Forms.Padding(4) Me.EvoSlots.Name = "EvoSlots" - Me.EvoSlots.Size = New System.Drawing.Size(120, 69) + Me.EvoSlots.Size = New System.Drawing.Size(159, 84) Me.EvoSlots.TabIndex = 1 ' 'EvoPKMNames @@ -1692,9 +1768,10 @@ Partial Class Pokemonedit Me.EvoPKMNames.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems Me.EvoPKMNames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.EvoPKMNames.FormattingEnabled = True - Me.EvoPKMNames.Location = New System.Drawing.Point(235, 32) + Me.EvoPKMNames.Location = New System.Drawing.Point(313, 39) + Me.EvoPKMNames.Margin = New System.Windows.Forms.Padding(4) Me.EvoPKMNames.Name = "EvoPKMNames" - Me.EvoPKMNames.Size = New System.Drawing.Size(121, 21) + Me.EvoPKMNames.Size = New System.Drawing.Size(160, 24) Me.EvoPKMNames.TabIndex = 0 ' 'TabPage4 @@ -1704,19 +1781,21 @@ Partial Class Pokemonedit Me.TabPage4.Controls.Add(Me.GroupBox24) Me.TabPage4.Controls.Add(Me.GroupBox23) Me.TabPage4.Controls.Add(Me.GroupBox22) - Me.TabPage4.Location = New System.Drawing.Point(4, 22) + Me.TabPage4.Location = New System.Drawing.Point(4, 25) + Me.TabPage4.Margin = New System.Windows.Forms.Padding(4) Me.TabPage4.Name = "TabPage4" - Me.TabPage4.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage4.Size = New System.Drawing.Size(614, 474) + Me.TabPage4.Padding = New System.Windows.Forms.Padding(4) + Me.TabPage4.Size = New System.Drawing.Size(821, 586) Me.TabPage4.TabIndex = 3 Me.TabPage4.Text = "Learnable attacks" Me.TabPage4.UseVisualStyleBackColor = True ' 'Button12 ' - Me.Button12.Location = New System.Drawing.Point(6, 9) + Me.Button12.Location = New System.Drawing.Point(8, 11) + Me.Button12.Margin = New System.Windows.Forms.Padding(4) Me.Button12.Name = "Button12" - Me.Button12.Size = New System.Drawing.Size(166, 41) + Me.Button12.Size = New System.Drawing.Size(221, 50) Me.Button12.TabIndex = 10 Me.Button12.Text = "Insert attacks at offset" Me.Button12.UseVisualStyleBackColor = True @@ -1724,9 +1803,11 @@ Partial Class Pokemonedit 'GroupBox25 ' Me.GroupBox25.Controls.Add(Me.MTCom) - Me.GroupBox25.Location = New System.Drawing.Point(380, 6) + Me.GroupBox25.Location = New System.Drawing.Point(507, 7) + Me.GroupBox25.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox25.Name = "GroupBox25" - Me.GroupBox25.Size = New System.Drawing.Size(166, 377) + Me.GroupBox25.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox25.Size = New System.Drawing.Size(221, 464) Me.GroupBox25.TabIndex = 9 Me.GroupBox25.TabStop = False Me.GroupBox25.Text = "Move Tutor Compatibility" @@ -1734,9 +1815,10 @@ Partial Class Pokemonedit 'MTCom ' Me.MTCom.FormattingEnabled = True - Me.MTCom.Location = New System.Drawing.Point(6, 19) + Me.MTCom.Location = New System.Drawing.Point(8, 23) + Me.MTCom.Margin = New System.Windows.Forms.Padding(4) Me.MTCom.Name = "MTCom" - Me.MTCom.Size = New System.Drawing.Size(151, 334) + Me.MTCom.Size = New System.Drawing.Size(200, 395) Me.MTCom.TabIndex = 0 ' 'GroupBox24 @@ -1745,27 +1827,31 @@ Partial Class Pokemonedit Me.GroupBox24.Controls.Add(Me.AtLvl) Me.GroupBox24.Controls.Add(Me.NewAt) Me.GroupBox24.Controls.Add(Me.lvlupattacks) - Me.GroupBox24.Location = New System.Drawing.Point(6, 110) + Me.GroupBox24.Location = New System.Drawing.Point(8, 135) + Me.GroupBox24.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox24.Name = "GroupBox24" - Me.GroupBox24.Size = New System.Drawing.Size(166, 273) + Me.GroupBox24.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox24.Size = New System.Drawing.Size(221, 336) Me.GroupBox24.TabIndex = 8 Me.GroupBox24.TabStop = False Me.GroupBox24.Text = "Level-up attacks" ' 'Button11 ' - Me.Button11.Location = New System.Drawing.Point(6, 219) + Me.Button11.Location = New System.Drawing.Point(8, 270) + Me.Button11.Margin = New System.Windows.Forms.Padding(4) Me.Button11.Name = "Button11" - Me.Button11.Size = New System.Drawing.Size(151, 41) + Me.Button11.Size = New System.Drawing.Size(201, 50) Me.Button11.TabIndex = 3 Me.Button11.Text = "Change attack" Me.Button11.UseVisualStyleBackColor = True ' 'AtLvl ' - Me.AtLvl.Location = New System.Drawing.Point(6, 192) + Me.AtLvl.Location = New System.Drawing.Point(8, 236) + Me.AtLvl.Margin = New System.Windows.Forms.Padding(4) Me.AtLvl.Name = "AtLvl" - Me.AtLvl.Size = New System.Drawing.Size(24, 20) + Me.AtLvl.Size = New System.Drawing.Size(31, 22) Me.AtLvl.TabIndex = 2 ' 'NewAt @@ -1773,25 +1859,30 @@ Partial Class Pokemonedit Me.NewAt.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems Me.NewAt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.NewAt.FormattingEnabled = True - Me.NewAt.Location = New System.Drawing.Point(36, 191) + Me.NewAt.Location = New System.Drawing.Point(48, 235) + Me.NewAt.Margin = New System.Windows.Forms.Padding(4) Me.NewAt.Name = "NewAt" - Me.NewAt.Size = New System.Drawing.Size(121, 21) + Me.NewAt.Size = New System.Drawing.Size(160, 24) Me.NewAt.TabIndex = 1 ' 'lvlupattacks ' Me.lvlupattacks.FormattingEnabled = True - Me.lvlupattacks.Location = New System.Drawing.Point(6, 19) + Me.lvlupattacks.ItemHeight = 16 + Me.lvlupattacks.Location = New System.Drawing.Point(8, 23) + Me.lvlupattacks.Margin = New System.Windows.Forms.Padding(4) Me.lvlupattacks.Name = "lvlupattacks" - Me.lvlupattacks.Size = New System.Drawing.Size(151, 160) + Me.lvlupattacks.Size = New System.Drawing.Size(200, 196) Me.lvlupattacks.TabIndex = 0 ' 'GroupBox23 ' Me.GroupBox23.Controls.Add(Me.TMHMCom) - Me.GroupBox23.Location = New System.Drawing.Point(184, 6) + Me.GroupBox23.Location = New System.Drawing.Point(245, 7) + Me.GroupBox23.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox23.Name = "GroupBox23" - Me.GroupBox23.Size = New System.Drawing.Size(190, 377) + Me.GroupBox23.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox23.Size = New System.Drawing.Size(253, 464) Me.GroupBox23.TabIndex = 7 Me.GroupBox23.TabStop = False Me.GroupBox23.Text = "TM and HM compatibility" @@ -1799,36 +1890,41 @@ Partial Class Pokemonedit 'TMHMCom ' Me.TMHMCom.FormattingEnabled = True - Me.TMHMCom.Location = New System.Drawing.Point(7, 19) + Me.TMHMCom.Location = New System.Drawing.Point(9, 23) + Me.TMHMCom.Margin = New System.Windows.Forms.Padding(4) Me.TMHMCom.Name = "TMHMCom" - Me.TMHMCom.Size = New System.Drawing.Size(177, 334) + Me.TMHMCom.Size = New System.Drawing.Size(235, 395) Me.TMHMCom.TabIndex = 0 ' 'GroupBox22 ' Me.GroupBox22.Controls.Add(Me.Button10) Me.GroupBox22.Controls.Add(Me.LvlUpAttPointer) - Me.GroupBox22.Location = New System.Drawing.Point(6, 56) + Me.GroupBox22.Location = New System.Drawing.Point(8, 69) + Me.GroupBox22.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox22.Name = "GroupBox22" - Me.GroupBox22.Size = New System.Drawing.Size(166, 50) + Me.GroupBox22.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox22.Size = New System.Drawing.Size(221, 62) Me.GroupBox22.TabIndex = 6 Me.GroupBox22.TabStop = False Me.GroupBox22.Text = "Level-up attack Pointer" ' 'Button10 ' - Me.Button10.Location = New System.Drawing.Point(89, 19) + Me.Button10.Location = New System.Drawing.Point(119, 23) + Me.Button10.Margin = New System.Windows.Forms.Padding(4) Me.Button10.Name = "Button10" - Me.Button10.Size = New System.Drawing.Size(68, 21) + Me.Button10.Size = New System.Drawing.Size(91, 26) Me.Button10.TabIndex = 12 Me.Button10.Text = "Repoint" Me.Button10.UseVisualStyleBackColor = True ' 'LvlUpAttPointer ' - Me.LvlUpAttPointer.Location = New System.Drawing.Point(15, 19) + Me.LvlUpAttPointer.Location = New System.Drawing.Point(20, 23) + Me.LvlUpAttPointer.Margin = New System.Windows.Forms.Padding(4) Me.LvlUpAttPointer.Name = "LvlUpAttPointer" - Me.LvlUpAttPointer.Size = New System.Drawing.Size(68, 20) + Me.LvlUpAttPointer.Size = New System.Drawing.Size(89, 22) Me.LvlUpAttPointer.TabIndex = 11 ' 'TabPage6 @@ -1839,9 +1935,10 @@ Partial Class Pokemonedit Me.TabPage6.Controls.Add(Me.GroupBox29) Me.TabPage6.Controls.Add(Me.GroupBox28) Me.TabPage6.Controls.Add(Me.GroupBox2) - Me.TabPage6.Location = New System.Drawing.Point(4, 22) + Me.TabPage6.Location = New System.Drawing.Point(4, 25) + Me.TabPage6.Margin = New System.Windows.Forms.Padding(4) Me.TabPage6.Name = "TabPage6" - Me.TabPage6.Size = New System.Drawing.Size(614, 474) + Me.TabPage6.Size = New System.Drawing.Size(821, 586) Me.TabPage6.TabIndex = 5 Me.TabPage6.Text = "Pokedex" Me.TabPage6.UseVisualStyleBackColor = True @@ -1859,9 +1956,11 @@ Partial Class Pokemonedit Me.GroupBox31.Controls.Add(Me.Scale1) Me.GroupBox31.Controls.Add(Me.Label43) Me.GroupBox31.Controls.Add(Me.Label44) - Me.GroupBox31.Location = New System.Drawing.Point(5, 123) + Me.GroupBox31.Location = New System.Drawing.Point(7, 151) + Me.GroupBox31.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox31.Name = "GroupBox31" - Me.GroupBox31.Size = New System.Drawing.Size(171, 209) + Me.GroupBox31.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox31.Size = New System.Drawing.Size(228, 257) Me.GroupBox31.TabIndex = 21 Me.GroupBox31.TabStop = False Me.GroupBox31.Text = "Size Comparison" @@ -1869,9 +1968,10 @@ Partial Class Pokemonedit 'RSEDexTrainer ' Me.RSEDexTrainer.BackColor = System.Drawing.Color.Transparent - Me.RSEDexTrainer.Location = New System.Drawing.Point(94, 123) + Me.RSEDexTrainer.Location = New System.Drawing.Point(125, 151) + Me.RSEDexTrainer.Margin = New System.Windows.Forms.Padding(4) Me.RSEDexTrainer.Name = "RSEDexTrainer" - Me.RSEDexTrainer.Size = New System.Drawing.Size(64, 64) + Me.RSEDexTrainer.Size = New System.Drawing.Size(85, 79) Me.RSEDexTrainer.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage Me.RSEDexTrainer.TabIndex = 12 Me.RSEDexTrainer.TabStop = False @@ -1879,83 +1979,93 @@ Partial Class Pokemonedit 'RSEDexPoke ' Me.RSEDexPoke.BackColor = System.Drawing.Color.Transparent - Me.RSEDexPoke.Location = New System.Drawing.Point(15, 123) + Me.RSEDexPoke.Location = New System.Drawing.Point(20, 151) + Me.RSEDexPoke.Margin = New System.Windows.Forms.Padding(4) Me.RSEDexPoke.Name = "RSEDexPoke" - Me.RSEDexPoke.Size = New System.Drawing.Size(64, 64) + Me.RSEDexPoke.Size = New System.Drawing.Size(85, 79) Me.RSEDexPoke.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage Me.RSEDexPoke.TabIndex = 11 Me.RSEDexPoke.TabStop = False ' 'Offset_1 ' - Me.Offset_1.Location = New System.Drawing.Point(55, 47) + Me.Offset_1.Location = New System.Drawing.Point(73, 58) + Me.Offset_1.Margin = New System.Windows.Forms.Padding(4) Me.Offset_1.Name = "Offset_1" - Me.Offset_1.Size = New System.Drawing.Size(38, 20) + Me.Offset_1.Size = New System.Drawing.Size(49, 22) Me.Offset_1.TabIndex = 9 ' 'Label40 ' Me.Label40.AutoSize = True - Me.Label40.Location = New System.Drawing.Point(12, 50) + Me.Label40.Location = New System.Drawing.Point(16, 62) + Me.Label40.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label40.Name = "Label40" - Me.Label40.Size = New System.Drawing.Size(38, 13) + Me.Label40.Size = New System.Drawing.Size(50, 17) Me.Label40.TabIndex = 8 Me.Label40.Text = "Offset:" ' 'Label41 ' Me.Label41.AutoSize = True - Me.Label41.Location = New System.Drawing.Point(12, 95) + Me.Label41.Location = New System.Drawing.Point(16, 117) + Me.Label41.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label41.Name = "Label41" - Me.Label41.Size = New System.Drawing.Size(37, 13) + Me.Label41.Size = New System.Drawing.Size(47, 17) Me.Label41.TabIndex = 7 Me.Label41.Text = "Scale:" ' 'Offset_2 ' - Me.Offset_2.Location = New System.Drawing.Point(119, 47) + Me.Offset_2.Location = New System.Drawing.Point(159, 58) + Me.Offset_2.Margin = New System.Windows.Forms.Padding(4) Me.Offset_2.Name = "Offset_2" - Me.Offset_2.Size = New System.Drawing.Size(38, 20) + Me.Offset_2.Size = New System.Drawing.Size(49, 22) Me.Offset_2.TabIndex = 6 ' 'Label42 ' Me.Label42.AutoSize = True - Me.Label42.Location = New System.Drawing.Point(85, 76) + Me.Label42.Location = New System.Drawing.Point(113, 94) + Me.Label42.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label42.Name = "Label42" - Me.Label42.Size = New System.Drawing.Size(42, 13) + Me.Label42.Size = New System.Drawing.Size(55, 17) Me.Label42.TabIndex = 4 Me.Label42.Text = "Against" ' 'Scale2 ' - Me.Scale2.Location = New System.Drawing.Point(120, 91) + Me.Scale2.Location = New System.Drawing.Point(160, 112) + Me.Scale2.Margin = New System.Windows.Forms.Padding(4) Me.Scale2.Name = "Scale2" - Me.Scale2.Size = New System.Drawing.Size(38, 20) + Me.Scale2.Size = New System.Drawing.Size(49, 22) Me.Scale2.TabIndex = 3 ' 'Scale1 ' - Me.Scale1.Location = New System.Drawing.Point(55, 92) + Me.Scale1.Location = New System.Drawing.Point(73, 113) + Me.Scale1.Margin = New System.Windows.Forms.Padding(4) Me.Scale1.Name = "Scale1" - Me.Scale1.Size = New System.Drawing.Size(39, 20) + Me.Scale1.Size = New System.Drawing.Size(51, 22) Me.Scale1.TabIndex = 2 ' 'Label43 ' Me.Label43.AutoSize = True - Me.Label43.Location = New System.Drawing.Point(117, 29) + Me.Label43.Location = New System.Drawing.Point(156, 36) + Me.Label43.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label43.Name = "Label43" - Me.Label43.Size = New System.Drawing.Size(40, 13) + Me.Label43.Size = New System.Drawing.Size(54, 17) Me.Label43.TabIndex = 1 Me.Label43.Text = "Trainer" ' 'Label44 ' Me.Label44.AutoSize = True - Me.Label44.Location = New System.Drawing.Point(52, 29) + Me.Label44.Location = New System.Drawing.Point(69, 36) + Me.Label44.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label44.Name = "Label44" - Me.Label44.Size = New System.Drawing.Size(52, 13) + Me.Label44.Size = New System.Drawing.Size(67, 17) Me.Label44.TabIndex = 0 Me.Label44.Text = "Pokémon" ' @@ -1963,27 +2073,31 @@ Partial Class Pokemonedit ' Me.GroupBox32.Controls.Add(Me.TextBox5) Me.GroupBox32.Controls.Add(Me.Label45) - Me.GroupBox32.Location = New System.Drawing.Point(149, 11) + Me.GroupBox32.Location = New System.Drawing.Point(199, 14) + Me.GroupBox32.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox32.Name = "GroupBox32" - Me.GroupBox32.Size = New System.Drawing.Size(138, 54) + Me.GroupBox32.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox32.Size = New System.Drawing.Size(184, 66) Me.GroupBox32.TabIndex = 20 Me.GroupBox32.TabStop = False Me.GroupBox32.Text = "Type" ' 'TextBox5 ' - Me.TextBox5.Location = New System.Drawing.Point(46, 22) + Me.TextBox5.Location = New System.Drawing.Point(61, 27) + Me.TextBox5.Margin = New System.Windows.Forms.Padding(4) Me.TextBox5.MaxLength = 11 Me.TextBox5.Name = "TextBox5" - Me.TextBox5.Size = New System.Drawing.Size(81, 20) + Me.TextBox5.Size = New System.Drawing.Size(107, 22) Me.TextBox5.TabIndex = 14 ' 'Label45 ' Me.Label45.AutoSize = True - Me.Label45.Location = New System.Drawing.Point(6, 22) + Me.Label45.Location = New System.Drawing.Point(8, 27) + Me.Label45.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label45.Name = "Label45" - Me.Label45.Size = New System.Drawing.Size(34, 13) + Me.Label45.Size = New System.Drawing.Size(44, 17) Me.Label45.TabIndex = 13 Me.Label45.Text = "Type:" ' @@ -1998,9 +2112,11 @@ Partial Class Pokemonedit Me.GroupBox30.Controls.Add(Me.Pointer2) Me.GroupBox30.Controls.Add(Me.Pointer1) Me.GroupBox30.Controls.Add(Me.Label39) - Me.GroupBox30.Location = New System.Drawing.Point(182, 153) + Me.GroupBox30.Location = New System.Drawing.Point(243, 188) + Me.GroupBox30.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox30.Name = "GroupBox30" - Me.GroupBox30.Size = New System.Drawing.Size(387, 262) + Me.GroupBox30.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox30.Size = New System.Drawing.Size(516, 322) Me.GroupBox30.TabIndex = 19 Me.GroupBox30.TabStop = False Me.GroupBox30.Text = "Entry Text" @@ -2008,79 +2124,88 @@ Partial Class Pokemonedit 'Label37 ' Me.Label37.AutoSize = True - Me.Label37.Location = New System.Drawing.Point(110, 228) + Me.Label37.Location = New System.Drawing.Point(147, 281) + Me.Label37.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label37.Name = "Label37" - Me.Label37.Size = New System.Drawing.Size(43, 13) + Me.Label37.Size = New System.Drawing.Size(56, 17) Me.Label37.TabIndex = 8 Me.Label37.Text = "Length:" ' 'Label38 ' Me.Label38.AutoSize = True - Me.Label38.Location = New System.Drawing.Point(110, 104) + Me.Label38.Location = New System.Drawing.Point(147, 128) + Me.Label38.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label38.Name = "Label38" - Me.Label38.Size = New System.Drawing.Size(43, 13) + Me.Label38.Size = New System.Drawing.Size(56, 17) Me.Label38.TabIndex = 7 Me.Label38.Text = "Length:" ' 'Button17 ' - Me.Button17.Location = New System.Drawing.Point(9, 123) + Me.Button17.Location = New System.Drawing.Point(12, 151) + Me.Button17.Margin = New System.Windows.Forms.Padding(4) Me.Button17.Name = "Button17" - Me.Button17.Size = New System.Drawing.Size(95, 24) + Me.Button17.Size = New System.Drawing.Size(127, 30) Me.Button17.TabIndex = 6 Me.Button17.Text = "Save" Me.Button17.UseVisualStyleBackColor = True ' 'Description2 ' - Me.Description2.Location = New System.Drawing.Point(110, 144) + Me.Description2.Location = New System.Drawing.Point(147, 177) + Me.Description2.Margin = New System.Windows.Forms.Padding(4) Me.Description2.Multiline = True Me.Description2.Name = "Description2" Me.Description2.ScrollBars = System.Windows.Forms.ScrollBars.Both - Me.Description2.Size = New System.Drawing.Size(261, 81) + Me.Description2.Size = New System.Drawing.Size(347, 99) Me.Description2.TabIndex = 5 Me.Description2.WordWrap = False ' 'Description1 ' - Me.Description1.Location = New System.Drawing.Point(110, 19) + Me.Description1.Location = New System.Drawing.Point(147, 23) + Me.Description1.Margin = New System.Windows.Forms.Padding(4) Me.Description1.Multiline = True Me.Description1.Name = "Description1" Me.Description1.ScrollBars = System.Windows.Forms.ScrollBars.Both - Me.Description1.Size = New System.Drawing.Size(261, 81) + Me.Description1.Size = New System.Drawing.Size(347, 99) Me.Description1.TabIndex = 4 Me.Description1.WordWrap = False ' 'Button18 ' - Me.Button18.Location = New System.Drawing.Point(9, 93) + Me.Button18.Location = New System.Drawing.Point(12, 114) + Me.Button18.Margin = New System.Windows.Forms.Padding(4) Me.Button18.Name = "Button18" - Me.Button18.Size = New System.Drawing.Size(95, 24) + Me.Button18.Size = New System.Drawing.Size(127, 30) Me.Button18.TabIndex = 3 Me.Button18.Text = "Repoint" Me.Button18.UseVisualStyleBackColor = True ' 'Pointer2 ' - Me.Pointer2.Location = New System.Drawing.Point(11, 67) + Me.Pointer2.Location = New System.Drawing.Point(15, 82) + Me.Pointer2.Margin = New System.Windows.Forms.Padding(4) Me.Pointer2.Name = "Pointer2" - Me.Pointer2.Size = New System.Drawing.Size(93, 20) + Me.Pointer2.Size = New System.Drawing.Size(123, 22) Me.Pointer2.TabIndex = 2 ' 'Pointer1 ' - Me.Pointer1.Location = New System.Drawing.Point(11, 41) + Me.Pointer1.Location = New System.Drawing.Point(15, 50) + Me.Pointer1.Margin = New System.Windows.Forms.Padding(4) Me.Pointer1.Name = "Pointer1" - Me.Pointer1.Size = New System.Drawing.Size(93, 20) + Me.Pointer1.Size = New System.Drawing.Size(123, 22) Me.Pointer1.TabIndex = 1 ' 'Label39 ' Me.Label39.AutoSize = True - Me.Label39.Location = New System.Drawing.Point(8, 19) + Me.Label39.Location = New System.Drawing.Point(11, 23) + Me.Label39.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label39.Name = "Label39" - Me.Label39.Size = New System.Drawing.Size(48, 13) + Me.Label39.Size = New System.Drawing.Size(64, 17) Me.Label39.TabIndex = 0 Me.Label39.Text = "Pointers:" ' @@ -2098,113 +2223,127 @@ Partial Class Pokemonedit Me.GroupBox29.Controls.Add(Me.Hght) Me.GroupBox29.Controls.Add(Me.Label35) Me.GroupBox29.Controls.Add(Me.Label36) - Me.GroupBox29.Location = New System.Drawing.Point(293, 3) + Me.GroupBox29.Location = New System.Drawing.Point(391, 4) + Me.GroupBox29.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox29.Name = "GroupBox29" - Me.GroupBox29.Size = New System.Drawing.Size(144, 142) + Me.GroupBox29.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox29.Size = New System.Drawing.Size(192, 175) Me.GroupBox29.TabIndex = 16 Me.GroupBox29.TabStop = False ' 'Label27 ' Me.Label27.AutoSize = True - Me.Label27.Location = New System.Drawing.Point(77, 113) + Me.Label27.Location = New System.Drawing.Point(103, 139) + Me.Label27.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label27.Name = "Label27" - Me.Label27.Size = New System.Drawing.Size(25, 13) + Me.Label27.Size = New System.Drawing.Size(32, 17) Me.Label27.TabIndex = 13 Me.Label27.Text = " " ' 'Label28 ' Me.Label28.AutoSize = True - Me.Label28.Location = New System.Drawing.Point(77, 98) + Me.Label28.Location = New System.Drawing.Point(103, 121) + Me.Label28.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label28.Name = "Label28" - Me.Label28.Size = New System.Drawing.Size(28, 13) + Me.Label28.Size = New System.Drawing.Size(36, 17) Me.Label28.TabIndex = 12 Me.Label28.Text = " " ' 'Label29 ' Me.Label29.AutoSize = True - Me.Label29.Location = New System.Drawing.Point(77, 54) + Me.Label29.Location = New System.Drawing.Point(103, 66) + Me.Label29.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label29.Name = "Label29" - Me.Label29.Size = New System.Drawing.Size(28, 13) + Me.Label29.Size = New System.Drawing.Size(36, 17) Me.Label29.TabIndex = 11 Me.Label29.Text = " " ' 'Label30 ' Me.Label30.AutoSize = True - Me.Label30.Location = New System.Drawing.Point(77, 39) + Me.Label30.Location = New System.Drawing.Point(103, 48) + Me.Label30.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label30.Name = "Label30" - Me.Label30.Size = New System.Drawing.Size(22, 13) + Me.Label30.Size = New System.Drawing.Size(28, 17) Me.Label30.TabIndex = 10 Me.Label30.Text = " " ' 'Label31 ' Me.Label31.AutoSize = True - Me.Label31.Location = New System.Drawing.Point(13, 113) + Me.Label31.Location = New System.Drawing.Point(17, 139) + Me.Label31.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label31.Name = "Label31" - Me.Label31.Size = New System.Drawing.Size(46, 13) + Me.Label31.Size = New System.Drawing.Size(60, 17) Me.Label31.TabIndex = 9 Me.Label31.Text = "Pounds:" ' 'Label32 ' Me.Label32.AutoSize = True - Me.Label32.Location = New System.Drawing.Point(13, 99) + Me.Label32.Location = New System.Drawing.Point(17, 122) + Me.Label32.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label32.Name = "Label32" - Me.Label32.Size = New System.Drawing.Size(55, 13) + Me.Label32.Size = New System.Drawing.Size(74, 17) Me.Label32.TabIndex = 8 Me.Label32.Text = "Kilograms:" ' 'Label33 ' Me.Label33.AutoSize = True - Me.Label33.Location = New System.Drawing.Point(13, 54) + Me.Label33.Location = New System.Drawing.Point(17, 66) + Me.Label33.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label33.Name = "Label33" - Me.Label33.Size = New System.Drawing.Size(31, 13) + Me.Label33.Size = New System.Drawing.Size(40, 17) Me.Label33.TabIndex = 7 Me.Label33.Text = "Feet:" ' 'Label34 ' Me.Label34.AutoSize = True - Me.Label34.Location = New System.Drawing.Point(13, 39) + Me.Label34.Location = New System.Drawing.Point(17, 48) + Me.Label34.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label34.Name = "Label34" - Me.Label34.Size = New System.Drawing.Size(42, 13) + Me.Label34.Size = New System.Drawing.Size(55, 17) Me.Label34.TabIndex = 6 Me.Label34.Text = "Meters:" ' 'Wght ' - Me.Wght.Location = New System.Drawing.Point(77, 75) + Me.Wght.Location = New System.Drawing.Point(103, 92) + Me.Wght.Margin = New System.Windows.Forms.Padding(4) Me.Wght.Name = "Wght" - Me.Wght.Size = New System.Drawing.Size(42, 20) + Me.Wght.Size = New System.Drawing.Size(55, 22) Me.Wght.TabIndex = 5 ' 'Hght ' - Me.Hght.Location = New System.Drawing.Point(77, 16) + Me.Hght.Location = New System.Drawing.Point(103, 20) + Me.Hght.Margin = New System.Windows.Forms.Padding(4) Me.Hght.Name = "Hght" - Me.Hght.Size = New System.Drawing.Size(42, 20) + Me.Hght.Size = New System.Drawing.Size(55, 22) Me.Hght.TabIndex = 4 ' 'Label35 ' Me.Label35.AutoSize = True - Me.Label35.Location = New System.Drawing.Point(12, 78) + Me.Label35.Location = New System.Drawing.Point(16, 96) + Me.Label35.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label35.Name = "Label35" - Me.Label35.Size = New System.Drawing.Size(44, 13) + Me.Label35.Size = New System.Drawing.Size(56, 17) Me.Label35.TabIndex = 2 Me.Label35.Text = "Weight:" ' 'Label36 ' Me.Label36.AutoSize = True - Me.Label36.Location = New System.Drawing.Point(13, 16) + Me.Label36.Location = New System.Drawing.Point(17, 20) + Me.Label36.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label36.Name = "Label36" - Me.Label36.Size = New System.Drawing.Size(41, 13) + Me.Label36.Size = New System.Drawing.Size(53, 17) Me.Label36.TabIndex = 1 Me.Label36.Text = "Height:" ' @@ -2215,32 +2354,37 @@ Partial Class Pokemonedit Me.GroupBox28.Controls.Add(Me.Button16) Me.GroupBox28.Controls.Add(Me.Label26) Me.GroupBox28.Controls.Add(Me.Label25) - Me.GroupBox28.Location = New System.Drawing.Point(5, 11) + Me.GroupBox28.Location = New System.Drawing.Point(7, 14) + Me.GroupBox28.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox28.Name = "GroupBox28" - Me.GroupBox28.Size = New System.Drawing.Size(138, 106) + Me.GroupBox28.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox28.Size = New System.Drawing.Size(184, 130) Me.GroupBox28.TabIndex = 1 Me.GroupBox28.TabStop = False Me.GroupBox28.Text = "Pokedex Order" ' 'TextBox4 ' - Me.TextBox4.Location = New System.Drawing.Point(94, 47) + Me.TextBox4.Location = New System.Drawing.Point(125, 58) + Me.TextBox4.Margin = New System.Windows.Forms.Padding(4) Me.TextBox4.Name = "TextBox4" - Me.TextBox4.Size = New System.Drawing.Size(34, 20) + Me.TextBox4.Size = New System.Drawing.Size(44, 22) Me.TextBox4.TabIndex = 4 ' 'TextBox3 ' - Me.TextBox3.Location = New System.Drawing.Point(94, 19) + Me.TextBox3.Location = New System.Drawing.Point(125, 23) + Me.TextBox3.Margin = New System.Windows.Forms.Padding(4) Me.TextBox3.Name = "TextBox3" - Me.TextBox3.Size = New System.Drawing.Size(34, 20) + Me.TextBox3.Size = New System.Drawing.Size(44, 22) Me.TextBox3.TabIndex = 3 ' 'Button16 ' - Me.Button16.Location = New System.Drawing.Point(20, 71) + Me.Button16.Location = New System.Drawing.Point(27, 87) + Me.Button16.Margin = New System.Windows.Forms.Padding(4) Me.Button16.Name = "Button16" - Me.Button16.Size = New System.Drawing.Size(107, 23) + Me.Button16.Size = New System.Drawing.Size(143, 28) Me.Button16.TabIndex = 2 Me.Button16.Text = "Save" Me.Button16.UseVisualStyleBackColor = True @@ -2248,27 +2392,31 @@ Partial Class Pokemonedit 'Label26 ' Me.Label26.AutoSize = True - Me.Label26.Location = New System.Drawing.Point(17, 50) + Me.Label26.Location = New System.Drawing.Point(23, 62) + Me.Label26.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label26.Name = "Label26" - Me.Label26.Size = New System.Drawing.Size(77, 13) + Me.Label26.Size = New System.Drawing.Size(100, 17) Me.Label26.TabIndex = 1 Me.Label26.Text = "Second Table:" ' 'Label25 ' Me.Label25.AutoSize = True - Me.Label25.Location = New System.Drawing.Point(17, 22) + Me.Label25.Location = New System.Drawing.Point(23, 27) + Me.Label25.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label25.Name = "Label25" - Me.Label25.Size = New System.Drawing.Size(49, 13) + Me.Label25.Size = New System.Drawing.Size(64, 17) Me.Label25.TabIndex = 0 Me.Label25.Text = "National:" ' 'GroupBox2 ' Me.GroupBox2.Controls.Add(Me.Clr1) - Me.GroupBox2.Location = New System.Drawing.Point(149, 71) + Me.GroupBox2.Location = New System.Drawing.Point(199, 87) + Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(131, 52) + Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox2.Size = New System.Drawing.Size(175, 64) Me.GroupBox2.TabIndex = 0 Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "Color (Base Stats)" @@ -2278,16 +2426,215 @@ Partial Class Pokemonedit Me.Clr1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.Clr1.FormattingEnabled = True Me.Clr1.Items.AddRange(New Object() {"Red", "Blue", "Yellow", "Green", "Black", "Brown", "Purple", "Gray", "White", "Pink"}) - Me.Clr1.Location = New System.Drawing.Point(6, 19) + Me.Clr1.Location = New System.Drawing.Point(8, 23) + Me.Clr1.Margin = New System.Windows.Forms.Padding(4) Me.Clr1.Name = "Clr1" - Me.Clr1.Size = New System.Drawing.Size(121, 21) + Me.Clr1.Size = New System.Drawing.Size(160, 24) Me.Clr1.TabIndex = 0 ' + 'TabPage5 + ' + Me.TabPage5.Controls.Add(Me.GroupBox35) + Me.TabPage5.Controls.Add(Me.GroupBox34) + Me.TabPage5.Controls.Add(Me.GroupBox21) + Me.TabPage5.Location = New System.Drawing.Point(4, 25) + Me.TabPage5.Name = "TabPage5" + Me.TabPage5.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage5.Size = New System.Drawing.Size(821, 586) + Me.TabPage5.TabIndex = 6 + Me.TabPage5.Text = "Cry Data" + Me.TabPage5.UseVisualStyleBackColor = True + ' + 'GroupBox35 + ' + Me.GroupBox35.Controls.Add(Me.Label56) + Me.GroupBox35.Controls.Add(Me.Label54) + Me.GroupBox35.Controls.Add(Me.Button31) + Me.GroupBox35.Controls.Add(Me.Label52) + Me.GroupBox35.Controls.Add(Me.Label46) + Me.GroupBox35.Controls.Add(Me.CryComp2) + Me.GroupBox35.Controls.Add(Me.CryPointer2) + Me.GroupBox35.Location = New System.Drawing.Point(17, 290) + Me.GroupBox35.Name = "GroupBox35" + Me.GroupBox35.Size = New System.Drawing.Size(400, 250) + Me.GroupBox35.TabIndex = 8 + Me.GroupBox35.TabStop = False + Me.GroupBox35.Text = "Growl Cry" + ' + 'Label54 + ' + Me.Label54.AutoSize = True + Me.Label54.Location = New System.Drawing.Point(20, 152) + Me.Label54.Name = "Label54" + Me.Label54.Size = New System.Drawing.Size(126, 17) + Me.Label54.TabIndex = 23 + Me.Label54.Text = "Sample Rate: 0 Hz" + ' + 'Button31 + ' + Me.Button31.Location = New System.Drawing.Point(24, 114) + Me.Button31.Margin = New System.Windows.Forms.Padding(4) + Me.Button31.Name = "Button31" + Me.Button31.Size = New System.Drawing.Size(187, 26) + Me.Button31.TabIndex = 21 + Me.Button31.Text = "Repoint + Save" + Me.Button31.UseVisualStyleBackColor = True + ' + 'Label52 + ' + Me.Label52.AutoSize = True + Me.Label52.Location = New System.Drawing.Point(20, 68) + Me.Label52.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label52.Name = "Label52" + Me.Label52.Size = New System.Drawing.Size(95, 17) + Me.Label52.TabIndex = 22 + Me.Label52.Text = "Compresion?:" + ' + 'Label46 + ' + Me.Label46.AutoSize = True + Me.Label46.Location = New System.Drawing.Point(20, 38) + Me.Label46.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label46.Name = "Label46" + Me.Label46.Size = New System.Drawing.Size(97, 17) + Me.Label46.TabIndex = 18 + Me.Label46.Text = "Growl Pointer:" + ' + 'CryComp2 + ' + Me.CryComp2.Location = New System.Drawing.Point(122, 64) + Me.CryComp2.Margin = New System.Windows.Forms.Padding(4) + Me.CryComp2.Name = "CryComp2" + Me.CryComp2.Size = New System.Drawing.Size(43, 22) + Me.CryComp2.TabIndex = 21 + ' + 'CryPointer2 + ' + Me.CryPointer2.Location = New System.Drawing.Point(122, 34) + Me.CryPointer2.Margin = New System.Windows.Forms.Padding(4) + Me.CryPointer2.Name = "CryPointer2" + Me.CryPointer2.Size = New System.Drawing.Size(89, 22) + Me.CryPointer2.TabIndex = 17 + ' + 'GroupBox34 + ' + Me.GroupBox34.Controls.Add(Me.Label55) + Me.GroupBox34.Controls.Add(Me.Label53) + Me.GroupBox34.Controls.Add(Me.Label17) + Me.GroupBox34.Controls.Add(Me.CryPointer) + Me.GroupBox34.Controls.Add(Me.Label51) + Me.GroupBox34.Controls.Add(Me.Button6) + Me.GroupBox34.Controls.Add(Me.CryComp1) + Me.GroupBox34.Location = New System.Drawing.Point(17, 23) + Me.GroupBox34.Name = "GroupBox34" + Me.GroupBox34.Size = New System.Drawing.Size(400, 250) + Me.GroupBox34.TabIndex = 7 + Me.GroupBox34.TabStop = False + Me.GroupBox34.Text = "Normal Cry" + ' + 'Label53 + ' + Me.Label53.AutoSize = True + Me.Label53.Location = New System.Drawing.Point(20, 129) + Me.Label53.Name = "Label53" + Me.Label53.Size = New System.Drawing.Size(126, 17) + Me.Label53.TabIndex = 21 + Me.Label53.Text = "Sample Rate: 0 Hz" + ' + 'Label17 + ' + Me.Label17.AutoSize = True + Me.Label17.Location = New System.Drawing.Point(20, 36) + Me.Label17.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label17.Name = "Label17" + Me.Label17.Size = New System.Drawing.Size(82, 17) + Me.Label17.TabIndex = 13 + Me.Label17.Text = "Cry Pointer:" + ' + 'CryPointer + ' + Me.CryPointer.Location = New System.Drawing.Point(122, 32) + Me.CryPointer.Margin = New System.Windows.Forms.Padding(4) + Me.CryPointer.Name = "CryPointer" + Me.CryPointer.Size = New System.Drawing.Size(89, 22) + Me.CryPointer.TabIndex = 11 + ' + 'Label51 + ' + Me.Label51.AutoSize = True + Me.Label51.Location = New System.Drawing.Point(20, 68) + Me.Label51.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label51.Name = "Label51" + Me.Label51.Size = New System.Drawing.Size(95, 17) + Me.Label51.TabIndex = 20 + Me.Label51.Text = "Compresion?:" + ' + 'Button6 + ' + Me.Button6.Location = New System.Drawing.Point(24, 94) + Me.Button6.Margin = New System.Windows.Forms.Padding(4) + Me.Button6.Name = "Button6" + Me.Button6.Size = New System.Drawing.Size(187, 26) + Me.Button6.TabIndex = 12 + Me.Button6.Text = "Repoint + Save" + Me.Button6.UseVisualStyleBackColor = True + ' + 'CryComp1 + ' + Me.CryComp1.Location = New System.Drawing.Point(122, 64) + Me.CryComp1.Margin = New System.Windows.Forms.Padding(4) + Me.CryComp1.Name = "CryComp1" + Me.CryComp1.Size = New System.Drawing.Size(43, 22) + Me.CryComp1.TabIndex = 19 + ' + 'GroupBox21 + ' + Me.GroupBox21.Controls.Add(Me.Button13) + Me.GroupBox21.Controls.Add(Me.CryConver) + Me.GroupBox21.Controls.Add(Me.Label18) + Me.GroupBox21.Location = New System.Drawing.Point(498, 407) + Me.GroupBox21.Margin = New System.Windows.Forms.Padding(4) + Me.GroupBox21.Name = "GroupBox21" + Me.GroupBox21.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox21.Size = New System.Drawing.Size(223, 111) + Me.GroupBox21.TabIndex = 6 + Me.GroupBox21.TabStop = False + Me.GroupBox21.Text = "Cry" + ' + 'Button13 + ' + Me.Button13.Location = New System.Drawing.Point(111, 53) + Me.Button13.Margin = New System.Windows.Forms.Padding(4) + Me.Button13.Name = "Button13" + Me.Button13.Size = New System.Drawing.Size(91, 26) + Me.Button13.TabIndex = 16 + Me.Button13.Text = "Save" + Me.Button13.UseVisualStyleBackColor = True + ' + 'CryConver + ' + Me.CryConver.Location = New System.Drawing.Point(111, 22) + Me.CryConver.Margin = New System.Windows.Forms.Padding(4) + Me.CryConver.Name = "CryConver" + Me.CryConver.Size = New System.Drawing.Size(89, 22) + Me.CryConver.TabIndex = 15 + ' + 'Label18 + ' + Me.Label18.AutoSize = True + Me.Label18.Location = New System.Drawing.Point(9, 26) + Me.Label18.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label18.Name = "Label18" + Me.Label18.Size = New System.Drawing.Size(83, 17) + Me.Label18.TabIndex = 14 + Me.Label18.Text = "Conversion:" + ' 'Button1 ' - Me.Button1.Location = New System.Drawing.Point(6, 83) + Me.Button1.Location = New System.Drawing.Point(8, 102) + Me.Button1.Margin = New System.Windows.Forms.Padding(4) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(118, 23) + Me.Button1.Size = New System.Drawing.Size(157, 28) Me.Button1.TabIndex = 2 Me.Button1.Text = "Save Pokemon" Me.Button1.UseVisualStyleBackColor = True @@ -2297,37 +2644,42 @@ Partial Class Pokemonedit Me.GroupBox18.Controls.Add(Me.Button15) Me.GroupBox18.Controls.Add(Me.ChangePKMName) Me.GroupBox18.Controls.Add(Me.CurPKMName) - Me.GroupBox18.Location = New System.Drawing.Point(8, 153) + Me.GroupBox18.Location = New System.Drawing.Point(11, 188) + Me.GroupBox18.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox18.Name = "GroupBox18" - Me.GroupBox18.Size = New System.Drawing.Size(130, 100) + Me.GroupBox18.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox18.Size = New System.Drawing.Size(173, 123) Me.GroupBox18.TabIndex = 7 Me.GroupBox18.TabStop = False Me.GroupBox18.Text = "Rename Pokemon" ' 'Button15 ' - Me.Button15.Location = New System.Drawing.Point(6, 70) + Me.Button15.Location = New System.Drawing.Point(8, 86) + Me.Button15.Margin = New System.Windows.Forms.Padding(4) Me.Button15.Name = "Button15" - Me.Button15.Size = New System.Drawing.Size(118, 23) + Me.Button15.Size = New System.Drawing.Size(157, 28) Me.Button15.TabIndex = 10 Me.Button15.Text = "Decap. all names!" Me.Button15.UseVisualStyleBackColor = True ' 'ChangePKMName ' - Me.ChangePKMName.Location = New System.Drawing.Point(6, 40) + Me.ChangePKMName.Location = New System.Drawing.Point(8, 49) + Me.ChangePKMName.Margin = New System.Windows.Forms.Padding(4) Me.ChangePKMName.Name = "ChangePKMName" - Me.ChangePKMName.Size = New System.Drawing.Size(118, 24) + Me.ChangePKMName.Size = New System.Drawing.Size(157, 30) Me.ChangePKMName.TabIndex = 6 Me.ChangePKMName.Text = "Change Name" Me.ChangePKMName.UseVisualStyleBackColor = True ' 'CurPKMName ' - Me.CurPKMName.Location = New System.Drawing.Point(6, 14) + Me.CurPKMName.Location = New System.Drawing.Point(8, 17) + Me.CurPKMName.Margin = New System.Windows.Forms.Padding(4) Me.CurPKMName.MaxLength = 10 Me.CurPKMName.Name = "CurPKMName" - Me.CurPKMName.Size = New System.Drawing.Size(118, 20) + Me.CurPKMName.Size = New System.Drawing.Size(156, 22) Me.CurPKMName.TabIndex = 5 ' 'GroupBox19 @@ -2336,27 +2688,31 @@ Partial Class Pokemonedit Me.GroupBox19.Controls.Add(Me.Label24) Me.GroupBox19.Controls.Add(Me.PKMNames) Me.GroupBox19.Controls.Add(Me.Button1) - Me.GroupBox19.Location = New System.Drawing.Point(8, 27) + Me.GroupBox19.Location = New System.Drawing.Point(11, 33) + Me.GroupBox19.Margin = New System.Windows.Forms.Padding(4) Me.GroupBox19.Name = "GroupBox19" - Me.GroupBox19.Size = New System.Drawing.Size(130, 120) + Me.GroupBox19.Padding = New System.Windows.Forms.Padding(4) + Me.GroupBox19.Size = New System.Drawing.Size(173, 148) Me.GroupBox19.TabIndex = 8 Me.GroupBox19.TabStop = False Me.GroupBox19.Text = "Pokemon Selection" ' 'PokemonListIndex ' - Me.PokemonListIndex.Location = New System.Drawing.Point(45, 50) + Me.PokemonListIndex.Location = New System.Drawing.Point(60, 62) + Me.PokemonListIndex.Margin = New System.Windows.Forms.Padding(4) Me.PokemonListIndex.Name = "PokemonListIndex" Me.PokemonListIndex.ReadOnly = True - Me.PokemonListIndex.Size = New System.Drawing.Size(40, 20) + Me.PokemonListIndex.Size = New System.Drawing.Size(52, 22) Me.PokemonListIndex.TabIndex = 9 ' 'Label24 ' Me.Label24.AutoSize = True - Me.Label24.Location = New System.Drawing.Point(3, 53) + Me.Label24.Location = New System.Drawing.Point(4, 65) + Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label24.Name = "Label24" - Me.Label24.Size = New System.Drawing.Size(36, 13) + Me.Label24.Size = New System.Drawing.Size(45, 17) Me.Label24.TabIndex = 8 Me.Label24.Text = "Index:" ' @@ -2364,25 +2720,28 @@ Partial Class Pokemonedit ' Me.PKMNames.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems Me.PKMNames.FormattingEnabled = True - Me.PKMNames.Location = New System.Drawing.Point(6, 19) + Me.PKMNames.Location = New System.Drawing.Point(8, 23) + Me.PKMNames.Margin = New System.Windows.Forms.Padding(4) Me.PKMNames.Name = "PKMNames" - Me.PKMNames.Size = New System.Drawing.Size(118, 21) + Me.PKMNames.Size = New System.Drawing.Size(156, 24) Me.PKMNames.TabIndex = 7 ' 'Button7 ' - Me.Button7.Location = New System.Drawing.Point(8, 260) + Me.Button7.Location = New System.Drawing.Point(11, 320) + Me.Button7.Margin = New System.Windows.Forms.Padding(4) Me.Button7.Name = "Button7" - Me.Button7.Size = New System.Drawing.Size(130, 20) + Me.Button7.Size = New System.Drawing.Size(173, 25) Me.Button7.TabIndex = 9 Me.Button7.Text = "Import Pokemon" Me.Button7.UseVisualStyleBackColor = True ' 'Button8 ' - Me.Button8.Location = New System.Drawing.Point(8, 307) + Me.Button8.Location = New System.Drawing.Point(11, 378) + Me.Button8.Margin = New System.Windows.Forms.Padding(4) Me.Button8.Name = "Button8" - Me.Button8.Size = New System.Drawing.Size(130, 20) + Me.Button8.Size = New System.Drawing.Size(173, 25) Me.Button8.TabIndex = 10 Me.Button8.Text = "Export Pokemon" Me.Button8.UseVisualStyleBackColor = True @@ -2393,121 +2752,116 @@ Partial Class Pokemonedit ' 'Button9 ' - Me.Button9.Location = New System.Drawing.Point(8, 330) + Me.Button9.Location = New System.Drawing.Point(11, 406) + Me.Button9.Margin = New System.Windows.Forms.Padding(4) Me.Button9.Name = "Button9" - Me.Button9.Size = New System.Drawing.Size(130, 20) + Me.Button9.Size = New System.Drawing.Size(173, 25) Me.Button9.TabIndex = 11 Me.Button9.Text = "Export All Pokemon" Me.Button9.UseVisualStyleBackColor = True ' 'ProgressBar ' - Me.ProgressBar.Location = New System.Drawing.Point(8, 533) + Me.ProgressBar.Location = New System.Drawing.Point(11, 656) + Me.ProgressBar.Margin = New System.Windows.Forms.Padding(4) Me.ProgressBar.Name = "ProgressBar" - Me.ProgressBar.Size = New System.Drawing.Size(762, 16) + Me.ProgressBar.Size = New System.Drawing.Size(1016, 20) Me.ProgressBar.TabIndex = 12 Me.ProgressBar.Visible = False ' 'Button14 ' - Me.Button14.Location = New System.Drawing.Point(8, 283) + Me.Button14.Location = New System.Drawing.Point(11, 348) + Me.Button14.Margin = New System.Windows.Forms.Padding(4) Me.Button14.Name = "Button14" - Me.Button14.Size = New System.Drawing.Size(130, 20) + Me.Button14.Size = New System.Drawing.Size(173, 25) Me.Button14.TabIndex = 13 Me.Button14.Text = "Import All Pokemon" Me.Button14.UseVisualStyleBackColor = True ' 'Button25 ' - Me.Button25.Location = New System.Drawing.Point(8, 353) + Me.Button25.Location = New System.Drawing.Point(11, 434) + Me.Button25.Margin = New System.Windows.Forms.Padding(4) Me.Button25.Name = "Button25" - Me.Button25.Size = New System.Drawing.Size(130, 20) + Me.Button25.Size = New System.Drawing.Size(173, 25) Me.Button25.TabIndex = 14 Me.Button25.Text = "Import All Sprite sheets" Me.Button25.UseVisualStyleBackColor = True ' 'Button26 ' - Me.Button26.Location = New System.Drawing.Point(8, 376) + Me.Button26.Location = New System.Drawing.Point(11, 463) + Me.Button26.Margin = New System.Windows.Forms.Padding(4) Me.Button26.Name = "Button26" - Me.Button26.Size = New System.Drawing.Size(130, 20) + Me.Button26.Size = New System.Drawing.Size(173, 25) Me.Button26.TabIndex = 15 Me.Button26.Text = "Export All Sprite sheets" Me.Button26.UseVisualStyleBackColor = True ' 'Button27 ' - Me.Button27.Location = New System.Drawing.Point(8, 424) + Me.Button27.Location = New System.Drawing.Point(11, 522) + Me.Button27.Margin = New System.Windows.Forms.Padding(4) Me.Button27.Name = "Button27" - Me.Button27.Size = New System.Drawing.Size(130, 20) + Me.Button27.Size = New System.Drawing.Size(173, 25) Me.Button27.TabIndex = 17 Me.Button27.Text = "Export All Icons" Me.Button27.UseVisualStyleBackColor = True ' 'Button28 ' - Me.Button28.Location = New System.Drawing.Point(8, 400) + Me.Button28.Location = New System.Drawing.Point(11, 492) + Me.Button28.Margin = New System.Windows.Forms.Padding(4) Me.Button28.Name = "Button28" - Me.Button28.Size = New System.Drawing.Size(130, 20) + Me.Button28.Size = New System.Drawing.Size(173, 25) Me.Button28.TabIndex = 16 Me.Button28.Text = "Import All Icons" Me.Button28.UseVisualStyleBackColor = True ' 'Button29 ' - Me.Button29.Location = New System.Drawing.Point(8, 471) + Me.Button29.Location = New System.Drawing.Point(11, 580) + Me.Button29.Margin = New System.Windows.Forms.Padding(4) Me.Button29.Name = "Button29" - Me.Button29.Size = New System.Drawing.Size(130, 20) + Me.Button29.Size = New System.Drawing.Size(173, 25) Me.Button29.TabIndex = 19 Me.Button29.Text = "Export All Footprints" Me.Button29.UseVisualStyleBackColor = True ' 'Button30 ' - Me.Button30.Location = New System.Drawing.Point(8, 448) + Me.Button30.Location = New System.Drawing.Point(11, 551) + Me.Button30.Margin = New System.Windows.Forms.Padding(4) Me.Button30.Name = "Button30" - Me.Button30.Size = New System.Drawing.Size(130, 20) + Me.Button30.Size = New System.Drawing.Size(173, 25) Me.Button30.TabIndex = 18 Me.Button30.Text = "Import All Footprints" Me.Button30.UseVisualStyleBackColor = True ' - 'CryComp1 + 'Label55 ' - Me.CryComp1.Location = New System.Drawing.Point(83, 95) - Me.CryComp1.Name = "CryComp1" - Me.CryComp1.Size = New System.Drawing.Size(33, 20) - Me.CryComp1.TabIndex = 19 + Me.Label55.AutoSize = True + Me.Label55.Location = New System.Drawing.Point(21, 156) + Me.Label55.Name = "Label55" + Me.Label55.Size = New System.Drawing.Size(107, 17) + Me.Label55.TabIndex = 22 + Me.Label55.Text = "Size: 0 samples" ' - 'Label51 + 'Label56 ' - Me.Label51.AutoSize = True - Me.Label51.Location = New System.Drawing.Point(7, 98) - Me.Label51.Name = "Label51" - Me.Label51.Size = New System.Drawing.Size(65, 13) - Me.Label51.TabIndex = 20 - Me.Label51.Text = "Compresion:" - ' - 'Label52 - ' - Me.Label52.AutoSize = True - Me.Label52.Location = New System.Drawing.Point(7, 150) - Me.Label52.Name = "Label52" - Me.Label52.Size = New System.Drawing.Size(65, 13) - Me.Label52.TabIndex = 22 - Me.Label52.Text = "Compresion:" - ' - 'CryComp2 - ' - Me.CryComp2.Location = New System.Drawing.Point(83, 147) - Me.CryComp2.Name = "CryComp2" - Me.CryComp2.Size = New System.Drawing.Size(33, 20) - Me.CryComp2.TabIndex = 21 + Me.Label56.AutoSize = True + Me.Label56.Location = New System.Drawing.Point(21, 182) + Me.Label56.Name = "Label56" + Me.Label56.Size = New System.Drawing.Size(107, 17) + Me.Label56.TabIndex = 24 + Me.Label56.Text = "Size: 0 samples" ' 'Pokemonedit ' - 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(782, 561) + Me.ClientSize = New System.Drawing.Size(1043, 690) Me.Controls.Add(Me.Button29) Me.Controls.Add(Me.Button30) Me.Controls.Add(Me.Button27) @@ -2524,6 +2878,7 @@ Partial Class Pokemonedit Me.Controls.Add(Me.TabControl1) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.Name = "Pokemonedit" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen @@ -2538,8 +2893,6 @@ Partial Class Pokemonedit CType(Me.EnemyAltitudeSelect, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EnemyYSelect, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PlayerYSelect, System.ComponentModel.ISupportInitialize).EndInit() - Me.GroupBox21.ResumeLayout(False) - Me.GroupBox21.PerformLayout() Me.GroupBox20.ResumeLayout(False) Me.GroupBox20.PerformLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() @@ -2607,6 +2960,13 @@ Partial Class Pokemonedit Me.GroupBox28.ResumeLayout(False) Me.GroupBox28.PerformLayout() Me.GroupBox2.ResumeLayout(False) + Me.TabPage5.ResumeLayout(False) + Me.GroupBox35.ResumeLayout(False) + Me.GroupBox35.PerformLayout() + Me.GroupBox34.ResumeLayout(False) + Me.GroupBox34.PerformLayout() + Me.GroupBox21.ResumeLayout(False) + Me.GroupBox21.PerformLayout() Me.GroupBox18.ResumeLayout(False) Me.GroupBox18.PerformLayout() Me.GroupBox19.ResumeLayout(False) @@ -2707,9 +3067,6 @@ Partial Class Pokemonedit Friend WithEvents CurPKMName As System.Windows.Forms.TextBox Friend WithEvents GroupBox19 As System.Windows.Forms.GroupBox Friend WithEvents PKMNames As System.Windows.Forms.ComboBox - Friend WithEvents GroupBox21 As System.Windows.Forms.GroupBox - Friend WithEvents Button6 As System.Windows.Forms.Button - Friend WithEvents CryPointer As System.Windows.Forms.TextBox Friend WithEvents GroupBox20 As System.Windows.Forms.GroupBox Friend WithEvents Button5 As System.Windows.Forms.Button Friend WithEvents FootPrintPointer As System.Windows.Forms.TextBox @@ -2735,10 +3092,6 @@ Partial Class Pokemonedit Friend WithEvents NewAt As System.Windows.Forms.ComboBox Friend WithEvents Button12 As System.Windows.Forms.Button Friend WithEvents IconPicBox As System.Windows.Forms.PictureBox - Friend WithEvents Button13 As System.Windows.Forms.Button - Friend WithEvents CryConver As System.Windows.Forms.TextBox - Friend WithEvents Label18 As System.Windows.Forms.Label - Friend WithEvents Label17 As System.Windows.Forms.Label Friend WithEvents ComboBox3 As System.Windows.Forms.ComboBox Friend WithEvents Label19 As System.Windows.Forms.Label Friend WithEvents TextBox2 As System.Windows.Forms.TextBox @@ -2812,8 +3165,6 @@ Partial Class Pokemonedit Friend WithEvents Label44 As Label Friend WithEvents RSEDexPoke As PictureBox Friend WithEvents RSEDexTrainer As PictureBox - Friend WithEvents CryPointer2 As TextBox - Friend WithEvents Label46 As Label Friend WithEvents GroupBox33 As GroupBox Friend WithEvents Label49 As Label Friend WithEvents Label48 As Label @@ -2839,8 +3190,25 @@ Partial Class Pokemonedit Friend WithEvents Button30 As Button Friend WithEvents TextBox6 As TextBox Friend WithEvents Label50 As Label + Friend WithEvents TabPage5 As System.Windows.Forms.TabPage + Friend WithEvents GroupBox21 As System.Windows.Forms.GroupBox Friend WithEvents Label52 As System.Windows.Forms.Label Friend WithEvents CryComp2 As System.Windows.Forms.TextBox Friend WithEvents Label51 As System.Windows.Forms.Label Friend WithEvents CryComp1 As System.Windows.Forms.TextBox + Friend WithEvents Label46 As System.Windows.Forms.Label + Friend WithEvents CryPointer2 As System.Windows.Forms.TextBox + Friend WithEvents Button13 As System.Windows.Forms.Button + Friend WithEvents CryConver As System.Windows.Forms.TextBox + Friend WithEvents Label18 As System.Windows.Forms.Label + Friend WithEvents Label17 As System.Windows.Forms.Label + Friend WithEvents Button6 As System.Windows.Forms.Button + Friend WithEvents CryPointer As System.Windows.Forms.TextBox + Friend WithEvents GroupBox35 As System.Windows.Forms.GroupBox + Friend WithEvents Button31 As System.Windows.Forms.Button + Friend WithEvents GroupBox34 As System.Windows.Forms.GroupBox + Friend WithEvents Label53 As System.Windows.Forms.Label + Friend WithEvents Label54 As System.Windows.Forms.Label + Friend WithEvents Label56 As System.Windows.Forms.Label + Friend WithEvents Label55 As System.Windows.Forms.Label End Class diff --git a/GBAPokemonGameEditor/Pokemonedit.vb b/GBAPokemonGameEditor/Pokemonedit.vb index 4ff794c..5744fa7 100644 --- a/GBAPokemonGameEditor/Pokemonedit.vb +++ b/GBAPokemonGameEditor/Pokemonedit.vb @@ -6,6 +6,7 @@ Imports System.Net Imports VB = Microsoft.VisualBasic Public Class Pokemonedit + Dim baseoff As Integer Dim FrontSpritePointers As Integer Dim BackSpritePointers As Integer @@ -36,6 +37,8 @@ Public Class Pokemonedit Private Sub Pokemonedit_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load + ' ledrom = New ROM(LoadedROM) + Type1.Items.Clear() Type2.Items.Clear() @@ -655,6 +658,10 @@ Public Class Pokemonedit 'cry stuff with conversion table support If (i + 1) < 252 Then GroupBox21.Enabled = True + GroupBox34.Enabled = True + GroupBox35.Enabled = True + + CryPointer.Text = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (CryTable) + (4) + (i * 12), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000) CryConver.Text = "" CryPointer2.Text = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (CryTable3) + (4) + (i * 12), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000) @@ -662,11 +669,31 @@ Public Class Pokemonedit CryComp1.Text = Hex(Int32.Parse(((ReadHEX(LoadedROM, (CryTable) + (i * 12), 1))), System.Globalization.NumberStyles.HexNumber)) CryComp2.Text = Hex(Int32.Parse(((ReadHEX(LoadedROM, (CryTable3) + (i * 12), 1))), System.Globalization.NumberStyles.HexNumber)) + crynorm = LoadCry(i, CryTable) + crygrowl = LoadCry(i, CryTable3) + + Label53.Text = "Sample Rate: " & crynorm.SampleRate & " Hz" + Label54.Text = "Sample Rate: " & crygrowl.SampleRate & " Hz" + + + Label55.Text = "Size: " & crynorm.Size & " samples" + Label56.Text = "Size: " & crygrowl.Size & " samples" + + 'Label53.Text = "Sample Rate: " & ((Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, ("&H" & CryPointer.Text) + (4), 4)))), System.Globalization.NumberStyles.HexNumber)) >> 10) & " Hz" + 'Label54.Text = "Sample Rate: " & ((Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, ("&H" & CryPointer2.Text) + (4), 4)))), System.Globalization.NumberStyles.HexNumber)) >> 10) & " Hz" + + 'Label55.Text = "Size: " & ((Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, ("&H" & CryPointer.Text) + (12), 4)))), System.Globalization.NumberStyles.HexNumber)) + 1) & " samples" + 'Label56.Text = "Size: " & ((Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, ("&H" & CryPointer2.Text) + (12), 4)))), System.Globalization.NumberStyles.HexNumber)) + 1) & " samples" + CryConver.Enabled = False Button13.Enabled = False + + ElseIf (i + 1) > 251 And (i + 1) <= 276 Then GroupBox21.Enabled = False + GroupBox34.Enabled = False + GroupBox35.Enabled = False CryPointer.Text = "" CryPointer2.Text = "" CryConver.Text = "" @@ -674,6 +701,12 @@ Public Class Pokemonedit CryComp1.Text = "" CryComp2.Text = "" + Label53.Text = "Sample Rate: " & 0 & " Hz" + Label54.Text = "Sample Rate: " & 0 & " Hz" + + Label55.Text = "Size: 0 samples" + Label56.Text = "Size: 0 samples" + End If @@ -681,6 +714,8 @@ Public Class Pokemonedit GroupBox21.Enabled = True CryConver.Enabled = True Button13.Enabled = True + GroupBox34.Enabled = True + GroupBox35.Enabled = True ' MsgBox((CryTable2) + ((i - 276) * 2)) CryConver.Text = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable2)) + ((i - 276) * 2), 2))), System.Globalization.NumberStyles.HexNumber) @@ -689,8 +724,15 @@ Public Class Pokemonedit CryPointer2.Text = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable3) + (4)) + ((CryConver.Text) * 12), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000) - CryComp1.Text = Hex(Int32.Parse(((ReadHEX(LoadedROM, ((CryTable)) + ((CryConver.Text) * 12), 1))), System.Globalization.NumberStyles.HexNumber)) - CryComp2.Text = Hex(Int32.Parse(((ReadHEX(LoadedROM, ((CryTable3)) + ((CryConver.Text) * 12), 1))), System.Globalization.NumberStyles.HexNumber)) + crynorm = LoadCry(CryConver.Text, CryTable) + crygrowl = LoadCry(CryConver.Text, CryTable3) + + Label53.Text = "Sample Rate: " & crynorm.SampleRate & " Hz" + Label54.Text = "Sample Rate: " & crygrowl.SampleRate & " Hz" + + + Label55.Text = "Size: " & crynorm.Size & " samples" + Label56.Text = "Size: " & crygrowl.Size & " samples" End If @@ -991,7 +1033,7 @@ Public Class Pokemonedit End If - + End Sub Private Sub EvoPKMNames_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles EvoPKMNames.SelectedIndexChanged @@ -1704,10 +1746,20 @@ Public Class Pokemonedit If (i + 1) < 252 Then WriteHEX(LoadedROM, (CryTable) + (4) + (i * 12), ReverseHEX(Hex(Int32.Parse(((CryPointer.Text)), System.Globalization.NumberStyles.HexNumber) + &H8000000))) - WriteHEX(LoadedROM, (CryTable3) + (4) + (i * 12), ReverseHEX(Hex(Int32.Parse(((CryPointer2.Text)), System.Globalization.NumberStyles.HexNumber) + &H8000000))) + ' WriteHEX(LoadedROM, (CryTable3) + (4) + (i * 12), ReverseHEX(Hex(Int32.Parse(((CryPointer2.Text)), System.Globalization.NumberStyles.HexNumber) + &H8000000))) WriteHEX(LoadedROM, (CryTable) + (i * 12), (Hex(Int32.Parse(((CryComp1.Text)), System.Globalization.NumberStyles.HexNumber)))) - WriteHEX(LoadedROM, (CryTable3) + (i * 12), (Hex(Int32.Parse(((CryComp2.Text)), System.Globalization.NumberStyles.HexNumber)))) + 'WriteHEX(LoadedROM, (CryTable3) + (i * 12), (Hex(Int32.Parse(((CryComp2.Text)), System.Globalization.NumberStyles.HexNumber)))) + + crynorm = LoadCry(i, CryTable) + crygrowl = LoadCry(i, CryTable3) + + Label53.Text = "Sample Rate: " & crynorm.SampleRate & " Hz" + Label54.Text = "Sample Rate: " & crygrowl.SampleRate & " Hz" + + + Label55.Text = "Size: " & crynorm.Size & " samples" + Label56.Text = "Size: " & crygrowl.Size & " samples" ElseIf (i + 1) > 251 And (i + 1) < 276 Then @@ -1715,10 +1767,20 @@ Public Class Pokemonedit ElseIf (i + 1) > 276 Then WriteHEX(LoadedROM, (CryTable) + (4) + (((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable2)) + ((i - 276) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) * 12), ReverseHEX(Hex(Int32.Parse(((CryPointer.Text)), System.Globalization.NumberStyles.HexNumber) + &H8000000))) - WriteHEX(LoadedROM, (CryTable3) + (4) + (((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable2)) + ((i - 276) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) * 12), ReverseHEX(Hex(Int32.Parse(((CryPointer2.Text)), System.Globalization.NumberStyles.HexNumber) + &H8000000))) + ' WriteHEX(LoadedROM, (CryTable3) + (4) + (((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable2)) + ((i - 276) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) * 12), ReverseHEX(Hex(Int32.Parse(((CryPointer2.Text)), System.Globalization.NumberStyles.HexNumber) + &H8000000))) WriteHEX(LoadedROM, (CryTable) + (((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable2)) + ((i - 276) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) * 12), (Hex(Int32.Parse(((CryComp1.Text)), System.Globalization.NumberStyles.HexNumber)))) - WriteHEX(LoadedROM, (CryTable3) + (((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable2)) + ((i - 276) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) * 12), (Hex(Int32.Parse(((CryComp2.Text)), System.Globalization.NumberStyles.HexNumber)))) + 'WriteHEX(LoadedROM, (CryTable3) + (((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable2)) + ((i - 276) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) * 12), (Hex(Int32.Parse(((CryComp2.Text)), System.Globalization.NumberStyles.HexNumber)))) + + crynorm = LoadCry(((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable2)) + ((i - 276) * 2), 2))), System.Globalization.NumberStyles.HexNumber))), CryTable) + crygrowl = LoadCry(((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable2)) + ((i - 276) * 2), 2))), System.Globalization.NumberStyles.HexNumber))), CryTable3) + + Label53.Text = "Sample Rate: " & crynorm.SampleRate & " Hz" + Label54.Text = "Sample Rate: " & crygrowl.SampleRate & " Hz" + + + Label55.Text = "Size: " & crynorm.Size & " samples" + Label56.Text = "Size: " & crygrowl.Size & " samples" End If End Sub @@ -2040,10 +2102,24 @@ Public Class Pokemonedit CryPointer.Text = Hex(Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, ((CryTable) + (4)) + ((CryConver.Text) * 12), 4)), System.Globalization.NumberStyles.HexNumber) - &H8000000) CryPointer2.Text = Hex(Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, ((CryTable3) + (4)) + ((CryConver.Text) * 12), 4)), System.Globalization.NumberStyles.HexNumber) - &H8000000) + + 'Label53.Text = "Sample Rate: " & ((Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, ("&H" & CryPointer.Text) + (4), 4)))), System.Globalization.NumberStyles.HexNumber)) >> 10) & " Hz" + 'Label54.Text = "Sample Rate: " & ((Int32.Parse(((ReverseHEX(ReadHEX(LoadedROM, ("&H" & CryPointer2.Text) + (4), 4)))), System.Globalization.NumberStyles.HexNumber)) >> 10) & " Hz" + + crynorm = LoadCry(CryConver.Text, CryTable) + crygrowl = LoadCry(CryConver.Text, CryTable3) + + Label53.Text = "Sample Rate: " & crynorm.SampleRate & " Hz" + Label54.Text = "Sample Rate: " & crygrowl.SampleRate & " Hz" + + + Label55.Text = "Size: " & crynorm.Size & " samples" + Label56.Text = "Size: " & crygrowl.Size & " samples" + End If End Sub - Private Sub CryPointer_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles CryPointer.TextChanged + Private Sub CryPointer_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) End Sub @@ -2340,9 +2416,9 @@ Public Class Pokemonedit Else GroupBox32.Enabled = False - GroupBox29.Enabled = False - GroupBox31.Enabled = False - GroupBox30.Enabled = False + GroupBox29.Enabled = False + GroupBox31.Enabled = False + GroupBox30.Enabled = False End If @@ -2456,9 +2532,9 @@ Public Class Pokemonedit End If RSEDexPoke.Location = PokePoint - RSEDexPoke.SizeMode = PictureBoxSizeMode.StretchImage + RSEDexPoke.SizeMode = PictureBoxSizeMode.StretchImage - End If + End If End Sub @@ -3544,4 +3620,51 @@ Public Class Pokemonedit End If End Sub + Private Sub Button31_Click(sender As Object, e As EventArgs) Handles Button31.Click + i = PKMNames.SelectedIndex + + + + If (i + 1) < 252 Then + + 'WriteHEX(LoadedROM, (CryTable) + (4) + (i * 12), ReverseHEX(Hex(Int32.Parse(((CryPointer.Text)), System.Globalization.NumberStyles.HexNumber) + &H8000000))) + WriteHEX(LoadedROM, (CryTable3) + (4) + (i * 12), ReverseHEX(Hex(Int32.Parse(((CryPointer2.Text)), System.Globalization.NumberStyles.HexNumber) + &H8000000))) + + 'WriteHEX(LoadedROM, (CryTable) + (i * 12), (Hex(Int32.Parse(((CryComp1.Text)), System.Globalization.NumberStyles.HexNumber)))) + WriteHEX(LoadedROM, (CryTable3) + (i * 12), (Hex(Int32.Parse(((CryComp2.Text)), System.Globalization.NumberStyles.HexNumber)))) + + crynorm = LoadCry(i, CryTable) + crygrowl = LoadCry(i, CryTable3) + + Label53.Text = "Sample Rate: " & crynorm.SampleRate & " Hz" + Label54.Text = "Sample Rate: " & crygrowl.SampleRate & " Hz" + + + Label55.Text = "Size: " & crynorm.Size & " samples" + Label56.Text = "Size: " & crygrowl.Size & " samples" + + ElseIf (i + 1) > 251 And (i + 1) < 276 Then + + MsgBox("This shoudln't be enabled! report it!") + ElseIf (i + 1) > 276 Then + + 'WriteHEX(LoadedROM, (CryTable) + (4) + (((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable2)) + ((i - 276) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) * 12), ReverseHEX(Hex(Int32.Parse(((CryPointer.Text)), System.Globalization.NumberStyles.HexNumber) + &H8000000))) + WriteHEX(LoadedROM, (CryTable3) + (4) + (((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable2)) + ((i - 276) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) * 12), ReverseHEX(Hex(Int32.Parse(((CryPointer2.Text)), System.Globalization.NumberStyles.HexNumber) + &H8000000))) + + 'WriteHEX(LoadedROM, (CryTable) + (((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable2)) + ((i - 276) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) * 12), (Hex(Int32.Parse(((CryComp1.Text)), System.Globalization.NumberStyles.HexNumber)))) + WriteHEX(LoadedROM, (CryTable3) + (((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable2)) + ((i - 276) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) * 12), (Hex(Int32.Parse(((CryComp2.Text)), System.Globalization.NumberStyles.HexNumber)))) + + crynorm = LoadCry(((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable2)) + ((i - 276) * 2), 2))), System.Globalization.NumberStyles.HexNumber))), CryTable) + crygrowl = LoadCry(((Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((CryTable2)) + ((i - 276) * 2), 2))), System.Globalization.NumberStyles.HexNumber))), CryTable3) + + Label53.Text = "Sample Rate: " & crynorm.SampleRate & " Hz" + Label54.Text = "Sample Rate: " & crygrowl.SampleRate & " Hz" + + + Label55.Text = "Size: " & crynorm.Size & " samples" + Label56.Text = "Size: " & crygrowl.Size & " samples" + + End If + End Sub + End Class \ No newline at end of file diff --git a/GBAPokemonGameEditor/ROM.vb b/GBAPokemonGameEditor/ROM.vb new file mode 100644 index 0000000..1f42c08 --- /dev/null +++ b/GBAPokemonGameEditor/ROM.vb @@ -0,0 +1,340 @@ +Imports System +Imports System.Collections.Generic +Imports System.Drawing +Imports System.IO +Imports System.Text + + +Public Class ROM + 'Implements IDisposable + Private buffer As Byte() + Private pos As Integer = 0 + Private m_filePath As String + Private fileWatcher As FileSystemWatcher + Private ignoreChange As Boolean + + Private disposed As Boolean + + Public Sub New(filePath As String) + Try + ' read contents of file into buffer + Using fs = File.Open(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite) + buffer = New Byte(fs.Length - 1) {} + fs.Read(buffer, 0, buffer.Length) + End Using + + ' create file watcher to monitor ROM being modified + fileWatcher = New FileSystemWatcher() + fileWatcher.Path = Path.GetDirectoryName(filePath) + fileWatcher.Filter = "*.gba" + + AddHandler fileWatcher.Changed, AddressOf OnSourceFileChanged + AddHandler fileWatcher.Renamed, AddressOf OnSourceFileRenamed + + fileWatcher.EnableRaisingEvents = True + Catch + Throw New Exception("Unable to open {filePath}!") + End Try + + Me.m_filePath = filePath + End Sub + + Protected Overrides Sub Finalize() + Try + Dispose() + Finally + MyBase.Finalize() + End Try + End Sub + + Public Sub Dispose() + If disposed Then + Return + End If + disposed = True + + fileWatcher.Dispose() + buffer = Nothing + End Sub + + Public Sub Save() + If String.IsNullOrEmpty(m_filePath) Then + Return + End If + + Using fs = File.Open(m_filePath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.ReadWrite) + fs.Write(buffer, 0, buffer.Length) + End Using + + ignoreChange = True + End Sub + + Public Sub Seek(offset As Integer) + If offset < 0 OrElse offset > buffer.Length Then + Throw New IndexOutOfRangeException() + End If + + pos = offset + End Sub + + Public Sub Skip(bytes As Integer) + pos += bytes + + If pos < 0 OrElse pos > buffer.Length Then + Throw New IndexOutOfRangeException() + End If + End Sub + +#Region "Read" + + Public Function ReadByte() As Byte + Return buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) + End Function + + Public Function PeekByte() As Byte + Return buffer(pos) + End Function + + Public Function ReadSByte() As SByte + Return CSByte(ReadByte()) + End Function + + Public Function ReadUInt16() As UShort + Return CUShort(buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) Or (buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) << 8)) + End Function + + Public Function ReadInt32() As Integer + Return buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) Or (buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) << 8) Or (buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) << 16) Or (buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) << 24) + End Function + + Public Function ReadUInt32() As UInteger + Return CUInt(buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) Or (buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) << 8) Or (buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) << 16) Or (buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) << 24)) + End Function + + Public Function ReadUInt64() As ULong + Return CULng(buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) Or (buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) << 8) Or (buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) << 16) Or (buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) << 24) Or (buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) << 32) Or (buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) << 40) Or (buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) << 48) Or (buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) << 56)) + End Function + + Public Function ReadBytes(count As Integer) As Byte() + Dim b = New Byte(count - 1) {} + For i As Integer = 0 To count - 1 + b(i) = buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) + Next + Return b + End Function + + ' Read a UTF8 encoded string + Public Function ReadString(length As Integer) As String + Return Encoding.UTF8.GetString(ReadBytes(length)) + End Function + + Public Function ReadPointer() As Integer + ' read value + Dim ptr = ReadInt32() + + ' return on blank pointer + If ptr = 0 Then + Return 0 + End If + + ' a pointer must be between 0x0 and 0x1FFFFFF to be valid on the GBA + ' ROM pointer format is OFFSET | 0x8000000, so 0x8000000 <= POINTER <= 0x9FFFFFF + If ptr < &H8000000 OrElse ptr > &H9FFFFFF Then + Throw New Exception(String.Format("Bad pointer at 0x{0:X6}", pos - 4)) + End If + + ' easy way to extract + Return ptr And &H1FFFFFF + End Function + + ' read a GBA string + 'Public Function ReadText(length As Integer, Optional encoding As CharacterEncoding = CharacterEncoding.English) As String + ' Return TextTable.GetString(ReadBytes(length), encoding) + 'End Function + + 'Public Function ReadTextTable(stringLength As Integer, tableSize As Integer, Optional encoding As CharacterEncoding = CharacterEncoding.English) As String() + ' Dim table = New String(tableSize - 1) {} + ' For i As Integer = 0 To tableSize - 1 + ' table(i) = ReadText(stringLength, encoding) + ' Next + + ' Return table + 'End Function + + + +#End Region + +#Region "Write" + + Public Sub WriteByte(value As Byte) + buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) = value + End Sub + + Public Sub WriteSByte(value As SByte) + WriteByte(CByte(value)) + End Sub + + Public Sub WriteUInt16(value As UShort) + buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) = CByte(value) + buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) = CByte(value >> 8) + End Sub + + Public Sub WriteInt32(value As Integer) + For i As Integer = 0 To 3 + buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) = CByte(value >> (i * 8)) + Next + End Sub + + Public Sub WriteUInt32(value As UInteger) + For i As Integer = 0 To 3 + buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) = CByte(value >> (i * 8)) + Next + End Sub + + Public Sub WriteUInt64(value As ULong) + For i As Integer = 0 To 7 + buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) = CByte(value >> (i * 8)) + Next + End Sub + + Public Sub WriteBytes(bytes As Byte()) + For i As Integer = 0 To bytes.Length - 1 + buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) = bytes(i) + Next + End Sub + + ' Write a byte value count number of times + Public Sub WriteBytes(value As Byte, count As Integer) + For i As Integer = 0 To count - 1 + buffer(System.Math.Max(System.Threading.Interlocked.Increment(pos), pos - 1)) = value + Next + End Sub + + Public Sub WritePointer(offset As Integer) + If offset > &H1FFFFFF Then + Throw New Exception(String.Format("Offset 0x{0:X6} too large for a ROM pointer (0 <= offset <= 0x1FFFFFF)!")) + End If + + WriteInt32(offset Or &H8000000) + End Sub + + ' Write a UTF8 encoded string + Public Sub WriteString(str As String) + WriteBytes(Encoding.UTF8.GetBytes(str)) + End Sub + +#End Region + +#Region "Search" + + Public Function FindFreeSpace(length As Integer, Optional freespace As Byte = &HFF, Optional startOffset As Integer = 0, Optional alignment As Integer = 1) As Integer + ' The simpest freespace finder I could think of + If alignment > 1 AndAlso startOffset Mod alignment <> 0 Then + startOffset += alignment - (startOffset Mod alignment) + End If + + Dim i As Integer = startOffset + While i < buffer.Length - length + Dim match As Boolean = True + For j As Integer = 0 To length - 1 + If buffer(i + j) <> freespace Then + match = False + Exit For + End If + Next + + If match Then + Return i + End If + i += alignment + End While + Return -1 + End Function + +#End Region + +#Region "Properties" + + Public ReadOnly Property FilePath() As String + Get + Return m_filePath + End Get + End Property + + Public ReadOnly Property Length() As Integer + Get + Return buffer.Length + End Get + End Property + + Public Property Position() As Integer + Get + Return pos + End Get + Set(value As Integer) + pos = value + + If pos < 0 OrElse pos > buffer.Length Then + Throw New IndexOutOfRangeException() + End If + End Set + End Property + + Public ReadOnly Property EndOfStream() As Boolean + Get + Return pos >= buffer.Length + End Get + End Property + + ' ROM specific properties + ' TODO: better to store these as existing strings + + Public ReadOnly Property Name() As String + Get + Return Encoding.UTF8.GetString(buffer, &HA0, 12) + End Get + End Property + + Public ReadOnly Property Code() As String + Get + Return Encoding.UTF8.GetString(buffer, &HAC, 4) + End Get + End Property + + Public ReadOnly Property Maker() As String + Get + Return Encoding.UTF8.GetString(buffer, &HB0, 2) + End Get + End Property + +#End Region + + Private Sub OnSourceFileChanged(sender As Object, e As FileSystemEventArgs) + Console.WriteLine("ROM {e.FullPath} changed {e.ChangeType}.") + If ignoreChange Then + ignoreChange = False + Return + End If + + If e.FullPath = m_filePath Then + Console.WriteLine("Reloading buffer...") + Using fs = File.Open(m_filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite) + If buffer.Length <> fs.Length Then + buffer = New Byte(fs.Length - 1) {} + End If + + fs.Read(buffer, 0, buffer.Length) + End Using + End If + End Sub + + Private Sub OnSourceFileRenamed(sender As Object, e As RenamedEventArgs) + Console.WriteLine("{e.OldFullPath} renamed to {e.FullPath}!") + + If e.OldFullPath = m_filePath Then + m_filePath = e.FullPath + End If + End Sub +End Class + diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application index 7c6fe95..dd4ac09 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - Lfa3tUh1a3B7Ce+KO1XOAFpQKJM= + cEChvezvtmhv3eHbLmFCkRtITkk= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe index edb2806..7826ebf 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 4172660..1ee351e 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - EnCvmx2c0VL8RvQ7IT/nN4FYRW8= + GrraqbCuBqWEnZ+CKRBzJpXfl+g= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb index e77afb8..d262d5c 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 7c6fe95..dd4ac09 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application @@ -16,7 +16,7 @@ - Lfa3tUh1a3B7Ce+KO1XOAFpQKJM= + cEChvezvtmhv3eHbLmFCkRtITkk= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest index 4172660..1ee351e 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest @@ -43,14 +43,14 @@ - + - EnCvmx2c0VL8RvQ7IT/nN4FYRW8= + GrraqbCuBqWEnZ+CKRBzJpXfl+g= diff --git a/GBAPokemonGameEditor/mMain.vb b/GBAPokemonGameEditor/mMain.vb index 9aec068..c8134c9 100644 --- a/GBAPokemonGameEditor/mMain.vb +++ b/GBAPokemonGameEditor/mMain.vb @@ -5,6 +5,7 @@ Module mMain Public LoadedROM As String + 'Public ledrom As ROM Public AppPath As String = System.AppDomain.CurrentDomain.BaseDirectory() & IIf(Right(System.AppDomain.CurrentDomain.BaseDirectory(), 1) = "\", "", "\") Public i As Integer Public FileNum As Integer @@ -15,6 +16,9 @@ Module mMain Public SkipVar As Integer Public x As Integer + Public crynorm As New Cry() + Public crygrowl As New Cry() + 'For Map Edit Public Point2MapBankPointers As String Public MapBankPointers As String diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache index d468da8..cde25fc 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.AboutBox1.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.AboutBox1.resources index 7b767b4..0609081 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.AboutBox1.resources and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.AboutBox1.resources differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.SplashScreen1.resources b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.SplashScreen1.resources index daa14d6..16f5c50 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.SplashScreen1.resources and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.SplashScreen1.resources differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application index 7c6fe95..dd4ac09 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - Lfa3tUh1a3B7Ce+KO1XOAFpQKJM= + cEChvezvtmhv3eHbLmFCkRtITkk= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe index edb2806..7826ebf 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 4172660..1ee351e 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - EnCvmx2c0VL8RvQ7IT/nN4FYRW8= + GrraqbCuBqWEnZ+CKRBzJpXfl+g= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb index e77afb8..d262d5c 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ diff --git a/README.md b/README.md index d4585cb..64b8380 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ 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 2015. +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. Screenshots ================= @@ -187,6 +187,8 @@ DoesntKnowHowToPlay AkameTheBulbasaur +doom-desire + Downloads ================================ https://github.com/Gamer2020/PokemonGameEditor/releases