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

2
src/RBB/code_0.c
View File

@@ -114,7 +114,7 @@ void func_803866F4(Actor *this, s32 arg1){
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
func_80324E38(0.0f, 3);
timedFunc_set_2(0.5f, (TFQM2) func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
timedFunc_set_1(1.0f, (TFQM1) func_803865D0, this->marker);
timedFunc_set_1(1.0f, (GenMethod_1) func_803865D0, this->marker);
}//L803867D4
if(arg1 == 4){
if(local->unk8 == 1 && D_80390074[local->unk4].unk2 > 0){

4
src/RBB/code_1570.c
View File

@@ -197,7 +197,7 @@ void func_80388154(ActorMarker *marker){
timed_playSfx(0.0f, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 0x7fc6);
timedFunc_set_2(1.2f, (TFQM2) func_80387B8C, 0x19f, 0);
timed_setCameraToNode(1.2f, 8);
timedFunc_set_1(1.5f, (TFQM1) func_80387F88, (s32) actor->marker);
timedFunc_set_1(1.5f, (GenMethod_1) func_80387F88, (s32) actor->marker);
}
void func_803881E8(Actor *this, s32 arg1){
@@ -208,7 +208,7 @@ void func_803881E8(Actor *this, s32 arg1){
timedFunc_set_2(0.1f, (TFQM2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
func_80324E38(0.2f, 3);
timed_setCameraToNode(1.1f, 7);
timedFunc_set_1(1.6f, (TFQM1)func_80388154, (s32)this->marker);
timedFunc_set_1(1.6f, (GenMethod_1)func_80388154, (s32)this->marker);
levelSpecificFlags_set(0x2D, 1);
}
}

2
src/RBB/code_3CB0.c
View File

@@ -49,7 +49,7 @@ void func_8038A0A0(Actor *this, s32 arg1){
if(this->state == 1){
levelSpecificFlags_set(local->unk0->unk8, 1);
func_803228D8();
timedFunc_set_1(1.1f, (TFQM1)func_8028F9DC, 2);
timedFunc_set_1(1.1f, (GenMethod_1)func_8028F9DC, 2);
timedFunc_set_3(1.1f, (TFQM3)func_802E4078, MAP_31_RBB_RUSTY_BUCKET_BAY, 0, 0);
}else{
levelSpecificFlags_set(local->unk0->unkA, 1);

2
src/RBB/code_9670.c
View File

@@ -28,7 +28,7 @@ void func_8038FA9C(Actor *this, s32 arg1){
func_80324E38(0.0f, 3);
timedFunc_set_2(1.0f, (TFQM2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
timed_setCameraToNode(1.8f, 1);
timedFunc_set_1(2.0f, (TFQM1) func_8038FA60, (s32)this->marker);
timedFunc_set_1(2.0f, (GenMethod_1) func_8038FA60, (s32)this->marker);
func_80324E88(5.0f);
func_80324E38(5.0f, 0);
}

2
src/RBB/code_99F0.c
View File

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

4
src/RBB/code_CA0.c
View File

@@ -102,13 +102,13 @@ void func_80387488(ActorMarker *marker){
if(-50.0f < sp1C[1] && sp1C[1] < 600.0f){
sp1C[1] = 0;
if(ml_vec3f_distance(&sp1C, &D_80390264) < 500.0f){
timedFunc_set_1(1.0f, (TFQM1) func_80387488, (s32)actor->marker);
timedFunc_set_1(1.0f, (GenMethod_1) func_80387488, (s32)actor->marker);
return;
}
}
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 6);
timedFunc_set_1(0.5f, (TFQM1) func_80387308, (s32) actor->marker);
timedFunc_set_1(0.5f, (GenMethod_1) func_80387308, (s32) actor->marker);
}
void func_8038756C(Actor *this, s32 arg1){