Game-Decompilation/dk64
1
0
Fork 0
mirror of https://gitlab.com/dk64_decomp/dk64.git synced 2024-11-23 07:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

41.7809%

Browse Source
This commit is contained in:
Donkey Kong 2024-05-23 17:57:43 +09:30
parent 7e06d8b71f
commit 0b2260dd1f
5 changed files with 53 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
progress/progress.critter.csv
View File

@ -38,7 +38,7 @@ us,.critter,func_critter_80024518,96,yes
us,.critter,func_critter_80027034,88,yes
us,.critter,func_critter_80028840,104,yes
us,.critter,func_critter_80028DE8,256,yes
us,.critter,func_critter_8002516C,916,no
us,.critter,func_critter_8002516C,916,yes
us,.critter,func_critter_80025D1C,156,yes
us,.critter,func_critter_800257D4,220,yes
us,.critter,func_critter_80028A9C,844,no

1 version section function length matching
38 us .critter func_critter_80027034 88 yes
39 us .critter func_critter_80028840 104 yes
40 us .critter func_critter_80028DE8 256 yes
41 us .critter func_critter_8002516C 916 no yes
42 us .critter func_critter_80025D1C 156 yes
43 us .critter func_critter_800257D4 220 yes
44 us .critter func_critter_80028A9C 844 no

2
progress/progress.total.csv
View File

@ -3657,7 +3657,7 @@ us,.critter,func_critter_80024518,96,yes
us,.critter,func_critter_80027034,88,yes
us,.critter,func_critter_80028840,104,yes
us,.critter,func_critter_80028DE8,256,yes
us,.critter,func_critter_8002516C,916,no
us,.critter,func_critter_8002516C,916,yes
us,.critter,func_critter_80025D1C,156,yes
us,.critter,func_critter_800257D4,220,yes
us,.critter,func_critter_80028A9C,844,no

1 version section function length matching
3657 us .critter func_critter_80027034 88 yes
3658 us .critter func_critter_80028840 104 yes
3659 us .critter func_critter_80028DE8 256 yes
3660 us .critter func_critter_8002516C 916 no yes
3661 us .critter func_critter_80025D1C 156 yes
3662 us .critter func_critter_800257D4 220 yes
3663 us .critter func_critter_80028A9C 844 no

6
progress/progress_critter.svg
View File

@ -9,7 +9,7 @@
</mask>
<g mask="url(#anybadge_1)">
<path fill="#555" d="M0 0h50v20H0z"/>
<path fill="#b9c000" d="M50 0h67v20H50z"/>
<path fill="#a9c000" d="M50 0h67v20H50z"/>
<path fill="url(#b)" d="M0 0h117v20H0z"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@ -17,7 +17,7 @@
<text x="25.0" y="14">critter</text>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="84.5" y="15" fill="#010101" fill-opacity=".3">51.8657%</text>
<text x="83.5" y="14">51.8657%</text>
<text x="84.5" y="15" fill="#010101" fill-opacity=".3">55.9346%</text>
<text x="83.5" y="14">55.9346%</text>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

4
progress/progress_total.svg
View File

@ -17,7 +17,7 @@
<text x="66.0" y="14">Donkey Kong 64 (US)</text>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="166.5" y="15" fill="#010101" fill-opacity=".3">41.7253%</text>
<text x="165.5" y="14">41.7253%</text>
<text x="166.5" y="15" fill="#010101" fill-opacity=".3">41.7809%</text>
<text x="165.5" y="14">41.7809%</text>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

49
src/critter/code_0.c
View File

@ -143,7 +143,8 @@ typedef struct Struct800247F4 {
f32 unk3C;
u8 unk40[0x48 - 0x40];
f32 unk48;
u8 unk4C[0x58 - 0x4C];
f32 unk4C;
u8 unk50[0x58 - 0x50];
Struct800247F4Sub58* unk58;
u8 unk5C[0x60 - 0x5C];
f32 unk60[2][4][4]; // At least 2 4x4 matrices
@ -516,8 +517,50 @@ void func_critter_80024F28(Critter *arg0) {
func_critter_80024578(arg0);
}
// Displaylist stuff
#pragma GLOBAL_ASM("asm/nonmatchings/critter/code_0/func_critter_8002516C.s")
s32 func_global_asm_80612C30(f32 (*)[4], f32); // extern
extern s32 D_critter_80029940;
extern s32 D_critter_80029980;
Gfx *func_critter_8002516C(Gfx *dl, Struct800247F4 *arg1) {
f32 spD0[4][4];
f32 sp90[4][4];
if (D_critter_80029BA8 != arg1->unk1E8) {
D_critter_80029BA8 = arg1->unk1E8;
gDPSetTextureImage(dl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, D_critter_80029BA8);
gDPSetTile(dl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD);\
gDPLoadSync(dl++);\
gDPLoadBlock(dl++, G_TX_LOADTILE, 0, 0, 1535, 171);\
gDPPipeSync(dl++);\
gDPSetTile(dl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 12, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD);
gDPSetTileSize(dl++, G_TX_RENDERTILE, 0, 0, 0x00BC, 0x007C);
}
func_critter_80025A3C(arg1);
gSPMatrix(dl++, arg1->unk60[D_global_asm_807444FC], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_global_asm_80612C30(spD0, arg1->unk4C);
guMtxF2L(spD0, arg1->unk160[D_global_asm_807444FC]);
gSPMatrix(dl++, arg1->unk160[D_global_asm_807444FC], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
gSPClearGeometryMode(dl++, G_CULL_BOTH);
guTranslateF(sp90, 0.0f, 0.0f, -27.0f);
func_global_asm_80612C30(spD0, arg1->unk48);
guMtxCatF(spD0, sp90, spD0);
guMtxF2L(spD0, arg1->unkE0[D_global_asm_807444FC]);
gSPMatrix(dl++, arg1->unkE0[D_global_asm_807444FC], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
gSPVertex(dl++, &D_critter_80029940, 4, 0);
gSP2Triangles(dl++, 0, 1, 2, 0, 2, 3, 0, 0);
gSPPopMatrix(dl++, G_MTX_MODELVIEW);
gSPSetGeometryMode(dl++, G_CULL_BACK);
gSPVertex(dl++, &D_critter_80029980, 9, 0);
gSP2Triangles(dl++, 0, 1, 2, 0, 0, 3, 4, 0);
gSP2Triangles(dl++, 5, 1, 6, 0, 4, 3, 5, 0);
gSP2Triangles(dl++, 0, 4, 6, 0, 0, 6, 1, 0);
gSP2Triangles(dl++, 4, 5, 6, 0, 5, 2, 1, 0);
gSP2Triangles(dl++, 0, 7, 3, 0, 3, 7, 5, 0);
gSP2Triangles(dl++, 2, 5, 8, 0, 2, 8, 0, 0);
gSP2Triangles(dl++, 0, 8, 7, 0, 7, 8, 5, 0);
gDPPipeSync(dl++);
return dl;
}
void func_critter_80025500(Critter *arg0) {
if ((arg0->unk1E0 != 0) && (arg0->unk1E1 & 1) && ((s16) (func_global_asm_806119A0() % 255U) < 6)) {