diff --git a/.vs/GBAPokemonGameEditor/v15/.suo b/.vs/GBAPokemonGameEditor/v15/.suo index 154359d..46e46f1 100644 Binary files a/.vs/GBAPokemonGameEditor/v15/.suo and b/.vs/GBAPokemonGameEditor/v15/.suo differ diff --git a/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide b/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide index 5e68346..327e0c9 100644 Binary files a/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide 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 index 03450df..13c51d2 100644 Binary files a/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-shm 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 index 90b2632..cd6a11a 100644 Binary files a/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-wal and b/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-wal differ diff --git a/GBAPokemonGameEditor/Pokemonedit.vb b/GBAPokemonGameEditor/Pokemonedit.vb index 69fcba4..d41ab68 100644 --- a/GBAPokemonGameEditor/Pokemonedit.vb +++ b/GBAPokemonGameEditor/Pokemonedit.vb @@ -313,19 +313,6 @@ Public Class Pokemonedit End If - If Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((baseoff) + 28 + 25) + (i * 28), 1))), System.Globalization.NumberStyles.HexNumber) < 10 Then - - Rght1.Checked = True - - Clr1.SelectedIndex = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((baseoff) + 28 + 25) + (i * 28), 1))), System.Globalization.NumberStyles.HexNumber) - - ElseIf Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((baseoff) + 28 + 25) + (i * 28), 1))), System.Globalization.NumberStyles.HexNumber) > 10 Then - - Lft1.Checked = True - Clr1.SelectedIndex = (Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((baseoff) + 28 + 25) + (i * 28), 1))), System.Globalization.NumberStyles.HexNumber)) - 128 - - End If - If ((ReadHEX(LoadedROM, ((baseoff) + 28 + 18) + (i * 28), 1))) = "00" Then HPVal.Enabled = False @@ -1181,22 +1168,11 @@ Public Class Pokemonedit i = PKMNames.SelectedIndex PokemonListIndex.Text = PKMNames.SelectedIndex + 1 + QuickRefresh(PokemonListIndex) + QuickRefresh(CurPKMName) + TabChanged() - 'Baseload() - - 'MediaLoad() - - 'TMHMCOMLoad() - - 'LearnableMoveLoad() - - 'MTComLoad() - - 'LoadDexData() - - 'LoadSpritePosition() - CurPKMName.Text = GetPokemonName(PKMNames.SelectedIndex + 1) If header2 = "BPR" Or header2 = "BPG" Then @@ -1672,8 +1648,7 @@ Public Class Pokemonedit ProgressBar.Value = (LoopVar / (GetString(GetINIFileLocation(), header, "NumberOfPokemon", ""))) * 100 - ProgressBar.Invalidate() - ProgressBar.Update() + QuickRefresh(ProgressBar) End While Me.Text = "Pokemon Editor" @@ -2360,8 +2335,7 @@ Public Class Pokemonedit ProgressBar.Value = (LoopVar / (GetString(GetINIFileLocation(), header, "NumberOfPokemon", ""))) * 100 - ProgressBar.Invalidate() - ProgressBar.Update() + QuickRefresh(ProgressBar) End While LoopVar = 0 @@ -2521,6 +2495,19 @@ Public Class Pokemonedit TextBox7.Enabled = False End If + If Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((baseoff) + 28 + 25) + (i * 28), 1))), System.Globalization.NumberStyles.HexNumber) < 10 Then + + Rght1.Checked = True + + Clr1.SelectedIndex = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((baseoff) + 28 + 25) + (i * 28), 1))), System.Globalization.NumberStyles.HexNumber) + + ElseIf Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((baseoff) + 28 + 25) + (i * 28), 1))), System.Globalization.NumberStyles.HexNumber) > 10 Then + + Lft1.Checked = True + Clr1.SelectedIndex = (Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((baseoff) + 28 + 25) + (i * 28), 1))), System.Globalization.NumberStyles.HexNumber)) - 128 + + End If + Else GroupBox32.Enabled = False @@ -3521,8 +3508,7 @@ Public Class Pokemonedit ProgressBar.Value = (LoopVar / (GetString(GetINIFileLocation(), header, "NumberOfPokemon", ""))) * 100 - ProgressBar.Invalidate() - ProgressBar.Update() + QuickRefresh(ProgressBar) End While Me.Text = "Pokemon Editor" @@ -3563,8 +3549,7 @@ Public Class Pokemonedit ProgressBar.Value = (LoopVar / (GetString(GetINIFileLocation(), header, "NumberOfPokemon", ""))) * 100 - ProgressBar.Invalidate() - ProgressBar.Update() + QuickRefresh(ProgressBar) End While PKMNames.SelectedIndex = 1 @@ -3605,8 +3590,7 @@ Public Class Pokemonedit ProgressBar.Value = (LoopVar / (GetString(GetINIFileLocation(), header, "NumberOfPokemon", ""))) * 100 - ProgressBar.Invalidate() - ProgressBar.Update() + QuickRefresh(ProgressBar) End While Me.Text = "Pokemon Editor" @@ -3647,8 +3631,7 @@ Public Class Pokemonedit ProgressBar.Value = (LoopVar / (GetString(GetINIFileLocation(), header, "NumberOfPokemon", ""))) * 100 - ProgressBar.Invalidate() - ProgressBar.Update() + QuickRefresh(ProgressBar) End While PKMNames.SelectedIndex = 1 @@ -3690,8 +3673,7 @@ Public Class Pokemonedit ProgressBar.Value = (LoopVar / (GetString(GetINIFileLocation(), header, "NumberOfPokemon", ""))) * 100 - ProgressBar.Invalidate() - ProgressBar.Update() + QuickRefresh(ProgressBar) End While PKMNames.SelectedIndex = 1 @@ -3732,8 +3714,7 @@ Public Class Pokemonedit ProgressBar.Value = (LoopVar / (GetString(GetINIFileLocation(), header, "NumberOfPokemon", ""))) * 100 - ProgressBar.Invalidate() - ProgressBar.Update() + QuickRefresh(ProgressBar) End While Me.Text = "Pokemon Editor" @@ -4009,8 +3990,7 @@ Public Class Pokemonedit ProgressBar.Value = (LoopVar / (GetString(GetINIFileLocation(), header, "NumberOfPokemon", ""))) * 100 - ProgressBar.Invalidate() - ProgressBar.Update() + QuickRefresh(ProgressBar) End While Me.Text = "Pokemon Editor" @@ -4075,6 +4055,24 @@ Public Class Pokemonedit BackgroundBox.Update() + QuickRefresh(FrontPointer) + QuickRefresh(BackPointer) + QuickRefresh(NormalPointer) + QuickRefresh(ShinyPointer) + QuickRefresh(IconPointer) + QuickRefresh(FootPrintPointer) + QuickRefresh(PictureBox1) + QuickRefresh(PlayerYSelect) + QuickRefresh(EnemyYSelect) + QuickRefresh(EnemyAltitudeSelect) + + If header2 = "BPE" Then + QuickRefresh(AnimationPointer) + QuickRefresh(TextBox8) + QuickRefresh(TextBox9) + QuickRefresh(TextBox10) + End If + Tab1LoadedMon = PKMNames.SelectedIndex + 1 End If @@ -4093,10 +4091,7 @@ Public Class Pokemonedit ElseIf TabControl1.SelectedTab Is TabPage3 And Not Tab3LoadedMon = PKMNames.SelectedIndex + 1 Then - EvoItemPic.Invalidate() - EvoItemPic.Invalidate() - EvoItemPic.Update() - EvoItemPic.Update() + QuickRefresh(EvoItemPic) Tab3LoadedMon = PKMNames.SelectedIndex + 1 @@ -4111,26 +4106,37 @@ Public Class Pokemonedit lvlupattacks.SelectedIndex = 0 - TMHMCom.Invalidate() - MTCom.Invalidate() - LvlUpAttPointer.Invalidate() - TMHMCom.Update() - MTCom.Update() - LvlUpAttPointer.Update() + QuickRefresh(MTCom) + QuickRefresh(TMHMCom) + QuickRefresh(LvlUpAttPointer) + lvlupattacks.EndUpdate() - lvlupattacks.Invalidate() - lvlupattacks.Update() + QuickRefresh(lvlupattacks) Tab4LoadedMon = PKMNames.SelectedIndex + 1 ElseIf TabControl1.SelectedTab Is TabPage5 And Not Tab5LoadedMon = PKMNames.SelectedIndex + 1 Then - Description1.Invalidate() LoadDexData() - Description1.Update() + QuickRefresh(Description1) + QuickRefresh(TextBox3) + QuickRefresh(TextBox4) + QuickRefresh(TextBox7) + QuickRefresh(TextBox5) + QuickRefresh(Hght) + QuickRefresh(Wght) + QuickRefresh(Offset_1) + QuickRefresh(Offset_2) + QuickRefresh(Scale1) + QuickRefresh(Scale2) + QuickRefresh(Pointer1) + QuickRefresh(Pointer2) + QuickRefresh(RSEDexPoke) + QuickRefresh(RSEDexTrainer) + QuickRefresh(GroupBox31) Tab5LoadedMon = PKMNames.SelectedIndex + 1 @@ -4221,8 +4227,7 @@ Public Class Pokemonedit LoopVar = LoopVar + 1 ProgressBar.Value = (LoopVar / (GetString(GetINIFileLocation(), header, "NumberOfPokemon", ""))) * 100 - ProgressBar.Invalidate() - ProgressBar.Update() + QuickRefresh(ProgressBar) End While @@ -4243,8 +4248,7 @@ Public Class Pokemonedit LoopVar = LoopVar + 1 ProgressBar.Value = (LoopVar / (GetString(GetINIFileLocation(), header, "NumberOfPokemon", ""))) * 100 - ProgressBar.Invalidate() - ProgressBar.Update() + QuickRefresh(ProgressBar) End While @@ -4380,8 +4384,7 @@ Public Class Pokemonedit End If ProgressBar.Value = (LoopVar / (GetString(GetINIFileLocation(), header, "NumberOfPokemon", ""))) * 100 - ProgressBar.Invalidate() - ProgressBar.Update() + QuickRefresh(ProgressBar) End While @@ -4395,4 +4398,10 @@ Public Class Pokemonedit Me.BringToFront() End If End Sub + + Private Sub QuickRefresh(MenuItem) + MenuItem.Invalidate() + MenuItem.Update() + End Sub + End Class \ No newline at end of file diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application index 93ab7a9..8227718 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - zBGXXsmSy1GHCXYBDl5hB8FgtCUg7wA2+uokrrNJWEc= + QsFKxbstxG1jmilFkSvaU7FbissqqWm3Xb5Jr6wVmQ4= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe index 9a0edd0..220df50 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 bed27ef..4ce5763 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest @@ -50,7 +50,7 @@ - 5CtwCk2VMdWIfz/HDRItLPt8ziUMJFTYFcwqsKXXyYo= + LmwckqXa9bIoxtAPUVKl2CgGfX6J4Ffr+MkbuILp58U= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb index d47200e..9bab66f 100644 Binary files a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb differ diff --git a/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe index 9a0edd0..220df50 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/PokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application index 93ab7a9..8227718 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - zBGXXsmSy1GHCXYBDl5hB8FgtCUg7wA2+uokrrNJWEc= + QsFKxbstxG1jmilFkSvaU7FbissqqWm3Xb5Jr6wVmQ4= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe index 9a0edd0..220df50 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 bed27ef..4ce5763 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest @@ -50,7 +50,7 @@ - 5CtwCk2VMdWIfz/HDRItLPt8ziUMJFTYFcwqsKXXyYo= + LmwckqXa9bIoxtAPUVKl2CgGfX6J4Ffr+MkbuILp58U= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb index d47200e..9bab66f 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ