1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-09 05:44:26 +00:00

Fix some pointers in the struct

Signed-off-by: angie <angheloalf95@gmail.com>
This commit is contained in:
angie 2021-01-17 15:32:52 -03:00
parent c9ae3d5d3a
commit 678233f749
No known key found for this signature in database
GPG key ID: E5212BA1B6FEA700
3 changed files with 16 additions and 7 deletions

View file

@ -25,24 +25,26 @@ const ActorInit Eff_Dust_InitVars = {
};
*/
extern Gfx D_8099EB60[];
//#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D0.s")
void func_8099D8D0(void *arg0, s32 arg1) {
//arg0->unk560 = arg1;
*((s32*)arg0 + 0x0560/4) = arg1;
void func_8099D8D0(EffDust* this, void (*callback)()) {
this->unk_0560 = callback;
}
//#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8D8.s")
void func_8099D8D8(void *arg0, s32 arg1) {
//arg0->unk564 = arg1;
*((s32*)arg0 + 0x0564/4) = arg1;
void func_8099D8D8(EffDust* this, void (*callback)()) {
this->unk_0564 = callback;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8E0.s")
s32 func_8099D8E0(EffDust* this);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Init.s")
//#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Destroy.s")
@ -62,6 +64,10 @@ void EffDust_Destroy(Actor *thisx, GlobalContext *globalCtx) {
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s")
void 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);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Draw.s")

View file

@ -8,7 +8,9 @@ struct EffDust;
typedef struct EffDust {
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x41C];
/* 0x014C */ char unk_14C[0x414];
/* 0x0560 */ void (*unk_0560)();
/* 0x0560 */ void (*unk_0564)();
} EffDust; // size = 0x0568
extern const ActorInit Eff_Dust_InitVars;

View file

@ -2348,6 +2348,7 @@ D_060027D8 = 0x060027D8;
// z_eff_dust
D_04037880 = 0x04037880;
D_8099EB60 = 0x8099EB60;
// z_en_am
D_06000118 = 0x06000118;