diff options
Diffstat (limited to 'src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c')
| -rw-r--r-- | src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c index b40707f64..ee0c33e09 100644 --- a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c +++ b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c @@ -46,9 +46,9 @@ void DemoMoonend_Init(Actor* thisx, PlayState* play) { this->actionFunc = func_80C17B60; } else { Actor_SetScale(&this->actor, 0.095f); - func_80183430(&this->skeletonInfo, &object_moonend_Blob_00B5A0, &object_moonend_Blob_001214, this->jointTable, + func_80183430(&this->skeletonInfo, (void*)object_moonend_Blob_00B5A0, (void*)object_moonend_Blob_001214, this->jointTable, this->morphTable, NULL); - func_801834A8(&this->skeletonInfo, &object_moonend_Blob_001214); + func_801834A8(&this->skeletonInfo, (void*)object_moonend_Blob_001214); this->cueType = CS_CMD_ACTOR_CUE_560; this->actionFunc = func_80C17C48; this->actor.home.rot.z = 0; @@ -110,13 +110,13 @@ void func_80C17C48(DemoMoonend* this, PlayState* play) { switch (this->cueId) { case 1: this->actor.draw = DemoMoonend_Draw; - func_801834A8(&this->skeletonInfo, &object_moonend_Blob_001214); + func_801834A8(&this->skeletonInfo, (void*)object_moonend_Blob_001214); this->skeletonInfo.frameCtrl.unk_C = 0.0f; break; case 2: this->actor.draw = DemoMoonend_Draw; - func_801834A8(&this->skeletonInfo, &object_moonend_Blob_001214); + func_801834A8(&this->skeletonInfo, (void*)object_moonend_Blob_001214); this->skeletonInfo.frameCtrl.unk_C = 2.0f / 3.0f; Actor_PlaySfx(&this->actor, NA_SE_EV_MOON_EXPLOSION); this->actor.home.rot.z = 1; @@ -166,7 +166,7 @@ void DemoMoonend_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); } -s32 func_80C17E70(PlayState* play, SkeletonInfo* skeletonInfo, s32 limbIndex, Gfx** dList, u8* flags, Actor* thisx, +s32 func_80C17E70(PlayState* play, SkeletonInfo* skeletonInfo, s32 limbIndex, Gfx** dList, u8* flags, void* thisx, Vec3f* scale, Vec3s* rot, Vec3f* pos) { DemoMoonend* this = THIS; @@ -178,7 +178,7 @@ s32 func_80C17E70(PlayState* play, SkeletonInfo* skeletonInfo, s32 limbIndex, Gf return true; } -s32 func_80C17EE0(PlayState* play, SkeletonInfo* skeleton, s32 limbIndex, Gfx** dList, u8* flags, Actor* thisx, +s32 func_80C17EE0(PlayState* play, SkeletonInfo* skeleton, s32 limbIndex, Gfx** dList, u8* flags, void* thisx, Vec3f* scale, Vec3s* rot, Vec3f* pos) { DemoMoonend* this = THIS; @@ -208,7 +208,7 @@ void func_80C17FCC(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx); Gfx_SetupDL25_Xlu(play->state.gfxCtx); - AnimatedMat_DrawXlu(play, Lib_SegmentedToVirtual(object_moonend_Matanimheader_0129F0)); + AnimatedMat_DrawXlu(play, Lib_SegmentedToVirtual((void*)object_moonend_Matanimheader_0129F0)); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_moonend_DL_010C40); |
