good luck

Author: mateusfavarin

decompile/General/230/D230.c

@@ -1,41 +1,39 @@
 #include <common.h>
 
-void RB_TNT_ThTick_SitOnHead();
-
 void DECOMP_RB_TNT_ThTick_ThrowOnHead(struct Thread* t)
 {
   struct MineWeapon* mw;
   struct Instance* inst;
   short* array;
   struct GameTracker* gGT;
-  
+
   short rot[3];
   short distHead;
-  
+
   // matrix?
   short auStack48 [32];
-  
+
   gGT = sdata->gGT;
-  
+
   inst = t->inst;
-  
+
   // object
   mw = inst->thread->object;
-  
+
   // alter height of TNT as it flies onto a driver's head,
   // do NOT use parenthesis
   mw->deltaPos[1] += (mw->velocity[1] * gGT->elapsedTimeMS) >> 5;
-  
+
   // if TNT is moving downward
-  if (mw->velocity[1] < 0) 
+  if (mw->velocity[1] < 0)
   {
 	// 0x800b2ac4
 	// BSS before Baron_ThTick,
 	// determines height of TNT for each player
 	array = (short*)0x800b2ac4; //TODO: access named memory instead (D231?)
-    
+
 	distHead = array[data.characterIDs[mw->driverTarget->driverID]];
-	
+
 	// if TNT landed on head
 	if (
 		(mw->deltaPos[1] < distHead) &&
@@ -45,55 +43,55 @@ void DECOMP_RB_TNT_ThTick_ThrowOnHead(struct Thread* t)
 	{
 	  // Set TNT timer to 0, it blows up at 0x5a
       mw->numFramesOnHead = 0;
-	  
+
 	  // number of jumps is 7 or 8
 	  mw->jumpsRemaining = 8 - (DECOMP_MixRNG_Scramble() & 1);
-	  
+
 	  // play sound that you hit a TNT
       PlaySound3D(0x51,inst);
-	  
+
       inst->unk50 = mw->driverTarget->instSelf->unk50 + -1;
       inst->unk51 = mw->driverTarget->instSelf->unk51 + -1;
-      
-	  // assign 
-	  ThTick_SetAndExec(t,RB_TNT_ThTick_SitOnHead);
+
+	  // assign
+	  ThTick_SetAndExec(t,DECOMP_RB_TNT_ThTick_SitOnHead);
 	  return;
     }
   }
-  
+
   // CopyMatrix
   LHMatrix_Parent(inst,mw->driverTarget->instSelf,(SVECTOR*)&mw->deltaPos[0]);
-  
+
   // rotation
   rot[0] = 0;
   rot[1] = mw->tntSpinY;
   rot[2] = 0;
-  
+
    // convert 3 rotation shorts into rotation matrix
   ConvertRotToMatrix((MATRIX*)auStack48,&rot[0]);
-  
+
   MatrixRotate(&inst->matrix,&inst->matrix,(MATRIX*)auStack48);
-  
+
   // reduce time remaining until TNT lands on head
   mw->velocity[1] -= ((gGT->elapsedTimeMS << 2) >> 5);
-  
+
    // set a minimum value (-0x60)
 	if(mw->velocity[1] < -0x60) mw->velocity[1] = -0x60;
-  
+
   // rotation
   mw->tntSpinY += FPS_HALF(0x100);
-  
+
   // if scale is small
-  if (inst->scale[0] < 0x801) 
+  if (inst->scale[0] < 0x801)
   {
 	// set min scale
     inst->scale [0] = 0x800;
     inst->scale [1] = 0x800;
     inst->scale [2] = 0x800;
   }
-  
+
   // if scale is large
-  else 
+  else
   {
 	// reduce scale
     inst->scale [0] -= FPS_HALF(0x100);

decompile/General/231/231_020_RB_TNT_ThTick_ThrowOnHead.c

@@ -3,21 +3,19 @@
 void DECOMP_RB_Warpball_Death(struct Thread* t)
 {
   struct TrackerWeapon* tw;
-  
+
   tw = t->object;
   tw->ptrParticle->framesLeftInLife = 0;
   tw->fadeAway_frameCount5 = 0;
-  
+
   // play sound of warpball death
   struct Instance* inst = t->inst;
   tw->distFromGround = inst->matrix.t[1];
   PlaySound3D(0x4f, inst);
-  
+
   // stop audio of moving
   OtherFX_RecycleMute(&tw->audioPtr);
-  
-  void RB_Warpball_FadeAway();
-  ThTick_SetAndExec(t,&RB_Warpball_FadeAway);
+
+  ThTick_SetAndExec(t,&DECOMP_RB_Warpball_FadeAway);
   return;
 }
- 

decompile/General/231/231_027_RB_Warpball_Death.c

@@ -78,7 +78,7 @@ void DECOMP_RB_ShieldDark_ThTick_Grow(struct Thread *th)
         highlightIdpp[i].pushBuffer = pb;
       }
   }
-  
+
   // if driver is not invisible
   else
   {
@@ -94,8 +94,8 @@ void DECOMP_RB_ShieldDark_ThTick_Grow(struct Thread *th)
   }
 
   short pos[3];
-  pos[0] = 0; 
-  pos[1] = 0; 
+  pos[0] = 0;
+  pos[1] = 0;
   pos[2] = 0;
 
   // Copy matrix
@@ -130,7 +130,7 @@ void DECOMP_RB_ShieldDark_ThTick_Grow(struct Thread *th)
   {
     scaleXZ = ((int *)0x800b2cf4)[shield->animFrame*2+0];
     scaleY =  ((int *)0x800b2cf4)[shield->animFrame*2+1];
-	
+
     // set scale
     shieldInst->scale[0] = WIDE_34(scaleXZ);
     shieldInst->scale[1] = scaleY;
@@ -140,18 +140,18 @@ void DECOMP_RB_ShieldDark_ThTick_Grow(struct Thread *th)
     colorInst->scale[0] = WIDE_34(scaleXZ);
     colorInst->scale[1] = scaleY;
     colorInst->scale[2] = scaleXZ;
-	
+
 	#ifdef USE_60FPS
 	if(sdata->gGT->timer & 1)
 	#endif
 		// next frame
 		shield->animFrame++;
   }
-  
+
   // if animation is done
   else
   {
-    short timerIndex = 
+    short timerIndex =
 		(
 			(gGT->timer >> FPS_RIGHTSHIFT(0))
 			% 6
@@ -211,9 +211,9 @@ void DECOMP_RB_ShieldDark_ThTick_Grow(struct Thread *th)
   shieldFlags = shield->flags;
 
   if (
-		((shieldFlags & 1) != 0) || 
+		((shieldFlags & 1) != 0) ||
 		((shieldFlags & 8) != 0) ||
-		
+
 		// if race ended for this driver
 		((player->actionsFlagSet & 0x2000000) != 0) ||
 
@@ -235,8 +235,7 @@ void DECOMP_RB_ShieldDark_ThTick_Grow(struct Thread *th)
     player->instBubbleHold = NULL;
 
     // execute, then assign per-frame funcPtr to thread
-	void RB_ShieldDark_ThTick_Pop();
-    ThTick_SetAndExec(th, RB_ShieldDark_ThTick_Pop);
+    ThTick_SetAndExec(th, DECOMP_RB_ShieldDark_ThTick_Pop);
     return;
   }
 
@@ -259,13 +258,13 @@ void DECOMP_RB_ShieldDark_ThTick_Grow(struct Thread *th)
   }
 
   // create a thread, get an instance
-  struct Instance *bombInst = 
+  struct Instance *bombInst =
 	DECOMP_INSTANCE_BirthWithThread(
-		model, 0, MEDIUM, OTHER, 
-        DECOMP_RB_MovingExplosive_ThTick, 
+		model, 0, MEDIUM, OTHER,
+        DECOMP_RB_MovingExplosive_ThTick,
         sizeof(struct TrackerWeapon),
         playerTh);
-		
+
   struct Thread* bombTh = bombInst->thread;
   bombTh->funcThDestroy = DECOMP_PROC_DestroyInstance;
 
@@ -280,7 +279,7 @@ void DECOMP_RB_ShieldDark_ThTick_Grow(struct Thread *th)
     Voiceline_RequestPlay(13, data.characterIDs[player->driverID], 0x10);
   }
 
-  // copy position and rotation from one instance to another 
+  // copy position and rotation from one instance to another
   *(int*)&bombInst->matrix.m[0][0] = *(int*)&shieldInst->matrix.m[0][0];
   *(int*)&bombInst->matrix.m[0][2] = *(int*)&shieldInst->matrix.m[0][2];
   *(int*)&bombInst->matrix.m[1][1] = *(int*)&shieldInst->matrix.m[1][1];
@@ -304,16 +303,16 @@ void DECOMP_RB_ShieldDark_ThTick_Grow(struct Thread *th)
   tw->timeAlive = 0;
   tw->audioPtr = 0;
   tw->frameCount_Blind = 0;
-  
+
   tw->driverParent = player;
   tw->instParent = driverInst;
-  
+
   // do NOT patch for 60fps,
   // velocity uses elapsedTime
   tw->vel[1] = 0;
   tw->vel[0] = (driverInst->matrix.m[0][2] * 3) >> 7;
   tw->vel[2] = (driverInst->matrix.m[2][2] * 3) >> 7;
-  
+
   tw->rotY = player->angle;
   tw->frameCount_DontHurtParent = FPS_DOUBLE(10);
 
@@ -330,4 +329,3 @@ void DECOMP_RB_ShieldDark_ThTick_Grow(struct Thread *th)
   th->flags |= 0x800;
 }
 
-