animation struct documentation

This commit is contained in:
Banjo Kazooie
2023-03-12 23:11:39 -05:00
parent 7dd7a0b60c
commit af75d8b32d
293 changed files with 2031 additions and 1986 deletions

View File

@@ -33,84 +33,84 @@ Struct_CC_3130_0 D_80389C30[] = {
ActorInfo D_80389C90 = {
MARKER_28_CLANKER_SAWBLADE, ACTOR_3D_CLANKER_SAWBLADE_PROPELLOR_1, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
chSawblade_update, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80389CB4 = {
MARKER_28_CLANKER_SAWBLADE, ACTOR_3E_CLANKER_SAWBLADE_PROPELLOR_2, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
chSawblade_update, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80389CD8 = {
MARKER_28_CLANKER_SAWBLADE, ACTOR_3F_CLANKER_SAWBLADE_PROPELLOR_3, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
chSawblade_update, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80389CFC = {
MARKER_28_CLANKER_SAWBLADE, ACTOR_40_CLANKER_SAWBLADE_PROPELLOR_4, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
chSawblade_update, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80389D20 = {
MARKER_28_CLANKER_SAWBLADE, ACTOR_41_CLANKER_SAWBLADE_PROPELLOR_5, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
chSawblade_update, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80389D44 = {
MARKER_28_CLANKER_SAWBLADE, ACTOR_42_CLANKER_SAWBLADE_PROPELLOR_6, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
chSawblade_update, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80389D68 = {
MARKER_28_CLANKER_SAWBLADE, ACTOR_290_CLANKER_SAWBLADE_PROPELLOR_7, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
chSawblade_update, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80389D8C = {
MARKER_28_CLANKER_SAWBLADE, ACTOR_291_CLANKER_SAWBLADE_PROPELLOR_8, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
chSawblade_update, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80389DB0 = {
MARKER_28_CLANKER_SAWBLADE, ACTOR_292_CLANKER_SAWBLADE_PROPELLOR_9, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
chSawblade_update, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80389DD4 = {
MARKER_28_CLANKER_SAWBLADE, ACTOR_293_CLANKER_SAWBLADE_PROPELLOR_10, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
chSawblade_update, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80389DF8 = {
MARKER_28_CLANKER_SAWBLADE, ACTOR_294_CLANKER_SAWBLADE_PROPELLOR_11, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
chSawblade_update, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80389E1C = {
MARKER_28_CLANKER_SAWBLADE, ACTOR_295_CLANKER_SAWBLADE_PROPELLOR_12, ASSET_43A_MODEL_CLANKER_SAWBLADE_PROPELLOR,
0, NULL,
chSawblade_update, NULL, func_80325888,
chSawblade_update, NULL, actor_draw,
0, 0, 0.0f, 0
};

View File

@@ -29,14 +29,14 @@ Struct_CC_1120_0 D_80389B50[] = {
ActorInfo D_80389B90 = {
0x4E, ACTOR_101_CLANKER_TOKEN_TOOTH, ASSET_891_MODEL_CLANKER_TOKEN_TOOTH_OPEN,
0, NULL,
chTooth_update, func_80326224, func_80325888,
chTooth_update, func_80326224, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80389BB4 = {
0x4F, ACTOR_102_CLANKER_JIGGY_TOOTH, ASSET_893_MODEL_CLANKER_JIGGY_TOOTH_OPEN,
0, NULL,
chTooth_update, func_80326224, func_80325888,
chTooth_update, func_80326224, actor_draw,
0, 0, 0.0f, 0
};

View File

@@ -15,7 +15,7 @@ void func_803864D4(Actor *this);
/* .data */
ActorInfo D_80389AA0 = {
MARKER_4B_CC_SCREW, ACTOR_43_CLACKER_SCREW, ASSET_890_MODEL_SCREW, 0, NULL,
func_803864D4, func_80326224 , func_80325888,
func_803864D4, func_80326224 , actor_draw,
0, 0, 0.0f, 0
};

View File

@@ -15,13 +15,13 @@ extern void func_802E9118(BKCollisionList *, BKVertexList *, f32[3], s32, f32, s
extern void func_802E9DD8(BKCollisionList *, BKVertexList *, f32[3], s32, f32, s32, f32, s32, s32);
extern int func_80340020(s32, f32[3], s32, f32, s32, BKVertexList *, f32[3], f32[3]);
extern void func_8033A670(s32, s32, f32[3]);
extern void func_8033A928(s32, s32, f32[3]);
extern void boneTransformList_getBoneScale(s32, s32, f32[3]);
extern void boneTransformList_setBoneScale(s32, s32, f32[3]);
extern void func_8033A9A8(s32, s32, f32[3]);
extern void viewport_getPosition(f32[3]);
extern void ml_vec3f_normalize(f32[3]);
extern void func_8033A45C(s32, s32);
extern void func_8033A238(s32);
extern void modelRender_setBoneTransformList(s32);
extern void func_8028FAB0(f32[3]);
extern void baModel_802921D4(f32[3]);
@@ -90,7 +90,7 @@ void func_80388518(s32 arg0){
D_80389FA0.unk21 = arg0;
D_80389FA0.unk38 = 0.0f;
if(D_80389FA0.unk21 == 1){
func_80335924(D_80389FA0.unk0, ASSET_C3_ANIM_CLANKER_IDLE, 0.0f, 10.0f);
skeletalAnim_set(D_80389FA0.unk0, ASSET_C3_ANIM_CLANKER_IDLE, 0.0f, 10.0f);
}
if(D_80389FA0.unk21 == 2){
func_8030DD90(D_80389FA0.unk4, 0);
@@ -103,7 +103,7 @@ void func_80388518(s32 arg0){
if(D_80389FA0.unk21 == 3){
if(sp24 != 2){
func_80335924(D_80389FA0.unk0, ASSET_C3_ANIM_CLANKER_IDLE, 0.0f, 10.0f);
skeletalAnim_set(D_80389FA0.unk0, ASSET_C3_ANIM_CLANKER_IDLE, 0.0f, 10.0f);
}
D_80389FA0.unk28[1] = 1100.0f;
}
@@ -151,13 +151,13 @@ void CC_func_80388760(Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(sp98[0] < -2600.0f || 11600.0f < sp98[0])
return;
s1 = func_803356A0(D_80389FA0.unk0);
func_8033A670(s1, 0x40, sp84);
s1 = skeletalAnim_getBoneTransformList(D_80389FA0.unk0);
boneTransformList_getBoneScale(s1, 0x40, sp84);
for( i = 0; i < 3; i++){
sp84[i] = sp84[i] + (1.3 - sp84[i])*D_80389FA0.unk8;
}
func_8033A928(s1, 0x40, sp84);
boneTransformList_setBoneScale(s1, 0x40, sp84);
if(D_80389FA0.unk21 == 1){
func_8033A9A8(s1, 0x44, D_80389C0C);
@@ -201,7 +201,7 @@ void CC_func_80388760(Gfx **gfx, Mtx **mtx, Vtx **vtx){
func_8033A45C(2, tmp_s0);
func_8033A45C(3, tmp_s0);
}
func_8033A238(s1);
modelRender_setBoneTransformList(s1);
func_8033A450(D_80389FA0.unk34);
modelRender_setVertexList(D_80389FA0.unk40);
modelRender_setDepthMode(MODEL_RENDER_DEPTH_FULL);
@@ -248,7 +248,7 @@ int CC_func_80388CA0(void){
void func_80388CB4(void){
if(D_80389FA0.unk21){
func_80335874(D_80389FA0.unk0);
skeletalAnim_free(D_80389FA0.unk0);
func_8030DA44(D_80389FA0.unk4);
func_80340690(D_80389FA0.unk18);
func_8034A2A8(D_80389FA0.unk34);
@@ -266,7 +266,7 @@ void func_80388CB4(void){
void func_80388D54(void){
D_80389FA0.unk21 = 0;
if(map_get() == MAP_B_CC_CLANKERS_CAVERN){
D_80389FA0.unk0 = func_803358B4();
D_80389FA0.unk0 = skeletalAnim_new();
D_80389FA0.unk4 = func_8030D90C();
D_80389FA0.unk8 = 1.0f;
D_80389FA0.unk18 = func_803406B0();
@@ -334,9 +334,9 @@ void CC_func_80388F4C(void){
D_80389FA0.unk20 = (ml_distance_vec3f(sp6C, D_80389FA0.unkC) < 200.0f);
D_80389FA0.unk38 += sp68;
sp64 = func_80335684(D_80389FA0.unk0);
func_80335A94(D_80389FA0.unk0, sp68, 1);
sp60 = func_80335684(D_80389FA0.unk0);
sp64 = skeletalAnim_getProgress(D_80389FA0.unk0);
skeletalAnim_update(D_80389FA0.unk0, sp68, 1);
sp60 = skeletalAnim_getProgress(D_80389FA0.unk0);
if(D_80389FA0.unk21 == 3){
func_8034A174(D_80389FA0.unk34, 5, sp54);
if(sp60 < sp64){
@@ -359,16 +359,16 @@ void CC_func_80388F4C(void){
}
if(D_80389FA0.unk21 == 1){
if(D_80389FA0.unk20 && func_8033567C(D_80389FA0.unk0) != ASSET_C4_ANIM_CLANKER_BITE){
func_80335924(D_80389FA0.unk0, ASSET_C4_ANIM_CLANKER_BITE, 1.0f, 10.0f);
if(D_80389FA0.unk20 && skeletalAnim_getAnimId(D_80389FA0.unk0) != ASSET_C4_ANIM_CLANKER_BITE){
skeletalAnim_set(D_80389FA0.unk0, ASSET_C4_ANIM_CLANKER_BITE, 1.0f, 10.0f);
if(!D_80389FA0.unk48){
func_80311480(0xd2b, 0xE, D_80389FA0.unk28, NULL, NULL, NULL);
D_80389FA0.unk48 = TRUE;
}
}//L8038918C
if(!D_80389FA0.unk20 && func_8033567C(D_80389FA0.unk0) == ASSET_C4_ANIM_CLANKER_BITE){
func_80335924(D_80389FA0.unk0, ASSET_C3_ANIM_CLANKER_IDLE, 1.0f, 10.0f);
if(!D_80389FA0.unk20 && skeletalAnim_getAnimId(D_80389FA0.unk0) == ASSET_C4_ANIM_CLANKER_BITE){
skeletalAnim_set(D_80389FA0.unk0, ASSET_C3_ANIM_CLANKER_IDLE, 1.0f, 10.0f);
}
}//L803891BC

View File

@@ -15,21 +15,21 @@ u8 D_80389E40[] = {3, 3, 2, 0};
ActorInfo D_80389E44 = {
0x1A9, 0x28C, 0x435,
0, NULL,
func_80389900, NULL, func_80325888,
func_80389900, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80389E68 = {
0x1A9, 0x28D, 0x436,
0, NULL,
func_80389900, NULL, func_80325888,
func_80389900, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80389E8C = {
0x1A9, 0x28E, 0x437,
0, NULL,
func_80389900, NULL, func_80325888,
func_80389900, NULL, actor_draw,
0, 0, 0.0f, 0
};

View File

@@ -23,7 +23,7 @@ void func_80386B28(Actor* this);
/* .data */
ActorInfo D_80389AD0 = {
MARKER_4A_CC_KEY, ACTOR_3C_CC_KEY, ASSET_429_MODEL_CC_KEY, 0, NULL,
func_80386B28, func_80326224, func_80325888,
func_80386B28, func_80326224, actor_draw,
0, 0, 0.0f, 0
};

View File

@@ -14,14 +14,14 @@ void func_803870F8(Actor *this);
extern ActorInfo D_80389B00 = {
MARKER_4C_CLANKER_TOKEN_TOOTH_EXT, ACTOR_44_CLANKER_TOKEN_TOOTH_EXTERIOR, ASSET_309_MODEL_CLANKER_TOKEN_TOOTH_EXTERIOR,
0, NULL,
func_803870F8, func_80326224, func_80325888,
func_803870F8, func_80326224, actor_draw,
0, 0, 0.0f, 0
};
extern ActorInfo D_80389B24 = {
MARKER_4D_CLANKER_JIGGY_TOOTH_EXT, ACTOR_45_CLANKER_JIGGY_TOOTH_EXTERIOR, ASSET_30A_MODEL_CLANKER_JIGGY_TOOTH_EXTERIOR,
0, NULL,
func_803870F8, func_80326224, func_80325888,
func_803870F8, func_80326224, actor_draw,
0, 0, 0.0f, 0
};