Fix scene export error

petfriendamy · Dec 18, 2024 · 56424be · 56424be
1 parent a9ad21e
commit 56424be
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/src/FFText.cs b/src/FFText.cs
@@ -21,7 +21,7 @@ public class FFText : IComparable
             '∞', '±', '≤', '≥', '¥', 'µ', '∂', 'Σ', 'Π', 'π', '⌡', 'ª', 'º', 'Ω', 'æ', 'ø',
             '¿', '¡', '¬', '√', 'ƒ', '≈', '∆', '«', '»', '…', '?', 'À', 'Ã', 'Õ', 'Œ', 'œ',
             '–', '—', '“', '”', '‘', '’', '÷', '◊', 'ÿ', 'Ÿ', '⁄', '¤', '‹', '›', 'ﬁ', 'ﬂ',
-            '■', '▪', '‚', '„', '‰', 'Â', 'Ê', 'Ë', 'Á', 'È', 'í', 'î', 'ï', 'ì', 'Ó', 'Ô',
+            '■', '▪', '‚', '„', '‰', 'Â', 'Ê', 'Ë', 'Á', 'È', 'Í', 'Î', 'Ï', 'Ì', 'Ó', 'Ô',
             ' ', 'Ò', 'Ù', 'Û'
         }.AsReadOnly();
 
@@ -207,6 +207,7 @@ public byte[] GetBytes(ParameterTypes type = ParameterTypes.String)
             switch (type)
             {
                 case ParameterTypes.OneByte:
+                case ParameterTypes.ReadWrite:
                     singleByte[0] = (byte)ToInt();
                     return singleByte;
                 case ParameterTypes.TwoByte:

diff --git a/src/KernelEditor/KernelChunkExportForm.cs b/src/KernelEditor/KernelChunkExportForm.cs
@@ -11,8 +11,8 @@ public KernelChunkExportForm(Kernel kernel)
         {
             InitializeComponent();
             this.kernel = kernel;
-            checkBoxes = new CheckBox[Kernel.SECTION_COUNT]
-            {
+            checkBoxes =
+            [
                 checkBoxChunk1, checkBoxChunk2, checkBoxChunk3, checkBoxChunk4,
                 checkBoxChunk5, checkBoxChunk6, checkBoxChunk7, checkBoxChunk8,
                 checkBoxChunk9, checkBoxChunk10, checkBoxChunk11, checkBoxChunk12,
@@ -21,7 +21,7 @@ public KernelChunkExportForm(Kernel kernel)
                 checkBoxChunk21, checkBoxChunk22, checkBoxChunk23, checkBoxChunk24,
                 checkBoxChunk25, checkBoxChunk26, checkBoxChunk27
 
-            };
+            ];
         }
 
         private void KernelChunkExportForm_Load(object sender, EventArgs e)

diff --git a/src/SceneEditor/Scene.cs b/src/SceneEditor/Scene.cs
@@ -457,15 +457,15 @@ public byte[] GetRawData()
                         {
                             atk = AttackList[i];
                             if (atk == null) { writer.Write(HexParser.NULL_OFFSET_16_BIT); }
-                            else { writer.Write(atk.Index); }
+                            else { writer.Write((ushort)atk.Index); }
                         }
                         for (i = 0; i < ATTACK_COUNT; ++i)
                         {
                             atk = AttackList[i];
                             if (atk == null) { writer.Write(HexParser.GetNullBlock(NAME_LENGTH)); }
                             else
                             {
-                                writer.Write(new FFText(atk.Name, NAME_LENGTH).GetBytes());
+                                writer.Write(new FFText(atk.Name).GetBytes(NAME_LENGTH));
                             }
                         }
                     }
@@ -535,8 +535,8 @@ public byte[] GetRawData()
                 }
 
                 //return a copy of the newly updated data
-                var copy = new byte[rawData.Length];
-                Array.Copy(rawData, copy, rawData.Length);
+                var copy = new byte[UNCOMPRESSED_BLOCK_SIZE];
+                Array.Copy(rawData, copy, UNCOMPRESSED_BLOCK_SIZE);
                 return copy;
             }
             catch (Exception ex)

diff --git a/src/SceneEditor/SceneExportForm.cs b/src/SceneEditor/SceneExportForm.cs
@@ -77,6 +77,7 @@ private async void buttonExport_Click(object sender, EventArgs e)
                         {
                             groupBoxExport.Enabled = false;
                             buttonExport.Enabled = false;
+                            processing = true;
                             await ExportScene(selectedScene, path);
                             progressBarSaving.Value = 100;
                             success = true;
@@ -122,6 +123,8 @@ private async void buttonExport_Click(object sender, EventArgs e)
                 catch (Exception ex)
                 {
                     MessageBox.Show(ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    groupBoxExport.Enabled = true;
+                    buttonExport.Enabled = true;
                     progressBarSaving.Value = 0;
                     processing = false;
                 }