60fps progress

CTR-tools · Apr 13, 2024 · e60535c · e60535c
1 parent ceb6494
commit e60535c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/decompile/General/Particle/Particle_FuncPtr_ExhaustUnderwater.c b/decompile/General/Particle/Particle_FuncPtr_ExhaustUnderwater.c
@@ -7,7 +7,7 @@ void DECOMP_Particle_FuncPtr_ExhaustUnderwater(struct Particle *p)
 
   if (
 		(3 < ((p->axis[1].startVal >> 8) + p->driverInst->matrix.t[1])) &&
-		(p->framesLeftInLife < 27)
+		(p->framesLeftInLife < FPS_DOUBLE(27))
 	  )
   {
     // bubblepop

diff --git a/decompile/WorkInProgress/src/PickupBots_UpdateAll.c b/decompile/WorkInProgress/src/PickupBots_UpdateAll.c
@@ -49,9 +49,6 @@ void DECOMP_PickupBots_Update(void)
 		// RNG for which weaopn shoots (oxide)
 		// etc
 
-		// if numPlyrCurrGame is not zero
-		if (!gGT->numPlyrCurrGame) return;
-
 		for (i = 0; i < gGT->numPlyrCurrGame; i++)
 		{
 			// get the player structure of each human player
@@ -220,7 +217,7 @@ void DECOMP_PickupBots_Update(void)
 								// Get character ID of two player/AI structures: iVar4 and iVar14
 
 								sVar11 = data.characterIDs[nextDriver->driverID];
-								sVar2 = data.characterIDs)currDriver->driverID];
+								sVar2 = data.characterIDs[currDriver->driverID];
 								uVar10 = 0xb;
 								goto LAB_8004128c;
 							}

diff --git a/include/common.h b/include/common.h
@@ -2,7 +2,7 @@
 #define COMMON_H
 
 // toggle these in decompile
-//#define USE_60FPS
+#define USE_60FPS
 //#define USE_16BY9
 //#define USE_NEW2P
 //#define USE_GPU1P