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

6
src/FP/ch/bearcub.c
View File

@@ -23,19 +23,19 @@ ActorAnimationInfo D_80391DF0[] = {
ActorInfo D_80391E08 = { MARKER_1FA_POLAR_BEAR_CUB_BLUE, ACTOR_1EA_POLAR_BEAR_CUB_BLUE, ASSET_44C_MODEL_POLAR_BEAR_CUB_BLUE,
0x1, D_80391DF0,
func_8038A384, func_80326224, func_80325888,
func_8038A384, func_80326224, actor_draw,
2500, 0, 1.2f, 0
};
ActorInfo FP_D_80391E2C = { MARKER_1FB_POLAR_BEAR_CUB_GREEN, ACTOR_1EB_POLAR_BEAR_CUB_GREEN, ASSET_44D_MODEL_POLAR_BEAR_CUB_GREEN,
0x1, D_80391DF0,
func_8038A384, func_80326224, func_80325888,
func_8038A384, func_80326224, actor_draw,
2500, 0, 1.2f, 0
};
ActorInfo D_80391E50 = { MARKER_1FC_POLAR_BEAR_CUB_RED, ACTOR_1EC_POLAR_BEAR_CUB_RED, ASSET_44E_MODEL_POLAR_BEAR_CUB_RED,
0x1, D_80391DF0,
func_8038A384, func_80326224, func_80325888,
func_8038A384, func_80326224, actor_draw,
2500, 0, 1.2f, 0
};

8
src/FP/ch/boggy1.c
View File

@@ -39,7 +39,7 @@ Actor *func_803875E0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
func_8033A45C(1, 0);
func_8033A45C(3, 1);
this = func_80325888(marker, gfx, mtx, vtx);
this = actor_draw(marker, gfx, mtx, vtx);
if(marker->unk14_21){
func_8034A174(func_80329934(), 5, this->velocity);
}
@@ -125,7 +125,7 @@ void func_8038794C(Actor *this){
if(jiggyscore_isCollected(JIGGY_2A_FP_BOGGY_1)){
if(!jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3) && !jiggyscore_isSpawned(JIGGY_2C_FP_BOGGY_3)){
__spawnQueue_add_1((GenMethod_1)func_80387760, reinterpret_cast(s32, this->marker));
__spawnQueue_add_1((GenFunction_1)func_80387760, reinterpret_cast(s32, this->marker));
}
this->unk38_31 = 0;
actor_collisionOff(this);
@@ -151,7 +151,7 @@ void func_8038794C(Actor *this){
if(!func_8028ECAC() || func_8028ECAC() == BSGROUP_8_TROT){
if(func_80311480(0xbff, 0x2a, this->position, NULL, NULL, NULL)){
for(i = 0; i <5; i++ ){
timedFunc_set_1(D_80391BEC[i], (GenMethod_1)func_8038787C, (s32)this->marker);
timedFunc_set_1(D_80391BEC[i], (GenFunction_1)func_8038787C, (s32)this->marker);
}
this->unk138_24 = TRUE;
}
@@ -195,7 +195,7 @@ void func_8038794C(Actor *this){
case 5://L80387D90
if(jiggyscore_isCollected(JIGGY_2A_FP_BOGGY_1)){
this->unk38_31 = 0;
__spawnQueue_add_1((GenMethod_1)func_80387760, reinterpret_cast(s32, this->marker));
__spawnQueue_add_1((GenFunction_1)func_80387760, reinterpret_cast(s32, this->marker));
}
break;
}

4
src/FP/ch/boggy2.c
View File

@@ -62,7 +62,7 @@ Actor *func_80388740(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
func_8033A45C(1, 1);
func_8033A45C(3, 1);
this = func_80325888(marker, gfx, mtx, vtx);
this = actor_draw(marker, gfx, mtx, vtx);
if(this->unk16C_4 && marker->unk14_21){
if( this->state == 4
|| this->state == 5
@@ -581,7 +581,7 @@ void func_803896FC(Actor *this){
case 1: //L80389F78
if(this->unk38_31 == 2){
if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2)){
__spawnQueue_add_1((GenMethod_1)func_80388F54, reinterpret_cast(s32, this->marker));
__spawnQueue_add_1((GenFunction_1)func_80388F54, reinterpret_cast(s32, this->marker));
func_8038B9BC();
marker_despawn(this->marker);
}

2
src/FP/ch/boggy3.c
View File

@@ -31,7 +31,7 @@ Actor *func_80390290(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
func_8033A45C(1, 0);
func_8033A45C(3, sp18);
func_80325888(marker, gfx, mtx, vtx);
actor_draw(marker, gfx, mtx, vtx);
}

2
src/FP/ch/cavewozza.c
View File

@@ -14,7 +14,7 @@ extern ActorAnimationInfo D_803926F0[]= {
extern ActorInfo D_80392700 = { MARKER_20F_WOZZA_IN_CAVE, ACTOR_33F_WOZZA_IN_CAVE, ASSET_494_MODEL_WOZZA,
0x1, D_803926F0,
func_80390630, func_80326224, func_80325888,
func_80390630, func_80326224, actor_draw,
2500, 0, 1.6f, 0
};

2
src/FP/ch/present.c
View File

@@ -34,7 +34,7 @@ Actor *func_8038F0F0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(this->unk38_31)
return this;
else
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}

2
src/FP/ch/racesled.c
View File

@@ -24,7 +24,7 @@ ActorInfo chRaceSled = {
Actor *chRaceSled_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = marker_getActor(marker);
if(this->unk10_12 == FALSE){
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}
return this;
}

2
src/FP/ch/scarfsled.c
View File

@@ -15,7 +15,7 @@ ActorAnimationInfo chScarfSledAnimations[] ={
ActorInfo chScarfSled = {
MARKER_3B_SCARF_SLED, ACTOR_181_SCARF_SLED, ASSET_352_MODEL_SLED,
0, chScarfSledAnimations,
NULL, chScarfSled_update, func_80325888,
NULL, chScarfSled_update, actor_draw,
1000, 0, 0.0f, 0
};

2
src/FP/ch/snowmanbutton.c
View File

@@ -41,7 +41,7 @@ Actor *func_80386B80(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = marker_getActor(marker);
func_8033A45C(1, this->state == 3);
func_8033A45C(2, func_8033A0F0(1) ^ 1);
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}

6
src/FP/ch/twinkly.c
View File

@@ -73,7 +73,7 @@ Actor *func_8038C0B0(ActorMarker *marker, UNK_TYPE(s32) arg1, f32 arg2, UNK_TYPE
sp40[1] = this->unk60;
sp40[2] = (f32)marker->roll;
sp3C = this->scale;
if(func_802EA190(marker->unk20)){
if(animMtxList_len(marker->unk20)){
return func_802EBAE0(sp5C, sp4C, sp40, sp3C, NULL, marker->unk20, arg1, arg2, arg3);
}
else{
@@ -85,7 +85,7 @@ Actor *func_8038C1F8(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = marker_getActor(marker);
func_8033A45C(2, this->unk38_31);
func_8033A45C(1, func_8033A0F0(2) ^ 1);
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}
void func_8038C260(f32 position[3], s32 count, enum asset_e model_id){
@@ -243,7 +243,7 @@ void func_8038C94C(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
if(!func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
func_80328A84(this, 6);
__spawnQueue_add_1((GenMethod_1)func_8038C8F0, reinterpret_cast(s32, this->marker));
__spawnQueue_add_1((GenFunction_1)func_8038C8F0, reinterpret_cast(s32, this->marker));
}
}

12
src/FP/ch/twinklybox.c
View File

@@ -30,7 +30,7 @@ Actor *FP_func_8038CED0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(0.0f == this->velocity[1])
return this;
}
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}
void func_8038CF54(f32 position[3], s32 count, enum asset_e model_id){
@@ -246,7 +246,7 @@ void func_8038D51C(ActorMarker *marker){
this->unk1C[1] = 1.0f;
timed_exitStaticCamera(1.7f);
func_80324E38(1.7f, 0);
timedFunc_set_1(2.3f, (GenMethod_1)func_8038D294, (s32)this->marker);
timedFunc_set_1(2.3f, (GenFunction_1)func_8038D294, (s32)this->marker);
this->velocity[1] = 1.0f;
}
@@ -355,7 +355,7 @@ void func_8038D6C8(Actor *this){
func_8038D324(this);
if(actor_animationIsAt(this, 0.999f))
__spawnQueue_add_1((GenMethod_1)func_8038D474, (s32)this->marker);
__spawnQueue_add_1((GenFunction_1)func_8038D474, (s32)this->marker);
if(this->velocity[0] != 0.0f)
break;
@@ -368,7 +368,7 @@ void func_8038D6C8(Actor *this){
item_set(ITEM_6_HOURGLASS, TRUE);
this->unk38_31 = 0xA;
item_set(ITEM_24_TWINKLY_SCORE, this->unk38_31);
__spawnQueue_add_1((GenMethod_1)func_8038D41C, (s32)this->marker);
__spawnQueue_add_1((GenFunction_1)func_8038D41C, (s32)this->marker);
this->unk60 = 0.0f;
func_80347A14(0);
func_802FAD64(ITEM_14_HEALTH);
@@ -385,7 +385,7 @@ void func_8038D6C8(Actor *this){
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
func_8038D3D8();
func_80324E38(0.0f, 3);
timedFunc_set_1(1.3f, (GenMethod_1)func_8038D51C, (s32)this->marker);
timedFunc_set_1(1.3f, (GenFunction_1)func_8038D51C, (s32)this->marker);
timed_setStaticCameraToNode(0.9f, 0xC);
item_set(ITEM_24_TWINKLY_SCORE, this->unk38_31);
func_80347A14(1);
@@ -408,7 +408,7 @@ void func_8038D6C8(Actor *this){
if(0.96 < animctrl_getAnimTimer(this->animctrl)){
if(this->unk60 <= 0.0){
__spawnQueue_add_1((GenMethod_1)func_8038D474, (s32)this->marker);
__spawnQueue_add_1((GenFunction_1)func_8038D474, (s32)this->marker);
this->unk60 = 2.9f;
}
else{

2
src/FP/ch/twinklymuncher.c
View File

@@ -30,7 +30,7 @@ Actor *func_8038DD70(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = marker_getActor(marker);
if(this->state == 1)
return this;
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}
void func_8038DDC8(Actor *this){

6
src/FP/ch/wozza.c
View File

@@ -44,7 +44,7 @@ Actor *func_8038F210(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(func_8038BFA0() || this->unk38_31)
return this;
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}
@@ -107,7 +107,7 @@ void func_8038F454(Actor *this){
actor_loopAnimation(this);
timed_setStaticCameraToNode(0.0f, 0x2e);
func_80324DBC(0.0f, 0xc1b, 0x2a, this->position, this->marker, func_8038F330, NULL);
timedFunc_set_1(2.5f, (GenMethod_1)func_8038F3F4, (s32)this->marker);
timedFunc_set_1(2.5f, (GenFunction_1)func_8038F3F4, (s32)this->marker);
}
else{
func_8038F2B8(this);
@@ -204,7 +204,7 @@ void FP_func_8038F7AC(Actor *this){
this->position[0] = local->unkC[0];\
this->position[1] = local->unkC[1];\
this->position[2] = local->unkC[2];
__spawnQueue_add_1((GenMethod_1)FP_func_8038F758, reinterpret_cast(s32, this->marker));
__spawnQueue_add_1((GenFunction_1)FP_func_8038F758, reinterpret_cast(s32, this->marker));
local->unk30 = FALSE;
}
}//L8038F910

2
src/FP/ch/wozzasjig.c
View File

@@ -33,7 +33,7 @@ Actor *func_8038FF00(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = marker_getActor(marker);
if(func_8038BFA0()) return this;
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}
void func_8038FF54(Actor *this){

4
src/FP/ch/xmastree.c
View File

@@ -19,7 +19,7 @@ Actor *chXmasTree_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = marker_getActor(marker);
func_8033A45C(5, this->unk38_31);
func_8033A45C(6, fileProgressFlag_get(0x13) && !func_8033A0F0(5));
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}
void __chXmasTree_free(Actor *this){
@@ -99,7 +99,7 @@ void chXmasTree_update(Actor *this){
sfxsource_setSampleRate(this->unk44_31, 28000);
}
__spawnQueue_add_0(__chXmasTree_spawnSwitch);
__spawnQueue_add_1((GenMethod_1)__chXmasTree_spawnStar, reinterpret_cast(s32, this->marker));
__spawnQueue_add_1((GenFunction_1)__chXmasTree_spawnStar, reinterpret_cast(s32, this->marker));
if(fileProgressFlag_get(0x13)){
__chXmasTree_80386F84(this);
mapSpecificFlags_set(2, FALSE);

6
src/FP/ch/xmastreeice.c
View File

@@ -17,7 +17,7 @@ Actor *func_803908F0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = marker_getActor(marker);
if(this->unk38_31 != 0) return this;
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}
void func_80390944(f32 position[3], s32 cnt, enum asset_e model_id){
@@ -79,8 +79,8 @@ void func_80390B2C(ActorMarker *marker){
void func_80390B70(Actor *this){
func_80324E38(0.0f, 3);
timed_setStaticCameraToNode(0.0f, 0);
timedFunc_set_1(0.6f, (GenMethod_1)func_80390ABC, reinterpret_cast(s32, this->marker));
timedFunc_set_1(2.5f, (GenMethod_1)func_80390B2C, reinterpret_cast(s32, this->marker));
timedFunc_set_1(0.6f, (GenFunction_1)func_80390ABC, reinterpret_cast(s32, this->marker));
timedFunc_set_1(2.5f, (GenFunction_1)func_80390B2C, reinterpret_cast(s32, this->marker));
}
void func_80390BDC(Actor *this){

2
src/FP/ch/xmastreestar.c
View File

@@ -28,7 +28,7 @@ f32 D_803935D0[3];
Actor *func_8038EBD0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
func_8033A45C( 2, mapSpecificFlags_get(0));
func_8033A45C( 1, mapSpecificFlags_get(0) ^ 1);
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}
void func_8038EC34(ActorMarker *this_marker, ActorMarker *other_marker){

2
src/FP/ch/xmastreeswitch.c
View File

@@ -23,7 +23,7 @@ ActorInfo D_80392420 = { 0x206, 0x338, 0x486,
Actor *func_8038E720(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
func_8033A45C(1, 0);
func_8033A45C(2, 1);
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}