bugfix

Author: Niko

decompile/General/CAMERA/CAM_17_FollowDriver_Normal.c

@@ -218,7 +218,7 @@ void DECOMP_CAM_FollowDriver_Normal(struct CameraDC *cDC, struct Driver *d, stru
 	// slight-down view angle
     if ((d->actionsFlagSet & 0x4000) == 0)
     {
-        cDC->unk1A -= 8;
+        cDC->unk1A -= FPS_HALF(8);
         if (cDC->unk1A < -0x20)
             cDC->unk1A = -0x20;
     }
@@ -227,7 +227,7 @@ void DECOMP_CAM_FollowDriver_Normal(struct CameraDC *cDC, struct Driver *d, stru
 	// straight-forward angle
     else
     {
-		cDC->unk1A += 8;
+		cDC->unk1A += FPS_HALF(8);
 		if (cDC->unk1A > 0)
 			cDC->unk1A = 0;
     }
@@ -296,7 +296,7 @@ void DECOMP_CAM_FollowDriver_Normal(struct CameraDC *cDC, struct Driver *d, stru
         cDC->BlastedLerp.desiredPos[1] = cDC->unkTriplet2[1] - *(short *)(scratchpad + 0x244);
         cDC->BlastedLerp.desiredPos[2] = cDC->unkTriplet2[2] - *(short *)(scratchpad + 0x248);
 
-        cDC->BlastedLerp.framesRemaining = 8;
+        cDC->BlastedLerp.framesRemaining = FPS_DOUBLE(8);
     }
 
     // if not arcade end-of-race
@@ -345,7 +345,7 @@ void DECOMP_CAM_FollowDriver_Normal(struct CameraDC *cDC, struct Driver *d, stru
             cDC->BlastedLerp.desiredPos[1] = cDC->unkTriplet2[1] - *(short *)(scratchpad + 0x244);
             cDC->BlastedLerp.desiredPos[2] = cDC->unkTriplet2[2] - *(short *)(scratchpad + 0x248);
 
-            cDC->BlastedLerp.framesRemaining = 8;
+            cDC->BlastedLerp.framesRemaining = FPS_DOUBLE(8);
 
             goto LAB_8001a8b0;
         }
@@ -355,13 +355,13 @@ void DECOMP_CAM_FollowDriver_Normal(struct CameraDC *cDC, struct Driver *d, stru
         // if frame countdown is not finished
         if (cDC->BlastedLerp.framesRemaining != 0)
         {
-            *(int *)(scratchpad + 0x240) += (cDC->BlastedLerp.desiredPos[0] * cDC->BlastedLerp.framesRemaining) >> 3;
-            *(int *)(scratchpad + 0x244) += (cDC->BlastedLerp.desiredPos[1] * cDC->BlastedLerp.framesRemaining) >> 3;
-            *(int *)(scratchpad + 0x248) += (cDC->BlastedLerp.desiredPos[2] * cDC->BlastedLerp.framesRemaining) >> 3;
+            *(int *)(scratchpad + 0x240) += (cDC->BlastedLerp.desiredPos[0] * cDC->BlastedLerp.framesRemaining) >> FPS_RIGHTSHIFT(3);
+            *(int *)(scratchpad + 0x244) += (cDC->BlastedLerp.desiredPos[1] * cDC->BlastedLerp.framesRemaining) >> FPS_RIGHTSHIFT(3);
+            *(int *)(scratchpad + 0x248) += (cDC->BlastedLerp.desiredPos[2] * cDC->BlastedLerp.framesRemaining) >> FPS_RIGHTSHIFT(3);
 
-            *(int *)(scratchpad + 0x258) += (cDC->BlastedLerp.desiredRot[0] * cDC->BlastedLerp.framesRemaining) >> 3;
-            *(int *)(scratchpad + 0x25c) += (cDC->BlastedLerp.desiredRot[1] * cDC->BlastedLerp.framesRemaining) >> 3;
-            *(int *)(scratchpad + 0x260) += (cDC->BlastedLerp.desiredRot[2] * cDC->BlastedLerp.framesRemaining) >> 3;
+            *(int *)(scratchpad + 0x258) += (cDC->BlastedLerp.desiredRot[0] * cDC->BlastedLerp.framesRemaining) >> FPS_RIGHTSHIFT(3);
+            *(int *)(scratchpad + 0x25c) += (cDC->BlastedLerp.desiredRot[1] * cDC->BlastedLerp.framesRemaining) >> FPS_RIGHTSHIFT(3);
+            *(int *)(scratchpad + 0x260) += (cDC->BlastedLerp.desiredRot[2] * cDC->BlastedLerp.framesRemaining) >> FPS_RIGHTSHIFT(3);
 
             // decrease frame countdown
             cDC->BlastedLerp.framesRemaining--;
@@ -571,6 +571,9 @@ void DECOMP_CAM_FollowDriver_Normal(struct CameraDC *cDC, struct Driver *d, stru
 					// No camera + No ghosts (battle maps)
 					(st1->count < 4) ||
 
+					// prevent advhub from playing startline
+					(cDC->unk8E == 0) ||
+					
 					// Press Triangle
 					((pad->buttonsTapped & BTN_TRIANGLE) != 0)
 				)

decompile/General/LOAD/LOAD_31_DriverMPK.c

@@ -76,8 +76,8 @@ void highLOD_DriverMPK(int numDrivers)
 
 	// TODO: Should restore Purple Gem Cup
 	// so that those are still Boss drivers
-	
-	for(int i = 0; i < numDrivers-1; i++)
+	int i = 0;
+	for(i = 0; i < numDrivers-1; i++)
 	{
 		// high lod CTR model
 		DECOMP_LOAD_AppendQueue(0, LT_GETADDR,

decompile/buildList.txt

@@ -314,10 +314,7 @@ common, exe, CAM_ProcessTransition, 0x0,               General/CAMERA/CAM_10_Pro
 common, exe, CAM_LookAtPosition, 0x0,                  General/CAMERA/CAM_14_LookAtPosition.c
 common, exe, CAM_FollowDriver_Spin360, 0x0,            General/CAMERA/CAM_15_FollowDriver_Spin360.c
 common, exe, CAM_SetDesiredPosRot, 0x0,                General/CAMERA/CAM_16_SetDesiredPosRot.c
-
-// Maybe works? Lets see
 common, exe, CAM_FollowDriver_Normal, 0x0,             General/CAMERA/CAM_17_FollowDriver_Normal.c
-
 //common, exe, CAM_MapRange_PosPoints, 0x0,              General/CAMERA/CAM_18_MapRange_PosPoints.c //TODO
 common, exe, CAM_ThTick, 0x0,                          General/CAMERA/CAM_19_ThTick.c