izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

update current code to match scratches on decomp.me (#662)

Browse Source 
* chore: update current code to match scratches on decomp.me

* update score
This commit is contained in:
Dominik Peters
2025-07-03 21:33:07 +02:00
committed by GitHub
parent 813705850a
commit 5255e7fa52
8 changed files with 1041 additions and 1189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+3 -3
View File
@@ -121,11 +121,11 @@ As of July 3, 2025, this is our current score:
```
======================================================================
ADVENTURE ONE (ASM -> C Decompilation)
--------------- 96.43% Complete (97.13% NON_MATCHING) ----------------
--------------- 96.43% Complete (97.33% NON_MATCHING) ----------------
# Decompiled functions: 1939
# GLOBAL_ASM remaining: 13
# NON_MATCHING functions: 4
# NON_EQUIVALENT WIP functions: 9
# NON_MATCHING functions: 5
# NON_EQUIVALENT WIP functions: 8
---------------------------- Game Status -----------------------------
Balloons: 46/47, Keys: 4/4, Trophies: 4/5
T.T. Amulets: 4/4, Wizpig Amulets: 4/4
include/structs.h
+5
View File
@@ -1717,4 +1717,9 @@ typedef struct GhostNode {
/* 0x08 */ s16 xRotation;
/* 0x0A */ s16 yRotation;
} GhostNode;
typedef struct CollisionNode {
u16 colPlaneIndex; // This triangle index
u16 closestTri[3];
} CollisionNode;
#endif
src/objects.c
+568 -746
View File
File diff suppressed because it is too large Load Diff
src/particles.c
+34 -21
View File
@@ -299,13 +299,13 @@ void init_particle_assets(void) {
#ifdef NON_EQUIVALENT
void init_particle_buffers(s32 maxTriangleParticles, s32 maxRectangleParticles, s32 maxSpriteParticles,
s32 maxLineParticles, s32 maxPointParticles, s32 unused_arg) {
unsigned int new_var2;
Vertex *sp54;
Triangle *sp50;
s32 allocSize;
s32 i;
s16 *asset2F;
ParticleModel *modelPtr;
s32 zero = 0;
Vertex *sp54;
Triangle *sp50;
s32 pad;
gParticleOverrideColor->word = 0;
@@ -336,42 +336,55 @@ void init_particle_buffers(s32 maxTriangleParticles, s32 maxRectangleParticles,
gPointParticleBufferFull = FALSE;
free_particle_vertices_triangles();
gParticleVertexBuffer = mempool_alloc_safe(
(3 * maxTriangleParticles + 4 * maxRectangleParticles + 6 * maxLineParticles + 16 * maxPointParticles) *
sizeof(Vertex),
COLOUR_TAG_SEMITRANS_GREY);
gParticleTriangleBuffer = mempool_alloc_safe((maxTriangleParticles + 2 * maxRectangleParticles) * sizeof(Triangle),
COLOUR_TAG_SEMITRANS_GREY);
allocSize = 0;
allocSize += maxTriangleParticles * 3;
allocSize += maxRectangleParticles << 2;
allocSize += maxLineParticles * 3 * 2;
allocSize += maxPointParticles << 4;
allocSize *= sizeof(Vertex);
gParticleVertexBuffer = mempool_alloc_safe(allocSize, COLOUR_TAG_SEMITRANS_GREY);
// @fake
// i = maxPointParticles <= 0;
i = 0;
allocSize = 0;
allocSize += maxTriangleParticles;
allocSize += maxRectangleParticles << 1;
allocSize += i;
allocSize *= sizeof(Triangle);
gParticleTriangleBuffer = mempool_alloc_safe(allocSize, COLOUR_TAG_SEMITRANS_GREY);
D_800E2CDC = 0;
free_particle_buffers();
if (gMaxTriangleParticles > 0) {
gNumTriangleParticles = 0;
gTriangleParticleBuffer = mempool_alloc_safe(maxTriangleParticles * (sizeof(Particle) + sizeof(ParticleModel)),
COLOUR_TAG_SEMITRANS_GREY);
allocSize = maxTriangleParticles * (sizeof(Particle) + sizeof(ParticleModel));
gTriangleParticleBuffer = mempool_alloc_safe(allocSize, COLOUR_TAG_SEMITRANS_GREY);
}
if (gMaxRectangleParticles > 0) {
gNumRectangleParticles = 0;
gRectangleParticleBuffer = mempool_alloc_safe(
maxRectangleParticles * (sizeof(Particle) + sizeof(ParticleModel)), COLOUR_TAG_SEMITRANS_GREY);
allocSize = maxRectangleParticles * (sizeof(Particle) + sizeof(ParticleModel));
gRectangleParticleBuffer = mempool_alloc_safe(allocSize, COLOUR_TAG_SEMITRANS_GREY);
}
if (gMaxSpriteParticles > 0) {
gNumSpriteParticles = 0;
gSpriteParticleBuffer = mempool_alloc_safe(maxSpriteParticles * sizeof(Particle), COLOUR_TAG_SEMITRANS_GREY);
allocSize = maxSpriteParticles * sizeof(Particle);
gSpriteParticleBuffer = mempool_alloc_safe(allocSize, COLOUR_TAG_SEMITRANS_GREY);
}
if (gMaxLineParticles > 0) {
gNumLineParticles = 0;
gLineParticleBuffer = mempool_alloc_safe(maxLineParticles * (sizeof(Particle) + sizeof(ParticleModel)),
COLOUR_TAG_SEMITRANS_GREY);
allocSize = maxLineParticles * (sizeof(Particle) + sizeof(ParticleModel));
gLineParticleBuffer = mempool_alloc_safe(allocSize, COLOUR_TAG_SEMITRANS_GREY);
}
if (gMaxPointParticles > 0) {
gNumPointParticles = 0;
gPointParticleBuffer = mempool_alloc_safe(maxPointParticles * (sizeof(PointParticle) + sizeof(ParticleModel)),
COLOUR_TAG_SEMITRANS_GREY);
allocSize = maxPointParticles * (sizeof(PointParticle) + sizeof(ParticleModel));
gPointParticleBuffer = mempool_alloc_safe(allocSize, COLOUR_TAG_SEMITRANS_GREY);
}
sp54 = &gParticleVertexBuffer[zero];
sp50 = &gParticleTriangleBuffer[zero];
// *0 is "fake", the asm does << 3 and << 4 on zero
sp54 = &gParticleVertexBuffer[maxTriangleParticles * 0];
sp50 = &gParticleTriangleBuffer[maxTriangleParticles * 0];
modelPtr = (ParticleModel *) &gTriangleParticleBuffer[gMaxTriangleParticles];
for (i = 0; i < gMaxTriangleParticles; i++) {
src/printf.c
+242 -231
View File
File diff suppressed because it is too large Load Diff
src/racer.c
+84 -79
View File
@@ -2731,10 +2731,11 @@ void func_80049794(s32 updateRate, f32 updateRateF, Object *obj, Object_Racer *r
apply_plane_tilt_anim(updateRate, obj, racer);
}
var_v0 = racer->playerIndex;
if (var_v0 == PLAYER_COMPUTER && gCurrentPlayerIndex != PLAYER_COMPUTER) {
if ((var_v0 == PLAYER_COMPUTER) && (gCurrentPlayerIndex != PLAYER_COMPUTER)) {
gCurrentRacerHandlingStat = 1.4f;
}
var_f20 = sqrtf((obj->x_velocity * obj->x_velocity) + (obj->z_velocity * obj->z_velocity) +
var_f20 = sqrtf((obj->x_velocity * obj->x_velocity) +
(obj->z_velocity * obj->z_velocity) +
(obj->y_velocity * obj->y_velocity)) -
2.0;
if (racer->vehicleID >= VEHICLE_BOSSES) {
@@ -3199,7 +3200,7 @@ void func_80049794(s32 updateRate, f32 updateRateF, Object *obj, Object_Racer *r
obj->y_velocity -= racer->oy3 * var_f20;
obj->z_velocity -= racer->oz3 * var_f20;
if (racer->trickType == 1 || racer->trickType == -1) {
spEC = racer->velocity * 0.0588235 * 1.5;
spEC = racer->velocity * 0.058823529411764705 * 1.5;
var_f20 = coss_f(racer->x_rotation_vel) * spEC * racer->trickType;
if (racer->x_rotation_vel > 0x4000 || racer->x_rotation_vel < -0x4000) {
var_f20 *= 2;
@@ -3303,8 +3304,8 @@ void func_80049794(s32 updateRate, f32 updateRateF, Object *obj, Object_Racer *r
gCurrentRacerTransform.z_position = 0.0f;
gCurrentRacerTransform.scale = 1.0f;
mtxf_from_inverse_transform((MtxF *) &sp60, &gCurrentRacerTransform);
mtxf_transform_point((MtxF *) &sp60, obj->x_velocity, obj->y_velocity, obj->z_velocity, &racer->lateral_velocity,
&racer->unk34, &racer->velocity);
mtxf_transform_point((MtxF *) &sp60, obj->x_velocity, obj->y_velocity, obj->z_velocity,
&racer->lateral_velocity, &racer->unk34, &racer->velocity);
if (obj->attachPoints != NULL && obj->attachPoints->count >= 3) {
temp_v0_obj = obj->attachPoints->obj[2];
temp_v0_obj->trans.rotation.y_rotation = 0x4000;
@@ -8132,16 +8133,17 @@ void set_position_goal_from_path(UNUSED Object *obj, Object_Racer *racer, f32 *x
*z = catmull_rom_interpolation(splineZ, destReached, magnitude);
}
// https://decomp.me/scratch/6WBdX
// https://decomp.me/scratch/uUmRq
#ifdef NON_MATCHING
void func_80059208(Object *obj, Object_Racer *racer, s32 updateRate) {
UNUSED s32 pad[2];
UNUSED f32 pad;
UNUSED f32 pad2;
s32 temp_v0;
CheckpointNode *temp_v0_4;
f32 posX[5];
f32 posY[5];
f32 posZ[5];
UNUSED s32 pad2;
UNUSED f32 pad3;
f32 tempX;
s32 counter;
f32 tempY;
@@ -8192,78 +8194,81 @@ void func_80059208(Object *obj, Object_Racer *racer, s32 updateRate) {
racer->unk1C8 = 0;
}
}
} else {
if (splinePos < 0.0f) {
splinePos = 0.0f;
}
temp_v0_4 = find_next_checkpoint_node(racer->checkpoint, racer->unk1C8);
scale = temp_v0_4->scale;
counter = racer->checkpoint - 1;
if (counter < 0) {
counter = temp_v0 - 1;
}
temp_v0_4 = get_checkpoint_node(counter);
distance = temp_v0_4->scale;
divisor = ((scale - temp_v0_4->scale) * splinePos) + distance;
counter = racer->checkpoint - 2;
if (counter < 0) {
counter += temp_v0;
}
for (i = 0; (i < 5) ^ 0; i++) {
temp_v0_4 = find_next_checkpoint_node(counter, racer->unk1C8);
posX[i] = temp_v0_4->x + ((temp_v0_4->scale * temp_v0_4->rotationZFrac) * racer->unk1BA);
posY[i] = temp_v0_4->y + (temp_v0_4->scale * racer->unk1BC);
posZ[i] = temp_v0_4->z + ((temp_v0_4->scale * (-temp_v0_4->rotationXFrac)) * racer->unk1BA);
counter++;
if (counter == temp_v0) {
counter = 0;
}
}
splineIndex = FALSE;
if (splinePos >= 1.0) {
splinePos -= 1.0;
splineIndex = TRUE;
}
tempX = cubic_spline_interpolation(posX, splineIndex, splinePos, &diffX);
tempY = cubic_spline_interpolation(posY, splineIndex, splinePos, &diffY);
tempZ = cubic_spline_interpolation(posZ, splineIndex, splinePos, &diffZ);
distance = sqrtf((diffX * diffX) + (diffZ * diffZ));
if (distance != 0.0f) {
scale = 1.0f / distance;
diffX *= scale;
diffZ *= scale;
}
angle = arctan2_f(diffX, diffZ) - (racer->steerVisualRotation & 0xFFFF) - 0x8000;
WRAP(angle, -0x8000, 0x8000);
if (angle > 0x4000 || angle < -0x4000) {
if (racer->wrongWayCounter < 200 && racer->velocity <= -1.0) {
racer->wrongWayCounter += updateRate;
}
} else {
racer->wrongWayCounter = 0;
}
diffY = diffX;
diffX = diffZ;
diffZ = -diffY;
splinePos = obj->trans.x_position;
distance = obj->trans.z_position;
diffX = -(((splinePos * diffX) + (diffZ * distance) - ((tempZ * diffZ) + (diffX * tempX))) / divisor);
if (diffX > 5.0f) {
diffX = 5.0f;
}
if (diffX < -5.0f) {
diffX = -5.0f;
}
racer->unk1BA += (s32) diffX;
diffY = (obj->trans.y_position - tempY) / divisor;
if (diffY > 100.0f) {
diffY = 100.0f;
}
if (diffY < -100.0f) {
diffY = -100.0f;
}
racer->unk1BC += (s32) diffY;
return;
}
if (splinePos < 0.0f) {
splinePos = 0.0f;
}
temp_v0_4 = find_next_checkpoint_node(racer->checkpoint, racer->unk1C8);
scale = temp_v0_4->scale;
counter = racer->checkpoint - 1;
if (counter < 0) {
counter = temp_v0 - 1;
}
temp_v0_4 = get_checkpoint_node(counter);
distance = temp_v0_4->scale;
divisor = ((scale - temp_v0_4->scale) * splinePos) + distance;
counter = racer->checkpoint - 2;
if (counter < 0) {
counter += temp_v0;
}
for (i = 0; (i < 5) ^ 0; i++) {
temp_v0_4 = find_next_checkpoint_node(counter, racer->unk1C8);
posX[i] = temp_v0_4->x + ((temp_v0_4->scale * temp_v0_4->rotationZFrac) * racer->unk1BA);
posY[i] = temp_v0_4->y + (temp_v0_4->scale * racer->unk1BC);
posZ[i] = temp_v0_4->z + ((temp_v0_4->scale * (-temp_v0_4->rotationXFrac)) * racer->unk1BA);
counter++;
if (counter == temp_v0) {
counter = 0;
}
}
splineIndex = FALSE;
if (splinePos >= 1.0) {
splinePos -= 1.0;
splineIndex = TRUE;
}
tempX = cubic_spline_interpolation(posX, splineIndex, splinePos, &diffX);
tempY = cubic_spline_interpolation(posY, splineIndex, splinePos, &diffY);
tempZ = cubic_spline_interpolation(posZ, splineIndex, splinePos, &diffZ);
distance = sqrtf((diffX * diffX) + (diffZ * diffZ));
if (distance != 0.0f) {
scale = 1.0f / distance;
diffX *= scale;
diffZ *= scale;
}
angle = arctan2_f(diffX, diffZ) - (racer->steerVisualRotation & 0xFFFF) - 0x8000;
WRAP(angle, -0x8000, 0x8000);
if (angle > 0x4000 || angle < -0x4000) {
if (racer->wrongWayCounter < 200 && racer->velocity <= -1.0) {
racer->wrongWayCounter += updateRate;
}
} else {
racer->wrongWayCounter = 0;
}
diffY = diffX;
diffX = diffZ;
diffZ = -diffY;
splinePos = obj->trans.x_position;
distance = obj->trans.z_position;
pad = ((splinePos * diffX) + (diffZ * distance));
pad2 = -((tempZ * diffZ) + (diffX * tempX));
diffX = -((pad + pad2) / divisor);
if (diffX > 5.0f) {
diffX = 5.0f;
}
if (diffX < -5.0f) {
diffX = -5.0f;
}
racer->unk1BA += (s32) diffX;
diffY = (obj->trans.y_position - tempY) / divisor;
if (diffY > 100.0f) {
diffY = 100.0f;
}
if (diffY < -100.0f) {
diffY = -100.0f;
}
racer->unk1BC += (s32) diffY;
}
#else
#pragma GLOBAL_ASM("asm/nonmatchings/racer/func_80059208.s")
src/racer.h
+1 -1
View File
@@ -219,7 +219,7 @@ void func_8004F7F4(s32 updateRate, f32 updateRateF, Object* racerObj, Object_Rac
//Non Matching
s32 timetrial_ghost_read(Object *obj);
void update_car_velocity_offground(Object *obj, Object_Racer *racer, s32, f32);
s32 func_80017248(Object *obj, s32, s32 *, Vec3f *, f32 *, f32 *, s8 *surface);
s32 func_80017248(Object *obj, s32 arg1, s32* arg2, f32 *arg3, f32* arg4, f32* arg5, s8* surface);
void func_80059208(Object* obj, Object_Racer* racer, s32 updateRate); /* extern */
void func_80049794(s32 updateRate, f32 updateRateF, Object* obj, Object_Racer* racer); /* extern */
void func_8004CC20(s32 updateRate, f32 updateRateF, Object *racerObj, Object_Racer *racer); /* extern */
src/tracks.c
+104 -108
View File
@@ -1076,43 +1076,34 @@ s32 void_generate_primitive(f32 *arg0, f32 *arg1, f32 arg2, f32 arg3) {
return NULL;
}
// https://decomp.me/scratch/7GUjD
#ifdef NON_MATCHING
typedef struct Unk80027568_1 {
u8 unk0[0x18];
Vec4f *unk18;
} Unk80027568_1;
// https://decomp.me/scratch/duMgr
s32 func_80027568(void) {
Unk80027568_1 *var_ra; // spE4
f32 new_var;
LevelModelSegment *segment; // spE4
s32 ret;
s32 var_t4;
f32 projectedRacerPos;
f32 projectedCamPos;
f32 playerDist;
f32 camDist;
f32 scalingFactor;
f32 var_f14;
u32 curViewport;
s32 flipSide;
s32 numRacers; // spC4
s32 curViewport;
s32 isNegative;
s32 i;
Vec4f *vector;
s32 j;
f32 var_f18;
f32 temp;
f32 temp2;
f32 temp3;
f32 A1, B1, C1, D1;
f32 var_f20;
f32 var_f22;
f32 var_f24;
u16 *var_t2;
CollisionNode *colNode;
Object_Racer *racer;
f32 camXPos;
f32 camYPos;
Object **racerGroup; // sp80
Object *currentObjRacer; // sp7C
f32 A, B, C, D;
Object **racerObjects; // sp80
Object *racerObj; // sp7C
s32 index;
u16 index2;
racerGroup = get_racer_objects(&numRacers);
racerObjects = get_racer_objects(&numRacers);
if (numRacers == 0) {
return FALSE;
}
@@ -1121,68 +1112,65 @@ s32 func_80027568(void) {
return FALSE;
}
curViewport = get_current_viewport();
currentObjRacer = NULL;
racerObj = NULL;
for (i = 0; i < numRacers; i++) {
racer = racerGroup[i]->racer;
racer = racerObjects[i]->racer;
if (curViewport == racer->playerIndex) {
currentObjRacer = racerGroup[i];
racerObj = racerObjects[i];
i = numRacers; // Come on! Just use break!
}
}
if (currentObjRacer == NULL) {
if (racerObj == NULL) {
return FALSE;
}
generate_collision_candidates(1, &currentObjRacer->trans.x_position, &gSceneActiveCamera->trans.x_position, -1);
generate_collision_candidates(1, &racerObj->trans.x_position, &gSceneActiveCamera->trans.x_position, -1);
ret = FALSE;
// bug? var_ra can be undefined?
for (var_t4 = 0; var_t4 < gNumCollisionCandidates && ret == FALSE; var_t4++) {
if ((s32) gCollisionCandidates[var_t4] > 0) {
var_ra = (Unk80027568_1 *) PHYS_TO_K0(gCollisionCandidates[var_t4]);
if (gCollisionCandidates[var_t4] > 0) {
// this is segment Entry
segment = (LevelModelSegment *) (gCollisionCandidates[var_t4] | 0x80000000);
} else {
var_t2 = gCollisionCandidates[var_t4];
vector = var_ra->unk18;
vector += var_t2[0];
new_var = vector->x;
colNode = (CollisionNode *) gCollisionCandidates[var_t4];
index = colNode->colPlaneIndex << 2;
A = segment->collisionPlanes[index + 0];
B = segment->collisionPlanes[index + 1];
C = segment->collisionPlanes[index + 2];
D = segment->collisionPlanes[index + 3];
camXPos = gSceneActiveCamera->trans.x_position;
camYPos = gSceneActiveCamera->trans.y_position;
camDist = A * gSceneActiveCamera->trans.x_position + B * gSceneActiveCamera->trans.y_position +
C * gSceneActiveCamera->trans.z_position + D - 14.0;
if (camDist < -0.1) {
playerDist = A * racerObj->trans.x_position + B * racerObj->trans.y_position +
C * racerObj->trans.z_position + D;
if (playerDist >= -0.1) {
var_f20 = (gSceneActiveCamera->trans.x_position - racerObj->trans.x_position);
var_f22 = (gSceneActiveCamera->trans.y_position - racerObj->trans.y_position);
var_f24 = (gSceneActiveCamera->trans.z_position - racerObj->trans.z_position);
projectedCamPos = (((camXPos * new_var) + (vector->y * camYPos) +
(vector->z * gSceneActiveCamera->trans.z_position) + vector->w) -
14.0);
if (projectedCamPos < -0.1) {
projectedRacerPos = (currentObjRacer->trans.x_position * new_var) +
(vector->y * currentObjRacer->trans.y_position) +
(vector->z * currentObjRacer->trans.z_position) + vector->w;
if (projectedRacerPos >= -0.1) {
var_f20 = (camXPos - currentObjRacer->trans.x_position);
var_f22 = (camYPos - currentObjRacer->trans.y_position);
var_f24 = (gSceneActiveCamera->trans.z_position - currentObjRacer->trans.z_position);
if (projectedRacerPos != projectedCamPos) {
scalingFactor = projectedRacerPos / (projectedRacerPos - projectedCamPos);
if (playerDist != camDist) {
scalingFactor = playerDist / (playerDist - camDist);
} else {
scalingFactor = 0.0f;
}
var_f20 = currentObjRacer->trans.x_position + (var_f20 * scalingFactor);
var_f22 = currentObjRacer->trans.y_position + (var_f22 * scalingFactor);
var_f24 = currentObjRacer->trans.z_position + (var_f24 * scalingFactor);
var_f20 = racerObj->trans.x_position + (var_f20 * scalingFactor);
var_f22 = racerObj->trans.y_position + (var_f22 * scalingFactor);
var_f24 = racerObj->trans.z_position + (var_f24 * scalingFactor);
for (j = 0, ret = TRUE; j < 3 && ret == TRUE; j++) {
isNegative = FALSE;
curViewport = var_t2[j + 1];
flipSide = FALSE;
curViewport = colNode->closestTri[j];
if (curViewport & 0x8000) {
curViewport &= 0x7FFF;
isNegative = TRUE;
flipSide = TRUE;
}
vector = &var_ra->unk18[curViewport];
temp = vector->x;
temp2 = vector->y;
temp3 = vector->z;
var_f14 = vector->w;
var_f18 = (temp * var_f20) + (temp2 * var_f22) + (temp3 * var_f24) + var_f14;
if (isNegative) {
curViewport = 4 * curViewport;
A1 = segment->collisionPlanes[curViewport + 0];
B1 = segment->collisionPlanes[curViewport + 1];
C1 = segment->collisionPlanes[curViewport + 2];
D1 = segment->collisionPlanes[curViewport + 3];
var_f18 = A1 * var_f20 + B1 * var_f22 + C1 * var_f24 + D1;
if (flipSide) {
var_f18 = -var_f18;
}
if (var_f18 > 4.0f) {
@@ -1481,9 +1469,9 @@ void trackbg_render_flashy(void) {
var_t2 = *gCurrentLevelHeader2->unk74;
var_a2 = -1;
if ((s32) var_t2 != -1) {
if ((u32) var_t2 != -1) {
levelHeader = gCurrentLevelHeader2->unk74[1];
if ((s32) levelHeader == -1) {
if ((u32) levelHeader == -1) {
levelHeader = var_t2;
}
} else {
@@ -2507,48 +2495,50 @@ s32 get_wave_properties(f32 yPos, f32 *waterHeight, Vec3f *rotation) {
return gTrackWaves[index]->type;
}
// https://decomp.me/scratch/X1SBi
// https://decomp.me/scratch/5Useu
#ifdef NON_EQUIVALENT
s32 func_8002B0F4(s32 levelSegmentIndex, f32 xIn, f32 zIn, WaterProperties ***arg3) {
LevelModelSegment *currentSegment;
LevelModelSegmentBoundingBox *currentBoundingBox;
Triangle *tri;
Vertex *vert;
f32 temp_f2_2;
s32 pad;
s16 vert2X;
s16 vert2Z;
s16 temp_a2;
s16 vert3X;
s32 sp108;
s16 vert3Z;
s32 currentVerticesOffset;
s16 nextFaceOffset;
s16 vert1X;
s16 currentFaceOffset;
s32 pad2;
s32 currentVerticesOffset;
s32 nextFaceOffset;
s32 currentFaceOffset;
s16 vert1Z;
s16 var_a1;
s32 faceNum;
s16 var_s1;
s16 var_t0;
s16 var_t1;
s8 surface;
s32 XInInt;
s32 ZInInt;
s32 temp_ra_1;
s32 temp_ra_2;
s32 temp_ra_3;
s32 spB0[8];
s32 yOutCount;
s32 batchNum;
s32 i;
s32 var_v0;
s32 stopSorting;
TriangleBatchInfo *currentBatch;
f32 *temp_v1_4;
s32 pad3;
Vec4f tempVec4f;
u16 temp;
s32 sp108;
s32 spB0[8];
s32 surface;
s32 temp;
s32 var_fp;
WaterProperties *wave;
WaterProperties *wave2;
D_8011D308 = 0;
*arg3 = NULL;
@@ -2558,15 +2548,16 @@ s32 func_8002B0F4(s32 levelSegmentIndex, f32 xIn, f32 zIn, WaterProperties ***ar
return 0;
}
XInInt = xIn;
ZInInt = zIn;
yOutCount = 0;
for (var_fp = 0; var_fp < sp108; var_fp++) {
currentSegment = &gCurrentLevelModel->segments[spB0[var_fp]];
currentBoundingBox = &gCurrentLevelModel->segmentsBoundingBoxes[spB0[var_fp]];
var_a1 = 1;
var_s1 = 0;
XInInt = xIn;
ZInInt = zIn;
temp_a2 = ((currentBoundingBox->x2 - currentBoundingBox->x1) >> 3) + 1;
var_t0 = temp_a2 + currentBoundingBox->x1;
var_t1 = currentBoundingBox->x1;
@@ -2578,9 +2569,11 @@ s32 func_8002B0F4(s32 levelSegmentIndex, f32 xIn, f32 zIn, WaterProperties ***ar
var_t1 += temp_a2;
var_a1 *= 2;
}
// Same as above, but for Z
temp_a2 = ((currentBoundingBox->z2 - currentBoundingBox->z1) >> 3) + 1;
// @fake for s3 vs s2
if (1) {}
var_t0 = temp_a2 + currentBoundingBox->z1;
var_t1 = currentBoundingBox->z1;
for (i = 0; i < 8; i++) {
@@ -2591,50 +2584,47 @@ s32 func_8002B0F4(s32 levelSegmentIndex, f32 xIn, f32 zIn, WaterProperties ***ar
var_t1 += temp_a2;
var_a1 *= 2;
}
yOutCount = 0;
for (batchNum = 0; batchNum < currentSegment->numberOfBatches; batchNum++) {
currentBatch = &currentSegment->batches[batchNum];
surface = gCurrentLevelModel->textures[currentBatch->textureIndex].surfaceType;
currentFaceOffset = currentBatch->facesOffset;
nextFaceOffset = currentBatch[1].facesOffset;
currentVerticesOffset = currentBatch->verticesOffset;
nextFaceOffset = currentBatch[1].facesOffset;
if (surface != SURFACE_WATER_CALM && surface != SURFACE_WATER_UNK_F &&
(currentBatch->flags & (RENDER_HIDDEN | RENDER_NO_COLLISION))) {
currentFaceOffset = nextFaceOffset;
}
for (faceNum = currentFaceOffset; faceNum < nextFaceOffset; faceNum++) {
if (var_s1 == (currentSegment->unk10[faceNum] & var_s1)) {
tri = &currentSegment->triangles[faceNum];
vert = &currentSegment->vertices[tri->verticesArray[1] + currentVerticesOffset];
vert1X = vert->x;
vert1Z = vert->z;
vert = &currentSegment->vertices[tri->verticesArray[2] + currentVerticesOffset];
vert2X = vert->x;
vert2Z = vert->z;
vert = &currentSegment->vertices[tri->verticesArray[3] + currentVerticesOffset];
vert3X = vert->x;
vert3Z = vert->z;
temp_ra_1 =
((((XInInt - vert2X) * (vert3Z - vert2Z)) - ((vert3X - vert2X) * (ZInInt - vert2Z))) >= 0);
temp_ra_2 =
((((XInInt - vert1X) * (vert2Z - vert1Z)) - ((vert2X - vert1X) * (ZInInt - vert1Z))) >= 0);
temp_ra_3 =
((((XInInt - vert1X) * (vert3Z - vert1Z)) - ((vert3X - vert1X) * (ZInInt - vert1Z))) >= 0);
temp_ra_1 = (((XInInt - vert2X) * (vert3Z - vert2Z)) - ((vert3X - vert2X) * (ZInInt - vert2Z))) >= 0;
temp_ra_2 = (((XInInt - vert1X) * (vert2Z - vert1Z)) - ((vert2X - vert1X) * (ZInInt - vert1Z))) >= 0;
temp_ra_3 = (((XInInt - vert1X) * (vert3Z - vert1Z)) - ((vert3X - vert1X) * (ZInInt - vert1Z))) >= 0;
if (temp_ra_1 == temp_ra_2 && temp_ra_2 != temp_ra_3) {
temp = currentSegment->collisionFacets[faceNum].basePlaneIndex;
temp_v1_4 = (f32 *) &currentSegment->collisionPlanes[temp * 4];
tempVec4f.x = temp_v1_4[0];
tempVec4f.y = temp_v1_4[1];
tempVec4f.z = temp_v1_4[2];
tempVec4f.w = temp_v1_4[3];
tempVec4f.x = currentSegment->collisionPlanes[temp * 4 + 0];
tempVec4f.y = currentSegment->collisionPlanes[temp * 4 + 1];
tempVec4f.z = currentSegment->collisionPlanes[temp * 4 + 2];
tempVec4f.w = currentSegment->collisionPlanes[temp * 4 + 3];
if (tempVec4f.y != 0.0) {
D_8011D128[yOutCount].type = surface;
D_8011D128[yOutCount].waveHeight =
-(((tempVec4f.x * xIn) + (tempVec4f.z * zIn) + tempVec4f.w) / tempVec4f.y);
D_8011D128[yOutCount].waveHeight = -(((tempVec4f.x * xIn) + (tempVec4f.z * zIn) + tempVec4f.w) / tempVec4f.y);
D_8011D128[yOutCount].rot.x = tempVec4f.x;
D_8011D128[yOutCount].rot.y = tempVec4f.y;
D_8011D128[yOutCount].rot.z = tempVec4f.z;
@@ -2652,12 +2642,14 @@ s32 func_8002B0F4(s32 levelSegmentIndex, f32 xIn, f32 zIn, WaterProperties ***ar
}
}
// @diff gCurrentLevelModel is stored in a0? Might be fixed if the bottom for and do-while is fixed
if (levelSegmentIndex >= 0 && levelSegmentIndex < gCurrentLevelModel->numberOfSegments) {
currentSegment = &gCurrentLevelModel->segments[levelSegmentIndex];
D_8011D128[yOutCount].type = SURFACE_WATER_WAVY;
if (gCurrentLevelModel->segments[levelSegmentIndex].hasWaves && gWaveBlockCount != 0) {
D_8011D128[yOutCount].waveHeight = func_800BB2F4(levelSegmentIndex, xIn, zIn, &D_8011D128[yOutCount].rot);
if (currentSegment->hasWaves && gWaveBlockCount != 0) {
D_8011D128[yOutCount].waveHeight = func_800BB2F4(levelSegmentIndex, xIn, zIn, &(yOutCount + D_8011D128)->rot);
} else {
D_8011D128[yOutCount].waveHeight = gCurrentLevelModel->segments[levelSegmentIndex].unk38;
D_8011D128[yOutCount].waveHeight = currentSegment->unk38;
D_8011D128[yOutCount].rot.x = 0.0f;
D_8011D128[yOutCount].rot.y = 1.0f;
D_8011D128[yOutCount].rot.z = 0.0f;
@@ -2666,17 +2658,21 @@ s32 func_8002B0F4(s32 levelSegmentIndex, f32 xIn, f32 zIn, WaterProperties ***ar
}
// clang-format off
for (i = 0; i < yOutCount; i++) { gTrackWaves[i] = &D_8011D128[i]; }
for (var_v0 = 0; var_v0 < yOutCount; var_v0++) {\
wave = &D_8011D128[var_v0];\
gTrackWaves[var_v0] = wave;\
}\
// clang-format on
do {
stopSorting = TRUE;
for (i = 0; i < yOutCount - 1; i++) {
if (gTrackWaves[i]->waveHeight < gTrackWaves[i + 1]->waveHeight) {
WaterProperties *wave = gTrackWaves[i];
for (var_v0 = 0; var_v0 < yOutCount - 1; var_v0++) {
wave = gTrackWaves[var_v0 + 1]; // @fake?
if (gTrackWaves[var_v0]->waveHeight < gTrackWaves[var_v0 + 1]->waveHeight) {
stopSorting = FALSE;
gTrackWaves[i] = gTrackWaves[i + 1];
gTrackWaves[i + 1] = wave;
wave = gTrackWaves[var_v0];
gTrackWaves[var_v0] = gTrackWaves[var_v0 + 1];
gTrackWaves[var_v0 + 1] = wave;
}
}
} while (!stopSorting);