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

42.5727%

Browse Source
This commit is contained in:
Donkey Kong 2024-06-07 00:06:01 +09:30
parent f23297b970
commit cdf00dad3f
11 changed files with 86 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions.h
View File

@ -2439,7 +2439,7 @@ s32 func_global_asm_806CCC10(void);
f32 func_global_asm_806CD898(f32 currentSpeed, f32 desiredSpeed, f32 boostAmount);
void func_global_asm_806CD8EC(void);
s16 func_global_asm_806CD988(Actor *arg0);
// TODO: func_global_asm_806CD9A0 has no documented signature
s16 func_global_asm_806CD9A0(Actor *arg0, f32 arg1, f32 arg2, s16 arg3, s16 arg4);
// TODO: func_global_asm_806CDD24 has no documented signature
u32 func_global_asm_806CE174(Actor *arg0, f32 arg1, f32 arg2, s32 arg3);
s16 func_global_asm_806CE4E4(Actor *arg0, f32 arg1, f32 arg2, s32 arg3);
@ -3399,7 +3399,7 @@ void func_global_asm_80718380(Struct80717D84 *arg0, s8 *arg1);
// TODO: func_global_asm_807184F4 has no documented signature
// TODO: func_global_asm_807186C8 has no documented signature
void func_global_asm_807189BC(Struct80717D84 *arg0, s8 *arg1);
// TODO: func_global_asm_80718BF4 has no documented signature
void func_global_asm_80718BF4(Struct80717D84 *arg0, s8 *arg1);
// TODO: func_global_asm_8071910C has no documented signature
// TODO: func_global_asm_807195D4 has no documented signature
// TODO: func_global_asm_807197B4 has no documented signature

2
progress/progress.global_asm.csv
View File

@ -817,7 +817,7 @@ us,asm,func_global_asm_806F07CC,172,yes
us,asm,func_global_asm_8065A654,12,yes
us,asm,func_global_asm_80676540,80,yes
us,asm,func_global_asm_806E9388,112,yes
us,asm,func_global_asm_806CD9A0,900,no
us,asm,func_global_asm_806CD9A0,900,yes
us,asm,func_global_asm_8073E63C,256,no
us,asm,func_global_asm_80634908,84,yes
us,asm,func_global_asm_806B1290,184,yes

1 version section function length matching
817 us asm func_global_asm_8065A654 12 yes
818 us asm func_global_asm_80676540 80 yes
819 us asm func_global_asm_806E9388 112 yes
820 us asm func_global_asm_806CD9A0 900 no yes
821 us asm func_global_asm_8073E63C 256 no
822 us asm func_global_asm_80634908 84 yes
823 us asm func_global_asm_806B1290 184 yes

2
progress/progress.total.csv
View File

@ -817,7 +817,7 @@ us,asm,func_global_asm_806F07CC,172,yes
us,asm,func_global_asm_8065A654,12,yes
us,asm,func_global_asm_80676540,80,yes
us,asm,func_global_asm_806E9388,112,yes
us,asm,func_global_asm_806CD9A0,900,no
us,asm,func_global_asm_806CD9A0,900,yes
us,asm,func_global_asm_8073E63C,256,no
us,asm,func_global_asm_80634908,84,yes
us,asm,func_global_asm_806B1290,184,yes

1 version section function length matching
817 us asm func_global_asm_8065A654 12 yes
818 us asm func_global_asm_80676540 80 yes
819 us asm func_global_asm_806E9388 112 yes
820 us asm func_global_asm_806CD9A0 900 no yes
821 us asm func_global_asm_8073E63C 256 no
822 us asm func_global_asm_80634908 84 yes
823 us asm func_global_asm_806B1290 184 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">41.8372%</text>
<text x="110.5" y="14">41.8372%</text>
<text x="111.5" y="15" fill="#010101" fill-opacity=".3">41.9103%</text>
<text x="110.5" y="14">41.9103%</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">42.5181%</text>
<text x="165.5" y="14">42.5181%</text>
<text x="166.5" y="15" fill="#010101" fill-opacity=".3">42.5727%</text>
<text x="165.5" y="14">42.5727%</text>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

1
src/critter/code_0.c
View File

@ -231,7 +231,6 @@ void func_critter_80026E0C(CritterController*);
void func_global_asm_8060956C(f32, f32, f32, s32, u8, f32, u8, u8);
void func_global_asm_80612CA0(f32 (*)[4], f32);
void func_global_asm_80718BF4(void);
void func_critter_80024000(Critter *arg0, u8 *arg1, f32 arg2) {
switch (*arg1) {

1
src/global_asm/code_478F0.c
View File

@ -97,7 +97,6 @@ void func_global_asm_80716F10(Struct80717D84 *arg0, s32 arg1);
int func_global_asm_8071E3EC(); // TODO: Signature
int func_global_asm_8071910C(); // TODO: Signature
int func_global_asm_80718BF4();
extern int func_global_asm_8071F1D0(); // TODO: Signature
int func_global_asm_8071C004();

2
src/global_asm/code_89250.c
View File

@ -21,8 +21,6 @@ extern s32 D_global_asm_807210EC;
extern s32 D_global_asm_80721158;
extern s32 D_global_asm_8072139C;
void func_global_asm_80718BF4(void);
extern u8 D_global_asm_80750AD0;
typedef struct {

3
src/global_asm/code_C2A90.c
View File

@ -38,7 +38,6 @@ void func_global_asm_8061C518(Actor*, Actor*, s32, s32, s32, s32, s32, s32, s32,
void func_global_asm_8061C600(Actor*, Actor*, s32, s32, s32, s32, s32, s32, s32, s32, f32);
void func_global_asm_806BF920(void);
int func_global_asm_807035C4(); // TODO: Signature
void func_global_asm_80718BF4(void);
int func_global_asm_807197B4(); // TODO: Signature
int func_global_asm_8071C818(); // TODO: Signature
@ -621,8 +620,6 @@ void func_global_asm_806C1300(void) {
renderActor(current_actor_pointer, 0);
}
s16 func_global_asm_806CD9A0(Actor *, f32, f32, u8, s32);
void func_global_asm_806C13AC(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4) {
s16 temp_v0;

86
src/global_asm/code_CEAE0.c
View File

@ -101,10 +101,8 @@ int func_global_asm_806FF75C(); // TODO: Signature
s32 handleInputsForControlState(s32 arg0);
void func_global_asm_806D0468(Actor *arg0, u8 arg1);
void func_global_asm_806CD424(s16, f32, f32); // TODO: Is this signature correct?
void func_global_asm_80718BF4(void);
void func_global_asm_806CEFBC(Struct806CEFBC*); // TODO: Proper signature, just for function pointer
void func_global_asm_806CF138(Struct806CF138 *arg0);
s16 func_global_asm_806CD9A0(Actor*, f32, f32, s16, s16);
void func_global_asm_80613A50(Actor*, s32);
void func_global_asm_806C9DE0(void) {
@ -870,8 +868,84 @@ s16 func_global_asm_806CD988(Actor *arg0) {
return temp;
}
// Jumptable
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_CEAE0/func_global_asm_806CD9A0.s")
extern f32 D_global_asm_8075318C[];
extern f32 D_global_asm_807531A8[];
extern f32 D_global_asm_80753170[];
extern f32 D_global_asm_807531C4[];
extern f32 D_global_asm_807531E0[];
s16 func_global_asm_806CD9A0(Actor *arg0, f32 arg1, f32 arg2, s16 arg3, s16 arg4) {
f32 var_f0 = MAX(arg1, arg2);
if ((arg0->unk6A | arg0->unk6C) & 1) {
switch (arg3) {
case 0:
case 1:
case 2:
if (arg2 != 0.0f) {
if (arg2 < D_global_asm_8075318C[arg4]) {
arg3 = 3;
} else if (arg2 < D_global_asm_807531C4[arg4]) {
arg3 = 4;
} else {
arg3 = 5;
}
}
break;
case 3:
if ((arg2 == 0.0f) && (arg1 < D_global_asm_80753170[arg4])) {
arg3 = 0;
} else if (D_global_asm_807531C4[arg4] < arg2) {
arg3 = 5;
} else if (D_global_asm_8075318C[arg4] < arg2) {
arg3 = 4;
}
break;
case 4:
if (var_f0 < D_global_asm_807531A8[arg4]) {
if (arg2 < D_global_asm_80753170[arg4]) {
arg3 = 0;
} else {
arg3 = 3;
}
} else if (D_global_asm_807531C4[arg4] < arg2) {
arg3 = 5;
}
break;
case 5:
if (var_f0 < D_global_asm_807531E0[arg4]) {
arg3 = 4;
}
break;
default:
if (arg1 < D_global_asm_80753170[arg4]) {
arg3 = 0;
} else if (arg1 < D_global_asm_807531A8[arg4]) {
arg3 = 3;
} else {
if (arg1 < D_global_asm_807531E0[arg4]) {
arg3 = 4;
} else {
arg3 = 5;
}
}
break;
}
if ((extra_player_info_pointer->unk1F0 & 0x100) && ((arg3 == 4) || (arg3 == 5))) {
arg3 = 3;
}
if ((arg3 == 0) && ((current_map == MAP_FUNKYS_STORE) || (current_map == MAP_CRANKYS_LAB) || (current_map == MAP_CANDYS_MUSIC_SHOP) || (current_map == MAP_SNIDES_HQ))) {
arg3 = 2;
} else if ((arg3 == 0) && ((cc_number_of_players >= 2) || (extra_player_info_pointer->unk1F0 & 0x40) || !(arg0->object_properties_bitfield & 4) || (is_cutscene_active == 1))) {
arg3 = 1;
} else if ((arg3 == 1) && (cc_number_of_players < 2) && !(extra_player_info_pointer->unk1F0 & 0x40) && (arg0->object_properties_bitfield & 4) && (is_cutscene_active != 1)) {
arg3 = 0;
}
} else {
arg3 = 6;
}
return arg3;
}
s32 func_global_asm_806CDD24(Actor *arg0, f32 arg1, f32 arg2, s32 arg3) {
s16 var_v1;
@ -1160,10 +1234,6 @@ s16 func_global_asm_806CE4E4(Actor *arg0, f32 arg1, f32 arg2, s32 arg3) {
return sp36;
}
extern f32 D_global_asm_80753170[];
extern f32 D_global_asm_807531C4[];
extern f32 D_global_asm_807531E0[];
s32 func_global_asm_806CE7A0(Actor *arg0, f32 arg1, f32 arg2, s16 arg3, s16 arg4) {
f32 var_f0;

1
src/global_asm/code_F56F0.c
View File

@ -113,7 +113,6 @@ extern s32 D_global_asm_807FBB68;
extern Struct80753EA0 D_global_asm_80753EA0[];
void func_global_asm_806F386C(u8, Actor*, Actor*, s16, u8);
s32 func_global_asm_806CD9A0(Actor*, f32, f32, s16, s16);
void func_global_asm_80614FD8(void*);
void func_global_asm_80614F28(void*);
s32 func_global_asm_80613448();