mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Code Issues Projects Releases Wiki Activity

set types for more segment addresses

Browse source
This commit is contained in:
KrimtonZ 2020-03-25 10:59:49 -05:00
parent 498d19655b
commit 18676c531d
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_Demo_Go/z_demo_go.c
View file

@ -320,7 +320,7 @@ void DemoGo_Init(DemoGo* this, GlobalContext* globalCtx) {
AnimationHeader* animation = &D_06004930;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f);
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600FEF0, 0, 0, 0, 0);
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600FEF0, NULL, NULL, NULL, 0);
SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(&animation->genericHeader), 2, 0.0f);
this->action = 0;
}

4
src/overlays/actors/ovl_En_Bird/z_en_bird.c
View file

@ -57,8 +57,8 @@ static InitChainEntry initChain[] = {
ICHAIN_F32(unk_4C, 5600, ICHAIN_STOP),
};
extern u32 D_0600006C;
extern u32 D_06002190;
extern AnimationHeader D_0600006C;
extern SkeletonHeader D_06002190;
void EnBird_SetNewUpdate(EnBird* this, ActorFunc newUpdateFunc) {
this->updateFunc = newUpdateFunc;

4
src/overlays/actors/ovl_En_Dog/z_en_dog.c
View file

@ -79,7 +79,7 @@ typedef enum {
/* 0x06 */ DOG_BOW_2,
} DogBehavior;
extern UNK_PTR D_06007290;
extern SkeletonHeader D_06007290;
extern AnimationHeader D_06001368;
extern AnimationHeader D_06000D78;
extern AnimationHeader D_06000278;
@ -242,7 +242,7 @@ static void EnDog_Init(EnDog* this, GlobalContext* globalCtx) {
collider = &this->collider;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 24.0f);
skelAnime = &this->skelAnime;
SkelAnime_InitSV(globalCtx, skelAnime, &D_06007290, 0, &this->unk_1F4, &this->unk_242, 13);
SkelAnime_InitSV(globalCtx, skelAnime, &D_06007290, NULL, &this->unk_1F4, &this->unk_242, 13);
func_80034EC0(skelAnime, animations, 0);
if ((this->actor.params & 0x8000) == 0) {

4
src/overlays/actors/ovl_En_Ms/z_en_ms.c
View file

@ -63,8 +63,8 @@ static InitChainEntry initChain[] = {
ICHAIN_F32(unk_4C, 500, ICHAIN_STOP),
};
extern D_060005EC;
extern D_06003DC0;
extern AnimationHeader D_060005EC;
extern SkeletonHeader D_06003DC0;
static void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx) {
this->actor.textId = Text_GetFaceReaction(globalCtx, 0x1B);

2
src/overlays/actors/ovl_En_Tk/z_en_tk.c
View file

@ -508,7 +508,7 @@ void EnTk_Init(EnTk* this, GlobalContext* globalCtx) {
ActorShape_Init(&thisAgain->actor.shape, 0, ActorShadow_DrawFunc_Circle, 24.f);
SkelAnime_InitSV(globalCtx, &thisAgain->skelAnim, &D_0600BE40, 0, thisAgain->hz_22A, thisAgain->hz_296, 18);
SkelAnime_InitSV(globalCtx, &thisAgain->skelAnim, &D_0600BE40, NULL, thisAgain->hz_22A, thisAgain->hz_296, 18);
SkelAnime_ChangeAnimation(&thisAgain->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84.genericHeader), 0,
0.f);