From cf7a9f66748d6aad0ea23e9b425ed26f25244d90 Mon Sep 17 00:00:00 2001 From: MichaelHinrichs Date: Sat, 27 Jul 2024 16:04:27 -0500 Subject: [PATCH] Refactor Subdata function --- DataTypes.cs | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/DataTypes.cs b/DataTypes.cs index 419259e..1c41949 100644 --- a/DataTypes.cs +++ b/DataTypes.cs @@ -35,25 +35,30 @@ namespace RPG_Maker_LDB_Printer ContinueIndent(); GetInt(); OpenIndent(); - bool Data_end = false; - while (Data_end == false) - { - ContinueIndent(); - int subData = GetInt(); - if (subData == 0x00) - Data_end = true; - else if (PartID == 0x1D & data == 0x0A & subData == 0x01 | PartID == 0x20 & data == 0x0A & subData == 0x01 | PartID == 0x20 & data == 0x0A & subData == 0x02 | PartID == 0x20 & data == 0x0B & subData == 0x01 | PartID == 0x20 & data == 0x0B & subData == 0x02) - GetString(); - else - GetBytes(); - } + ReadSubdata(PartID, data); CloseIndent(); } CloseIndent(); } } - public static int GetInt() + public static void ReadSubdata(byte PartID, int data) + { + bool Data_end = false; + while (Data_end == false) + { + ContinueIndent(); + int subData = GetInt(); + if (subData == 0x00) + Data_end = true; + else if (PartID == 0x1D & data == 0x0A & subData == 0x01 | PartID == 0x20 & data == 0x0A & subData == 0x01 | PartID == 0x20 & data == 0x0A & subData == 0x02 | PartID == 0x20 & data == 0x0B & subData == 0x01 | PartID == 0x20 & data == 0x0B & subData == 0x02) + GetString(); + else + GetBytes(); + } + } + + public static int GetInt() { return Convert7BitHex(0); }