documentations:

- various particle system functions/structs
- more in src/fight
- beehive
- added prototypes (reduced compiler warnings)
This commit is contained in:
mariob92
2024-09-07 12:52:35 +02:00
parent 78142ca162
commit c8598c2677
77 changed files with 356 additions and 332 deletions

View File

@@ -197,7 +197,7 @@ void __chClam_emitSmallShellParticles(f32 position[3], s32 count){
}
void __chClam_emitEatencollectibleParticles(f32 position[3], enum asset_e sprite_id, s32 count){
static struct31s D_8038C484 = {
static ParticleScaleAndLifetimeRanges D_8038C484 = {
{0.2f, 0.35f},
{0.0f, 0.0f},
{0.0f, 0.01f},
@@ -217,7 +217,7 @@ void __chClam_emitEatencollectibleParticles(f32 position[3], enum asset_e sprite
particleEmitter_setStartingFrameRange(pCtrl, 1, 6);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setVelocityAndAccelerationRanges(pCtrl, &D_8038C4AC);
func_802EFB98(pCtrl, &D_8038C484);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038C484);
particleEmitter_emitN(pCtrl, count);
}

View File

@@ -30,7 +30,7 @@ ActorInfo D_8038C580 = {
/* .code */
void func_80387DC0(f32 *position, s32 count) {
static s32 D_8038C5A4[3] = {180, 180, 180};
static struct31s D_8038C5B0 = {
static ParticleScaleAndLifetimeRanges D_8038C5B0 = {
{0.1f, 0.5f},
{1.4f, 2.8f},
{0.0f, 0.01f},
@@ -53,7 +53,7 @@ void func_80387DC0(f32 *position, s32 count) {
-40.0f, 10.0f, -40.0f,
40.0f, 40.0f, 40.0f
);
func_802EFB98(pCtrl, &D_8038C5B0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038C5B0);
particleEmitter_emitN(pCtrl, count);
}

View File

@@ -57,7 +57,7 @@ ActorInfo D_8038C8F8 = {
};
s32 D_8038C91C[3] = {160, 120, 20};
struct31s D_8038C928 = {
ParticleScaleAndLifetimeRanges D_8038C928 = {
{1.1f, 1.5f},
{4.0f, 4.6f},
{0.0f, 0.01f},
@@ -164,7 +164,7 @@ void func_80389CC4(s16 arg0[3], s32 arg1){
particleEmitter_setStartingFrameRange(D_8038D700, 0, 7);
particleEmitter_setPosition(D_8038D700, D_8038D708);
particleEmitter_setPositionAndVelocityRanges(D_8038D700, &D_8038C950);
func_802EFB98(D_8038D700, &D_8038C928);
particleEmitter_setScaleAndLifetimeRanges(D_8038D700, &D_8038C928);
particleEmitter_emitN(D_8038D700, 5);
D_8038D708[2] += 300.0f;
gcpausemenu_80314AC8(0);
@@ -240,6 +240,6 @@ Actor *func_8038A0D0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
func_8032AA58(actor, sp3C);
modelRender_preDraw(actor_predrawMethod, actor);
modelRender_draw(gfx, mtx, sp40, sp4C, sp3C, NULL, func_80330B1C(marker));
modelRender_draw(gfx, mtx, sp40, sp4C, sp3C, NULL, marker_loadModelBin(marker));
return actor;
}