diff --git a/GBAPokemonGameEditor.v12.suo b/GBAPokemonGameEditor.v12.suo index ea675bc..a48dcd9 100644 Binary files a/GBAPokemonGameEditor.v12.suo and b/GBAPokemonGameEditor.v12.suo differ diff --git a/GBAPokemonGameEditor/Pokemonedit.Designer.vb b/GBAPokemonGameEditor/Pokemonedit.Designer.vb index f565b76..344c91a 100644 --- a/GBAPokemonGameEditor/Pokemonedit.Designer.vb +++ b/GBAPokemonGameEditor/Pokemonedit.Designer.vb @@ -139,6 +139,8 @@ Partial Class Pokemonedit Me.Label1 = New System.Windows.Forms.Label() Me.TabPage3 = New System.Windows.Forms.TabPage() Me.GroupBox17 = New System.Windows.Forms.GroupBox() + Me.TextBox6 = New System.Windows.Forms.TextBox() + Me.Label50 = New System.Windows.Forms.Label() Me.ComboBox3 = New System.Windows.Forms.ComboBox() Me.Label19 = New System.Windows.Forms.Label() Me.TextBox2 = New System.Windows.Forms.TextBox() @@ -246,8 +248,10 @@ 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.Label50 = New System.Windows.Forms.Label() - Me.TextBox6 = New System.Windows.Forms.TextBox() + 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.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() Me.GroupBox26.SuspendLayout() @@ -458,6 +462,10 @@ Partial Class Pokemonedit ' '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) @@ -468,7 +476,7 @@ Partial Class Pokemonedit 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, 152) + Me.GroupBox21.Size = New System.Drawing.Size(167, 201) Me.GroupBox21.TabIndex = 5 Me.GroupBox21.TabStop = False Me.GroupBox21.Text = "Cry" @@ -476,15 +484,15 @@ Partial Class Pokemonedit 'Label46 ' Me.Label46.AutoSize = True - Me.Label46.Location = New System.Drawing.Point(7, 98) + Me.Label46.Location = New System.Drawing.Point(7, 126) Me.Label46.Name = "Label46" - Me.Label46.Size = New System.Drawing.Size(70, 13) + Me.Label46.Size = New System.Drawing.Size(73, 13) Me.Label46.TabIndex = 18 - Me.Label46.Text = "Growl Pointer" + Me.Label46.Text = "Growl Pointer:" ' 'CryPointer2 ' - Me.CryPointer2.Location = New System.Drawing.Point(83, 95) + 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 @@ -502,7 +510,7 @@ Partial Class Pokemonedit ' Me.CryConver.Location = New System.Drawing.Point(83, 18) Me.CryConver.Name = "CryConver" - Me.CryConver.Size = New System.Drawing.Size(67, 20) + Me.CryConver.Size = New System.Drawing.Size(68, 20) Me.CryConver.TabIndex = 15 ' 'Label18 @@ -510,26 +518,26 @@ Partial Class Pokemonedit Me.Label18.AutoSize = True Me.Label18.Location = New System.Drawing.Point(7, 21) Me.Label18.Name = "Label18" - Me.Label18.Size = New System.Drawing.Size(60, 13) + Me.Label18.Size = New System.Drawing.Size(63, 13) Me.Label18.TabIndex = 14 - Me.Label18.Text = "Conversion" + 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(58, 13) + Me.Label17.Size = New System.Drawing.Size(61, 13) Me.Label17.TabIndex = 13 - Me.Label17.Text = "Cry Pointer" + Me.Label17.Text = "Cry Pointer:" ' 'Button6 ' - Me.Button6.Location = New System.Drawing.Point(83, 124) + Me.Button6.Location = New System.Drawing.Point(10, 169) Me.Button6.Name = "Button6" - Me.Button6.Size = New System.Drawing.Size(68, 21) + Me.Button6.Size = New System.Drawing.Size(140, 21) Me.Button6.TabIndex = 12 - Me.Button6.Text = "Repoint" + Me.Button6.Text = "Repoint + Save" Me.Button6.UseVisualStyleBackColor = True ' 'CryPointer @@ -1474,6 +1482,22 @@ Partial Class Pokemonedit Me.GroupBox17.TabStop = False Me.GroupBox17.Text = "Evolutions" ' + 'TextBox6 + ' + Me.TextBox6.Location = New System.Drawing.Point(422, 241) + Me.TextBox6.Name = "TextBox6" + Me.TextBox6.Size = New System.Drawing.Size(40, 20) + Me.TextBox6.TabIndex = 34 + ' + 'Label50 + ' + Me.Label50.AutoSize = True + Me.Label50.Location = New System.Drawing.Point(379, 244) + Me.Label50.Name = "Label50" + Me.Label50.Size = New System.Drawing.Size(37, 13) + Me.Label50.TabIndex = 33 + Me.Label50.Text = "Value:" + ' 'ComboBox3 ' Me.ComboBox3.FormattingEnabled = True @@ -2447,21 +2471,37 @@ Partial Class Pokemonedit Me.Button30.Text = "Import All Footprints" Me.Button30.UseVisualStyleBackColor = True ' - 'Label50 + 'CryComp1 ' - Me.Label50.AutoSize = True - Me.Label50.Location = New System.Drawing.Point(379, 244) - Me.Label50.Name = "Label50" - Me.Label50.Size = New System.Drawing.Size(37, 13) - Me.Label50.TabIndex = 33 - Me.Label50.Text = "Value:" + 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 ' - 'TextBox6 + 'Label51 ' - Me.TextBox6.Location = New System.Drawing.Point(422, 241) - Me.TextBox6.Name = "TextBox6" - Me.TextBox6.Size = New System.Drawing.Size(40, 20) - Me.TextBox6.TabIndex = 34 + 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 ' 'Pokemonedit ' @@ -2799,4 +2839,8 @@ Partial Class Pokemonedit Friend WithEvents Button30 As Button Friend WithEvents TextBox6 As TextBox Friend WithEvents Label50 As Label + 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 End Class diff --git a/GBAPokemonGameEditor/Pokemonedit.vb b/GBAPokemonGameEditor/Pokemonedit.vb index 0b083f7..4ff794c 100644 --- a/GBAPokemonGameEditor/Pokemonedit.vb +++ b/GBAPokemonGameEditor/Pokemonedit.vb @@ -659,6 +659,8 @@ Public Class Pokemonedit CryConver.Text = "" CryPointer2.Text = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (CryTable3) + (4) + (i * 12), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000) + 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)) CryConver.Enabled = False Button13.Enabled = False @@ -668,7 +670,13 @@ Public Class Pokemonedit CryPointer.Text = "" CryPointer2.Text = "" CryConver.Text = "" + + CryComp1.Text = "" + CryComp2.Text = "" + End If + + If (i + 1) > 276 Then GroupBox21.Enabled = True CryConver.Enabled = True @@ -681,6 +689,9 @@ 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)) + End If @@ -1691,8 +1702,13 @@ 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, (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)))) + ElseIf (i + 1) > 251 And (i + 1) < 276 Then MsgBox("This shoudln't be enabled! report it!") @@ -1701,8 +1717,8 @@ Public Class Pokemonedit 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) + (4) + (((Int32.Parse(("&H" & 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(("&H" & 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)))) End If End Sub @@ -3527,4 +3543,5 @@ Public Class Pokemonedit Me.BringToFront() End If End Sub + End Class \ No newline at end of file diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application index 4839bcb..35dfa75 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - D9KwK39NolQFqxaYcyKd8o41NTY= + lqDNPpZMfL7zCPElYCmPb0Mz/yc= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe index 131d92b..1cee4d8 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 84e4940..089fd19 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - 1KkWY8UFAHL0//xwhmZ6iyK3dBk= + VNiVMlESuiXScx25WLLV2kLEldc= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb index d11e8d1..e882467 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 4839bcb..35dfa75 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application @@ -16,7 +16,7 @@ - D9KwK39NolQFqxaYcyKd8o41NTY= + lqDNPpZMfL7zCPElYCmPb0Mz/yc= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe index 8f90da4..f443805 100644 Binary files a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe differ diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest index 84e4940..089fd19 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest @@ -43,14 +43,14 @@ - + - 1KkWY8UFAHL0//xwhmZ6iyK3dBk= + VNiVMlESuiXScx25WLLV2kLEldc= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.xml b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.xml index 5e84171..53e3f82 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.xml +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.xml @@ -6,21 +6,19 @@ PokemonGameEditor - - - A strongly-typed resource class, for looking up localized strings, etc. - - - + Returns the cached ResourceManager instance used by this class. - - - + + Overrides the current thread's CurrentUICulture property for all resource lookups using this strongly typed resource class. + + + A strongly-typed resource class, for looking up localized strings, etc. + - + \ No newline at end of file diff --git a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 48779c5..da6c2fb 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache and b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index e0f8210..be07c51 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache index 3dabc6b..76cf5e3 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application index 4839bcb..35dfa75 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - D9KwK39NolQFqxaYcyKd8o41NTY= + lqDNPpZMfL7zCPElYCmPb0Mz/yc= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe index 131d92b..1cee4d8 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 84e4940..089fd19 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - 1KkWY8UFAHL0//xwhmZ6iyK3dBk= + VNiVMlESuiXScx25WLLV2kLEldc= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb index d11e8d1..e882467 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.xml b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.xml index 5e84171..53e3f82 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.xml +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.xml @@ -6,21 +6,19 @@ PokemonGameEditor - - - A strongly-typed resource class, for looking up localized strings, etc. - - - + Returns the cached ResourceManager instance used by this class. - - - + + Overrides the current thread's CurrentUICulture property for all resource lookups using this strongly typed resource class. + + + A strongly-typed resource class, for looking up localized strings, etc. + - + \ No newline at end of file