Set up a new method for reading GX opcodes and made gracefully handling Dat errors an option.

Author: MeltyPlayer

FinModelUtility/Libraries/Gx/src/GxDisplayListReader.cs

@@ -11,7 +11,15 @@ namespace gx;
 public class GxDisplayListReader {
   public GxPrimitive? Read(IBinaryReader br,
                            IVertexDescriptor vertexDescriptor) {
+    this.ReadOpcode(br, vertexDescriptor, out var primitive);
+    return primitive;
+  }
+
+  public GxOpcode ReadOpcode(IBinaryReader br,
+                             IVertexDescriptor vertexDescriptor,
+                             out GxPrimitive? primitive) {
     var opcode = (GxOpcode) br.ReadByte();
+    primitive = null;
 
     switch (opcode) {
       case GxOpcode.NOP: break;
@@ -53,7 +61,8 @@ public class GxDisplayListReader {
         for (var i = 0; i < vertices.Length; ++i) {
           var vertex = vertices[i] = new GxVertex();
 
-          foreach (var (vertexAttribute, vertexFormat, colorComponentType) in vertexDescriptor) {
+          foreach (var (vertexAttribute, vertexFormat, colorComponentType) in
+                   vertexDescriptor) {
             if (vertexAttribute == GxVertexAttribute.Color0 &&
                 vertexFormat == GxAttributeType.DIRECT) {
               Asserts.True(colorComponentType.HasValue);
@@ -141,13 +150,15 @@ public class GxDisplayListReader {
           }
         }
 
-        return new GxPrimitive((GxPrimitiveType) opcode, vertices);
+        primitive = new GxPrimitive((GxPrimitiveType) opcode, vertices);
+        break;
       }
+
       default: {
         throw new NotImplementedException();
       }
     }
 
-    return null;
+    return opcode;
   }
 }

FinModelUtility/Libraries/Sysdolphin/Sysdolphin/src/schema/Dat.cs

@@ -3,23 +3,36 @@
 namespace sysdolphin.schema;
 
 public class Dat : IBinaryDeserializable {
+  private const bool IGNORE_ERRORS = false;
+
   public LinkedList<DatSubfile> Subfiles { get; } = [];
 
   public void Read(IBinaryReader br) {
     do {
-      var offset = br.Position;
-      try {
+      if (!IGNORE_ERRORS) {
+        var offset = br.Position;
         br.PushLocalSpace();
         var subfile = br.ReadNew<DatSubfile>();
         br.PopLocalSpace();
 
         this.Subfiles.AddLast(subfile);
         br.Position = offset + subfile.FileSize;
         br.Align(0x20);
-      } catch (Exception e) {
-        br.PopLocalSpace();
-        br.Position = offset;
-        break;
+      } else {
+        var offset = br.Position;
+        try {
+          br.PushLocalSpace();
+          var subfile = br.ReadNew<DatSubfile>();
+          br.PopLocalSpace();
+
+          this.Subfiles.AddLast(subfile);
+          br.Position = offset + subfile.FileSize;
+          br.Align(0x20);
+        } catch (Exception e) {
+          br.PopLocalSpace();
+          br.Position = offset;
+          break;
+        }
       }
     } while (!br.Eof);
   }