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/RBB/ch/anchor.c
View File

@@ -7,18 +7,18 @@ void func_8038BF28(Actor *this);
/* .data */
ActorInfo RBB_D_80390AE0 = {
0x31, 0x1C9, 0x41D, 0x0, NULL,
func_8038BF28, NULL, func_80325888,
func_8038BF28, NULL, actor_draw,
0, 0, 0.0f, 0
};
/* .code */
void RBB_func_8038BEA0(Actor *this, s32 arg1){
if(arg1 == 1)
func_80335924(this->unk148, ASSET_141_ANIM_ANCHOR_LOWERED, 0.0f, 5.5f);
skeletalAnim_set(this->unk148, ASSET_141_ANIM_ANCHOR_LOWERED, 0.0f, 5.5f);
if(arg1 == 2){
func_80335924(this->unk148, ASSET_142_ANIM_ANCHOR_RISING, 0.0f, 8.0f);
func_80335A8C(this->unk148, 2);
skeletalAnim_set(this->unk148, ASSET_142_ANIM_ANCHOR_RISING, 0.0f, 8.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
}
this->state = arg1;
}

6
src/RBB/ch/anchorctrl.c
View File

@@ -41,9 +41,9 @@ void __chAnchorCtrl_setState(Actor *this, s32 new_state){
ncStaticCamera_setToNode(0xC);
func_80324E38(0.0f, 3);
timedFunc_set_0(1.0f, func_8038C000);
timedFunc_set_2(1.0f, (GenMethod_2)mapSpecificFlags_set, 8, TRUE);
timedFunc_set_2(1.0f, (GenFunction_2)mapSpecificFlags_set, 8, TRUE);
timed_playSfx(2.1f, SFX_3F6_UNKNOWN, 0.6f, 32700);
timedFunc_set_2(2.7f, (GenMethod_2)mapSpecificFlags_set, 4, TRUE);
timedFunc_set_2(2.7f, (GenFunction_2)mapSpecificFlags_set, 4, TRUE);
timedFunc_set_0(3.0f, func_8038C058);
func_80324DBC(3.0f, 0xb9C, 7, NULL, this->marker, __chAnchorCtrl_spawnJiggy, NULL);
}//L8038C1D8
@@ -66,6 +66,6 @@ void chAnchorCtrl_update(Actor *this){
timed_exitStaticCamera(0.0f);
func_80324E38(0.0f, 0);
timedFunc_set_0(0.0f, func_803228D8);
timedFunc_set_3(0.0f, (GenMethod_3)func_802E4078, MAP_8B_RBB_ANCHOR_ROOM, 2, 0);
timedFunc_set_3(0.0f, (GenFunction_3)func_802E4078, MAP_8B_RBB_ANCHOR_ROOM, 2, 0);
}//L8038C2E4
}

4
src/RBB/ch/anchorswitch.c
View File

@@ -7,7 +7,7 @@ void chAnchorSwitch_update(Actor *this);
/* .data */
ActorInfo D_80390A80 = {
0x2F, 0x1C7, 0x41B, 0x0, NULL,
chAnchorSwitch_update, NULL, func_80325888,
chAnchorSwitch_update, NULL, actor_draw,
0, 0, 0.0f, 0
};
@@ -23,7 +23,7 @@ void __chAnchorSwitch_setState(Actor *this, s32 arg1){
levelSpecificFlags_set(0x30, TRUE);
func_803204E4(0xe, 1);
timedFunc_set_0(1.0f, func_803228D8);
timedFunc_set_3(1.0f, (GenMethod_3)func_802E4078, MAP_31_RBB_RUSTY_BUCKET_BAY, 0, 0);
timedFunc_set_3(1.0f, (GenFunction_3)func_802E4078, MAP_31_RBB_RUSTY_BUCKET_BAY, 0, 0);
}
}
this->state = arg1;

6
src/RBB/ch/axle.c
View File

@@ -32,19 +32,19 @@ ActorLocal_RBB_2A70_0 D_80390430[] = {
ActorInfo D_803904C0 = {
0x188, 0x178, 0x40C, 0x0, NULL,
func_803890BC, NULL, func_80325888,
func_803890BC, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_803904E4 = {
0x189, 0x179, 0x40D, 0x0, NULL,
func_803890BC, NULL, func_80325888,
func_803890BC, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80390508 = {
0x18A, 0x17A, 0x40E, 0x0, NULL,
func_803890BC, NULL, func_80325888,
func_803890BC, NULL, actor_draw,
0, 0, 0.0f, 0
};

4
src/RBB/ch/bellbuoy.c
View File

@@ -18,7 +18,7 @@ void func_8038DF6C(Actor* this);
/* .data */
ActorInfo D_80390D20 = {
0x1AA, 0x296, 0x43B, 0x0, NULL,
func_8038DF6C, NULL, func_80325888,
func_8038DF6C, NULL, actor_draw,
0, 0, 0.0f, 0
};
@@ -26,7 +26,7 @@ ActorInfo D_80390D20 = {
/*.code */
void func_8038DF10(Actor *this, int arg1){
if(arg1 == 1){
func_80335924(this->unk148, 0x16a, 0, 1.2f);
skeletalAnim_set(this->unk148, 0x16a, 0, 1.2f);
}
this->state = arg1;
}

18
src/RBB/ch/boombox.c
View File

@@ -202,8 +202,8 @@ int func_8038EF08(Actor *this, f32 (*position)[3], f32 arg2){
local->unk20[2] = this->position_z;
}
}
func_80335924(this->unk148, ASSET_147_ANIM_BOOMBOX_MOVE, 0.1f, randf2(-0.1f, 0.1f) + (1.0/arg2)*0.4);
func_80335A8C(this->unk148, 2);
skeletalAnim_set(this->unk148, ASSET_147_ANIM_BOOMBOX_MOVE, 0.1f, randf2(-0.1f, 0.1f) + (1.0/arg2)*0.4);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
local->unk14[0] = this->position_x;
local->unk14[1] = this->position_y;
local->unk14[2] = this->position_z;
@@ -222,8 +222,8 @@ void func_8038F190(Actor *this, s32 arg1){
}
if(arg1 == 1){
func_80335924(this->unk148, ASSET_147_ANIM_BOOMBOX_MOVE, 0.2f, 1.0f);
func_80335A8C(this->unk148, 4);
skeletalAnim_set(this->unk148, ASSET_147_ANIM_BOOMBOX_MOVE, 0.2f, 1.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_4_STOPPED);
}//L8038F204
if(arg1 == 2){
@@ -247,8 +247,8 @@ void func_8038F190(Actor *this, s32 arg1){
func_8038FB6C();
actor_collisionOff(this);
func_80324D54(0.0f, SFX_1B_EXPLOSION_1, 1.0f, 0x7d00, &this->position, 1000.0f, 2000.0f);
func_80335924(this->unk148, ASSET_148_ANIM_BOOMBOX_DIE, 0.2f, 1.0f);
func_80335A8C(this->unk148, 2);
skeletalAnim_set(this->unk148, ASSET_148_ANIM_BOOMBOX_DIE, 0.2f, 1.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
func_8038EAB4(this);
func_8038EC14(this);
func_8038ED3C(this, 0x53a);
@@ -309,7 +309,7 @@ Actor * func_8038F4B0(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 arg3){
D_803912A0[2] = actor->roll;
modelRender_setPrimAndEnvColors(sp28, &D_80390DDC);
}//L8038F5F8
return func_80325888(marker, gdl, mptr, arg3);
return actor_draw(marker, gdl, mptr, arg3);
}
void func_8038F618(Actor *this){
@@ -369,7 +369,7 @@ void func_8038F618(Actor *this){
if(0.0f == local->unk30 && sp78)
func_8038E910(this);
func_8033568C(this->unk148, &sp6C, &sp68);
skeletalAnim_getProgressRange(this->unk148, &sp6C, &sp68);
if(0.1 <= sp68 && sp68 <= 0.6)
ml_interpolate_vec3f(this->position, &local->unk14, &local->unk20, (sp68 - 0.1) /0.5 );
@@ -386,7 +386,7 @@ void func_8038F618(Actor *this){
func_80258A4C(&D_80390DEC,this->yaw - 90.0f, &sp50, &sp4C, &sp48, &sp44);
this->yaw += (sp44*400.0f)*sp70;
if(func_80335794(this->unk148) > 0){
if(skeletalAnim_getLoopCount(this->unk148) > 0){
if(ml_distance_vec3f(&this->position, &local->unk8) < 10.0f){
func_8038F190(this, 1);
}else{

64
src/RBB/ch/bossboombox.c
View File

@@ -2,8 +2,8 @@
#include "functions.h"
#include "variables.h"
extern void func_803253A0(Actor *);
extern void func_80325794(ActorMarker *);
extern void actor_predrawMethod(Actor *);
extern void actor_postdrawMethod(ActorMarker *);
extern void func_8030E394(u8);
extern void func_80326310(Actor *);
extern int func_803342AC(f32 (*)[3], f32(*)[3], f32);
@@ -229,7 +229,7 @@ void func_8038CB68(ActorMarker *marker, s32 arg1, s32 arg2){
Actor *actor = marker_getActor(marker);
timed_exitStaticCamera(0.0f);
func_80324E38(0.0f, 0);
timedFunc_set_2(0.0f, (GenMethod_2)RBB_func_8038C370, actor->marker, 3);
timedFunc_set_2(0.0f, (GenFunction_2)RBB_func_8038C370, actor->marker, 3);
}
void chbossboombox_hideJiggy(void){
@@ -298,16 +298,16 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
}
if(this->state == 1){
func_80335924(this->unk148, ASSET_146_ANIM_BOSS_BOOMBOX_APPEAR, 0.0f, 2.0f);
func_80335A8C(this->unk148, 4);
skeletalAnim_set(this->unk148, ASSET_146_ANIM_BOSS_BOOMBOX_APPEAR, 0.0f, 2.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_4_STOPPED);
}
if(this->state == 2){
func_8025A58C(0, 0xfa0);
func_8025A6EC(COMUSIC_62_RBB_BOOMBOX, -1);
func_8025AABC(COMUSIC_62_RBB_BOOMBOX);
func_80335924(this->unk148, ASSET_146_ANIM_BOSS_BOOMBOX_APPEAR, 0.0f, 2.4f);
func_80335A8C(this->unk148, 2);
skeletalAnim_set(this->unk148, ASSET_146_ANIM_BOSS_BOOMBOX_APPEAR, 0.0f, 2.4f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
func_80324E38(0.0f, 3);
timed_setStaticCameraToNode(0.0f, 0);
timed_playSfx(0.5f, SFX_3F5_UNKNOWN, 1.0f, 0x7fc6);
@@ -319,18 +319,18 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
item_set(ITEM_0_HOURGLASS_TIMER, 0x1067);
timed_exitStaticCamera(2.4f);
func_80324E38(2.4f, 0);
timedFunc_set_2(2.4f, (GenMethod_2)RBB_func_8038C370, (s32)this->marker, 3);
timedFunc_set_2(2.4f, (GenFunction_2)RBB_func_8038C370, (s32)this->marker, 3);
}
else{//L8038CEFC
timedFunc_set_3(2.4f, (GenMethod_3)comusic_8025AB44, COMUSIC_62_RBB_BOOMBOX, 0x1f40, 0x12C);
timedFunc_set_3(2.4f, (GenFunction_3)comusic_8025AB44, COMUSIC_62_RBB_BOOMBOX, 0x1f40, 0x12C);
func_80324DBC(2.4f, 0xb9e, 4, NULL, this->marker, func_8038CB34, func_8038CB68);
}
}//L8038CF60
if(this->state == 3 || this->state == 4){
func_8030E878(0x3f2, local->unk0->unk14, 0x6d60, &this->position, 500.0f, 1000.0f);
func_80335924(this->unk148, ASSET_147_ANIM_BOOMBOX_MOVE, 0.2f, (1.0/(local->unk0->unk8)*randf2(1.0f, 1.1f)));
func_80335A8C(this->unk148, 2);
skeletalAnim_set(this->unk148, ASSET_147_ANIM_BOOMBOX_MOVE, 0.2f, (1.0/(local->unk0->unk8)*randf2(1.0f, 1.1f)));
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
ml_vec3f_set_length(sp80, (this->state == 4)? -0x32*(2 + func_80326218()) : 300.0f/local->unk0->unk8);
local->unk14[0] = sp80[0] + this->position_x;
local->unk14[1] = sp80[1] + this->position_y;
@@ -342,8 +342,8 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
if(this->state == 5){
actor_collisionOff(this);
timed_playSfx(0.2f, SFX_D9_WOODEN_CRATE_BREAKING_1, 0.9f, 0x7530);
func_80335924(this->unk148, ASSET_148_ANIM_BOOMBOX_DIE, 0.2f, 1.0f);
func_80335A8C(this->unk148, 2);
skeletalAnim_set(this->unk148, ASSET_148_ANIM_BOOMBOX_DIE, 0.2f, 1.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
ml_vec3f_set_length(sp80, -300.f);
local->unk14[0] = sp80[0] + this->position_x;
local->unk14[1] = sp80[1] + this->position_y;
@@ -367,7 +367,7 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
func_803204E4(5, 1);
}
else{//L8038D220
timedFunc_set_3(0.0f, (GenMethod_3)chbossboombox_respawnJiggy, (s32)this->position_x, (s32)this->position_y, (s32)this->position_z);
timedFunc_set_3(0.0f, (GenFunction_3)chbossboombox_respawnJiggy, (s32)this->position_x, (s32)this->position_y, (s32)this->position_z);
func_80311480(0xb9f, 4, 0, 0, 0, 0);
}
}//L8038D278
@@ -376,20 +376,20 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
sp68[0] = this->position_x + 200.0f*local->unk0->unk4;
sp68[1] = this->position_y + 80.0f*local->unk0->unk4;
sp68[2] = this->position_z;
__spawnQueue_add_4((GenMethod_4)func_802C4140, local->unk0->unk0 + 1, reinterpret_cast(s32, sp68[0]), reinterpret_cast(s32, sp68[1]), reinterpret_cast(s32, sp68[2]));
__spawnQueue_add_4((GenFunction_4)func_802C4140, local->unk0->unk0 + 1, reinterpret_cast(s32, sp68[0]), reinterpret_cast(s32, sp68[1]), reinterpret_cast(s32, sp68[2]));
sp68[0] = this->position_x - 200.0f*local->unk0->unk4;
sp68[1] = this->position_y + 80.0f*local->unk0->unk4;
sp68[2] = this->position_z;
__spawnQueue_add_4((GenMethod_4)func_802C4140, local->unk0->unk0 + 1, reinterpret_cast(s32, sp68[0]), reinterpret_cast(s32, sp68[1]), reinterpret_cast(s32, sp68[2]));
__spawnQueue_add_4((GenFunction_4)func_802C4140, local->unk0->unk0 + 1, reinterpret_cast(s32, sp68[0]), reinterpret_cast(s32, sp68[1]), reinterpret_cast(s32, sp68[2]));
}
}//L8038D378
if(this->state == 7){
actor_collisionOff(this);
func_803262E4(this);
func_80335924(this->unk148, ASSET_147_ANIM_BOOMBOX_MOVE, 0.0f, 1.0f);
func_80335A8C(this->unk148, 2);
skeletalAnim_set(this->unk148, ASSET_147_ANIM_BOOMBOX_MOVE, 0.0f, 1.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
local->unk8[0] = this->position_x;
local->unk8[1] = this->position_y;
local->unk8[2] = this->position_z;
@@ -464,8 +464,8 @@ Actor *func_8038D638(ActorMarker *marker, Gfx **gdl, Mtx ** mptr, s32 arg3){
func_8033A45C(6, (actor->state == 4)? 2: 1);
func_8033A45C(7, (actor->state == 4)? 2: 1);
}
modelRender_preDraw( (GenMethod_1)func_803253A0, (s32)actor);
modelRender_postDraw((GenMethod_1)func_80325794, (s32)marker);
modelRender_preDraw( (GenFunction_1)actor_predrawMethod, (s32)actor);
modelRender_postDraw((GenFunction_1)actor_postdrawMethod, (s32)marker);
modelRender_draw(gdl, mptr, actor->position, sp3C, actor->scale, NULL, func_80330B1C(marker));
return actor;
@@ -532,8 +532,8 @@ void func_8038D8BC(Actor *this){
if(func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){
chbossboombox_hideJiggy();
func_80335924(this->unk148, ASSET_146_ANIM_BOSS_BOOMBOX_APPEAR, 0.0f, 2.4f);
func_80335A8C(this->unk148, 2);
skeletalAnim_set(this->unk148, ASSET_146_ANIM_BOSS_BOOMBOX_APPEAR, 0.0f, 2.4f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
this->state = 2;
}
return;
@@ -554,15 +554,15 @@ void func_8038D8BC(Actor *this){
}//L8038DAD8
if(this->state == 2){
if(func_8033567C(this->unk148) == ASSET_146_ANIM_BOSS_BOOMBOX_APPEAR && func_80335794(this->unk148) > 0){
func_80335924(this->unk148, ASSET_147_ANIM_BOOMBOX_MOVE, 0.2, 1.0f);
func_80335A8C(this->unk148, 1);
if(skeletalAnim_getAnimId(this->unk148) == ASSET_146_ANIM_BOSS_BOOMBOX_APPEAR && skeletalAnim_getLoopCount(this->unk148) > 0){
skeletalAnim_set(this->unk148, ASSET_147_ANIM_BOOMBOX_MOVE, 0.2, 1.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_1_LOOP);
}
}//L8038DB30
if( this->state == 2 || this->state == 3 || this->state == 4){
if(func_8033567C(this->unk148) == ASSET_147_ANIM_BOOMBOX_MOVE){
func_8033568C(this->unk148, &sp5C, &sp58);
if(skeletalAnim_getAnimId(this->unk148) == ASSET_147_ANIM_BOOMBOX_MOVE){
skeletalAnim_getProgressRange(this->unk148, &sp5C, &sp58);
if(sp5C < 0.6 && 0.6 <= sp58){
func_8030E878(SFX_6C_LOCKUP_CLOSING, randf2(-0.05f, 0.05f) + local->unk0->unk14, 20000, this->position, 500.0f, 1000.0f);
}//L8038DC04
@@ -580,23 +580,23 @@ void func_8038D8BC(Actor *this){
RBB_func_8038CC9C(this, 8);
}
}
func_8033568C(this->unk148, &sp54, &sp50);
skeletalAnim_getProgressRange(this->unk148, &sp54, &sp50);
if(0.1 <= sp50 && sp50 <= 0.6){
sp4C = (sp50 - 0.1)/0.5;
ml_interpolate_vec3f(this->position, local->unk8, local->unk14, sp4C);
this->yaw = local->unk24 + sp4C*(local->unk28 - local->unk24);
}
if(func_80335794(this->unk148) > 0)
if(skeletalAnim_getLoopCount(this->unk148) > 0)
RBB_func_8038CC9C(this, 3);
}//L8038DD64
if(this->state == 5){
if(func_80335794(this->unk148) > 0){
if(skeletalAnim_getLoopCount(this->unk148) > 0){
RBB_func_8038CC9C(this, 6);
}else{
tmp_f2 = func_80335684(this->unk148);
tmp_f2 = skeletalAnim_getProgress(this->unk148);
if(tmp_f2 <= 0.3)
tmp_f2 = tmp_f2/0.3;
else
@@ -606,7 +606,7 @@ void func_8038D8BC(Actor *this){
}//L8038DE10
if(this->state == 7){
if(func_80335794(this->unk148) > 0)
if(skeletalAnim_getLoopCount(this->unk148) > 0)
RBB_func_8038CC9C(this, 3);
}
}

2
src/RBB/ch/bossboomboxctrl.c
View File

@@ -24,7 +24,7 @@ void chBossBoomBoxCtrl_update(Actor *this){
if(jiggyscore_isSpawned(JIGGY_56_RBB_BOSS_BOOM_BOX) && !func_803203FC(2)){
marker_despawn(this->marker);
}else{
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_281_BOSS_BOOM_BOX_LARGEST, reinterpret_cast(s32,this->position_x), reinterpret_cast(s32,this->position_y), reinterpret_cast(s32,this->position_z));
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_281_BOSS_BOOM_BOX_LARGEST, reinterpret_cast(s32,this->position_x), reinterpret_cast(s32,this->position_y), reinterpret_cast(s32,this->position_z));
__chBossBoomBoxCtrl_setState(this, 1);
}
}//L8038DEF4

6
src/RBB/ch/cog.c
View File

@@ -12,19 +12,19 @@ void func_80388C20(Actor *this);
/* .data */
ActorInfo D_803903B0 = {
0x18B, 0x17B, 0x409, 0x0, NULL,
func_80388C20, NULL, func_80325888,
func_80388C20, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_803903D4 = {
0x18C, 0x17C, 0x40A, 0x0, NULL,
func_80388C20, NULL, func_80325888,
func_80388C20, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_803903F8 = {
0x18D, 0x17D, 0x40B, 0x0, NULL,
func_80388C20, NULL, func_80325888,
func_80388C20, NULL, actor_draw,
0, 0, 0.0f, 0
};

17
src/RBB/ch/dolphin.c
View File

@@ -2,7 +2,6 @@
#include "functions.h"
#include "variables.h"
extern void func_80335A24(void *, s32, f32, f32);
extern s32 func_802EDD8C(f32 (*)[3], f32, f32);
void func_8038B900(Actor *this);
@@ -10,17 +9,17 @@ void func_8038B900(Actor *this);
/* .data */
ActorInfo RBB_D_80390AB0 = {
0x30, 0x1C8, 0x41C, 0x0, NULL,
NULL, func_8038B900, func_80325888,
NULL, func_8038B900, actor_draw,
0, 0, 0.0f, 0
};
/* .code */
void func_8038B880(Actor *this, s32 new_state){
if(new_state == 1)
func_80335924(this->unk148, ASSET_13F_ANIM_SNORKEL_STUCK, 0.0f, 5.5f);
skeletalAnim_set(this->unk148, ASSET_13F_ANIM_SNORKEL_STUCK, 0.0f, 5.5f);
if(new_state == 2)
func_80335A24(this->unk148, ASSET_13E_ANIM_SNORKEL_SWIM, 1.0f, 0.65f);
skeletalAnim_swap(this->unk148, ASSET_13E_ANIM_SNORKEL_SWIM, 1.0f, 0.65f);
this->state = new_state;
}
@@ -34,7 +33,7 @@ void func_8038B900(Actor *this){
this->marker->propPtr->unk8_3 = 1;
if(this->marker->unk14_21){
sp54 = func_80335684(this->unk148);
sp54 = skeletalAnim_getProgress(this->unk148);
if( ( func_8023DB5C() & (1 << 4) )
&& ( func_8023DB5C() & (1 << 2) )
&& ( randf() < 0.90 )
@@ -53,7 +52,7 @@ void func_8038B900(Actor *this){
)
)
){//L8038BB24
func_8034A174(this->marker->unk44, 5, &sp48);
func_8034A174(this->marker->unk44, 5, sp48);
other = func_802EDD8C(&sp48, 0.0f, -1300.0f);
func_802EFB70(other, 0.04f, 0.04f);
func_802EFB84(other, 0.18f, 0.18f);
@@ -76,13 +75,13 @@ void func_8038B900(Actor *this){
}
}
else{//L8038BC74
func_8033568C(this->unk148, &sp5C, &sp58);
skeletalAnim_getProgressRange(this->unk148, &sp5C, &sp58);
if( sp5C < 0.22 && 0.22 <= sp58 ){
func_8030E988(SFX_D1_SNORKEL_WAH, randf2(0.8f, 0.9f), 0x3a98, &this->position, 1500.0f, 2000.0f);
func_8030E988(SFX_D1_SNORKEL_WAH, randf2(0.8f, 0.9f), 15000, this->position, 1500.0f, 2000.0f);
}
if( sp5C < 0.54 && 0.54 <= sp58 ){
func_8030E988(SFX_D1_SNORKEL_WAH, randf2(0.9f, 1.0f), 0x4a38, &this->position, 1500.0f, 2000.0f);
func_8030E988(SFX_D1_SNORKEL_WAH, randf2(0.9f, 1.0f), 19000, this->position, 1500.0f, 2000.0f);
}
if(this->state == 1){

6
src/RBB/ch/eggtoll1.c
View File

@@ -94,7 +94,7 @@ void func_803865D0(ActorMarker *marker){
ActorLocal_RBB_0 * local = (ActorLocal_RBB_0 *) &actor->local;
RBB_func_803863F0(actor, 1);
timed_setStaticCameraToNode(0.0f, D_80390074[local->unk4].unk0);
timedFunc_set_2(0.75*D_80390074[local->unk4].unk4, (GenMethod_2) func_803865A4, actor->marker, 4);
timedFunc_set_2(0.75*D_80390074[local->unk4].unk4, (GenFunction_2) func_803865A4, actor->marker, 4);
timed_exitStaticCamera(0.75*D_80390074[local->unk4].unk4);
func_80324E38(0.75*D_80390074[local->unk4].unk4, 0);
timed_playSfx(D_80390074[local->unk4].unk4, SFX_7F_HEAVYDOOR_SLAM, 0.8f, 0x7fd0);
@@ -113,8 +113,8 @@ void func_803866F4(Actor *this, s32 arg1){
local->unk8++;
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
func_80324E38(0.0f, 3);
timedFunc_set_2(0.5f, (GenMethod_2) func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
timedFunc_set_1(1.0f, (GenMethod_1) func_803865D0, this->marker);
timedFunc_set_2(0.5f, (GenFunction_2) func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
timedFunc_set_1(1.0f, (GenFunction_1) func_803865D0, this->marker);
}//L803867D4
if(arg1 == 4){
if(local->unk8 == 1 && D_80390074[local->unk4].unk2 > 0){

6
src/RBB/ch/enginefan.c
View File

@@ -58,19 +58,19 @@ Struct_RBB_2E90_0 D_80390530[] = {
ActorInfo D_80390640 = {
MARKER_191_ENGINE_ROOM_PROPELLOR_1, ACTOR_1BB_ENGINE_ROOM_PROPELLOR_1, ASSET_40F_MODEL_ENGINE_ROOM_PROPELLER_1, 0x0, NULL,
func_8038944C, NULL, func_80325888,
func_8038944C, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80390664 = {
MARKER_192_ENGINE_ROOM_PROPELLOR_2, ACTOR_1BC_ENGINE_ROOM_PROPELLOR_2, ASSET_410_MODEL_ENGINE_ROOM_PROPELLER_2, 0x0, NULL,
func_8038944C, NULL, func_80325888,
func_8038944C, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80390688 = {
MARKER_193_ENGINE_ROOM_PROPELLOR_3, ACTOR_1BD_ENGINE_ROOM_PROPELLOR_3, ASSET_411_MODEL_ENGINE_ROOM_PROPELLER_3, 0x0, NULL,
func_8038944C, NULL, func_80325888,
func_8038944C, NULL, actor_draw,
0, 0, 0.0f, 0
};

2
src/RBB/ch/enginefanswitch.c
View File

@@ -7,7 +7,7 @@ void chEngineFanSwitch_update(Actor *this);
/* .data */
ActorInfo D_803906B0 = {
0x194, 0x1BE, 0x412, 0x0, NULL,
chEngineFanSwitch_update, NULL, func_80325888,
chEngineFanSwitch_update, NULL, actor_draw,
0, 0, 0.0f, 0
};

8
src/RBB/ch/engineparts.c
View File

@@ -33,25 +33,25 @@ Struct_RBB_40F0 D_80390760[4] = {
ActorInfo D_803907D0 = {
0x187, 0x177, 0x406, 0x0, NULL,
func_8038A724, NULL, func_80325888,
func_8038A724, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_803907F4 = {
0x18E, 0x17E, 0x406, 0x0, NULL,
func_8038A724, NULL, func_80325888,
func_8038A724, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80390818 = {
0x18F, 0x17F, 0x407, 0x0, NULL,
func_8038A724, NULL, func_80325888,
func_8038A724, NULL, actor_draw,
0, 0, 0.0f, 0
};
ActorInfo D_8039083C = {
0x190, 0x180, 0x408, 0x0, NULL,
func_8038A724, NULL, func_80325888,
func_8038A724, NULL, actor_draw,
0, 0, 0.0f, 0
};

14
src/RBB/ch/grimlet.c
View File

@@ -30,8 +30,8 @@ void func_803883B0(Actor *this, s32 arg1){
local->unk5 = 0;
if(arg1 == 2){
FUNC_8030E624(SFX_66_BIRD_AUUGHH, 0.6f, 32675);
func_80335924(this->unk148, 0x137, 0.0f, 0.8f);
func_80335A8C(this->unk148, 2);
skeletalAnim_set(this->unk148, 0x137, 0.0f, 0.8f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
}
this->state = arg1;
}
@@ -57,7 +57,7 @@ Actor *func_8038846C(ActorMarker * marker, Gfx **gdl, Mtx **mptr, Vtx **vtx){
}
if(local->unk4){
sp5C = func_803356A0(actor->unk148);
sp5C = skeletalAnim_getBoneTransformList(actor->unk148);
sp40[0] = 0.0f;
sp40[1] = local->unk0;
sp40[2] = 0.0f;
@@ -74,11 +74,11 @@ Actor *func_8038846C(ActorMarker * marker, Gfx **gdl, Mtx **mptr, Vtx **vtx){
sp34[1] = 0.0f;
sp34[2] = local->unkC/200.0f;
func_8033A968(sp5C, 0x12, sp34);
func_80335918(actor->unk148);
skeletalAnim_func_80335918(actor->unk148);
}
func_8033A45C(3, (0.0f < local->unk8)? 1 : 0);
func_8033A45C(4, (0.0f < local->unk8)? 1 : 0);
func_80325888(marker, gdl, mptr, vtx);
actor_draw(marker, gdl, mptr, vtx);
local->unk4 = actor->marker->unk14_21;
return actor;
}
@@ -162,7 +162,7 @@ void func_80388620(Actor *this){
}//L80388AB8
if(this->state == 2){
func_8033568C(this->unk148, &sp4C, &sp48);
skeletalAnim_getProgressRange(this->unk148, &sp4C, &sp48);
if(0.6 <= sp48)
tmp_f2 = 1.0 - 2*(sp48 - 0.6);
else
@@ -177,7 +177,7 @@ void func_80388620(Actor *this){
FUNC_8030E8B4(SFX_20_METAL_CLANK_1, 1.0f, 32000, this->position, 500, 2500);
}
if(func_80335794(this->unk148) > 0)
if(skeletalAnim_getLoopCount(this->unk148) > 0)
func_803883B0(this, 1);
}//L80388BB0
}

8
src/RBB/ch/propellor.c
View File

@@ -16,7 +16,7 @@ void chPropellor_update(Actor *this);
ActorInfo D_803906E0 = {
MARKER_185_MODEL_RUSTY_BUCKET_REAR_PROPELLER, ACTOR_175_MODEL_RUSTY_BUCKET_REAR_PROPELLER, ASSET_403_MODEL_RUSTY_BUCKET_REAR_PROPELLER,
0x0, NULL,
chPropellor_update, NULL, func_80325888,
chPropellor_update, NULL, actor_draw,
0, 0, 0.0f, 0
};
@@ -93,11 +93,11 @@ void chPropellor_update(Actor *this){
if(levelSpecificFlags_get(local->unk8 ? 4 : 3)){
ncStaticCamera_setToNode(9);
func_80324E38(0.0f, 3);
timedFunc_set_2(0.1f, (GenMethod_2)levelSpecificFlags_set, local->unk8 ? 0x28 : 0x27, 1);
timedFunc_set_2(0.1f, (GenFunction_2)levelSpecificFlags_set, local->unk8 ? 0x28 : 0x27, 1);
timed_exitStaticCamera(4.5f);
func_80324E38(4.5f, 0);
timedFunc_set_2(4.5f, (GenMethod_2)levelSpecificFlags_set, local->unk8 ? 0x4 : 0x3, 0);
timedFunc_set_3(4.5f, (GenMethod_3)func_802E4078, MAP_34_RBB_ENGINE_ROOM, !local->unk8 ? 3 : 2, 0);
timedFunc_set_2(4.5f, (GenFunction_2)levelSpecificFlags_set, local->unk8 ? 0x4 : 0x3, 0);
timedFunc_set_3(4.5f, (GenFunction_3)func_802E4078, MAP_34_RBB_ENGINE_ROOM, !local->unk8 ? 3 : 2, 0);
func_803228D8();
}
}//L80389EA8

8
src/RBB/ch/propellorswitch.c
View File

@@ -3,7 +3,7 @@
#include "variables.h"
extern void func_8028F9DC(s32);
extern void func_803253A0(Actor *);
extern void actor_predrawMethod(Actor *);
/* typedefs and declarations */
typedef struct {
@@ -48,8 +48,8 @@ void __chPropellorSwitch_setState(Actor *this, s32 arg1){
if(this->state == 1){
levelSpecificFlags_set(local->unk0->unk8, 1);
func_803228D8();
timedFunc_set_1(1.1f, (GenMethod_1)func_8028F9DC, 2);
timedFunc_set_3(1.1f, (GenMethod_3)func_802E4078, MAP_31_RBB_RUSTY_BUCKET_BAY, 0, 0);
timedFunc_set_1(1.1f, (GenFunction_1)func_8028F9DC, 2);
timedFunc_set_3(1.1f, (GenFunction_3)func_802E4078, MAP_31_RBB_RUSTY_BUCKET_BAY, 0, 0);
}else{
levelSpecificFlags_set(local->unk0->unkA, 1);
}
@@ -76,7 +76,7 @@ Actor *chPropellorSwitch_draw(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 ar
return actor;
}
modelRender_preDraw(func_803253A0, actor);
modelRender_preDraw(actor_predrawMethod, actor);
if(local->unk4){
modelRender_draw(gdl, mptr, &actor->position, NULL, 1.0f, NULL, local->unk4);
}

4
src/RBB/ch/rarewareflag.c
View File

@@ -6,7 +6,7 @@ void func_8038C300(Actor *this);
ActorInfo D_80390B40 = {
0x198, 0x1ca, 0x41e, 0x0, NULL,
func_8038C300, NULL, func_80325888,
func_8038C300, NULL, actor_draw,
0, 0, 0.0f, 0
};
@@ -14,6 +14,6 @@ void func_8038C300(Actor *this){
if(!this->unk16C_4){
this->marker->propPtr->unk8_3 = 1;
this->unk16C_4 = 1;
func_80335924(this->unk148, 0x140, 0.0f, 1.0f);
skeletalAnim_set(this->unk148, 0x140, 0.0f, 1.0f);
}
}

2
src/RBB/ch/rowboat.c
View File

@@ -17,7 +17,7 @@ void func_8038E3D8(Actor *this);
/* .data */
ActorInfo D_80390D50 = {
0x1ab, 0x297, 0x43C, 0x0, NULL,
func_8038E3D8, NULL, func_80325888,
func_8038E3D8, NULL, actor_draw,
0, 0, 0.0f, 0
};

10
src/RBB/ch/whistle.c
View File

@@ -72,8 +72,8 @@ void RBB_func_8038B0B8(Actor *this, s32 arg1){
this->state = arg1;
if(this->state == 2){
func_80335924(this->unk148, local->unk0->unk12, 0.0f, 0.5f);
func_80335A8C(this->unk148, 2);
skeletalAnim_set(this->unk148, local->unk0->unk12, 0.0f, 0.5f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
timed_playSfx(0.1f, local->unk0->unk14, 1.0f, 0x7d00);
other = partEmitMgr_newEmitter(0xa);
particleEmitter_setSprite(other, ASSET_70E_SPRITE_SMOKE_2);
@@ -105,13 +105,13 @@ Actor *func_8038B230(ActorMarker *marker, Gfx** gdl, Mtx** mptr, s32 arg3){
return actor;
if(actor->state == 2){
func_8033A238(func_803356A0(actor->unk148));
modelRender_setBoneTransformList(skeletalAnim_getBoneTransformList(actor->unk148));
}
sp3C[0] = actor->pitch;
sp3C[1] = actor->yaw;
sp3C[2] = actor->roll;
modelRender_preDraw(&func_803253A0, actor);
modelRender_preDraw(&actor_predrawMethod, actor);
func_8033A450(func_80329934());
modelRender_draw(gdl, mptr, &actor->position, &sp3C, actor->scale, NULL, func_80330B1C(marker));
func_8034A174(func_80329934(), 5, &local->unk4);
@@ -146,7 +146,7 @@ void func_8038B340(Actor * this){
}
if(this->state == 2){
if( func_80335794(this->unk148) > 0 )
if( skeletalAnim_getLoopCount(this->unk148) > 0 )
RBB_func_8038B0B8(this, 1);
}
}

2
src/RBB/ch/whistleswitch.c
View File

@@ -121,7 +121,7 @@ Actor *func_8038AD9C(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 arg3){
);
modelRender_setVertexList(local->unkC);
}
return func_80325888(marker, gdl, mptr, arg3);
return actor_draw(marker, gdl, mptr, arg3);
}
void func_8038AEB8(Actor *this){

14
src/RBB/code_1570.c
View File

@@ -188,28 +188,28 @@ void func_80387F88(ActorMarker *marker){
timed_playSfx(3.0f, SFX_1A_BIG_THINGS_FALL_OVER, 0.6f, 22000);
timed_exitStaticCamera(4.0f);
func_80324E38(4.0f, 0);
timedFunc_set_2(4.0f, (GenMethod_2) RBB_func_80387F18, (s32) actor->marker, 3);
timedFunc_set_2(4.0f, (GenFunction_2) RBB_func_80387F18, (s32) actor->marker, 3);
}
void func_80388154(ActorMarker *marker){
Actor *actor = marker_getActor(marker);
func_803879F0();
timedFunc_set_0(0.0f, (GenMethod_0) RBB_func_80387F44);
timedFunc_set_0(0.0f, (GenFunction_0) RBB_func_80387F44);
timed_playSfx(0.0f, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 0x7fc6);
timedFunc_set_2(1.2f, (GenMethod_2) func_80387B8C, 0x19f, 0);
timedFunc_set_2(1.2f, (GenFunction_2) func_80387B8C, 0x19f, 0);
timed_setStaticCameraToNode(1.2f, 8);
timedFunc_set_1(1.5f, (GenMethod_1) func_80387F88, (s32) actor->marker);
timedFunc_set_1(1.5f, (GenFunction_1) func_80387F88, (s32) actor->marker);
}
void func_803881E8(Actor *this, s32 arg1){
this->state = arg1;
if(this->state == 2){
RBB_func_80387960(0.05f);
timedFunc_set_2(0.05f, (GenMethod_2)func_80387BEC, 0x19f, 0x1f4);
timedFunc_set_2(0.1f, (GenMethod_2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
timedFunc_set_2(0.05f, (GenFunction_2)func_80387BEC, 0x19f, 0x1f4);
timedFunc_set_2(0.1f, (GenFunction_2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
func_80324E38(0.2f, 3);
timed_setStaticCameraToNode(1.1f, 7);
timedFunc_set_1(1.6f, (GenMethod_1)func_80388154, (s32)this->marker);
timedFunc_set_1(1.6f, (GenFunction_1)func_80388154, (s32)this->marker);
levelSpecificFlags_set(0x2D, 1);
}
}

14
src/RBB/code_640.c
View File

@@ -76,37 +76,37 @@ ActorAnimationInfo D_803900C0[4] = {
ActorInfo D_803900E0 = {
0x107, 0x21D, 0x493, 0x1, NULL,
func_802D3D54, func_80326224, func_80325E78,
func_802D3D54, func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_80390104 = {
0x108, 0x21C, 0x492, 0x1, NULL,
func_802D3D54, func_80326224, func_80325E78,
func_802D3D54, func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_80390128 = {
0x22D, 0x266, 0x4BA, 0x1, NULL,
func_802D3D54, func_80326224, func_80325E78,
func_802D3D54, func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_8039014C = {
0x22E, 0x267, 0x4BB, 0x1, NULL,
func_802D3D54, func_80326224, func_80325E78,
func_802D3D54, func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_80390170 = {
0x235, 0x23F, 0x4E2, 0x1, NULL,
func_802D3D54, func_80326224, func_80325E78,
func_802D3D54, func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
ActorInfo D_80390194 = {
0x15F, 0x18F, 0x42F, 0x1, D_803900C0,
func_80386BF8, func_80326224, func_80325888,
func_80386BF8, func_80326224, actor_draw,
0, 0, 0.0f, 0
};
@@ -159,7 +159,7 @@ void func_80386A7C(Actor *this){
Actor *func_80386B9C(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 arg3){
Actor *actor = marker_getActor(marker);
return (actor->unk38_0) ? func_80325E78(marker, gdl, mptr, arg3): NULL;
return (actor->unk38_0) ? actor_drawFullDepth(marker, gdl, mptr, arg3): NULL;
}
void func_80386BF8(Actor *arg0){

4
src/RBB/code_9670.c
View File

@@ -26,9 +26,9 @@ void RBB_func_8038FA60(ActorMarker *marker){
void func_8038FA9C(Actor *this, s32 arg1){
if(arg1 == 3){
func_80324E38(0.0f, 3);
timedFunc_set_2(1.0f, (GenMethod_2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
timedFunc_set_2(1.0f, (GenFunction_2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
timed_setStaticCameraToNode(1.8f, 1);
timedFunc_set_1(2.0f, (GenMethod_1) RBB_func_8038FA60, (s32)this->marker);
timedFunc_set_1(2.0f, (GenFunction_1) RBB_func_8038FA60, (s32)this->marker);
timed_exitStaticCamera(5.0f);
func_80324E38(5.0f, 0);
}

10
src/RBB/code_CA0.c
View File

@@ -64,7 +64,7 @@ void func_8038718C(ActorMarker *marker){
timed_playSfx(4.0f, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 19000);\
timed_exitStaticCamera(5.0f);
func_80324E38(5.0f, 0);
timedFunc_set_2(5.0f, (GenMethod_2) func_80387090, (s32) marker, 3);
timedFunc_set_2(5.0f, (GenFunction_2) func_80387090, (s32) marker, 3);
}
void func_80387308(ActorMarker *marker){
@@ -86,9 +86,9 @@ void func_80387308(ActorMarker *marker){
timed_playSfx(0.5f, SFX_7F_HEAVYDOOR_SLAM, 0.8f, 19000);
timed_playSfx(0.5f, SFX_7F_HEAVYDOOR_SLAM, 0.9f, 19000);
timed_playSfx(0.5f, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 19000);
timedFunc_set_2(0.5f, (GenMethod_2) func_80387090, (s32) actor->marker, 1);
timedFunc_set_2(0.5f, (GenFunction_2) func_80387090, (s32) actor->marker, 1);
timedFunc_set_2(1.5f, (GenMethod_2) func_803870BC, 0x19d, 0x1f4);
timedFunc_set_2(1.5f, (GenFunction_2) func_803870BC, 0x19d, 0x1f4);
timed_exitStaticCamera(1.5f);
func_80324E38(1.5f, 0);
@@ -102,13 +102,13 @@ void func_80387488(ActorMarker *marker){
if(-50.0f < sp1C[1] && sp1C[1] < 600.0f){
sp1C[1] = 0;
if(ml_distance_vec3f(&sp1C, &D_80390264) < 500.0f){
timedFunc_set_1(1.0f, (GenMethod_1) func_80387488, (s32)actor->marker);
timedFunc_set_1(1.0f, (GenFunction_1) func_80387488, (s32)actor->marker);
return;
}
}
func_80324E38(0.0f, 3);
timed_setStaticCameraToNode(0.0f, 6);
timedFunc_set_1(0.5f, (GenMethod_1) func_80387308, (s32) actor->marker);
timedFunc_set_1(0.5f, (GenFunction_1) func_80387308, (s32) actor->marker);
}
void func_8038756C(Actor *this, s32 arg1){

2
src/RBB/propellorctrl.c
View File

@@ -23,7 +23,7 @@ void __propellorCtrl_setState(s32 arg0){
levelSpecificFlags_set(0x28, FALSE);
item_set(ITEM_9_PROPELLOR,0);
if(arg0 == 3 && !jiggyscore_isCollected(JIGGY_57_RBB_PROPELLOR)){
timedFunc_set_1(0.5f, (GenMethod_1)func_802FAD64, 3);
timedFunc_set_1(0.5f, (GenFunction_1)func_802FAD64, 3);
func_80324DBC(1.0f, 0xb9d, 4, NULL, NULL, NULL, NULL);
}
else{