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

match: func_8001C6C4 (#628)

Browse Source
This commit is contained in:
Dominik Peters
2025-06-17 09:05:30 -04:00
committed by GitHub
parent 65a2043d23
commit c797becf16
2 changed files with 108 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+5 -5
View File
@@ -7,7 +7,7 @@ All versions are supported, and the US 1.0 version (SHA1 = 0cb115d8716dbbc2922fd
<!-- README_SCORE_SUMMARY_BEGIN -->
As of June 16, 2025, this is our current score:
&emsp;&emsp;&emsp;&emsp;Decomp progress: 91.59%
&emsp;&emsp;&emsp;&emsp;Decomp progress: 91.75%
&emsp;&emsp;&emsp;&emsp;Documentation progress: 59.08%
<!-- README_SCORE_SUMMARY_END -->
@@ -121,11 +121,11 @@ As of June 16, 2025, this is our current score:
```
=====================================================================
ADVENTURE ONE (ASM -> C Decompilation)
--------------- 91.59% Complete (92.37% NON_MATCHING) ---------------
# Decompiled functions: 1919
# GLOBAL_ASM remaining: 28
--------------- 91.75% Complete (92.53% NON_MATCHING) ---------------
# Decompiled functions: 1920
# GLOBAL_ASM remaining: 27
# NON_MATCHING functions: 4
# NON_EQUIVALENT WIP functions: 24
# NON_EQUIVALENT WIP functions: 23
---------------------------- Game Status ----------------------------
Balloons: 43/47, Keys: 4/4, Trophies: 4/5
T.T. Amulets: 4/4, Wizpig Amulets: 4/4
src/objects.c
+103 -111
View File
@@ -7787,140 +7787,132 @@ s32 ainode_find_nearest(f32 diffX, f32 diffY, f32 diffZ, s32 useElevation) {
return result;
}
// https://decomp.me/scratch/cfVAM
#ifdef NON_EQUIVALENT
// Updated Object_NPC
f32 func_8001C6C4(Object_NPC *npc, Object *npcParentObj, f32 updateRateF, f32 speedF, s32 direction) {
Object *aiNode;
f32 var_f20_2;
f32 xPosData[5];
f32 yPosData[5];
f32 zPosData[5];
f32 xPositions[5];
f32 yPositions[5];
f32 zPositions[5];
f32 xDiff2;
f32 yDiff2;
f32 zDiff2;
Object *aiNode;
f32 dist;
f32 xDiff;
f32 yDiff;
f32 zDiff;
f32 dist;
f32 dist2;
f32 mag;
f32 tempYDiff;
UNUSED s32 pad_sp84;
s32 i;
f32 var_f20_2;
s32 var_s0;
s32 var_s1;
u8 nodeForward1;
u8 nodeForward2;
s32 someBool;
if (osTvType == OS_TV_TYPE_PAL) {
updateRateF *= 1.2;
}
i = 0;
while (1) {
for (i = 0; i < 5; i++) {
if (npc->nodeData[i] == 0xFF) {
return 0.0f;
}
aiNode = ainode_get(npc->nodeData[i]);
if (aiNode == NULL) {
return 0.0f;
}
xPosData[i] = aiNode->segment.trans.x_position;
yPosData[i] = aiNode->segment.trans.y_position;
zPosData[i] = aiNode->segment.trans.z_position;
i++;
if (i != 5) {
continue;
}
// This puts xPosData into yDiff2, and yPosData into xDiff2. Bug?
yDiff2 = catmull_rom_interpolation(xPosData, 0, npc->unk0);
xDiff2 = catmull_rom_interpolation(yPosData, 0, npc->unk0);
zDiff2 = catmull_rom_interpolation(zPosData, 0, npc->unk0);
if (npc->unk8 == 0.0f) {
npc->unk8 = 0.01f;
}
var_s1 = 0;
for (var_s0 = 0; var_s0 != 2; var_s0++) {
var_f20_2 = npc->unk0 + (npc->unk8 * updateRateF);
if (var_f20_2 >= 1.0) {
var_f20_2 -= 1.0;
var_s1 = 1;
}
xDiff = catmull_rom_interpolation(xPosData, var_s1, var_f20_2);
yDiff = catmull_rom_interpolation(yPosData, var_s1, var_f20_2);
zDiff = catmull_rom_interpolation(zPosData, var_s1, var_f20_2);
// This puts mixes up y and x diffs like above.
xDiff -= yDiff2;
yDiff -= xDiff2;
zDiff -= zDiff2;
if (var_s0 == 0) {
var_s1 = 0;
dist = sqrtf((xDiff * xDiff) + (yDiff * yDiff) + (zDiff * zDiff)) / updateRateF;
if (dist != 0.0f) {
npc->unk8 *= (speedF / dist);
}
}
}
npc->unk0 = var_f20_2;
xDiff2 += xDiff;
yDiff2 += yDiff;
zDiff2 += zDiff;
xDiff = xDiff2 - npcParentObj->segment.trans.x_position;
yDiff = yDiff2 - npcParentObj->segment.trans.y_position;
if (0) {}
zDiff = zDiff2 - npcParentObj->segment.trans.z_position;
xDiff2 = xDiff;
yDiff2 = yDiff;
zDiff2 = zDiff;
dist = sqrtf((xDiff * xDiff) + (yDiff * yDiff) + (zDiff * zDiff));
if (dist != 0.0f) {
mag = 255.0 / dist;
xDiff *= mag;
yDiff *= mag;
zDiff *= mag;
}
dist2 = sqrtf((xDiff2 * xDiff2) + (yDiff2 * yDiff2) + (zDiff2 * zDiff2)) / 16;
if (speedF < dist2) {
dist2 = speedF;
}
if (dist2 >= 1.0) {
var_s0 = (arctan2_f(xDiff, zDiff) - (npcParentObj->segment.trans.rotation.y_rotation & 0xFFFF)) - 0x8000;
if (var_s0 > 0x8000) {
var_s0 -= 0xFFFF;
}
if (var_s0 < -0x8000) {
var_s0 += 0xFFFF;
}
npcParentObj->segment.trans.rotation.y_rotation += (var_s0 * (s32) updateRateF) >> 4;
var_s0 = arctan2_f(yDiff, 255.0f) - (npcParentObj->segment.trans.rotation.x_rotation & 0xFFFF);
if (var_s0 > 0x8000) {
var_s0 -= 0xFFFF;
}
if (var_s0 < -0x8000) {
var_s0 += 0xFFFF;
}
npcParentObj->segment.trans.rotation.x_rotation += ((var_s0 * (s32) updateRateF) >> 4);
}
npcParentObj->segment.trans.rotation.z_rotation = 0;
xDiff = sins_f(npcParentObj->segment.trans.rotation.y_rotation + 0x8000) * dist2;
move_object(npcParentObj, xDiff * updateRateF, 0.0f,
coss_f(npcParentObj->segment.trans.rotation.y_rotation + 0x8000) * dist2 * updateRateF);
npcParentObj->segment.trans.y_position = yDiff2;
dist2 = dist2 * updateRateF * 2;
if (var_s1 != 0) {
nodeForward1 = npc->nodeData[3];
nodeForward2 = npc->nodeData[4];
npc->nodeData[0] = npc->nodeData[1];
npc->nodeData[1] = npc->nodeData[2];
npc->nodeData[2] = npc->nodeData[3];
npc->nodeData[3] = npc->nodeData[4];
npc->nodeData[4] = ainode_find_next(nodeForward2 & 0xFF, nodeForward1 & 0xFF, direction);
}
return dist2;
xPositions[i] = aiNode->segment.trans.x_position;
yPositions[i] = aiNode->segment.trans.y_position;
zPositions[i] = aiNode->segment.trans.z_position;
}
xDiff2 = catmull_rom_interpolation(xPositions, 0, npc->unk0);
yDiff2 = catmull_rom_interpolation(yPositions, 0, npc->unk0);
zDiff2 = catmull_rom_interpolation(zPositions, 0, npc->unk0);
someBool = FALSE;
if (npc->unk8 == 0.0f) {
npc->unk8 = 0.01f;
}
for (var_s0 = 0; var_s0 != 2; var_s0++) {
var_f20_2 = npc->unk0 + (npc->unk8 * updateRateF);
if (var_f20_2 >= 1.0) {
someBool = TRUE;
var_f20_2 -= 1.0;
}
xDiff = catmull_rom_interpolation(xPositions, someBool, var_f20_2);
yDiff = catmull_rom_interpolation(yPositions, someBool, var_f20_2);
zDiff = catmull_rom_interpolation(zPositions, someBool, var_f20_2);
xDiff -= xDiff2;
yDiff -= yDiff2;
zDiff -= zDiff2;
if (var_s0 == 0) {
someBool = FALSE;
dist = sqrtf((xDiff * xDiff) + (yDiff * yDiff) + (zDiff * zDiff)) / updateRateF;
if (dist != 0.0f) {
npc->unk8 *= (speedF / dist);
}
}
}
npc->unk0 = var_f20_2;
xDiff2 = xDiff + xDiff2;
tempYDiff = yDiff2 = yDiff + yDiff2;
zDiff2 = zDiff + zDiff2;
xDiff = xDiff2 - npcParentObj->segment.trans.x_position;
yDiff = yDiff2 - npcParentObj->segment.trans.y_position;
zDiff = zDiff2 - npcParentObj->segment.trans.z_position;
xDiff2 = xDiff;
yDiff2 = yDiff;
zDiff2 = zDiff;
dist = sqrtf((xDiff * xDiff) + (yDiff * yDiff) + (zDiff * zDiff));
if (dist != 0.0f) {
dist = 255.0 / dist;
xDiff *= dist;
yDiff *= dist;
zDiff *= dist;
}
dist = sqrtf((xDiff2 * xDiff2) + (yDiff2 * yDiff2) + (zDiff2 * zDiff2)) / 16;
if (speedF < dist) {
dist = speedF;
}
if (dist >= 1.0) {
var_s0 = (arctan2_f(xDiff, zDiff) - (npcParentObj->segment.trans.rotation.y_rotation & 0xFFFF)) - 0x8000;
if (var_s0 > 0x8000) {
var_s0 -= 0xFFFF;
}
if (var_s0 < -0x8000) {
var_s0 += 0xFFFF;
}
npcParentObj->segment.trans.rotation.y_rotation += ((var_s0 * (s32) updateRateF)) >> 4;
var_s0 = arctan2_f(yDiff, 255.0f) - (npcParentObj->segment.trans.rotation.x_rotation & 0xFFFF);
if (var_s0 > 0x8000) {
var_s0 -= 0xFFFF;
}
if (var_s0 < -0x8000) {
var_s0 += 0xFFFF;
}
npcParentObj->segment.trans.rotation.x_rotation += ((var_s0 * (s32) updateRateF)) >> 4;
}
npcParentObj->segment.trans.rotation.z_rotation = 0;
xDiff = sins_f((s16) (npcParentObj->segment.trans.rotation.y_rotation + 0x8000)) * dist;
move_object(npcParentObj, xDiff * updateRateF, 0.0f,
coss_f((npcParentObj->segment.trans.rotation.y_rotation + 0x8000)) * dist * updateRateF);
npcParentObj->segment.trans.y_position = tempYDiff;
dist = dist * updateRateF * 2;
if (someBool != 0) {
npc->nodeData[0] = npc->nodeData[1];
npc->nodeData[1] = npc->nodeData[2];
npc->nodeData[2] = npc->nodeData[3];
npc->nodeData[3] = npc->nodeData[4];
npc->nodeData[4] = ainode_find_next(npc->nodeData[3], npc->nodeData[2], direction);
}
return dist;
}
#else
#pragma GLOBAL_ASM("asm/nonmatchings/objects/func_8001C6C4.s")
#endif
s32 ainode_find_next(s32 nodeId, s32 nextNodeId, s32 direction) {
Object *aiNodeObj;