soundpacks support

2024-09-06 13:10:59 +05:00
parent 15c96c48b7
commit cc52ac29a8
12 changed files with 51 additions and 12 deletions
--- a/.vs/p2epPSX_CDToolkit/FileContentIndex/ba2250d9-e9e1-42ab-81f2-c923f6eaf9f1.vsidx
+++ b/.vs/p2epPSX_CDToolkit/FileContentIndex/ba2250d9-e9e1-42ab-81f2-c923f6eaf9f1.vsidx
--- a/.vs/p2epPSX_CDToolkit/FileContentIndex/e783bc7d-ab25-43b5-9b26-5c3a213adcd5.vsidx
+++ b/.vs/p2epPSX_CDToolkit/FileContentIndex/e783bc7d-ab25-43b5-9b26-5c3a213adcd5.vsidx
--- a/.vs/p2epPSX_CDToolkit/v17/.suo
+++ b/.vs/p2epPSX_CDToolkit/v17/.suo
--- a/.vs/p2epPSX_CDToolkit/v17/DocumentLayout.json
+++ b/.vs/p2epPSX_CDToolkit/v17/DocumentLayout.json
@@ -3,7 +3,15 @@
  "WorkspaceRootPath": "C:\\Users\\Sergey\\source\\repos\\p2epPSX_CDToolkit\\",
  "Documents": [
    {
-      "AbsoluteMoniker": "D:0:0:{E92973F5-DC31-4C53-B473-A203A0E6AA29}|p2isPSX_CDToolkit\\p2epPSX_CDToolkit.vbproj|c:\\users\\sergey\\source\\repos\\p2eppsx_cdtoolkit\\p2ispsx_cdtoolkit\\scripttools.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
+      "AbsoluteMoniker": "D:0:0:{E92973F5-DC31-4C53-B473-A203A0E6AA29}|p2isPSX_CDToolkit\\p2epPSX_CDToolkit.vbproj|c:\\users\\sergey\\source\\repos\\p2eppsx_cdtoolkit\\p2ispsx_cdtoolkit\\form1.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
+      "RelativeMoniker": "D:0:0:{E92973F5-DC31-4C53-B473-A203A0E6AA29}|p2isPSX_CDToolkit\\p2epPSX_CDToolkit.vbproj|solutionrelative:p2ispsx_cdtoolkit\\form1.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{E92973F5-DC31-4C53-B473-A203A0E6AA29}|p2isPSX_CDToolkit\\p2epPSX_CDToolkit.vbproj|C:\\Users\\Sergey\\source\\repos\\p2epPSX_CDToolkit\\p2ispsx_cdtoolkit\\rletools.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
+      "RelativeMoniker": "D:0:0:{E92973F5-DC31-4C53-B473-A203A0E6AA29}|p2isPSX_CDToolkit\\p2epPSX_CDToolkit.vbproj|solutionrelative:p2ispsx_cdtoolkit\\rletools.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{E92973F5-DC31-4C53-B473-A203A0E6AA29}|p2isPSX_CDToolkit\\p2epPSX_CDToolkit.vbproj|C:\\Users\\Sergey\\source\\repos\\p2epPSX_CDToolkit\\p2ispsx_cdtoolkit\\scripttools.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
      "RelativeMoniker": "D:0:0:{E92973F5-DC31-4C53-B473-A203A0E6AA29}|p2isPSX_CDToolkit\\p2epPSX_CDToolkit.vbproj|solutionrelative:p2ispsx_cdtoolkit\\scripttools.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
    }
  ],
@@ -14,24 +22,49 @@
      "DocumentGroups": [
        {
          "DockedWidth": 200,
-          "SelectedChildIndex": 1,
+          "SelectedChildIndex": 0,
          "Children": [
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}"
-            },
            {
              "$type": "Document",
              "DocumentIndex": 0,
+              "Title": "Form1.vb",
+              "DocumentMoniker": "C:\\Users\\Sergey\\source\\repos\\p2epPSX_CDToolkit\\p2isPSX_CDToolkit\\Form1.vb",
+              "RelativeDocumentMoniker": "p2isPSX_CDToolkit\\Form1.vb",
+              "ToolTip": "C:\\Users\\Sergey\\source\\repos\\p2epPSX_CDToolkit\\p2isPSX_CDToolkit\\Form1.vb",
+              "RelativeToolTip": "p2isPSX_CDToolkit\\Form1.vb",
+              "ViewState": "AQIAAMsAAAAAAAAAAAAiwOQAAAAAAAAA",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-06-25T15:02:18.439Z",
+              "IsPinned": true,
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 1,
+              "Title": "rleTools.vb",
+              "DocumentMoniker": "C:\\Users\\Sergey\\source\\repos\\p2epPSX_CDToolkit\\p2isPSX_CDToolkit\\rleTools.vb",
+              "RelativeDocumentMoniker": "p2isPSX_CDToolkit\\rleTools.vb",
+              "ToolTip": "C:\\Users\\Sergey\\source\\repos\\p2epPSX_CDToolkit\\p2isPSX_CDToolkit\\rleTools.vb",
+              "RelativeToolTip": "p2isPSX_CDToolkit\\rleTools.vb",
+              "ViewState": "AQIAAAAAAAAAAAAAAAAqwA4AAABHAAAA",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-06-25T14:57:54.21Z"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 2,
              "Title": "ScriptTools.vb",
              "DocumentMoniker": "C:\\Users\\Sergey\\source\\repos\\p2epPSX_CDToolkit\\p2isPSX_CDToolkit\\ScriptTools.vb",
              "RelativeDocumentMoniker": "p2isPSX_CDToolkit\\ScriptTools.vb",
              "ToolTip": "C:\\Users\\Sergey\\source\\repos\\p2epPSX_CDToolkit\\p2isPSX_CDToolkit\\ScriptTools.vb",
              "RelativeToolTip": "p2isPSX_CDToolkit\\ScriptTools.vb",
-              "ViewState": "AQIAAFoFAAAAAAAAAAAAAHgFAAAAAAAA",
+              "ViewState": "AQIAAJ8AAAAAAAAAAAAAALcAAABSAAAA",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
-              "WhenOpened": "2024-05-06T18:10:40.088Z",
-              "EditorCaption": ""
+              "WhenOpened": "2024-05-06T18:10:40.088Z"
            }
          ]
        }
--- a/p2isPSX_CDToolkit/Form1.vb
+++ b/p2isPSX_CDToolkit/Form1.vb
@@ -200,7 +200,7 @@ Public Class Form1
        type.Add("eof")
        type.Add("DATA")
        type.Add("IMAGE")
-        type.Add("SCR?")
+        type.Add("SND")
        If IsNothing(BinFile) Then Exit Sub

        For Each r In BinFile
@@ -214,7 +214,11 @@ Public Class Form1
                Case 0
                    SelBinFiles.Items.Add(r.SectorID & ":" & r.ID & " : " & type(r.Type) & xy & " : " & compr(r.Compr) & ", Sz: " & r.Size & " Gap: " & r.SectorGap)
                Case 1
-                    SelBinFiles.Items.Add(r.SectorID & ":" & r.ID & " : " & type(r.Type) & xy & " : " & compr(r.Compr) & ", Sz: " & r.Size & " unp:" & r.UnpackSize & " Gap: " & r.SectorGap)
+                    If r.Type <> 3 Then
+                        SelBinFiles.Items.Add(r.SectorID & ":" & r.ID & " : " & type(r.Type) & xy & " : " & compr(r.Compr) & ", Sz: " & r.Size & " unp:" & r.UnpackSize & " Gap: " & r.SectorGap)
+                    Else
+                        SelBinFiles.Items.Add(r.SectorID & ":" & r.ID & " : SNDPACK : " & compr(r.Compr) & ", Sz: " & r.Size & " Gap: " & r.SectorGap)
+                    End If
                Case 2
                    SelBinFiles.Items.Add(r.SectorID & ":" & r.ID & " : " & type(r.Type) & xy & " : " & compr(r.Compr) & ", Sz: " & r.Size & " unp:" & r.UnpackSize & " Gap: " & r.SectorGap)
                Case Else
--- a/p2isPSX_CDToolkit/bin/Debug/FileDesc.txt
+++ b/p2isPSX_CDToolkit/bin/Debug/FileDesc.txt
@@ -49,7 +49,7 @@ EVENTCODE

 GR_BTLSPR
 GRF_AVAS
-
+SND_PACK



--- a/p2isPSX_CDToolkit/bin/Debug/p2epPSX_CDToolkit.exe
+++ b/p2isPSX_CDToolkit/bin/Debug/p2epPSX_CDToolkit.exe
--- a/p2isPSX_CDToolkit/bin/Debug/p2epPSX_CDToolkit.pdb
+++ b/p2isPSX_CDToolkit/bin/Debug/p2epPSX_CDToolkit.pdb
--- a/p2isPSX_CDToolkit/obj/Debug/p2epPSX_CDToolkit.exe
+++ b/p2isPSX_CDToolkit/obj/Debug/p2epPSX_CDToolkit.exe
--- a/p2isPSX_CDToolkit/obj/Debug/p2epPSX_CDToolkit.pdb
+++ b/p2isPSX_CDToolkit/obj/Debug/p2epPSX_CDToolkit.pdb
--- a/p2isPSX_CDToolkit/obj/Debug/p2epPSX_CDToolkit.vbproj.GenerateResource.cache
+++ b/p2isPSX_CDToolkit/obj/Debug/p2epPSX_CDToolkit.vbproj.GenerateResource.cache
--- a/p2isPSX_CDToolkit/rleTools.vb
+++ b/p2isPSX_CDToolkit/rleTools.vb
@@ -16,6 +16,8 @@
        Dim readAddr = 12

        If readFile(0) = 2 Then readAddr = 16               'if picture
+        If readFile(0) = 3 Then readAddr = 20               'if bgm
+


        Dim mode As Byte