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

6
src/FP/code_11F0.c
View File

@@ -124,7 +124,7 @@ void func_8038794C(Actor *this){
if(jiggyscore_isCollected(JIGGY_2A_FP_BOGGY_1)){
if(!jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3) && !jiggyscore_isSpawned(JIGGY_2C_FP_BOGGY_3)){
func_802C3C88(func_80387760, this->marker);
__spawnqueue_add_1(func_80387760, this->marker);
}
this->unk38_31 = 0;
actor_collisionOff(this);
@@ -150,7 +150,7 @@ void func_8038794C(Actor *this){
if(!func_8028ECAC() || func_8028ECAC() == BSGROUP_8_TROT){
if(func_80311480(0xbff, 0x2a, this->position, NULL, NULL, NULL)){
for(i = 0; i <5; i++ ){
timedFunc_set_1(D_80391BEC[i], (TFQM1)func_8038787C, (s32)this->marker);
timedFunc_set_1(D_80391BEC[i], (GenMethod_1)func_8038787C, (s32)this->marker);
}
this->unk138_24 = TRUE;
}
@@ -194,7 +194,7 @@ void func_8038794C(Actor *this){
case 5://L80387D90
if(jiggyscore_isCollected(JIGGY_2A_FP_BOGGY_1)){
this->unk38_31 = 0;
func_802C3C88(func_80387760, this->marker);
__spawnqueue_add_1(func_80387760, this->marker);
}
break;
}

2
src/FP/code_2350.c
View File

@@ -584,7 +584,7 @@ void func_803896FC(Actor *this){
case 1: //L80389F78
if(this->unk38_31 == 2){
if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2)){
func_802C3C88(func_80388F54, this->marker);
__spawnqueue_add_1(func_80388F54, this->marker);
func_8038B9BC();
marker_despawn(this->marker);
}

2
src/FP/code_3E00.c
View File

@@ -120,7 +120,7 @@ void func_8038A384(Actor *this){
: (sp34 == 2) ? 0xC18
: 0xC19;
this->yaw_moving = (f32)func_80329784(this);
this->yaw_ideal = (f32)func_80329784(this);
func_80328FB0(this, 2.0f);
func_8028E668(this->position, 100.0f, -10.0f, 100.0f);

4
src/FP/code_4770.c
View File

@@ -159,7 +159,7 @@ void func_8038AEE0(s32 indx){
}
void func_8038B00C(s32 indx){
func_802C3C88(func_8038AEE0, indx);
__spawnqueue_add_1(func_8038AEE0, indx);
}
void func_8038B034(void){
@@ -211,7 +211,7 @@ void func_8038B1D0(enum jiggy_e jiggy_id){
timed_setCameraToNode(0.0f, 3);
timedFunc_set_0(0.0f, func_8038AEA0);
timedFunc_set_0(0.0f, func_8038B0B8);
timedFunc_set_1(0.1f, (TFQM1) func_8038B130, jiggy_id);
timedFunc_set_1(0.1f, (GenMethod_1) func_8038B130, jiggy_id);
timedFunc_set_0(5.0f, func_8038B190);
timedFunc_set_0(5.0f, func_8038B1C4);
func_80324E88(5.0f);

4
src/FP/code_5CC0.c
View File

@@ -266,7 +266,7 @@ void func_8038C94C(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
if(!func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
func_80328A84(this, 6);
func_802C3C88(func_8038C8F0, this->marker);
__spawnqueue_add_1(func_8038C8F0, this->marker);
}
}
@@ -370,7 +370,7 @@ void func_8038C9A0(Actor *this){
break;
case 5:// 8038CE14
this->yaw_moving = (f32)func_80329784(this);
this->yaw_ideal = (f32)func_80329784(this);
func_80328FB0(this, 8.0f);
if(!func_8038C718(this, this->unk1C[1])){
this->velocity[1] = randf2(14.0f, 20.0f);

10
src/FP/code_6AE0.c
View File

@@ -261,7 +261,7 @@ void func_8038D51C(ActorMarker *marker){
this->unk1C[1] = 1.0f;
func_80324E88(1.7f);
func_80324E38(1.7f, 0);
timedFunc_set_1(2.3f, (TFQM1)func_8038D294, (s32)this->marker);
timedFunc_set_1(2.3f, (GenMethod_1)func_8038D294, (s32)this->marker);
this->velocity[1] = 1.0f;
}
@@ -368,7 +368,7 @@ void func_8038D6C8(Actor *this){
func_8038D324(this);
if(actor_animationIsAt(this, 0.999f))
func_802C3C88((GenMethod_1)func_8038D474, (s32)this->marker);
__spawnqueue_add_1((GenMethod_1)func_8038D474, (s32)this->marker);
if(this->velocity[0] != 0.0f)
break;
@@ -381,7 +381,7 @@ void func_8038D6C8(Actor *this){
item_set(ITEM_6_HOURGLASS, TRUE);
this->unk38_31 = 0xA;
item_set(ITEM_24_TWINKLY_SCORE, this->unk38_31);
func_802C3C88((GenMethod_1)func_8038D41C, (s32)this->marker);
__spawnqueue_add_1((GenMethod_1)func_8038D41C, (s32)this->marker);
this->unk60 = 0.0f;
func_80347A14(0);
func_802FAD64(ITEM_14_HEALTH);
@@ -398,7 +398,7 @@ void func_8038D6C8(Actor *this){
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
func_8038D3D8();
func_80324E38(0.0f, 3);
timedFunc_set_1(1.3f, (TFQM1)func_8038D51C, (s32)this->marker);
timedFunc_set_1(1.3f, (GenMethod_1)func_8038D51C, (s32)this->marker);
timed_setCameraToNode(0.9f, 0xC);
item_set(ITEM_24_TWINKLY_SCORE, this->unk38_31);
func_80347A14(1);
@@ -421,7 +421,7 @@ void func_8038D6C8(Actor *this){
if(0.96 < animctrl_getAnimTimer(this->animctrl)){
if(this->unk60 <= 0.0){
func_802C3C88((GenMethod_1)func_8038D474, (s32)this->marker);
__spawnqueue_add_1((GenMethod_1)func_8038D474, (s32)this->marker);
this->unk60 = 2.9f;
}
else{

2
src/FP/code_7980.c
View File

@@ -222,7 +222,7 @@ void func_8038E094(Actor *this){
case 6: //L8038E698
this->marker->propPtr->unk8_3 = FALSE;
this->yaw_moving = (f32)func_80329784(this);
this->yaw_ideal = (f32)func_80329784(this);
func_80328FB0(this, 12.0f);
break;

10
src/FP/code_8E20.c
View File

@@ -93,7 +93,7 @@ void func_8038F454(Actor *this){
actor_loopAnimation(this);
timed_setCameraToNode(0.0f, 0x2e);
func_80324DBC(0.0f, 0xc1b, 0x2a, this->position, this->marker, func_8038F330, NULL);
timedFunc_set_1(2.5f, (TFQM1)func_8038F3F4, (s32)this->marker);
timedFunc_set_1(2.5f, (GenMethod_1)func_8038F3F4, (s32)this->marker);
}
else{
func_8038F2B8(this);
@@ -111,7 +111,7 @@ void func_8038F560(Actor *this){
}
void func_8038F598(Actor *this, f32 arg1){
this->yaw_moving = func_80329784(this);
this->yaw_ideal = func_80329784(this);
func_80328FB0(this, arg1);
}
@@ -119,7 +119,7 @@ bool func_8038F5D4(Actor *this, f32 arg1[3], f32 arg2, f32 arg3, s32 arg4){
f32 sp24;
sp24 = animctrl_getAnimTimer(this->animctrl);
this->yaw_moving = (f32) func_803297C8(this, arg1);
this->yaw_ideal = (f32) func_803297C8(this, arg1);
func_80328FB0(this, arg3);
if(actor_animationIsAt(this, 0.9f)){
FUNC_8030E8B4(SFX_3F2_UNKNOWN, 0.8f, 24000, this->position, 500, 2000);
@@ -137,7 +137,7 @@ bool func_8038F6C4(Actor *this, f32 arg1[3], f32 arg2){
func_80328C64(this, func_803297C8(this, arg1));
func_80328FB0(this, arg2);
dTheta = this->yaw - this->yaw_moving;
dTheta = this->yaw - this->yaw_ideal;
if(-arg2 <= dTheta && dTheta <= arg2){
return TRUE;
}
@@ -190,7 +190,7 @@ void func_8038F7AC(Actor *this){
this->position[0] = local->unkC[0];\
this->position[1] = local->unkC[1];\
this->position[2] = local->unkC[2];
func_802C3C88(func_8038F758, this->marker);
__spawnqueue_add_1(func_8038F758, this->marker);
local->unk30 = FALSE;
}
}//L8038F910

2
src/FP/code_A240.c
View File

@@ -46,7 +46,7 @@ void func_80390630(Actor *this){
func_8028E668(this->position, 200.0f, -40.0f, 160.0f);
if(this->state == 1){
this->yaw_moving = (f32)func_80329784(this);
this->yaw_ideal = (f32)func_80329784(this);
func_80328FB0(this, 1.0f);
if(!func_803114B0()){

2
src/FP/code_A40.c
View File

@@ -99,7 +99,7 @@ void chXmasTree_update(Actor *this){
sfxsource_setSampleRate(this->unk44_31, 28000);
}
func_802C3BF8(func_80386FB4);
func_802C3C88(func_80386FE0, this->marker);
__spawnqueue_add_1(func_80386FE0, this->marker);
if(func_8031FF1C(0x13)){
func_80386F84(this);
mapSpecificFlags_set(2, FALSE);

2
src/FP/code_A500.c
View File

@@ -72,7 +72,7 @@ void func_80390B2C(ActorMarker *marker){
void func_80390B70(Actor *this){
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 0);
timedFunc_set_1(0.6f, (TFQM1)func_80390ABC, this->marker);
timedFunc_set_1(0.6f, (GenMethod_1)func_80390ABC, this->marker);
timedFunc_set_1(2.5f, func_80390B2C, this->marker);
}