diff --git a/script/format/NpcsFormat.go b/script/format/NpcsFormat.go index 9423f4c..58f78e3 100644 --- a/script/format/NpcsFormat.go +++ b/script/format/NpcsFormat.go @@ -58,6 +58,12 @@ func (f *Npcs) DecodeLine(data []byte) string { case PresentUnknown05: text.WriteString(utils.FormatByte(data[i])) i++ + case PresentUnknown06: + text.WriteString(utils.FormatByte(data[i])) + i++ + case TextWait: + text.WriteString(utils.FormatBytes(data[i : i+2])) + i += 2 case PresentResetAlignment: text.WriteString(utils.FormatByte(data[i])) i++ @@ -88,6 +94,9 @@ func (f *Npcs) DecodeLine(data []byte) string { case GetHardcodedValue: text.WriteString(utils.FormatBytes(data[i : i+3])) i += 3 + case PresentUnknown14: + text.WriteString(utils.FormatBytes(data[i : i+3])) + i += 3 case EvaluateExpression: tmp := bytes.NewBuffer(nil) tmp.WriteByte(data[i]) @@ -121,15 +130,21 @@ func (f *Npcs) DecodeLine(data []byte) string { tmp.WriteByte(data[i]) text.WriteString(utils.FormatBytes(tmp.Bytes())) i++ + case PresentUnknown16: + text.WriteString(utils.FormatBytes(data[i : i+3])) + i += 3 case PresentUnknown18: text.WriteString(utils.FormatByte(data[i])) i++ case AutoForward: - text.WriteString(utils.FormatByte(data[i])) - i++ + text.WriteString(utils.FormatBytes(data[i : i+3])) + i += 3 case AutoForward1A: - text.WriteString(utils.FormatByte(data[i])) - i++ + text.WriteString(utils.FormatBytes(data[i : i+3])) + i += 3 + case PresentUnknown1B: + text.WriteString(utils.FormatBytes(data[i : i+2])) + i += 2 case RubyCenterPerChar: text.WriteString(utils.FormatByte(data[i])) i++ diff --git a/script/format/NpcsPFormat.go b/script/format/NpcsPFormat.go index 353ec8a..5269a8a 100644 --- a/script/format/NpcsPFormat.go +++ b/script/format/NpcsPFormat.go @@ -53,6 +53,12 @@ func (f *NpcsP) DecodeLine(data []byte) string { case PresentUnknown05: text.WriteString(utils.FormatByte(data[i])) i++ + case PresentUnknown06: + text.WriteString(utils.FormatByte(data[i])) + i++ + case TextWait: + text.WriteString(utils.FormatBytes(data[i : i+2])) + i += 2 case PresentResetAlignment: text.WriteString(utils.FormatByte(data[i])) i++ @@ -83,6 +89,9 @@ func (f *NpcsP) DecodeLine(data []byte) string { case GetHardcodedValue: text.WriteString(utils.FormatBytes(data[i : i+3])) i += 3 + case PresentUnknown14: + text.WriteString(utils.FormatBytes(data[i : i+3])) + i += 3 case EvaluateExpression: tmp := bytes.NewBuffer(nil) tmp.WriteByte(data[i]) @@ -116,15 +125,21 @@ func (f *NpcsP) DecodeLine(data []byte) string { tmp.WriteByte(data[i]) text.WriteString(utils.FormatBytes(tmp.Bytes())) i++ + case PresentUnknown16: + text.WriteString(utils.FormatBytes(data[i : i+3])) + i += 3 case PresentUnknown18: text.WriteString(utils.FormatByte(data[i])) i++ case AutoForward: - text.WriteString(utils.FormatByte(data[i])) - i++ + text.WriteString(utils.FormatBytes(data[i : i+3])) + i += 3 case AutoForward1A: - text.WriteString(utils.FormatByte(data[i])) - i++ + text.WriteString(utils.FormatBytes(data[i : i+3])) + i += 3 + case PresentUnknown1B: + text.WriteString(utils.FormatBytes(data[i : i+2])) + i += 2 case RubyCenterPerChar: text.WriteString(utils.FormatByte(data[i])) i++ diff --git a/script/format/format.go b/script/format/format.go index dd3aa12..cb7ab2e 100644 --- a/script/format/format.go +++ b/script/format/format.go @@ -7,6 +7,8 @@ const ( Present = 0x03 SetColor = 0x04 PresentUnknown05 = 0x05 + PresentUnknown06 = 0x06 + TextWait = 0x07 PresentResetAlignment = 0x08 RubyBaseStart = 0x09 RubyTextStart = 0x0A @@ -17,10 +19,13 @@ const ( SetMarginTop = 0x11 SetMarginLeft = 0x12 GetHardcodedValue = 0x13 + PresentUnknown14 = 0x14 EvaluateExpression = 0x15 + PresentUnknown16 = 0x16 PresentUnknown18 = 0x18 AutoForward = 0x19 AutoForward1A = 0x1A + PresentUnknown1B = 0x1B RubyCenterPerChar = 0x1E AltLineBreak = 0x1F Terminator = 0xFF