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

Update jetpac item struct

Browse Source
This commit is contained in:
Donkey Kong 2024-05-28 19:10:22 -05:00
parent 45c942ee19
commit 47bd9d49f4
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/structs.h
View File

@ -2039,17 +2039,26 @@ typedef struct JetpacItem {
u8 unk0;
} JetpacItem;
typedef struct CompetitorSub14 {
typedef struct JetpacPickupStruct {
s32 *unk0;
u8 unk4[0x4];
f32 unk8;
f32 unkC;
u8 unk10[0x1C-0x10];
f32 posX;
f32 posY;
f32 velX;
f32 velY;
u8 red;
u8 green;
u8 blue;
u8 will_render;
s32 unk1C;
u8 unk20[0x44-0x20];
u8 unk20[0x34-0x20];
s32 counter;
s32 unk38;
s32 point_bonus;
s32 drop_type;
void (*unk44)(void*);
void (*code)(void*, s32);
} CompetitorSub14;
} JetpacPickupStruct;
typedef struct Competitor {
s32 level;
@ -2057,7 +2066,7 @@ typedef struct Competitor {
s32 lives;
s32 lives_consumed;
s32 unk10; //used
CompetitorSub14 unk14[4];
JetpacPickupStruct unk14[4];
s32 unk_144;
JetpacItem next_item_pointer;
u8 unk14C[4];

20
src/jetpac/code_3480.c
View File

@ -168,14 +168,14 @@ void func_jetpac_80027D64(Competitor *arg0) {
#pragma GLOBAL_ASM("asm/nonmatchings/jetpac/code_3480/func_jetpac_80027EC0.s")
s32 func_jetpac_800274C0();
extern CompetitorSub14 D_jetpac_8002DD38;
extern JetpacPickupStruct D_jetpac_8002DD38;
void func_jetpac_80028340(Competitor *arg0) {
CompetitorSub14 sp1C;
JetpacPickupStruct sp1C;
f32 sp24;
sp1C = D_jetpac_8002DD38;
sp1C.unk8 = func_jetpac_800274C0();
sp1C.posX = func_jetpac_800274C0();
arg0->unk14[3] = sp1C;
arg0->unk10 = 3;
}
@ -226,7 +226,7 @@ block_5:
void func_jetpac_80028544(void) {
void (*temp_v0)(void *, s32);
s32 i;
CompetitorSub14 *var_s0;
JetpacPickupStruct *var_s0;
JetpacPlayerStruct* player;
player = &D_jetpac_8002EC30.player[D_jetpac_8002EC30.player_index];
@ -250,14 +250,14 @@ void func_jetpac_800285DC(void) {
void func_jetpac_80028634(void) {
s32 i;
Competitor *temp_v0;
CompetitorSub14 *temp;
JetpacPickupStruct *temp;
temp_v0 = &D_jetpac_8002EC30.player[D_jetpac_8002EC30.player_index];
temp = temp_v0->unk14;
temp_v0->lives_consumed = 8;
for (i = 0; i < 3; i++, temp++) {
temp->unk8 = 168.0f;
temp->unkC = (i * 16) + 136.0f;
temp->posX = 168.0f;
temp->posY = (i * 16) + 136.0f;
}
}
@ -266,14 +266,14 @@ void func_jetpac_80028634(void) {
void func_jetpac_80028950(void) {
s32 i;
Competitor *temp_v0;
CompetitorSub14 *var_v1;
JetpacPickupStruct *var_v1;
temp_v0 = &D_jetpac_8002EC30.player[D_jetpac_8002EC30.player_index];
var_v1 = &temp_v0->unk14[0].unk0;
temp_v0->lives_consumed = 2;
for (i = 0; i < 3; i++, var_v1++) {
var_v1->unk8 = 168.0f;
var_v1->unkC = (i * 16) + -8.0f;
var_v1->posX = 168.0f;
var_v1->posY = (i * 16) + -8.0f;
}
}