kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fight documentation

Browse Source
This commit is contained in:
Banjo Kazooie
2022-10-08 22:07:56 -05:00
parent c0b005fa3d
commit cd222d498a
106 changed files with 1120 additions and 880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lair/code_0.c
View File

@@ -415,13 +415,13 @@ void func_80386D78(Actor *this) {
} else {
this->scale = (this->scale < 1.0) ? this->scale + 0.04 : 1.0;
if (this->scale < 1.0) {
this->yaw_moving += 8.0;
if (this->yaw_moving >= 360.0f) {
phi_f2 = this->yaw_moving - 360.0f;
this->yaw_ideal += 8.0;
if (this->yaw_ideal >= 360.0f) {
phi_f2 = this->yaw_ideal - 360.0f;
} else {
phi_f2 = this->yaw_moving;
phi_f2 = this->yaw_ideal;
}
this->yaw_moving = phi_f2;
this->yaw_ideal = phi_f2;
this->yaw = phi_f2;
}
}
@@ -804,7 +804,7 @@ void func_803880BC(Actor *this)
this->position_y -= 51.f;
this->unk1C[0] = 0;
func_802C3C88((GenMethod_1)func_80387E94, reinterpret_cast(s32, this->marker));
__spawnqueue_add_1((GenMethod_1)func_80387E94, reinterpret_cast(s32, this->marker));
if (func_803203FC(0xBC) && !func_8031FF1C(0x9A))
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.75f, 30000);
@@ -1496,7 +1496,7 @@ void func_8038982C(Actor *this)
this->initialized = TRUE;
if (!func_8031FF1C(BKPROG_9E_CRYPT_COFFIN_LID_OPEN))
func_802C3C88((GenMethod_1)func_803897D4, reinterpret_cast(s32, this->marker));
__spawnqueue_add_1((GenMethod_1)func_803897D4, reinterpret_cast(s32, this->marker));
}
}

2
src/lair/code_42A0.c
View File

@@ -378,7 +378,7 @@ void func_8038AE2C(Actor *this) {
if( func_8038ADF0(sp38, (s32) this->velocity[0])
|| func_8038ADF0((s32) this->velocity[0], sp38)
) {
this->yaw_moving = (f32) sp38;
this->yaw_ideal = (f32) sp38;
}
func_80328FB0(this, 3.0f);
if( actor_animationIsAt(this, 0.114f)

2
src/lair/code_5640.c
View File

@@ -115,7 +115,7 @@ void func_8038BCF0(Actor *this) {
}
func_8028E668(this->position, 280.0f, -40.0f, 160.0f);
this->yaw_moving = (f32) func_80329784(this);
this->yaw_ideal = (f32) func_80329784(this);
func_80328FB0(this, 3.0f);
func_8024E55C(0, sp78);
player_getPosition(sp64);

2
src/lair/code_5ED0.c
View File

@@ -511,7 +511,7 @@ void func_8038D1E4(void)
}
if (cleanupDelay > 0.0) // f64
timedFunc_set_1(cleanupDelay, (TFQM1)func_8038D670, FFA_4_UNK);
timedFunc_set_1(cleanupDelay, (GenMethod_1)func_8038D670, FFA_4_UNK);
}
void func_8038D394(void)

2
src/lair/code_86F0.c
View File

@@ -365,7 +365,7 @@ void func_8038F350(Actor *this, s32 next_state){
} else if (this->unkF4_8 == 0xA) {
func_80324DBC(1.0f, 0xFAC, 4, NULL, this->marker, func_8038F0C0, NULL);
}
timedFunc_set_1(2.0f, (TFQM1) func_8038EBEC, (s32) this->marker);
timedFunc_set_1(2.0f, (GenMethod_1) func_8038EBEC, (s32) this->marker);
this->unk60 = 3.0f;
break;
}

4
src/lair/code_A810.c
View File

@@ -78,7 +78,7 @@ void func_80390D3C(Actor *this, s32 val)
this->unk1C[2] = this->position_z;
}
func_802C3C88((GenMethod_1)func_80390C00, reinterpret_cast(s32, this->marker));
__spawnqueue_add_1((GenMethod_1)func_80390C00, reinterpret_cast(s32, this->marker));
break;
}
@@ -88,7 +88,7 @@ void func_80390D3C(Actor *this, s32 val)
this->unk1C[1] = this->position_y;
this->unk1C[2] = this->position_z;
func_802C3C88((GenMethod_1)func_80390CB4, reinterpret_cast(s32, this->marker));
__spawnqueue_add_1((GenMethod_1)func_80390CB4, reinterpret_cast(s32, this->marker));
break;
}

4
src/lair/code_AD70.c
View File

@@ -254,7 +254,7 @@ void func_80391B04(Actor *this) {
this->position[1] += this->velocity[1] * sp44;
this->position[2] += this->velocity[2] * sp44;
this->velocity[1] += -1000.0f * sp44;
this->yaw += this->yaw_moving * sp44;
this->yaw += this->yaw_ideal * sp44;
this->pitch += this->unk6C * sp44;
if ((this->velocity[1] < 0.0) && (this->position[1] < this->unk1C[1])) {
func_80391810(this, 3);
@@ -304,7 +304,7 @@ void func_80391EA8(ActorMarker *marker, ActorMarker *a1, f32 a2[3], f32 f1, f32
actor->unk28 = f1;
actor->yaw_moving = randf2( 240, 480);
actor->yaw_ideal = randf2( 240, 480);
actor->unk6C = randf2(-240, -480);
actor->scale = scale;

2
src/lair/code_C1C0.c
View File

@@ -47,7 +47,7 @@ void func_80392690(ActorMarker *marker, enum asset_e text_id, s32 arg2){
func_8030E6D4(SFX_EA_GRUNTY_LAUGH_1);
func_80328B8C(this, 5, 0.0f, 1);
actor_loopAnimation(this);
this->yaw_moving = 79.0f;
this->yaw_ideal = 79.0f;
animctrl_setTransitionDuration(this->animctrl, 0.4f);
}