Merge remote-tracking branch 'upstream/main' into lua

randovania · Jan 3, 2024 · a7fae3a · a7fae3a
2 parents 7ec41e1 + 9587c7b
commit a7fae3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@
 repos:
 -   repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.1.8
+    rev: v0.1.9
     hooks:
       - id: ruff
         args: [ --fix, --exit-non-zero-on-fix  ]
diff --git a/src/mercury_engine_data_structures/formats/bmsad.py b/src/mercury_engine_data_structures/formats/bmsad.py
@@ -305,13 +305,13 @@ def _not_implemented(code):
 
 SRHeader = Struct(
     model_name=StrId,
-    unk_1=Int8ul,
+    ignore_samus=Flag,
     unk_2a=Float,
     unk_2b=Float,
     unk_2c=Float,
-    unk_2d=Float,
+    model_scale=Float,
     unk_2e=Float,
-    unk_2f=CVector3D,
+    hitbox_dimensions=CVector3D,
     unk_2g=Float,
     unk_3=Int8ul,
     unk_4=Int32ul,