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

35.3654%

Browse Source
This commit is contained in:
Donkey Kong 2024-03-07 22:07:12 +10:30
parent 630e90850c
commit ebf7030978
5 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
progress/progress.menu.csv
View File

@ -83,7 +83,7 @@ us,.menu,func_menu_800322D0,52,yes
us,.menu,func_menu_80027E10,80,yes
us,.menu,func_menu_8002AB80,340,no
us,.menu,func_menu_80024224,500,yes
us,.menu,func_menu_80029BB4,380,no
us,.menu,func_menu_80029BB4,380,yes
us,.menu,func_menu_80026290,24,yes
us,.menu,func_menu_800275FC,316,no
us,.menu,func_menu_800262A8,988,no

1 version section function length matching
83 us .menu func_menu_80027E10 80 yes
84 us .menu func_menu_8002AB80 340 no
85 us .menu func_menu_80024224 500 yes
86 us .menu func_menu_80029BB4 380 no yes
87 us .menu func_menu_80026290 24 yes
88 us .menu func_menu_800275FC 316 no
89 us .menu func_menu_800262A8 988 no

2
progress/progress.total.csv
View File

@ -3366,7 +3366,7 @@ us,.menu,func_menu_800322D0,52,yes
us,.menu,func_menu_80027E10,80,yes
us,.menu,func_menu_8002AB80,340,no
us,.menu,func_menu_80024224,500,yes
us,.menu,func_menu_80029BB4,380,no
us,.menu,func_menu_80029BB4,380,yes
us,.menu,func_menu_80026290,24,yes
us,.menu,func_menu_800275FC,316,no
us,.menu,func_menu_800262A8,988,no

1 version section function length matching
3366 us .menu func_menu_80027E10 80 yes
3367 us .menu func_menu_8002AB80 340 no
3368 us .menu func_menu_80024224 500 yes
3369 us .menu func_menu_80029BB4 380 no yes
3370 us .menu func_menu_80026290 24 yes
3371 us .menu func_menu_800275FC 316 no
3372 us .menu func_menu_800262A8 988 no

6
progress/progress_menu.svg
View File

@ -9,7 +9,7 @@
</mask>
<g mask="url(#anybadge_1)">
<path fill="#555" d="M0 0h41v20H0z"/>
<path fill="#c07300" d="M41 0h67v20H41z"/>
<path fill="#c07600" d="M41 0h67v20H41z"/>
<path fill="url(#b)" d="M0 0h108v20H0z"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@ -17,7 +17,7 @@
<text x="20.5" y="14">menu</text>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="75.5" y="15" fill="#010101" fill-opacity=".3">29.9817%</text>
<text x="74.5" y="14">29.9817%</text>
<text x="75.5" y="15" fill="#010101" fill-opacity=".3">30.6020%</text>
<text x="74.5" y="14">30.6020%</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">35.3423%</text>
<text x="165.5" y="14">35.3423%</text>
<text x="166.5" y="15" fill="#010101" fill-opacity=".3">35.3654%</text>
<text x="165.5" y="14">35.3654%</text>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

36
src/menu/code_3E10.c
View File

@ -221,13 +221,12 @@ void func_menu_80027FAC(Actor *arg0, s32 arg1) {
s16 i;
s16 max;
s32 var_v0_2;
s8 temp;
MaaD = arg0->additional_actor_data;
sp54 = D_menu_800337FC;
sp4F = 0;
if (inputs_enabled_timer > 0) {
inputs_enabled_timer -= 1;
inputs_enabled_timer--;
} else {
inputs_enabled_timer = 0;
}
@ -237,8 +236,7 @@ void func_menu_80027FAC(Actor *arg0, s32 arg1) {
if (inputs_enabled_timer == 0) {
if (MaaD->unk4 == 0.0f) {
menu_selection_available = 1;
temp = MaaD->unk17;
switch (temp) {
switch (MaaD->unk17) {
case 2:
if (!isFlagSet(0x1C, FLAG_TYPE_GLOBAL)) {
menu_selection_available = -1;
@ -261,9 +259,8 @@ void func_menu_80027FAC(Actor *arg0, s32 arg1) {
menu_icon_transition_scale += menu_selection_speed;
if (menu_icon_transition_scale > 1) {
menu_icon_transition_scale = 1;
temp = MaaD->unk17;
MaaD->unk16 = 0;
switch (temp) {
switch (MaaD->unk17) {
default:
MaaD->unk13 = 2;
break;
@ -653,41 +650,37 @@ void func_menu_80029AAC(Actor *arg0, s32 arg1) {
func_menu_8002FC1C(arg0, MaaD, 1);
}
// Displaylist stuff, close
#pragma GLOBAL_ASM("asm/nonmatchings/menu/code_3E10/func_menu_80029BB4.s")
/*
Gfx *func_menu_80029BB4(Actor *arg0, Gfx *dl) {
s32 pad124;
s32 sp120;
s32 pad11C;
s32 pad118;
s32 pad114;
f32 sp110;
f32 sp10C;
s32 pad108;
s32 pad104;
s32 pad100;
s16 spFE;
s16 temp_f4;
s16 sp100;
s32 padFC;
s32 padF8;
s16 spFE;
f32 temp3[4][4];
f32 temp2[4][4];
f32 temp[4][4];
s32 sp34;
void *aaD = arg0->additional_actor_data;
char sp34[4];
gDPSetPrimColor(dl++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF);
sp120 = func_menu_800317E8(aaD, 160.0f, 25.0f, &sp110, &sp10C, 3, 1, 0.45f);
temp_f4 = sp10C * 4.0f;
spFE = sp110 * 4.0f;
if (func_menu_800322D0(sp120) != 0) {
sp100 = sp10C * 4.0f;
if (func_menu_800322D0(sp120)) {
func_dk64_boot_800031E0(&sp34, "%s", label_string_pointer_array[6]);
} else {
func_dk64_boot_800031E0(&sp34, "%s %d", label_string_pointer_array[7], sp120 + 1);
}
dl = func_global_asm_806ABB98(dl, spFE, temp_f4, 0.6f, &sp34);
return func_global_asm_806ABB98(dl, sp110 * 4.0f, temp_f4 - 0x3C, 0.6f, label_string_pointer_array[8]);
dl = func_global_asm_806ABB98(dl, spFE, sp100, 0.6f, &sp34);
sp100 -= 0x3C;
return func_global_asm_806ABB98(dl, sp110 * 4.0f, sp100, 0.6f, label_string_pointer_array[8]);
}
*/
// TODO: Might be a fake match since func_menu_80030894 probably takes a void* as an arg instead of s32
// We'll see when .rodata and .data shake out I guess...
@ -1160,6 +1153,7 @@ void func_menu_8002CFA4(Actor *arg0, s32 arg1) {
}
*/
// displaylist stuff
#pragma GLOBAL_ASM("asm/nonmatchings/menu/code_3E10/func_menu_8002D520.s")
void func_menu_8002D7EC(Actor *arg0, s32 arg1) {