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

33.2278%

Browse Source
This commit is contained in:
Donkey Kong 2023-08-15 20:31:09 +09:30
parent 8733aaed6b
commit 1c482cdb91
6 changed files with 136 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/structs.h
View File

@ -90,7 +90,7 @@ typedef struct PlayerProgress {
u16 oranges; // 0x2F4
u16 crystals; // 0x2F6 // Note: Multiplied by 150 compared to on screen counter
u16 film; // 0x2F8
u8 unk2FA;
s8 unk2FA;
s8 health; // 0x2FB
u8 melons; // 0x2FC
s8 unk2FD; // Something to do with health... hmm

4
progress/progress.multiplayer.csv
View File

@ -1,8 +1,8 @@
version,section,function,length,matching
us,.multiplayer,func_multiplayer_800241F4,96,yes
us,.multiplayer,func_multiplayer_80025404,516,no
us,.multiplayer,func_multiplayer_80025404,516,yes
us,.multiplayer,func_multiplayer_8002698C,60,yes
us,.multiplayer,func_multiplayer_80025CE8,668,no
us,.multiplayer,func_multiplayer_80025CE8,668,yes
us,.multiplayer,func_multiplayer_80024254,168,yes
us,.multiplayer,func_multiplayer_80026E20,336,no
us,.multiplayer,func_multiplayer_80026B0C,204,yes

1 version section function length matching
2 us .multiplayer func_multiplayer_800241F4 96 yes
3 us .multiplayer func_multiplayer_80025404 516 no yes
4 us .multiplayer func_multiplayer_8002698C 60 yes
5 us .multiplayer func_multiplayer_80025CE8 668 no yes
6 us .multiplayer func_multiplayer_80024254 168 yes
7 us .multiplayer func_multiplayer_80026E20 336 no
8 us .multiplayer func_multiplayer_80026B0C 204 yes

4
progress/progress.total.csv
View File

@ -3397,9 +3397,9 @@ us,.menu,func_menu_800291CC,1500,no
us,.menu,func_menu_800266F0,276,yes
version,section,function,length,matching
us,.multiplayer,func_multiplayer_800241F4,96,yes
us,.multiplayer,func_multiplayer_80025404,516,no
us,.multiplayer,func_multiplayer_80025404,516,yes
us,.multiplayer,func_multiplayer_8002698C,60,yes
us,.multiplayer,func_multiplayer_80025CE8,668,no
us,.multiplayer,func_multiplayer_80025CE8,668,yes
us,.multiplayer,func_multiplayer_80024254,168,yes
us,.multiplayer,func_multiplayer_80026E20,336,no
us,.multiplayer,func_multiplayer_80026B0C,204,yes

1 version section function length matching
3397 us .menu func_menu_800266F0 276 yes
3398 version section function length matching
3399 us .multiplayer func_multiplayer_800241F4 96 yes
3400 us .multiplayer func_multiplayer_80025404 516 no yes
3401 us .multiplayer func_multiplayer_8002698C 60 yes
3402 us .multiplayer func_multiplayer_80025CE8 668 no yes
3403 us .multiplayer func_multiplayer_80024254 168 yes
3404 us .multiplayer func_multiplayer_80026E20 336 no
3405 us .multiplayer func_multiplayer_80026B0C 204 yes

6
progress/progress_multiplayer.svg
View File

@ -9,7 +9,7 @@
</mask>
<g mask="url(#anybadge_1)">
<path fill="#555" d="M0 0h78v20H0z"/>
<path fill="#c07400" d="M78 0h67v20H78z"/>
<path fill="#c09900" d="M78 0h67v20H78z"/>
<path fill="url(#b)" d="M0 0h145v20H0z"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@ -17,7 +17,7 @@
<text x="39.0" y="14">multiplayer</text>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="112.5" y="15" fill="#010101" fill-opacity=".3">30.1054%</text>
<text x="111.5" y="14">30.1054%</text>
<text x="112.5" y="15" fill="#010101" fill-opacity=".3">39.8551%</text>
<text x="111.5" y="14">39.8551%</text>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

6
progress/progress_total.svg
View File

@ -9,7 +9,7 @@
</mask>
<g mask="url(#anybadge_1)">
<path fill="#555" d="M0 0h132v20H0z"/>
<path fill="#c07f00" d="M132 0h67v20H132z"/>
<path fill="#c08000" d="M132 0h67v20H132z"/>
<path fill="url(#b)" d="M0 0h199v20H0z"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@ -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">33.1559%</text>
<text x="165.5" y="14">33.1559%</text>
<text x="166.5" y="15" fill="#010101" fill-opacity=".3">33.2278%</text>
<text x="165.5" y="14">33.2278%</text>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

131
src/multiplayer/code_0.c
View File

@ -260,8 +260,62 @@ s32 func_multiplayer_800253C8(void) {
return (((rand() >> 0xF) % 32767) % 211) + 90;
}
// Jumptable
#pragma GLOBAL_ASM("asm/nonmatchings/multiplayer/code_0/func_multiplayer_80025404.s")
void func_global_asm_80715908(Struct80717D84 *); // extern
extern s32 D_global_asm_807207BC; // TODO: Type
extern int func_global_asm_8071F3C0(); // TODO: Signature
s32 func_multiplayer_80025404(void) {
s32 pad;
s32 sp50;
Struct80717D84 *temp_a0;
s32 i;
s32 chosenPlayer;
s32 var_s6;
s32 temp_s3;
u8 temp_t4;
PlayerAdditionalActorData *PaaD;
chosenPlayer = -1;
for (i = 0; i < cc_number_of_players; i++) {
PaaD = character_change_array[i].player_pointer->PaaD;
if (func_global_asm_806F8AD4(1, i) != 0) {
temp_s3 = D_global_asm_807FC950[i].health + D_global_asm_807FC950[i].unk2FD;
if (PaaD->unk260 == NULL) {
switch (current_character_index[i]) {
case 0:
case 3:
var_s6 = 0xF;
break;
case 1:
case 2:
case 4:
case 5:
var_s6 = 0xD;
break;
}
func_global_asm_807149B8(1);
func_global_asm_807149FC(-1);
func_global_asm_80714998(2);
func_global_asm_807149C8(0xFF, 0xFF, 0xFF, 0x7F);
func_global_asm_8071498C(&func_global_asm_8071F3C0);
PaaD->unk260 = func_global_asm_80714C08(&D_global_asm_807207BC, 0.5f, character_change_array[i].player_pointer, var_s6, 2);
D_global_asm_807FC950[i].unk2FA = temp_s3;
}
if (D_global_asm_807FC950[i].unk2FA < temp_s3) {
D_global_asm_807FC950[i].unk2FA = temp_s3;
}
chosenPlayer = i;
} else {
temp_a0 = PaaD->unk260;
if (temp_a0 != NULL) {
func_global_asm_80715908(temp_a0);
PaaD->unk260 = NULL;
D_global_asm_807FC950[i].unk2FA = 0;
}
}
}
return chosenPlayer;
}
s32 func_global_asm_8063254C(s32, s32 *, f32 *, f32 *, f32 *, s16 *, s16*); /* extern */
@ -373,8 +427,75 @@ void func_multiplayer_80025B48(Struct80025B48 *arg0) {
}
}
// Jumptable
#pragma GLOBAL_ASM("asm/nonmatchings/multiplayer/code_0/func_multiplayer_80025CE8.s")
void func_global_asm_806F54E0(u8, s32, s32);
void func_multiplayer_80025CE8(s32 arg0) {
Actor *temp_s3;
s32 temp_t4;
s32 temp_t5;
s32 playerIndex;
u32 temp_hi;
u32 temp_t9;
PlayerAdditionalActorData *PaaD;
PlayerAdditionalActorData *temp_s1;
Actor *player;
temp_s3 = character_change_array[arg0].player_pointer;
PaaD = temp_s3->PaaD;
switch (PaaD->unk264) {
case 0:
func_global_asm_806D0468(temp_s3, 2);
func_global_asm_806F54E0(arg0, 0x8E, 0);
break;
case 1:
for (playerIndex = 0; playerIndex < cc_number_of_players; playerIndex++) {
player = character_change_array[playerIndex].player_pointer;
temp_s1 = player->PaaD;
if (playerIndex != arg0) {
if (temp_s1->unkD4 == 0) {
if (player->control_state != 0x84) {
func_global_asm_806EB0C0(0x27, temp_s3, playerIndex);
temp_s1->unk200 = 0x96;
}
}
}
}
break;
case 2:
PaaD->unk1F0 |= 0x20;
PaaD->unk1F0 &= 0xF7FFFFFF;
func_global_asm_806F54E0(arg0, 0x8E, 0);
break;
case 3:
func_global_asm_806846B4(temp_s3->x_position, temp_s3->y_position, temp_s3->z_position, 0.1f, 0.1f, temp_s3, 1);
break;
case 4:
temp_hi = (rand() >> 0xF) % 5;
switch (temp_hi) {
case 0:
func_global_asm_806D0468(temp_s3, 0);
func_global_asm_806F54E0(arg0, 0x8E, 0);
break;
case 1:
PaaD->unk200 = 0x96;
PaaD->unk1F0 |= 0x80;
break;
case 2:
PaaD->unk1F0 |= 0x08000000;
PaaD->unk1F0 &= ~0x20;
PaaD->unk200 = 0x96;
break;
case 3:
func_global_asm_806C9974(arg0, 0x40);
break;
case 4:
func_global_asm_806846B4(temp_s3->x_position, temp_s3->y_position, temp_s3->z_position, 0.1f, 0.1f, temp_s3, 1);
break;
}
break;
}
PaaD->unk264 = -1;
}
void func_multiplayer_80025F84(void) {
s32 i;
@ -386,8 +507,6 @@ void func_multiplayer_80025F84(void) {
}
}
void func_global_asm_80715908(s32);
typedef struct {
u8 unk0[0x50 - 0x0];
s32 unk50[8];