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

10
src/GV/ch/gobi1.c
View File

@@ -136,13 +136,13 @@ void chGobi1_update(Actor *this){
return;
}//L80387514
if(func_8025773C(&local->unk8, tick))
if(ml_timer_update(&local->unk8, tick))
sp6C = 5;
if(func_8025773C(&local->unkC, tick))
if(ml_timer_update(&local->unkC, tick))
FUNC_8030E8B4(SFX_84_GOBI_CRYING, 0.9f, 32000, this->position, 1500, 2500);
if(func_8025773C(&local->unk10, tick)){
if(ml_timer_update(&local->unk10, tick)){
for(i = 0; i < 2; i++){
sfxsource_setSfxId(local->unk0[i], SFX_3F9_UNKNOWN);
func_8030DD14(local->unk0[i], 3);
@@ -151,7 +151,7 @@ void chGobi1_update(Actor *this){
}
}
if(func_8025773C(&local->unk14, tick)){
if(ml_timer_update(&local->unk14, tick)){
local->unk10 = 0.75f;
local->unk8 = 7.5f;
timed_setCameraToNode(0.5f, 0xa);
@@ -191,7 +191,7 @@ void chGobi1_update(Actor *this){
sp6C = 6;
}//L803877F0
else{
if(func_8025773C(&local->unk4, tick))
if(ml_timer_update(&local->unk4, tick))
sp6C = 2;
}
}//L80387808

14
src/GV/ch/gobirock.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern void func_802EF3A8(ParticleEmitter *, Gfx **, Mtx **, Vtx**);
extern void particleEmitter_draw(ParticleEmitter *, Gfx **, Mtx **, Vtx**);
typedef struct {
f32 unk0[3];
@@ -61,8 +61,8 @@ Actor *chGobiRock_draw(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx
ActorLocal_chGobiRock *local = (ActorLocal_chGobiRock *)&this->local;
f32 sp3C[3];
func_802EF3A8(local->unkC, gfx, mtx, vtx);
func_802EF3A8(local->unk10, gfx, mtx, vtx);
particleEmitter_draw(local->unkC, gfx, mtx, vtx);
particleEmitter_draw(local->unk10, gfx, mtx, vtx);
if(this->state == 0 || this->state == 2)
return this;
@@ -84,8 +84,8 @@ bool chGobiRock_isDestroyed(void){
void chGobiRock_free(Actor *this){
ActorLocal_chGobiRock *local = (ActorLocal_chGobiRock *)&this->local;
__chGobiRock_setState(this, 0);
func_802EF684(local->unkC);
func_802EF684(local->unk10);
particleEmitter_free(local->unkC);
particleEmitter_free(local->unk10);
}
void chGobiRock_update(Actor *this){
@@ -119,12 +119,12 @@ void chGobiRock_update(Actor *this){
else{//L80388ED0
particleEmitter_update(local->unkC);
particleEmitter_update(local->unk10);
if(func_8025773C(&local->unk14, sp24)){
if(ml_timer_update(&local->unk14, sp24)){
jiggySpawn(JIGGY_44_GV_GOBI_1, jiggy_position);
func_802BB3DC(0, 60.0f, 0.65f);
}
if(this->state == 2){
if(func_802EF648(local->unkC) && func_802EF648(local->unk10)){
if(particleEmitter_isDone(local->unkC) && particleEmitter_isDone(local->unk10)){
marker_despawn(sp34);
}
}

2
src/GV/ch/mazectrl.c
View File

@@ -175,7 +175,7 @@ void chMazeCtrl_update(Actor *this){
__chMazeCtrl_setState(this, 2);
}
if( !levelSpecificFlags_get(0x15)
&& func_8025773C(&local->unk8, sp34)
&& ml_timer_update(&local->unk8, sp34)
&& func_80311480(ASSET_A81_TEXT_SANDYBUTT_ENTER, 0, NULL, NULL, NULL, NULL)
){
levelSpecificFlags_set(0x15, TRUE);

6
src/GV/code_3BB0.c
View File

@@ -28,11 +28,11 @@ s32 D_80390F94[3] = {0xFF, 0xFF, 0x9B};
/* .code */
void func_80389FA0(f32 position[3]){
ParticleEmitter *pCtrl = partEmitList_pushNew(1);
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(1);
particleEmitter_setSprite(pCtrl, ASSET_70D_SPRITE_SMOKE_1);
particleEmitter_setStartingFrameRange(pCtrl, 1, 6);
func_802EFFA8(pCtrl, D_80390F94);
func_802EF9E4(pCtrl, 100);
particleEmitter_setRGB(pCtrl, D_80390F94);
particleEmitter_setAlpha(pCtrl, 100);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setParticleSpawnPositionRange( pCtrl,
-700.0f, 0.0f, -700.0f,

26
src/GV/code_4740.c
View File

@@ -39,19 +39,19 @@ f32 GV_D_80391A70[3];
/* .code */
void func_8038AB30(ParticleEmitter *pCtrl, f32 position[3], s32 cnt){
if(map_get() != MAP_1A_GV_INSIDE_JINXY)
func_802EFFA8(pCtrl, D_803910BC);
particleEmitter_setRGB(pCtrl, D_803910BC);
else
func_802EFFA8(pCtrl, D_803910C8);
particleEmitter_setRGB(pCtrl, D_803910C8);
func_802EF9E4(pCtrl, 0xBE);
particleEmitter_setAlpha(pCtrl, 0xBE);
particleEmitter_setSprite(pCtrl, ASSET_700_SPRITE_DUST);
func_802EFA5C(pCtrl, 0.0f, 0.01f);
particleEmitter_setFade(pCtrl, 0.0f, 0.01f);
particleEmitter_setStartingFrameRange(pCtrl, 0, 7);
particleEmitter_setPosition(pCtrl, position);
}
void func_8038ABD8(f32 position[3], s32 cnt){
ParticleEmitter *pCtrl = partEmitList_pushNew(cnt);
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
func_8038AB30(pCtrl, position, cnt);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
-40.0f, -5.0f, -40.0f,
@@ -64,12 +64,12 @@ void func_8038ABD8(f32 position[3], s32 cnt){
func_802EFB70(pCtrl, 0.1f, 0.5f);
func_802EFB84(pCtrl, 1.2f, 2.6f);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
func_802EFEC0(pCtrl, 0.5f, 1.4f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 0.5f, 1.4f);
particleEmitter_emitN(pCtrl, cnt);
}
void func_8038ACEC(f32 pos[3], s32 cnt){
ParticleEmitter *pCtrl = partEmitList_pushNew(cnt);
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
func_8038AB30(pCtrl, pos, cnt);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
-80.0f, 20.0f, -80.0f,
@@ -82,23 +82,23 @@ void func_8038ACEC(f32 pos[3], s32 cnt){
func_802EFB70(pCtrl, 1.0f, 2.6f);
func_802EFB84(pCtrl, 3.0f, 5.5f);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
func_802EFEC0(pCtrl, 1.2f, 3.2f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 1.2f, 3.2f);
particleEmitter_emitN(pCtrl, cnt);
}
void func_8038ADFC(f32 pos[3], s32 cnt){
ParticleEmitter *pCtrl = partEmitList_pushNew(cnt);
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
particleEmitter_setModel(pCtrl, 0x389);
particleEmitter_setPosition(pCtrl, pos);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_803910D4);
func_802EFE24(pCtrl, -500.0f, -500.0f, -500.0f, 500.0f, 500.0f, 500.0f);
particleEmitter_setAngularVelocityRange(pCtrl, -500.0f, -500.0f, -500.0f, 500.0f, 500.0f, 500.0f);
func_802EF9F8(pCtrl, 0.6f);
func_802EFA18(pCtrl, 2);
func_802EFB70(pCtrl, 1.0f, 1.0f);
func_802EFA70(pCtrl, 2);
particleEmitter_setDrawMode(pCtrl, 2);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
func_802EFEC0(pCtrl, 4.0f, 6.0f);
func_802EFA5C(pCtrl, 0.0f, 0.05f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 4.0f, 6.0f);
particleEmitter_setFade(pCtrl, 0.0f, 0.05f);
particleEmitter_emitN(pCtrl, cnt);
}

14
src/GV/code_5570.c
View File

@@ -109,16 +109,16 @@ void func_8038BB6C(Actor *jiggy, ActorMarker * grabba_marker)
}
void func_8038BBFC(ParticleEmitter *pCtrl, f32 position[3], s32 cnt){
func_802EFFA8(pCtrl, D_8039117C);
func_802EF9E4(pCtrl, 0x96);
particleEmitter_setRGB(pCtrl, D_8039117C);
particleEmitter_setAlpha(pCtrl, 0x96);
particleEmitter_setSprite(pCtrl, ASSET_700_SPRITE_DUST);
func_802EFA5C(pCtrl, 0.0f, 0.01f);
particleEmitter_setFade(pCtrl, 0.0f, 0.01f);
particleEmitter_setStartingFrameRange(pCtrl, 0, 7);
particleEmitter_setPosition(pCtrl, position);
}
void func_8038BC7C(f32 position[3], s32 cnt){
ParticleEmitter *pCtrl = partEmitList_pushNew(cnt);
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
func_8038BBFC(pCtrl, position, cnt);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
-60.0f, 0.0f, -60.0f,
@@ -131,12 +131,12 @@ void func_8038BC7C(f32 position[3], s32 cnt){
func_802EFB70(pCtrl, 0.1f, 0.5f);
func_802EFB84(pCtrl, 2.0f, 2.6f);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
func_802EFEC0(pCtrl, 0.5f, 1.4f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 0.5f, 1.4f);
particleEmitter_emitN(pCtrl, cnt);
}
void func_8038BD8C(f32 position[3], s32 cnt){
ParticleEmitter *pCtrl = partEmitList_pushNew(cnt);
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
func_8038BBFC(pCtrl, position, cnt);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
-40.0f, 0.0f, -40.0f,
@@ -149,7 +149,7 @@ void func_8038BD8C(f32 position[3], s32 cnt){
func_802EFB70(pCtrl, 0.1f, 0.5f);
func_802EFB84(pCtrl, 1.2, 1.6f);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
func_802EFEC0(pCtrl, 0.5f, 1.4f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 0.5f, 1.4f);
particleEmitter_emitN(pCtrl, cnt);
}

6
src/GV/code_6370.c
View File

@@ -94,7 +94,7 @@ void func_8038C8A0(Actor *this, s32 next_state){
local->unk18[1] = this->position_y;
local->unk18[2] = this->position_z;
if(this->state == 1){
func_80250E94(0.0f, 0.6f, 1.0f, 0, 1.3f, 0.0f);
rumbleManager_80250E94(0.0f, 0.6f, 1.0f, 0, 1.3f, 0.0f);
timed_playSfx(1.0f, SFX_3F6_UNKNOWN, 0.8f, 30000);
}
}//L8038CA6C
@@ -125,13 +125,13 @@ void func_8038C8A0(Actor *this, s32 next_state){
local->unk18[0] = this->position_x;
local->unk18[1] = this->position_y;
local->unk18[2] = this->position_z;
func_80250D94(0.7f, 0.5f, 1.3f);
rumbleManager_80250D94(0.7f, 0.5f, 1.3f);
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.8f, 30000);
}
if(next_state == 8){
if(this->state == 7){
func_80250D94(0.8f, 0.7f, 3.0f);
rumbleManager_80250D94(0.8f, 0.7f, 3.0f);
func_8038C760(this, *local->unk8 + 1);
}
marker_despawn(this->marker);

2
src/GV/code_7060.c
View File

@@ -72,7 +72,7 @@ void func_8038D47C(Actor *this){
if(!mapSpecificFlags_get(0x14)){
player_getPosition(sp3C);
if(func_8028ECAC() == 0){
if( ml_vec3f_distance(sp3C, this->unk1C) < 100.0f || ml_vec3f_distance(sp3C, this->velocity) < 100.0f){
if( ml_distance_vec3f(sp3C, this->unk1C) < 100.0f || ml_distance_vec3f(sp3C, this->velocity) < 100.0f){
if(func_80311480(ASSET_A7B_TEXT_JINXY_MEET, 0, NULL, NULL, NULL, NULL)){
mapSpecificFlags_set(0x14, 1);
}