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_800B92F4 / func_800B97A8 (#501)

Browse Source 
* match: func_800B92F4

* fix: score.py script crashing on invalid / empty address

* match: func_800B97A8
This commit is contained in:
Dominik Peters
2025-04-05 21:06:23 -04:00
committed by GitHub
parent 34508976cd
commit fa806d366f
5 changed files with 220 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+10 -10
View File
@@ -5,9 +5,9 @@ This repo contains a work-in-progress decompilation of Diddy Kong Racing for the
All versions are supported, and the US 1.0 version (SHA1 = 0cb115d8716dbbc2922fda38e533b9fe63bb9670) of the game is the default if not specified.
<!-- README_SCORE_SUMMARY_BEGIN -->
As of March 28, 2025, this is our current score:
As of April 6, 2025, this is our current score:
&emsp;&emsp;&emsp;&emsp;Decomp progress: 76.84%
&emsp;&emsp;&emsp;&emsp;Decomp progress: 77.14%
&emsp;&emsp;&emsp;&emsp;Documentation progress: 49.86%
<!-- README_SCORE_SUMMARY_END -->
@@ -117,25 +117,25 @@ s32 is_drumstick_unlocked(void) {
```
<!-- README_SCORE_BEGIN -->
As of March 28, 2025, this is our current score:
As of April 6, 2025, this is our current score:
```
=======================================================================
ADVENTURE ONE (ASM -> C Decompilation)
---------------- 76.84% Complete (79.45% NON_MATCHING) ----------------
# Decompiled functions: 1837
# GLOBAL_ASM remaining: 114
---------------- 77.14% Complete (79.75% NON_MATCHING) ----------------
# Decompiled functions: 1840
# GLOBAL_ASM remaining: 111
# NON_MATCHING functions: 14
# NON_EQUIVALENT WIP functions: 35
# NON_EQUIVALENT WIP functions: 36
----------------------------- Game Status -----------------------------
Balloons: 36/47, Keys: 4/4, Trophies: 3/5
T.T. Amulets: 4/4, Wizpig Amulets: 3/4
-----------------------------------------------------------------------
We are collecting silver coins in Greenwood Village. (6/8 silver coins)
We are collecting silver coins in Greenwood Village. (8/8 silver coins)
=======================================================================
ADVENTURE TWO (Cleanup & Documentation)
--------------------------- 49.86% Complete ---------------------------
# Documented functions: 1088
# Undocumented remaining: 566
# Documented functions: 1089
# Undocumented remaining: 565
----------------------------- Game Status -----------------------------
Balloons: 24/47, Keys: 3/4, Trophies: 2/5
T.T. Amulets: 2/4, Wizpig Amulets: 2/4
rename.sh
+1 -1
View File
@@ -25,7 +25,7 @@ fi
grep -rl "$1" asm/**/*.s src/**/*.{c,h} lib/**/*.{c,s} include/*.h undefined_syms.txt dkr.ld | xargs sed -i "s/\b$1\b/$2/g"
# Rename filenames & directories.
python3 ./tools/python/rename_file.py "$1" "$2"
.venv/bin/python3 ./tools/python/rename_file.py "$1" "$2"
# This removes all the .o files that use the old name.
grep -rl "$1" build/**/*.o | xargs rm
src/waves.c
+199 -11
View File
@@ -12,7 +12,7 @@
/************ .data ************/
f32 *D_800E3040 = NULL;
s16 *D_800E3044 = NULL;
Vec2s *D_800E3044 = NULL;
s32 *D_800E3048 = NULL;
f32 *D_800E304C[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
@@ -117,12 +117,9 @@ typedef struct unk8012A5E8 {
s16 unk4;
s16 unk6;
s32 unk8;
s16 unkC;
} unk8012A5E8;
unk8012A5E8 *D_8012A5E8;
UNUSED s32 D_8012A5EC;
UNUSED s32 D_8012A5F0;
unk8012A5E8 D_8012A5E8[1];
s16 D_8012A5F4;
UNUSED s32 D_8012A5F8;
UNUSED s32 D_8012A5FC;
@@ -172,7 +169,7 @@ void wave_init(void) {
free_waves();
D_800E3040 = (f32 *) mempool_alloc_safe(D_80129FC8.unk20 << 2, COLOUR_TAG_CYAN);
D_800E3044 = (s16 *) mempool_alloc_safe((D_80129FC8.unk4 << 2) * D_80129FC8.unk4, COLOUR_TAG_CYAN);
D_800E3044 = (Vec2s *) mempool_alloc_safe((D_80129FC8.unk4 << 2) * D_80129FC8.unk4, COLOUR_TAG_CYAN);
D_800E3048 = (s32 *) mempool_alloc_safe(((D_80129FC8.unk0 + 1) << 2) * (D_80129FC8.unk0 + 1), COLOUR_TAG_CYAN);
allocSize = ((D_80129FC8.unk0 + 1) << 2) * (D_80129FC8.unk0 + 1);
D_800E304C[0] = mempool_alloc_safe(allocSize * ARRAY_COUNT(D_800E304C), COLOUR_TAG_CYAN);
@@ -290,8 +287,8 @@ void func_800B82B4(LevelModel *arg0, LevelHeader *arg1, s32 arg2) {
if (D_80129FC8.unk4 > 0) {
for (i = 0; i < D_80129FC8.unk4; i++) {
for (var_s0 = 0; var_s0 < D_80129FC8.unk4; var_s0++) {
D_800E3044[(var_s0 * 2)] = get_random_number_from_range(0, D_80129FC8.unk20 - 1);
D_800E3044[(var_s0 * 2) + 1] = get_random_number_from_range(0, D_80129FC8.unk20 - 1);
D_800E3044[var_s0].s[0] = get_random_number_from_range(0, D_80129FC8.unk20 - 1);
D_800E3044[var_s0].s[1] = get_random_number_from_range(0, D_80129FC8.unk20 - 1);
}
}
}
@@ -438,7 +435,7 @@ void func_800B8C04(s32 xPosition, s32 yPosition, s32 zPosition, s32 currentViewp
// possible fake:
xPosRatio = (xPosition - D_8012A0D0) / gWaveBoundingBoxDiffX;
zPosRatio = (zPosition - D_8012A0D4) / gWaveBoundingBoxDiffZ;
D_8012A5E8 = -1;
D_8012A5E8[0].unk0 = -1;
D_8012A5F4 = -1;
// This is incorrect because the assembly compares
@@ -581,8 +578,199 @@ s32 func_800B9228(LevelModelSegment *arg0) {
return result;
}
#pragma GLOBAL_ASM("asm/nonmatchings/waves/func_800B92F4.s")
#pragma GLOBAL_ASM("asm/nonmatchings/waves/func_800B97A8.s")
void func_800B92F4(s32 arg0, s32 arg1) {
s32 i;
s32 var_s2;
s32 j;
f32 temp_f22;
f32 var_f20;
s32 sp98;
s32 var_v0;
s32 sp90;
s32 sp8C;
s32 sp88;
s32 sp84;
s32 var_v1;
s32 vertexIdx;
s32 var_s1;
s32 k;
Vertex *vertices;
LevelModel_Alternate *sp6C;
temp_f22 = (1.0f - D_80129FC8.unk44) / 255.0f;
sp6C = &D_800E30D8[arg0];
sp90 = (D_80129FC8.unk0 + 1) * (D_80129FC8.unk0 + 1);
for (k = 0; D_8012A5E8[k].unk0 != -1; k++) {
if (arg0 != D_8012A5E8[k].unk0) {
continue;
}
if (D_80129FC8.unk28 != 0) {
sp98 = (((u32) D_800E30D4[sp6C->unkC] >> (D_8012A5E8[k].unk2 * 8)) & 0xFF) - 1;
sp8C = (D_8012A5E8[k].unk2 & 1) * D_80129FC8.unk0;
sp88 = ((D_8012A5E8[k].unk2 & 2) >> 1) * D_80129FC8.unk0;
} else {
sp98 = (D_800E30D4[sp6C->unkC] & 0xFF) - 1;
sp8C = 0;
sp88 = 0;
}
sp84 = D_8012A5E8[k].unk6;
vertices = &D_800E3070[D_8012A018 + arg1][sp90 * sp98];
sp98 = D_800E30E4[sp98];
vertexIdx = 0;
for (i = 0; i <= D_80129FC8.unk0; i++) {
var_s1 = D_8012A5E8[k].unk4;
var_s2 = (sp84 * D_80129FC8.unk4) + var_s1;
for (j = 0; j <= D_80129FC8.unk0; j++) {
var_f20 =
(D_800E3040[D_800E3044[var_s2].s[0]] + D_800E3040[D_800E3044[var_s2].s[1]]) * D_80129FC8.magnitude;
if (D_800E3188 > 0) {
var_f20 += func_800BEFC4(arg0, j + sp8C, i + sp88);
}
var_f20 *= D_800E304C[sp98][vertexIdx];
var_v0 = ((u8 *) ((s32) D_800E3178 + D_8012A5E8[k].unk8))[0];
// clang-format off
var_v0 <<= 1; \
D_8012A5E8[k].unk8++;
// clang-format on
if (var_v0 < 0xFF) {
var_f20 *= D_80129FC8.unk44 + ((f32) var_v0 * temp_f22);
}
var_v0 += (s32) (var_f20 * D_80129FC8.unk48);
if (var_v0 >= 0x100) {
var_v0 = 0xFF;
} else if (var_v0 < 0) {
var_v0 = 0;
}
var_v0 += ((0xFF - var_v0) * sp6C->unk14[arg1 >> 1].unk0[D_8012A5E8[k].unk2]) >> 7;
vertices[vertexIdx].y = var_f20;
if (var_v0 < 0xC0) {
var_v1 = 0xFF;
} else {
var_v1 = ((0xFF - var_v0) * 4) & 0xFF;
}
vertices[vertexIdx].r = var_v1;
vertices[vertexIdx].g = var_v1;
vertices[vertexIdx].b = var_v1;
if (var_v0 < 0x40) {
var_v1 = (var_v0 * 4) & 0xFF;
} else {
var_v1 = 0xFF;
}
vertices[vertexIdx].a = var_v1;
vertexIdx++;
var_s1++;
var_s2++;
if (var_s1 >= D_80129FC8.unk4) {
var_s1 -= D_80129FC8.unk4;
var_s2 -= D_80129FC8.unk4;
}
}
sp84++;
if (sp84 >= D_80129FC8.unk4) {
sp84 -= D_80129FC8.unk4;
}
if (D_80129FC8.unk28 != 0) {
D_8012A5E8[k].unk8 += D_80129FC8.unk0;
}
}
}
}
void func_800B97A8(s32 arg0, s32 arg1) {
s32 var_v0;
f32 temp_f26;
s32 vertexIdx;
s32 spA8;
f32 var_f20;
s32 spA0;
s32 sp9C;
s32 sp98;
s32 var_a0;
f32 var_f28;
s32 var_s1;
s32 i;
s32 var_s2;
s32 j;
Vertex *vertices;
LevelModel_Alternate *sp78;
s32 k;
k = 0;
temp_f26 = D_8012A020 * 2.0f - D_8012A01C * 2.0f;
spA0 = (D_80129FC8.unk0 + 1) * (D_80129FC8.unk0 + 1);
sp78 = &D_800E30D8[arg0];
if (temp_f26 <= 0) {
var_f28 = 0;
} else {
var_f28 = 1.0f / temp_f26;
}
temp_f26 = D_8012A01C * 2.0f;
for (; D_8012A5E8[k].unk0 != -1; k++) {
if (arg0 != D_8012A5E8[k].unk0) {
continue;
}
if (D_80129FC8.unk28 != 0) {
spA8 = (((u32) D_800E30D4[sp78->unkC] >> (D_8012A5E8[k].unk2 * 8)) & 0xFF) - 1;
sp9C = (D_8012A5E8[k].unk2 & 1) * D_80129FC8.unk0;
sp98 = ((s32) (D_8012A5E8[k].unk2 & 2) >> 1) * D_80129FC8.unk0;
} else {
spA8 = (D_800E30D4[sp78->unkC] & 0xFF) - 1;
sp9C = 0;
sp98 = 0;
}
var_a0 = D_8012A5E8[k].unk6;
vertices = &D_800E3070[D_8012A018 + arg1][spA0 * spA8];
spA8 = D_800E30E4[spA8];
i = 0;
vertexIdx = 0;
for (; i <= D_80129FC8.unk0; i++) {
var_s1 = D_8012A5E8[k].unk4;
var_s2 = (var_a0 * D_80129FC8.unk4) + var_s1;
for (j = 0; j <= D_80129FC8.unk0; j++) {
var_f20 =
(D_800E3040[D_800E3044[var_s2].s[0]] + D_800E3040[D_800E3044[var_s2].s[1]]) * D_80129FC8.magnitude;
if (D_800E3188 > 0) {
var_f20 += func_800BEFC4(arg0, j + sp9C, i + sp98);
}
var_f20 *= D_800E304C[spA8][vertexIdx];
vertices[vertexIdx].y = var_f20;
var_f20 = (var_f20 - temp_f26) * var_f28;
if (var_f20 > 1.0f) {
var_f20 = 1.0f;
} else if (var_f20 < 0) {
var_f20 = 0;
}
var_v0 = (0 * var_f20);
var_v0 += 0xFF;
vertices[vertexIdx].r = var_v0;
vertices[vertexIdx].g = var_v0;
vertices[vertexIdx].b = var_v0;
vertices[vertexIdx].a = 0xFF;
vertexIdx++;
var_s1++;
var_s2++;
if (var_s1 >= D_80129FC8.unk4) {
var_s1 -= D_80129FC8.unk4;
var_s2 -= D_80129FC8.unk4;
}
}
var_a0++;
if (var_a0 >= D_80129FC8.unk4) {
var_a0 -= D_80129FC8.unk4;
}
if (D_80129FC8.unk28 != 0) {
D_8012A5E8[k].unk8 += D_80129FC8.unk0;
}
}
}
}
#pragma GLOBAL_ASM("asm/nonmatchings/waves/func_800B9C18.s")
void func_800BA288(s32 arg0, s32 arg1) {
tools/python/score.py
+7 -2
View File
@@ -83,8 +83,13 @@ class DkrMapFile:
lineSet = 18
if (lineSet != 0):
if '=' in line:
line = line[0:line.find('=')-1]
address = int(line[lineSet:lineSet+8], 16)
line = line[0:line.find('=') - 1]
try:
address = int(line[lineSet:lineSet+8], 16)
except ValueError:
# no or incorrect address, skip
continue
if address >= CODE_START and address < CODE_END:
symbol = line[line.rfind(' ')+1:]
if (not symbol.startswith(".L") and not symbol.startswith("L800")
update-score.sh
+3 -3
View File
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
export NEW_SCORE="$(python3 ./tools/python/score.py)"
export NEW_SCORE_SUMMARY="$(python3 ./tools/python/score.py --summary)"
export NEW_SCORE="$(.venv/bin/python3 ./tools/python/score.py)"
export NEW_SCORE_SUMMARY="$(.venv/bin/python3 ./tools/python/score.py --summary)"
python3 - <<'EOF' > README.md.tmp
.venv/bin/python3 - <<'EOF' > README.md.tmp
import sys
import os
import re