more stuff

enmacompat/src/area.rs

@@ -1,8 +1,8 @@
 use crate::{
-    dist_cell::read_dist_cells,
+    dist_cell::{read_dist_cells, EnmaDistTableCell},
     lane::EnmaLaneCell,
-    non_guard::EnmaNonGuardCell,
     section::{read_bank_cell, EnmaBankCell, EnmaSection},
+    sign::EnmaSignCell,
     speed::EnmaSpeedCell,
     windows_pe::WindowsPEFile,
     zebra::EnmaZebraCell,
@@ -72,6 +72,11 @@ pub fn read_area(file: &WindowsPEFile, address: u64) -> Result<EnmaArea, std::io
         non_guard_right: read_dist_cells(file, area.non_guard_right_addr, area.max_dist, false)?,
         speed: read_dist_cells(file, area.speed_addr, area.max_dist, true)?,
         lane: read_dist_cells(file, area.lane_addr, area.max_dist, true)?,
+        non_lane_change: read_dist_cells(file, area.non_lane_change_addr, area.max_dist, false)?,
+        signs: read_dist_cells(file, area.signs_addr, area.max_dist, false)?,
+        notices: read_dist_cells(file, area.notices_addr, area.max_dist, false)?,
+        watches: read_dist_cells(file, area.watches_addr, area.max_dist, false)?,
+        on_comers: read_dist_cells(file, area.on_comers_addr, area.max_dist, false)?,
     })
 }
 
@@ -90,10 +95,17 @@ pub struct EnmaArea {
     pub zebra_left: Vec<EnmaZebraCell>,
     pub zebra_right: Vec<EnmaZebraCell>,
     pub gaps: Vec<f32>,
-    pub non_guard_left: Vec<EnmaNonGuardCell>,
-    pub non_guard_right: Vec<EnmaNonGuardCell>,
+    pub non_guard_left: Vec<EnmaDistTableCell>,
+    pub non_guard_right: Vec<EnmaDistTableCell>,
     pub speed: Vec<EnmaSpeedCell>,
     pub lane: Vec<EnmaLaneCell>,
+    // TODO: other
+    pub non_lane_change: Vec<EnmaDistTableCell>,
+    pub signs: Vec<EnmaSignCell>,
+    pub notices: Vec<EnmaDistTableCell>,
+    pub watches: Vec<EnmaDistTableCell>,
+    pub on_comers: Vec<EnmaDistTableCell>,
+    // TODO: pillers
 }
 
 #[derive(BinRead, Debug)]

enmacompat/src/dist_cell.rs

@@ -1,6 +1,6 @@
-use binrw::BinRead;
-
 use crate::windows_pe::WindowsPEFile;
+use binrw::BinRead;
+use serde::Serialize;
 
 pub trait EnmaDistCell {
     fn dist(&self) -> f32;
@@ -17,13 +17,20 @@ impl EnmaDistCell for f32 {
     }
 }
 
-impl EnmaDistCell for (f32, i32) {
+#[derive(Debug, BinRead, Serialize)]
+pub struct EnmaDistTableCell {
+    pub dist: f32,
+    pub unk1: f32,
+    pub flag: i32,
+}
+
+impl EnmaDistCell for EnmaDistTableCell {
     fn dist(&self) -> f32 {
-        self.0
+        self.dist
     }
 
     fn size() -> u64 {
-        8
+        0xc
     }
 }
 

enmacompat/src/lib.rs

@@ -2,8 +2,8 @@ pub mod area;
 pub mod dist_cell;
 pub mod lane;
 pub mod meta;
-pub mod non_guard;
 pub mod section;
+pub mod sign;
 pub mod speed;
 mod util;
 pub mod windows_pe;

enmacompat/src/sign.rs

@@ -4,19 +4,19 @@ use serde::Serialize;
 use crate::dist_cell::EnmaDistCell;
 
 #[derive(Debug, BinRead, Serialize)]
-pub struct EnmaNonGuardCell {
+pub struct EnmaSignCell {
     pub dist: f32,
-    pub unk1: f32,
-    // TODO: Is this a boolean?
-    pub guard: i32,
+    pub unk2: f32,
+    pub unk3: i32,
+    pub unk4: i32,
 }
 
-impl EnmaDistCell for EnmaNonGuardCell {
+impl EnmaDistCell for EnmaSignCell {
     fn dist(&self) -> f32 {
         self.dist
     }
 
     fn size() -> u64 {
-        0xc
+        0x10
     }
 }