Leahnaya/PokemonGameEditor
1
0
Fork 0
mirror of https://github.com/Gamer2020/PokemonGameEditor.git synced 2026-10-01 05:30:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
# Conflicts:
#	.vs/GBAPokemonGameEditor/v14/.suo
#	.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-shm
#	.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-wal
#	GBAPokemonGameEditor/ImportDataFunctions.vb
#	GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
#	GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
#	GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
#	GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
#	GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
#	GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe
#	GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
#	GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.xml
#	GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe
#	GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
#	GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
#	GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt
#	GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
#	GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
#	GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
#	GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
#	GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
This commit is contained in:
Dreuu
2019-01-16 23:21:46 -05:00
parent 5ca419973a aff8d33f33
commit 02f9fb8d67
25 changed files with 638 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GBAPokemonGameEditor/GetImageFunctions.vb
View File

@@ -1200,7 +1200,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)