progress

CTR-tools · Mar 8, 2023 · f7b1b63 · f7b1b63
1 parent 3519008
commit f7b1b63
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 12 deletions.
diff --git a/psx-modding-toolchain/games/CrashTeamRacing/decompile/General/zGlobal_DATA.c b/psx-modding-toolchain/games/CrashTeamRacing/decompile/General/zGlobal_DATA.c
@@ -76,8 +76,63 @@ struct Data data =
 		.t = {0,-0x20,0}
 	},
 
-#if 0
-	.EndOfRace_Camera_Size[0x12] =
+	.NearCam4x3 =
+	{
+		.distMin = 0xB3,
+		.distMax = 0xE0,
+		.speedMin = 0x400,
+		.speedMax = 0x1400,
+		.percentage1 = 0xF0, // 90%
+		.percentage2 = 0xFF, // 99%
+		.angle[0] = 0x80,
+		.angle[1] = 0xE0,
+		.angle[2] = 0x70,
+		.vertDistance = 0x40
+	},
+
+	.NearCam8x3 =
+	{
+		.distMin = 0x133,
+		.distMax = 0x14c,
+		.speedMin = 0x400,
+		.speedMax = 0x1400,
+		.percentage1 = 0xF0, // 90%
+		.percentage2 = 0xFF, // 99%
+		.angle[0] = 0x80,
+		.angle[1] = 0xE0,
+		.angle[2] = 0x60,
+		.vertDistance = 0x60
+	},
+
+	.FarCam4x3 =
+	{
+		.distMin = 0xE0,
+		.distMax = 0x120,
+		.speedMin = 0x400,
+		.speedMax = 0x1400,
+		.percentage1 = 0xF0, // 90%
+		.percentage2 = 0xFF, // 99%
+		.angle[0] = 0x80,
+		.angle[1] = 0xE0,
+		.angle[2] = 0x60,
+		.vertDistance = 0x60
+	},
+
+	.FarCam8x3 =
+	{
+		.distMin = 0x180,
+		.distMax = 0x1B3,
+		.speedMin = 0x400,
+		.speedMax = 0x1400,
+		.percentage1 = 0xF0, // 90%
+		.percentage2 = 0xFF, // 99%
+		.angle[0] = 0x80,
+		.angle[1] = 0xE0,
+		.angle[2] = 0x60,
+		.vertDistance = 0xA0
+	},
+
+	.EndOfRace_Camera_Size =
 	{
 		0,		// mode 0 (following driver)
 		-1,		// mode 1 (doesn't exist)
@@ -92,12 +147,32 @@ struct Data data =
 		0x6,	// mode A
 		0xC,	// mode B
 		0x14,	// mode C
-		0x10,	// mode D (lookAt driver and follow path)
+		0x10,	// mode D (lookAt and follow path)
 		0xC,	// mode E
 		0,		// mode F (first person)
 		0,		// mode 10 (first person)
-
-		0, 0,	// alignment
 	},
-#endif
+
+	.Spin360_heightOffset_cameraPos =
+	{
+		0,		// not possible
+		0x80,	// 1P
+		0x60,	// 2P
+		0x80,	// 3P
+		0x80	// 4P
+	},
+
+	.Spin360_heightOffset_driverPos =
+	{
+		0,		// not possible
+		0x60,	// 1P
+		0x40,	// 2P
+		0x60,	// 3P
+		0x60	// 4P
+	},
+
+	.s_XA_ENG_XNF 	= "\\XA\\ENG.XNF;1",
+	.s_XA_MUSIC 	= "\\XA\\MUSIC\\S00.XA;1",
+	.s_XA_ENG_EXTRA	= "\\XA\\ENG\\EXTRA\\S00.XA;1",
+	.s_XA_ENG_GAME	= "\\XA\\ENG\\GAME\\S00.XA;1",
 };
diff --git a/psx-modding-toolchain/games/CrashTeamRacing/include/common.h b/psx-modding-toolchain/games/CrashTeamRacing/include/common.h
@@ -6211,8 +6211,8 @@ struct ZoomData
 	short speedMax;
 
 	// 0x8
-	char percentage1;
-	char percentage2;
+	unsigned char percentage1;
+	unsigned char percentage2;
 
 	// 0xA
 	short angle[3];
@@ -7425,10 +7425,6 @@ struct Data
 	// 80080F48
 	MATRIX identity;
 
-// for rewriting structs in decompile,
-// zGlobal_DATA.c
-#ifndef DATA_DEV
-
 	// 80080F68
 	struct ZoomData NearCam4x3; // 1P,3P,4P
 	struct ZoomData NearCam8x3; // 2P
@@ -7455,6 +7451,10 @@ struct Data
 	char s_XA_ENG_EXTRA[0x18];
 	char s_XA_ENG_GAME[0x18];
 
+// for rewriting structs in decompile,
+// zGlobal_DATA.c
+#ifndef DATA_DEV
+
 	// 8007f240 -- SepReview
 	// 80081050 -- UsaRetail
 	// 800800B4 -- JpnTrial