Merge branch 'main' into fix/remove-padding-bytes-from-bdt-entry-read…

…er-output
soulsmods · Jul 21, 2024 · 999b662 · 999b662
2 parents 7236318 + d80c2e4
commit 999b662
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/crates/cli/src/extract.rs b/crates/cli/src/extract.rs
@@ -10,8 +10,6 @@ use fstools_formats::{bnd4::BND4, dcx::DcxHeader};
 use indicatif::{ParallelProgressIterator, ProgressStyle};
 use rayon::prelude::*;
 
-pub trait SyncError: Sync + Send + Error + Sized {}
-
 pub fn extract(
     dvd_bnd: &DvdBnd,
     recursive: bool,

diff --git a/crates/formats/src/msb/point.rs b/crates/formats/src/msb/point.rs
@@ -301,13 +301,13 @@ pub struct PointDataMessage {
     pub unk2: I16<LE>,
     // Seems to always be true/false? Could be a single byte with some padding?
     pub hidden: U32<LE>,
-    pub unk8: I32<LE>,
+    pub item_lot: I32<LE>,
     pub unkc: U32<LE>,
     pub event_flag: I32<LE>,
-    pub unk14: I32<LE>,
-    pub unk18: I32<LE>,
-    pub unk1c: I32<LE>,
-    pub unk20: I32<LE>,
+    pub character_model_id: I32<LE>,
+    pub npc_param_id: I32<LE>,
+    pub animation_id: I32<LE>,
+    pub chara_init_param_id: I32<LE>,
 }
 
 #[derive(FromZeroes, FromBytes, Debug)]