progress

Niko · Niko · commit f90750d5d658 · 2025-04-23T20:20:36.000-04:00
diff --git a/decompile/General/CDSYS/CDSYS_12_XAGetNumTracks.c b/decompile/General/CDSYS/CDSYS_12_XAGetNumTracks.c
@@ -3,7 +3,7 @@
 int DECOMP_CDSYS_XAGetNumTracks(int categoryID)
 {
 	// XnfLoaded will be false without boolUseDisc
-	//if(sdata->boolUseDisc == 0) return 0;
+	//if(sdata->boolUseDisc == 0) return -1;
 	if(sdata->bool_XnfLoaded == 0) return -1;
 	if(categoryID >= CDSYS_XA_NUM_TYPES) return -1;
 	
diff --git a/decompile/General/CDSYS/CDSYS_14_XAGetTrackLength.c b/decompile/General/CDSYS/CDSYS_14_XAGetTrackLength.c
@@ -4,8 +4,8 @@ int DECOMP_CDSYS_XAGetTrackLength(int categoryID, int xaID)
 {
 	if(xaID >= DECOMP_CDSYS_XAGetNumTracks(categoryID)) return 0;
 
-	return sdata->ptrArray_XaSize[
-				sdata->ptrArray_firstSongIndex[categoryID] +
-				xaID
-			].XaBytes;
+	int sizeIndex = 
+		sdata->ptrArray_firstSongIndex[categoryID] + xaID;
+
+	return sdata->ptrArray_XaSize[sizeIndex	].XaBytes;
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`int DECOMP_CDSYS_XAGetNumTracks(int categoryID)`
`4`	`4`	`{`
`5`	`5`	`// XnfLoaded will be false without boolUseDisc`
`6`		`- //if(sdata->boolUseDisc == 0) return 0;`
	`6`	`+ //if(sdata->boolUseDisc == 0) return -1;`
`7`	`7`	`if(sdata->bool_XnfLoaded == 0) return -1;`
`8`	`8`	`if(categoryID >= CDSYS_XA_NUM_TYPES) return -1;`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ int DECOMP_CDSYS_XAGetTrackLength(int categoryID, int xaID)`
`4`	`4`	`{`
`5`	`5`	`if(xaID >= DECOMP_CDSYS_XAGetNumTracks(categoryID)) return 0;`
`6`	`6`
`7`		`- return sdata->ptrArray_XaSize[`
`8`		`- sdata->ptrArray_firstSongIndex[categoryID] +`
`9`		`- xaID`
`10`		`- ].XaBytes;`
	`7`	`+ int sizeIndex =`
	`8`	`+ sdata->ptrArray_firstSongIndex[categoryID] + xaID;`
	`9`	`+`
	`10`	`+ return sdata->ptrArray_XaSize[sizeIndex ].XaBytes;`
`11`	`11`	`}`