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

8
src/fight/chbossjinjo.c
View File

@@ -28,28 +28,28 @@ ActorAnimationInfo D_80391810[] = {
ActorInfo D_80391840 = {
MARKER_27B_BOSS_JINJO_ORANGE, ACTOR_3A5_BOSS_JINJO_ORANGE, ASSET_3BC_MODEL_JINJO_ORANGE,
0x1, D_80391810,
func_8038C840, func_8038D014, func_80325888,
func_8038C840, func_8038D014, actor_draw,
0, 0, 1.0f, 0
};
ActorInfo D_80391864 = {
MARKER_27C_BOSS_JINJO_GREEN, ACTOR_3A6_BOSS_JINJO_GREEN, ASSET_3C2_MODEL_JINJO_GREEN,
0x1, D_80391810,
func_8038C840, func_8038D014, func_80325888,
func_8038C840, func_8038D014, actor_draw,
0, 0, 1.0f, 0
};
ActorInfo D_80391888 = {
MARKER_27D_BOSS_JINJO_PINK, ACTOR_3A7_BOSS_JINJO_PINK, ASSET_3C1_MODEL_JINJO_PINK,
0x1, D_80391810,
func_8038C840, func_8038D014, func_80325888,
func_8038C840, func_8038D014, actor_draw,
0, 0, 1.0f, 0
};
ActorInfo D_803918AC = {
MARKER_27E_BOSS_JINJO_YELLOW, ACTOR_3A8_BOSS_JINJO_YELLOW, ASSET_3BB_MODEL_JINJO_YELLOW,
0x1, D_80391810,
func_8038C840, func_8038D014, func_80325888,
func_8038C840, func_8038D014, actor_draw,
0, 0, 1.0f, 0
};

4
src/fight/chbossjinjobase.c
View File

@@ -12,7 +12,7 @@ void func_8038D568(Actor *this);
ActorInfo D_80391990 = {
MARKER_27A_JINJO_STATUE_BASE, ACTOR_3A2_JINJO_STATUE_BASE, ASSET_543_MODEL_JINJO_STATUE_BASE,
0x1, NULL,
func_8038D568, func_80326224, func_80325888,
func_8038D568, func_80326224, actor_draw,
0, 0x800, 0.0f, 0
};
@@ -127,7 +127,7 @@ void func_8038D568(Actor *this){
this->velocity_y = 100.0f;
func_802BB3DC(0, 8.0f, 0.92f);
__spawnQueue_add_4((GenMethod_4)func_802C4140, 0x3ad, *(s32*)&this->unk1C[0], *(s32*)&this->unk1C[1], *(s32*)&this->unk1C[2]);
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x3ad, *(s32*)&this->unk1C[0], *(s32*)&this->unk1C[1], *(s32*)&this->unk1C[2]);
func_8038D2EC(this->unk1C, 0x10);
SPAWNQUEUE_ADD_1(chbossjinjobase_spawnStoneJinjo, this->marker);
}

12
src/fight/chfinalboss.c
View File

@@ -285,7 +285,7 @@ Actor *chfinalboss_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
if (local->phase == 1) {
func_8033A25C(0);
}
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}
void func_80386600(ActorMarker *arg0, s32 arg1) {
@@ -695,7 +695,7 @@ void chfinalboss_setPhase(ActorMarker *this, u32 phase_id)
timed_setStaticCameraToNode(0.0f, 0);
timed_exitStaticCamera(2.0f);
timed_setStaticCameraToNode(2.0f, 1);
timedFunc_set_1(2.0f, (GenMethod_1)func_8038B780, reinterpret_cast(s32, actor->marker));
timedFunc_set_1(2.0f, (GenFunction_1)func_8038B780, reinterpret_cast(s32, actor->marker));
return;
case 1:
@@ -1506,7 +1506,7 @@ void chfinalboss_phase3_update(ActorMarker *marker) {
chfinalboss_phase3_setState(this, 0x15);
if (local->unkB == 0) {
local->unkB = 1;
timedFunc_set_1(1.2f, (GenMethod_1)chfinalboss_dropHealth, (s32) this->marker);
timedFunc_set_1(1.2f, (GenFunction_1)chfinalboss_dropHealth, (s32) this->marker);
}
}
break;
@@ -1874,7 +1874,7 @@ void chfinalboss_phase5_setState(Actor *this, s32 next_state) {
timedFunc_set_1(0.0f, chfinalboss_spawnStatue, 5);
timed_setStaticCameraToNode(0.0f, sp28);
timed_exitStaticCamera(7.5f);
timedFunc_set_1(7.5f, (GenMethod_1)func_8038AC50, (s32) this->marker);
timedFunc_set_1(7.5f, (GenFunction_1)func_8038AC50, (s32) this->marker);
func_80324E38(7.5f, 0);
break;
@@ -1970,7 +1970,7 @@ void chfinalboss_phase5_update(ActorMarker *marker) {
if (__chFinalBossJinjonatorHits == 9) {
sp2C = 0x16;
if(local->mirror_phase5) sp2C = 0x25;
timedFunc_set_1(2.4f, (GenMethod_1)func_8038AF84, (s32) this->marker);
timedFunc_set_1(2.4f, (GenFunction_1)func_8038AF84, (s32) this->marker);
timed_setStaticCameraToNode(2.4f, sp2C);
timed_exitStaticCamera(4.4f);
timed_setStaticCameraToNode(4.4f, sp38 + 3 + __chFinalBossJinjonatorHits);
@@ -2309,7 +2309,7 @@ void chfinalboss_update(Actor *this){
__chFinalBossJinjoStatueMarker[i] = NULL;
}
__spawnQueue_add_1((GenMethod_1) chfinalboss_spawnShadow, (s32) this->marker);
__spawnQueue_add_1((GenFunction_1) chfinalboss_spawnShadow, (s32) this->marker);
chfinalboss_setPhase(this->marker, 0);
local->hits = 0;
func_80386600(this->marker, 0);

2
src/fight/chjinjonator.c
View File

@@ -47,7 +47,7 @@ ActorAnimationInfo D_80391FB0[] = {
ActorInfo D_80392018 = {
MARKER_285_JINJONATOR, ACTOR_3AC_JINJONATOR, ASSET_551_MODEL_JINJONATOR,
0x1, D_80391FB0,
chjinjonator_update, func_80326224, func_80325888,
chjinjonator_update, func_80326224, actor_draw,
0, 0, 1.0f, 0
};

14
src/fight/chjinjonatorbase.c
View File

@@ -12,7 +12,7 @@ void chjinjonatorbase_update(Actor *);
ActorInfo fight_D_80391A40 = {
MARKER_27F_JINJONATOR_STATUE_BASE, ACTOR_3A9_JINJONATOR_STATUE_BASE, ASSET_544_MODEL_JINJONATOR_STATUE_BASE,
0x1, NULL,
chjinjonatorbase_update, func_80326224, func_80325888,
chjinjonatorbase_update, func_80326224, actor_draw,
0, 0x800, 0.0f, 0
};
@@ -97,7 +97,7 @@ void func_8038E260(ActorMarker *arg0) {
Actor *sp24 = marker_getActor(arg0);
func_802BB3DC(0, 18.0f, 0.92f);
__spawnQueue_add_4((GenMethod_4) func_802C4140, 0x3AD, *(u32 *)(&sp24->unk1C_x), *(u32 *)(&sp24->unk1C_y), *(u32 *)(&sp24->unk1C_z));
__spawnQueue_add_4((GenFunction_4) func_802C4140, 0x3AD, *(u32 *)(&sp24->unk1C_x), *(u32 *)(&sp24->unk1C_y), *(u32 *)(&sp24->unk1C_z));
func_8038E03C(sp24->unk1C, 0x10);
}
@@ -139,7 +139,7 @@ void chjinjonatorbase_update(Actor *this){
func_802FA060(temp_s0, 17000, 17000, 0.0f);
func_8025A6EC(JINGLE_MENACING_GRUNTILDA_A, 15000);
func_8032BB88(this, 0, 0x7fff);
timedFunc_set_1(8.0f, (GenMethod_1)func_8038E2CC, reinterpret_cast(s32,this->marker));
timedFunc_set_1(8.0f, (GenFunction_1)func_8038E2CC, reinterpret_cast(s32,this->marker));
this->unk1C[0] = this->position_x;
this->unk1C[1] = this->position_y;
this->unk1C[2] = this->position_z;
@@ -150,10 +150,10 @@ void chjinjonatorbase_update(Actor *this){
}else{
this->velocity_y = 100.0f;
}
timedFunc_set_1(this->unk60* 0.05, (GenMethod_1)func_8038E260, reinterpret_cast(s32,this->marker));
timedFunc_set_1(this->unk60* 0.28, (GenMethod_1) func_8038E260, reinterpret_cast(s32,this->marker));
timedFunc_set_1(this->unk60* 0.46, (GenMethod_1) func_8038E260, reinterpret_cast(s32,this->marker));
timedFunc_set_1(this->unk60* 0.58, (GenMethod_1) func_8038E260, reinterpret_cast(s32,this->marker));
timedFunc_set_1(this->unk60* 0.05, (GenFunction_1)func_8038E260, reinterpret_cast(s32,this->marker));
timedFunc_set_1(this->unk60* 0.28, (GenFunction_1) func_8038E260, reinterpret_cast(s32,this->marker));
timedFunc_set_1(this->unk60* 0.46, (GenFunction_1) func_8038E260, reinterpret_cast(s32,this->marker));
timedFunc_set_1(this->unk60* 0.58, (GenFunction_1) func_8038E260, reinterpret_cast(s32,this->marker));
SPAWNQUEUE_ADD_1(chjinjonatorbase_spawnStoneJinjo, this->marker);
}

2
src/fight/chspellbarrier.c
View File

@@ -29,7 +29,7 @@ void chspellbarrier_update(Actor *this);
ActorInfo D_80391AD0 = {
MARKER_284_GRUNTY_SPELL_BARRIER, ACTOR_3AB_GRUNTY_SPELL_BARRIER, ASSET_546_MODEL_GRUNTY_SPELL_BARRIER,
0x1, NULL,
chspellbarrier_update, func_80326224, func_80325888,
chspellbarrier_update, func_80326224, actor_draw,
0, 0, 0.0f, 0
};

2
src/fight/chspellfireball.c
View File

@@ -22,7 +22,7 @@ void func_8038F620(Actor *this);
ActorInfo fight_D_80391B00 = {
MARKER_25C_GRUNTY_SPELL_FIREBALL, ACTOR_389_GRUNTY_SPELL_FIREBALL, ASSET_541_SPRITE_FIREBALL_SPELL_ATTACK,
0x1, NULL,
func_8038F620, func_80326224, func_80325888,
func_8038F620, func_80326224, actor_draw,
0, 0, 1.0f, 0
};

2
src/fight/chstonejinjo.c
View File

@@ -19,7 +19,7 @@ ActorAnimationInfo fight_D_803919F0[] ={
ActorInfo D_80391A10 = {
MARKER_276_STONE_JINJO, ACTOR_3A1_STONE_JINJO, ASSET_545_MODEL_STONE_JINJO,
0x1, fight_D_803919F0,
chstonejinjo_update, func_80326224, func_80325888,
chstonejinjo_update, func_80326224, actor_draw,
0, 0x800, 1.0f, 0
};