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

@@ -170,7 +170,7 @@ void func_80386A90(s32 marker, s32 duration) {
}
void func_80386AC8(s32 arg0) {
static struct31s D_8038D350 = {{2.2f, 2.8f}, {6.3f, 9.4f}, {0.0f, 0.05f}, {10.0f, 10.0f}, 0.2f, 0.9f};
static ParticleScaleAndLifetimeRanges D_8038D350 = {{2.2f, 2.8f}, {6.3f, 9.4f}, {0.0f, 0.05f}, {10.0f, 10.0f}, 0.2f, 0.9f};
Actor *actor;
ParticleEmitter *pCtrl;
f32 sp34[3];
@@ -186,12 +186,12 @@ void func_80386AC8(s32 arg0) {
particleEmitter_setParticleSpawnPositionRange(pCtrl, -50.0f, 600.0f, -50.0f, 50.0f, 600.0f, 50.0f);
func_802EF9F8(pCtrl, 0.01f);
func_802EFA18(pCtrl, 3);
func_802EFB98(pCtrl, &D_8038D350);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D350);
particleEmitter_emitN(pCtrl, 10);
}
void func_80386C34(s32 arg0) {
static struct31s D_8038D378 = {{3.0f, 6.0f}, {6.3f, 9.4f}, {0.0f, 0.05f}, {10.0f, 10.0f}, 0.0f, 0.9f};
static ParticleScaleAndLifetimeRanges D_8038D378 = {{3.0f, 6.0f}, {6.3f, 9.4f}, {0.0f, 0.05f}, {10.0f, 10.0f}, 0.0f, 0.9f};
Actor *sp44;
ParticleEmitter *pCtrl;
f32 sp34[3];
@@ -207,12 +207,12 @@ void func_80386C34(s32 arg0) {
particleEmitter_setParticleSpawnPositionRange(pCtrl, -50.0f, 600.0f, -50.0f, 50.0f, 600.0f, 50.0f);
func_802EF9F8(pCtrl, 0.01f);
func_802EFA18(pCtrl, 3);
func_802EFB98(pCtrl, &D_8038D378);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D378);
particleEmitter_emitN(pCtrl, 15);
}
void func_80386DA0(s32 arg0) {
static struct31s D_8038D3A0 = {{10.0f, 10.0f}, {100.0f, 100.0f}, {0.0f, 0.05f}, {10.0f, 10.0f}, 0.3f, 0.9f};
static ParticleScaleAndLifetimeRanges D_8038D3A0 = {{10.0f, 10.0f}, {100.0f, 100.0f}, {0.0f, 0.05f}, {10.0f, 10.0f}, 0.3f, 0.9f};
Actor *sp44;
ParticleEmitter *pCtrl;
f32 sp34[3];
@@ -228,12 +228,12 @@ void func_80386DA0(s32 arg0) {
particleEmitter_setParticleSpawnPositionRange(pCtrl, -50.0f, 1500.0f, -50.0f, 50.0f, 1500.0f, 50.0f);
func_802EF9F8(pCtrl, 0.01f);
func_802EFA18(pCtrl, 3);
func_802EFB98(pCtrl, &D_8038D3A0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D3A0);
particleEmitter_emitN(pCtrl, 1);
}
void func_80386EF8(s32 arg0) {
static struct31s D_8038D3C8 = {{0.05f, 0.1f}, {0.0f, 0.0f}, {0.0f, 0.05f}, {4.0f, 4.0f}, 0.0f, 0.3f};
static ParticleScaleAndLifetimeRanges D_8038D3C8 = {{0.05f, 0.1f}, {0.0f, 0.0f}, {0.0f, 0.05f}, {4.0f, 4.0f}, 0.0f, 0.3f};
Actor *sp44;
ParticleEmitter *pCtrl;
f32 sp34[3];
@@ -248,12 +248,12 @@ void func_80386EF8(s32 arg0) {
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -600.0f, 0.0f, 0.0f, -600.0f, 0.0f);
func_802EF9F8(pCtrl, 0.01f);
func_802EFA18(pCtrl, 3);
func_802EFB98(pCtrl, &D_8038D3C8);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D3C8);
particleEmitter_emitN(pCtrl, 8);
}
void func_8038702C(s32 arg0) {
static struct31s D_8038D3F0 = {{0.2f, 0.25f}, {0.35f, 0.4f}, {0.0f, 0.05f}, {4.0f, 4.0f}, 0.0f, 0.8f};
static ParticleScaleAndLifetimeRanges D_8038D3F0 = {{0.2f, 0.25f}, {0.35f, 0.4f}, {0.0f, 0.05f}, {4.0f, 4.0f}, 0.0f, 0.8f};
Actor *sp44;
ParticleEmitter *pCtrl;
f32 sp34[3];
@@ -269,12 +269,12 @@ void func_8038702C(s32 arg0) {
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -800.0f, 0.0f, 0.0f, -800.0f, 0.0f);
func_802EF9F8(pCtrl, 0.4f);
func_802EFA18(pCtrl, 3);
func_802EFB98(pCtrl, &D_8038D3F0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D3F0);
particleEmitter_emitN(pCtrl, 8);
}
void func_80387170(s32 arg0) {
static struct31s D_8038D418 ={{0.2f, 0.25f}, {0.35f, 0.4f}, {0.0f, 0.05f}, {4.0f, 4.0f}, 0.0f, 0.8f};
static ParticleScaleAndLifetimeRanges D_8038D418 ={{0.2f, 0.25f}, {0.35f, 0.4f}, {0.0f, 0.05f}, {4.0f, 4.0f}, 0.0f, 0.8f};
Actor *sp44;
ParticleEmitter *pCtrl;
f32 sp34[3];
@@ -290,7 +290,7 @@ void func_80387170(s32 arg0) {
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -800.0f, 0.0f, 0.0f, -800.0f, 0.0f);
func_802EF9F8(pCtrl, 0.4f);
func_802EFA18(pCtrl, 3);
func_802EFB98(pCtrl, &D_8038D418);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D418);
particleEmitter_emitN(pCtrl, 8);
}
@@ -312,7 +312,7 @@ void func_803872B4(s32 arg0) {
func_8034A174((struct5Bs *)sp44->marker->unk44, 7, sp34);
particleEmitter_setPosition(pCtrl, sp34);
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8038D470);
func_802EFB98(pCtrl, &D_8038D440.unk0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D440.unk0);
particleEmitter_emitN(pCtrl, 4);
}
@@ -336,12 +336,12 @@ void func_80387364(s32 arg0) {
func_8034A174((struct5Bs *) sp34->marker->unk44, 8, sp24);
particleEmitter_setPosition(pCtrl, sp24);
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8038D4DC);
func_802EFB98(pCtrl, &D_8038D4AC.unk0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D4AC.unk0);
particleEmitter_emitN(pCtrl, 1);
}
void func_80387424(s32 arg0) {
static struct31s D_8038D50C = {{0.06f, 0.07f}, {0.07f, 0.07f}, {0.0f, 0.8f}, {1.0f, 1.1f}, 0.0f, 0.4f};
static ParticleScaleAndLifetimeRanges D_8038D50C = {{0.06f, 0.07f}, {0.07f, 0.07f}, {0.0f, 0.8f}, {1.0f, 1.1f}, 0.0f, 0.4f};
Actor *sp44;
ParticleEmitter *pCtrl;
f32 sp34[3];
@@ -355,13 +355,13 @@ void func_80387424(s32 arg0) {
particleEmitter_setPosition(pCtrl, sp34);
particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -30.0f, 130.0f, -30.0f, 130.0f, 45.0f, 30.0f);
func_802EFB98(pCtrl, &D_8038D50C);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D50C);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -300.0f, 0.0f, 0.0f, -300.0f, 0.0f);
particleEmitter_emitN(pCtrl, 8);
}
void cutscenes_func_80387560(s32 arg0) {
static struct31s D_8038D534 = {{0.15f, 0.15f}, {0.15f, 0.15f}, {0.0f, 0.8f}, {1.0f, 1.1f}, 0.0f, 0.4f};
static ParticleScaleAndLifetimeRanges D_8038D534 = {{0.15f, 0.15f}, {0.15f, 0.15f}, {0.0f, 0.8f}, {1.0f, 1.1f}, 0.0f, 0.4f};
Actor *sp44;
ParticleEmitter *pCtrl;
f32 sp34[3];
@@ -373,13 +373,13 @@ void cutscenes_func_80387560(s32 arg0) {
particleEmitter_setPosition(pCtrl, sp34);
particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -30.0f, 130.0f, -30.0f, 130.0f, 45.0f, 30.0f);
func_802EFB98(pCtrl, &D_8038D534);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D534);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -500.0f, 0.0f, 0.0f, -500.0f, 0.0f);
particleEmitter_emitN(pCtrl, 11);
}
void func_80387680(s32 arg0) {
static struct31s D_8038D55C = {{0.03f, 0.03f}, {0.03f, 0.03f}, {0.0f, 0.8f}, {1.0f, 1.1f}, 0.0f, 0.4f};
static ParticleScaleAndLifetimeRanges D_8038D55C = {{0.03f, 0.03f}, {0.03f, 0.03f}, {0.0f, 0.8f}, {1.0f, 1.1f}, 0.0f, 0.4f};
Actor *sp44;
ParticleEmitter *pCtrl;
f32 sp34[3];
@@ -391,7 +391,7 @@ void func_80387680(s32 arg0) {
particleEmitter_setPosition(pCtrl, sp34);
particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -30.0f, 130.0f, -30.0f, 130.0f, 45.0f, 30.0f);
func_802EFB98(pCtrl, &D_8038D55C);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D55C);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -500.0f, 0.0f, 0.0f, -500.0f, 0.0f);
particleEmitter_emitN(pCtrl, 11);
}
@@ -419,12 +419,12 @@ void func_803877A0(s32 arg0) {
func_8034A174((struct5Bs *) sp34->marker->unk44, 6, sp24);
particleEmitter_setPosition(pCtrl, sp24);
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8038D5C0);
func_802EFB98(pCtrl, &D_8038D590.unk0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D590.unk0);
particleEmitter_emitN(pCtrl, 1);
}
void func_803878A4(s32 arg0) {
static struct31s D_8038D5F0 = {{1.6f, 1.6f}, {1.6f, 1.6f}, {0.0f, 0.05f}, {4.0f, 4.0f}, 0.0f, 0.3f};
static ParticleScaleAndLifetimeRanges D_8038D5F0 = {{1.6f, 1.6f}, {1.6f, 1.6f}, {0.0f, 0.05f}, {4.0f, 4.0f}, 0.0f, 0.3f};
Actor *sp44;
ParticleEmitter *pCtrl;
f32 sp34[3];
@@ -440,13 +440,13 @@ void func_803878A4(s32 arg0) {
func_802EF9F8(pCtrl, 0.3f);
func_802EFA18(pCtrl, 3);
particleEmitter_setDrawMode(pCtrl, 2);
func_802EFB98(pCtrl, &D_8038D5F0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D5F0);
particleEmitter_setSfx(pCtrl, SFX_21_EGG_BOUNCE_1, 15000);
particleEmitter_emitN(pCtrl, 1);
}
void cutscenes_func_803879E0(s32 arg0) {
static struct31s D_8038D618 = {{1.6f, 1.6f}, {1.6f, 1.6f}, {0.0f, 3.0f}, {4.0f, 4.0f}, 0.0f, 0.3f};
static ParticleScaleAndLifetimeRanges D_8038D618 = {{1.6f, 1.6f}, {1.6f, 1.6f}, {0.0f, 3.0f}, {4.0f, 4.0f}, 0.0f, 0.3f};
Actor *sp44;
ParticleEmitter *pCtrl;
f32 sp34[3];
@@ -463,7 +463,7 @@ void cutscenes_func_803879E0(s32 arg0) {
func_802EF9F8(pCtrl, 0.3f);
func_802EFA18(pCtrl, 3);
particleEmitter_setDrawMode(pCtrl, 2);
func_802EFB98(pCtrl, &D_8038D618);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D618);
particleEmitter_setSfx(pCtrl, SFX_21_EGG_BOUNCE_1, 15000);
particleEmitter_emitN(pCtrl, 2);
}
@@ -488,7 +488,7 @@ void func_80387B58(s32 arg0) {
func_8034A174((struct5Bs *) sp44->marker->unk44, 5, sp34);
particleEmitter_setPosition(pCtrl, sp34);
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8038D670);
func_802EFB98(pCtrl, &D_8038D640.unk0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D640.unk0);
particleEmitter_emitN(pCtrl, 1);
}
@@ -517,7 +517,7 @@ void func_80387C64(s32 arg0) {
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -30.0f, 0.0f, 0.0f, -30.0f, 0.0f);
particleEmitter_setPosition(pCtrl, sp34);
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8038D6DC);
func_802EFB98(pCtrl, &D_8038D6AC.unk0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D6AC.unk0);
particleEmitter_emitN(pCtrl, 1);
}
}
@@ -543,7 +543,7 @@ void func_80387D88(s32 arg0) {
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -30.0f, 0.0f, 0.0f, -30.0f, 0.0f);
particleEmitter_setPosition(pCtrl, sp34);
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8038D73C);
func_802EFB98(pCtrl, &D_8038D70C.unk0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D70C.unk0);
particleEmitter_emitN(pCtrl, 25);
}
}
@@ -571,7 +571,7 @@ void func_80387E9C(s32 arg0) {
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -30.0f, 0.0f, 0.0f, -30.0f, 0.0f);
particleEmitter_setPosition(pCtrl, sp34);
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8038D7A8);
func_802EFB98(pCtrl, &D_8038D778.unk0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D778.unk0);
particleEmitter_emitN(pCtrl, 1);
}
}
@@ -598,7 +598,7 @@ void func_80387FC0(s32 arg0) {
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, 200.0f, 0.0f, 0.0f, 200.0f, 0.0f);
particleEmitter_setPosition(pCtrl, sp34);
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8038D808);
func_802EFB98(pCtrl, &D_8038D7D8.unk0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D7D8.unk0);
particleEmitter_emitN(pCtrl, 1);
}
}
@@ -626,7 +626,7 @@ void func_803880C8(s32 arg0) {
func_8034A174((struct5Bs *) sp34->marker->unk44, 5, sp24);
particleEmitter_setPosition(pCtrl, sp24);
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8038D874);
func_802EFB98(pCtrl, &D_8038D844.unk0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D844.unk0);
particleEmitter_emitN(pCtrl, 1);
}
@@ -651,7 +651,7 @@ void func_803881CC(s32 arg0) {
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, 100.0f, 0.0f, 0.0f, 300.0f, 0.0f);
particleEmitter_setPosition(pCtrl, sp34);
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8038D8D4);
func_802EFB98(pCtrl, &D_8038D8A4.unk0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038D8A4.unk0);
particleEmitter_emitN(pCtrl, 2);
}
}

View File

@@ -25,7 +25,7 @@ extern ActorInfo D_8038E718 = {
extern s32 D_8038E73C[3] = {0xff, 0xff, 0xff};
extern struct31s D_8038E748 = {
extern ParticleScaleAndLifetimeRanges D_8038E748 = {
{0.1f, 0.3f},
{0.0f, 0.0f},
{0.0f, 0.01f},
@@ -45,7 +45,7 @@ void cutscenes_func_8038CB20(ParticleEmitter *pCtrl){
particleEmitter_setAlpha(pCtrl, 230);
particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f,-600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setVelocityAndAccelerationRanges(pCtrl, &D_8038E770);
func_802EFB98(pCtrl, &D_8038E748);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038E748);
particleEmitter_setDrawMode(pCtrl, 4);
particleEmitter_manualFree(pCtrl);
}

View File

@@ -19,7 +19,7 @@ ActorInfo D_8038E7A0 = {
s32 D_8038E7C4[3] = {0xFF, 0xFF, 0xFF};
struct31s D_8038E7D0 = {
ParticleScaleAndLifetimeRanges D_8038E7D0 = {
{0.7f, 0.9f},
{0.4f, 0.5f},
{0.0f, 0.01f},
@@ -34,7 +34,7 @@ struct42s D_8038E7F8 ={
s32 D_8038E828[3] = {0xFF, 0xFF, 0xFF};
struct31s D_8038E834 = {
ParticleScaleAndLifetimeRanges D_8038E834 = {
{0.05f, 0.1f},
{0.1f, 0.2f},
{0.0f, 0.01f},
@@ -55,7 +55,7 @@ void func_8038CDE0(ParticleEmitter *pCtrl){
particleEmitter_setAlpha(pCtrl, 0xff);
particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f,-600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8038E7F8);
func_802EFB98(pCtrl, &D_8038E7D0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038E7D0);
func_802EFA78(pCtrl, 1);
particleEmitter_setDrawMode(pCtrl, 4);
particleEmitter_manualFree(pCtrl);
@@ -67,7 +67,7 @@ void func_8038CE98(ParticleEmitter *pCtrl){
particleEmitter_setAlpha(pCtrl, 0xff);
particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f,-600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8038E85C);
func_802EFB98(pCtrl, &D_8038E834);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038E834);
func_802EFA78(pCtrl, 1);
particleEmitter_setDrawMode(pCtrl, 4);
particleEmitter_manualFree(pCtrl);

View File

@@ -25,7 +25,7 @@ ActorInfo D_8038E8A8 = {
s32 D_8038E8CC[3] = {0xff, 0xff, 0xff};
struct31s D_8038E8D8 = {
ParticleScaleAndLifetimeRanges D_8038E8D8 = {
{0.6f, 0.6f},
{0.9f, 0.9f},
{0.0f, 0.01f},
@@ -46,7 +46,7 @@ void func_8038D080(ParticleEmitter *pCtrl){
particleEmitter_setAlpha(pCtrl, 60);
particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f,-600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setVelocityAndAccelerationRanges(pCtrl, &D_8038E900);
func_802EFB98(pCtrl, &D_8038E8D8);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038E8D8);
particleEmitter_setDrawMode(pCtrl, 4);
particleEmitter_manualFree(pCtrl);
}