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

38.8634%

Browse Source
This commit is contained in:
Donkey Kong 2024-09-21 19:44:37 -05:00
parent e5e6631f2b
commit cee6bc2a65
6 changed files with 74 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/structs.h
View File

@ -363,7 +363,7 @@ typedef struct actor_animation_state {
s32 unk74;
s32 unk78;
s32 unk7C;
s32 unk80;
f32 unk80;
s32 unk84;
s32 unk88;
s32 unk8C;

10
progress/progress.global_asm.csv
View File

@ -396,7 +396,7 @@ us,asm,func_global_asm_806188F4,56,no
us,asm,func_global_asm_80737198,212,no
us,asm,func_global_asm_806D281C,200,yes
us,asm,func_global_asm_806BFBF4,5292,no
us,asm,func_global_asm_8061537C,144,no
us,asm,func_global_asm_8061537C,144,yes
us,asm,func_global_asm_8064A258,1452,no
us,asm,func_global_asm_8064C134,284,yes
us,asm,func_global_asm_8060CB9C,32,yes
@ -1366,7 +1366,7 @@ us,asm,func_global_asm_8062EE48,344,no
us,asm,func_global_asm_806CEED8,228,yes
us,asm,func_global_asm_806E330C,272,yes
us,asm,func_global_asm_80674ADC,180,no
us,asm,func_global_asm_8061522C,208,no
us,asm,func_global_asm_8061522C,208,yes
us,asm,func_global_asm_8067FB6C,3080,no
us,asm,func_global_asm_806728F0,384,yes
us,asm,func_global_asm_8068848C,44,yes
@ -1423,7 +1423,7 @@ us,asm,func_global_asm_806A0330,676,yes
us,asm,func_global_asm_80642FC4,688,yes
us,asm,func_global_asm_806998E8,8,yes
us,asm,func_global_asm_806134B4,512,no
us,asm,func_global_asm_806151BC,112,no
us,asm,func_global_asm_806151BC,112,yes
us,asm,func_global_asm_806B2D64,1724,no
us,asm,func_global_asm_8068EA38,260,yes
us,asm,func_global_asm_80669C6C,72,yes
@ -1560,7 +1560,7 @@ us,asm,func_global_asm_806A0864,784,yes
us,asm,func_global_asm_80614F88,80,yes
us,asm,func_global_asm_8060E3B0,128,yes
us,asm,func_global_asm_8063CF0C,48,yes
us,asm,func_global_asm_806152FC,44,no
us,asm,func_global_asm_806152FC,44,yes
us,asm,func_global_asm_806D24A8,60,yes
us,asm,func_global_asm_806E5E68,64,yes
us,asm,func_global_asm_8070068C,300,yes
@ -1692,7 +1692,7 @@ us,asm,func_global_asm_80698FEC,32,yes
us,asm,func_global_asm_80635548,64,yes
us,asm,func_global_asm_806EC3BC,240,yes
us,asm,func_global_asm_8069D0F8,436,yes
us,asm,func_global_asm_80615328,84,no
us,asm,func_global_asm_80615328,84,yes
us,asm,func_global_asm_806EA0A4,348,yes
us,asm,func_global_asm_806EE634,44,yes
us,asm,playSoundAtPosition,1756,no

1 version section function length matching
396 us asm func_global_asm_80737198 212 no
397 us asm func_global_asm_806D281C 200 yes
398 us asm func_global_asm_806BFBF4 5292 no
399 us asm func_global_asm_8061537C 144 no yes
400 us asm func_global_asm_8064A258 1452 no
401 us asm func_global_asm_8064C134 284 yes
402 us asm func_global_asm_8060CB9C 32 yes
1366 us asm func_global_asm_806CEED8 228 yes
1367 us asm func_global_asm_806E330C 272 yes
1368 us asm func_global_asm_80674ADC 180 no
1369 us asm func_global_asm_8061522C 208 no yes
1370 us asm func_global_asm_8067FB6C 3080 no
1371 us asm func_global_asm_806728F0 384 yes
1372 us asm func_global_asm_8068848C 44 yes
1423 us asm func_global_asm_80642FC4 688 yes
1424 us asm func_global_asm_806998E8 8 yes
1425 us asm func_global_asm_806134B4 512 no
1426 us asm func_global_asm_806151BC 112 no yes
1427 us asm func_global_asm_806B2D64 1724 no
1428 us asm func_global_asm_8068EA38 260 yes
1429 us asm func_global_asm_80669C6C 72 yes
1560 us asm func_global_asm_80614F88 80 yes
1561 us asm func_global_asm_8060E3B0 128 yes
1562 us asm func_global_asm_8063CF0C 48 yes
1563 us asm func_global_asm_806152FC 44 no yes
1564 us asm func_global_asm_806D24A8 60 yes
1565 us asm func_global_asm_806E5E68 64 yes
1566 us asm func_global_asm_8070068C 300 yes
1692 us asm func_global_asm_80635548 64 yes
1693 us asm func_global_asm_806EC3BC 240 yes
1694 us asm func_global_asm_8069D0F8 436 yes
1695 us asm func_global_asm_80615328 84 no yes
1696 us asm func_global_asm_806EA0A4 348 yes
1697 us asm func_global_asm_806EE634 44 yes
1698 us asm playSoundAtPosition 1756 no

10
progress/progress.total.csv
View File

@ -396,7 +396,7 @@ us,asm,func_global_asm_806188F4,56,no
us,asm,func_global_asm_80737198,212,no
us,asm,func_global_asm_806D281C,200,yes
us,asm,func_global_asm_806BFBF4,5292,no
us,asm,func_global_asm_8061537C,144,no
us,asm,func_global_asm_8061537C,144,yes
us,asm,func_global_asm_8064A258,1452,no
us,asm,func_global_asm_8064C134,284,yes
us,asm,func_global_asm_8060CB9C,32,yes
@ -1366,7 +1366,7 @@ us,asm,func_global_asm_8062EE48,344,no
us,asm,func_global_asm_806CEED8,228,yes
us,asm,func_global_asm_806E330C,272,yes
us,asm,func_global_asm_80674ADC,180,no
us,asm,func_global_asm_8061522C,208,no
us,asm,func_global_asm_8061522C,208,yes
us,asm,func_global_asm_8067FB6C,3080,no
us,asm,func_global_asm_806728F0,384,yes
us,asm,func_global_asm_8068848C,44,yes
@ -1423,7 +1423,7 @@ us,asm,func_global_asm_806A0330,676,yes
us,asm,func_global_asm_80642FC4,688,yes
us,asm,func_global_asm_806998E8,8,yes
us,asm,func_global_asm_806134B4,512,no
us,asm,func_global_asm_806151BC,112,no
us,asm,func_global_asm_806151BC,112,yes
us,asm,func_global_asm_806B2D64,1724,no
us,asm,func_global_asm_8068EA38,260,yes
us,asm,func_global_asm_80669C6C,72,yes
@ -1560,7 +1560,7 @@ us,asm,func_global_asm_806A0864,784,yes
us,asm,func_global_asm_80614F88,80,yes
us,asm,func_global_asm_8060E3B0,128,yes
us,asm,func_global_asm_8063CF0C,48,yes
us,asm,func_global_asm_806152FC,44,no
us,asm,func_global_asm_806152FC,44,yes
us,asm,func_global_asm_806D24A8,60,yes
us,asm,func_global_asm_806E5E68,64,yes
us,asm,func_global_asm_8070068C,300,yes
@ -1692,7 +1692,7 @@ us,asm,func_global_asm_80698FEC,32,yes
us,asm,func_global_asm_80635548,64,yes
us,asm,func_global_asm_806EC3BC,240,yes
us,asm,func_global_asm_8069D0F8,436,yes
us,asm,func_global_asm_80615328,84,no
us,asm,func_global_asm_80615328,84,yes
us,asm,func_global_asm_806EA0A4,348,yes
us,asm,func_global_asm_806EE634,44,yes
us,asm,playSoundAtPosition,1756,no

1 version section function length matching
396 us asm func_global_asm_80737198 212 no
397 us asm func_global_asm_806D281C 200 yes
398 us asm func_global_asm_806BFBF4 5292 no
399 us asm func_global_asm_8061537C 144 no yes
400 us asm func_global_asm_8064A258 1452 no
401 us asm func_global_asm_8064C134 284 yes
402 us asm func_global_asm_8060CB9C 32 yes
1366 us asm func_global_asm_806CEED8 228 yes
1367 us asm func_global_asm_806E330C 272 yes
1368 us asm func_global_asm_80674ADC 180 no
1369 us asm func_global_asm_8061522C 208 no yes
1370 us asm func_global_asm_8067FB6C 3080 no
1371 us asm func_global_asm_806728F0 384 yes
1372 us asm func_global_asm_8068848C 44 yes
1423 us asm func_global_asm_80642FC4 688 yes
1424 us asm func_global_asm_806998E8 8 yes
1425 us asm func_global_asm_806134B4 512 no
1426 us asm func_global_asm_806151BC 112 no yes
1427 us asm func_global_asm_806B2D64 1724 no
1428 us asm func_global_asm_8068EA38 260 yes
1429 us asm func_global_asm_80669C6C 72 yes
1560 us asm func_global_asm_80614F88 80 yes
1561 us asm func_global_asm_8060E3B0 128 yes
1562 us asm func_global_asm_8063CF0C 48 yes
1563 us asm func_global_asm_806152FC 44 no yes
1564 us asm func_global_asm_806D24A8 60 yes
1565 us asm func_global_asm_806E5E68 64 yes
1566 us asm func_global_asm_8070068C 300 yes
1692 us asm func_global_asm_80635548 64 yes
1693 us asm func_global_asm_806EC3BC 240 yes
1694 us asm func_global_asm_8069D0F8 436 yes
1695 us asm func_global_asm_80615328 84 no yes
1696 us asm func_global_asm_806EA0A4 348 yes
1697 us asm func_global_asm_806EE634 44 yes
1698 us asm playSoundAtPosition 1756 no

6
progress/progress_global_asm.svg
View File

@ -9,7 +9,7 @@
</mask>
<g mask="url(#anybadge_1)">
<path fill="#555" d="M0 0h77v20H0z"/>
<path fill="#c08c00" d="M77 0h67v20H77z"/>
<path fill="#c08d00" d="M77 0h67v20H77z"/>
<path fill="url(#b)" d="M0 0h144v20H0z"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@ -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.5431%</text>
<text x="110.5" y="14">36.5431%</text>
<text x="111.5" y="15" fill="#010101" fill-opacity=".3">36.5912%</text>
<text x="110.5" y="14">36.5912%</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.8275%</text>
<text x="165.5" y="14">38.8275%</text>
<text x="166.5" y="15" fill="#010101" fill-opacity=".3">38.8634%</text>
<text x="165.5" y="14">38.8634%</text>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

68
src/global_asm/code_17B90.c
View File

@ -188,12 +188,11 @@ s32 func_global_asm_8061507C(Actor *arg0) {
s32 func_global_asm_806150C8(Actor *arg0) {
s32 temp_v1;
ActorAnimationState *temp_v0;
ActorAnimationState *AAS;
temp_v0 = arg0->animation_state;
temp_v1 = temp_v0->unk88;
if (temp_v1 != 0) {
temp_v0->unk88 = temp_v1 - 1;
AAS = arg0->animation_state;
if (AAS->unk88) {
AAS->unk88--;
}
D_807F5AF0++;
return 1;
@ -228,15 +227,64 @@ s32 func_global_asm_80615134(Actor *arg0) {
return 0;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_806151BC.s")
s32 func_global_asm_806151BC(Actor *arg0) {
u8 sp1F;
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_8061522C.s")
D_807F5AF0++;
func_global_asm_80614F28(&sp1F);
if (sp1F) {
arg0->animation_state->unk7C = sp1F - 1;
arg0->animation_state->unk78 |= 2;
return 0;
}
return 1;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_806152FC.s")
s32 func_global_asm_8061522C(Actor *arg0) {
u8 temp_a0;
u8 sp1E;
u8 sp1D;
s32 var_v0;
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_80615328.s")
D_807F5AF0++;
func_global_asm_80614F28(&sp1E);
func_global_asm_80614F28(&sp1D);
temp_a0 = (((rand() >> 0xF) % 32767) % ((sp1D - sp1E) + 1)) + sp1E;
if (temp_a0) {
arg0->animation_state->unk7C = temp_a0 - 1;
arg0->animation_state->unk78 |= 2;
return 0;
}
return 1;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_8061537C.s")
s32 func_global_asm_806152FC(Actor *arg0) {
D_807F5AF0++;
arg0->animation_state->unk78 |= 4;
return 0;
}
s32 func_global_asm_80615328(Actor *arg0) {
s16 sp1E;
D_807F5AF0++;
func_global_asm_80614F4C(&sp1E);
arg0->animation_state->unk78 |= sp1E;
return 0;
}
s32 func_global_asm_8061537C(Actor *arg0) {
f32 sp1C;
D_807F5AF0++;
func_global_asm_80614FD8(&sp1C);
if (sp1C < 0.0f) {
sp1C = arg0->animation_state->unk88;
}
arg0->animation_state->unk80 = sp1C;
arg0->animation_state->unk78 |= 8;
return 0;
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_17B90/func_global_asm_8061540C.s")