Merge remote-tracking branch 'refs/remotes/Gamer2020/master'

# Conflicts:
#	GBAPokemonGameEditor/bin/Debug/errors.txt
This commit is contained in:
EddyHg80 2017-03-29 16:51:09 +02:00
commit e3ffe03099
28 changed files with 112 additions and 61 deletions

Binary file not shown.

View File

@ -35,7 +35,7 @@ Partial Class AboutBox1
'
Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image)
Me.PictureBox1.Location = New System.Drawing.Point(0, 0)
Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4)
Me.PictureBox1.Name = "PictureBox1"
Me.PictureBox1.Size = New System.Drawing.Size(667, 246)
Me.PictureBox1.TabIndex = 0
@ -44,7 +44,7 @@ Partial Class AboutBox1
'OKButton
'
Me.OKButton.Location = New System.Drawing.Point(551, 329)
Me.OKButton.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
Me.OKButton.Margin = New System.Windows.Forms.Padding(4)
Me.OKButton.Name = "OKButton"
Me.OKButton.Size = New System.Drawing.Size(100, 28)
Me.OKButton.TabIndex = 1
@ -77,9 +77,9 @@ Partial Class AboutBox1
Me.Label1.Location = New System.Drawing.Point(205, 289)
Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(237, 17)
Me.Label1.Size = New System.Drawing.Size(295, 17)
Me.Label1.TabIndex = 4
Me.Label1.Text = "Contact: lostatlife2020@hotmail.com"
Me.Label1.Text = "Contact: Gamer2020@romhackersonline.com"
'
'AboutBox1
'
@ -92,7 +92,7 @@ Partial Class AboutBox1
Me.Controls.Add(Me.OKButton)
Me.Controls.Add(Me.PictureBox1)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
Me.Margin = New System.Windows.Forms.Padding(4)
Me.MaximizeBox = False
Me.MinimizeBox = False
Me.Name = "AboutBox1"

View File

@ -397,7 +397,7 @@ Public Class AttackAdder
WriteHEX(LoadedROM, &HD75FC, "00000000000013E0")
'Move Table hack stuff
If CheckBox1.Checked And GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then
If CheckBox1.Checked And GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then
'Converts the table to the new format
@ -999,7 +999,7 @@ Public Class AttackAdder
WriteHEX(LoadedROM, &HDE83A, "00000000000000E0")
'Move Table hack stuff
If CheckBox4.Checked And GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then
If CheckBox4.Checked And GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then
'Converts the table to the new format

View File

@ -131,14 +131,20 @@ Module CryFunctions
Dim cryImage As Bitmap
If GetString(AppPath & "GBAPGESettings.ini", "Settings", "DisableCryImage", "0") = "1" Then
cryImage = New Bitmap(128, 128)
Else
cryImage = New Bitmap(cry.Data.Length, 128)
cryImage = New Bitmap(cry.Data.Length, 128)
Using g = Graphics.FromImage(cryImage)
For i As Integer = 1 To cry.Data.Length - 1
g.DrawLine(Pens.Green, i - 1, 64 + cry.Data(i - 1), i, 64 + cry.Data(i))
Next
End Using
Using g = Graphics.FromImage(cryImage)
For i As Integer = 1 To cry.Data.Length - 1
g.DrawLine(Pens.Green, i - 1, 64 + cry.Data(i - 1), i, 64 + cry.Data(i))
Next
End Using
End If
Return cryImage

View File

@ -65,7 +65,7 @@ Module ExportDataFunctions
CurAttackListOffset = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (Int32.Parse((GetString(GetINIFileLocation(), header, "PokemonAttackTable", "")), System.Globalization.NumberStyles.HexNumber)) + (PokemonIndex * 4), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000)
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then
Looper = 0
@ -108,7 +108,7 @@ Module ExportDataFunctions
End While
ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "True" Then
ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "True".ToLower() Then
Looper = 0

View File

@ -76,9 +76,9 @@ Module ImportDataFunctions
EvolutionData = EvolutionData.Remove((8 * (GetString(GetINIFileLocation(), header, "NumberOfEvolutionsPerPokemon", ""))) * 2)
End If
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then
lvlupattacks = GetString(INIFileName, "Pokemon", "LevelUpAttacksOriginal", "2102FFFF0000")
ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "True" Then
ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "True".ToLower() Then
lvlupattacks = GetString(INIFileName, "Pokemon", "LevelUpAttacksJambo51", "2100010000FF00")
End If

View File

@ -86,6 +86,7 @@ Partial Class MainFrm
Me.Button1 = New System.Windows.Forms.Button()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.Label1 = New System.Windows.Forms.Label()
Me.DisableCryImageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.MenuStrip1.SuspendLayout()
Me.GroupBox4.SuspendLayout()
Me.TabControl1.SuspendLayout()
@ -132,7 +133,7 @@ Partial Class MainFrm
'
'SettingsToolStripMenuItem
'
Me.SettingsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AddOrRemoveProgramsToolStripMenuItem, Me.TransparentBackgroundsToolStripMenuItem, Me.DisablePokemonImageLoadingToolStripMenuItem, Me.LinuxToolStripMenuItem})
Me.SettingsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AddOrRemoveProgramsToolStripMenuItem, Me.TransparentBackgroundsToolStripMenuItem, Me.DisablePokemonImageLoadingToolStripMenuItem, Me.LinuxToolStripMenuItem, Me.DisableCryImageToolStripMenuItem})
Me.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"
Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(74, 24)
Me.SettingsToolStripMenuItem.Text = "&Settings"
@ -758,6 +759,12 @@ Partial Class MainFrm
Me.Label1.TabIndex = 0
Me.Label1.Text = "Copyright © 2017 Gamer2020 All Rights Reserved. "
'
'DisableCryImageToolStripMenuItem
'
Me.DisableCryImageToolStripMenuItem.Name = "DisableCryImageToolStripMenuItem"
Me.DisableCryImageToolStripMenuItem.Size = New System.Drawing.Size(313, 26)
Me.DisableCryImageToolStripMenuItem.Text = "Disable Cry Image"
'
'MainFrm
'
Me.AllowDrop = True
@ -853,4 +860,5 @@ Partial Class MainFrm
Friend WithEvents Button10 As Button
Friend WithEvents Button11 As Button
Friend WithEvents Button12 As System.Windows.Forms.Button
Friend WithEvents DisableCryImageToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
End Class

View File

@ -29,6 +29,12 @@ Public Class MainFrm
End If
If GetString(AppPath & "GBAPGESettings.ini", "Settings", "DisableCryImage", "0") = "1" Then
DisableCryImageToolStripMenuItem.CheckState = CheckState.Checked
End If
If GetString(AppPath & "GBAPGESettings.ini", "Settings", "ProgramPath0", "") <> "" Then
Button27.Text = GetString(AppPath & "GBAPGESettings.ini", "Settings", "ProgramName0", "")
@ -837,4 +843,21 @@ Public Class MainFrm
Me.Cursor = Cursors.Arrow
End Sub
Private Sub DisableCryImageToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DisableCryImageToolStripMenuItem.Click
If DisableCryImageToolStripMenuItem.CheckState = CheckState.Checked Then
DisableCryImageToolStripMenuItem.CheckState = CheckState.Unchecked
WriteString(AppPath & "GBAPGESettings.ini", "Settings", "DisableCryImage", "0")
ElseIf DisableCryImageToolStripMenuItem.CheckState = CheckState.Unchecked Then
DisableCryImageToolStripMenuItem.CheckState = CheckState.Checked
WriteString(AppPath & "GBAPGESettings.ini", "Settings", "DisableCryImage", "1")
End If
End Sub
End Class

View File

@ -372,7 +372,7 @@ Public Class PokemonAdder
'Repoint Pokemon Attack Table
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "True" Then
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "True".ToLower() Then
WriteHEX(LoadedROM, (Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, &H3EA10 + 4, 4)), System.Globalization.NumberStyles.HexNumber) - &H8000001 + 124), ReverseHEX(Hex((PokemonAttackDataNewOffset) + &H8000000)))
WriteHEX(LoadedROM, &H3EB10, ReverseHEX(Hex((PokemonAttackDataNewOffset) + &H8000000)))
@ -381,7 +381,7 @@ Public Class PokemonAdder
WriteHEX(LoadedROM, &H43DD4 + 72, ReverseHEX(Hex((PokemonAttackDataNewOffset) + &H8000000)))
WriteHEX(LoadedROM, (Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, &H43E2C + 4, 4)), System.Globalization.NumberStyles.HexNumber) - &H8000001 + 360), ReverseHEX(Hex((PokemonAttackDataNewOffset) + &H8000000)))
ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then
ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then
WriteHEX(LoadedROM, &H3EA7C, ReverseHEX(Hex((PokemonAttackDataNewOffset) + &H8000000)))
WriteHEX(LoadedROM, &H3EB10, ReverseHEX(Hex((PokemonAttackDataNewOffset) + &H8000000)))

View File

@ -1691,7 +1691,7 @@ Public Class Pokemonedit
Looper = Looper + 1
End While
ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "True" Then
ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "True".ToLower() Then
AttackTable = Int32.Parse((GetString(GetINIFileLocation(), header, "PokemonAttackTable", "")), System.Globalization.NumberStyles.HexNumber)
LvlUpAttPointer.Text = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (AttackTable) + (4) + (PKMNames.SelectedIndex * 4), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000)
@ -1719,7 +1719,7 @@ Public Class Pokemonedit
Dim at As String
Dim lvl As String
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then
i = PKMNames.SelectedIndex
WriteHEX(LoadedROM, (AttackTable) + (4) + (i * 4), ReverseHEX(Hex(Int32.Parse(((LvlUpAttPointer.Text)), System.Globalization.NumberStyles.HexNumber) + &H8000000)))
lvlupattacks.Items.Clear()
@ -1752,7 +1752,7 @@ Public Class Pokemonedit
End While
End If
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "True" Then
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "True".ToLower() Then
i = PKMNames.SelectedIndex
WriteHEX(LoadedROM, (AttackTable) + (4) + (i * 4), ReverseHEX(Hex(Val("&H" & (LvlUpAttPointer.Text)) + &H8000000)))
lvlupattacks.Items.Clear()
@ -1997,7 +1997,7 @@ Public Class Pokemonedit
Dim pointer As String
'Dim loopme As Integer
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then
pointer = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (AttackTable) + (4) + (PKMNames.SelectedIndex * 4), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000)
@ -2023,7 +2023,7 @@ Public Class Pokemonedit
AtLvl.Text = lvl
NewAt.SelectedIndex = at
End If
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "True" Then
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "True".ToLower() Then
pointer = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (AttackTable) + (4) + (PKMNames.SelectedIndex * 4), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000)
@ -2051,7 +2051,7 @@ Public Class Pokemonedit
Dim temp As Integer
'Dim loopme As Integer
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then
holder = lvlupattacks.SelectedIndex
pointer = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (AttackTable) + (4) + (PKMNames.SelectedIndex * 4), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000)
@ -2082,7 +2082,7 @@ Public Class Pokemonedit
End If
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "True" Then
If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "True".ToLower() Then
holder = lvlupattacks.SelectedIndex
pointer = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (AttackTable) + (4) + (PKMNames.SelectedIndex * 4), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000)

View File

@ -57,10 +57,12 @@ Partial Class TrainerEditor
Me.TrainerItem2 = New System.Windows.Forms.ComboBox()
Me.TrainerItem1 = New System.Windows.Forms.ComboBox()
Me.TabPage2 = New System.Windows.Forms.TabPage()
Me.Label15 = New System.Windows.Forms.Label()
Me.SaveMnyRt = New System.Windows.Forms.Button()
Me.MoneyRateTextBox = New System.Windows.Forms.TextBox()
Me.Label14 = New System.Windows.Forms.Label()
Me.TabPage3 = New System.Windows.Forms.TabPage()
Me.PokeDataFormatComboBox = New System.Windows.Forms.ComboBox()
Me.PkmnSvBttn = New System.Windows.Forms.Button()
Me.PkmnEvsTextBox = New System.Windows.Forms.TextBox()
Me.Label13 = New System.Windows.Forms.Label()
@ -78,14 +80,12 @@ Partial Class TrainerEditor
Me.TnPkmPictureBox = New System.Windows.Forms.PictureBox()
Me.TnPkmComboBox = New System.Windows.Forms.ComboBox()
Me.PkmSlts = New System.Windows.Forms.ListBox()
Me.PokeDataFormatTextBox = New System.Windows.Forms.TextBox()
Me.Label8 = New System.Windows.Forms.Label()
Me.PokeNumTextBox = New System.Windows.Forms.TextBox()
Me.Label7 = New System.Windows.Forms.Label()
Me.RpntPkDtBttn = New System.Windows.Forms.Button()
Me.PointerPokeDataTextBox = New System.Windows.Forms.TextBox()
Me.Label6 = New System.Windows.Forms.Label()
Me.Label15 = New System.Windows.Forms.Label()
Me.GroupBox1.SuspendLayout()
Me.GroupBox3.SuspendLayout()
CType(Me.PicNumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit()
@ -421,6 +421,15 @@ Partial Class TrainerEditor
Me.TabPage2.Text = "Trainer Class"
Me.TabPage2.UseVisualStyleBackColor = True
'
'Label15
'
Me.Label15.AutoSize = True
Me.Label15.Location = New System.Drawing.Point(61, 144)
Me.Label15.Name = "Label15"
Me.Label15.Size = New System.Drawing.Size(98, 17)
Me.Label15.TabIndex = 27
Me.Label15.Text = "Prize Money: "
'
'SaveMnyRt
'
Me.SaveMnyRt.Location = New System.Drawing.Point(64, 164)
@ -448,6 +457,7 @@ Partial Class TrainerEditor
'
'TabPage3
'
Me.TabPage3.Controls.Add(Me.PokeDataFormatComboBox)
Me.TabPage3.Controls.Add(Me.PkmnSvBttn)
Me.TabPage3.Controls.Add(Me.PkmnEvsTextBox)
Me.TabPage3.Controls.Add(Me.Label13)
@ -465,7 +475,6 @@ Partial Class TrainerEditor
Me.TabPage3.Controls.Add(Me.TnPkmPictureBox)
Me.TabPage3.Controls.Add(Me.TnPkmComboBox)
Me.TabPage3.Controls.Add(Me.PkmSlts)
Me.TabPage3.Controls.Add(Me.PokeDataFormatTextBox)
Me.TabPage3.Controls.Add(Me.Label8)
Me.TabPage3.Controls.Add(Me.PokeNumTextBox)
Me.TabPage3.Controls.Add(Me.Label7)
@ -479,6 +488,16 @@ Partial Class TrainerEditor
Me.TabPage3.Text = "Pokemon Data"
Me.TabPage3.UseVisualStyleBackColor = True
'
'PokeDataFormatComboBox
'
Me.PokeDataFormatComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.PokeDataFormatComboBox.FormattingEnabled = True
Me.PokeDataFormatComboBox.Items.AddRange(New Object() {"Default Moves", "Custom Moves", "Custom Items", "Custom Moves/Items"})
Me.PokeDataFormatComboBox.Location = New System.Drawing.Point(173, 13)
Me.PokeDataFormatComboBox.Name = "PokeDataFormatComboBox"
Me.PokeDataFormatComboBox.Size = New System.Drawing.Size(138, 24)
Me.PokeDataFormatComboBox.TabIndex = 47
'
'PkmnSvBttn
'
Me.PkmnSvBttn.Location = New System.Drawing.Point(173, 398)
@ -634,13 +653,6 @@ Partial Class TrainerEditor
Me.PkmSlts.Size = New System.Drawing.Size(138, 116)
Me.PkmSlts.TabIndex = 29
'
'PokeDataFormatTextBox
'
Me.PokeDataFormatTextBox.Location = New System.Drawing.Point(173, 13)
Me.PokeDataFormatTextBox.Name = "PokeDataFormatTextBox"
Me.PokeDataFormatTextBox.Size = New System.Drawing.Size(43, 22)
Me.PokeDataFormatTextBox.TabIndex = 28
'
'Label8
'
Me.Label8.AutoSize = True
@ -691,15 +703,6 @@ Partial Class TrainerEditor
Me.Label6.TabIndex = 0
Me.Label6.Text = "Pointer:"
'
'Label15
'
Me.Label15.AutoSize = True
Me.Label15.Location = New System.Drawing.Point(61, 144)
Me.Label15.Name = "Label15"
Me.Label15.Size = New System.Drawing.Size(98, 17)
Me.Label15.TabIndex = 27
Me.Label15.Text = "Prize Money: "
'
'TrainerEditor
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
@ -773,7 +776,6 @@ Partial Class TrainerEditor
Friend WithEvents Label6 As System.Windows.Forms.Label
Friend WithEvents PokeNumTextBox As System.Windows.Forms.TextBox
Friend WithEvents Label7 As System.Windows.Forms.Label
Friend WithEvents PokeDataFormatTextBox As System.Windows.Forms.TextBox
Friend WithEvents Label8 As System.Windows.Forms.Label
Friend WithEvents PkmSlts As System.Windows.Forms.ListBox
Friend WithEvents TnPkmPictureBox As System.Windows.Forms.PictureBox
@ -796,4 +798,5 @@ Partial Class TrainerEditor
Friend WithEvents MoneyRateTextBox As System.Windows.Forms.TextBox
Friend WithEvents Label14 As System.Windows.Forms.Label
Friend WithEvents Label15 As System.Windows.Forms.Label
Friend WithEvents PokeDataFormatComboBox As System.Windows.Forms.ComboBox
End Class

View File

@ -154,7 +154,7 @@ Public Class TrainerEditor
PointerPokeDataTextBox.Text = (Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, offvar + 36, 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000))
PokeNumTextBox.Text = Int32.Parse((ReadHEX(LoadedROM, offvar + 32, 1)), System.Globalization.NumberStyles.HexNumber)
PokeDataFormatTextBox.Text = Int32.Parse(ReadHEX(LoadedROM, offvar, 1), System.Globalization.NumberStyles.HexNumber)
PokeDataFormatComboBox.SelectedIndex = Int32.Parse(ReadHEX(LoadedROM, offvar, 1), System.Globalization.NumberStyles.HexNumber)
PkmSlts.Items.Clear()
@ -238,7 +238,7 @@ Public Class TrainerEditor
WriteHEX(LoadedROM, offvar + 22, ReverseHEX(VB.Right("0000" & Hex(TrainerItem4.SelectedIndex), 4)))
WriteHEX(LoadedROM, offvar + 32, Hex(PokeNumTextBox.Text))
WriteHEX(LoadedROM, offvar, Hex(PokeDataFormatTextBox.Text))
WriteHEX(LoadedROM, offvar, Hex(PokeDataFormatComboBox.SelectedIndex))
If DblCheckBox.Checked = False Then
@ -444,7 +444,7 @@ Public Class TrainerEditor
PointerPokeDataTextBox.Text = (Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, offvar + 36, 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000))
PokeNumTextBox.Text = Int32.Parse((ReadHEX(LoadedROM, offvar + 32, 1)), System.Globalization.NumberStyles.HexNumber)
PokeDataFormatTextBox.Text = Int32.Parse(ReadHEX(LoadedROM, offvar, 1), System.Globalization.NumberStyles.HexNumber)
PokeDataFormatComboBox.SelectedIndex = Int32.Parse(ReadHEX(LoadedROM, offvar, 1), System.Globalization.NumberStyles.HexNumber)
PkmSlts.Items.Clear()
@ -680,9 +680,9 @@ Public Class TrainerEditor
Dim num As Integer = 0
Dim num2 As Integer = 8
If PokeDataFormatTextBox.Text <> "" And MoneyRateTextBox.Text <> "" Then
If PokeDataFormatComboBox.SelectedIndex <> -1 And MoneyRateTextBox.Text <> "" Then
If PokeDataFormatTextBox.Text = 1 Or PokeDataFormatTextBox.Text = 3 Then
If PokeDataFormatComboBox.SelectedIndex = 1 Or PokeDataFormatComboBox.SelectedIndex = 3 Then
num2 = &H10
End If
If (PkmSlts.Items.Count > 0) Then

View File

@ -1,2 +1,3 @@
[Settings]
OSisLinux=0
DisableCryImage=1

View File

@ -16,7 +16,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>xd50aTWRTRGUVR/smbYM5VR7xVADbJqpcwGRx2aRAfI=</dsig:DigestValue>
<dsig:DigestValue>igbUbUZZ6x3LG89oy1wF/dO5zrMf1r9nIcjJBK4dzhs=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

View File

@ -43,14 +43,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2132992">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2134528">
<assemblyIdentity name="PokemonGameEditor" version="3.8.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>/EOBJtiqvTjj+BrKFAp/wGP2ypb7Xry95eyGQdXf/iY=</dsig:DigestValue>
<dsig:DigestValue>kX/sL7dtcAqFej9q0Q3GSKl+5Ib01CNrJSEB8qN1mps=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

View File

@ -16,7 +16,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>xd50aTWRTRGUVR/smbYM5VR7xVADbJqpcwGRx2aRAfI=</dsig:DigestValue>
<dsig:DigestValue>igbUbUZZ6x3LG89oy1wF/dO5zrMf1r9nIcjJBK4dzhs=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

View File

@ -43,14 +43,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2132992">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2134528">
<assemblyIdentity name="PokemonGameEditor" version="3.8.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>/EOBJtiqvTjj+BrKFAp/wGP2ypb7Xry95eyGQdXf/iY=</dsig:DigestValue>
<dsig:DigestValue>kX/sL7dtcAqFej9q0Q3GSKl+5Ib01CNrJSEB8qN1mps=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

View File

@ -401,6 +401,7 @@ NationalDexTable=251FEE
SecondDexTable=251CB8
PokedexData=44E850
NumberOfDexEntries=387
NumberOfRegionDex=151
PokemonData=254784
AbilityNames=24FC40
NumberOfAbilities=78

View File

@ -16,7 +16,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>xd50aTWRTRGUVR/smbYM5VR7xVADbJqpcwGRx2aRAfI=</dsig:DigestValue>
<dsig:DigestValue>igbUbUZZ6x3LG89oy1wF/dO5zrMf1r9nIcjJBK4dzhs=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

View File

@ -43,14 +43,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2132992">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2134528">
<assemblyIdentity name="PokemonGameEditor" version="3.8.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>/EOBJtiqvTjj+BrKFAp/wGP2ypb7Xry95eyGQdXf/iY=</dsig:DigestValue>
<dsig:DigestValue>kX/sL7dtcAqFej9q0Q3GSKl+5Ib01CNrJSEB8qN1mps=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

View File

@ -11,3 +11,8 @@ This is the license agreement for the program Pokemon Game Editor. By using the
5. Any improvements to this program should be submitted through Github so they can be added to the project. Otherwise improvements are to be for personal use only.
6. You are allowed to use code from this program in other programs as long as credit is given.
7. In addition to rule 3, support for this program will be voided if you use the following programs.
TL-Quick-Enhancer
Gen III Rom Hacking Suite

View File

@ -1,3 +1,6 @@
Please use the latest beta!
====================
![alt tag](https://raw.githubusercontent.com/Gamer2020/PokemonGameEditor/master/Screenshots/PGEBANNER.png)
Pokemon Game Editor, commonly know as PGE, is an all in one tool started in 2010 by Gamer2020 for hacking the Game Boy Advanced Pokemon games. The program continues to evolve over the years and has had 60,000+ downloads. It has even inspired several copycat programs hence the slogan "Accept no Imitations!" was adopted. The program is currently developed in VB.Net with Visual Studio 2013.

View File

@ -401,6 +401,7 @@ NationalDexTable=251FEE
SecondDexTable=251CB8
PokedexData=44E850
NumberOfDexEntries=387
NumberOfRegionDex=151
PokemonData=254784
AbilityNames=24FC40
NumberOfAbilities=78