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

misc documentation

Browse Source
This commit is contained in:
Banjo Kazooie
2023-01-30 00:02:44 -06:00
parent da9a0109b5
commit cd146f444f
258 changed files with 2526 additions and 3594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/CCW/code_14B0.c
View File

@@ -45,7 +45,7 @@ void func_803878A0(Actor *this, s32 next_state) {
local->unkC[0] = randf2(-500.0f, 500.0f);
local->unkC[1] = randf2(400.0f, 900.0f);
local->unkC[2] = randf2(-400.0f, 700.0f);
if(ml_vec3f_distance(this->position, local->unkC) > 800.0f)
if(ml_distance_vec3f(this->position, local->unkC) > 800.0f)
break;
}
local->unk8 = randf2(500.0f, 1000.0f);
@@ -90,7 +90,7 @@ void CCW_func_80387A40(Actor *this) {
sp5C[0] = local->unkC[0] - this->position[0];
sp5C[1] = local->unkC[1] - this->position[1];
sp5C[2] = local->unkC[2] - this->position[2];
if (ml_vec3f_distance(this->position, local->unkC) < 500.0f) {
if (ml_distance_vec3f(this->position, local->unkC) < 500.0f) {
ml_vec3f_set_length(sp5C, local->unk8 * 8.0f);
} else {
ml_vec3f_set_length(sp5C, local->unk8 * 2);
@@ -106,7 +106,7 @@ void CCW_func_80387A40(Actor *this) {
}
func_80258A4C(this->position, this->yaw - 90.0f, local->unkC, &sp58, &sp54, &sp50);
this->yaw += 140.0f * sp50 * sp68;
if (ml_vec3f_distance(this->position, local->unkC) < 100.0f) {
if (ml_distance_vec3f(this->position, local->unkC) < 100.0f) {
func_803878A0(this, 1);
}
}

8
src/CCW/code_160.c
View File

@@ -172,7 +172,7 @@ void func_8038687C(Actor *this) {
other->position[1] = this->position[1] + sp6C[1];
other->position[2] = this->position[2] + sp6C[2];
}
if (func_8025773C(&local->unkC, sp88)) {
if (ml_timer_update(&local->unkC, sp88)) {
if ((local->unk4 < 3) && ((local->unk8 + local->unk4) < 10)) {
player_getPosition(sp5C);
for(phi_s0 = 0; phi_s0 < 20; phi_s0++){
@@ -180,10 +180,10 @@ void func_8038687C(Actor *this) {
sp4C[1] = -100.0f;
sp4C[2] = randf2(-500.0f, 900.0f);
if(ml_vec3f_distance(this->position, sp4C) < 400.0f)
if(ml_distance_vec3f(this->position, sp4C) < 400.0f)
continue;
tmp = ml_vec3f_distance(sp5C, sp4C);
tmp = ml_distance_vec3f(sp5C, sp4C);
phi_v0 = (phi_s0 < 0xA) ? 500 : 200;
if(tmp < (f32) phi_v0)
continue;
@@ -204,7 +204,7 @@ void func_8038687C(Actor *this) {
func_803865F4(this, 3);
} else if ((local->unk0 != NULL) && (map_get() == MAP_5A_CCW_SUMMER_ZUBBA_HIVE)) {
player_getPosition(sp40);
if ((ml_vec3f_distance(this->position, sp40) < 300.0f) && (player_getTransformation() == TRANSFORM_1_BANJO)) {
if ((ml_distance_vec3f(this->position, sp40) < 300.0f) && (player_getTransformation() == TRANSFORM_1_BANJO)) {
func_803865F4(this, 2);
}
}

2
src/CCW/code_2270.c
View File

@@ -161,7 +161,7 @@ void chGobiCCW_update(Actor *this) {
if(this->state == 1){
if (!this->unk138_24) {
player_getPosition(sp48);
if (ml_vec3f_distance(this->position, sp48) < 600.0f) {
if (ml_distance_vec3f(this->position, sp48) < 600.0f) {
if (local->unk0->unk2 != 0) {
func_80311480((s32) local->unk0->unk2, 4, NULL, NULL, NULL, NULL);
}

2
src/CCW/code_3310.c
View File

@@ -272,7 +272,7 @@ void CCW_func_80389BFC(Actor *this) {
}
if ((local->unk0->map_id != MAP_43_CCW_SPRING) && ((this->position[0] + 500.0f) < sp4C[0])) {
func_8028F364(this->position, 1110.0f, 200.0f, ACTOR_2A2_CATERPILLAR, &this);
if ((local->unk0->unkE != 0) && (carriedObj_getActorId() == ACTOR_2A2_CATERPILLAR) && (ml_vec3f_distance(this->position, sp4C) < 1010.0f) && (func_8028FC34() != 0)) {
if ((local->unk0->unkE != 0) && (carriedObj_getActorId() == ACTOR_2A2_CATERPILLAR) && (ml_distance_vec3f(this->position, sp4C) < 1010.0f) && (func_8028FC34() != 0)) {
func_8028FA54(D_8038FDE0);
if ((local->unk0->map_id == MAP_44_CCW_SUMMER) && (local->unk4 == 0)) {
func_80311480(0xCD8, 4, NULL, NULL, NULL, NULL);

8
src/CCW/code_3DA0.c
View File

@@ -111,13 +111,13 @@ void chcaterpillar_update(Actor *this){
if(this->state == 1){
func_8033568C(this->unk148, &sp64, &sp60);
player_getPosition(sp74);
if(ml_vec3f_distance(this->position, local->unk0) < 10.0f){
if(ml_distance_vec3f(this->position, local->unk0) < 10.0f){
for(i = 0; i < 10; i++){
local->unk0[0] = randf2(-300.0f, 300.0f) + this->position_x;
local->unk0[1] = this->position_y;
local->unk0[2] = randf2(-300.0f, 300.0f) + this->position_z;
if( !(ml_vec3f_distance(local->unk0, this->position) < 50.0f) && func_80329210(this, local->unk0))
if( !(ml_distance_vec3f(local->unk0, this->position) < 50.0f) && func_80329210(this, local->unk0))
break;
}//L8038A544
if(i == 10){
@@ -150,7 +150,7 @@ void chcaterpillar_update(Actor *this){
}
}//L8038A714
if(ml_vec3f_distance(this->position, sp74) < 50.0f){
if(ml_distance_vec3f(this->position, sp74) < 50.0f){
func_8028F030(ACTOR_2A2_CATERPILLAR);
if(!func_803203FC(0xb2)){
func_80311480(0xcc7, 4, NULL, NULL, NULL, NULL);
@@ -177,7 +177,7 @@ void chcaterpillar_update(Actor *this){
local->unk24 += 3.3333333333333335*sp84;
local->unk24 = (1.0 < local->unk24) ? 1.0 : local->unk24;
func_80255FE4(this->position, local->unkC, local->unk18, local->unk24);
ml_interpolate_vec3f(this->position, local->unkC, local->unk18, local->unk24);
this->position[1] += 50.0f*sinf(local->unk24*3.141592654);
if(1.0 == local->unk24){

2
src/CCW/code_4530.c
View File

@@ -101,7 +101,7 @@ void func_8038AA8C(Actor *this) {
}
player_getPosition(sp54);
if (ml_vec3f_distance(this->position, sp54) < 850.0f) {
if (ml_distance_vec3f(this->position, sp54) < 850.0f) {
func_8038A950(this, 2);
}
}

2
src/CCW/code_4D00.c
View File

@@ -67,7 +67,7 @@ void func_8038B19C(Actor *this) {
func_8038B0F0(this, 1);
}
if ((this->state == 1) && func_8025773C(&local->unk0, tick)) {
if ((this->state == 1) && ml_timer_update(&local->unk0, tick)) {
func_8038B0F0(this, 2);
}

4
src/CCW/code_5540.c
View File

@@ -133,7 +133,7 @@ void chnabnut_update(Actor *this) {
if (this->state == NABNUT_STATE_1_SAD) {
player_getPosition(sp30);
if (!this->unk138_24 && (ml_vec3f_distance(this->position, sp30) < 400.0f)) {
if (!this->unk138_24 && (ml_distance_vec3f(this->position, sp30) < 400.0f)) {
this->unk138_24 = TRUE;
func_80311480(0xCCA, 0xE, this->position, NULL, NULL, NULL);
}
@@ -143,7 +143,7 @@ void chnabnut_update(Actor *this) {
}
if (this->unk138_24 && !func_803114B0()) {
func_8028F364(this->position, 500.0f, 200.0f, ACTOR_2A9_ACORN, &this);
if ((carriedObj_getActorId() == ACTOR_2A9_ACORN) && (ml_vec3f_distance(this->position, sp30) < 300.0f) && func_8028FC34()) {
if ((carriedObj_getActorId() == ACTOR_2A9_ACORN) && (ml_distance_vec3f(this->position, sp30) < 300.0f) && func_8028FC34()) {
func_8028FA54(D_8038F350);
local->returned_acorn_count++;
if (local->returned_acorn_count == 6) {

2
src/CCW/code_5BF0.c
View File

@@ -114,7 +114,7 @@ void func_8038C41C(Actor *this) {
if ((this->marker->unk14_20 == 0x1CB) && (this->state == 2)) {
player_getPosition(sp2C);
if (!this->unk138_24 && (ml_vec3f_distance(this->position, sp2C) < 400.0f)) {
if (!this->unk138_24 && (ml_distance_vec3f(this->position, sp2C) < 400.0f)) {
this->unk138_24 = TRUE;
func_80311480(0xCCD, 0, NULL, NULL, NULL, NULL);
}

4
src/CCW/code_61E0.c
View File

@@ -73,7 +73,7 @@ void func_8038C7A8(Actor *this) {
if (this->state == 1) {
player_getPosition(sp38);
if (ml_vec3f_distance(this->position, sp38) < 50.0f) {
if (ml_distance_vec3f(this->position, sp38) < 50.0f) {
func_8028F030(0x2A9);
FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 25000, this->position, 500, 2500);
CCW_func_8038C6A0(this, 5);
@@ -91,7 +91,7 @@ void func_8038C7A8(Actor *this) {
if (this->state == 3) {
local->unk18 += 3.3333333333333333 * sp44;
local->unk18 = (local->unk18 > 1.0) ? 1.0 : local->unk18;
func_80255FE4(this->position, local->unk0, local->unkC, local->unk18);
ml_interpolate_vec3f(this->position, local->unk0, local->unkC, local->unk18);
this->position[1] += 50.0f * sinf(local->unk18 * BAD_PI);
if (local->unk18 == 1.0) {
CCW_func_8038C6A0(this, 4);

2
src/CCW/code_6620.c
View File

@@ -115,7 +115,7 @@ void func_8038CC4C(Actor *this) {
}
if (!this->unk138_24) {
player_getPosition(sp38);
if (ml_vec3f_distance(this->position, sp38) < 900.0f) {
if (ml_distance_vec3f(this->position, sp38) < 900.0f) {
if (local->unk0->map_id != MAP_46_CCW_WINTER || func_8028F2FC()) {
func_80311480(local->unk0->unk4, 4, NULL, NULL, NULL, NULL);
this->unk138_24 = TRUE;

2
src/CCW/code_6AC0.c
View File

@@ -116,7 +116,7 @@ void func_8038CFB4(Actor *this) {
if (this->state == 1) {
if (!this->unk138_24) {
player_getPosition(sp60);
if (ml_vec3f_distance(this->position, sp60) < 900.0f) {
if (ml_distance_vec3f(this->position, sp60) < 900.0f) {
func_80311480(0xCCF, 4, NULL, NULL, NULL, NULL);
this->unk138_24 = TRUE;
}

2
src/CCW/code_6EC0.c
View File

@@ -68,7 +68,7 @@ void func_8038D368(Actor *this) {
if(!this->unk138_24){
player_getPosition(plyr_pos);
if (ml_vec3f_distance(this->position, plyr_pos) < 600.0f) {
if (ml_distance_vec3f(this->position, plyr_pos) < 600.0f) {
if (!jiggyscore_isCollected(JIGGY_4B_CCW_GNAWTY)) {
func_80311480(local->unk0->unk2, 4, NULL, NULL, NULL, NULL);
} else {

16
src/CCW/code_7120.c
View File

@@ -25,16 +25,16 @@ void CCW_func_8038D510(Actor *this) {
};
ParticleEmitter *pCtrl;
pCtrl = partEmitList_pushNew(6);
pCtrl = partEmitMgr_newEmitter(6);
particleEmitter_setSprite(pCtrl, ASSET_70E_SPRITE_SMOKE_2);
func_802EFA5C(pCtrl, 0.01f, 0.5f);
particleEmitter_setFade(pCtrl, 0.01f, 0.5f);
particleEmitter_setStartingFrameRange(pCtrl, 0, 7);
particleEmitter_setPosition(pCtrl, this->position);
func_802EFB70(pCtrl, 1.0f, 2.0f);
func_802EFB84(pCtrl, 3.0f, 4.0f);
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8038F670);
func_802EFFA8(pCtrl, D_8038F664);
func_802EFEC0(pCtrl, 3.0f, 4.0f);
particleEmitter_setRGB(pCtrl, D_8038F664);
particleEmitter_setParticleLifeTimeRange(pCtrl, 3.0f, 4.0f);
particleEmitter_emitN(pCtrl, 6);
}
@@ -47,18 +47,18 @@ void func_8038D5DC(Actor *this) {
ParticleEmitter *pCtrl;
pCtrl = partEmitList_pushNew(30);
pCtrl = partEmitMgr_newEmitter(30);
func_802EF9F8(pCtrl, 0.6f);
func_802EFA18(pCtrl, 3);
particleEmitter_setModel(pCtrl, 0x896);
particleEmitter_setPosition(pCtrl, this->position);
func_802EFB70(pCtrl, 0.05f, 0.3f);
func_802EFE24(pCtrl,
particleEmitter_setAngularVelocityRange(pCtrl,
-600.0f, -600.0f, -600.0f,
600.0f, 600.0f, 600.0f
);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
func_802EFEC0(pCtrl, 10.0f, 10.0f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 10.0f, 10.0f);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_8038F6A0);
particleEmitter_emitN(pCtrl, 30);
}
@@ -116,7 +116,7 @@ void func_8038D85C(Actor *this) {
return;
}
if(this->state == 2){
if (func_8025773C(&local->unk0, tick) ) {
if (ml_timer_update(&local->unk0, tick) ) {
func_8038D6D8(this, 3);
}
}

4
src/CCW/code_8050.c
View File

@@ -70,7 +70,7 @@ void func_8038E440(ParticleEmitter *pCtrl, Actor *actor, enum asset_e model_id){
};
func_802DABA0(pCtrl, actor->position, actor->scale, model_id);
func_802EFE24(pCtrl,
particleEmitter_setAngularVelocityRange(pCtrl,
-600.0f, -600.0f, -600.0f,
600.0f, 600.0f, 600.0f
);
@@ -85,7 +85,7 @@ void func_8038E4C0(ActorMarker* marker, s32 arg1) {
func_80328B8C(actor, 5, 0.0f, 1);
actor_playAnimationOnce(actor);
FUNC_8030E8B4(SFX_C2_GRUBLIN_EGH, 1.0f, 32000, actor->position, 1250, 2500);
pCtrl = partEmitList_pushNew(1);
pCtrl = partEmitMgr_newEmitter(1);
func_8038E440(pCtrl, actor, ASSET_52D_MODEL_GRUBLIN_HOOD_HAT);
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32,actor->position_x), reinterpret_cast(s32,actor->position_y), reinterpret_cast(s32,actor->position_z));
actor_collisionOff(actor);