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

16
src/core2/ch/bigbutt.c
View File

@@ -66,7 +66,7 @@ void func_802C5F44(Actor *this){
void func_802C5F94(Actor *this){
func_80328A84(this, 2);
func_802C5E80(this);
func_80328CEC(this, (s32)this->yaw_moving, 135, 175);
func_80328CEC(this, (s32)this->yaw_ideal, 135, 175);
this->unk38_31 = 150;
}
@@ -162,13 +162,13 @@ void func_802C6240(Actor *this){
func_80328CEC(this, (s32)this->yaw, 90, 150);
}//L802C64EC
if(!(func_8023DB5C() & 0xf))
func_80328CEC(this, (s32)this->yaw_moving, 10, 20);
func_80328CEC(this, (s32)this->yaw_ideal, 10, 20);
if(!(func_8023DB5C() & 0x7))
func_80328BD4(this, 1, 0.16f, 1, 0.02f);
if( !(func_8023DB5C() & 0xf)
&& func_80329078(this, (s32)this->yaw_moving, 150)
&& func_80329078(this, (s32)this->yaw_ideal, 150)
&& func_80328B38(this, 3, 0.13f)
){
this->unk28 = randf2(7.1f, 8.4f);
@@ -178,7 +178,7 @@ void func_802C6240(Actor *this){
case 0x8: //L802C65D0
func_802C5F44(this);
this->yaw_moving = func_80329784(this);
this->yaw_ideal = func_80329784(this);
func_80328FB0(this, 4.0f);
if(func_80329480(this))
func_80328A84(this, 6);
@@ -198,7 +198,7 @@ void func_802C6240(Actor *this){
case 0x6: //L802C66D0
animctrl_setDuration(this->animctrl, D_80366010[6].duration - (3 - this->unk10_12)*0.1085);
this->yaw_moving = (f32)func_80329784(this);
this->yaw_ideal = (f32)func_80329784(this);
if(!func_803294B4(this, 0x21)){
func_80328A84(this, 8);
}
@@ -224,13 +224,13 @@ void func_802C6240(Actor *this){
if(30.0f < this->unk28)
this->unk28 = 30.0f;
this->yaw_moving = (f32)func_80329784(this);
this->yaw_ideal = (f32)func_80329784(this);
func_80328FB0(this, 9.0f);
if(!func_80329030(this, 0))
func_802C5F94(this);
if(func_80329530(this, 320)){
if(func_80329078(this, (s32)this->yaw_moving,200)){
if(func_80329078(this, (s32)this->yaw_ideal,200)){
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_ONCE);
func_80328A84(this, 4);
this->unk28 += 5.7;
@@ -252,7 +252,7 @@ void func_802C6240(Actor *this){
case 0x4: //L802C6A14
if(animctrl_getAnimTimer(this->animctrl) < 0.99){
this->yaw_moving = (f32)func_80329784(this);
this->yaw_ideal = (f32)func_80329784(this);
func_80328FB0(this, 1.0f);
}
func_80329030(this, 0);

8
src/core2/ch/code_5AB30.c
View File

@@ -141,13 +141,13 @@ void func_802E1DE8(Actor *this){
}
void func_802E1E20(Actor *this, f32 arg1){
this->yaw_moving = func_80329784(this);
this->yaw_ideal = func_80329784(this);
func_80328FB0(this, 6.0f);
}
int func_802E1E5C(Actor *this, s32 arg1){
f32 f0;
f0 = this->yaw - this->yaw_moving;
f0 = this->yaw - this->yaw_ideal;
if((f0 < arg1) && (-arg1 < f0)){
return 1;
}
@@ -183,7 +183,7 @@ void func_802E1FD0(ActorMarker *marker, ActorMarker *other_marker){
FUNC_8030E8B4(SFX_3EA_UNKNOWN, 1.0f, 30000, actor->position, 1500, 4500);
FUNC_8030E8B4(SFX_2F_ORANGE_SPLAT, 1.0f, 30000, actor->position, 1500, 4500);
func_802C3C88((GenMethod_1)func_802E1BD0, (s32)actor->marker);
__spawnqueue_add_1((GenMethod_1)func_802E1BD0, (s32)actor->marker);
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK)
func_8038A978();
func_802E1CB8(actor->position, 0xC);
@@ -309,7 +309,7 @@ void func_802E20E8(Actor *this){
&& local->unkB
){
func_8030E878(SFX_8F_SNOWBALL_FLYING, randf2(0.95f, 1.05f), 30000, this->position, 800.0f, 3050.0f);
func_802C3C88((GenMethod_1)func_802E1B24, (s32)this->marker);
__spawnqueue_add_1((GenMethod_1)func_802E1B24, (s32)this->marker);
local->unk9 = FALSE;
}

2
src/core2/ch/gameSelect.c
View File

@@ -298,7 +298,7 @@ void func_802C4C14(Actor *this){
return;
if(!this->initialized){
func_802C3C88(func_802C4BB4, this->marker);
__spawnqueue_add_1(func_802C4BB4, this->marker);
func_802C7318(this);
this->unk130 = func_802C71F0;
if(sp84 == 0){

8
src/core2/ch/ghost.c
View File

@@ -183,7 +183,7 @@ void func_8035B824(Actor *this){
func_80328B8C(this, 4, 0.01f, 1);
actor_loopAnimation(this);
func_80328CEC(this, (s32)this->yaw_moving, 0xA, 0x1E);
func_80328CEC(this, (s32)this->yaw_ideal, 0xA, 0x1E);
this->unk28 = 4.0f;
local->unk4 = randf2(2.0f, 4.5f);
@@ -193,7 +193,7 @@ void func_8035B824(Actor *this){
void func_8035B8A8(Actor *this){
func_80328B8C(this, 5, 0.01f, 1);
actor_loopAnimation(this);
func_80328CEC(this, (s32)this->yaw_moving, 0xE1, 0x87);
func_80328CEC(this, (s32)this->yaw_ideal, 0xE1, 0x87);
}
void func_8035B900(Actor *this){
@@ -232,7 +232,7 @@ void func_8035B900(Actor *this){
}
break;
case 2: //L8035BA98
this->yaw_moving = func_80329784(this);
this->yaw_ideal = func_80329784(this);
func_8035B444(this, 4.0f);
if(actor_animationIsAt(this, 0.99f)){
func_8035B75C(this);
@@ -243,7 +243,7 @@ void func_8035B900(Actor *this){
if((sp30 & 0x3F) == 7 && randf() < 0.7){
func_8030E878(0x3F4, randf2(1.0f, 1.2f), 32000, this->position, this->scale*400.0f, this->scale*1800.0f);
}//L8035BB6C
this->yaw_moving = func_80329784(this);
this->yaw_ideal = func_80329784(this);
if(!func_8035B3E4(this) || !func_8035B444(this, 5.0f)){
func_8035B674(this);
}

2
src/core2/ch/icecube.c
View File

@@ -224,7 +224,7 @@ void __chicecube_die(ActorMarker *marker, ActorMarker *other_marker){
func_8035A04C(actor->position, 12, ASSET_505_MODEL_ICECUBE_CHUNK, actor->scale);
func_8035A228(actor->position, 6, ASSET_700_SPRITE_DUST, actor->scale);
if(actor->unkF4_8 != 1){
func_802C3C88(__chicecube_spawnHalfCubes, actor->marker);
__spawnqueue_add_1(__chicecube_spawnHalfCubes, actor->marker);
}
marker_despawn(actor->marker);
}

4
src/core2/ch/jiggy.c
View File

@@ -83,7 +83,7 @@ void func_802C7B8C(Actor *this, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5
timedFunc_set_4(0.6f, (TFQM4)func_802C7AF8, (s32)this->position[0], (s32)this->position[1], (s32)this->position[2], arg4);
timedFunc_set_2(0.6f, (TFQM2)func_802C7AB0, (s32)this->marker, arg5);
timedFunc_set_0(1.0f, (TFQM0)func_802BE720);
timedFunc_set_1(3.9f, (TFQM1)func_802C7B6C, arg4);
timedFunc_set_1(3.9f, (GenMethod_1)func_802C7B6C, arg4);
mapSpecificFlags_set(arg1, 1);
}
}
@@ -95,7 +95,7 @@ void func_802C7CA4(Actor *this){
if(360.0f <= this->yaw){
this->yaw -= 360.0f;
}
this->yaw_moving = this->yaw;
this->yaw_ideal = this->yaw;
}
//chjiggy_draw

8
src/core2/ch/mole.c
View File

@@ -324,7 +324,7 @@ void func_802D9D60(Actor *this){
this->unk38_0 = TRUE;
nodeprop_getPosition(other, this->unk1C);
}
func_802C3C88(func_802D9C54, this->marker);
__spawnqueue_add_1(func_802D9C54, this->marker);
this->marker->propPtr->unk8_3 = FALSE;
this->marker->collidable = FALSE;
this->initialized = TRUE;
@@ -345,7 +345,7 @@ void func_802D9D60(Actor *this){
func_8024E55C(0, sp50);//get face buttons press counters
switch(this->state){
case 1://L802D9F70
this->yaw_moving = func_80329784(this);
this->yaw_ideal = func_80329784(this);
func_80328FB0(this, 4.0f);
if(func_8028F20C() && func_8028F0D4() && !func_8028EC04()){
if( this->unkF4_8 == 0x12
@@ -370,7 +370,7 @@ void func_802D9D60(Actor *this){
break;
case 2://L802DA0A0
this->marker->propPtr->unk8_3 = TRUE;
this->yaw_moving = func_80329784(this);
this->yaw_ideal = func_80329784(this);
func_80328FB0(this, 4.0f);
if( 0.0 < animctrl_getAnimTimer(this->animctrl)
&& animctrl_getAnimTimer(this->animctrl) < 0.16
@@ -396,7 +396,7 @@ void func_802D9D60(Actor *this){
}
break;
case 3://L802DA210
this->yaw_moving = func_80329784(this);
this->yaw_ideal = func_80329784(this);
func_80328FB0(this, 4.0f);
if( ( actor_animationIsAt(this, 0.37f)
|| actor_animationIsAt(this, 0.66f)