diff --git a/p2isPSX_CDToolkit/Additions.vb b/p2isPSX_CDToolkit/Additions.vb index dfb44d2..a1f812b 100644 --- a/p2isPSX_CDToolkit/Additions.vb +++ b/p2isPSX_CDToolkit/Additions.vb @@ -489,10 +489,13 @@ Partial Class Form1 Private Sub ConvertContact_Click(sender As Object, e As EventArgs) Handles ExportContact.Click + Dim baseDir = "D:\Games\PSX\Persona 2 - Batsu (NTSC-J) [SLPS-02825]\Export\UnRLE\" + Dim Dir = baseDir & If(CharContact.Checked, "0863_CharCONTC", "0864_DemnCONTC") + 'Dim Dir = baseDir & If(CharContact.Checked, " 0862_PersCONTC", "0864_DemnCONTC") + + Dim Japfiles = IO.Directory.GetFiles(Dir & "\SRC\", "*_U").ToList + Dim Engfiles = IO.Directory.GetFiles(Dir & "\SRC\", "*_E").ToList - Dim Japfiles = IO.Directory.GetFiles("D:\Games\PSX\Persona 2 - Batsu (NTSC-J) [SLPS-02825]\Export\UnRLE\0864_Btl_CONTC\SRC\", "*_U").ToList - Dim Engfiles = IO.Directory.GetFiles("D:\Games\PSX\Persona 2 - Batsu (NTSC-J) [SLPS-02825]\Export\UnRLE\0864_Btl_CONTC\SRC\", "*_E").ToList - Dim OutPut_Dir = "D:\Games\PSX\Persona 2 - Batsu (NTSC-J) [SLPS-02825]\Export\UnRLE\0864_Btl_CONTC\" Dim scr = New ScriptTools Dim cnt = 0 @@ -501,7 +504,8 @@ Partial Class Form1 Dim contact As String = scr.MakeContactExportFile(My.Computer.FileSystem.ReadAllBytes(fil), My.Computer.FileSystem.ReadAllBytes(Engfiles(Japfiles.IndexOf(fil))), cnt) - Dim filename = OutPut_Dir & Path.GetFileName(fil) & "_exp.txt" + Dim filename = Dir & "\" & Path.GetFileName(fil) & "_exp.txt" + Debug.WriteLine("Saving " & filename) My.Computer.FileSystem.WriteAllText(filename, contact, False) Next diff --git a/p2isPSX_CDToolkit/Form1.Designer.vb b/p2isPSX_CDToolkit/Form1.Designer.vb index 04037a0..1ebb9b5 100644 --- a/p2isPSX_CDToolkit/Form1.Designer.vb +++ b/p2isPSX_CDToolkit/Form1.Designer.vb @@ -201,6 +201,7 @@ Partial Class Form1 Me.Label25 = New System.Windows.Forms.Label() Me.CDEXTRApath = New System.Windows.Forms.TextBox() Me.SavePaths = New System.Windows.Forms.Button() + Me.CharContact = New System.Windows.Forms.CheckBox() Me.TabControl1.SuspendLayout() Me.ReplaceTextExecutes.SuspendLayout() Me.GroupBox11.SuspendLayout() @@ -1603,7 +1604,7 @@ Partial Class Form1 ' Me.GroupBox9.Controls.Add(Me.Convert_Summon) Me.GroupBox9.Controls.Add(Me.Summon_Export) - Me.GroupBox9.Location = New System.Drawing.Point(520, 557) + Me.GroupBox9.Location = New System.Drawing.Point(513, 630) Me.GroupBox9.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.GroupBox9.Name = "GroupBox9" Me.GroupBox9.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3) @@ -1634,6 +1635,7 @@ Partial Class Form1 ' 'GroupBox8 ' + Me.GroupBox8.Controls.Add(Me.CharContact) Me.GroupBox8.Controls.Add(Me.ConvertContactScript) Me.GroupBox8.Controls.Add(Me.ExportContact) Me.GroupBox8.Location = New System.Drawing.Point(513, 385) @@ -1647,17 +1649,17 @@ Partial Class Form1 ' 'ConvertContactScript ' - Me.ConvertContactScript.Location = New System.Drawing.Point(7, 91) + Me.ConvertContactScript.Location = New System.Drawing.Point(7, 129) Me.ConvertContactScript.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.ConvertContactScript.Name = "ConvertContactScript" - Me.ConvertContactScript.Size = New System.Drawing.Size(219, 61) + Me.ConvertContactScript.Size = New System.Drawing.Size(219, 28) Me.ConvertContactScript.TabIndex = 16 Me.ConvertContactScript.Text = "Convert TXTs to trnslCNT" Me.ConvertContactScript.UseVisualStyleBackColor = True ' 'ExportContact ' - Me.ExportContact.Location = New System.Drawing.Point(7, 25) + Me.ExportContact.Location = New System.Drawing.Point(8, 45) Me.ExportContact.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) Me.ExportContact.Name = "ExportContact" Me.ExportContact.Size = New System.Drawing.Size(219, 41) @@ -2191,6 +2193,19 @@ Partial Class Form1 Me.SavePaths.Text = "Save Path Settings" Me.SavePaths.UseVisualStyleBackColor = True ' + 'CharContact + ' + Me.CharContact.AutoSize = True + Me.CharContact.Checked = True + Me.CharContact.CheckState = System.Windows.Forms.CheckState.Checked + Me.CharContact.Location = New System.Drawing.Point(18, 22) + Me.CharContact.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3) + Me.CharContact.Name = "CharContact" + Me.CharContact.Size = New System.Drawing.Size(145, 20) + Me.CharContact.TabIndex = 5 + Me.CharContact.Text = "Character Contact" + Me.CharContact.UseVisualStyleBackColor = True + ' 'Form1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!) @@ -2256,6 +2271,7 @@ Partial Class Form1 Me.GroupBox6.ResumeLayout(False) Me.GroupBox9.ResumeLayout(False) Me.GroupBox8.ResumeLayout(False) + Me.GroupBox8.PerformLayout() Me.GroupBox5.ResumeLayout(False) Me.GroupBox5.PerformLayout() Me.GroupBox4.ResumeLayout(False) @@ -2449,4 +2465,5 @@ Partial Class Form1 Friend WithEvents CDEXTRApath As TextBox Friend WithEvents SavePaths As Button Friend WithEvents ID As DataGridViewTextBoxColumn + Friend WithEvents CharContact As CheckBox End Class diff --git a/p2isPSX_CDToolkit/ScriptTools.vb b/p2isPSX_CDToolkit/ScriptTools.vb index 9626308..b709b34 100644 --- a/p2isPSX_CDToolkit/ScriptTools.vb +++ b/p2isPSX_CDToolkit/ScriptTools.vb @@ -980,7 +980,9 @@ endlineTest: For Each b In fileHeader retString &= $"[" & b.ToString("X4") & "]" Next - retString = retString.Substring(0, retString.Length - 1) & vbCrLf + + 'retString = retString.Substring(0, retString.Length - 1) & vbCrLf + retString &= vbCrLf For a = 0 To japPointers.Count - 1 retString &= engText(a) & vbCrLf diff --git a/p2isPSX_CDToolkit/StringsOffsetEditorvb.vb b/p2isPSX_CDToolkit/StringsOffsetEditorvb.vb index a1e0a9b..c618308 100644 --- a/p2isPSX_CDToolkit/StringsOffsetEditorvb.vb +++ b/p2isPSX_CDToolkit/StringsOffsetEditorvb.vb @@ -644,6 +644,8 @@ simil: If Form1.OpenFileDialog1.ShowDialog <> DialogResult.OK Then Exit Sub Dim txt = Split(My.Computer.FileSystem.ReadAllText(Form1.OpenFileDialog1.FileName), vbCrLf) + txt = txt.Where(Function(s) Not s.Contains("\\")).ToArray() + ReDim Preserve txt(DataGridView1.Rows.Count - 1) For Each row In DataGridView1.Rows diff --git a/p2isPSX_CDToolkit/bin/Debug/FileDesc.txt b/p2isPSX_CDToolkit/bin/Debug/FileDesc.txt index ab18d3e..da0019a 100644 --- a/p2isPSX_CDToolkit/bin/Debug/FileDesc.txt +++ b/p2isPSX_CDToolkit/bin/Debug/FileDesc.txt @@ -860,9 +860,9 @@ BTalkCODE - - -Btl_CONTC +PersCONTC +CharCONTC +DemnCONTC Vid_Intro diff --git a/p2isPSX_CDToolkit/bin/Debug/p2epPSX_CDToolkit.exe b/p2isPSX_CDToolkit/bin/Debug/p2epPSX_CDToolkit.exe index 4f4f76d..3d21b72 100644 Binary files a/p2isPSX_CDToolkit/bin/Debug/p2epPSX_CDToolkit.exe and b/p2isPSX_CDToolkit/bin/Debug/p2epPSX_CDToolkit.exe differ