diff --git a/.vs/GBAPokemonGameEditor/v14/.suo b/.vs/GBAPokemonGameEditor/v14/.suo index f646216..c65557f 100644 Binary files a/.vs/GBAPokemonGameEditor/v14/.suo and b/.vs/GBAPokemonGameEditor/v14/.suo differ diff --git a/GBAPokemonGameEditor/MainFrm.Designer.vb b/GBAPokemonGameEditor/MainFrm.Designer.vb index ea02511..df9b017 100644 --- a/GBAPokemonGameEditor/MainFrm.Designer.vb +++ b/GBAPokemonGameEditor/MainFrm.Designer.vb @@ -159,10 +159,12 @@ Partial Class MainFrm ' 'UseJambo51sTMHMExtensionHackIfYouDontKnowWhatThisIsDontUseItToolStripMenuItem ' + Me.UseJambo51sTMHMExtensionHackIfYouDontKnowWhatThisIsDontUseItToolStripMenuItem.Enabled = False Me.UseJambo51sTMHMExtensionHackIfYouDontKnowWhatThisIsDontUseItToolStripMenuItem.Name = "UseJambo51sTMHMExtensionHackIfYouDontKnowWhatThisIsDontUseItToolStripMenuItem" Me.UseJambo51sTMHMExtensionHackIfYouDontKnowWhatThisIsDontUseItToolStripMenuItem.Size = New System.Drawing.Size(654, 22) Me.UseJambo51sTMHMExtensionHackIfYouDontKnowWhatThisIsDontUseItToolStripMenuItem.Text = "Use Jambo51's TM/HM extension hack. (If you don't know what this is don't use it." & ")" + Me.UseJambo51sTMHMExtensionHackIfYouDontKnowWhatThisIsDontUseItToolStripMenuItem.Visible = False ' 'LinuxToolStripMenuItem ' diff --git a/GBAPokemonGameEditor/Pokemonedit.vb b/GBAPokemonGameEditor/Pokemonedit.vb index 7ea7b58..96a0d5c 100644 --- a/GBAPokemonGameEditor/Pokemonedit.vb +++ b/GBAPokemonGameEditor/Pokemonedit.vb @@ -1245,57 +1245,29 @@ Public Class Pokemonedit TMHMCom.Items.Clear() + LoopVar = 0 - If GetString(AppPath & "GBAPGESettings.ini", "Settings", "jamboTMextensionHack", "0") = 0 Then + While LoopVar < (Val(GetString(GetINIFileLocation(), header, "TotalTMsPlusHMs", ""))) = True - LoopVar = 0 + If LoopVar > ((Val(GetString(GetINIFileLocation(), header, "TotalTMs", ""))) - 1) Then + TMHMCom.Items.Add("HM" & LoopVar - 49 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((LoopVar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) - While LoopVar < 58 = True + LoopVar = LoopVar + 1 - If LoopVar > 49 Then - TMHMCom.Items.Add("HM" & LoopVar - 49 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((LoopVar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) + ElseIf LoopVar < 9 Then - LoopVar = LoopVar + 1 + TMHMCom.Items.Add("TM" & "0" & LoopVar + 1 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((LoopVar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) - ElseIf LoopVar < 9 Then + LoopVar = LoopVar + 1 + Else - TMHMCom.Items.Add("TM" & "0" & LoopVar + 1 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((LoopVar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) - - LoopVar = LoopVar + 1 - Else - - TMHMCom.Items.Add("TM" & LoopVar + 1 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((LoopVar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) - - LoopVar = LoopVar + 1 - End If - End While - End If - - If GetString(AppPath & "GBAPGESettings.ini", "Settings", "jamboTMextensionHack", "0") = 1 Then - - LoopVar = 0 - - While LoopVar < 104 = True - - If LoopVar > 94 Then - TMHMCom.Items.Add("HM" & LoopVar - 94) - - LoopVar = LoopVar + 1 - - ElseIf LoopVar < 9 Then - - TMHMCom.Items.Add("TM" & "0" & LoopVar + 1) - - LoopVar = LoopVar + 1 - Else - - TMHMCom.Items.Add("TM" & LoopVar + 1) + TMHMCom.Items.Add("TM" & LoopVar + 1 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((LoopVar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) LoopVar = LoopVar + 1 End If End While - End If + End Sub Public Sub TMHMCOMLoad() @@ -1313,104 +1285,104 @@ Public Class Pokemonedit Dim binarythebitch As String Dim curchar As String - If GetString(AppPath & "GBAPGESettings.ini", "Settings", "jamboTMextensionHack", "0") = 0 Then - whichtmbyte = 0 + 'If GetString(AppPath & "GBAPGESettings.ini", "Settings", "jamboTMextensionHack", "0") = 0 Then + ' whichtmbyte = 0 - While whichtmbyte < 8 + ' While whichtmbyte < 8 - blah = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMCompoLoc + 8 + (i * 8) + whichtmbyte, 1))), System.Globalization.NumberStyles.HexNumber) - binarythebitch = (Convert.ToString(blah, 2)) + ' blah = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMCompoLoc + 8 + (i * 8) + whichtmbyte, 1))), System.Globalization.NumberStyles.HexNumber) + ' binarythebitch = (Convert.ToString(blah, 2)) - If whichtmbyte = 7 Then + ' If whichtmbyte = 7 Then - howmanytmschecked = 0 + ' howmanytmschecked = 0 - ' MsgBox((Convert.ToString(blah, 2))) + ' ' MsgBox((Convert.ToString(blah, 2))) - If Len(binarythebitch) > 2 Then - MsgBox("Did you mess with the TM/HM data? Contact Gamer2020!") - ElseIf Len(binarythebitch) = 2 Then + ' If Len(binarythebitch) > 2 Then + ' MsgBox("Did you mess with the TM/HM data? Contact Gamer2020!") + ' ElseIf Len(binarythebitch) = 2 Then - curchar = GetChar(binarythebitch, 1) + ' curchar = GetChar(binarythebitch, 1) - If curchar = "1" Then - TMHMCom.SetItemChecked(57, True) + ' If curchar = "1" Then + ' TMHMCom.SetItemChecked(57, True) - ElseIf curchar = "0" Then - TMHMCom.SetItemChecked(57, False) + ' ElseIf curchar = "0" Then + ' TMHMCom.SetItemChecked(57, False) - End If + ' End If - curchar = GetChar(binarythebitch, 2) + ' curchar = GetChar(binarythebitch, 2) - If curchar = "1" Then - TMHMCom.SetItemChecked(56, True) + ' If curchar = "1" Then + ' TMHMCom.SetItemChecked(56, True) - ElseIf curchar = "0" Then - TMHMCom.SetItemChecked(56, False) + ' ElseIf curchar = "0" Then + ' TMHMCom.SetItemChecked(56, False) - End If + ' End If - ElseIf Len(binarythebitch) < 2 Then + ' ElseIf Len(binarythebitch) < 2 Then - TMHMCom.SetItemChecked(57, False) + ' TMHMCom.SetItemChecked(57, False) - curchar = GetChar(binarythebitch, 1) + ' curchar = GetChar(binarythebitch, 1) - If curchar = "1" Then - TMHMCom.SetItemChecked(56, True) + ' If curchar = "1" Then + ' TMHMCom.SetItemChecked(56, True) - ElseIf curchar = "0" Then - TMHMCom.SetItemChecked(56, False) + ' ElseIf curchar = "0" Then + ' TMHMCom.SetItemChecked(56, False) - End If + ' End If - End If + ' End If - whichtmbyte = whichtmbyte + 1 - Else - howmanytmschecked = 0 + ' whichtmbyte = whichtmbyte + 1 + ' Else + ' howmanytmschecked = 0 - ' MsgBox((Convert.ToString(blah, 2))) + ' ' MsgBox((Convert.ToString(blah, 2))) - howmanyzeros = (8 - Len(binarythebitch)) + ' howmanyzeros = (8 - Len(binarythebitch)) - For looper = 1 To howmanyzeros - TMHMCom.SetItemChecked((7 + (8 * whichtmbyte)) - howmanytmschecked, False) + ' For looper = 1 To howmanyzeros + ' TMHMCom.SetItemChecked((7 + (8 * whichtmbyte)) - howmanytmschecked, False) - howmanytmschecked = howmanytmschecked + 1 + ' howmanytmschecked = howmanytmschecked + 1 - Next looper + ' Next looper - For curposition = 1 To Len(Convert.ToString(blah, 2)) + ' For curposition = 1 To Len(Convert.ToString(blah, 2)) - ' Len(Convert.ToString(blah, 2)) + ' ' Len(Convert.ToString(blah, 2)) - curchar = GetChar(binarythebitch, curposition) + ' curchar = GetChar(binarythebitch, curposition) - If curchar = "1" Then - TMHMCom.SetItemChecked((7 + (8 * whichtmbyte)) - howmanytmschecked, True) + ' If curchar = "1" Then + ' TMHMCom.SetItemChecked((7 + (8 * whichtmbyte)) - howmanytmschecked, True) - howmanytmschecked = howmanytmschecked + 1 + ' howmanytmschecked = howmanytmschecked + 1 - ElseIf curchar = "0" Then - TMHMCom.SetItemChecked((7 + (8 * whichtmbyte)) - howmanytmschecked, False) + ' ElseIf curchar = "0" Then + ' TMHMCom.SetItemChecked((7 + (8 * whichtmbyte)) - howmanytmschecked, False) - howmanytmschecked = howmanytmschecked + 1 + ' howmanytmschecked = howmanytmschecked + 1 - End If - Next curposition - whichtmbyte = whichtmbyte + 1 - End If - End While - End If + ' End If + ' Next curposition + ' whichtmbyte = whichtmbyte + 1 + ' End If + ' End While + 'End If 'seperate @@ -1418,14 +1390,14 @@ Public Class Pokemonedit 'seperate 'seperate - If GetString(AppPath & "GBAPGESettings.ini", "Settings", "jamboTMextensionHack", "0") = 1 Then + ' If GetString(AppPath & "GBAPGESettings.ini", "Settings", "jamboTMextensionHack", "0") = 1 Then - whichtmbyte = 0 + whichtmbyte = 0 - While whichtmbyte < 13 + While whichtmbyte < (Val(GetString(GetINIFileLocation(), header, "TMHMLenPerPoke", ""))) - blah = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMCompoLoc + 13 + (i * 13) + whichtmbyte, 1))), System.Globalization.NumberStyles.HexNumber) - binarythebitch = (Convert.ToString(blah, 2)) + blah = Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMCompoLoc + (Val(GetString(GetINIFileLocation(), header, "TMHMLenPerPoke", ""))) + (i * (Val(GetString(GetINIFileLocation(), header, "TMHMLenPerPoke", "")))) + whichtmbyte, 1))), System.Globalization.NumberStyles.HexNumber) + binarythebitch = (Convert.ToString(blah, 2)) howmanytmschecked = 0 @@ -1435,35 +1407,41 @@ Public Class Pokemonedit howmanyzeros = (8 - Len(binarythebitch)) For looper = 1 To howmanyzeros - TMHMCom.SetItemChecked((7 + (8 * whichtmbyte)) - howmanytmschecked, False) + 'TMHMCom.SetItemChecked((7 + (8 * whichtmbyte)) - howmanytmschecked, False) + 'howmanytmschecked = howmanytmschecked + 1 + binarythebitch = "0" & binarythebitch + + Next looper + + For curposition = 1 To Len(binarythebitch) + + ' Len(Convert.ToString(blah, 2)) + + curchar = GetChar(binarythebitch, curposition) + + If curchar = "1" Then + + + If (((7 + (8 * whichtmbyte)) - howmanytmschecked) < (Val(GetString(GetINIFileLocation(), header, "TotalTMsPlusHMs", "")))) Then + TMHMCom.SetItemChecked((7 + (8 * whichtmbyte)) - howmanytmschecked, True) + End If howmanytmschecked = howmanytmschecked + 1 - Next looper + ElseIf curchar = "0" Then - For curposition = 1 To Len(Convert.ToString(blah, 2)) - - ' Len(Convert.ToString(blah, 2)) - - curchar = GetChar(binarythebitch, curposition) - - If curchar = "1" Then - TMHMCom.SetItemChecked((7 + (8 * whichtmbyte)) - howmanytmschecked, True) - - howmanytmschecked = howmanytmschecked + 1 - - ElseIf curchar = "0" Then + If (((7 + (8 * whichtmbyte)) - howmanytmschecked) < (Val(GetString(GetINIFileLocation(), header, "TotalTMsPlusHMs", "")))) Then TMHMCom.SetItemChecked((7 + (8 * whichtmbyte)) - howmanytmschecked, False) - - howmanytmschecked = howmanytmschecked + 1 + End If + howmanytmschecked = howmanytmschecked + 1 End If - Next curposition - whichtmbyte = whichtmbyte + 1 + Next curposition + whichtmbyte = whichtmbyte + 1 End While - End If + ' End If End Sub @@ -1476,83 +1454,91 @@ Public Class Pokemonedit Dim binarytowrite As String Dim bytetowrite As String - If GetString(AppPath & "GBAPGESettings.ini", "Settings", "jamboTMextensionHack", "0") = 0 Then + 'If GetString(AppPath & "GBAPGESettings.ini", "Settings", "jamboTMextensionHack", "0") = 0 Then - whichtmbyte = 0 + ' whichtmbyte = 0 - While whichtmbyte < 8 + ' While whichtmbyte < 8 - If whichtmbyte = 7 Then + ' If whichtmbyte = 7 Then - binarytowrite = "" - For looper = 0 To 1 + ' binarytowrite = "" + ' For looper = 0 To 1 - If TMHMCom.GetItemChecked((8 * whichtmbyte) + looper) = True Then - binarytowrite = "1" & binarytowrite + ' If TMHMCom.GetItemChecked((8 * whichtmbyte) + looper) = True Then + ' binarytowrite = "1" & binarytowrite - ElseIf TMHMCom.GetItemChecked((8 * whichtmbyte) + looper) = False Then - binarytowrite = "0" & binarytowrite + ' ElseIf TMHMCom.GetItemChecked((8 * whichtmbyte) + looper) = False Then + ' binarytowrite = "0" & binarytowrite - End If + ' End If - Next looper - bytetowrite = Hex(Convert.ToInt32(binarytowrite, 2)) - WriteHEX(LoadedROM, TMHMCompoLoc + 8 + (i * 8) + whichtmbyte, bytetowrite) + ' Next looper + ' bytetowrite = Hex(Convert.ToInt32(binarytowrite, 2)) + ' WriteHEX(LoadedROM, TMHMCompoLoc + 8 + (i * 8) + whichtmbyte, bytetowrite) - whichtmbyte = whichtmbyte + 1 + ' whichtmbyte = whichtmbyte + 1 + ' Else + + ' binarytowrite = "" + ' For looper = 0 To 7 + + ' If TMHMCom.GetItemChecked((8 * whichtmbyte) + looper) = True Then + ' binarytowrite = "1" & binarytowrite + + ' ElseIf TMHMCom.GetItemChecked((8 * whichtmbyte) + looper) = False Then + ' binarytowrite = "0" & binarytowrite + + ' End If + + ' Next looper + ' bytetowrite = Hex(Convert.ToInt32(binarytowrite, 2)) + ' WriteHEX(LoadedROM, TMHMCompoLoc + 8 + (i * 8) + whichtmbyte, bytetowrite) + + ' whichtmbyte = whichtmbyte + 1 + ' End If + ' End While + 'End If + + + 'separate + 'separate + 'separate + + ' If GetString(AppPath & "GBAPGESettings.ini", "Settings", "jamboTMextensionHack", "0") = 1 Then + + whichtmbyte = 0 + + While whichtmbyte < (Val(GetString(GetINIFileLocation(), header, "TMHMLenPerPoke", ""))) + + binarytowrite = "" + For looper = 0 To 7 + + + + If (((8 * whichtmbyte) + looper) < TMHMCom.Items.Count) Then + + If TMHMCom.GetItemChecked((8 * whichtmbyte) + looper) = True Then + binarytowrite = "1" & binarytowrite + + ElseIf TMHMCom.GetItemChecked((8 * whichtmbyte) + looper) = False Then + binarytowrite = "0" & binarytowrite + + End If Else - binarytowrite = "" - For looper = 0 To 7 + binarytowrite = "0" & binarytowrite - If TMHMCom.GetItemChecked((8 * whichtmbyte) + looper) = True Then - binarytowrite = "1" & binarytowrite - - ElseIf TMHMCom.GetItemChecked((8 * whichtmbyte) + looper) = False Then - binarytowrite = "0" & binarytowrite - - End If - - Next looper - bytetowrite = Hex(Convert.ToInt32(binarytowrite, 2)) - WriteHEX(LoadedROM, TMHMCompoLoc + 8 + (i * 8) + whichtmbyte, bytetowrite) - - whichtmbyte = whichtmbyte + 1 End If - End While - End If - - - 'separate - 'separate - 'separate - - If GetString(AppPath & "GBAPGESettings.ini", "Settings", "jamboTMextensionHack", "0") = 1 Then - - whichtmbyte = 0 - - While whichtmbyte < 13 - - binarytowrite = "" - For looper = 0 To 7 - - If TMHMCom.GetItemChecked((8 * whichtmbyte) + looper) = True Then - binarytowrite = "1" & binarytowrite - - ElseIf TMHMCom.GetItemChecked((8 * whichtmbyte) + looper) = False Then - binarytowrite = "0" & binarytowrite - - End If - - Next looper + Next looper bytetowrite = Hex(Convert.ToInt32(binarytowrite, 2)) - WriteHEX(LoadedROM, TMHMCompoLoc + 13 + (i * 13) + whichtmbyte, bytetowrite) + WriteHEX(LoadedROM, TMHMCompoLoc + (Val(GetString(GetINIFileLocation(), header, "TMHMLenPerPoke", ""))) + (i * (Val(GetString(GetINIFileLocation(), header, "TMHMLenPerPoke", "")))) + whichtmbyte, bytetowrite) - whichtmbyte = whichtmbyte + 1 + whichtmbyte = whichtmbyte + 1 End While - End If + ' End If End Sub Private Sub Button9_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button9.Click diff --git a/GBAPokemonGameEditor/TMHMEditor.vb b/GBAPokemonGameEditor/TMHMEditor.vb index 15a0ec6..5b9afcd 100644 --- a/GBAPokemonGameEditor/TMHMEditor.vb +++ b/GBAPokemonGameEditor/TMHMEditor.vb @@ -15,37 +15,30 @@ Public Class TMHMEditor TMHMList.Items.Clear() - If GetString(AppPath & "GBAPGESettings.ini", "Settings", "jamboTMextensionHack", "0") = 0 Then + LoopVar = 0 - LoopVar = 0 + While LoopVar < (Val(GetString(GetINIFileLocation(), header, "TotalTMsPlusHMs", ""))) = True - While LoopVar < 58 = True + If LoopVar > ((Val(GetString(GetINIFileLocation(), header, "TotalTMs", ""))) - 1) Then + TMHMList.Items.Add("HM" & LoopVar - 49 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((LoopVar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) - If LoopVar > 49 Then - TMHMList.Items.Add("HM" & LoopVar - 49 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((LoopVar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) + LoopVar = LoopVar + 1 - LoopVar = LoopVar + 1 + ElseIf LoopVar < 9 Then - ElseIf LoopVar < 9 Then + TMHMList.Items.Add("TM" & "0" & LoopVar + 1 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((LoopVar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) - TMHMList.Items.Add("TM" & "0" & LoopVar + 1 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((LoopVar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) + LoopVar = LoopVar + 1 + Else - LoopVar = LoopVar + 1 - Else - - TMHMList.Items.Add("TM" & LoopVar + 1 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((LoopVar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) + TMHMList.Items.Add("TM" & LoopVar + 1 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((LoopVar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) LoopVar = LoopVar + 1 End If End While - End If - If GetString(AppPath & "GBAPGESettings.ini", "Settings", "jamboTMextensionHack", "0") = 1 Then - MsgBox("I'm sorry but this does not support Jambo51's TM/HM hack yet.") - End If - - AttackList.Items.Clear() + AttackList.Items.Clear() LoopVar = 0 @@ -77,30 +70,28 @@ Public Class TMHMEditor TMHMList.Items.Clear() - If GetString(AppPath & "GBAPGESettings.ini", "Settings", "jamboTMextensionHack", "0") = 0 Then + loopvar = 0 - loopvar = 0 + While loopvar < (Val(GetString(GetINIFileLocation(), header, "TotalTMsPlusHMs", ""))) = True - While loopvar < 58 = True + If loopvar > ((Val(GetString(GetINIFileLocation(), header, "TotalTMs", ""))) - 1) Then + TMHMList.Items.Add("HM" & loopvar - 49 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((loopvar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) - If loopvar > 49 Then - TMHMList.Items.Add("HM" & loopvar - 49 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((loopvar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) + loopvar = loopvar + 1 - loopvar = loopvar + 1 + ElseIf loopvar < 9 Then - ElseIf loopvar < 9 Then + TMHMList.Items.Add("TM" & "0" & loopvar + 1 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((loopvar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) - TMHMList.Items.Add("TM" & "0" & loopvar + 1 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((loopvar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) + loopvar = loopvar + 1 + Else - loopvar = loopvar + 1 - Else + TMHMList.Items.Add("TM" & loopvar + 1 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((loopvar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) - TMHMList.Items.Add("TM" & loopvar + 1 & " - " & GetAttackName(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, TMHMAttacks + ((loopvar) * 2), 2))), System.Globalization.NumberStyles.HexNumber))) + loopvar = loopvar + 1 + End If + End While - loopvar = loopvar + 1 - End If - End While - End If TMHMList.SelectedIndex = indexbuf diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application index 98f2c29..29ef084 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - jWCwoT8KCqzZSq0pEsj8/y7AQ68= + eeix/XNm/75UjBZUSC4PG7KtJJc= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe index 2f7dedd..0f9ae6a 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 c291661..f6a6bcd 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - Tfc6DsWEYTXqAZ25cPAe2MLNbEw= + jvsSD/+8xa66jZyMoocFI2ZoJWU= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb index b1a2095..8ffe4af 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 98f2c29..29ef084 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application @@ -16,7 +16,7 @@ - jWCwoT8KCqzZSq0pEsj8/y7AQ68= + eeix/XNm/75UjBZUSC4PG7KtJJc= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest index c291661..f6a6bcd 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest @@ -43,14 +43,14 @@ - + - Tfc6DsWEYTXqAZ25cPAe2MLNbEw= + jvsSD/+8xa66jZyMoocFI2ZoJWU= diff --git a/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe index 2f7dedd..0f9ae6a 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/bin/Debug/ini/roms.ini b/GBAPokemonGameEditor/bin/Debug/ini/roms.ini index 5059f1e..3dccdcf 100644 --- a/GBAPokemonGameEditor/bin/Debug/ini/roms.ini +++ b/GBAPokemonGameEditor/bin/Debug/ini/roms.ini @@ -3,6 +3,8 @@ ROMName=Pok ItemData=3C5564 AttackNames=1F8320 TMData=376504 +TotalTMsPlusHMs=58 +TotalTMs=50 NumberOfItems=349 NumberOfAttacks=354 PokemonNames=1F716C @@ -96,6 +98,7 @@ FootPrintTable=3B4EE4 PokemonAttackTable=207BC8 PokemonEvolutions=203B68 TMHMCompatibility=1FD0F0 +TMHMLenPerPoke=8 EnemyYTable=1E7C74 PlayerYTable=1E9114 EnemyAltitudeTable=1ECB14 @@ -210,6 +213,8 @@ ROMName=Pok ItemData=3C55BC AttackNames=1F82B0 TMData=376494 +TotalTMsPlusHMs=58 +TotalTMs=50 NumberOfItems=349 NumberOfAttacks=354 PokemonNames=1F70FC @@ -303,6 +308,7 @@ FootPrintTable=3B4F3C PokemonAttackTable=207B58 PokemonEvolutions=203AF8 TMHMCompatibility=1FD080 +TMHMLenPerPoke=8 EnemyYTable= PlayerYTable= EnemyAltitudeTable= @@ -361,6 +367,8 @@ ROMName=Pok ItemData=3DB028 AttackNames=247094 TMData=45A80C +TotalTMsPlusHMs=58 +TotalTMs=50 ItemIMGData=3D4294 NumberOfItems=375 NumberOfAttacks=354 @@ -475,6 +483,7 @@ FootPrintTable=43FAB0 PokemonAttackTable=25D7B4 PokemonEvolutions=259754 TMHMCompatibility=252BC8 +TMHMLenPerPoke=8 MoveTutorCompatibility=459B7E EnemyYTable=2349CC PlayerYTable=235E6C @@ -528,6 +537,8 @@ ROMName=Pok ItemData=3DAE64 AttackNames=247070 TMData=45A22C +TotalTMsPlusHMs=58 +TotalTMs=50 ItemIMGData=3D40D0 NumberOfItems=375 NumberOfAttacks=354 @@ -642,6 +653,7 @@ FootPrintTable=43F8EC PokemonAttackTable=25D794 PokemonEvolutions=259734 TMHMCompatibility=252BA4 +TMHMLenPerPoke=8 MoveTutorCompatibility=459B9E EnemyYTable= PlayerYTable= @@ -693,6 +705,8 @@ ROMName=Pok ItemData=5839A0 AttackNames=31977C TMData=616040 +TotalTMsPlusHMs=58 +TotalTMs=50 ItemIMGData=614410 NumberOfItems=377 NumberOfAttacks=354 @@ -790,6 +804,7 @@ FootPrintTable=56E694 PokemonAttackTable=32937C PokemonEvolutions=32531C TMHMCompatibility=31E898 +TMHMLenPerPoke=8 MoveTutorCompatibility=615048 EnemyYTable=300D38 PlayerYTable=3021D8 diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache index 54f1643..cad7b40 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 98f2c29..29ef084 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - jWCwoT8KCqzZSq0pEsj8/y7AQ68= + eeix/XNm/75UjBZUSC4PG7KtJJc= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe index 2f7dedd..0f9ae6a 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 c291661..f6a6bcd 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - Tfc6DsWEYTXqAZ25cPAe2MLNbEw= + jvsSD/+8xa66jZyMoocFI2ZoJWU= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb index b1a2095..8ffe4af 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ diff --git a/roms.ini b/roms.ini index 5059f1e..3dccdcf 100644 --- a/roms.ini +++ b/roms.ini @@ -3,6 +3,8 @@ ROMName=Pok ItemData=3C5564 AttackNames=1F8320 TMData=376504 +TotalTMsPlusHMs=58 +TotalTMs=50 NumberOfItems=349 NumberOfAttacks=354 PokemonNames=1F716C @@ -96,6 +98,7 @@ FootPrintTable=3B4EE4 PokemonAttackTable=207BC8 PokemonEvolutions=203B68 TMHMCompatibility=1FD0F0 +TMHMLenPerPoke=8 EnemyYTable=1E7C74 PlayerYTable=1E9114 EnemyAltitudeTable=1ECB14 @@ -210,6 +213,8 @@ ROMName=Pok ItemData=3C55BC AttackNames=1F82B0 TMData=376494 +TotalTMsPlusHMs=58 +TotalTMs=50 NumberOfItems=349 NumberOfAttacks=354 PokemonNames=1F70FC @@ -303,6 +308,7 @@ FootPrintTable=3B4F3C PokemonAttackTable=207B58 PokemonEvolutions=203AF8 TMHMCompatibility=1FD080 +TMHMLenPerPoke=8 EnemyYTable= PlayerYTable= EnemyAltitudeTable= @@ -361,6 +367,8 @@ ROMName=Pok ItemData=3DB028 AttackNames=247094 TMData=45A80C +TotalTMsPlusHMs=58 +TotalTMs=50 ItemIMGData=3D4294 NumberOfItems=375 NumberOfAttacks=354 @@ -475,6 +483,7 @@ FootPrintTable=43FAB0 PokemonAttackTable=25D7B4 PokemonEvolutions=259754 TMHMCompatibility=252BC8 +TMHMLenPerPoke=8 MoveTutorCompatibility=459B7E EnemyYTable=2349CC PlayerYTable=235E6C @@ -528,6 +537,8 @@ ROMName=Pok ItemData=3DAE64 AttackNames=247070 TMData=45A22C +TotalTMsPlusHMs=58 +TotalTMs=50 ItemIMGData=3D40D0 NumberOfItems=375 NumberOfAttacks=354 @@ -642,6 +653,7 @@ FootPrintTable=43F8EC PokemonAttackTable=25D794 PokemonEvolutions=259734 TMHMCompatibility=252BA4 +TMHMLenPerPoke=8 MoveTutorCompatibility=459B9E EnemyYTable= PlayerYTable= @@ -693,6 +705,8 @@ ROMName=Pok ItemData=5839A0 AttackNames=31977C TMData=616040 +TotalTMsPlusHMs=58 +TotalTMs=50 ItemIMGData=614410 NumberOfItems=377 NumberOfAttacks=354 @@ -790,6 +804,7 @@ FootPrintTable=56E694 PokemonAttackTable=32937C PokemonEvolutions=32531C TMHMCompatibility=31E898 +TMHMLenPerPoke=8 MoveTutorCompatibility=615048 EnemyYTable=300D38 PlayerYTable=3021D8