coll progress

CTR-tools · Feb 23, 2025 · be0517c · be0517c
1 parent af4334e
commit be0517c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 9 deletions.
diff --git a/ghidra/COLL.c b/ghidra/COLL.c
@@ -3055,13 +3055,14 @@ void FUN_8001fc40(undefined4 *param_1,int param_2,undefined4 param_3,undefined4
         param_1[0x34] = uVar5;
         param_1[0x35] = uVar6;
 
+		// sps 0x68 = 0x4c (Set2 = Set1)
         param_1[0x1a] = param_1[0x13];
         param_1[0x1b] = param_1[0x14];
         param_1[0x1c] = param_1[0x15];
         param_1[0x1d] = param_1[0x16];
         param_1[0x1e] = param_1[0x17];
         param_1[0x1f] = param_1[0x18];
-        param_1[0x20] = iVar10;
+        param_1[0x20] = iVar10; // param_1[0x19]
 
 		// triangle ID (0-9)
 		// 0x1f800187

diff --git a/include/namespace_Coll.h b/include/namespace_Coll.h
@@ -129,17 +129,41 @@ struct ScratchpadStruct
 	struct BSP* bspHitbox;
 
 	// 0x4c
-	// 1f800154
-	char unk4C[0xA4]; //unk4C + 0x24 seems to be a rotation of some sort, possibly related to potions. See 231_014.c
-
-	// 0x64
-	// ptrQuadblock
+	struct
+	{
+		// 0x4c
+		short hitPos[4];
+
+		// 0x54 
+		short normalVec[4];
+
+		// 0x5c
+		char unk[8];
+
+		// 0x64
+		void* ptrQuadblock;
+
+	} Set1;
 
 	// 0x68
-	// short hitPos[4]
+	struct
+	{
+		// 0x68
+		short hitPos[4];
+
+		// 0x70 
+		short normalVec[4];
+
+		// 0x78
+		char unk[8];
+
+		// 0x80
+		void* ptrQuadblock;
+
+	} Set2;
 
-	// 0x70 
-	// short normalVec[4]
+	// 0x84
+	char unk84[4];
 
 	// 0x88 - array of pointer,
 	// size of array at offset 0xc4,