documentations:

- various particle system functions/structs
- more in src/fight
- beehive
- added prototypes (reduced compiler warnings)

src/lair/code_0.c

@@ -16,7 +16,6 @@ extern int  actor_animationIsAt(Actor *, f32);
 extern void subaddie_set_state_with_direction(Actor *, s32, f32, s32);
 extern void func_8033A45C(s32, s32);
 extern void func_8034E0FC(void *, s32);
-extern void  *func_8034C2C4(ActorMarker *, s32);
 
 
 
@@ -162,7 +161,7 @@ ActorInfo D_8039339C = { 0x234, 0x23E, 0x4E1, 0x12, D_80392CB0, func_8038982C, f
 ActorInfo D_803933C0 = { 0x163, 0x258, 0x511, 0x12, D_80392CB0, func_80389898, func_80326224, func_8038664C, 0, 0,   0.0f, 0x8E};
 ActorInfo D_803933E4 = { 0x160, 0x255, 0x509, 0x15, D_80392CB0, func_80389934, func_80326224, actor_draw, 0, 0,   0.0f, 0};
 ActorInfo D_80393408 = { 0x102, 0x203, 0x491, 0x1, D_80392CB0, func_80387730, func_80326224, func_80387DA8, 0, 0,   0.0f, 0};
-struct31s D_8039342C = {
+ParticleScaleAndLifetimeRanges D_8039342C = {
     {0.31f, 0.37f},
     {0.17f, 0.22f},
     {0.0f,  0.01f},
@@ -199,7 +198,7 @@ s16 D_8039347C[] = {50, 180, 260, 350, 450, 640, 765, 810, 828, 846, 864, 882};
 
 s16 D_80393494[]  = {0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B}; 
 s32 D_803934A0[3] = {0x00, 0xFF, 0x00};
-struct31s D_803934AC = {
+ParticleScaleAndLifetimeRanges D_803934AC = {
     {1.0f, 2.0f},
     {2.4f, 5.0f},
     {0.0f, 3.2f},
@@ -320,7 +319,7 @@ ParticleEmitter *func_803866D8(s32 a0)
 
     particleEmitter_manualFree(ptr);
     particleEmitter_setSprite(ptr, ASSET_710_SPRITE_SPARKLE_PURPLE);
-    func_802EFB98(ptr, &D_8039342C);
+    particleEmitter_setScaleAndLifetimeRanges(ptr, &D_8039342C);
     particleEmitter_setParticleVelocityRange(ptr, 0.f, 70.f, 0.f, 0.f, 140.f, 0.f);
 
     colour[0] = a0 * 0xFF;
@@ -1191,7 +1190,7 @@ void func_80388524(Actor *this) {
                             particleEmitter_setAlpha(sp2C, 0x3C);
                             particleEmitter_setPosition(sp2C, this->position);
                             particleEmitter_setPositionAndVelocityRanges(sp2C, &D_803934D4);
-                            func_802EFB98(sp2C, &D_803934AC);
+                            particleEmitter_setScaleAndLifetimeRanges(sp2C, &D_803934AC);
                             particleEmitter_emitN(sp2C, 3);
                         }
                         break;
@@ -1640,7 +1639,7 @@ void func_80389934(Actor *this)
             if (actor_animationIsAt(this, 0.95f))
             {
                 subaddie_set_state_with_direction(this, 0x18, 0.999f, 1);
-                FUNC_8030E624(SFX_7F_HEAVYDOOR_SLAM, 1.0f, 26000,);
+                FUNC_8030E624(SFX_7F_HEAVYDOOR_SLAM, 1.0f, 26000);
             }
 
             break;

src/lair/code_86F0.c

@@ -41,7 +41,7 @@ Struct_lair_86F0_0 D_803947F8[0xb] ={
     { 4, 0x3, FILEPROG_7F_DOUBLE_HEALTH_PUZZLE_PIECES_PLACED}
 };
 s32 D_80394824[3] = {0xff, 0xff, 0};
-struct31s D_80394830 = {
+ParticleScaleAndLifetimeRanges D_80394830 = {
     {0.17f, 0.24f},
     {0.08f, 0.13f},
     {0.0f, 0.01f},
@@ -460,7 +460,7 @@ void lair_func_8038F924(Actor *this) {
             sp54 = partEmitMgr_newEmitter(6);
             particleEmitter_setSprite(sp54, ASSET_710_SPRITE_SPARKLE_PURPLE);
             particleEmitter_setAlpha(sp54, 0xFF);
-            func_802EFB98(sp54, &D_80394830);
+            particleEmitter_setScaleAndLifetimeRanges(sp54, &D_80394830);
             particleEmitter_setPosition(sp54, this->position);
             sp58[2] = randf() * 255.0f;
             particleEmitter_setRGB(sp54, sp58);

src/lair/code_AD70.c

@@ -20,7 +20,7 @@ void func_80391B04(Actor *this);
 /* .data */
 ActorInfo D_80394AB0 = { 0x1EF, 0x3BB, 0x54B, 0x1, NULL, func_80391B04, func_80326224, func_80325340, 0, 0, 0.0f, 0};
 s32 D_80394AD4[3] = {0xBA, 0xBA, 0xBA};
-struct31s D_80394AE0 = {
+ParticleScaleAndLifetimeRanges D_80394AE0 = {
     {0.1f, 0.2f},
     {3.6f, 4.6f},
     {1.0f, 1.0f},
@@ -28,7 +28,7 @@ struct31s D_80394AE0 = {
     0.05f, 0.1f
 };
 
-struct31s D_80394B08 = {
+ParticleScaleAndLifetimeRanges D_80394B08 = {
     {0.3f, 0.5f},
     {0.0f, 0.0f},
     {0.0f, 0.1f},
@@ -62,7 +62,7 @@ void func_80391160(f32 pos[3], u32 count)
     particleEmitter_setPosition(p, pos);
     particleEmitter_setParticleSpawnPositionRange(p, -55, -55, -55, 55, 55, 55);
     particleEmitter_setParticleVelocityRange(p, -70, -70, -70, 70, 70, 70);
-    func_802EFB98(p, &D_80394AE0);
+    particleEmitter_setScaleAndLifetimeRanges(p, &D_80394AE0);
     particleEmitter_emitN(p, count);
 }
 
@@ -91,7 +91,7 @@ void func_8039137C(f32 pos[3], u32 count, enum asset_e sprite)
     func_802EFA18(p, 3);
     particleEmitter_setAngularVelocityRange(p, 0, 0, 600, 0, 0, 900);
     particleEmitter_setPositionVelocityAndAccelerationRanges(p, &D_80394B30);
-    func_802EFB98(p, &D_80394B08);
+    particleEmitter_setScaleAndLifetimeRanges(p, &D_80394B08);
     particleEmitter_setDrawMode(p, 2);
     particleEmitter_emitN(p, count);
 }