diff --git a/Gen5 Distribution Creator/Form1.vb b/Gen5 Distribution Creator/Form1.vb index 965a432..f99494d 100644 --- a/Gen5 Distribution Creator/Form1.vb +++ b/Gen5 Distribution Creator/Form1.vb @@ -137,22 +137,29 @@ Make sure you put the new lines(ENTER key)" Dim a = MsgB(msl, 2, Yes, No, "", tl) If a = 6 Then MsgBox("Can you select it for me?", 0) - OpenFileDialog1.Filter = "Event ROM (*.nds)|*.nds|All files (*.*)|*.*" - OpenFileDialog1.ShowDialog() - Dim myFile As String = OpenFileDialog1.FileName - Dim l = System.IO.File.ReadAllText(myFile) - If l.Contains("POKWBLIBERTYY8KP01") Then - If System.IO.File.Exists(apppath & "/ticket.nds") Then - System.IO.File.Delete(apppath & "/ticket.nds") - End If - System.IO.File.Copy(myFile, apppath & "/ticket.nds") - My.Settings.ticket = apppath & "/ticket.nds" - Else - MsgBox("Error: Invaild File", 0) + 'OpenFileDialog1.Filter = "Event ROM (*.nds)|*.nds|All files (*.*)|*.*" + Dim b As New OpenFileDialog '1.ShowDialog() + b.Filter = "Event ROM (*.nds)|*.nds|All files (*.*)|*.*" + Dim res As DialogResult = b.ShowDialog() + If res = Windows.Forms.DialogResult.Cancel Then Close() + Else + Dim myFile As String = b.FileName 'OpenFileDialog1.FileName + Dim l = System.IO.File.ReadAllText(myFile) + If l.Contains("POKWBLIBERTYY8KP01") Then + If System.IO.File.Exists(apppath & "/ticket.nds") Then + System.IO.File.Delete(apppath & "/ticket.nds") + End If + System.IO.File.Copy(myFile, apppath & "/ticket.nds") + My.Settings.ticket = apppath & "/ticket.nds" + Else + MsgBox("Error: Invaild File", 0) + Close() + End If End If ElseIf a = 7 Then MsgBox("Google is your friend.", 0) + Process.Start("https://www.google.com/search?q=pokemon+liberty+ticket+distribution+rom") Close() End If End If @@ -347,21 +354,28 @@ Make sure you put the new lines(ENTER key)" #End Region #Region "Settings" Private Sub Button1_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button1.Click - OpenFileDialog1.Filter = "Gen 5 Event Files (*.pgf)|*.pgf|All files (*.*)|*.*" - OpenFileDialog1.ShowDialog() - Dim myFile As String = OpenFileDialog1.FileName - Dim Fn() As String = myFile.Split("\") - Dim fn2 As String = Fn(UBound(Fn)) - Label2.Text = fn2 - RichTextBox1.Text = RichTextBox1.Text.Remove(8, 408) - Dim myBytes As Byte() = My.Computer.FileSystem.ReadAllBytes(myFile) - Dim txtTemp As New System.Text.StringBuilder() - For Each myByte As Byte In myBytes - txtTemp.Append(myByte.ToString("X2")) - Next - RichTextBox1.Text = RichTextBox1.Text.Insert(8, txtTemp.ToString()) - RichTextBox1.Text = RichTextBox1.Text.Remove(352, 8) - RichTextBox1.Text = RichTextBox1.Text.Insert(352, "00000000") + Dim b As New OpenFileDialog + b.Filter = "Gen 5 Event Files (*.pgf)|*.pgf|All files (*.*)|*.*" + Dim res As DialogResult = b.ShowDialog() + If res = Windows.Forms.DialogResult.Cancel Then + + Else + Dim myFile As String = b.FileName + Dim Fn() As String = myFile.Split("\") + Dim fn2 As String = Fn(UBound(Fn)) + Label2.Text = fn2 + RichTextBox1.Text = RichTextBox1.Text.Remove(8, 408) + Dim myBytes As Byte() = My.Computer.FileSystem.ReadAllBytes(myFile) + Dim txtTemp As New System.Text.StringBuilder() + For Each myByte As Byte In myBytes + txtTemp.Append(myByte.ToString("X2")) + Next + RichTextBox1.Text = RichTextBox1.Text.Insert(8, txtTemp.ToString()) + RichTextBox1.Text = RichTextBox1.Text.Remove(352, 8) + RichTextBox1.Text = RichTextBox1.Text.Insert(352, "00000000") + End If + 'OpenFileDialog1.Filter = "Gen 5 Event Files (*.pgf)|*.pgf|All files (*.*)|*.*" + 'OpenFileDialog1.ShowDialog() End Sub Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox1.CheckedChanged If CheckBox1.Checked = True Then diff --git a/Gen5 Distribution Creator/Form3.vb b/Gen5 Distribution Creator/Form3.vb index 25669fb..35da00b 100644 --- a/Gen5 Distribution Creator/Form3.vb +++ b/Gen5 Distribution Creator/Form3.vb @@ -49,27 +49,34 @@ Return s2 End Function Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click - OpenFileDialog1.Filter = "Gen 5 PKM Files (*.pk5)|*.pk5|All files (*.*)|*.*" - OpenFileDialog1.ShowDialog() - Dim myFile As String = OpenFileDialog1.FileName - Dim Fn() As String = myFile.Split("\") - Dim fn2 As String = Fn(UBound(Fn)) - Label2.Text = fn2 - Dim myBytes As Byte() = My.Computer.FileSystem.ReadAllBytes(myFile) - Dim txtTemp As New System.Text.StringBuilder() - For Each myByte As Byte In myBytes - txtTemp.Append(myByte.ToString("X2")) - Next - RichTextBox1.Text = txtTemp.ToString() - store() - RichTextBox1.Text = Nothing - construct() - GroupBox1.Enabled = True - TextBox1.Enabled = True - NumericUpDown1.Enabled = True - Label1.Enabled = True - Label3.Enabled = True - checks() + 'OpenFileDialog1.Filter = "Gen 5 PKM Files (*.pk5)|*.pk5|All files (*.*)|*.*" + 'OpenFileDialog1.ShowDialog() + Dim b As New OpenFileDialog + b.Filter = "Gen 5 PKM Files (*.pk5)|*.pk5|All files (*.*)|*.*" + Dim res As DialogResult = b.ShowDialog() + If res = Windows.Forms.DialogResult.Cancel Then + + Else + Dim myFile As String = b.FileName + Dim Fn() As String = myFile.Split("\") + Dim fn2 As String = Fn(UBound(Fn)) + Label2.Text = fn2 + Dim myBytes As Byte() = My.Computer.FileSystem.ReadAllBytes(myFile) + Dim txtTemp As New System.Text.StringBuilder() + For Each myByte As Byte In myBytes + txtTemp.Append(myByte.ToString("X2")) + Next + RichTextBox1.Text = txtTemp.ToString() + store() + RichTextBox1.Text = Nothing + construct() + GroupBox1.Enabled = True + TextBox1.Enabled = True + NumericUpDown1.Enabled = True + Label1.Enabled = True + Label3.Enabled = True + checks() + End If End Sub Private Function tgh(ByVal int As Integer, ByVal suplen As Integer) Dim gh As String = Hex(int) diff --git a/Gen5 Distribution Creator/bin/Debug/Gen 5 Pokémon Distribution ROM Creator.exe b/Gen5 Distribution Creator/bin/Debug/Gen 5 Pokémon Distribution ROM Creator.exe index a2aa413..5c342f2 100644 Binary files a/Gen5 Distribution Creator/bin/Debug/Gen 5 Pokémon Distribution ROM Creator.exe and b/Gen5 Distribution Creator/bin/Debug/Gen 5 Pokémon Distribution ROM Creator.exe differ diff --git a/Gen5 Distribution Creator/bin/Debug/Gen 5 Pokémon Distribution ROM Creator.pdb b/Gen5 Distribution Creator/bin/Debug/Gen 5 Pokémon Distribution ROM Creator.pdb index e1be83c..c10ef12 100644 Binary files a/Gen5 Distribution Creator/bin/Debug/Gen 5 Pokémon Distribution ROM Creator.pdb and b/Gen5 Distribution Creator/bin/Debug/Gen 5 Pokémon Distribution ROM Creator.pdb differ diff --git a/Gen5 Distribution Creator/bin/Release/Gen 5 Pokémon Distribution ROM Creator.exe b/Gen5 Distribution Creator/bin/Release/Gen 5 Pokémon Distribution ROM Creator.exe index 2a81879..19443ad 100644 Binary files a/Gen5 Distribution Creator/bin/Release/Gen 5 Pokémon Distribution ROM Creator.exe and b/Gen5 Distribution Creator/bin/Release/Gen 5 Pokémon Distribution ROM Creator.exe differ diff --git a/Gen5 Distribution Creator/bin/Release/Gen 5 Pokémon Distribution ROM Creator.pdb b/Gen5 Distribution Creator/bin/Release/Gen 5 Pokémon Distribution ROM Creator.pdb index 1725207..44c9325 100644 Binary files a/Gen5 Distribution Creator/bin/Release/Gen 5 Pokémon Distribution ROM Creator.pdb and b/Gen5 Distribution Creator/bin/Release/Gen 5 Pokémon Distribution ROM Creator.pdb differ diff --git a/Gen5 Distribution Creator/obj/Debug/Gen 5 Pokémon Distribution ROM Creator.exe b/Gen5 Distribution Creator/obj/Debug/Gen 5 Pokémon Distribution ROM Creator.exe index 25b82ef..250a7e8 100644 Binary files a/Gen5 Distribution Creator/obj/Debug/Gen 5 Pokémon Distribution ROM Creator.exe and b/Gen5 Distribution Creator/obj/Debug/Gen 5 Pokémon Distribution ROM Creator.exe differ diff --git a/Gen5 Distribution Creator/obj/Debug/Gen 5 Pokémon Distribution ROM Creator.pdb b/Gen5 Distribution Creator/obj/Debug/Gen 5 Pokémon Distribution ROM Creator.pdb index fa81aba..4583a0e 100644 Binary files a/Gen5 Distribution Creator/obj/Debug/Gen 5 Pokémon Distribution ROM Creator.pdb and b/Gen5 Distribution Creator/obj/Debug/Gen 5 Pokémon Distribution ROM Creator.pdb differ diff --git a/Gen5 Distribution Creator/obj/Release/Gen 5 Pokémon Distribution ROM Creator.exe b/Gen5 Distribution Creator/obj/Release/Gen 5 Pokémon Distribution ROM Creator.exe index b83a31f..eca0763 100644 Binary files a/Gen5 Distribution Creator/obj/Release/Gen 5 Pokémon Distribution ROM Creator.exe and b/Gen5 Distribution Creator/obj/Release/Gen 5 Pokémon Distribution ROM Creator.exe differ diff --git a/Gen5 Distribution Creator/obj/Release/Gen 5 Pokémon Distribution ROM Creator.pdb b/Gen5 Distribution Creator/obj/Release/Gen 5 Pokémon Distribution ROM Creator.pdb index 5b3e97f..f6ca9df 100644 Binary files a/Gen5 Distribution Creator/obj/Release/Gen 5 Pokémon Distribution ROM Creator.pdb and b/Gen5 Distribution Creator/obj/Release/Gen 5 Pokémon Distribution ROM Creator.pdb differ