Game-Decompilation/dk64
1
0
Fork 0
mirror of https://gitlab.com/dk64_decomp/dk64.git synced 2025-02-19 23:41:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

39.0259%

Browse Source
This commit is contained in:
Donkey Kong 2024-09-21 21:50:17 -05:00
parent e76c631d63
commit f742b2016d
6 changed files with 134 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/structs.h
View File

@ -271,7 +271,7 @@ typedef struct ledge_info {
} LedgeInfo;
typedef struct AnimationStateUnk0_0 {
u8 pad0[0x4];
f32 unk0;
u16 unk4;
u8 pad6[0x12 - 0x6];
u8 unk12;
@ -281,15 +281,17 @@ typedef struct AnimationStateUnk0_0 {
typedef struct animation_state_unk0 {
AnimationStateUnk0_0 *unk0;
f32 unk4; // Used
s32 unk8;
s32 unkC;
f32 unk8;
s16 unkC;
s16 unkE;
s16 unk10; // Used
s16 unk12;
f32 unk14;
f32 unk18;
s16 unk1C;
s16 unk1E;
s32 unk20;
s16 unk20;
s16 unk22;
f32 unk24; // Used
f32 unk28;
f32 unk2C;

16
progress/progress.global_asm.csv
View File

@ -598,7 +598,7 @@ us,asm,func_global_asm_80636784,364,no
us,asm,func_global_asm_807327F4,160,yes
us,asm,func_global_asm_806C7220,8,yes
us,asm,func_global_asm_80728300,1308,no
us,asm,func_global_asm_80615ADC,88,no
us,asm,func_global_asm_80615ADC,88,yes
us,asm,func_global_asm_8061507C,76,yes
us,asm,func_global_asm_80657CB0,372,yes
us,asm,func_global_asm_80642844,252,yes
@ -710,7 +710,7 @@ us,asm,func_global_asm_806C7228,8,yes
us,asm,func_global_asm_80614A64,208,no
us,asm,func_global_asm_80690AB0,312,yes
us,asm,func_global_asm_8068C3A0,520,yes
us,asm,func_global_asm_80615BDC,88,no
us,asm,func_global_asm_80615BDC,88,yes
us,asm,func_global_asm_806D0A54,48,yes
us,asm,func_global_asm_8065F134,128,yes
us,asm,func_global_asm_806E7B48,296,yes
@ -858,7 +858,7 @@ us,asm,func_global_asm_806AC07C,2572,no
us,asm,func_global_asm_806ED244,476,yes
us,asm,func_global_asm_806DD24C,1576,yes
us,asm,func_global_asm_80655BF0,264,yes
us,asm,func_global_asm_80615FA0,108,no
us,asm,func_global_asm_80615FA0,108,yes
us,asm,func_global_asm_8071509C,468,no
us,asm,func_global_asm_807102AC,308,no
us,asm,func_global_asm_8064F358,172,yes
@ -1186,7 +1186,7 @@ us,asm,func_global_asm_8067ABC0,120,yes
us,asm,func_global_asm_8066B7F4,212,yes
us,asm,func_global_asm_8060151C,196,yes
us,asm,func_global_asm_806049CC,540,yes
us,asm,func_global_asm_80615CE4,192,no
us,asm,func_global_asm_80615CE4,192,yes
us,asm,func_global_asm_8062BCC8,232,yes
us,asm,func_global_asm_80645614,236,yes
us,asm,func_global_asm_8064199C,92,yes
@ -2008,7 +2008,7 @@ us,asm,func_global_asm_806F2A40,520,yes
us,asm,func_global_asm_8063D468,44,yes
us,asm,func_global_asm_80683158,412,yes
us,asm,func_global_asm_806D423C,80,yes
us,asm,func_global_asm_80615B84,88,no
us,asm,func_global_asm_80615B84,88,yes
us,asm,func_global_asm_8069E210,640,no
us,asm,func_global_asm_8063D4A4,264,yes
us,asm,func_global_asm_8060F208,76,no
@ -2473,7 +2473,7 @@ us,asm,func_global_asm_80637B6C,5968,no
us,asm,func_global_asm_806E0294,308,yes
us,asm,func_global_asm_80600C68,228,yes
us,asm,func_global_asm_80636B50,176,no
us,asm,func_global_asm_8061600C,112,no
us,asm,func_global_asm_8061600C,112,yes
us,asm,func_global_asm_8060D0A8,164,yes
us,asm,func_global_asm_806A2B90,672,no
us,asm,func_global_asm_8062B660,480,no
@ -2497,7 +2497,7 @@ us,asm,playAnimation,68,yes
us,asm,func_global_asm_8072FDD4,140,yes
us,asm,func_global_asm_80724A9C,192,yes
us,asm,func_global_asm_8073CAC0,468,no
us,asm,func_global_asm_80615B34,80,no
us,asm,func_global_asm_80615B34,80,yes
us,asm,func_global_asm_806FDF1C,56,yes
us,asm,func_global_asm_806F14BC,428,yes
us,asm,func_global_asm_8063643C,12,yes
@ -3488,7 +3488,7 @@ us,asm,func_global_asm_80610BD8,156,no
us,asm,func_global_asm_8061EDA0,428,no
us,asm,func_global_asm_8073CDD0,304,no
us,asm,func_global_asm_8066B7AC,72,yes
us,asm,func_global_asm_80615C34,176,no
us,asm,func_global_asm_80615C34,176,yes
us,asm,func_global_asm_8060ED6C,100,yes
us,asm,_n_collectPVoices,108,yes
us,asm,func_global_asm_806012D4,72,yes

1 version section function length matching
598 us asm func_global_asm_807327F4 160 yes
599 us asm func_global_asm_806C7220 8 yes
600 us asm func_global_asm_80728300 1308 no
601 us asm func_global_asm_80615ADC 88 no yes
602 us asm func_global_asm_8061507C 76 yes
603 us asm func_global_asm_80657CB0 372 yes
604 us asm func_global_asm_80642844 252 yes
710 us asm func_global_asm_80614A64 208 no
711 us asm func_global_asm_80690AB0 312 yes
712 us asm func_global_asm_8068C3A0 520 yes
713 us asm func_global_asm_80615BDC 88 no yes
714 us asm func_global_asm_806D0A54 48 yes
715 us asm func_global_asm_8065F134 128 yes
716 us asm func_global_asm_806E7B48 296 yes
858 us asm func_global_asm_806ED244 476 yes
859 us asm func_global_asm_806DD24C 1576 yes
860 us asm func_global_asm_80655BF0 264 yes
861 us asm func_global_asm_80615FA0 108 no yes
862 us asm func_global_asm_8071509C 468 no
863 us asm func_global_asm_807102AC 308 no
864 us asm func_global_asm_8064F358 172 yes
1186 us asm func_global_asm_8066B7F4 212 yes
1187 us asm func_global_asm_8060151C 196 yes
1188 us asm func_global_asm_806049CC 540 yes
1189 us asm func_global_asm_80615CE4 192 no yes
1190 us asm func_global_asm_8062BCC8 232 yes
1191 us asm func_global_asm_80645614 236 yes
1192 us asm func_global_asm_8064199C 92 yes
2008 us asm func_global_asm_8063D468 44 yes
2009 us asm func_global_asm_80683158 412 yes
2010 us asm func_global_asm_806D423C 80 yes
2011 us asm func_global_asm_80615B84 88 no yes
2012 us asm func_global_asm_8069E210 640 no
2013 us asm func_global_asm_8063D4A4 264 yes
2014 us asm func_global_asm_8060F208 76 no
2473 us asm func_global_asm_806E0294 308 yes
2474 us asm func_global_asm_80600C68 228 yes
2475 us asm func_global_asm_80636B50 176 no
2476 us asm func_global_asm_8061600C 112 no yes
2477 us asm func_global_asm_8060D0A8 164 yes
2478 us asm func_global_asm_806A2B90 672 no
2479 us asm func_global_asm_8062B660 480 no
2497 us asm func_global_asm_8072FDD4 140 yes
2498 us asm func_global_asm_80724A9C 192 yes
2499 us asm func_global_asm_8073CAC0 468 no
2500 us asm func_global_asm_80615B34 80 no yes
2501 us asm func_global_asm_806FDF1C 56 yes
2502 us asm func_global_asm_806F14BC 428 yes
2503 us asm func_global_asm_8063643C 12 yes
3488 us asm func_global_asm_8061EDA0 428 no
3489 us asm func_global_asm_8073CDD0 304 no
3490 us asm func_global_asm_8066B7AC 72 yes
3491 us asm func_global_asm_80615C34 176 no yes
3492 us asm func_global_asm_8060ED6C 100 yes
3493 us asm _n_collectPVoices 108 yes
3494 us asm func_global_asm_806012D4 72 yes

16
progress/progress.total.csv
View File

@ -598,7 +598,7 @@ us,asm,func_global_asm_80636784,364,no
us,asm,func_global_asm_807327F4,160,yes
us,asm,func_global_asm_806C7220,8,yes
us,asm,func_global_asm_80728300,1308,no
us,asm,func_global_asm_80615ADC,88,no
us,asm,func_global_asm_80615ADC,88,yes
us,asm,func_global_asm_8061507C,76,yes
us,asm,func_global_asm_80657CB0,372,yes
us,asm,func_global_asm_80642844,252,yes
@ -710,7 +710,7 @@ us,asm,func_global_asm_806C7228,8,yes
us,asm,func_global_asm_80614A64,208,no
us,asm,func_global_asm_80690AB0,312,yes
us,asm,func_global_asm_8068C3A0,520,yes
us,asm,func_global_asm_80615BDC,88,no
us,asm,func_global_asm_80615BDC,88,yes
us,asm,func_global_asm_806D0A54,48,yes
us,asm,func_global_asm_8065F134,128,yes
us,asm,func_global_asm_806E7B48,296,yes
@ -858,7 +858,7 @@ us,asm,func_global_asm_806AC07C,2572,no
us,asm,func_global_asm_806ED244,476,yes
us,asm,func_global_asm_806DD24C,1576,yes
us,asm,func_global_asm_80655BF0,264,yes
us,asm,func_global_asm_80615FA0,108,no
us,asm,func_global_asm_80615FA0,108,yes
us,asm,func_global_asm_8071509C,468,no
us,asm,func_global_asm_807102AC,308,no
us,asm,func_global_asm_8064F358,172,yes
@ -1186,7 +1186,7 @@ us,asm,func_global_asm_8067ABC0,120,yes
us,asm,func_global_asm_8066B7F4,212,yes
us,asm,func_global_asm_8060151C,196,yes
us,asm,func_global_asm_806049CC,540,yes
us,asm,func_global_asm_80615CE4,192,no
us,asm,func_global_asm_80615CE4,192,yes
us,asm,func_global_asm_8062BCC8,232,yes
us,asm,func_global_asm_80645614,236,yes
us,asm,func_global_asm_8064199C,92,yes
@ -2008,7 +2008,7 @@ us,asm,func_global_asm_806F2A40,520,yes
us,asm,func_global_asm_8063D468,44,yes
us,asm,func_global_asm_80683158,412,yes
us,asm,func_global_asm_806D423C,80,yes
us,asm,func_global_asm_80615B84,88,no
us,asm,func_global_asm_80615B84,88,yes
us,asm,func_global_asm_8069E210,640,no
us,asm,func_global_asm_8063D4A4,264,yes
us,asm,func_global_asm_8060F208,76,no
@ -2473,7 +2473,7 @@ us,asm,func_global_asm_80637B6C,5968,no
us,asm,func_global_asm_806E0294,308,yes
us,asm,func_global_asm_80600C68,228,yes
us,asm,func_global_asm_80636B50,176,no
us,asm,func_global_asm_8061600C,112,no
us,asm,func_global_asm_8061600C,112,yes
us,asm,func_global_asm_8060D0A8,164,yes
us,asm,func_global_asm_806A2B90,672,no
us,asm,func_global_asm_8062B660,480,no
@ -2497,7 +2497,7 @@ us,asm,playAnimation,68,yes
us,asm,func_global_asm_8072FDD4,140,yes
us,asm,func_global_asm_80724A9C,192,yes
us,asm,func_global_asm_8073CAC0,468,no
us,asm,func_global_asm_80615B34,80,no
us,asm,func_global_asm_80615B34,80,yes
us,asm,func_global_asm_806FDF1C,56,yes
us,asm,func_global_asm_806F14BC,428,yes
us,asm,func_global_asm_8063643C,12,yes
@ -3488,7 +3488,7 @@ us,asm,func_global_asm_80610BD8,156,no
us,asm,func_global_asm_8061EDA0,428,no
us,asm,func_global_asm_8073CDD0,304,no
us,asm,func_global_asm_8066B7AC,72,yes
us,asm,func_global_asm_80615C34,176,no
us,asm,func_global_asm_80615C34,176,yes
us,asm,func_global_asm_8060ED6C,100,yes
us,asm,_n_collectPVoices,108,yes
us,asm,func_global_asm_806012D4,72,yes

1 version section function length matching
598 us asm func_global_asm_807327F4 160 yes
599 us asm func_global_asm_806C7220 8 yes
600 us asm func_global_asm_80728300 1308 no
601 us asm func_global_asm_80615ADC 88 no yes
602 us asm func_global_asm_8061507C 76 yes
603 us asm func_global_asm_80657CB0 372 yes
604 us asm func_global_asm_80642844 252 yes
710 us asm func_global_asm_80614A64 208 no
711 us asm func_global_asm_80690AB0 312 yes
712 us asm func_global_asm_8068C3A0 520 yes
713 us asm func_global_asm_80615BDC 88 no yes
714 us asm func_global_asm_806D0A54 48 yes
715 us asm func_global_asm_8065F134 128 yes
716 us asm func_global_asm_806E7B48 296 yes
858 us asm func_global_asm_806ED244 476 yes
859 us asm func_global_asm_806DD24C 1576 yes
860 us asm func_global_asm_80655BF0 264 yes
861 us asm func_global_asm_80615FA0 108 no yes
862 us asm func_global_asm_8071509C 468 no
863 us asm func_global_asm_807102AC 308 no
864 us asm func_global_asm_8064F358 172 yes
1186 us asm func_global_asm_8066B7F4 212 yes
1187 us asm func_global_asm_8060151C 196 yes
1188 us asm func_global_asm_806049CC 540 yes
1189 us asm func_global_asm_80615CE4 192 no yes
1190 us asm func_global_asm_8062BCC8 232 yes
1191 us asm func_global_asm_80645614 236 yes
1192 us asm func_global_asm_8064199C 92 yes
2008 us asm func_global_asm_8063D468 44 yes
2009 us asm func_global_asm_80683158 412 yes
2010 us asm func_global_asm_806D423C 80 yes
2011 us asm func_global_asm_80615B84 88 no yes
2012 us asm func_global_asm_8069E210 640 no
2013 us asm func_global_asm_8063D4A4 264 yes
2014 us asm func_global_asm_8060F208 76 no
2473 us asm func_global_asm_806E0294 308 yes
2474 us asm func_global_asm_80600C68 228 yes
2475 us asm func_global_asm_80636B50 176 no
2476 us asm func_global_asm_8061600C 112 no yes
2477 us asm func_global_asm_8060D0A8 164 yes
2478 us asm func_global_asm_806A2B90 672 no
2479 us asm func_global_asm_8062B660 480 no
2497 us asm func_global_asm_8072FDD4 140 yes
2498 us asm func_global_asm_80724A9C 192 yes
2499 us asm func_global_asm_8073CAC0 468 no
2500 us asm func_global_asm_80615B34 80 no yes
2501 us asm func_global_asm_806FDF1C 56 yes
2502 us asm func_global_asm_806F14BC 428 yes
2503 us asm func_global_asm_8063643C 12 yes
3488 us asm func_global_asm_8061EDA0 428 no
3489 us asm func_global_asm_8073CDD0 304 no
3490 us asm func_global_asm_8066B7AC 72 yes
3491 us asm func_global_asm_80615C34 176 no yes
3492 us asm func_global_asm_8060ED6C 100 yes
3493 us asm _n_collectPVoices 108 yes
3494 us asm func_global_asm_806012D4 72 yes

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">36.7328%</text>
<text x="110.5" y="14">36.7328%</text>
<text x="111.5" y="15" fill="#010101" fill-opacity=".3">36.8085%</text>
<text x="110.5" y="14">36.8085%</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">38.9693%</text>
<text x="165.5" y="14">38.9693%</text>
<text x="166.5" y="15" fill="#010101" fill-opacity=".3">39.0259%</text>
<text x="165.5" y="14">39.0259%</text>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

117
src/global_asm/code_17B90.c
View File

@ -457,6 +457,9 @@ s32 func_global_asm_8061594C(Actor *arg0) {
void func_global_asm_80613BA0(Actor *, s16, f32, f32);
void func_global_asm_80613CA8(Actor *, s16, f32, f32);
void func_global_asm_80614014(Actor *, u16, f32, u8);
void func_global_asm_80613FB0(Actor *, u16, f32, u8);
void func_global_asm_80614644(Actor *, AnimationStateUnk0 *, f32);
s32 func_global_asm_8061599C(Actor *arg0) {
s16 sp1E;
@ -487,7 +490,7 @@ s32 func_global_asm_80615A3C(Actor *arg0) {
return 1;
}
s32 func_global_asm_80615A94(s32 arg0) {
s32 func_global_asm_80615A94(Actor *arg0) {
s8 sp1F;
D_807F5AF0++;
@ -496,25 +499,121 @@ s32 func_global_asm_80615A94(s32 arg0) {
return 1;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_80615ADC.s")
s32 func_global_asm_80615ADC(Actor *arg0) {
u16 sp1E;
u8 sp1D;
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_80615B34.s")
D_807F5AF0++;
func_global_asm_80614F4C(&sp1E);
func_global_asm_80614F28(&sp1D);
func_global_asm_80614014(arg0, sp1E, 0.0f, sp1D);
return 1;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_80615B84.s")
s32 func_global_asm_80615B34(Actor *arg0) {
s16 sp1E;
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_80615BDC.s")
D_807F5AF0++;
func_global_asm_80614F4C(&sp1E);
func_global_asm_80613AF8(arg0, sp1E, 0.0f, 1.0f);
return 1;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_80615C34.s")
s32 func_global_asm_80615B84(Actor *arg0) {
s16 sp1E;
f32 sp18;
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_80615CE4.s")
D_807F5AF0 += 1;
func_global_asm_80614F4C(&sp1E);
func_global_asm_80614FD8(&sp18);
func_global_asm_80613AF8(arg0, sp1E, 0.0f, sp18);
return 1;
}
s32 func_global_asm_80615BDC(s32 arg0) {
u16 sp1E;
u8 sp1D;
D_807F5AF0++;
func_global_asm_80614F4C(&sp1E);
func_global_asm_80614F28(&sp1D);
func_global_asm_80613FB0(arg0, sp1E, 0, sp1D);
return 1;
}
s32 func_global_asm_80615C34(Actor *arg0) {
u8 sp27;
AnimationStateUnk0 *var_a1;
if (arg0->animation_state->unk84) {
var_a1 = arg0->animation_state->unk4;
} else {
var_a1 = arg0->animation_state->unk0;
}
D_807F5AF0++;
func_global_asm_80614F28(&sp27);
if (sp27 == 0xFF) {
sp27 = arg0->animation_state->unk88;
}
func_global_asm_80614644(arg0, var_a1, sp27);
return 1;
}
extern u8 D_global_asm_80746D5C;
s32 func_global_asm_80615CE4(Actor *arg0) {
u8 sp27;
AnimationStateUnk0 *var_a1;
if (arg0->animation_state->unk84 != 0) {
var_a1 = arg0->animation_state->unk4;
} else {
var_a1 = arg0->animation_state->unk0;
}
D_807F5AF0 += 1;
func_global_asm_80614F28(&sp27);
func_global_asm_80614644(arg0, var_a1, D_global_asm_80746D5C);
if (D_global_asm_80746D5C != 0) {
D_global_asm_80746D5C += sp27;
} else {
D_global_asm_80746D5C = 0;
}
return 1;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_80615DA4.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_80615E74.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_80615FA0.s")
s32 func_global_asm_80615FA0(Actor *arg0) {
s16 sp26;
AnimationStateUnk0 *var_v1;
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_8061600C.s")
if (arg0->animation_state->unk84 != 0) {
var_v1 = arg0->animation_state->unk4;
} else {
var_v1 = arg0->animation_state->unk0;
}
D_807F5AF0++;
func_global_asm_80614F4C(&sp26);
var_v1->unk1C |= sp26;
return 1;
}
s32 func_global_asm_8061600C(Actor *arg0) {
s16 sp26;
AnimationStateUnk0 *var_v1;
if (arg0->animation_state->unk84 != 0) {
var_v1 = arg0->animation_state->unk4;
} else {
var_v1 = arg0->animation_state->unk0;
}
D_807F5AF0++;
func_global_asm_80614F4C(&sp26);
var_v1->unk1C &= ~sp26;
return 1;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_8061607C.s")