documentation: core2/ba/physics

This commit is contained in:
Banjo Kazooie
2024-06-16 22:36:36 -05:00
parent 8fe5c3b4d1
commit 092de6aae3
208 changed files with 2342 additions and 2163 deletions

View File

@@ -92,7 +92,7 @@ void func_80387E68(ActorMarker *caller, enum asset_e text_id, s32 arg2){
timed_playSfx(1.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000);
func_80324CFC(0.4f, COMUSIC_43_ENTER_LEVEL_GLITTER, 22000);
func_80324D2C(4.5f, COMUSIC_43_ENTER_LEVEL_GLITTER);
func_80328B8C(this, 5, 0.79f, 1);
subaddie_set_state_with_direction(this, 5, 0.79f, 1);
func_80326310(this);
bgs_D_803907B8[this->unkF4_8]->propPtr->unk8_4 = TRUE;
timedFunc_set_1(1.1f, (GenFunction_1)func_80387E00, reinterpret_cast(s32, bgs_D_803907B8[this->unkF4_8]));
@@ -144,13 +144,13 @@ void func_80387FD4(Actor *this){
if (this->unkF4_8 == 1) {
func_8028F94C(2, this->position);
func_80311480(0xC86, 0xE, this->position, this->marker, func_80387E68, NULL);
func_80328B8C(this, 6, 0.79f, 1);
subaddie_set_state_with_direction(this, 6, 0.79f, 1);
} else {
timed_playSfx(0.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000); //0.4f
timed_playSfx(1.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000); //1.4f
func_80324CFC(0.4f, COMUSIC_43_ENTER_LEVEL_GLITTER, 22000);
func_80324D2C(4.5f, COMUSIC_43_ENTER_LEVEL_GLITTER);
func_80328B8C(this, 5, 0.79f, 1);
subaddie_set_state_with_direction(this, 5, 0.79f, 1);
if (this->unkF4_8 == 5) {
timedFunc_set_1(0.9f, (GenFunction_1) func_80387E40, (s32) this->marker);
} else {
@@ -172,7 +172,7 @@ void func_80387FD4(Actor *this){
case 1:// L80388370
this->unk60 += time_getDelta();
if(0.7 <= this->unk60){
func_80328B8C(this, 2, 0.0f, 1);
subaddie_set_state_with_direction(this, 2, 0.0f, 1);
func_80387C90(this);
this->unk60 = 0.0f;
func_80324D54(0.1f, SFX_D0_GRIMLET_SQUEAK, 1.0f, 0x7530, this->position, 0.0f, 1800.0f);
@@ -181,14 +181,14 @@ void func_80387FD4(Actor *this){
case 2:// L80388400
if(actor_animationIsAt(this, 0.62f)){
func_80328B8C(this, 3, 0.62f, 1);
subaddie_set_state_with_direction(this, 3, 0.62f, 1);
}
break;
case 3:// L80388434
this->unk60 += time_getDelta();
if( this->unk60 >= 0.13 + 0.7/4 * (5 - this->unkF4_8)){
func_80328B8C(this, 4, 0.62f, 1);
subaddie_set_state_with_direction(this, 4, 0.62f, 1);
func_80387C90(this);
this->unk60 = 0.0f;
func_80324D54(0.3f, 0x406, 1.0f, 0x55f0, this->position, 0.0f, 1800.0f);
@@ -197,7 +197,7 @@ void func_80387FD4(Actor *this){
case 4:// L8038850C
if(actor_animationIsAt(this, 0.0f)){
func_80328B8C(this, 1, 0.0f, 1);
subaddie_set_state_with_direction(this, 1, 0.0f, 1);
}
break;

View File

@@ -93,7 +93,7 @@ void func_8038FD9C(Actor *this){
this->unk1C[0] = 1.0f;
this->alpha_124_19 = 0xff;
if(this->unk54 != 0.0f){
func_80328A84(this, 2);
subaddie_set_state(this, 2);
}
break;
@@ -104,7 +104,7 @@ void func_8038FD9C(Actor *this){
this->marker->propPtr->unk8_3 = 1;
this->unk1C[0] = 1.0f;
if(15.0f <= this->velocity_x){
func_80328A84(this, 3);
subaddie_set_state(this, 3);
this->velocity_x = 0.0f;
}
else{
@@ -124,7 +124,7 @@ void func_8038FD9C(Actor *this){
this->unk1C[0] = 0.0f;
this->alpha_124_19 = 0;
if (this->unk54 == 0.0f) {
func_80328A84(this, 4);
subaddie_set_state(this, 4);
}
break;
@@ -132,7 +132,7 @@ void func_8038FD9C(Actor *this){
this->marker->propPtr->unk8_3 = 1;
this->unk1C[0] = 1.0f;
if (this->velocity[0] >= 15.0f) {
func_80328A84(this, 1);
subaddie_set_state(this, 1);
this->velocity[0] = 0.0f;
} else {
if(tmp[5-(((s32)this->velocity_x)%6)]) {

View File

@@ -9,7 +9,7 @@ extern f32 player_stateTimer_get(enum state_timer_e);
void func_802C4218(u32,f32,f32,f32);
void func_80328A84(Actor *, u32);
void subaddie_set_state(Actor *, u32);
/* local declarations */
Actor *chmudhut_draw(ActorMarker *this, Gfx** gdl, Mtx** mtx, Vtx **vtx);
@@ -97,7 +97,7 @@ void chmudhut_update(Actor *this){
diffPos[1] += 130.0;
FUNC_8030E8B4(SFX_5B_HEAVY_STUFF_FALLING, 1.0f, 28000, this->position, 0x12C, 0xBB8);
func_80328A84(this, 2);
subaddie_set_state(this, 2);
this->marker->propPtr->unk8_3 = 0;
actor_playAnimationOnce(this);
if(tmp == 5){

View File

@@ -85,7 +85,7 @@ void chpinkegg_collision(ActorMarker *this, ActorMarker *other_marker){
thisActor = marker_getActor(this);
this->propPtr->unk8_3 = 0;
func_8030E510(SFX_AA_BGS_EGG_BREAKING_1, 28000);
func_80328A84(thisActor, 3);
subaddie_set_state(thisActor, 3);
actor_playAnimationOnce(thisActor);
this->collidable = 0;
thisActor->unk124_6 = 0;
@@ -108,7 +108,7 @@ void chpinkegg_update(Actor *this){
case 1:
if(!((ActorLocal_PinkEgg *) &this->local)->unk4){
this->marker->collidable = 1;
func_80328A84(this,2);
subaddie_set_state(this,2);
}else{
((ActorLocal_PinkEgg *) &this->local)->unk4--;

View File

@@ -47,7 +47,7 @@ void func_8038F470(ActorMarker *this, s32 arg1, enum chtanktup_leg_e leg_id){
sp18[1] += 50.0f;
leg = func_8032813C(leg_id + ACTOR_E9_TANKTUP_LEG_FL, sp18, (s32)thisActor->yaw);
func_80328B8C(leg, arg1 + 1, 0, -1);
subaddie_set_state_with_direction(leg, arg1 + 1, 0, -1);
leg->unk10_12 = leg_id;
}
@@ -148,7 +148,7 @@ void func_8038F6A4(Actor *this)
}
if (local->unk10)
{
func_80328B8C(this, 2, 0.0f, -1);
subaddie_set_state_with_direction(this, 2, 0.0f, -1);
local->unk10 = 0;
sp44 = 0;
if(&sp44);
@@ -182,11 +182,11 @@ void func_8038F6A4(Actor *this)
{
if (!local->unk14)
{
func_80328B8C(this, 1, 0.0f, -1);
subaddie_set_state_with_direction(this, 1, 0.0f, -1);
}
else
{
func_80328B8C(this, 3, 0.0f, -1);
subaddie_set_state_with_direction(this, 3, 0.0f, -1);
actor_playAnimationOnce(this);
}
}