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/TTC/ch/blubber.c
View File

@@ -69,7 +69,7 @@ void func_80387574(ActorMarker *caller, enum asset_e text_id, s32 arg1){
if(nodeProp_findPositionFromActorId(0x14b, sp24)){
jiggySpawn(JIGGY_14_TTC_BLUBBER, sp24);
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
}
}
@@ -96,7 +96,7 @@ void func_80387678(Actor *this){
mapSpecificFlags_set(3, TRUE);
func_8028F918(2);
timed_setStaticCameraToNode(0.0f, 4);
timedFunc_set_1(1.0f, (GenMethod_1)func_803875D4, (s32)this->marker);
timedFunc_set_1(1.0f, (GenFunction_1)func_803875D4, (s32)this->marker);
func_80328B8C(this, 1, 0.0f, 1);
}
@@ -249,5 +249,5 @@ void TTC_func_80387CF4(Actor *this){
Actor *func_80387D6C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
func_8033A45C(4, 0);
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}

4
src/TTC/ch/clam.c
View File

@@ -19,7 +19,7 @@ ActorAnimationInfo chClamAnimations[] = {
ActorInfo chClam = {
MARKER_15_CLAM, ACTOR_69_CLAM, ASSET_351_MODEL_CLAM,
0x1, chClamAnimations,
chClam_update, func_80326224, func_80325888,
chClam_update, func_80326224, actor_draw,
4500, 0x366, 1.6f, 0
};
@@ -241,7 +241,7 @@ void __chClam_playerDropsItem(s32 index, enum item_e item_id){
player_getPosition(position);
func_802C8F70(randf2(0.0f, 359.0f));
__spawnQueue_add_4((GenMethod_4)func_802C4218, index, reinterpret_cast(s32, position[0]), reinterpret_cast(s32, position[1]), reinterpret_cast(s32, position[2]));
__spawnQueue_add_4((GenFunction_4)func_802C4218, index, reinterpret_cast(s32, position[0]), reinterpret_cast(s32, position[1]), reinterpret_cast(s32, position[2]));
item_dec(item_id);
}

6
src/TTC/ch/leaky.c
View File

@@ -18,7 +18,7 @@ ActorAnimationInfo D_8038C700[] = {
ActorInfo D_8038C718 = {
MARKER_33_LEAKY, ACTOR_1E_LEAKY, ASSET_51A_MODEL_LEAKY,
0x1, D_8038C700,
chLeaky_update, func_80326224, func_80325888,
chLeaky_update, func_80326224, actor_draw,
0, 0, 0.0f, 0
};
@@ -41,7 +41,7 @@ void chLeaky_update(Actor *this) {
this->marker->propPtr->unk8_3 = FALSE;
if (levelSpecificFlags_get(5) != 0) {
levelSpecificFlags_set(5, FALSE);
timedFunc_set_1(0.5f, (GenMethod_1)func_8025A70C, COMUSIC_2D_PUZZLE_SOLVED_FANFARE);
timedFunc_set_1(0.5f, (GenFunction_1)func_8025A70C, COMUSIC_2D_PUZZLE_SOLVED_FANFARE);
}
if (levelSpecificFlags_get(2) != 0) {
temp_v0_2 = func_8034C5AC(300);
@@ -94,7 +94,7 @@ void __chLeaky_startCutscene(ActorMarker *caller, enum asset_e text_id, s32 arg2
timedFunc_set_0(1.0f, func_80388F88);
func_80324E38(2.5f, 0);
timedFunc_set_1(2.5f, func_8028F9DC, 2);
timedFunc_set_3(2.5f, (GenMethod_3)func_802E4078, MAP_A_TTC_SANDCASTLE, 0, 0);
timedFunc_set_3(2.5f, (GenFunction_3)func_802E4078, MAP_A_TTC_SANDCASTLE, 0, 0);
func_803228D8();
}

2
src/TTC/ch/lockup.c
View File

@@ -51,7 +51,7 @@ Actor *func_803894C0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor * actor = marker_getActor(marker);
func_8033A45C(3, actor->unk38_31);
func_8033A45C(4, actor->unk38_31);
func_80325888(marker, gfx, mtx, vtx);
actor_draw(marker, gfx, mtx, vtx);
}

2
src/TTC/ch/nipper.c
View File

@@ -62,7 +62,7 @@ Actor *func_80387EB0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
this = marker_getActor(marker);
func_8033A45C(3, (this->state == 7)? 0 : 1);
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}
void TTC_func_80387F18(Actor *this) {

4
src/TTC/ch/treasure.c
View File

@@ -15,14 +15,14 @@ ActorAnimationInfo gChTreasureAnim[]={
ActorInfo gChTreasureInfo = {
MARKER_DB_BURIED_TREASURE, ACTOR_F4_BURIED_TREASURE, ASSET_42C_MODEL_BURIED_TREASURE,
1, gChTreasureAnim,
chtreasure_update, func_80326224, func_80325888,
chtreasure_update, func_80326224, actor_draw,
0, 0, 1.7f, 0
};
/* .code */
void __chtreasure_die(ActorMarker *marker, ActorMarker *otherMarker){
Actor *this = marker_getActor(marker);
__spawnQueue_add_4((GenMethod_4) func_802C4140, 0x4C, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
__spawnQueue_add_4((GenFunction_4) func_802C4140, 0x4C, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
func_802EE278(this, 3, 0xf, 0x3C, 0.2f, 1.2f);
func_803115C4(0xA19);
jiggySpawn(JIGGY_11_TTC_RED_X, this->position);

8
src/TTC/ch/treasurehunt.c
View File

@@ -157,7 +157,7 @@ void func_80389CC4(s16 arg0[3], s32 arg1){
D_8038D708[1] = (f32)arg0[1];
D_8038D708[2] = (f32)arg0[2];
D_8038D708[1] = func_80309724(D_8038D708);
__spawnQueue_add_4((GenMethod_4)func_802C4140, 0xF4, reinterpret_cast(s32, D_8038D708[0]), reinterpret_cast(s32, D_8038D708[1]), reinterpret_cast(s32, D_8038D708[2]));
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0xF4, reinterpret_cast(s32, D_8038D708[0]), reinterpret_cast(s32, D_8038D708[1]), reinterpret_cast(s32, D_8038D708[2]));
D_8038D700 = partEmitMgr_newEmitter(3);
particleEmitter_setRGB(D_8038D700, D_8038C91C);
particleEmitter_setSprite(D_8038D700, ASSET_700_SPRITE_DUST);
@@ -168,8 +168,8 @@ void func_80389CC4(s16 arg0[3], s32 arg1){
particleEmitter_emitN(D_8038D700, 5);
D_8038D708[2] += 300.0f;
gcpausemenu_80314AC8(0);
timedFunc_set_2(0.1f, (GenMethod_2) func_8028F45C, 9, (s32)&D_8038D708);
timedFunc_set_1(0.1f, (GenMethod_1) gcpausemenu_80314AC8, 1);
timedFunc_set_2(0.1f, (GenFunction_2) func_8028F45C, 9, (s32)&D_8038D708);
timedFunc_set_1(0.1f, (GenFunction_1) gcpausemenu_80314AC8, 1);
func_80311480(ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED, 4, NULL, NULL, NULL, NULL);
D_8037DCB4++;
}//L80389E70
@@ -239,7 +239,7 @@ Actor *func_8038A0D0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
sp40[2] = actor->position[2];
func_8032AA58(actor, sp3C);
modelRender_preDraw(func_803253A0, actor);
modelRender_preDraw(actor_predrawMethod, actor);
modelRender_draw(gfx, mtx, sp40, sp4C, sp3C, NULL, func_80330B1C(marker));
return actor;
}

18
src/TTC/code_26D0.c
View File

@@ -34,56 +34,56 @@ void func_80388D8C(Actor *this);
ActorInfo D_8038C5E0 = {
0xA1, 0x10E, 0x3D2,
0x1, NULL,
func_802D3D54, func_80326224, func_80325E78,
func_802D3D54, func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_8038C604 = {
MARKER_EA_LIGHTHOUSE_DOOR, ACTOR_13E_LIGHTHOUSE_DOOR, ASSET_3D6_MODEL_LIGHTHOUSE_DOOR,
0x1, NULL,
func_802D3D54, func_80326224, func_80325E78,
func_802D3D54, func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_8038C628 = {
MARKER_167_SHARKFOOD_ISLAND, ACTOR_25C_SHARKFOOD_ISLAND, ASSET_50A_MODEL_SHARKFOOD_ISLAND,
0x1, NULL,
func_80388D8C, func_80326224, func_80325E78,
func_80388D8C, func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_8038C64C = {
0x267, 0x2E2, 0x3BD,
0x1, NULL,
func_80388D34, func_80326224, func_80325E78,
func_80388D34, func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_8038C670 = {
0x26A, 0x2DF, 0x3BE,
0x1, NULL,
TTC_func_80388C78, func_80326224, func_80325E78,
TTC_func_80388C78, func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_8038C694 = {
0x268, 0x2E0, 0x3B6,
0x1, NULL,
TTC_func_80388C78, func_80326224, func_80325E78,
TTC_func_80388C78, func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_8038C6B8 = {
0x269, 0x2E1, 0x3B7,
0x1, NULL,
TTC_func_80388C78, func_80326224, func_80325E78,
TTC_func_80388C78, func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_8038C6DC = {
MARKER_1D5_PALM_TREE, ACTOR_31E_PALM_TREE, ASSET_3A9_MODEL_PALM_TREE,
0x1, NULL,
func_80388CB8, func_80326224, func_80325E78,
func_80388CB8, func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
@@ -135,7 +135,7 @@ void func_80388D04(s32 arg0){
void func_80388D34(Actor *this){
TTC_func_80388C78(this);
if(!this->unk16C_4){
__spawnQueue_add_1((GenMethod_1)func_80388D04, (s32)this->marker);
__spawnQueue_add_1((GenFunction_1)func_80388D04, (s32)this->marker);
this->unk16C_4 = TRUE;
}
}

2
src/TTC/code_3E30.c
View File

@@ -408,7 +408,7 @@ void func_8038B094(void){
timed_exitStaticCamera(2.0f);
func_80324E38(2.0f, 0);
func_803228D8();
timedFunc_set_3(2.0f, (GenMethod_3) func_802E4078, MAP_7_TTC_TREASURE_TROVE_COVE, 1, 0);
timedFunc_set_3(2.0f, (GenFunction_3) func_802E4078, MAP_7_TTC_TREASURE_TROVE_COVE, 1, 0);
}
else if(levelSpecificFlags_get(2) || func_803203FC(2)){
func_8034E71C(sp2C, -500, 0.0f);