diff --git a/.vs/GBAPokemonGameEditor/v14/.suo b/.vs/GBAPokemonGameEditor/v14/.suo index e3da90f..032af70 100644 Binary files a/.vs/GBAPokemonGameEditor/v14/.suo and b/.vs/GBAPokemonGameEditor/v14/.suo differ diff --git a/GBAPokemonGameEditor/AttackEditor.Designer.vb b/GBAPokemonGameEditor/AttackEditor.Designer.vb index cb283f1..b64abef 100644 --- a/GBAPokemonGameEditor/AttackEditor.Designer.vb +++ b/GBAPokemonGameEditor/AttackEditor.Designer.vb @@ -130,7 +130,9 @@ Partial Class AttackEditor ' 'ComboBox3 ' - Me.ComboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.ComboBox3.AllowDrop = True + Me.ComboBox3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend + Me.ComboBox3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems Me.ComboBox3.FormattingEnabled = True Me.ComboBox3.Location = New System.Drawing.Point(6, 19) Me.ComboBox3.Name = "ComboBox3" diff --git a/GBAPokemonGameEditor/AttackEditor.vb b/GBAPokemonGameEditor/AttackEditor.vb index 75f5da0..7b79135 100644 --- a/GBAPokemonGameEditor/AttackEditor.vb +++ b/GBAPokemonGameEditor/AttackEditor.vb @@ -408,4 +408,5 @@ End If End Sub + End Class \ No newline at end of file diff --git a/GBAPokemonGameEditor/AttackExpander.vb b/GBAPokemonGameEditor/AttackExpander.vb index f40dae2..47d53fa 100644 --- a/GBAPokemonGameEditor/AttackExpander.vb +++ b/GBAPokemonGameEditor/AttackExpander.vb @@ -313,6 +313,21 @@ Public Class AttackExpander WriteHEX(LoadedROM, &H131E14, ReverseHEX(Hex((AttackNamesNewOffset) + &H8000000))) WriteHEX(LoadedROM, &H13695C, ReverseHEX(Hex((AttackNamesNewOffset) + &H8000000))) + 'Repoint Field Move names + + WriteHEX(LoadedROM, &H45A6A8, ReverseHEX(Hex((AttackNamesNewOffset + (148 * 13)) + &H8000000))) + WriteHEX(LoadedROM, &H45A6B0, ReverseHEX(Hex((AttackNamesNewOffset + (15 * 13)) + &H8000000))) + WriteHEX(LoadedROM, &H45A6B8, ReverseHEX(Hex((AttackNamesNewOffset + (19 * 13)) + &H8000000))) + WriteHEX(LoadedROM, &H45A6C0, ReverseHEX(Hex((AttackNamesNewOffset + (70 * 13)) + &H8000000))) + WriteHEX(LoadedROM, &H45A6C8, ReverseHEX(Hex((AttackNamesNewOffset + (57 * 13)) + &H8000000))) + WriteHEX(LoadedROM, &H45A6D0, ReverseHEX(Hex((AttackNamesNewOffset + (249 * 13)) + &H8000000))) + WriteHEX(LoadedROM, &H45A6D8, ReverseHEX(Hex((AttackNamesNewOffset + (127 * 13)) + &H8000000))) + WriteHEX(LoadedROM, &H45A6E0, ReverseHEX(Hex((AttackNamesNewOffset + (100 * 13)) + &H8000000))) + WriteHEX(LoadedROM, &H45A6E8, ReverseHEX(Hex((AttackNamesNewOffset + (91 * 13)) + &H8000000))) + WriteHEX(LoadedROM, &H45A6F0, ReverseHEX(Hex((AttackNamesNewOffset + (208 * 13)) + &H8000000))) + WriteHEX(LoadedROM, &H45A6F8, ReverseHEX(Hex((AttackNamesNewOffset + (135 * 13)) + &H8000000))) + WriteHEX(LoadedROM, &H45A700, ReverseHEX(Hex((AttackNamesNewOffset + (230 * 13)) + &H8000000))) + ''Attack Animations diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application index e0fbe53..7112008 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application @@ -16,7 +16,7 @@ - I2kuidxH4MS3jq/bO7aMcahxlS4= + iaL+4Et5blrXK9ZDsOkMo7D0GCw= diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe index 7d3f0bd..dcee1c9 100644 Binary files a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe and b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe differ diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest index 2a0a1a7..9d5ea64 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - 0WK4KLGUotwoi3yeyuwQbbNYtfM= + DbD92H55I5vNuBfCZ3ft8jxbBEw= diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb index a81a74f..21ae947 100644 Binary files a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb and b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb differ diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application index e0fbe53..7112008 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application @@ -16,7 +16,7 @@ - I2kuidxH4MS3jq/bO7aMcahxlS4= + iaL+4Et5blrXK9ZDsOkMo7D0GCw= diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest index 2a0a1a7..9d5ea64 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest @@ -43,14 +43,14 @@ - + - 0WK4KLGUotwoi3yeyuwQbbNYtfM= + DbD92H55I5vNuBfCZ3ft8jxbBEw= diff --git a/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe index 7d3f0bd..dcee1c9 100644 Binary files a/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe and b/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application index e0fbe53..7112008 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application @@ -16,7 +16,7 @@ - I2kuidxH4MS3jq/bO7aMcahxlS4= + iaL+4Et5blrXK9ZDsOkMo7D0GCw= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe index 7d3f0bd..dcee1c9 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest index 2a0a1a7..9d5ea64 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - 0WK4KLGUotwoi3yeyuwQbbNYtfM= + DbD92H55I5vNuBfCZ3ft8jxbBEw= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb index a81a74f..21ae947 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache index 04c15ed..6cc2892 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache differ