Syncing changes

I finished porting the code for saving the cry but there is an error. I will need to debug it.
Gamer2020 · Oct 5, 2016 · 305542d · 305542d
1 parent 0464065
commit 305542d
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 30 deletions.
diff --git a/GBAPokemonGameEditor.v12.suo b/GBAPokemonGameEditor.v12.suo
diff --git a/GBAPokemonGameEditor/CryFunctions.vb b/GBAPokemonGameEditor/CryFunctions.vb
@@ -308,7 +308,7 @@ Module CryFunctions
     End Function
 
 
-    Public Function SaveCry(crytosave As Cry, index As Integer, cryTable As Integer) As Boolean
+    Public Function SaveCry(crytosave As Cry, cryTable As Integer) As Boolean
 
         If crytosave.Offset = 0 Then
             Return False
@@ -447,6 +447,18 @@ Module CryFunctions
         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)))
+        WriteHEX(LoadedROM, crytosave.Offset + 8, ReverseHEX(VB.Right("00000000" & (crytosave.LoopStart), 8)))
+        WriteHEX(LoadedROM, crytosave.Offset + 12, ReverseHEX(VB.Right("00000000" & (crytosave.Data.Length - 1), 8)))
+
+        Dim tempbuff As String = ByteArrayToHexString(data.ToArray)
+
+        WriteHEX(LoadedROM, crytosave.Offset + 16, tempbuff)
+
+        ' write cry table entry
+
+        WriteHEX(LoadedROM, cryTable + (crytosave.Index * 12), ReverseHEX(If(crytosave.Compressed, "00003C20", "00003C00")))
+        WriteHEX(LoadedROM, cryTable + (crytosave.Index * 12) + 4, ReverseHEX(VB.Right("00000000" & Hex(crytosave.Offset), 8)))
+        WriteHEX(LoadedROM, cryTable + (crytosave.Index * 12) + 8, "FF00FF")
 
 
         'rom.WriteUInt16(CUShort(If(Cry.Compressed, 1, 0)))

diff --git a/GBAPokemonGameEditor/Pokemonedit.vb b/GBAPokemonGameEditor/Pokemonedit.vb
@@ -3882,6 +3882,8 @@ Public Class Pokemonedit
 
             crynorm = ImportCry(fileOpenDialog.FileName, crynorm)
 
+            SaveCry(crynorm, CryTable)
+
             'ImportPokemonFootPrint(fileOpenDialog.FileName, PKMNames.SelectedIndex + 1)
 
             'GetAndDrawPokemonFootPrint(PictureBox1, PKMNames.SelectedIndex + 1)

diff --git 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>Izv0zXWPp1tqdp3oXwU3tQbslihM2iE6MjFNGQm/2oE=</dsig:DigestValue>
+        <dsig:DigestValue>SWVuezIHBPTuAeS/j788fYBxHreKTXtB4r0nWC9J9Rg=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
diff --git 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="1985024">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2027520">
       <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>fGhjD86B3cOpBpAg6ac2Qrho9Oy8pU3yWepRTqLC4dQ=</dsig:DigestValue>
+        <dsig:DigestValue>qv5nn/8i73OvsP4Tne8cSEIKuLaHnBDT/UlQuY1qLM4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
diff --git 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>Izv0zXWPp1tqdp3oXwU3tQbslihM2iE6MjFNGQm/2oE=</dsig:DigestValue>
+        <dsig:DigestValue>SWVuezIHBPTuAeS/j788fYBxHreKTXtB4r0nWC9J9Rg=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe
diff --git 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="1985024">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2027520">
       <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>fGhjD86B3cOpBpAg6ac2Qrho9Oy8pU3yWepRTqLC4dQ=</dsig:DigestValue>
+        <dsig:DigestValue>qv5nn/8i73OvsP4Tne8cSEIKuLaHnBDT/UlQuY1qLM4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.xml b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.xml
@@ -6,21 +6,19 @@ PokemonGameEditor
 </name>
 </assembly>
 <members>
-<member name="T:PokemonGameEditor.My.Resources.Resources">
-<summary>
-  A strongly-typed resource class, for looking up localized strings, etc.
-</summary>
-</member>
 <member name="P:PokemonGameEditor.My.Resources.Resources.ResourceManager">
-<summary>
+	<summary>
   Returns the cached ResourceManager instance used by this class.
 </summary>
-</member>
-<member name="P:PokemonGameEditor.My.Resources.Resources.Culture">
-<summary>
+</member><member name="P:PokemonGameEditor.My.Resources.Resources.Culture">
+	<summary>
   Overrides the current thread's CurrentUICulture property for all
   resource lookups using this strongly typed resource class.
 </summary>
+</member><member name="T:PokemonGameEditor.My.Resources.Resources">
+	<summary>
+  A strongly-typed resource class, for looking up localized strings, etc.
+</summary>
 </member>
 </members>
-</doc>
+</doc>
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt
@@ -220,3 +220,4 @@ D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor
 D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.exe
 D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.xml
 D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.pdb
+D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
diff --git 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>Izv0zXWPp1tqdp3oXwU3tQbslihM2iE6MjFNGQm/2oE=</dsig:DigestValue>
+        <dsig:DigestValue>SWVuezIHBPTuAeS/j788fYBxHreKTXtB4r0nWC9J9Rg=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
diff --git 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="1985024">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2027520">
       <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>fGhjD86B3cOpBpAg6ac2Qrho9Oy8pU3yWepRTqLC4dQ=</dsig:DigestValue>
+        <dsig:DigestValue>qv5nn/8i73OvsP4Tne8cSEIKuLaHnBDT/UlQuY1qLM4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.xml b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.xml
@@ -6,21 +6,19 @@ PokemonGameEditor
 </name>
 </assembly>
 <members>
-<member name="T:PokemonGameEditor.My.Resources.Resources">
-<summary>
-  A strongly-typed resource class, for looking up localized strings, etc.
-</summary>
-</member>
 <member name="P:PokemonGameEditor.My.Resources.Resources.ResourceManager">
-<summary>
+	<summary>
   Returns the cached ResourceManager instance used by this class.
 </summary>
-</member>
-<member name="P:PokemonGameEditor.My.Resources.Resources.Culture">
-<summary>
+</member><member name="P:PokemonGameEditor.My.Resources.Resources.Culture">
+	<summary>
   Overrides the current thread's CurrentUICulture property for all
   resource lookups using this strongly typed resource class.
 </summary>
+</member><member name="T:PokemonGameEditor.My.Resources.Resources">
+	<summary>
+  A strongly-typed resource class, for looking up localized strings, etc.
+</summary>
 </member>
 </members>
-</doc>
+</doc>