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

documentation: core2/ba/physics

Browse Source
This commit is contained in:
Banjo Kazooie
2024-06-16 22:36:36 -05:00
parent 8fe5c3b4d1
commit 092de6aae3
208 changed files with 2342 additions and 2163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MM/ch/chimpystump.c
View File

@@ -44,7 +44,7 @@ void chchimpystump_update(Actor *this){
{
case 1:
if(mapSpecificFlags_get(0))
func_80328A84(this, 2);
subaddie_set_state(this, 2);
_chchimpystump_80386CA0(this);
break;
@@ -53,7 +53,7 @@ void chchimpystump_update(Actor *this){
this->position_y += 2.5;
if(this->unk28 <= this->position_y){
this->position_y = this->unk28;
func_80328A84(this, 3);
subaddie_set_state(this, 3);
func_802BB41C(1);
func_80244C78(0);
}

32
src/MM/ch/conga.c
View File

@@ -17,7 +17,7 @@
void func_80328FB0(Actor *, f32);
void func_80328B8C(Actor*, s32, f32, s32);
void subaddie_set_state_with_direction(Actor*, s32, f32, s32);
void func_802C8F70(f32);
void timed_exitStaticCamera(f32);
Actor *func_8032811C(s32 actor_id, s32 position[3], s32 yaw);
@@ -78,7 +78,7 @@ int func_80386ED0(Actor * this){
}
void func_80386FB0(Actor *this){
func_80328C64(this, func_80329784(this));
subaddie_set_ideal_yaw(this, func_80329784(this));
func_80328FB0(this, 3.0f);
}
@@ -92,7 +92,7 @@ void func_80386FE8(void){
}
void func_8038708C(Actor *this, s32 anim_id){
func_80328B8C(this, anim_id, 0.0f, 1);
subaddie_set_state_with_direction(this, anim_id, 0.0f, 1);
func_8030E58C(SFX_24_KONGA_NOISE_3, randf2(0.9f, 1.1f));
}
@@ -128,7 +128,7 @@ void func_80387168(ActorMarker *marker, ActorMarker *other_marker){
if( actorPtr->unk38_31 == 3
&& !jiggyscore_isCollected(JIGGY_A_MM_CONGA)
){
func_80328B8C(actorPtr, 8, 0 ,1);
subaddie_set_state_with_direction(actorPtr, 8, 0 ,1);
timed_setStaticCameraToNode(0.0f, 0x10);
func_80324E38(0.0f, 3);
FUNC_8030E624(SFX_84_GOBI_CRYING, 0.8f, 32750);
@@ -238,7 +238,7 @@ void func_803876D0(Actor *this){
){
if(this->state > 3 && this->state < 8){
actor_loopAnimation(this);
func_80328B8C(this, 1, 0.76f, 1);
subaddie_set_state_with_direction(this, 1, 0.76f, 1);
}
return;
}
@@ -269,7 +269,7 @@ void func_803876D0(Actor *this){
};
}//L80387A18
if(actor_animationIsAt(this, 0.66f)){
func_80328BD4(this, 6, 0, 1, 0.38f);
subaddie_maybe_set_state_position_direction(this, 6, 0, 1, 0.38f);
}
if( sp3C
&& func_8028ECAC() != 1
@@ -278,14 +278,14 @@ void func_803876D0(Actor *this){
&& !func_8032A9E4(((ActorLocal_Conga *)&this->local)->unk10, ((ActorLocal_Conga *)&this->local)->unk18, ((ActorLocal_Conga *)&this->local)->unk1C)
&& !func_803872EC()
){
func_80328B8C(this, 4, 0.0f, 1);
subaddie_set_state_with_direction(this, 4, 0.0f, 1);
}//L80387AC0
if( func_8028ECAC() != 1
&& func_80386ED0(this)
&& this->unk38_31 != 0
&& !func_803872EC()
){
func_80328B8C(this, 7, 0.0f, 1);
subaddie_set_state_with_direction(this, 7, 0.0f, 1);
}
break;
@@ -296,12 +296,12 @@ void func_803876D0(Actor *this){
if( animctrl_isPlayedForwards(this->animctrl) == TRUE
&& actor_animationIsAt(this, 0.0f)
){
func_80328B8C(this, 5, 0.0f, 1);
subaddie_set_state_with_direction(this, 5, 0.0f, 1);
}
else if( !animctrl_isPlayedForwards(this->animctrl)
&& actor_animationIsAt(this, 0.001f)
){
func_80328B8C(this, 1, 0.76f, 1);
subaddie_set_state_with_direction(this, 1, 0.76f, 1);
}
break;
@@ -310,7 +310,7 @@ void func_803876D0(Actor *this){
actor_loopAnimation(this);
func_80386FE8();
if( actor_animationIsAt(this, 0.99f)){
func_80328BD4(this, 6, 0.999f, 0, sp3C ? 1.0 : 0.4);
subaddie_maybe_set_state_position_direction(this, 6, 0.999f, 0, sp3C ? 1.0 : 0.4);
}//L80387C30
if( actor_animationIsAt(this, 0.9f)
|| actor_animationIsAt(this, 0.4f)
@@ -330,21 +330,21 @@ void func_803876D0(Actor *this){
|| !timedFuncQueue_is_empty()
|| func_803872EC()
){
func_80328B8C(this, 1, 0.0f, 1);
subaddie_set_state_with_direction(this, 1, 0.0f, 1);
}
break;
case 2: //L80387D0C
actor_playAnimationOnce(this);
if(actor_animationIsAt(this, 0.99f)){
func_80328B8C(this, 1, 0.0f, 1);
subaddie_set_state_with_direction(this, 1, 0.0f, 1);
}
break;
case 8: //L80387D4C
actor_playAnimationOnce(this);
if(actor_animationIsAt(this, 0.99f)){
func_80328B8C(this, 3, 0.0f, 1);
subaddie_set_state_with_direction(this, 3, 0.0f, 1);
func_80311480(ASSET_B38_TEXT_CONGA_DEFEAT, 0xe, this->position, this->marker, func_80387370, NULL);
}
break;
@@ -352,7 +352,7 @@ void func_803876D0(Actor *this){
case 3: //L80387DB8
actor_loopAnimation(this);
if(jiggyscore_isCollected(JIGGY_A_MM_CONGA)){
func_80328B8C(this, 1, 0.0f, 1);
subaddie_set_state_with_direction(this, 1, 0.0f, 1);
}
break;
@@ -360,7 +360,7 @@ void func_803876D0(Actor *this){
if(this->unk10_12 == 0){
if(actor_animationIsAt(this, 0.97f)){
((ActorLocal_Conga *)&this->local)->unkC = 1;
func_80328B8C(this, 6, 0.0f, 1);
subaddie_set_state_with_direction(this, 6, 0.0f, 1);
}
}
break;

4
src/MM/ch/grublin.c
View File

@@ -21,7 +21,7 @@ typedef struct chgrublin_s{
void (*unk34)(ActorMarker *, s32);
}ActorLocal_Grublin;
void func_80328B8C(Actor *, s32, f32, s32);
void subaddie_set_state_with_direction(Actor *, s32, f32, s32);
void func_80388A80(Actor *);
@@ -51,7 +51,7 @@ void func_803889A0(ActorMarker *this, s32 arg1){
Actor *actorPtr;
actorPtr = marker_getActor(this);
func_80328B8C(actorPtr, 5, 0.0f, 1);
subaddie_set_state_with_direction(actorPtr, 5, 0.0f, 1);
actor_playAnimationOnce(actorPtr);
FUNC_8030E8B4(SFX_C2_GRUBLIN_EGH, 1.0f, 32000, actorPtr->position, 1250, 2500);

4
src/MM/ch/hut.c
View File

@@ -82,7 +82,7 @@ void chhut_update(Actor *this){
sp3C[2] = this->position_z;
sp3C[1] += 125.0;
func_8030E484(SFX_5B_HEAVY_STUFF_FALLING);
func_80328A84(this, 1);
subaddie_set_state(this, 1);
actor_playAnimationOnce(this);
__spawnQueue_add_1((GenFunction_1)func_803869EC, (s32)this->marker);
func_802C8F70(this->yaw);
@@ -98,7 +98,7 @@ void chhut_update(Actor *this){
case 1: //L80386C2C
if(animctrl_getAnimTimer(this->animctrl) > 0.99){
animctrl_setTransitionDuration(this->animctrl, 0.0f);
func_80328A84(this, 2);
subaddie_set_state(this, 2);
this->position_y -= 160.0f;
}
break;

10
src/MM/ch/lmonkey.c
View File

@@ -4,7 +4,7 @@
void func_8028E668(f32 *, f32, f32, f32);
int actor_animationIsAt(Actor *, f32);
void func_80328B8C(Actor *, s32, f32, s32);
void subaddie_set_state_with_direction(Actor *, s32, f32, s32);
void timed_exitStaticCamera(f32);
void func_80324E38(f32,s32);
void timed_setStaticCameraToNode(f32, s32);
@@ -70,7 +70,7 @@ void __chLMonkey_spawnJiggy(s32 x, s32 y, s32 z){
void __chLMonkey_complete(ActorMarker *marker, enum asset_e arg1, s32 arg2){
Actor * actor = marker_getActor(marker);
mapSpecificFlags_set(4,1);
func_80328A84(actor, 3);
subaddie_set_state(actor, 3);
timed_setStaticCameraToNode(2.3f, 0x12);
timedFunc_set_3(2.9f,__chLMonkey_spawnJiggy, actor->position_x, actor->position_y + 150.0f, actor->position_z);
timed_exitStaticCamera(4.3f);
@@ -90,7 +90,7 @@ void chLMonkey_update(Actor *this){
switch(this->state){
case 1://L80388690
if(mapSpecificFlags_get(2)){
func_80328A84(this, 4);
subaddie_set_state(this, 4);
if(!jiggyscore_isCollected(JIGGY_9_MM_CHIMPY)){
func_80311480(ASSET_B40_DIALOG_CHIMPY_COMPLETE, 0xE, this->position, this->marker, __chLMonkey_complete, NULL);
}else{//L803886E8
@@ -107,14 +107,14 @@ void chLMonkey_update(Actor *this){
this->unk138_24 = 1;
}//L80388774
actor_loopAnimation(this);
func_80328BD4(this, 2, 0.0f, -1, 0.02f);
subaddie_maybe_set_state_position_direction(this, 2, 0.0f, -1, 0.02f);
}
break;
case 2: //L803887A4
func_80388300(&this);
actor_playAnimationOnce(this);
if(actor_animationIsAt(this, 0.99f)){
func_80328B8C(this,1,0.0f,-1);
subaddie_set_state_with_direction(this,1,0.0f,-1);
}
break;
case 4: //L803887E4

19
src/MM/code_24C0.c
View File

@@ -2,6 +2,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "actor.h"
#include "prop.h"
@@ -16,13 +17,13 @@ extern ActorInfo chorangepadInfo;
extern ActorInfo chlmonkeyInfo;
void MM_func_803888B0(void){
spawnableActorList_add( &chhutInfo, actor_new, 0X400);
spawnableActorList_add( &chchimpystump, actor_new, 0x0);
spawnableActorList_add( &chgrublinInfo, actor_new, 0X2000121);
spawnableActorList_add( &chcongaInfo, actor_new, 0X2000160);
spawnableActorList_add( &chorangeInfo, actor_new, 0x0);
spawnableActorList_add( &chjujuhitboxInfo, actor_new, 0x0);
spawnableActorList_add( &chjujuInfo, actor_new, 0X4004);
spawnableActorList_add( &chorangepadInfo, actor_new, 0X40);
spawnableActorList_add( &chlmonkeyInfo, actor_new, 0X100);
spawnableActorList_add( &chhutInfo, actor_new, ACTOR_FLAG_UNKNOWN_10);
spawnableActorList_add( &chchimpystump, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add( &chgrublinInfo, actor_new, ACTOR_FLAG_UNKNOWN_25 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_0);
spawnableActorList_add( &chcongaInfo, actor_new, ACTOR_FLAG_UNKNOWN_25 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_5);
spawnableActorList_add( &chorangeInfo, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add( &chjujuhitboxInfo, actor_new, ACTOR_FLAG_NONE);
spawnableActorList_add( &chjujuInfo, actor_new, ACTOR_FLAG_UNKNOWN_14 | ACTOR_FLAG_UNKNOWN_2);
spawnableActorList_add( &chorangepadInfo, actor_new, ACTOR_FLAG_UNKNOWN_6);
spawnableActorList_add( &chlmonkeyInfo, actor_new, ACTOR_FLAG_UNKNOWN_8);
}