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

12
src/TTC/code_0.c
View File

@@ -84,7 +84,7 @@ bool func_803864B0(Actor *this, f32 arg1) {
}
this->unk28 = phi_f2 / arg1;
this->yaw_moving = func_80257204(this->position[0], this->position[2], sp3C[0], sp3C[2]);
this->yaw_ideal = func_80257204(this->position[0], this->position[2], sp3C[0], sp3C[2]);
if ((func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11) < this->unk28) {
this->unk28 = (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) != 0) ? 0.0f : 17.0f;
} else if (sp38 == 0) {
@@ -109,13 +109,13 @@ bool func_80386760(Actor *this, s32 arg1) {
if (this->unk1C[0] != 0.0f) {
arg1 *= 2;
this->unk28 = (f32) randi2(0, 0.5*(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11));
this->yaw_moving += (f32) randi2(-arg1, arg1);
this->yaw_ideal += (f32) randi2(-arg1, arg1);
} else if ((f64) randf() < 0.4) {
this->unk28 = 0.0f;
this->yaw_moving += (f32) randi2(-arg1, arg1);
this->yaw_ideal += (f32) randi2(-arg1, arg1);
} else {
this->unk28 = (f32) randi2(0.33 * (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11), func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11);
this->yaw_moving = this->yaw;
this->yaw_ideal = this->yaw;
}
this->unk1C[0] = 0.0f;
}
@@ -126,12 +126,12 @@ bool func_80386760(Actor *this, s32 arg1) {
}
temp_f0_2 = this->unk28 * sp2C;
this->velocity[1] = ((f32)(0.3*temp_f0_2) / sp2C) - (f32) ((s32) (sp2C * -5) / 2);
if (func_80329078(this, this->yaw_moving, temp_f0_2)) {
if (func_80329078(this, this->yaw_ideal, temp_f0_2)) {
return TRUE;
}
this->unk1C[0] = 1.0f;
this->unk28 = 0.0f;
this->yaw_moving = this->yaw;
this->yaw_ideal = this->yaw;
return FALSE;
}

6
src/TTC/code_10A0.c
View File

@@ -92,11 +92,11 @@ void func_80387678(Actor *this){
if( !mapSpecificFlags_get(1) ) return;
if( mapSpecificFlags_get(3) ) return;
this->yaw_moving = (f32) func_80329784(this);
this->yaw_ideal = (f32) func_80329784(this);
mapSpecificFlags_set(3, TRUE);
func_8028F918(2);
timed_setCameraToNode(0.0f, 4);
timedFunc_set_1(1.0f, (TFQM1)func_803875D4, (s32)this->marker);
timedFunc_set_1(1.0f, (GenMethod_1)func_803875D4, (s32)this->marker);
func_80328B8C(this, 1, 0.0f, 1);
}
@@ -104,7 +104,7 @@ void func_8038771C(Actor *this){
if( !func_80329030(this, 0)
&& func_80329480(this)
){
func_80328CEC(this, (s32)this->yaw_moving, 120, 180);
func_80328CEC(this, (s32)this->yaw_ideal, 120, 180);
}
}

2
src/TTC/code_26D0.c
View File

@@ -135,7 +135,7 @@ void func_80388D04(s32 arg0){
void func_80388D34(Actor *this){
func_80388C78(this);
if(!this->unk16C_4){
func_802C3C88((GenMethod_1)func_80388D04, (s32)this->marker);
__spawnqueue_add_1((GenMethod_1)func_80388D04, (s32)this->marker);
this->unk16C_4 = TRUE;
}
}

2
src/TTC/code_2B80.c
View File

@@ -41,7 +41,7 @@ void func_80388FBC(Actor *this) {
this->marker->propPtr->unk8_3 = FALSE;
if (levelSpecificFlags_get(5) != 0) {
levelSpecificFlags_set(5, 0);
timedFunc_set_1(0.5f, (TFQM1)func_8025A70C, COMUSIC_2D_PUZZLE_SOLVED_FANFARE);
timedFunc_set_1(0.5f, (GenMethod_1)func_8025A70C, COMUSIC_2D_PUZZLE_SOLVED_FANFARE);
}
if (levelSpecificFlags_get(2) != 0) {
temp_v0_2 = func_8034C5AC(300);

2
src/TTC/code_35D0.c
View File

@@ -169,7 +169,7 @@ void func_80389CC4(s16 arg0[3], s32 arg1){
D_8038D708[2] += 300.0f;
gcpausemenu_80314AC8(0);
timedFunc_set_2(0.1f, (TFQM2) func_8028F45C, 9, (s32)&D_8038D708);
timedFunc_set_1(0.1f, (TFQM1) gcpausemenu_80314AC8, 1);
timedFunc_set_1(0.1f, (GenMethod_1) gcpausemenu_80314AC8, 1);
func_80311480(ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED, 4, NULL, NULL, NULL, NULL);
D_8037DCB4++;
}//L80389E70