diff --git a/.vs/GBAPokemonGameEditor/v14/.suo b/.vs/GBAPokemonGameEditor/v14/.suo index 863c060..f2b52ea 100644 Binary files a/.vs/GBAPokemonGameEditor/v14/.suo and b/.vs/GBAPokemonGameEditor/v14/.suo differ diff --git a/GBAPokemonGameEditor/AboutBox1.Designer.vb b/GBAPokemonGameEditor/AboutBox1.Designer.vb index 761154a..4400b1a 100644 --- a/GBAPokemonGameEditor/AboutBox1.Designer.vb +++ b/GBAPokemonGameEditor/AboutBox1.Designer.vb @@ -27,6 +27,7 @@ Partial Class AboutBox1 Me.OKButton = New System.Windows.Forms.Button() Me.LabelVersion = New System.Windows.Forms.Label() Me.LabelCopyright = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -41,7 +42,7 @@ Partial Class AboutBox1 ' 'OKButton ' - Me.OKButton.Location = New System.Drawing.Point(413, 247) + Me.OKButton.Location = New System.Drawing.Point(413, 267) Me.OKButton.Name = "OKButton" Me.OKButton.Size = New System.Drawing.Size(75, 23) Me.OKButton.TabIndex = 1 @@ -51,7 +52,7 @@ Partial Class AboutBox1 'LabelVersion ' Me.LabelVersion.AutoSize = True - Me.LabelVersion.Location = New System.Drawing.Point(207, 236) + Me.LabelVersion.Location = New System.Drawing.Point(207, 256) Me.LabelVersion.Name = "LabelVersion" Me.LabelVersion.Size = New System.Drawing.Size(42, 13) Me.LabelVersion.TabIndex = 2 @@ -66,11 +67,21 @@ Partial Class AboutBox1 Me.LabelCopyright.TabIndex = 3 Me.LabelCopyright.Text = "Copyright © 2016 Gamer2020 All Rights Reserved." ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(154, 235) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(179, 13) + Me.Label1.TabIndex = 4 + Me.Label1.Text = "Contact: lostatlife2020@hotmail.com" + ' 'AboutBox1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(500, 282) + Me.ClientSize = New System.Drawing.Size(500, 300) + Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.LabelCopyright) Me.Controls.Add(Me.LabelVersion) Me.Controls.Add(Me.OKButton) @@ -93,4 +104,5 @@ Partial Class AboutBox1 Friend WithEvents OKButton As Button Friend WithEvents LabelVersion As Label Friend WithEvents LabelCopyright As Label + Friend WithEvents Label1 As Label End Class diff --git a/GBAPokemonGameEditor/AboutBox1.resx b/GBAPokemonGameEditor/AboutBox1.resx index 2c37e8e..b679b5d 100644 --- a/GBAPokemonGameEditor/AboutBox1.resx +++ b/GBAPokemonGameEditor/AboutBox1.resx @@ -165,7 +165,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAA9UFJREFUeF7s/QfYFtW1 + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAA9UFJREFUeF7s/QfYFtW1 949PuR9NM+3EJJpiemJiYmKMXWNUFBtIUVREQcXeERTpHem9I3axF6TZAOlFehVF7NH095T3/b3nvGf/ v581s+9nnmHupyCo53/lvq7vNXNPnz171nd91157TxCeNsR5BI1rIruuEoJTB5dRtH53kD1mQxDuNu6s F4LTKixvNDDFoBxYl8MpA1L0r4B0faMi+PM0AOXz6dwna/ppwEm6zz/0S+9T05P7ptB/Xwa2rdad1M9F diff --git a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj index 52c7fe2..3e57f8c 100644 --- a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj +++ b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj @@ -31,7 +31,7 @@ true publish.htm 0 - 3.4.0.0 + 3.5.0.0 false true true @@ -45,6 +45,7 @@ bin\Debug\ PokemonGameEditor.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + true AnyCPU diff --git a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj.user b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj.user index fba2798..9912f57 100644 --- a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj.user +++ b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj.user @@ -11,4 +11,7 @@ false ShowAllFiles + + false + \ No newline at end of file diff --git a/GBAPokemonGameEditor/My Project/AssemblyInfo.vb b/GBAPokemonGameEditor/My Project/AssemblyInfo.vb index 813fb43..bd539c8 100644 --- a/GBAPokemonGameEditor/My Project/AssemblyInfo.vb +++ b/GBAPokemonGameEditor/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/GBAPokemonGameEditor/PokemonAdder.vb b/GBAPokemonGameEditor/PokemonAdder.vb index 99f6f80..1bcb5ba 100644 --- a/GBAPokemonGameEditor/PokemonAdder.vb +++ b/GBAPokemonGameEditor/PokemonAdder.vb @@ -100,6 +100,9 @@ Public Class PokemonAdder Dim EvolutionDataBuffer As String Dim EvolutionDataNewOffset As String + Dim PokemonItemAnimationTableBuffer As String + Dim PokemonItemAnimationTableNewOffset As String + If System.IO.File.Exists((LoadedROM).Substring(0, LoadedROM.Length - 4) & ".ini") = True Then MsgBox("An INI for this ROM has been detected! Values will be updated as needed.") @@ -1135,6 +1138,18 @@ Public Class PokemonAdder WriteHEX(LoadedROM, &H4599C, ReverseHEX(Hex((EvolutionDataNewOffset) + &H8000000))) WriteHEX(LoadedROM, &HCE8C4, ReverseHEX(Hex((EvolutionDataNewOffset) + &H8000000))) + 'Repoint the item animation table. + 'This Is at x45FD50. + 'Each entry Is 5 bytes long. Entire thing Is x811 bytes. + + 'This fixes the evolution animation. + WriteHEX(LoadedROM, &HEC9A, "07E0") + + 'This fixes the stamps on the back of the trainer card. + WriteHEX(LoadedROM, &H97011, "E0") + + 'This will enable cries past #511 to function. + WriteHEX(LoadedROM, &H720CA, "011C11E0") 'Updates the number of Pokemon If (GetString(GetINIFileLocation(), header, "NumberOfPokemon", "")) = "412" Then diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application index b30bc4a..6c99cba 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application @@ -1,6 +1,6 @@  - + @@ -10,13 +10,13 @@ - + - eFad94sfwHbam7hvJ/Ac+ay5+6c= + yFNEdLpoCUPrbyZX9cLW/pXiof4= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe index 4c54185..e813531 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 c5f26af..123e77d 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest @@ -1,10 +1,10 @@  - + - + @@ -44,13 +44,13 @@ - + - QRBzL8y+AFTJdKfGBkm3L5l9jZM= + 54OEZEIZ//2KSSXrnehGCur8qH8= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb index 74e94cd..f6036f9 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 b30bc4a..6c99cba 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application @@ -1,6 +1,6 @@  - + @@ -10,13 +10,13 @@ - + - eFad94sfwHbam7hvJ/Ac+ay5+6c= + yFNEdLpoCUPrbyZX9cLW/pXiof4= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest index c5f26af..123e77d 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest @@ -1,10 +1,10 @@  - + - + @@ -44,13 +44,13 @@ - + - QRBzL8y+AFTJdKfGBkm3L5l9jZM= + 54OEZEIZ//2KSSXrnehGCur8qH8= diff --git a/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe index 4c54185..e813531 100644 Binary files a/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe and b/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe differ diff --git a/GBAPokemonGameEditor/bin/Debug/ini/roms.ini b/GBAPokemonGameEditor/bin/Debug/ini/roms.ini index b5b1c18..18ab264 100644 --- a/GBAPokemonGameEditor/bin/Debug/ini/roms.ini +++ b/GBAPokemonGameEditor/bin/Debug/ini/roms.ini @@ -537,6 +537,7 @@ Evolution15Param=evolvesbutnoparms EggMoveTable=25EF0C EggMoveTableLimiter=45CC4 HabitatTable=452C4C +ItemAnimationTable=45FD50 [BPGE] ROMName=Pokémon Leaf Green (English) diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache index 796c5bb..b3a916f 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 0609081..7b767b4 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.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application index b30bc4a..6c99cba 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application @@ -1,6 +1,6 @@  - + @@ -10,13 +10,13 @@ - + - eFad94sfwHbam7hvJ/Ac+ay5+6c= + yFNEdLpoCUPrbyZX9cLW/pXiof4= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe index 4c54185..e813531 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 c5f26af..123e77d 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest @@ -1,10 +1,10 @@  - + - + @@ -44,13 +44,13 @@ - + - QRBzL8y+AFTJdKfGBkm3L5l9jZM= + 54OEZEIZ//2KSSXrnehGCur8qH8= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb index 74e94cd..f6036f9 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ diff --git a/roms.ini b/roms.ini index b5b1c18..18ab264 100644 --- a/roms.ini +++ b/roms.ini @@ -537,6 +537,7 @@ Evolution15Param=evolvesbutnoparms EggMoveTable=25EF0C EggMoveTableLimiter=45CC4 HabitatTable=452C4C +ItemAnimationTable=45FD50 [BPGE] ROMName=Pokémon Leaf Green (English)