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

35.9450%

Browse Source
This commit is contained in:
Donkey Kong 2024-03-21 02:26:35 +10:30
parent 6ab009d819
commit 198683efe5
6 changed files with 86 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
progress/progress.global_asm.csv
View File

@ -900,7 +900,7 @@ us,asm,func_global_asm_80690BE8,120,yes
us,asm,func_global_asm_8060E79C,80,yes
us,asm,func_global_asm_80631FAC,216,yes
us,asm,func_global_asm_8068ECF4,608,yes
us,asm,func_global_asm_806BA76C,348,no
us,asm,func_global_asm_806BA76C,348,yes
us,asm,func_global_asm_8068086C,156,yes
us,asm,func_global_asm_8068A3A0,100,no
us,asm,func_global_asm_80724874,56,yes

1 version section function length matching
900 us asm func_global_asm_8060E79C 80 yes
901 us asm func_global_asm_80631FAC 216 yes
902 us asm func_global_asm_8068ECF4 608 yes
903 us asm func_global_asm_806BA76C 348 no yes
904 us asm func_global_asm_8068086C 156 yes
905 us asm func_global_asm_8068A3A0 100 no
906 us asm func_global_asm_80724874 56 yes

2
progress/progress.total.csv
View File

@ -900,7 +900,7 @@ us,asm,func_global_asm_80690BE8,120,yes
us,asm,func_global_asm_8060E79C,80,yes
us,asm,func_global_asm_80631FAC,216,yes
us,asm,func_global_asm_8068ECF4,608,yes
us,asm,func_global_asm_806BA76C,348,no
us,asm,func_global_asm_806BA76C,348,yes
us,asm,func_global_asm_8068086C,156,yes
us,asm,func_global_asm_8068A3A0,100,no
us,asm,func_global_asm_80724874,56,yes

1 version section function length matching
900 us asm func_global_asm_8060E79C 80 yes
901 us asm func_global_asm_80631FAC 216 yes
902 us asm func_global_asm_8068ECF4 608 yes
903 us asm func_global_asm_806BA76C 348 no yes
904 us asm func_global_asm_8068086C 156 yes
905 us asm func_global_asm_8068A3A0 100 no
906 us asm func_global_asm_80724874 56 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">35.4674%</text>
<text x="110.5" y="14">35.4674%</text>
<text x="111.5" y="15" fill="#010101" fill-opacity=".3">35.4957%</text>
<text x="110.5" y="14">35.4957%</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.9239%</text>
<text x="165.5" y="14">35.9239%</text>
<text x="166.5" y="15" fill="#010101" fill-opacity=".3">35.9450%</text>
<text x="165.5" y="14">35.9450%</text>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

46
src/global_asm/code_BDEE0.c
View File

@ -10,7 +10,7 @@ extern u8 D_global_asm_80750628[];
void func_global_asm_80612BC0(Mtx*, f32);
void func_global_asm_80612C30(Mtx*, f32);
void func_global_asm_80611A70(f32, f32, f32*, f32*);
void func_global_asm_8072AB74(s32, f32, f32, s32, f32);
s32 func_global_asm_8072AB74(s32, f32, f32, s32, f32);
// Jumptable
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_BDEE0/func_global_asm_806B91E0.s")
@ -189,8 +189,48 @@ s32 func_global_asm_806BA240(u8 arg0, s16 arg1) {
}
*/
// Jumptable, doable, use new context for function signatures
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_BDEE0/func_global_asm_806BA76C.s")
void func_global_asm_806BA76C(f32 arg0) {
Actor178 *a178;
f32 var_f0;
f32 var_f2;
a178 = current_actor_pointer->unk178;
var_f0 = D_global_asm_807FDC90->unkA;
var_f2 = D_global_asm_807FDC90->unkE;
switch (current_actor_pointer->control_state) {
case 0x1:
case 0x10:
case 0x15:
case 0x23:
var_f0 = D_global_asm_807FDC94->x_position;
var_f2 = D_global_asm_807FDC94->z_position;
// fallthrough
case 0x2:
case 0x3:
case 0x7:
case 0x35:
if (!(func_global_asm_8072AB74(current_actor_pointer->control_state, var_f0, var_f2, (current_actor_pointer->unkFC ? 0x10 : 0x810) & 0xFFFF, 0.0f) & 1) && (current_actor_pointer->unkFC == 0)) {
a178->unk0 += arg0;
}
break;
case 0x37:
switch (current_actor_pointer->control_state_progress) {
case 2:
func_global_asm_8072DC7C(0xA);
break;
case 3:
current_actor_pointer->control_state = 0x40;
break;
}
break;
case 0x4:
func_global_asm_8072AB74(0x37, 0.0f, 0.0f, 0x12, 0.0f);
break;
default:
func_global_asm_8072B7CC(0);
break;
}
}
void func_global_asm_806BA8C8(void) {
switch (current_actor_pointer->control_state) {

74
src/global_asm/code_D78D0.c
View File

@ -1767,43 +1767,43 @@ void func_global_asm_806D8308(void) {
PlayerAdditionalActorData *temp_v0;
switch (current_actor_pointer->control_state_progress) {
case 0:
current_actor_pointer->unkEA = current_actor_pointer->unkEE;
func_global_asm_80614D00(current_actor_pointer, 1.0f, 0.0f);
func_global_asm_806DF6D4(0x48);
func_global_asm_806CC948();
break;
case 1:
current_actor_pointer->y_velocity = extra_player_info_pointer->unk54;
current_actor_pointer->y_acceleration = D_global_asm_807537A8[D_global_asm_807FD584];
current_actor_pointer->unkB8 = D_global_asm_80753770[D_global_asm_807FD584];
current_actor_pointer->unkEA = current_actor_pointer->unkEE;
current_actor_pointer->control_state_progress += 1;
func_global_asm_806DF6D4(0x48);
func_global_asm_806CFE30();
func_global_asm_806CC948();
break;
case 2:
func_global_asm_806CFE30();
func_global_asm_806D3608();
func_global_asm_806CC948();
func_global_asm_806DF6D4(0x48);
break;
case 3:
extra_player_info_pointer->unk30 = D_global_asm_807537C4[D_global_asm_807FD584];
func_global_asm_806DF6D4(0x33);
func_global_asm_806CFE7C();
func_global_asm_806CC8B8();
break;
case 4:
if (extra_player_info_pointer->unk4 > 10.0f) {
func_global_asm_806CFF9C(current_actor_pointer);
}
extra_player_info_pointer->unk30 = D_global_asm_807537C4[D_global_asm_807FD584];
func_global_asm_806DF6D4(0x33);
func_global_asm_806CFE7C();
func_global_asm_806CC8B8();
break;
case 0:
current_actor_pointer->unkEA = current_actor_pointer->unkEE;
func_global_asm_80614D00(current_actor_pointer, 1.0f, 0.0f);
func_global_asm_806DF6D4(0x48);
func_global_asm_806CC948();
break;
case 1:
current_actor_pointer->y_velocity = extra_player_info_pointer->unk54;
current_actor_pointer->y_acceleration = D_global_asm_807537A8[D_global_asm_807FD584];
current_actor_pointer->unkB8 = D_global_asm_80753770[D_global_asm_807FD584];
current_actor_pointer->unkEA = current_actor_pointer->unkEE;
current_actor_pointer->control_state_progress += 1;
func_global_asm_806DF6D4(0x48);
func_global_asm_806CFE30();
func_global_asm_806CC948();
break;
case 2:
func_global_asm_806CFE30();
func_global_asm_806D3608();
func_global_asm_806CC948();
func_global_asm_806DF6D4(0x48);
break;
case 3:
extra_player_info_pointer->unk30 = D_global_asm_807537C4[D_global_asm_807FD584];
func_global_asm_806DF6D4(0x33);
func_global_asm_806CFE7C();
func_global_asm_806CC8B8();
break;
case 4:
if (extra_player_info_pointer->unk4 > 10.0f) {
func_global_asm_806CFF9C(current_actor_pointer);
}
extra_player_info_pointer->unk30 = D_global_asm_807537C4[D_global_asm_807FD584];
func_global_asm_806DF6D4(0x33);
func_global_asm_806CFE7C();
func_global_asm_806CC8B8();
break;
}
renderActor(current_actor_pointer, 0);
}