mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 15:01:17 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup symbols from undefined_syms.txt (2nd round) (#934)

Browse source
This commit is contained in:
Dragorn421 2021-09-01 01:00:55 +02:00 • committed by GitHub
parent 4444c5ea35
commit 89634377c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 162 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
View file

@ -1,5 +1,6 @@
#include "z_demo_ik.h"
#include "vt.h"
#include "objects/object_ik/object_ik.h"
#define FLAGS 0x00000010
@ -24,26 +25,6 @@ void DemoIk_DrawNothing(DemoIk* this, GlobalContext* globalCtx);
void DemoIk_Type1Draw(DemoIk* this, GlobalContext* globalCtx);
void DemoIk_Type2Draw(DemoIk* this, GlobalContext* globalCtx);
extern AnimationHeader D_0600035C;
extern SkeletonHeader D_06000380;
extern AnimationHeader D_06000634;
extern SkeletonHeader D_06000660;
extern AnimationHeader D_060008DC;
extern AnimationHeader D_06000C6C;
extern SkeletonHeader D_06000C90;
extern AnimationHeader D_06000F0C;
extern Gfx D_06016BE0[];
extern Gfx D_06016CD8[];
extern Gfx D_06016F88[];
extern Gfx D_06017028[];
extern Gfx D_06017170[];
extern FlexSkeletonHeader D_0601EE60;
extern FlexSkeletonHeader D_06000F30;
extern AnimationHeader D_0601EB14;
extern FlexSkeletonHeader D_0601EB40;
extern AnimationHeader D_0601EE34;
extern FlexSkeletonHeader D_06000900;
void DemoIk_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
@ -183,18 +164,18 @@ void DemoIk_Type1Init(DemoIk* this, GlobalContext* globalCtx) {
switch (this->actor.params) {
case 0:
skeleton = &D_06000C90;
animation = &D_06000C6C;
skeleton = &object_ik_Skel_000C90;
animation = &object_ik_Anim_000C6C;
phi_f0 = 30.0f;
break;
case 1:
skeleton = &D_06000660;
animation = &D_06000634;
skeleton = &object_ik_Skel_000660;
animation = &object_ik_Anim_000634;
phi_f0 = 10.0f;
break;
default:
skeleton = &D_06000380;
animation = &D_0600035C;
skeleton = &object_ik_Skel_000380;
animation = &object_ik_Anim_00035C;
phi_f0 = 20.0f;
// No break is required for matching
}
@ -286,12 +267,12 @@ void DemoIk_Type1PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
case 0:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inArmer.c", 390),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016BE0);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0);
break;
case 2:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inArmer.c", 396),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016F88);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016F88);
break;
}
}
@ -321,20 +302,20 @@ void DemoIk_Type2Init(DemoIk* this, GlobalContext* globalCtx) {
switch (this->actor.params) {
case 3:
skeleton = &D_0601EB40;
animation = &D_0601EB14;
skeleton = &object_ik_Skel_01EB40;
animation = &object_ik_Anim_01EB14;
break;
case 4:
skeleton = &D_0601EE60;
animation = &D_0601EE34;
skeleton = &object_ik_Skel_01EE60;
animation = &object_ik_Anim_01EE34;
break;
case 5:
skeleton = &D_06000F30;
animation = &D_06000F0C;
skeleton = &object_ik_Skel_000F30;
animation = &object_ik_Anim_000F0C;
break;
default:
skeleton = &D_06000900;
animation = &D_060008DC;
skeleton = &object_ik_Skel_000900;
animation = &object_ik_Anim_0008DC;
}
SkelAnime_InitFlex(globalCtx, &this->skelAnime, skeleton, NULL, this->jointTable, this->morphTable, 2);
@ -444,22 +425,22 @@ void DemoIk_Type2PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
case 3:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 274),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06017028);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_017028);
break;
case 4:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 280),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06017170);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_017170);
break;
case 5:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 286),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016BE0);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0);
break;
default:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 292),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_06016CD8);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016CD8);
break;
}
}