kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

animation struct documentation

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MM/ch/chimpystump.c
View File

@@ -16,7 +16,7 @@ void chchimpystump_update(Actor *this);
/* .data */
ActorInfo chchimpystump = { MARKER_95_CHIMPY_STUMP, ACTOR_C5_CHIMPY_STUMP, ASSET_3C8_MODEL_CHIMPY_STUMP,
1, NULL,
chchimpystump_update, func_80326224, func_80325E78,
chchimpystump_update, func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};

6
src/MM/ch/conga.c
View File

@@ -50,7 +50,7 @@ ActorAnimationInfo chCongaAnimations[9] = {
ActorInfo chcongaInfo = { MARKER_7_CONGA, ACTOR_8_CONGA, ASSET_35C_MODEL_CONGA,
1, chCongaAnimations,
func_803876D0, func_80326224, func_80325888,
func_803876D0, func_80326224, actor_draw,
0, 0x333, 0.0f, 0
};
@@ -228,7 +228,7 @@ void func_803876D0(Actor *this){
if(0.0f != this->velocity_x){
this->velocity_x -= 1.0f;
if(0.0f == this->velocity_x){
__spawnQueue_add_1((GenMethod_1)func_80387100, (s32)this->marker);
__spawnQueue_add_1((GenFunction_1)func_80387100, (s32)this->marker);
}
}
marker_setCollisionScripts(this->marker, NULL, NULL, func_80387168);
@@ -369,6 +369,6 @@ void func_803876D0(Actor *this){
|| (this->state == 7 && actor_animationIsAt(this, 0.468f))
){
func_8034A1B4(this->marker->unk44, 5, &this->local);
__spawnQueue_add_1((GenMethod_1)func_803873C8, (s32)this->marker); //spawn orange
__spawnQueue_add_1((GenFunction_1)func_803873C8, (s32)this->marker); //spawn orange
}
}

2
src/MM/ch/grublin.c
View File

@@ -42,7 +42,7 @@ ActorAnimationInfo chGrublinAnimations[11] = {
ActorInfo chgrublinInfo = { MARKER_5_GRUBLIN, ACTOR_6_GRUBLIN, ASSET_3C5_MODEL_GRUBLIN,
1, chGrublinAnimations,
func_80388A80, func_80326224, func_80325888,
func_80388A80, func_80326224, actor_draw,
2500, 0, 1.0f, 0
};

6
src/MM/ch/hut.c
View File

@@ -40,7 +40,7 @@ Actor *chhut_draw(ActorMarker *this, Gfx **arg1, Mtx **arg2, Vtx **arg3){
this->propPtr->unk8_3 = temp_a2;
func_8033A45C(1, temp_a1);
return func_80325888(this, arg1, arg2, arg3);
return actor_draw(this, arg1, arg2, arg3);
}
void func_803869EC(ActorMarker *this){
@@ -84,10 +84,10 @@ void chhut_update(Actor *this){
func_8030E484(SFX_5B_HEAVY_STUFF_FALLING);
func_80328A84(this, 1);
actor_playAnimationOnce(this);
__spawnQueue_add_1((GenMethod_1)func_803869EC, (s32)this->marker);
__spawnQueue_add_1((GenFunction_1)func_803869EC, (s32)this->marker);
func_802C8F70(this->yaw);
if(D_8037DCB0 < 5){
__spawnQueue_add_4((GenMethod_4)func_802C4218, D_803898D8[D_8037DCB0], *(s32*)(&sp3C[0]),*(s32*)(&sp3C[1]),*(s32*)(&sp3C[2]));
__spawnQueue_add_4((GenFunction_4)func_802C4218, D_803898D8[D_8037DCB0], *(s32*)(&sp3C[0]),*(s32*)(&sp3C[1]),*(s32*)(&sp3C[2]));
}
else{
jiggySpawn(JIGGY_5_MM_HUTS, sp3C);

2
src/MM/ch/juju.c
View File

@@ -93,7 +93,7 @@ void func_803891E8(s32 x, s32 y, s32 z, s32 yaw){
}
void func_80389244(s32 x, s32 y, s32 z, s32 yaw){
__spawnQueue_add_4((GenMethod_4)func_803891E8, x, y, z, yaw);
__spawnQueue_add_4((GenFunction_4)func_803891E8, x, y, z, yaw);
func_802BB3DC(0, 10.0f, 0.8f);
gcpausemenu_80314AC8(1);
}

4
src/MM/ch/jujuhitbox.c
View File

@@ -71,7 +71,7 @@ void func_80388BEC(NodeProp *arg0, ActorMarker *arg1){
((ActorLocal_JujuHitbox *)&sp30->local)->unk4++;
func_803892A8(((ActorLocal_JujuHitbox *)&sp30->local)->unk8);
func_80353580(arg1);
__spawnQueue_add_4((GenMethod_4)func_802C4140, 0x58, *(s32 *)&sp20[0], *(s32 *)&sp20[1], *(s32 *)&sp20[2]);
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x58, *(s32 *)&sp20[0], *(s32 *)&sp20[1], *(s32 *)&sp20[2]);
}
}
}
@@ -123,7 +123,7 @@ void func_80388E20(Actor *this){
}
if(!this->unk16C_4){
this->unk16C_4 = 1;
__spawnQueue_add_2((GenMethod_2)func_80388DFC,this->marker, jujuCtlPtr->unk4);
__spawnQueue_add_2((GenFunction_2)func_80388DFC,this->marker, jujuCtlPtr->unk4);
func_80388D14(this);
}else{
if( func_80329530(this, 0xfa)

2
src/MM/ch/lmonkey.c
View File

@@ -25,7 +25,7 @@ ActorAnimationInfo chlmonkeyAnimations[5] = {
ActorInfo chlmonkeyInfo = { MARKER_A_CHIMPY, ACTOR_F_CHIMPY, ASSET_35D_MODEL_CHIMPY,
1, chlmonkeyAnimations,
NULL, chLMonkey_update, func_80325888,
NULL, chLMonkey_update, actor_draw,
2500, 0, 0.8f, 0
};

2
src/MM/ch/orange.c
View File

@@ -76,7 +76,7 @@ void MM_func_80387FF4(Actor * this){
}
Actor *func_80388188(ActorMarker *this, Gfx **dl, Mtx **mptr, Vtx **vtx){
Actor* actorPtr = func_80325E78(this, dl, mptr, vtx);
Actor* actorPtr = actor_drawFullDepth(this, dl, mptr, vtx);
f32 sp60[3] = D_803899F4;
f32 sp54[3] = D_80389A00;
f32 sp48[3];

4
src/MM/ch/orangepad.c
View File

@@ -14,7 +14,7 @@ void func_80386768(Actor *);
/* .data */
ActorInfo chorangepadInfo = { MARKER_66_ORANGE_PAD, ACTOR_57_ORANGE_PAD, ASSET_2EB_MODEL_ORANGE_PAD,
0, NULL,
func_80386768, func_80326224, func_80325888,
func_80386768, func_80326224, actor_draw,
0, 0, 0.0f, 0
};
@@ -51,7 +51,7 @@ void func_80386444(ActorMarker *arg0){
func_802BAFE4(temp_a0);
sp44[1] += 50.0f;
timedFunc_set_3(0.6f, (GenMethod_3) MM_func_803863F0, (s32)sp44[0], (s32)sp44[1], (s32)sp44[2]);
timedFunc_set_3(0.6f, (GenFunction_3) MM_func_803863F0, (s32)sp44[0], (s32)sp44[1], (s32)sp44[2]);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
if(!jiggyscore_isCollected(JIGGY_8_MM_ORANGE_PADS)){
func_80311480(0xB3B, 4, NULL, NULL, NULL, NULL);