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

36
src/lair/code_0.c
View File

@@ -316,9 +316,9 @@ ParticleEmitter *func_803866D8(s32 a0)
void *ptr;
s32 colour[3];
ptr = partEmitList_pushNew(0x28);
ptr = partEmitMgr_newEmitter(0x28);
func_802F0D54(ptr);
particleEmitter_manualFree(ptr);
particleEmitter_setSprite(ptr, ASSET_710_SPRITE_SPARKLE_PURPLE);
func_802EFB98(ptr, &D_8039342C);
particleEmitter_setParticleVelocityRange(ptr, 0.f, 70.f, 0.f, 0.f, 140.f, 0.f);
@@ -327,7 +327,7 @@ ParticleEmitter *func_803866D8(s32 a0)
colour[1] = 0xFF;
colour[2] = 0;
func_802EFFA8(ptr, colour);
particleEmitter_setRGB(ptr, colour);
return ptr;
}
@@ -407,7 +407,7 @@ void func_803867A8(Actor *this) {
if (this->marker->unk14_21) {
sp44 = this->unk158[func_8023DB5C() & 1];
if (sp44 != NULL) {
func_802EF9E4(sp44, this->alpha_124_19);
particleEmitter_setAlpha(sp44, this->alpha_124_19);
phi_f0 = this->unk60 - 10.0f;
while(phi_f0 < 0.0f) {phi_f0 += 360.0f;}
@@ -560,7 +560,7 @@ void func_803870DC(Actor *this) {
this->alpha_124_19 = phi_v1;
temp_s7 = (s32)((f32)this->alpha_124_19 / 5.0) - 0xC;
if (this->marker->unk14_21 && (temp_s7 > 0)) {
temp_s5 = partEmitList_pushNew(temp_s7);
temp_s5 = partEmitMgr_newEmitter(temp_s7);
func_8034A174(func_80329934(), 5, sp90);
func_8034A174(func_80329934(), 6, sp84);
particleEmitter_setSprite(temp_s5, ASSET_710_SPRITE_SPARKLE_PURPLE);
@@ -568,9 +568,9 @@ void func_803870DC(Actor *this) {
func_802EFB84(temp_s5, 0.08f, 0.13f);
particleEmitter_setParticleAccelerationRange(temp_s5, -500.0f, -1800.0f, -500.0f, 500.0f, 1800.0f, 500.0f);
particleEmitter_setSpawnIntervalRange(temp_s5, 0.0f, 0.01f);
func_802EFEC0(temp_s5, 0.9f, 0.9f);
particleEmitter_setParticleLifeTimeRange(temp_s5, 0.9f, 0.9f);
particleEmitter_setParticleVelocityRange(temp_s5, -400.0f, 400.0f, -400.0f, 400.0f, -400.0f, 400.0f);
func_802EF9E4(temp_s5, this->alpha_124_19);
particleEmitter_setAlpha(temp_s5, this->alpha_124_19);
for(phi_s4 = 0; phi_s4 < temp_s7; phi_s4++){
for(i = 0; i < 3; i++){
sp64[i] = randf2(sp90[i], sp84[i]);
@@ -579,7 +579,7 @@ void func_803870DC(Actor *this) {
sp70[0] = (s32) ((randf() * 130.0f) + 125.0f);
sp70[2] = sp70[1] = (s32) ((randf() * 170.0f) + 85.0f);
sp70[(randf() > 0.5) ? 2 : 1] = 0;
func_802EFFA8(temp_s5, sp70);
particleEmitter_setRGB(temp_s5, sp70);
particleEmitter_emitN(temp_s5, 1);
}
}
@@ -684,7 +684,7 @@ void func_80387730(Actor *this) {
}
if (!func_8031FF1C(this->unkF4_8 + 0x39) && ability_isUnlocked(ABILITY_13_1ST_NOTEDOOR)) {
player_getPosition(spAC);
if ((ml_vec3f_distance(spAC, this->position) < 500.0f) && (func_803114C4() != 0xF64)) {
if ((ml_distance_vec3f(spAC, this->position) < 500.0f) && (func_803114C4() != 0xF64)) {
func_802FACA4(0xC);
}
if (itemscore_noteScores_getTotal() >= D_8039347C[this->unkF4_8 - 1]) {
@@ -700,7 +700,7 @@ void func_80387730(Actor *this) {
phi_f20 = 290.0f;
}
sp9C[1] = this->position[1];
if ((ml_vec3f_distance(spAC, sp9C) < phi_f20) || (this->alpha_124_19 != 0xFF)) {
if ((ml_distance_vec3f(spAC, sp9C) < phi_f20) || (this->alpha_124_19 != 0xFF)) {
if (this->alpha_124_19 == 0xFF) {
func_80324CFC(0.0f, COMUSIC_43_ENTER_LEVEL_GLITTER, 32700);
func_80324D2C(2.4f, COMUSIC_43_ENTER_LEVEL_GLITTER);
@@ -719,16 +719,16 @@ void func_80387730(Actor *this) {
return;
}
if (this->marker->unk14_21) {
temp_s5 = partEmitList_pushNew((s32)((f32) this->alpha_124_19 / 11.0));
temp_s5 = partEmitMgr_newEmitter((s32)((f32) this->alpha_124_19 / 11.0));
sp6C[2] = 0;
particleEmitter_setSprite(temp_s5, ASSET_710_SPRITE_SPARKLE_PURPLE);
func_802EFB70(temp_s5, 0.13f, 0.18f);
func_802EFB84(temp_s5, 0.08f, 0.13f);
particleEmitter_setParticleAccelerationRange(temp_s5, -10.0f, 0.0f, -10.0f, 10.0f, 1600.0f, 10.0f);
particleEmitter_setSpawnIntervalRange(temp_s5, 0.0f, 0.01f);
func_802EFEC0(temp_s5, 1.4f, 1.4f);
particleEmitter_setParticleLifeTimeRange(temp_s5, 1.4f, 1.4f);
particleEmitter_setParticleVelocityRange(temp_s5, -100.0f, 100.0f, -100.0f, 100.0f, 0.0f, 100.0f);
func_802EF9E4(temp_s5, this->alpha_124_19);
particleEmitter_setAlpha(temp_s5, this->alpha_124_19);
for(phi_s4 = 0; phi_s4 < (s32) ((f32)this->alpha_124_19 / 11.0); phi_s4++){
for(i = 0; i < 3; i++){
sp60[i] = randf2(sp90[i], sp84[i]);
@@ -736,12 +736,12 @@ void func_80387730(Actor *this) {
particleEmitter_setPosition(temp_s5, sp60);
sp6C[0] = (s32) ((randf() * 60.0f) + 195.0f);
sp6C[1] = (s32) ((randf() * 130.0f) + 125.0f);
func_802EFFA8(temp_s5, sp6C);
particleEmitter_setRGB(temp_s5, sp6C);
particleEmitter_emitN(temp_s5, 1);
}
}
}
} else if ((this->unkF4_8 >= 2) && (ml_vec3f_distance(spAC, this->position) < 290.0f)) {
} else if ((this->unkF4_8 >= 2) && (ml_distance_vec3f(spAC, this->position) < 290.0f)) {
func_80356520(0xB0);
}
}
@@ -1184,11 +1184,11 @@ void func_80388524(Actor *this) {
func_8030E6D4(SFX_6C_LOCKUP_CLOSING);
}
if (animctrl_getAnimTimer(this->animctrl) < 0.68) {
sp2C = partEmitList_pushNew(3U);
sp2C = partEmitMgr_newEmitter(3U);
particleEmitter_setSprite(sp2C, ASSET_70D_SPRITE_SMOKE_1);
particleEmitter_setStartingFrameRange(sp2C, 1, 6);
func_802EFFA8(sp2C, D_803934A0);
func_802EF9E4(sp2C, 0x3C);
particleEmitter_setRGB(sp2C, D_803934A0);
particleEmitter_setAlpha(sp2C, 0x3C);
particleEmitter_setPosition(sp2C, this->position);
particleEmitter_setPositionAndVelocityRanges(sp2C, &D_803934D4);
func_802EFB98(sp2C, &D_803934AC);

4
src/lair/code_5ED0.c
View File

@@ -79,7 +79,7 @@ extern void gczoombox_open(gczoombox_t *);
extern void gczoombox_maximize(gczoombox_t *);
extern void *mapModel_getModel(s32);
extern void func_8029A95C(s32); // set transformation
extern void player_setTransformation(s32); // set transformation
//typedef migrated to "inlcude/core2/code_C9E70.h"
extern struct FF_StorageStruct *D_8037DCB8;
@@ -659,7 +659,7 @@ void lair_func_8038CF18(void)
ptr[-3].unk20 = 0;
#endif
func_8029A95C(TRANSFORM_1_BANJO);
player_setTransformation(TRANSFORM_1_BANJO);
func_80347A14(0);

12
src/lair/code_86F0.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern f32 ml_vec3f_distance_squared(f32[3], f32[3]);
extern f32 ml_distanceSquared_vec3f(f32[3], f32[3]);
extern void func_8028F3D8(f32[3], f32, void(*)(ActorMarker *), ActorMarker *);
extern void func_80324CFC(f32, enum comusic_e, s32);
extern void func_8034A8BC(s32);
@@ -203,7 +203,7 @@ void func_8038EFD8(Actor *this) {
sp24[1] = this->position[1];
sp24[2] = this->position[2];
sp24[1] += 50.0f;
func_8028F3D8(sp24, ml_vec3f_distance(sp30, sp24) / 150.0, func_8038EF58, this->marker);
func_8028F3D8(sp24, ml_distance_vec3f(sp30, sp24) / 150.0, func_8038EF58, this->marker);
}
void func_8038F078(ActorMarker *marker, enum asset_e text_id, s32 arg2){
@@ -457,13 +457,13 @@ void lair_func_8038F924(Actor *this) {
if (this->marker->unk14_21) {
s32 sp58[3] = D_80394824;
ParticleEmitter *sp54;
sp54 = partEmitList_pushNew(6);
sp54 = partEmitMgr_newEmitter(6);
particleEmitter_setSprite(sp54, ASSET_710_SPRITE_SPARKLE_PURPLE);
func_802EF9E4(sp54, 0xFF);
particleEmitter_setAlpha(sp54, 0xFF);
func_802EFB98(sp54, &D_80394830);
particleEmitter_setPosition(sp54, this->position);
sp58[2] = randf() * 255.0f;
func_802EFFA8(sp54, sp58);
particleEmitter_setRGB(sp54, sp58);
particleEmitter_setParticleSpawnPositionRange(sp54, -30.0f, -40.0f, -30.0f, 30.0f, 20.0f, 30.0f);
particleEmitter_emitN(sp54, 6);
}
@@ -535,7 +535,7 @@ void lair_func_8038F924(Actor *this) {
s32 pad2;
this->marker->unk3E_1 = FALSE;
player_getPosition(sp44);
if (ml_vec3f_distance_squared(sp44, this->position) < 250000.0f) {
if (ml_distanceSquared_vec3f(sp44, this->position) < 250000.0f) {
if (!this->unk38_0) {
func_802FA5D0();
this->unk38_0 = TRUE;

2
src/lair/code_A810.c
View File

@@ -111,7 +111,7 @@ void func_80390E28(Actor *this) {
}
this->unk10_12 = 0;
for(i = 0; (i < D_80395460) && (this->unk10_12 < 4); i++){
temp_f0 = ml_vec3f_distance(this->position, D_80395370[i]);
temp_f0 = ml_distance_vec3f(this->position, D_80395370[i]);
if ((temp_f0 > 400.0f) && (temp_f0 < 1200.0f)) {
local->unk0[this->unk10_12][0] = D_80395370[i][0];
local->unk0[this->unk10_12][1] = D_80395370[i][1];

47
src/lair/code_AD70.c
View File

@@ -1,6 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "core2/particle.h"
extern void func_8038EA68(s32, s32[3]);
extern void func_8038EA10(s32, f32[3]);
@@ -53,10 +54,10 @@ s32 D_80394BD4[3] = {0xff, 0x80, 0x80};
/* .code */
void func_80391160(f32 pos[3], u32 count)
{
ParticleEmitter *p = partEmitList_pushNew(count);
ParticleEmitter *p = partEmitMgr_newEmitter(count);
particleEmitter_setSprite(p, 0x70E);
func_802EFFA8(p, D_80394AD4);
func_802EF9E4(p, 0xEB);
particleEmitter_setRGB(p, D_80394AD4);
particleEmitter_setAlpha(p, 0xEB);
particleEmitter_setStartingFrameRange(p, 0, 7);
particleEmitter_setPosition(p, pos);
particleEmitter_setParticleSpawnPositionRange(p, -55, -55, -55, 55, 55, 55);
@@ -67,44 +68,44 @@ void func_80391160(f32 pos[3], u32 count)
void lair_func_80391254(f32 pos[3], u32 count, enum asset_e sprite)
{
ParticleEmitter *p = partEmitList_pushNew(count);
ParticleEmitter *p = partEmitMgr_newEmitter(count);
particleEmitter_setSprite(p, sprite);
func_802EFA70(p, 8);
particleEmitter_setDrawMode(p, PART_EMIT_NO_LOOP);
particleEmitter_setStartingFrameRange(p, 0, 2);
particleEmitter_setParticleFramerateRange(p, 4, 6);
particleEmitter_setParticleSpawnPositionRange(p, -80, 0, -80, 80, 0, 80);
particleEmitter_setPosition(p, pos);
func_802EFA5C(p, 0.6f, 0.7f);
particleEmitter_setFade(p, 0.6f, 0.7f);
func_802EFB70(p, 3, 3);
func_802EFB84(p, 4, 4);
func_802EFEC0(p, 1, 1);
particleEmitter_setParticleLifeTimeRange(p, 1, 1);
particleEmitter_emitN(p, count);
}
void func_8039137C(f32 pos[3], u32 count, enum asset_e sprite)
{
ParticleEmitter *p = partEmitList_pushNew(count);
ParticleEmitter *p = partEmitMgr_newEmitter(count);
particleEmitter_setSprite(p, sprite);
particleEmitter_setPosition(p, pos);
func_802EF9F8(p, 0.3f);
func_802EFA18(p, 3);
func_802EFE24(p, 0, 0, 600, 0, 0, 900);
particleEmitter_setAngularVelocityRange(p, 0, 0, 600, 0, 0, 900);
particleEmitter_setPositionVelocityAndAccelerationRanges(p, &D_80394B30);
func_802EFB98(p, &D_80394B08);
func_802EFA70(p, 2);
particleEmitter_setDrawMode(p, 2);
particleEmitter_emitN(p, count);
}
void func_8039144C(f32 pos[3], u32 count)
{
ParticleEmitter *p = partEmitList_pushNew(count);
ParticleEmitter *p = partEmitMgr_newEmitter(count);
particleEmitter_setSprite(p, 0x713);
particleEmitter_setPosition(p, pos);
particleEmitter_setParticleSpawnPositionRange(p, -40, -40, -40, 40, 40, 40);
func_802EFA70(p, 4);
func_802EFE24(p, 0, 0, 200, 0, 0, 300);
func_802EFA5C(p, 0.1f, 0.2f);
func_802EFEC0(p, 0.75f, 0.75f);
particleEmitter_setDrawMode(p, 4);
particleEmitter_setAngularVelocityRange(p, 0, 0, 200, 0, 0, 300);
particleEmitter_setFade(p, 0.1f, 0.2f);
particleEmitter_setParticleLifeTimeRange(p, 0.75f, 0.75f);
func_802EFB70(p, 0.5f, 0.5f);
func_802EFB84(p, 0.2f, 0.2f);
particleEmitter_setParticleAccelerationRange(p, 0, -50, 0, 0, -100, 0);
@@ -113,31 +114,31 @@ void func_8039144C(f32 pos[3], u32 count)
void func_803915A4(f32 pos[3], s32 count, f32 scale)
{
ParticleEmitter *p = partEmitList_pushNew(count);
ParticleEmitter *p = partEmitMgr_newEmitter(count);
particleEmitter_setSprite(p, 0x4A0);
func_802EFA5C(p, 0.1f, 0.2f);
func_802EFA70(p, 8);
particleEmitter_setFade(p, 0.1f, 0.2f);
particleEmitter_setDrawMode(p, PART_EMIT_NO_LOOP);
particleEmitter_setStartingFrameRange(p, 2, 8);
particleEmitter_setParticleFramerateRange(p, 8, 8);
particleEmitter_setPosition(p, pos);
func_802EFB70(p, scale * 2.0, scale * 2.0);
func_802EFB84(p, scale * 0.4, scale * 0.4);
func_802EFEC0(p, 0.5f, 0.5f);
particleEmitter_setParticleLifeTimeRange(p, 0.5f, 0.5f);
particleEmitter_emitN(p, count);
}
void func_803916BC(f32 position[3], s32 cnt){
ParticleEmitter *pCtrl = partEmitList_pushNew(cnt);
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
particleEmitter_setSprite(pCtrl, ASSET_4A0_SPRITE_EXPLOSION);
func_802EFA5C(pCtrl, 0.1f, 0.3f);
func_802EFA70(pCtrl, 8);
particleEmitter_setFade(pCtrl, 0.1f, 0.3f);
particleEmitter_setDrawMode(pCtrl, PART_EMIT_NO_LOOP);
particleEmitter_setStartingFrameRange(pCtrl, 0, 6);
particleEmitter_setParticleFramerateRange(pCtrl, 5.0f, 8.0f);
particleEmitter_setPosition(pCtrl, position);
func_802EFB70(pCtrl, 2.0f, 2.0f);
func_802EFB84(pCtrl, 4.0f, 4.0f);
func_802EFEC0(pCtrl, 1.0f, 1.5f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 1.0f, 1.5f);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80394B78);
particleEmitter_emitN(pCtrl, cnt);
}

2
src/lair/code_C6C0.c
View File

@@ -45,7 +45,7 @@ void func_80392B6C(Actor *this) {
}
}
if (mapSpecificFlags_get(7) != 0) {
sp28 = ml_vec3f_distance(this->position, this->unk1C) / 350.0;
sp28 = ml_distance_vec3f(this->position, this->unk1C) / 350.0;
func_8025A70C(COMUSIC_A9_TOOTY);
mapSpecificFlags_set(7, 0);
mapSpecificFlags_set(9, 1);