diff --git a/.vs/GBAPokemonGameEditor/v14/.suo b/.vs/GBAPokemonGameEditor/v14/.suo index 1a9b9d9..ff8770e 100644 Binary files a/.vs/GBAPokemonGameEditor/v14/.suo and b/.vs/GBAPokemonGameEditor/v14/.suo differ diff --git a/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/db.lock b/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/db.lock new file mode 100644 index 0000000..e69de29 diff --git a/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide b/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide new file mode 100644 index 0000000..56758a8 Binary files /dev/null and b/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-shm b/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-shm new file mode 100644 index 0000000..700e271 Binary files /dev/null and b/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-wal b/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-wal new file mode 100644 index 0000000..e5fe3a7 Binary files /dev/null and b/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-wal differ diff --git a/GBAPokemonGameEditor/ExportDataFunctions.vb b/GBAPokemonGameEditor/ExportDataFunctions.vb index 8bc9b47..07c3fb3 100644 --- a/GBAPokemonGameEditor/ExportDataFunctions.vb +++ b/GBAPokemonGameEditor/ExportDataFunctions.vb @@ -438,7 +438,7 @@ Module ExportDataFunctions Public Sub ExportTrainerSprite(filename As String, Index As Integer) - Dim bitout As Bitmap = GetAndDrawTrainerSpriteToBitmap(Index, Int32.Parse(((ReadHEX(LoadedROM, (Int32.Parse((GetString(GetINIFileLocation(), header, "IconPalTable", "")), System.Globalization.NumberStyles.HexNumber)) + (Index), 1))), System.Globalization.NumberStyles.HexNumber), True) + Dim bitout As Bitmap = GetAndDrawTrainerSpriteToBitmap(Index, True) bitout.Save(filename) diff --git a/GBAPokemonGameEditor/GetImageFunctions.vb b/GBAPokemonGameEditor/GetImageFunctions.vb index 4d03e48..4c28182 100644 --- a/GBAPokemonGameEditor/GetImageFunctions.vb +++ b/GBAPokemonGameEditor/GetImageFunctions.vb @@ -1159,7 +1159,7 @@ ErrorHandle: End Sub - Public Function GetAndDrawTrainerSpriteToBitmap(ByVal index As Integer, ByVal palindex As Integer, Optional ShowBackColor As Boolean = False) As Bitmap + Public Function GetAndDrawTrainerSpriteToBitmap(ByVal index As Integer, Optional ShowBackColor As Boolean = False) As Bitmap Dim sOffset As Integer = Int32.Parse(GetString(GetINIFileLocation(), header, "TrainerImageTable", ""), System.Globalization.NumberStyles.HexNumber) + (index * 8) Dim pOffset As Integer = Int32.Parse(GetString(GetINIFileLocation(), header, "TrainerPaletteTable", ""), System.Globalization.NumberStyles.HexNumber) + (index * 8) diff --git a/GBAPokemonGameEditor/ImportDataFunctions.vb b/GBAPokemonGameEditor/ImportDataFunctions.vb index e75f647..f07b8bb 100644 --- a/GBAPokemonGameEditor/ImportDataFunctions.vb +++ b/GBAPokemonGameEditor/ImportDataFunctions.vb @@ -4,14 +4,14 @@ Imports System.Net Imports VB = Microsoft.VisualBasic Module ImportDataFunctions - Private FrontPalette As Color() = New Color(&H11 - 1) {} - Private BackPalette As Color() = New Color(&H11 - 1) {} + Private FrontPalette As Color() = New Color(&H10 - 1) {} + Private BackPalette As Color() = New Color(&H10 - 1) {} Private FrontSprite As Byte() Private BackSprite As Byte() - Private AnimationNormalPalette As Color() = New Color(&H11 - 1) {} - Private AnimationShinyPalette As Color() = New Color(&H11 - 1) {} + Private AnimationNormalPalette As Color() = New Color(&H10 - 1) {} + Private AnimationShinyPalette As Color() = New Color(&H110 - 1) {} Private AnimationNormalSprite As Byte() Private AnimationShinySprite As Byte() @@ -427,12 +427,12 @@ Module ImportDataFunctions Dim palcolor As Color Dim flag As Boolean = False - Array.Clear(FrontPalette, 0, &H10) - Array.Clear(BackPalette, 0, &H10) + Array.Clear(FrontPalette, 0, &H10 - 1) + Array.Clear(BackPalette, 0, &H10 - 1) If LoadAnimationFlag = True Then - Array.Clear(AnimationNormalPalette, 0, &H10) - Array.Clear(AnimationShinyPalette, 0, &H10) + Array.Clear(AnimationNormalPalette, 0, &H10 - 1) + Array.Clear(AnimationShinyPalette, 0, &H10 - 1) End If @@ -552,21 +552,20 @@ Module ImportDataFunctions ConvertBitmapToPalette(OShinyBackBitmapAnimation, AnimationShinyPalette, True) End If - SynchSprite(FrontSprite, ONormalFrontBitmap, OShinyFrontBitmap) SynchSprite(BackSprite, ONormalBackBitmap, OShinyBackBitmap) If LoadAnimationFlag = True Then - SynchSprite2(AnimationNormalSprite, ONormalFrontBitmapAnimation, OShinyFrontBitmapAnimation) + SynchSprite(AnimationNormalSprite, ONormalFrontBitmapAnimation, OShinyFrontBitmapAnimation) + SaveAnimationSpriteToFreeSpace(PokemonIndex, AnimationNormalSprite) + Else + SynchSprite(FrontSprite, ONormalFrontBitmap, OShinyFrontBitmap) + SaveFrontSpriteToFreeSpace(PokemonIndex, FrontSprite, FrontPalette) End If mainbitmap.Dispose() - - SaveFrontSpriteToFreeSpace(PokemonIndex, FrontSprite, FrontPalette) SaveBackSpriteToFreeSpace(PokemonIndex, BackSprite, BackPalette) - If LoadAnimationFlag = True Then - SaveAnimationSpriteToFreeSpace(PokemonIndex, AnimationNormalSprite) - End If + End Sub diff --git a/GBAPokemonGameEditor/MainFrm.vb b/GBAPokemonGameEditor/MainFrm.vb index 80644b6..0a99dd3 100644 --- a/GBAPokemonGameEditor/MainFrm.vb +++ b/GBAPokemonGameEditor/MainFrm.vb @@ -831,8 +831,8 @@ Me.Cursor = Cursors.Arrow Private Sub Button10_Click(sender As Object, e As EventArgs) Handles Button10.Click Me.Cursor = Cursors.WaitCursor TradeEditor.Show() -tradereditor.focus() -Me.Cursor = Cursors.Arrow + TradeEditor.Focus() + Me.Cursor = Cursors.Arrow End Sub Private Sub Button11_Click(sender As Object, e As EventArgs) Handles Button11.Click diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application index e40bebb..b1e485c 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - CNOrQyXBW7VKG4UVND1SIxYcJwQc1os3VonwDBQmnc0= + ZPldB61y37uHoxUw3d9sjfXQNo6uXLUSu3S+Zm/hJaA= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe index d344283..eb3b8b0 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 42653dd..7a5eda6 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - Cr6D7QgtSxz+kovq1cDsGPSD/zdNHYuBCB2mh8uw4mw= + OcpzcyjEychSbS73gzzApWC7NRIXJInBLOU5Ortf8So= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb index b6ab15b..44d29ff 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 e40bebb..886abb7 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application @@ -16,7 +16,7 @@ - CNOrQyXBW7VKG4UVND1SIxYcJwQc1os3VonwDBQmnc0= + 0ANUy5+Ne0s7N6h5fsyD/o48XukQJcAiCGYT+H4UoZU= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe index f443805..8f90da4 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 42653dd..0160a92 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest @@ -43,14 +43,14 @@ - + - Cr6D7QgtSxz+kovq1cDsGPSD/zdNHYuBCB2mh8uw4mw= + yrh+ZXo63tISyVQnwDlVf1/TfkJIIpmL3XB34CEkk/s= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.xml b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.xml index 53e3f82..5e84171 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.xml +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.xml @@ -6,19 +6,21 @@ PokemonGameEditor - - - 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. + + + 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. + + - \ No newline at end of file + diff --git a/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe new file mode 100644 index 0000000..eb3b8b0 Binary files /dev/null and b/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 0b247cc..08ae84e 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 2014ef3..cf809ff 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.FileListAbsolute.txt b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt index d26e506..1d6d565 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt +++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt @@ -174,7 +174,6 @@ C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.exe C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.xml C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.pdb -C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.EggMoveEditor.resources C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.HabitatEditor.resources C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.AttackAdder.resources @@ -222,3 +221,6 @@ D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.xml D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.pdb D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache +C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.TrainerEditor.resources +C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.vbprojAssemblyReference.cache +C:\Users\Gamer2020\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.vbproj.CoreCompileInputs.cache diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache index b3386a4..813849f 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache deleted file mode 100644 index 3e73083..0000000 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache and /dev/null differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application index e40bebb..b1e485c 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - CNOrQyXBW7VKG4UVND1SIxYcJwQc1os3VonwDBQmnc0= + ZPldB61y37uHoxUw3d9sjfXQNo6uXLUSu3S+Zm/hJaA= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe index d344283..eb3b8b0 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 42653dd..7a5eda6 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - Cr6D7QgtSxz+kovq1cDsGPSD/zdNHYuBCB2mh8uw4mw= + OcpzcyjEychSbS73gzzApWC7NRIXJInBLOU5Ortf8So= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb index b6ab15b..44d29ff 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 53e3f82..5e84171 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.xml +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.xml @@ -6,19 +6,21 @@ PokemonGameEditor - - - 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. + + + 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. + + - \ No newline at end of file + diff --git a/README.md b/README.md index 9c3df7c..34b9521 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Support is not being offered at this time! Please make sure to use the latest be ![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. +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 2017. Screenshots =================