mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +00:00
Code Issues Projects Releases Wiki Activity

More actor cleanup Part 3 (#118)

Browse source 
* Add custom types for actor specific functions (like actions)

* Add a forward struct declaration for all other actors
This commit is contained in:
Roman971 2020-05-06 00:53:15 +02:00 • committed by GitHub
parent f114df8929
commit 1425678d8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
477 changed files with 1817 additions and 792 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/overlays/actors/ovl_En_Ani/z_en_ani.c
View file

@ -15,7 +15,6 @@ void EnAni_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnAni_Update(Actor* thisx, GlobalContext* globalCtx);
void EnAni_Draw(Actor* thisx, GlobalContext* globalCtx);
void EnAni_SetupAction(EnAni* this, ActorFunc actionFunc);
s32 EnAni_SetText(EnAni* this, GlobalContext* globalCtx, u16 textId);
void func_809B04F0(EnAni* this, GlobalContext* globalCtx);
void func_809B0524(EnAni* this, GlobalContext* globalCtx);
@ -64,7 +63,7 @@ UNK_PTR D_809B0F80[] = {
0x06001D18,
};
void EnAni_SetupAction(EnAni* this, ActorFunc actionFunc) {
void EnAni_SetupAction(EnAni* this, EnAniActionFunc actionFunc) {
this->actionFunc = actionFunc;
}

8
src/overlays/actors/ovl_En_Ani/z_en_ani.h
View file

@ -4,7 +4,11 @@
#include <ultra64.h>
#include <global.h>
typedef struct {
struct EnAni;
typedef void (*EnAniActionFunc)(struct EnAni*, GlobalContext*);
typedef struct EnAni {
/* 0x0000 */ Actor actor;
/* 0x014C */ ColliderCylinder collider;
/* 0x0198 */ SkelAnime skelAnime;
@ -16,7 +20,7 @@ typedef struct {
/* 0x02AA */ u16 unk_2AA;
/* 0x02AC */ s16 unk_2AC;
/* 0x02AE */ s16 unk_2AE;
/* 0x02B0 */ ActorFunc actionFunc;
/* 0x02B0 */ EnAniActionFunc actionFunc;
} EnAni; // size = 0x02B4
extern const ActorInit En_Ani_InitVars;