misc documentation

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

View File

@@ -1,6 +1,8 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "core2/particle.h"
extern void func_8024C5CC(f32 (*)[3]);
extern void func_80328B8C(Actor *, s32, f32, s32);
@@ -72,27 +74,27 @@ struct31s D_80391968 = {
/* .code */
void fight_func_8038C2C0(f32 position[3], s32 count, enum asset_e id, f32 arg3){
ParticleEmitter * temp_s0 = partEmitList_pushNew(count);
ParticleEmitter * temp_s0 = partEmitMgr_newEmitter(count);
f32 sp24;
particleEmitter_setSprite(temp_s0, id);
particleEmitter_setStartingFrameRange(temp_s0, 1, 6);
particleEmitter_setPosition(temp_s0, position);
func_802EFE24(temp_s0, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
particleEmitter_setAngularVelocityRange(temp_s0, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
func_802EFB70(temp_s0, arg3*0.35, arg3*0.65);
func_802EFB84(temp_s0, 0.0f, 0.0f);
func_802EF9F8(temp_s0, 0.5f);
func_802EFA18(temp_s0, 3);
particleEmitter_setSpawnIntervalRange(temp_s0, 0.0f, 0.01f);
func_802EFEC0(temp_s0, 3.0f, 3.3f);
func_802EFA5C(temp_s0, 0.0f, 0.35f);
particleEmitter_setParticleLifeTimeRange(temp_s0, 3.0f, 3.3f);
particleEmitter_setFade(temp_s0, 0.0f, 0.35f);
particleEmitter_setPositionVelocityAndAccelerationRanges(temp_s0, &D_803918D0);
func_802EFA70(temp_s0, 4);
particleEmitter_setDrawMode(temp_s0, 4);
particleEmitter_emitN(temp_s0, count);
}
void func_8038C424(f32 position[3], s32 count, enum asset_e id, f32 arg3){
ParticleEmitter * temp_s0 = partEmitList_pushNew(count);
ParticleEmitter * temp_s0 = partEmitMgr_newEmitter(count);
f32 sp24;
particleEmitter_setSprite(temp_s0, id);
@@ -104,9 +106,9 @@ void func_8038C424(f32 position[3], s32 count, enum asset_e id, f32 arg3){
func_802EFB70(temp_s0, sp24, sp24);
func_802EFB84(temp_s0, sp24, sp24);
particleEmitter_setSpawnIntervalRange(temp_s0, 0.0f, 0.0f);
func_802EFEC0(temp_s0, (arg3*0.5), (arg3*0.5)*1.5);
func_802EFA5C(temp_s0, 0.7f, 0.8f);
func_802EFA70(temp_s0, 0x10);
particleEmitter_setParticleLifeTimeRange(temp_s0, (arg3*0.5), (arg3*0.5)*1.5);
particleEmitter_setFade(temp_s0, 0.7f, 0.8f);
particleEmitter_setDrawMode(temp_s0, PART_EMIT_NO_DEPTH);
particleEmitter_emitN(temp_s0, count);
}
@@ -318,7 +320,7 @@ void func_8038C840(Actor *this){
}
void func_8038CED8(f32 arg0[3], enum asset_e model_id, f32 arg2, f32 arg3){
ParticleEmitter *s0 = partEmitList_pushNew(1);
ParticleEmitter *s0 = partEmitMgr_newEmitter(1);
f32 sp40[3];
f32 sp34[3];
@@ -339,7 +341,7 @@ void func_8038CED8(f32 arg0[3], enum asset_e model_id, f32 arg2, f32 arg3){
D_80391968.unk8[0] *= arg2;
D_80391968.unk8[1] *= arg2;
func_802EFB98(s0, &D_80391968);
func_802EFA70(s0, 0x10);
particleEmitter_setDrawMode(s0, PART_EMIT_NO_DEPTH);
func_802EFA78(s0, 1);
particleEmitter_emitN(s0, 1);
}

View File

@@ -37,10 +37,10 @@ void chbossjinjobase_spawnStoneJinjo(ActorMarker *arg0) {
}
void func_8038D2EC(f32 arg0[3], s32 arg1) {
ParticleEmitter *temp_v0 = partEmitList_pushNew(arg1);
ParticleEmitter *temp_v0 = partEmitMgr_newEmitter(arg1);
particleEmitter_setSprite(temp_v0, ASSET_70E_SPRITE_SMOKE_2);
func_802EFFA8(temp_v0, D_803919B4);
particleEmitter_setRGB(temp_v0, D_803919B4);
particleEmitter_setStartingFrameRange(temp_v0, 0, 7);
particleEmitter_setPosition(temp_v0, arg0);
particleEmitter_setParticleSpawnPositionRange(temp_v0, -90.0f, 0.0f, -80.0f, 80.0f, 60.0f, 80.0f);

View File

@@ -331,10 +331,10 @@ void func_80386698(f32 arg0) {
void chfinalboss_spawnBroomstickParticles(f32 position[3], enum asset_e model_id, s32 n) {
ParticleEmitter *temp_s0;
temp_s0 = partEmitList_pushNew(n);
temp_s0 = partEmitMgr_newEmitter(n);
particleEmitter_setModel(temp_s0, model_id);
particleEmitter_setPosition(temp_s0, position);
func_802EFE24(temp_s0, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
particleEmitter_setAngularVelocityRange(temp_s0, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
particleEmitter_setPositionVelocityAndAccelerationRanges(temp_s0, &D_80391564);
func_802EFB98(temp_s0, &D_8039153C);
func_802EFA78(temp_s0, 1);
@@ -344,17 +344,17 @@ void chfinalboss_spawnBroomstickParticles(f32 position[3], enum asset_e model_id
void func_8038679C(f32 arg0[3], s32 arg1, f32 arg2[4]) {
ParticleEmitter *temp_s0;
temp_s0 = partEmitList_pushNew(arg1);
temp_s0 = partEmitMgr_newEmitter(arg1);
particleEmitter_setSprite(temp_s0, ASSET_70E_SPRITE_SMOKE_2);
func_802EFFA8(temp_s0, D_803915AC);
particleEmitter_setRGB(temp_s0, D_803915AC);
particleEmitter_setStartingFrameRange(temp_s0, 0, 7);
particleEmitter_setPosition(temp_s0, arg0);
particleEmitter_setPositionAndVelocityRanges(temp_s0, &D_803915B8);
func_802EFB70(temp_s0, arg2[0], arg2[1]);
func_802EFB84(temp_s0, arg2[2], arg2[3]);
particleEmitter_setSpawnIntervalRange(temp_s0, 0.0f, 0.01f);
func_802EFEC0(temp_s0, 2.8f, 3.2f);
func_802EFA5C(temp_s0, 0.3f, 0.4f);
particleEmitter_setParticleLifeTimeRange(temp_s0, 2.8f, 3.2f);
particleEmitter_setFade(temp_s0, 0.3f, 0.4f);
func_802EFA78(temp_s0, 1);
particleEmitter_emitN(temp_s0, arg1);
}
@@ -362,10 +362,10 @@ void func_8038679C(f32 arg0[3], s32 arg1, f32 arg2[4]) {
void func_803868A0(f32 arg0[3], s32 arg1[3]) {
ParticleEmitter * temp_s0;
temp_s0 = partEmitList_pushNew(1);
temp_s0 = partEmitMgr_newEmitter(1);
particleEmitter_setSprite(temp_s0, ASSET_45A_SPRITE_GREEN_GLOW);
particleEmitter_setStartingFrameRange(temp_s0, 2, 2);
func_802EFFA8(temp_s0, arg1);
particleEmitter_setRGB(temp_s0, arg1);
particleEmitter_setPosition(temp_s0, arg0);
func_802EFA78(temp_s0, 1);
particleEmitter_setPositionAndVelocityRanges(temp_s0, &D_80391618);
@@ -375,7 +375,7 @@ void func_803868A0(f32 arg0[3], s32 arg1[3]) {
void func_80386934(f32 position[3], enum asset_e sprite_id) {
ParticleEmitter * temp_s0;
temp_s0 = partEmitList_pushNew(1);
temp_s0 = partEmitMgr_newEmitter(1);
particleEmitter_setSprite(temp_s0, sprite_id);
particleEmitter_setStartingFrameRange(temp_s0, 1, 6);
particleEmitter_setPosition(temp_s0, position);
@@ -631,7 +631,7 @@ bool func_80387470(Actor *this, f32 arg1[3], f32 v_max, f32 arg3, f32 arg4, f32
diff[2] = arg1[2] - this->position[2];
if (arg5 != 0.00f) {
if (ml_vec3f_distance(this->position, arg1) < arg5) {
if (ml_distance_vec3f(this->position, arg1) < arg5) {
ml_vec3f_set_length(diff, arg3 * 4.00f);
} else {
ml_vec3f_set_length(diff, arg3 * 1.00f);
@@ -660,7 +660,7 @@ bool func_80387470(Actor *this, f32 arg1[3], f32 v_max, f32 arg3, f32 arg4, f32
this->yaw += (arg4 * temp.pos_x * dt);
if (ml_vec3f_distance(this->position, arg1) < arg6) {
if (ml_distance_vec3f(this->position, arg1) < arg6) {
return TRUE;
}
return FALSE;
@@ -1045,7 +1045,7 @@ void chfinalboss_phase1_update(ActorMarker *marker) {
case 3:
func_80386600(this->marker, 0);
func_803869BC(this);
sp50 = ml_map_f(ml_vec3f_distance(this->position, this->unk1C), 300.0f, 1000.0f, 100.0f, 1000.0f);
sp50 = ml_map_f(ml_distance_vec3f(this->position, this->unk1C), 300.0f, 1000.0f, 100.0f, 1000.0f);
func_80387ACC(this, 60.0f * sp54);
if (func_80387470(this, this->unk1C, sp50, 1800.0f, 200.0f, 500.0f, 300.0f)) {
chfinalboss_phase1_setState(this, 4);
@@ -1247,7 +1247,7 @@ void chfinalboss_phase2_update(ActorMarker *marker) {
case 14:
func_803869BC(this);
func_80387ACC(this, 30.0f * sp4C);
if (func_80387470(this, this->unk1C, ml_map_f(ml_vec3f_distance(this->position, this->unk1C), 70.0f, 1000.0f, 100.0f, D_80391758[sp48]), D_80391758[sp48] * 2, 160.0f, 500.0f, 70.0f)) {
if (func_80387470(this, this->unk1C, ml_map_f(ml_distance_vec3f(this->position, this->unk1C), 70.0f, 1000.0f, 100.0f, D_80391758[sp48]), D_80391758[sp48] * 2, 160.0f, 500.0f, 70.0f)) {
local->unkA = 1;
chfinalboss_phase2_setState(this, 0xF);
}

View File

@@ -69,7 +69,7 @@ f32 D_80392920[3];
/* .code */
void chjinjonator_80390130(f32 position[3], int count, enum asset_e sprite_id){
ParticleEmitter *s0 = partEmitList_pushNew(count);
ParticleEmitter *s0 = partEmitMgr_newEmitter(count);
particleEmitter_setSprite(s0, sprite_id);
particleEmitter_setStartingFrameRange(s0, 1, 6);
particleEmitter_setPosition(s0, position);
@@ -78,10 +78,10 @@ void chjinjonator_80390130(f32 position[3], int count, enum asset_e sprite_id){
func_802EFB70(s0, 0.5f, 0.65f);
func_802EFB84(s0, 0.0f, 0.0f);
particleEmitter_setSpawnIntervalRange(s0, 0.0f, 0.01f);
func_802EFEC0(s0, 0.65f, 0.85f);
func_802EFA5C(s0, 0.0f, 0.35f);
particleEmitter_setParticleLifeTimeRange(s0, 0.65f, 0.85f);
particleEmitter_setFade(s0, 0.0f, 0.35f);
func_802EFA78(s0, 1);
func_802EFA70(s0, 4);
particleEmitter_setDrawMode(s0, 4);
particleEmitter_emitN(s0, count);
}

View File

@@ -46,10 +46,10 @@ void chjinjonatorbase_spawnStoneJinjo(ActorMarker *marker) {
}
void func_8038E03C(f32 arg0[3], u32 arg1) {
ParticleEmitter *temp_v0 = partEmitList_pushNew(arg1);
ParticleEmitter *temp_v0 = partEmitMgr_newEmitter(arg1);
particleEmitter_setSprite(temp_v0, ASSET_70E_SPRITE_SMOKE_2);
func_802EFFA8(temp_v0, D_80391A64);
particleEmitter_setRGB(temp_v0, D_80391A64);
particleEmitter_setStartingFrameRange(temp_v0, 0, 7);
particleEmitter_setPosition(temp_v0, arg0);
particleEmitter_setPositionAndVelocityRanges(temp_v0, &D_80391A98);

View File

@@ -1,6 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "core2/particle.h"
extern void func_80324CFC(f32, s32, s32);
extern void func_80386654(f32 arg0, f32 arg1[4], f32 arg2[4]);
@@ -98,7 +99,7 @@ void func_8038EB90(ActorMarker *arg0, f32 *arg1) {
}
void func_8038EBE0(f32 arg0[3], u32 arg1, enum asset_e arg2, f32 arg3[6], f32 arg4[6], f32 arg5[6], f32 arg6[4], f32 arg7[4], f32 arg8[2]) {
ParticleEmitter *temp_v0 = partEmitList_pushNew(arg1);
ParticleEmitter *temp_v0 = partEmitMgr_newEmitter(arg1);
particleEmitter_setSprite(temp_v0, arg2);
particleEmitter_setStartingFrameRange(temp_v0, 1, 6);
@@ -106,21 +107,21 @@ void func_8038EBE0(f32 arg0[3], u32 arg1, enum asset_e arg2, f32 arg3[6], f32 ar
particleEmitter_setParticleSpawnPositionRange(temp_v0, arg3[0], arg3[1], arg3[2], arg3[3], arg3[4], arg3[5]);
particleEmitter_setParticleAccelerationRange(temp_v0, arg4[0], arg4[1], arg4[2], arg4[3], arg4[4], arg4[5]);
particleEmitter_setParticleVelocityRange(temp_v0, arg5[0], arg5[1], arg5[2], arg5[3], arg5[4], arg5[5]);
func_802EFE24(temp_v0, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
particleEmitter_setAngularVelocityRange(temp_v0, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
func_802EFB70(temp_v0, arg6[0], arg6[1]);
func_802EFB84(temp_v0, arg6[2], arg6[3]);
func_802EF9F8(temp_v0, 0.5f);
func_802EFA18(temp_v0, 3);
particleEmitter_setSpawnIntervalRange(temp_v0, arg7[0], arg7[1]);
func_802EFEC0(temp_v0, arg7[2], arg7[3]);
func_802EFA5C(temp_v0, arg8[0], arg8[1]);
particleEmitter_setParticleLifeTimeRange(temp_v0, arg7[2], arg7[3]);
particleEmitter_setFade(temp_v0, arg8[0], arg8[1]);
func_802EFA78(temp_v0, 1);
func_802EFA70(temp_v0, 4);
particleEmitter_setDrawMode(temp_v0, 4);
particleEmitter_emitN(temp_v0, arg1);
}
void func_8038ED9C(f32 arg0[3], u32 arg1, s32 arg2, s32 arg3[2], f32 arg4[6], f32 arg5[4], f32 arg6[4], f32 arg7[2]) {
ParticleEmitter *temp_v0 = partEmitList_pushNew(arg2);
ParticleEmitter *temp_v0 = partEmitMgr_newEmitter(arg2);
particleEmitter_setSprite(temp_v0, arg1);
particleEmitter_setStartingFrameRange(temp_v0, arg3[0], arg3[1]);
@@ -131,28 +132,28 @@ void func_8038ED9C(f32 arg0[3], u32 arg1, s32 arg2, s32 arg3[2], f32 arg4[6], f3
func_802EFB70(temp_v0, arg5[0], arg5[1]);
func_802EFB84(temp_v0, arg5[2], arg5[3]);
particleEmitter_setSpawnIntervalRange(temp_v0, arg6[0], arg6[1]);
func_802EFEC0(temp_v0, arg6[2], arg6[3]);
func_802EFA5C(temp_v0, arg7[0], arg7[1]);
func_802EFA70(temp_v0, 0x10);
particleEmitter_setParticleLifeTimeRange(temp_v0, arg6[2], arg6[3]);
particleEmitter_setFade(temp_v0, arg7[0], arg7[1]);
particleEmitter_setDrawMode(temp_v0, PART_EMIT_NO_DEPTH);
func_802EFA78(temp_v0, 1);
particleEmitter_emitN(temp_v0, arg2);
}
void func_8038EEFC(f32 arg0[3], u32 arg1, f32 *arg2) {
ParticleEmitter *temp_v0 = partEmitList_pushNew(arg1);
ParticleEmitter *temp_v0 = partEmitMgr_newEmitter(arg1);
particleEmitter_setSprite(temp_v0, ASSET_70E_SPRITE_SMOKE_2);
func_802EFFA8(temp_v0, D_80391B48);
func_802EF9E4(temp_v0, 0xEB);
particleEmitter_setRGB(temp_v0, D_80391B48);
particleEmitter_setAlpha(temp_v0, 0xEB);
particleEmitter_setStartingFrameRange(temp_v0, 0, 7);
particleEmitter_setPosition(temp_v0, arg0);
particleEmitter_setPositionAndVelocityRanges(temp_v0, &D_80391B54);
func_802EFB70(temp_v0, 0.1f, 0.2f);
func_802EFB84(temp_v0, 3.6f, 4.6f);
particleEmitter_setSpawnIntervalRange(temp_v0, arg2[0], arg2[1]);
func_802EFEC0(temp_v0, arg2[2], arg2[3]);
func_802EFA5C(temp_v0, 0.05f, 0.1f);
func_802EFA70(temp_v0, 0x10);
particleEmitter_setParticleLifeTimeRange(temp_v0, arg2[2], arg2[3]);
particleEmitter_setFade(temp_v0, 0.05f, 0.1f);
particleEmitter_setDrawMode(temp_v0, PART_EMIT_NO_DEPTH);
func_802EFA78(temp_v0, 1);
particleEmitter_emitN(temp_v0, arg1);
}