diff --git a/GBAPokemonGameEditor.v12.suo b/GBAPokemonGameEditor.v12.suo index 74ffba4..9d8d414 100644 Binary files a/GBAPokemonGameEditor.v12.suo and b/GBAPokemonGameEditor.v12.suo differ diff --git a/GBAPokemonGameEditor/AttackAdder.vb b/GBAPokemonGameEditor/AttackAdder.vb index 1e4f5c5..0c2acba 100644 --- a/GBAPokemonGameEditor/AttackAdder.vb +++ b/GBAPokemonGameEditor/AttackAdder.vb @@ -397,7 +397,7 @@ Public Class AttackAdder WriteHEX(LoadedROM, &HD75FC, "00000000000013E0") 'Move Table hack stuff - If CheckBox1.Checked And GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then + If CheckBox1.Checked And GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then 'Converts the table to the new format @@ -999,7 +999,7 @@ Public Class AttackAdder WriteHEX(LoadedROM, &HDE83A, "00000000000000E0") 'Move Table hack stuff - If CheckBox4.Checked And GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then + If CheckBox4.Checked And GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then 'Converts the table to the new format diff --git a/GBAPokemonGameEditor/ExportDataFunctions.vb b/GBAPokemonGameEditor/ExportDataFunctions.vb index 1a4a922..8bc9b47 100644 --- a/GBAPokemonGameEditor/ExportDataFunctions.vb +++ b/GBAPokemonGameEditor/ExportDataFunctions.vb @@ -65,7 +65,7 @@ Module ExportDataFunctions CurAttackListOffset = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (Int32.Parse((GetString(GetINIFileLocation(), header, "PokemonAttackTable", "")), System.Globalization.NumberStyles.HexNumber)) + (PokemonIndex * 4), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000) - If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then + If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then Looper = 0 @@ -108,7 +108,7 @@ Module ExportDataFunctions End While - ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "True" Then + ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "True".ToLower() Then Looper = 0 diff --git a/GBAPokemonGameEditor/ImportDataFunctions.vb b/GBAPokemonGameEditor/ImportDataFunctions.vb index e8ebfa6..e75f647 100644 --- a/GBAPokemonGameEditor/ImportDataFunctions.vb +++ b/GBAPokemonGameEditor/ImportDataFunctions.vb @@ -76,9 +76,9 @@ Module ImportDataFunctions EvolutionData = EvolutionData.Remove((8 * (GetString(GetINIFileLocation(), header, "NumberOfEvolutionsPerPokemon", ""))) * 2) End If - If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then + If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then lvlupattacks = GetString(INIFileName, "Pokemon", "LevelUpAttacksOriginal", "2102FFFF0000") - ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "True" Then + ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "True".ToLower() Then lvlupattacks = GetString(INIFileName, "Pokemon", "LevelUpAttacksJambo51", "2100010000FF00") End If diff --git a/GBAPokemonGameEditor/PokemonAdder.vb b/GBAPokemonGameEditor/PokemonAdder.vb index 4a3a721..ff00a30 100644 --- a/GBAPokemonGameEditor/PokemonAdder.vb +++ b/GBAPokemonGameEditor/PokemonAdder.vb @@ -372,7 +372,7 @@ Public Class PokemonAdder 'Repoint Pokemon Attack Table - If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "True" Then + If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "True".ToLower() Then WriteHEX(LoadedROM, (Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, &H3EA10 + 4, 4)), System.Globalization.NumberStyles.HexNumber) - &H8000001 + 124), ReverseHEX(Hex((PokemonAttackDataNewOffset) + &H8000000))) WriteHEX(LoadedROM, &H3EB10, ReverseHEX(Hex((PokemonAttackDataNewOffset) + &H8000000))) @@ -381,7 +381,7 @@ Public Class PokemonAdder WriteHEX(LoadedROM, &H43DD4 + 72, ReverseHEX(Hex((PokemonAttackDataNewOffset) + &H8000000))) WriteHEX(LoadedROM, (Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, &H43E2C + 4, 4)), System.Globalization.NumberStyles.HexNumber) - &H8000001 + 360), ReverseHEX(Hex((PokemonAttackDataNewOffset) + &H8000000))) - ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then + ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then WriteHEX(LoadedROM, &H3EA7C, ReverseHEX(Hex((PokemonAttackDataNewOffset) + &H8000000))) WriteHEX(LoadedROM, &H3EB10, ReverseHEX(Hex((PokemonAttackDataNewOffset) + &H8000000))) diff --git a/GBAPokemonGameEditor/Pokemonedit.vb b/GBAPokemonGameEditor/Pokemonedit.vb index 2a99f17..cde95c5 100644 --- a/GBAPokemonGameEditor/Pokemonedit.vb +++ b/GBAPokemonGameEditor/Pokemonedit.vb @@ -1691,7 +1691,7 @@ Public Class Pokemonedit Looper = Looper + 1 End While - ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "True" Then + ElseIf GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "True".ToLower() Then AttackTable = Int32.Parse((GetString(GetINIFileLocation(), header, "PokemonAttackTable", "")), System.Globalization.NumberStyles.HexNumber) LvlUpAttPointer.Text = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (AttackTable) + (4) + (PKMNames.SelectedIndex * 4), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000) @@ -1719,7 +1719,7 @@ Public Class Pokemonedit Dim at As String Dim lvl As String - If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then + If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then i = PKMNames.SelectedIndex WriteHEX(LoadedROM, (AttackTable) + (4) + (i * 4), ReverseHEX(Hex(Int32.Parse(((LvlUpAttPointer.Text)), System.Globalization.NumberStyles.HexNumber) + &H8000000))) lvlupattacks.Items.Clear() @@ -1752,7 +1752,7 @@ Public Class Pokemonedit End While End If - If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "True" Then + If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "True".ToLower() Then i = PKMNames.SelectedIndex WriteHEX(LoadedROM, (AttackTable) + (4) + (i * 4), ReverseHEX(Hex(Val("&H" & (LvlUpAttPointer.Text)) + &H8000000))) lvlupattacks.Items.Clear() @@ -1997,7 +1997,7 @@ Public Class Pokemonedit Dim pointer As String 'Dim loopme As Integer - If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then + If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then pointer = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (AttackTable) + (4) + (PKMNames.SelectedIndex * 4), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000) @@ -2023,7 +2023,7 @@ Public Class Pokemonedit AtLvl.Text = lvl NewAt.SelectedIndex = at End If - If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "True" Then + If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "True".ToLower() Then pointer = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (AttackTable) + (4) + (PKMNames.SelectedIndex * 4), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000) @@ -2051,7 +2051,7 @@ Public Class Pokemonedit Dim temp As Integer 'Dim loopme As Integer - If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "False" Then + If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "False".ToLower() Then holder = lvlupattacks.SelectedIndex pointer = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (AttackTable) + (4) + (PKMNames.SelectedIndex * 4), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000) @@ -2082,7 +2082,7 @@ Public Class Pokemonedit End If - If GetString(GetINIFileLocation(), header, "MoveTableHack", "False") = "True" Then + If GetString(GetINIFileLocation(), header, "MoveTableHack", "False").ToLower() = "True".ToLower() Then holder = lvlupattacks.SelectedIndex pointer = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, (AttackTable) + (4) + (PKMNames.SelectedIndex * 4), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000) diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application index 73f98e9..6b2049c 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - e/oJWwSV8XEYHflhLlUSROXxhsL+5yTs7Mo9Onn0LI8= + igbUbUZZ6x3LG89oy1wF/dO5zrMf1r9nIcjJBK4dzhs= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe index 02b3231..fb7cbde 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 a3407b5..c4108cc 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - ntkixu0XPL39J/wS+VmTEuZJWoq2G89mv15mr0yhwCY= + kX/sL7dtcAqFej9q0Q3GSKl+5Ib01CNrJSEB8qN1mps= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb index fd5eb31..867786e 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 73f98e9..6b2049c 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application @@ -16,7 +16,7 @@ - e/oJWwSV8XEYHflhLlUSROXxhsL+5yTs7Mo9Onn0LI8= + igbUbUZZ6x3LG89oy1wF/dO5zrMf1r9nIcjJBK4dzhs= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest index a3407b5..c4108cc 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest @@ -43,14 +43,14 @@ - + - ntkixu0XPL39J/wS+VmTEuZJWoq2G89mv15mr0yhwCY= + kX/sL7dtcAqFej9q0Q3GSKl+5Ib01CNrJSEB8qN1mps= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application index 73f98e9..6b2049c 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - e/oJWwSV8XEYHflhLlUSROXxhsL+5yTs7Mo9Onn0LI8= + igbUbUZZ6x3LG89oy1wF/dO5zrMf1r9nIcjJBK4dzhs= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe index 02b3231..fb7cbde 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 a3407b5..c4108cc 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - ntkixu0XPL39J/wS+VmTEuZJWoq2G89mv15mr0yhwCY= + kX/sL7dtcAqFej9q0Q3GSKl+5Ib01CNrJSEB8qN1mps= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb index fd5eb31..867786e 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ