mirror of
https://gitlab.com/dk64_decomp/dk64.git
synced 2024-11-23 07:01:58 +00:00
20.9348%
This commit is contained in:
parent
78213e8525
commit
266a464971
@ -1400,15 +1400,22 @@ typedef struct JetpacItem {
|
||||
u8 unk0;
|
||||
} JetpacItem;
|
||||
|
||||
typedef struct CompetitorSubF8 {
|
||||
u8 unk0[0x8];
|
||||
f32 unk8;
|
||||
u8 unkC[0x1C-0xC];
|
||||
s32 unk1C; // Used
|
||||
u8 unk20[0x4C-0x20];
|
||||
} CompetitorSubF8;
|
||||
|
||||
typedef struct Competitor {
|
||||
s32 level;
|
||||
s32 current_score;
|
||||
s32 lives;
|
||||
s32 lives_consumed;
|
||||
s32 unk10; //used
|
||||
u8 pad0[0x114 - 0x14];
|
||||
s32 unk114; //used
|
||||
u8 pad2[0x144 - 0x118];
|
||||
u8 pad0[0xF8 - 0x14];
|
||||
CompetitorSubF8 unkF8;
|
||||
s32 unk_144;
|
||||
JetpacItem next_item_pointer;
|
||||
u8 unk14C[4];
|
||||
|
@ -54,7 +54,7 @@ us,.code,func_80028E04,132,no
|
||||
us,.code,func_8002998C,364,no
|
||||
us,.code,func_80028544,152,no
|
||||
us,.code,func_80025F48,124,no
|
||||
us,.code,func_80028340,172,no
|
||||
us,.code,func_80028340,172,yes
|
||||
us,.code,func_80028B54,124,no
|
||||
us,.code,func_8002A944,48,yes
|
||||
us,.code,func_80025BB8,136,yes
|
||||
|
|
@ -3836,7 +3836,7 @@ us,.code,func_80028E04,132,no
|
||||
us,.code,func_8002998C,364,no
|
||||
us,.code,func_80028544,152,no
|
||||
us,.code,func_80025F48,124,no
|
||||
us,.code,func_80028340,172,no
|
||||
us,.code,func_80028340,172,yes
|
||||
us,.code,func_80028B54,124,no
|
||||
us,.code,func_8002A944,48,yes
|
||||
us,.code,func_80025BB8,136,yes
|
||||
|
|
@ -9,7 +9,7 @@
|
||||
</mask>
|
||||
<g mask="url(#anybadge_1)">
|
||||
<path fill="#555" d="M0 0h47v20H0z"/>
|
||||
<path fill="#c05500" d="M47 0h67v20H47z"/>
|
||||
<path fill="#c05700" d="M47 0h67v20H47z"/>
|
||||
<path fill="url(#b)" d="M0 0h114v20H0z"/>
|
||||
</g>
|
||||
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
|
||||
@ -17,7 +17,7 @@
|
||||
<text x="23.5" y="14">jetpac</text>
|
||||
</g>
|
||||
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
|
||||
<text x="81.5" y="15" fill="#010101" fill-opacity=".3">22.1127%</text>
|
||||
<text x="80.5" y="14">22.1127%</text>
|
||||
<text x="81.5" y="15" fill="#010101" fill-opacity=".3">22.7096%</text>
|
||||
<text x="80.5" y="14">22.7096%</text>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
@ -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">20.9243%</text>
|
||||
<text x="165.5" y="14">20.9243%</text>
|
||||
<text x="166.5" y="15" fill="#010101" fill-opacity=".3">20.9348%</text>
|
||||
<text x="165.5" y="14">20.9348%</text>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
@ -341,7 +341,7 @@ void func_800250A0(void) {
|
||||
func_80027D64(player);
|
||||
if ((player->level & 3) == 0) {
|
||||
func_800275F4(player);
|
||||
player->unk114 = 0;
|
||||
player->unkF8.unk1C = 0;
|
||||
player->unk10 = 1;
|
||||
func_80024F9C(2);
|
||||
return;
|
||||
|
@ -64,7 +64,18 @@ s32 func_80027510(Struct80027510 *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4,
|
||||
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/jetpac/code_3480/func_80027EC0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/jetpac/code_3480/func_80028340.s")
|
||||
s32 func_800274C0();
|
||||
extern CompetitorSubF8 D_8002DD38;
|
||||
|
||||
void func_80028340(Competitor *arg0) {
|
||||
CompetitorSubF8 sp1C;
|
||||
f32 sp24;
|
||||
|
||||
sp1C = D_8002DD38;
|
||||
sp1C.unk8 = func_800274C0();
|
||||
arg0->unkF8 = sp1C;
|
||||
arg0->unk10 = 3;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/jetpac/code_3480/func_800283EC.s")
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user