From 18676c531d2a6ce1655529c15209aff24698693b Mon Sep 17 00:00:00 2001 From: KrimtonZ Date: Wed, 25 Mar 2020 10:59:49 -0500 Subject: [PATCH] set types for more segment addresses --- src/overlays/actors/ovl_Demo_Go/z_demo_go.c | 2 +- src/overlays/actors/ovl_En_Bird/z_en_bird.c | 4 ++-- src/overlays/actors/ovl_En_Dog/z_en_dog.c | 4 ++-- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 4 ++-- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index d0b335ed32..0ece8aadae 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -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; } diff --git a/src/overlays/actors/ovl_En_Bird/z_en_bird.c b/src/overlays/actors/ovl_En_Bird/z_en_bird.c index bacd4051fe..c3e30bb5cc 100644 --- a/src/overlays/actors/ovl_En_Bird/z_en_bird.c +++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.c @@ -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; diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index 782b572a60..396a07b319 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -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) { diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 30a64142a3..6e08c53b70 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -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); diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index d16780c51f..6f69317a0d 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -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);