Game-Decompilation/dk64
1
0
Fork 0
mirror of https://gitlab.com/dk64_decomp/dk64.git synced 2025-03-01 04:07:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

36.0411%

Browse Source
This commit is contained in:
Donkey Kong 2024-03-21 19:00:50 +10:30
parent e0b8d9ce5c
commit fca37f3d23
6 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
progress/progress.global_asm.csv
View File

@ -698,7 +698,7 @@ us,asm,func_global_asm_806F12FC,84,yes
us,asm,func_global_asm_8060B4D4,136,yes
us,asm,func_global_asm_80652EBC,104,yes
us,asm,func_global_asm_806E7050,56,yes
us,asm,func_global_asm_805FE398,316,no
us,asm,func_global_asm_805FE398,316,yes
us,asm,func_global_asm_8064F84C,264,no
us,asm,func_global_asm_80654A2C,404,no
us,asm,func_global_asm_807085D0,1512,no

1 version section function length matching
698 us asm func_global_asm_8060B4D4 136 yes
699 us asm func_global_asm_80652EBC 104 yes
700 us asm func_global_asm_806E7050 56 yes
701 us asm func_global_asm_805FE398 316 no yes
702 us asm func_global_asm_8064F84C 264 no
703 us asm func_global_asm_80654A2C 404 no
704 us asm func_global_asm_807085D0 1512 no

2
progress/progress.total.csv
View File

@ -698,7 +698,7 @@ us,asm,func_global_asm_806F12FC,84,yes
us,asm,func_global_asm_8060B4D4,136,yes
us,asm,func_global_asm_80652EBC,104,yes
us,asm,func_global_asm_806E7050,56,yes
us,asm,func_global_asm_805FE398,316,no
us,asm,func_global_asm_805FE398,316,yes
us,asm,func_global_asm_8064F84C,264,no
us,asm,func_global_asm_80654A2C,404,no
us,asm,func_global_asm_807085D0,1512,no

1 version section function length matching
698 us asm func_global_asm_8060B4D4 136 yes
699 us asm func_global_asm_80652EBC 104 yes
700 us asm func_global_asm_806E7050 56 yes
701 us asm func_global_asm_805FE398 316 no yes
702 us asm func_global_asm_8064F84C 264 no
703 us asm func_global_asm_80654A2C 404 no
704 us asm func_global_asm_807085D0 1512 no

4
progress/progress_global_asm.svg
View File

@ -17,7 +17,7 @@
<text x="38.5" y="14">global_asm</text>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="111.5" y="15" fill="#010101" fill-opacity=".3">35.5987%</text>
<text x="110.5" y="14">35.5987%</text>
<text x="111.5" y="15" fill="#010101" fill-opacity=".3">35.6243%</text>
<text x="110.5" y="14">35.6243%</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">36.0219%</text>
<text x="165.5" y="14">36.0219%</text>
<text x="166.5" y="15" fill="#010101" fill-opacity=".3">36.0411%</text>
<text x="165.5" y="14">36.0411%</text>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

22
src/global_asm/code_0.c
View File

@ -275,6 +275,7 @@ void func_global_asm_805FBE04(void) {
guPerspective(&D_global_asm_80768E98, &D_global_asm_8076A09C, D_global_asm_807444B8, D_global_asm_807444BC * FOV, D_global_asm_807444C8, D_global_asm_807444C4, 1.0f);
}
// close, just missing some nops
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_0/func_global_asm_805FBFF4.s")
extern s32 D_global_asm_8076A070;
@ -289,7 +290,6 @@ extern u8 D_global_asm_807444F0;
extern s32 D_global_asm_80767CC0;
/*
// TODO: Remarkably close, just missing some NOPs
void func_global_asm_805FBFF4(s32 arg0) {
s32 phi_s4;
OSMesg* sp38;
@ -497,13 +497,25 @@ Gfx *func_global_asm_805FD030(Gfx *dl) {
// Displaylist stuff
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_0/func_global_asm_805FD088.s")
// Displaylist stuff, doable
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_0/func_global_asm_805FE398.s")
extern s32 D_global_asm_80744470[];
extern void *D_8076A060;
extern s16 D_global_asm_80744490;
extern s16 D_global_asm_80744494;
Gfx *func_global_asm_805FE398(Gfx *dl) {
gDPPipeSync(dl++);
gDPSetRenderMode(dl++, G_RM_NOOP, G_RM_NOOP2);
gDPSetCycleType(dl++, G_CYC_FILL);
gSPClearGeometryMode(dl++, G_ZBUFFER);
gDPSetDepthImage(dl++, osVirtualToPhysical(D_8076A060));
gDPSetColorImage(dl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, D_global_asm_80744490, osVirtualToPhysical(D_8076A060));
gDPSetFillColor(dl++, 0xFFFCFFFC);
gDPFillRectangle(dl++, 0, 0, D_global_asm_80744490 - 1, D_global_asm_80744494 - 1);
gDPPipeSync(dl++);
return dl;
}
extern s32 D_global_asm_80744470[];
Gfx *func_global_asm_805FE4D4(Gfx *arg0) {
gDPSetColorImage(arg0++, 0, 2, D_global_asm_80744490, osVirtualToPhysical(D_global_asm_80744470[D_global_asm_807444FC]));
return arg0;

3
src/global_asm/code_42630.c
View File

@ -3318,11 +3318,10 @@ u8 func_global_asm_8064EC04(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
return ((s16)func_global_asm_806FB418() >= D_global_asm_807446D0[sp1E]);
}
// Doable
// Doable, pretty close
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_42630/func_global_asm_8064EC60.s")
/*
// TODO: Pretty close
u8 func_global_asm_8064EC60(s32 arg0, s16 arg1, s16 arg2, s16 arg3) {
u8 sp1B;
s32 temp_v0;