mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-03 01:54:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix functions declarations

Browse source 
Signed-off-by: angie <angheloalf95@gmail.com>
This commit is contained in:
angie 2021-01-17 15:53:18 -03:00
parent 678233f749
commit ef7ca54add
No known key found for this signature in database
GPG key ID: E5212BA1B6FEA700
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
View file

@ -29,14 +29,14 @@ extern Gfx D_8099EB60[];
//#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D0.s") //#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; this->unk_0560 = callback;
} }
//#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D8.s") //#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; 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") #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") #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") #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/EffDust_Update.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.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") #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") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Draw.s")

6
src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h
View file

@ -6,11 +6,13 @@
struct EffDust; struct EffDust;
typedef f32 (*EffDustActionFunc)(struct EffDust *, GlobalContext *);
typedef struct EffDust { typedef struct EffDust {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x414]; /* 0x014C */ char unk_14C[0x414];
/* 0x0560 */ void (*unk_0560)(); /* 0x0560 */ EffDustActionFunc unk_0560;
/* 0x0560 */ void (*unk_0564)(); /* 0x0560 */ EffDustActionFunc unk_0564;
} EffDust; // size = 0x0568 } EffDust; // size = 0x0568
extern const ActorInit Eff_Dust_InitVars; extern const ActorInit Eff_Dust_InitVars;