Disabled cry importing.

I've disabledcry importing. I can't seem to get it to work so I will come back to it.
2026-04-24 07:06:58 -05:00 · 2016-10-09 20:02:07 -05:00 · 2016-10-09 20:02:07 -05:00 · ab837627a2
commit ab837627a2
parent 305542d382
16 changed files with 42 additions and 18 deletions
--- a/GBAPokemonGameEditor.v12.suo
+++ b/GBAPokemonGameEditor.v12.suo
--- a/GBAPokemonGameEditor/CryFunctions.vb
+++ b/GBAPokemonGameEditor/CryFunctions.vb
@ -354,17 +354,32 @@ Module CryFunctions
                Dim i As Integer = n * &H40
                Dim k As Integer = 0

-                ' set first value
-                blocks(n)(System.Math.Max(System.Threading.Interlocked.Increment(k), k - 1)) = CByte(crytosave.Data(i))
-                Dim pcm As SByte = crytosave.Data(System.Math.Max(System.Threading.Interlocked.Increment(i), i - 1))
+                If i < crytosave.Data.Length Then
+                    ' set first value
+                    blocks(n)(k) = BitConverter.GetBytes(crytosave.Data(i))(0)
+                End If
+
+                k = k + 1
+
+                Dim pcm As SByte
+
+                If i < crytosave.Data.Length Then
+
+                    pcm = crytosave.Data(i)
+
+                End If
+
+                i = i + 1

                Dim j As Integer = 1
-                While j < &H40 AndAlso i < crytosave.Data.Length
+                While j < &H40 And i < crytosave.Data.Length
                    ' get current sample
-                    Dim sample = crytosave.Data(System.Math.Max(System.Threading.Interlocked.Increment(i), i - 1))
+                    Dim sample As SByte = crytosave.Data(i)
+
+                    i = i + 1

                    ' difference between previous sample and this
-                    Dim diff = sample - pcm
+                    Dim diff As Integer = sample - pcm

                    ' check for a perfect match in lookup table
                    Dim lookupI = -1
@ -377,9 +392,9 @@ Module CryFunctions

                    ' search for the closest match in the table
                    If lookupI = -1 Then
-                        Dim bestDiff = 255
+                        Dim bestDiff As Integer = 255
                        For x As Integer = 0 To 15
-                            If Math.Abs(lookup(x) - diff) < bestDiff Then
+                            If Math.Abs(CInt(lookup(x)) - diff) < bestDiff Then
                                lookupI = x
                                bestDiff = Math.Abs(lookup(x) - diff)
                            End If
@ -391,7 +406,10 @@ Module CryFunctions
                    If j Mod 2 = 0 Then
                        blocks(n)(k) = blocks(n)(k) Or CByte(lookupI << 4)
                    Else
-                        blocks(n)(System.Math.Max(System.Threading.Interlocked.Increment(k), k - 1)) = blocks(n)(System.Math.Max(System.Threading.Interlocked.Increment(k), k - 1)) Or CByte(lookupI)
+                        blocks(n)(k) = blocks(n)(k) Or CByte(lookupI)
+
+                        k = k + 1
+
                    End If

                    ' set previous
--- a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj
+++ b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj
@ -47,6 +47,7 @@
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
    <UseVSHostingProcess>true</UseVSHostingProcess>
    <Prefer32Bit>false</Prefer32Bit>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
--- a/GBAPokemonGameEditor/Pokemonedit.Designer.vb
+++ b/GBAPokemonGameEditor/Pokemonedit.Designer.vb
@ -2495,6 +2495,7 @@ Partial Class Pokemonedit
        '
        'Button36
        '
+        Me.Button36.Enabled = False
        Me.Button36.Location = New System.Drawing.Point(299, 211)
        Me.Button36.Name = "Button36"
        Me.Button36.Size = New System.Drawing.Size(75, 33)
@ -2532,6 +2533,7 @@ Partial Class Pokemonedit
        'chkCompressed2
        '
        Me.chkCompressed2.AutoSize = True
+        Me.chkCompressed2.Enabled = False
        Me.chkCompressed2.Location = New System.Drawing.Point(25, 189)
        Me.chkCompressed2.Name = "chkCompressed2"
        Me.chkCompressed2.Size = New System.Drawing.Size(109, 21)
@ -2635,6 +2637,7 @@ Partial Class Pokemonedit
        '
        'Button33
        '
+        Me.Button33.Enabled = False
        Me.Button33.Location = New System.Drawing.Point(299, 211)
        Me.Button33.Name = "Button33"
        Me.Button33.Size = New System.Drawing.Size(75, 33)
@ -2654,6 +2657,7 @@ Partial Class Pokemonedit
        'chkCompressed1
        '
        Me.chkCompressed1.AutoSize = True
+        Me.chkCompressed1.Enabled = False
        Me.chkCompressed1.Location = New System.Drawing.Point(23, 184)
        Me.chkCompressed1.Name = "chkCompressed1"
        Me.chkCompressed1.Size = New System.Drawing.Size(109, 21)
@ -3007,6 +3011,7 @@ Partial Class Pokemonedit
        '
        'Button39
        '
+        Me.Button39.Enabled = False
        Me.Button39.Location = New System.Drawing.Point(11, 576)
        Me.Button39.Margin = New System.Windows.Forms.Padding(4)
        Me.Button39.Name = "Button39"
--- 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>SWVuezIHBPTuAeS/j788fYBxHreKTXtB4r0nWC9J9Rg=</dsig:DigestValue>
+        <dsig:DigestValue>O3wBXsjQsev5Z8J1i/0BQisAwnt0Rujg1VVbKEaBucA=</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="2027520">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2028032">
      <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>qv5nn/8i73OvsP4Tne8cSEIKuLaHnBDT/UlQuY1qLM4=</dsig:DigestValue>
+        <dsig:DigestValue>Fy/93fmn8gghe1sGv6k4oQPba92JQ9FGEqm8TVLLJU0=</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>SWVuezIHBPTuAeS/j788fYBxHreKTXtB4r0nWC9J9Rg=</dsig:DigestValue>
+        <dsig:DigestValue>O3wBXsjQsev5Z8J1i/0BQisAwnt0Rujg1VVbKEaBucA=</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="2027520">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2028032">
      <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>qv5nn/8i73OvsP4Tne8cSEIKuLaHnBDT/UlQuY1qLM4=</dsig:DigestValue>
+        <dsig:DigestValue>Fy/93fmn8gghe1sGv6k4oQPba92JQ9FGEqm8TVLLJU0=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
+++ b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
--- 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>SWVuezIHBPTuAeS/j788fYBxHreKTXtB4r0nWC9J9Rg=</dsig:DigestValue>
+        <dsig:DigestValue>O3wBXsjQsev5Z8J1i/0BQisAwnt0Rujg1VVbKEaBucA=</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="2027520">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2028032">
      <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>qv5nn/8i73OvsP4Tne8cSEIKuLaHnBDT/UlQuY1qLM4=</dsig:DigestValue>
+        <dsig:DigestValue>Fy/93fmn8gghe1sGv6k4oQPba92JQ9FGEqm8TVLLJU0=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb