diff --git a/.vs/GBAPokemonGameEditor/v14/.suo b/.vs/GBAPokemonGameEditor/v14/.suo index 02cc77e..25748e0 100644 Binary files a/.vs/GBAPokemonGameEditor/v14/.suo and b/.vs/GBAPokemonGameEditor/v14/.suo differ diff --git a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj index d786b17..d89aa28 100644 --- a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj +++ b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj @@ -31,7 +31,7 @@ true publish.htm 0 - 3.3.0.0 + 3.4.0.0 false true true diff --git a/GBAPokemonGameEditor/My Project/AssemblyInfo.vb b/GBAPokemonGameEditor/My Project/AssemblyInfo.vb index 763d30b..813fb43 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/SplashScreen1.vb b/GBAPokemonGameEditor/SplashScreen1.vb index 369b6d9..44ac948 100644 --- a/GBAPokemonGameEditor/SplashScreen1.vb +++ b/GBAPokemonGameEditor/SplashScreen1.vb @@ -6,7 +6,7 @@ Private Sub SplashScreen1_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load - My.Application.MinimumSplashScreenDisplayTime = 10000 + My.Application.MinimumSplashScreenDisplayTime = 12000 ' 'Set up the dialog text at runtime according to the application's assembly information. diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPGESettings.ini b/GBAPokemonGameEditor/bin/Debug/GBAPGESettings.ini index b55db7e..5dbe2f6 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPGESettings.ini +++ b/GBAPokemonGameEditor/bin/Debug/GBAPGESettings.ini @@ -1,6 +1,4 @@ [Settings] TransparentImages=0 -MoveTableHack=0 DisablePKMImages=0 -jamboTMextensionHack=0 OSisLinux=0 diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application index 36d5a11..4a0e077 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application @@ -1,6 +1,6 @@  - + @@ -10,13 +10,13 @@ - + - wBplzNaRb4qrUlO563fgdrSxdgA= + wQG0GuZAQVzqD9F1sc6HZTcmFc0= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe index 66533c6..8a0b69b 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 b4249e7..bc8cc06 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest @@ -1,10 +1,10 @@  - + - + @@ -44,13 +44,13 @@ - + - 8792aE3QeKgqL3ymLsNwMJxdXvw= + V2M3hnPdTksm+zh+Tmidxb87fXU= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb index 8fb41ea..7070f70 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 36d5a11..4a0e077 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application @@ -1,6 +1,6 @@  - + @@ -10,13 +10,13 @@ - + - wBplzNaRb4qrUlO563fgdrSxdgA= + wQG0GuZAQVzqD9F1sc6HZTcmFc0= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest index b4249e7..bc8cc06 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 @@ - + - 8792aE3QeKgqL3ymLsNwMJxdXvw= + V2M3hnPdTksm+zh+Tmidxb87fXU= diff --git a/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe index 66533c6..8a0b69b 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/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 9c63a80..b92062c 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/PokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application index 36d5a11..4a0e077 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application @@ -1,6 +1,6 @@  - + @@ -10,13 +10,13 @@ - + - wBplzNaRb4qrUlO563fgdrSxdgA= + wQG0GuZAQVzqD9F1sc6HZTcmFc0= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe index 66533c6..8a0b69b 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 b4249e7..bc8cc06 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 @@ - + - 8792aE3QeKgqL3ymLsNwMJxdXvw= + V2M3hnPdTksm+zh+Tmidxb87fXU= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb index 8fb41ea..7070f70 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ