Syncing changes

syncing so I can work on my PC.
2026-08-24 03:14:34 -05:00 · 2016-10-03 20:29:20 -04:00
parent af200e8a02
commit 0464065e5a
14 changed files with 36 additions and 29 deletions
--- a/.vs/GBAPokemonGameEditor/v14/.suo
+++ b/.vs/GBAPokemonGameEditor/v14/.suo
--- a/GBAPokemonGameEditor/CryFunctions.vb
+++ b/GBAPokemonGameEditor/CryFunctions.vb
@@ -2,6 +2,7 @@
 Imports System.IO
 Imports System.Text
 Imports System.Media
+Imports VB = Microsoft.VisualBasic

 'These functions are based off the ones found in this project: https://github.com/doom-desire/Cry-Editor
 'Credit goes to doom-desire for these functions.
@@ -440,28 +441,34 @@ Module CryFunctions

        End If

-            '' write cry
-            'rom.Seek(Cry.Offset)
-            'rom.WriteUInt16(CUShort(If(Cry.Compressed, 1, 0)))
-            'rom.WriteUInt16(CUShort(If(Cry.Looped, &H4000, 0)))
-            'rom.WriteInt32(Cry.SampleRate << 10)
-            'rom.WriteInt32(Cry.LoopStart)
-            'rom.WriteInt32(Cry.Data.Length - 1)
-            'rom.WriteBytes(data.ToArray())
+        ' write cry

-            '' write cry table entry
-            'rom.Seek(cryTable + Cry.Index * 12)
-            'rom.WriteUInt32(If(Cry.Compressed, &H3C20UI, &H3C00UI))
-            'rom.WritePointer(Cry.Offset)
-            'rom.WriteUInt32(&HFF00FFUI)

-            '' write growl table entry
-            'rom.Seek(growlTable + Cry.Index * 12)
-            'rom.WriteUInt32(If(Cry.Compressed, &H3C30UI, &H3C00UI))
-            '' !!! not sure if 00 should be used for uncompressed
-            'rom.WritePointer(Cry.Offset)
-            'rom.WriteUInt32(&HFF00FFUI)
-            Return True
+        WriteHEX(LoadedROM, crytosave.Offset, ReverseHEX(VB.Right("0000" & CUShort(If(crytosave.Compressed, 1, 0)), 4)))
+        WriteHEX(LoadedROM, crytosave.Offset + 2, ReverseHEX(VB.Right("0000" & CUShort(If(crytosave.Looped, &H4000, 0)), 4)))
+        WriteHEX(LoadedROM, crytosave.Offset + 4, ReverseHEX(VB.Right("00000000" & (crytosave.SampleRate << 10), 8)))
+
+
+        'rom.WriteUInt16(CUShort(If(Cry.Compressed, 1, 0)))
+        'rom.WriteUInt16(CUShort(If(Cry.Looped, &H4000, 0)))
+        'rom.WriteInt32(Cry.SampleRate << 10)
+        'rom.WriteInt32(Cry.LoopStart)
+        'rom.WriteInt32(Cry.Data.Length - 1)
+        'rom.WriteBytes(data.ToArray())
+
+        '' write cry table entry
+        'rom.Seek(cryTable + Cry.Index * 12)
+        'rom.WriteUInt32(If(Cry.Compressed, &H3C20UI, &H3C00UI))
+        'rom.WritePointer(Cry.Offset)
+        'rom.WriteUInt32(&HFF00FFUI)
+
+        '' write growl table entry
+        'rom.Seek(growlTable + Cry.Index * 12)
+        'rom.WriteUInt32(If(Cry.Compressed, &H3C30UI, &H3C00UI))
+        '' !!! not sure if 00 should be used for uncompressed
+        'rom.WritePointer(Cry.Offset)
+        'rom.WriteUInt32(&HFF00FFUI)
+        Return True
    End Function

 End Module
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
@@ -16,7 +16,7 @@
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>tDu5LpY+dmIhMHbSR+lkoM/qzfx1yuosJ/hxST2klN0=</dsig:DigestValue>
+        <dsig:DigestValue>Izv0zXWPp1tqdp3oXwU3tQbslihM2iE6MjFNGQm/2oE=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
@@ -43,14 +43,14 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="1986560">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="1985024">
      <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>IYGcSk+w8m60V7xbRTj4cQ836mvY5mAH8nVzaC8aupM=</dsig:DigestValue>
+        <dsig:DigestValue>fGhjD86B3cOpBpAg6ac2Qrho9Oy8pU3yWepRTqLC4dQ=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
@@ -16,7 +16,7 @@
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>tDu5LpY+dmIhMHbSR+lkoM/qzfx1yuosJ/hxST2klN0=</dsig:DigestValue>
+        <dsig:DigestValue>Izv0zXWPp1tqdp3oXwU3tQbslihM2iE6MjFNGQm/2oE=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
@@ -43,14 +43,14 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="1986560">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="1985024">
      <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>IYGcSk+w8m60V7xbRTj4cQ836mvY5mAH8nVzaC8aupM=</dsig:DigestValue>
+        <dsig:DigestValue>fGhjD86B3cOpBpAg6ac2Qrho9Oy8pU3yWepRTqLC4dQ=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe
+++ b/GBAPokemonGameEditor/bin/Debug/app.publish/PokemonGameEditor.exe
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
+++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
@@ -16,7 +16,7 @@
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>tDu5LpY+dmIhMHbSR+lkoM/qzfx1yuosJ/hxST2klN0=</dsig:DigestValue>
+        <dsig:DigestValue>Izv0zXWPp1tqdp3oXwU3tQbslihM2iE6MjFNGQm/2oE=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
@@ -43,14 +43,14 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="1986560">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="1985024">
      <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>IYGcSk+w8m60V7xbRTj4cQ836mvY5mAH8nVzaC8aupM=</dsig:DigestValue>
+        <dsig:DigestValue>fGhjD86B3cOpBpAg6ac2Qrho9Oy8pU3yWepRTqLC4dQ=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb