Add Willox's updates, Part 3 - Class

Author: 20kdc

Diff for: after/src/main/java/after/io/DMBClassTable.java

@@ -51,14 +51,15 @@ public static class Entry implements DMBObjectEntryBasedSubblock.Entry {
 
 		// >= 494
 
-		public int idH;
-		public short unkB;
-		public short unkC;
+		@StringID // Nullable
+		public int maptext;
+		public short maptextWidth;
+		public short maptextHeight;
 
 		// >= 508
 
-		public short unkD;
-		public short unkE;
+		public short maptextX;
+		public short maptextY;
 
 		// --
 
@@ -83,13 +84,13 @@ public static class Entry implements DMBObjectEntryBasedSubblock.Entry {
 
 		// >= 500
 
-		public byte hasFloats;
-		public float[] floats = new float[6];
+		public byte hasTransform;
+		public float[] transform = new float[6];
 
 		// >= 509
 
-		public byte hasEvenMoreFloats;
-		public float[] evenMoreFloats = new float[20];
+		public byte hasColourMatrix;
+		public float[] colourMatrix = new float[20];
 
 		// >= 306
 
@@ -118,14 +119,14 @@ public void read(DMBReadContext rc) {
 			text = rc.id();
 
 			if (rc.vRHS >= 494) {
-				idH = rc.id();
-				unkB = rc.io.getShort();
-				unkC = rc.io.getShort();
+				maptext = rc.id();
+				maptextWidth = rc.io.getShort();
+				maptextHeight = rc.io.getShort();
 			}
 
 			if (rc.vRHS >= 508) {
-				unkD = rc.io.getShort();
-				unkE = rc.io.getShort();
+				maptextX = rc.io.getShort();
+				maptextY = rc.io.getShort();
 			}
 
 			suffix = rc.id();
@@ -144,15 +145,15 @@ public void read(DMBReadContext rc) {
 				layer = rc.io.getFloat();
 
 			if (rc.vRHS >= 500) {
-				hasFloats = rc.io.get();
-				if (hasFloats != 0)
-					rc.floats(floats);
+				hasTransform = rc.io.get();
+				if (hasTransform != 0)
+					rc.floats(transform);
 			}
 
 			if (rc.vRHS >= 509) {
-				hasEvenMoreFloats = rc.io.get();
-				if (hasEvenMoreFloats != 0)
-					rc.floats(evenMoreFloats);
+				hasColourMatrix = rc.io.get();
+				if (hasColourMatrix != 0)
+					rc.floats(colourMatrix);
 			}
 
 			if (rc.vGEN >= 306)
@@ -181,14 +182,14 @@ public void write(DMBWriteContext wc) {
 			wc.id(text);
 
 			if (wc.vRHS >= 494) {
-				wc.id(idH);
-				wc.i16(unkB);
-				wc.i16(unkC);
+				wc.id(maptext);
+				wc.i16(maptextWidth);
+				wc.i16(maptextHeight);
 			}
 
 			if (wc.vRHS >= 508) {
-				wc.i16(unkD);
-				wc.i16(unkE);
+				wc.i16(maptextX);
+				wc.i16(maptextY);
 			}
 
 			wc.id(suffix);
@@ -206,15 +207,15 @@ public void write(DMBWriteContext wc) {
 				wc.i32(Float.floatToIntBits(layer));
 
 			if (wc.vRHS >= 500) {
-				wc.i8(hasFloats);
-				if (hasFloats != 0)
-					wc.floats(floats);
+				wc.i8(hasTransform);
+				if (hasTransform != 0)
+					wc.floats(transform);
 			}
 
 			if (wc.vRHS >= 509) {
-				wc.i8(hasEvenMoreFloats);
-				if (hasEvenMoreFloats != 0)
-					wc.floats(evenMoreFloats);
+				wc.i8(hasColourMatrix);
+				if (hasColourMatrix != 0)
+					wc.floats(colourMatrix);
 			}
 
 			if (wc.vGEN >= 306)

Diff for: formats/DMB.md

@@ -147,16 +147,16 @@ format version shenanigans.
 
 For RHS Versions >= 494, additionally {
 
-1. ObjectID unk
-2. Uint16 unk (note: my pet theory is, this involves either step or icon size)
-3. Uint16 unk (same)
+1. Nullable StringID maptext (thanks to Willox for finding this)
+2. Uint16 maptextWidth (thanks to Willox for finding this)
+3. Uint16 maptextHeight (thanks to Willox for finding this)
 
 }
 
 For RHS Versions >= 508, additionally {
 
-1. Uint16 unk
-2. Uint16 unk
+1. Uint16 maptextX (thanks to Willox for finding this)
+2. Uint16 maptextY (thanks to Willox for finding this)
 
 }
 
@@ -176,15 +176,15 @@ For GEN Versions >= 267, additionally {
 
 For RHS Versions >= 500, additionally {
 
-1. Uint8 hasFloats, but really a boolean
-2. If hasFloats, Array of 6 Float32s
+1. Uint8 hasTransform, but really a boolean
+2. If hasColourMatrix, Array of 6 Float32s (Affine transform (TODO: Details?) - thanks to Willox for finding this)
 
 }
 
 For RHS Versions >= 509, additionally {
 
-1. Uint8 hasEvenMoreFloats, really a boolean
-2. If hasEvenMoreFloats, Array of 20 Float32s
+1. Uint8 hasColourMatrix, really a boolean
+2. If hasColourMatrix, Array of 20 Float32s (Colour matrix (TODO: Details?) - thanks to Willox for finding this)
 
 }