diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3147742 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +.ide +.exe +.application +.manifest +.Cache +.ide-wal diff --git a/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide b/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide index ee5b265..5b91ec7 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-wal b/.vs/GBAPokemonGameEditor/v15/Server/sqlite3/storage.ide-wal index 992a2ef..3e1ff65 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.Designer.vb b/GBAPokemonGameEditor/Pokemonedit.Designer.vb index 1c78580..d0fb189 100644 --- a/GBAPokemonGameEditor/Pokemonedit.Designer.vb +++ b/GBAPokemonGameEditor/Pokemonedit.Designer.vb @@ -286,6 +286,7 @@ Partial Class Pokemonedit Me.Button39 = New System.Windows.Forms.Button() Me.Button41 = New System.Windows.Forms.Button() Me.CheckBox1 = New System.Windows.Forms.CheckBox() + Me.Label61 = New System.Windows.Forms.Label() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() Me.GroupBox26.SuspendLayout() @@ -583,6 +584,7 @@ Partial Class Pokemonedit ' 'GroupBox16 ' + Me.GroupBox16.Controls.Add(Me.Label61) Me.GroupBox16.Controls.Add(Me.Button40) Me.GroupBox16.Controls.Add(Me.Button22) Me.GroupBox16.Controls.Add(Me.Button21) @@ -3160,6 +3162,17 @@ Partial Class Pokemonedit Me.CheckBox1.Text = "Efficient Imports" Me.CheckBox1.UseVisualStyleBackColor = True ' + 'Label61 + ' + Me.Label61.AutoSize = True + Me.Label61.ForeColor = System.Drawing.Color.Crimson + Me.Label61.Location = New System.Drawing.Point(27, 119) + Me.Label61.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label61.Name = "Label61" + Me.Label61.Size = New System.Drawing.Size(97, 20) + Me.Label61.TabIndex = 13 + Me.Label61.Text = "Invalid Pal#: " + ' 'Pokemonedit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) @@ -3553,4 +3566,5 @@ Partial Class Pokemonedit Friend WithEvents Button40 As Button Friend WithEvents Button41 As Button Friend WithEvents CheckBox1 As CheckBox + Friend WithEvents Label61 As Label End Class diff --git a/GBAPokemonGameEditor/Pokemonedit.vb b/GBAPokemonGameEditor/Pokemonedit.vb index 5c5ff6f..de1ba03 100644 --- a/GBAPokemonGameEditor/Pokemonedit.vb +++ b/GBAPokemonGameEditor/Pokemonedit.vb @@ -692,10 +692,15 @@ Public Class Pokemonedit Try IconPal.SelectedIndex = Int32.Parse(((ReadHEX(LoadedROM, (IconPalTable) + (1) + (i), 1))), System.Globalization.NumberStyles.HexNumber) + Label61.Text = " " Catch IconPal.SelectedIndex = IconPalCount - 1 + Label61.Text = "Invalid Pal#: " + Convert.ToString(Int32.Parse(((ReadHEX(LoadedROM, (IconPalTable) + (1) + (i), 1))), System.Globalization.NumberStyles.HexNumber)) End Try + Label61.Invalidate() + Label61.Update() + FootPrintPointer.Text = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (FootPrintTable) + (4) + (i * 4), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000) AnimationPointer.Text = "" diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application index 64b9241..b14ab1a 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - XozeHA7UZmqA/b/Cs03DBlFj1CotO1+nb8JfVqJ/UnQ= + /TMXH7TbOoTD6/KT2qbzyHQ4cnH0Ds1OXY4mjlznt0o= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe index 677fb42..12ae9b5 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 f59df71..84ec4b0 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - PZALu8lBA432VEvgKFxJLZjoOy/psUVUIAXWjcVsbvY= + BYPNOtnl6NqIhYpRJO9FGh9OiSYT8Bh3DCHX8BPYuk0= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb index ddfc304..d360555 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 677fb42..12ae9b5 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/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache index 7062c02..48f7e72 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.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application index 64b9241..b14ab1a 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - XozeHA7UZmqA/b/Cs03DBlFj1CotO1+nb8JfVqJ/UnQ= + /TMXH7TbOoTD6/KT2qbzyHQ4cnH0Ds1OXY4mjlznt0o= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe index 677fb42..12ae9b5 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 f59df71..84ec4b0 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - PZALu8lBA432VEvgKFxJLZjoOy/psUVUIAXWjcVsbvY= + BYPNOtnl6NqIhYpRJO9FGh9OiSYT8Bh3DCHX8BPYuk0= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb index ddfc304..d360555 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ