diff --git a/include/structs.h b/include/structs.h index 64234d4..1aca45b 100644 --- a/include/structs.h +++ b/include/structs.h @@ -2039,7 +2039,9 @@ typedef struct JetpacItem { u8 unk0; } JetpacItem; -typedef struct JetpacPickupStruct { +typedef struct JetpacPickupStruct JetpacPickupStruct; + +struct JetpacPickupStruct { s32 *unk0; u8 unk4[0x4]; f32 posX; @@ -2056,15 +2058,15 @@ typedef struct JetpacPickupStruct { s32 unk38; s32 point_bonus; s32 drop_type; - void (*unk44)(void*); - void (*code)(void*, s32); -} JetpacPickupStruct; + void (*unk44)(JetpacPickupStruct*); + void (*code)(JetpacPickupStruct*, s32); +}; typedef struct Competitor { s32 level; s32 current_score; s32 lives; - s32 lives_consumed; + s32 rocket_stage; s32 unk10; //used JetpacPickupStruct rocket_segments[3]; JetpacPickupStruct fuel_item; diff --git a/src/jetpac/code_3480.c b/src/jetpac/code_3480.c index 40ac049..3c86e6c 100644 --- a/src/jetpac/code_3480.c +++ b/src/jetpac/code_3480.c @@ -254,7 +254,7 @@ void func_jetpac_80028634(void) { temp_v0 = &D_jetpac_8002EC30.player[D_jetpac_8002EC30.player_index]; temp = temp_v0->rocket_segments; - temp_v0->lives_consumed = 8; + temp_v0->rocket_stage = 8; for (i = 0; i < 3; i++, temp++) { temp->posX = 168.0f; temp->posY = (i * 16) + 136.0f; @@ -270,7 +270,7 @@ void func_jetpac_80028950(void) { temp_v0 = &D_jetpac_8002EC30.player[D_jetpac_8002EC30.player_index]; var_v1 = &temp_v0->rocket_segments[0].unk0; - temp_v0->lives_consumed = 2; + temp_v0->rocket_stage = 2; for (i = 0; i < 3; i++, var_v1++) { var_v1->posX = 168.0f; var_v1->posY = (i * 16) + -8.0f;