From ef7ca54addb0077b5f7ecbf48592a548838afd75 Mon Sep 17 00:00:00 2001 From: angie Date: Sun, 17 Jan 2021 15:53:18 -0300 Subject: [PATCH] Fix functions declarations Signed-off-by: angie --- src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c | 14 ++++++++++---- src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h | 6 ++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index 814394e882..bf0d809353 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -29,14 +29,14 @@ extern Gfx D_8099EB60[]; //#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D0.s") -void func_8099D8D0(EffDust* this, void (*callback)()) { +void func_8099D8D0(EffDust* this, EffDustActionFunc callback) { this->unk_0560 = callback; } //#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D8.s") -void func_8099D8D8(EffDust* this, void (*callback)()) { +void func_8099D8D8(EffDust* this, EffDustActionFunc callback) { this->unk_0564 = callback; } @@ -56,18 +56,24 @@ void EffDust_Destroy(Actor *thisx, GlobalContext *globalCtx) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DB28.s") +f32 func_8099DB28(EffDust* this, GlobalContext* globalCtx); + #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DD74.s") +f32 func_8099DD74(EffDust* this, GlobalContext* globalCtx); + #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099DFC0.s") +f32 func_8099DFC0(EffDust* this, GlobalContext* globalCtx); + #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s") -void func_8099E4F4(EffDust* this, GlobalContext* globalCtx); +f32 func_8099E4F4(EffDust* this, GlobalContext* globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s") -void func_8099E784(EffDust* this, GlobalContext* globalCtx); +f32 func_8099E784(EffDust* this, GlobalContext* globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Draw.s") diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h index f7f06e5a33..aabb22a96c 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h @@ -6,11 +6,13 @@ struct EffDust; +typedef f32 (*EffDustActionFunc)(struct EffDust *, GlobalContext *); + typedef struct EffDust { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x414]; - /* 0x0560 */ void (*unk_0560)(); - /* 0x0560 */ void (*unk_0564)(); + /* 0x0560 */ EffDustActionFunc unk_0560; + /* 0x0560 */ EffDustActionFunc unk_0564; } EffDust; // size = 0x0568 extern const ActorInit Eff_Dust_InitVars;