kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fight and other docu

Browse Source
This commit is contained in:
Mario
2024-10-08 05:54:59 +00:00
committed by Banjo Kazooie
parent ea4b9ab1a6
commit cd336b9b58
223 changed files with 2692 additions and 2652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core2/bs/droneenter.c
View File

@@ -47,25 +47,25 @@ void __bsDroneEnter_emitParticles(void) {
f32 plyr_pos[3];
player_getPosition(plyr_pos);
particleEmitter_setParticleAccelerationRange(bsDroneEnter.yellow_sparkle_emitter, 0.0f, 700.0f, 0.0f, 0.0f, 1200.0f, 0.0f);
particleEmitter_setParticleSpawnPositionRange(bsDroneEnter.yellow_sparkle_emitter, -45.0f, -5.0f, -45.0f, 45.0f, 10.0f, 45.0f);
particleEmitter_setAccelerationRange(bsDroneEnter.yellow_sparkle_emitter, 0.0f, 700.0f, 0.0f, 0.0f, 1200.0f, 0.0f);
particleEmitter_setSpawnPositionRange(bsDroneEnter.yellow_sparkle_emitter, -45.0f, -5.0f, -45.0f, 45.0f, 10.0f, 45.0f);
particleEmitter_setPosition(bsDroneEnter.yellow_sparkle_emitter, plyr_pos);
particleEmitter_emitN(bsDroneEnter.yellow_sparkle_emitter, 1);
particleEmitter_setParticleAccelerationRange(bsDroneEnter.white_sparkle_emitter, 0.0f, 700.0f, 0.0f, 0.0f, 1200.0f, 0.0f);
particleEmitter_setParticleSpawnPositionRange(bsDroneEnter.yellow_sparkle_emitter, -45.0f, -5.0f, -45.0f, 45.0f, 10.0f, 45.0f);
particleEmitter_setAccelerationRange(bsDroneEnter.white_sparkle_emitter, 0.0f, 700.0f, 0.0f, 0.0f, 1200.0f, 0.0f);
particleEmitter_setSpawnPositionRange(bsDroneEnter.yellow_sparkle_emitter, -45.0f, -5.0f, -45.0f, 45.0f, 10.0f, 45.0f);
particleEmitter_setPosition(bsDroneEnter.white_sparkle_emitter, plyr_pos);
particleEmitter_emitN(bsDroneEnter.white_sparkle_emitter, 1);
player_getPosition(plyr_pos);
plyr_pos[1] += 130.0f;
particleEmitter_setParticleAccelerationRange(bsDroneEnter.yellow_sparkle_emitter, 0.0f, -700.0f, 0.0f, 0.0f, -1200.0f, 0.0f);
particleEmitter_setParticleSpawnPositionRange(bsDroneEnter.yellow_sparkle_emitter, -45.0f, -10.0f, -45.0f, 45.0f, 10.0f, 45.0f);
particleEmitter_setAccelerationRange(bsDroneEnter.yellow_sparkle_emitter, 0.0f, -700.0f, 0.0f, 0.0f, -1200.0f, 0.0f);
particleEmitter_setSpawnPositionRange(bsDroneEnter.yellow_sparkle_emitter, -45.0f, -10.0f, -45.0f, 45.0f, 10.0f, 45.0f);
particleEmitter_setPosition(bsDroneEnter.yellow_sparkle_emitter, plyr_pos);
particleEmitter_emitN(bsDroneEnter.yellow_sparkle_emitter, 1);
particleEmitter_setParticleAccelerationRange(bsDroneEnter.white_sparkle_emitter, 0.0f, -700.0f, 0.0f, 0.0f, -1200.0f, 0.0f);
particleEmitter_setParticleSpawnPositionRange(bsDroneEnter.yellow_sparkle_emitter, -45.0f, -10.0f, -45.0f, 45.0f, 10.0f, 45.0f);
particleEmitter_setAccelerationRange(bsDroneEnter.white_sparkle_emitter, 0.0f, -700.0f, 0.0f, 0.0f, -1200.0f, 0.0f);
particleEmitter_setSpawnPositionRange(bsDroneEnter.yellow_sparkle_emitter, -45.0f, -10.0f, -45.0f, 45.0f, 10.0f, 45.0f);
particleEmitter_setPosition(bsDroneEnter.white_sparkle_emitter, plyr_pos);
particleEmitter_emitN(bsDroneEnter.white_sparkle_emitter, 1);
}

10
src/core2/bs/dronevanish.c
View File

@@ -40,17 +40,17 @@ void __bsDroneVanish_emitParticles(void) {
f32 position[3];
player_getPosition(position);
particleEmitter_setParticleAccelerationRange(D_8037D450.unk4, 0.0f, 700.0f, 0.0f, 0.0f, 1200.0f, 0.0f);
particleEmitter_setAccelerationRange(D_8037D450.unk4, 0.0f, 700.0f, 0.0f, 0.0f, 1200.0f, 0.0f);
particleEmitter_setPosition(D_8037D450.unk4, position);
particleEmitter_emitN(D_8037D450.unk4, 1);
particleEmitter_setParticleAccelerationRange(D_8037D450.unk0, 0.0f, 700.0f, 0.0f, 0.0f, 1200.0f, 0.0f);
particleEmitter_setAccelerationRange(D_8037D450.unk0, 0.0f, 700.0f, 0.0f, 0.0f, 1200.0f, 0.0f);
particleEmitter_setPosition(D_8037D450.unk0, position);
particleEmitter_emitN(D_8037D450.unk0, 1);
position[1] += 130.0f;
particleEmitter_setParticleAccelerationRange(D_8037D450.unk4, 0.0f, -700.0f, 0.0f, 0.0f, -1200.0f, 0.0f);
particleEmitter_setAccelerationRange(D_8037D450.unk4, 0.0f, -700.0f, 0.0f, 0.0f, -1200.0f, 0.0f);
particleEmitter_setPosition(D_8037D450.unk4, position);
particleEmitter_emitN(D_8037D450.unk4, 1);
particleEmitter_setParticleAccelerationRange(D_8037D450.unk0, 0.0f, -700.0f, 0.0f, 0.0f, -1200.0f, 0.0f);
particleEmitter_setAccelerationRange(D_8037D450.unk0, 0.0f, -700.0f, 0.0f, 0.0f, -1200.0f, 0.0f);
particleEmitter_setPosition(D_8037D450.unk0, position);
particleEmitter_emitN(D_8037D450.unk0, 1);
}
@@ -59,7 +59,7 @@ void __bsDroneVanish_particleEmitInit(ParticleEmitter *p_ctrl, enum asset_e spri
particleEmitter_manualFree();
particleEmitter_setSprite(p_ctrl, sprite_id);
particleEmitter_setFade(p_ctrl, 0.3f, 0.8f);
particleEmitter_setParticleSpawnPositionRange(p_ctrl, -45.0f, 0.0f, -45.0f, 45.0f, 0.0f, 45.0f);
particleEmitter_setSpawnPositionRange(p_ctrl, -45.0f, 0.0f, -45.0f, 45.0f, 0.0f, 45.0f);
particleEmitter_setStartingScaleRange(p_ctrl, 0.15f, 0.22f);
particleEmitter_setFinalScaleRange(p_ctrl, 0.03f, 0.05f);
particleEmitter_setAngularVelocityRange(p_ctrl, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);

22
src/core2/bs/dronexform.c
View File

@@ -36,7 +36,7 @@ struct {
void func_802AF7A0(ParticleEmitter *arg0, enum asset_e arg1){
particleEmitter_manualFree(arg0);
particleEmitter_setSprite(arg0, arg1);
particleEmitter_setParticleAccelerationRange(arg0, 0.0f, -50.0f, 0.0f, 0.0f, -50.0f, 0.0f);
particleEmitter_setAccelerationRange(arg0, 0.0f, -50.0f, 0.0f, 0.0f, -50.0f, 0.0f);
particleEmitter_setFade(arg0, 0.4f, 0.8f);
particleEmitter_setFinalScaleRange(arg0, 0.03f, 0.03f);
particleEmitter_setAngularVelocityRange(arg0, 0.0f, 0.0f, 300.0f, 0.0f, 0.0f, 300.0f);
@@ -116,31 +116,31 @@ void func_802AFBAC(f32 arg0){
}
void func_802AFBB8(f32 arg0[3]){
static struct41s D_80364BB0 = {
static ParticleSettingsVelocityAcceleration D_80364BB0 = {
{{-150.0f, 10.0f, -150.0f}, { 150.0f, 50.0f, 150.0f}},
{{ 0.0f, -50.0f, 0.0f}, { 0.0f, -50.0f, 0.0f}}
};
static struct41s D_80364BE0 = {
static ParticleSettingsVelocityAcceleration D_80364BE0 = {
{{-300.0f, 150.0f, -300.0f}, { 300.0f, 200.0f, 300.0f}},
{{ 0.0f, -150.0f, 0.0f}, { 0.0f, -150.0f, 0.0f}}
};
static struct41s D_80364C10 = {
static ParticleSettingsVelocityAcceleration D_80364C10 = {
{{-100.0f, 10.0f, -100.0f}, { 100.0f, 15.0f, 100.0f}},
{{ 0.0f, -700.0f, 0.0f}, { 0.0f, -700.0f, 0.0f}}
};
static struct41s D_80364C40 = {
static ParticleSettingsVelocityAcceleration D_80364C40 = {
{{ -50.0f, 60.0f, -50.0f}, { 50.0f, 150.0f, 50.0f}},
{{ 0.0f, -50.0f, 0.0f}, { 0.0f, -50.0f, 0.0f}}
};
static struct41s D_80364C70 = {
static ParticleSettingsVelocityAcceleration D_80364C70 = {
{{-400.0f, 150.0f, -400.0f}, { 400.0f, 200.0f, 400.0f}},
{{ 0.0f, -200.0f, 0.0f}, { 0.0f, -200.0f, 0.0f}}
};
static struct41s D_80364CA0 = {
static ParticleSettingsVelocityAcceleration D_80364CA0 = {
{{-200.0f, 10.0f, -200.0f}, { 200.0f, 20.0f, 200.0f}},
{{ 0.0f, -850.0f, 0.0f}, { 0.0f, -850.0f, 0.0f}}
};
@@ -180,8 +180,8 @@ void func_802AFBB8(f32 arg0[3]){
particleEmitter_emitN(s0, 5);
particleEmitter_setVelocityAndAccelerationRanges(s0, &D_80364C10);
func_802EF9F8(s0, 0.4f);
func_802EFA18(s0, 3);
particleEmitter_func_802EF9F8(s0, 0.4f);
particleEmitter_func_802EFA18(s0, 3);
particleEmitter_emitN(s0, 4);
s0 = partEmitMgr_newEmitter(0x11);
@@ -200,8 +200,8 @@ void func_802AFBB8(f32 arg0[3]){
particleEmitter_emitN(s0, 5);
particleEmitter_setVelocityAndAccelerationRanges(s0, &D_80364CA0);
func_802EF9F8(s0, 0.4f);
func_802EFA18(s0, 3);
particleEmitter_func_802EF9F8(s0, 0.4f);
particleEmitter_func_802EFA18(s0, 3);
particleEmitter_emitN(s0, 4);
}

2
src/core2/ch/badShad.c
View File

@@ -14,7 +14,7 @@ void func_802D729C(Actor *actor, f32 arg1);
ActorInfo chBadShad = {
0x9B, 0x108, 0x3BF,
0x1, NULL,
chBadShad_update, func_80326224, chBadShad_draw,
chBadShad_update, actor_update_func_80326224, chBadShad_draw,
0, 0, 0.0f, 0
};

2
src/core2/ch/bat.c
View File

@@ -40,7 +40,7 @@ ActorAnimationInfo sChBatAnimations[] = {
ActorInfo gChBat = {
MARKER_127_BAT, ACTOR_163_BAT, ASSET_3CA_MODEL_BAT,
CH_BAT_STATE_ROOSTING, sChBatAnimations,
chbat_update, func_80326224, actor_draw,
chbat_update, actor_update_func_80326224, actor_draw,
2500, 0, 0.9f, 0
};

2
src/core2/ch/beehive.c
View File

@@ -19,7 +19,7 @@ ActorAnimationInfo chBeehiveAnimations[] ={
ActorInfo chBeehive = {MARKER_50_BEEHIVE, ACTOR_12_BEEHIVE, ASSET_364_MODEL_BEEHIVE,
1, chBeehiveAnimations,
chBeehive_update, func_80326224, actor_draw,
chBeehive_update, actor_update_func_80326224, actor_draw,
0, 0x333, 0.0f, 0
};

4
src/core2/ch/bigbutt.c
View File

@@ -28,13 +28,13 @@ ActorAnimationInfo D_80366010[] ={
ActorInfo D_80366090 = {0x3, ACTOR_4_BIGBUTT, ASSET_353_MODEL_BIGBUTT,
1, D_80366010,
func_802C6240, func_80326224, func_802C6E84,
func_802C6240, actor_update_func_80326224, func_802C6E84,
3200, 0, 0.0f, 0
};
ActorInfo D_803660B4 = {0x9, ACTOR_E_BULL_INTRO, ASSET_354_MODEL_BULL_INTRO,
1, D_80366010,
func_802C6240, func_80326224, func_802C6E84,
func_802C6240, actor_update_func_80326224, func_802C6E84,
3200, 0, 0.0f, 0
};

2
src/core2/ch/bottlesbonus.c
View File

@@ -94,7 +94,7 @@ f32 D_803682C4[3] = {0.0f, 0.0f, 0.0f};
ActorInfo chBottlesBonusDescription = {
0x179, 0x1E0, 0x46C,
0x1, chBottlesBonusAnimations,
chBottlesBonus_update, func_80326224, chBottlesBonus_draw,
chBottlesBonus_update, actor_update_func_80326224, chBottlesBonus_draw,
0, 0, 0.0f, 0
};

2
src/core2/ch/bottlesbonuscursor.c
View File

@@ -57,7 +57,7 @@ f32 D_8036840C[3] = {-11.28f, 3.92f, -52.96f};
ActorInfo D_80368418 = {
0x17A, 0x2B4, 0x565,
0x1, D_803683B0,
chBottlesBonusCursor_update, func_80326224, func_80325340,
chBottlesBonusCursor_update, actor_update_func_80326224, func_80325340,
0, 0, 0.0f, 0
};

2
src/core2/ch/bubble.c
View File

@@ -12,7 +12,7 @@ extern void func_802F32C4(s32, f32[3], f32, ActorMarker *, s32(*)(f32[3], f32, A
/* .data */
ActorInfo chBubble = {
MARKER_6B_GLOOPBUBBLE, ACTOR_E7_GLOOP_BUBBLE, ASSET_704_SPRITE_BUBBLE,
0, NULL, chBubble_update, func_80326224, func_80325340,
0, NULL, chBubble_update, actor_update_func_80326224, func_80325340,
0, 0, 0.0f, 0
};

2
src/core2/ch/climbBase.c
View File

@@ -16,7 +16,7 @@ typedef struct {
ActorInfo D_80367B20 = {
0x35, 0x26, 0x0,
0x1, NULL,
func_802D77D4, func_80326224, func_80325340,
func_802D77D4, actor_update_func_80326224, func_80325340,
0, 0, 0.0f, 0
};

6
src/core2/ch/collectible.c
View File

@@ -14,21 +14,21 @@ void chCollectible_update(Actor *this);
extern ActorInfo D_80367D00 = {
MARKER_60_BLUE_EGG_COLLECTIBLE, ACTOR_52_BLUE_EGG, ASSET_36D_SPRITE_BLUE_EGG,
0, NULL,
chCollectible_update, func_80326224, chCollectible_draw,
chCollectible_update, actor_update_func_80326224, chCollectible_draw,
0, 0, 0.7f, 0
};
extern ActorInfo D_80367D24 = {
MARKER_B5_RED_FEATHER_COLLECTIBLE, ACTOR_129_RED_FEATHER, ASSET_580_SPRITE_RED_FEATHER,
0, NULL,
chCollectible_update, func_80326224, chCollectible_draw,
chCollectible_update, actor_update_func_80326224, chCollectible_draw,
0, 0, 0.5f, 0
};
extern ActorInfo D_80367D48 = {
MARKER_1E5_GOLD_FEATHER_COLLECTIBLE, ACTOR_370_GOLD_FEATHER, ASSET_6D1_SPRITE_GOLDFEATHTER,
0, NULL,
chCollectible_update, func_80326224, chCollectible_draw,
chCollectible_update, actor_update_func_80326224, chCollectible_draw,
0, 0, 0.5f, 0
};

16
src/core2/ch/crab.c
View File

@@ -94,8 +94,8 @@ void __chCrab_ow(ActorMarker *marker, ActorMarker *other) {
void __chCrab_particleEmitterSetup(ParticleEmitter *p_ctrl, f32 position[3]) {
particleEmitter_setPosition(p_ctrl, position);
particleEmitter_setDrawMode(p_ctrl, 2);
func_802EF9F8(p_ctrl, 0.7f);
func_802EFA18(p_ctrl, 5);
particleEmitter_func_802EF9F8(p_ctrl, 0.7f);
particleEmitter_func_802EFA18(p_ctrl, 5);
func_802EFA20(p_ctrl, 0.8f, 1.0f);
particleEmitter_setSfx(p_ctrl, SFX_1F_HITTING_AN_ENEMY_3, 10000);
particleEmitter_setSpawnIntervalRange(p_ctrl, 0.0f, 0.01f);
@@ -106,7 +106,7 @@ void __chCrab_particleEmitterSetup(ParticleEmitter *p_ctrl, f32 position[3]) {
void __chCrab_emitClawPiece(ParticleEmitter *p_ctrl, f32 position[3], enum asset_e model_id) {
__chCrab_particleEmitterSetup(p_ctrl, position);
particleEmitter_setParticleAccelerationRange(p_ctrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setAccelerationRange(p_ctrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setModel(p_ctrl, model_id);
particleEmitter_setStartingScaleRange(p_ctrl, 0.5f, 0.8f);
particleEmitter_setAngularVelocityRange(p_ctrl, -800.0f, -800.0f, -800.0f, 800.0f, 800.0f, 800.0f);
@@ -116,7 +116,7 @@ void __chCrab_emitClawPiece(ParticleEmitter *p_ctrl, f32 position[3], enum asset
void __chCrab_emitLegPiece(ParticleEmitter *p_ctrl, f32 position[3], enum asset_e model_id) {
__chCrab_particleEmitterSetup(p_ctrl, position);
particleEmitter_setParticleAccelerationRange(p_ctrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setAccelerationRange(p_ctrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setModel(p_ctrl, model_id);
particleEmitter_setStartingScaleRange(p_ctrl, 0.5f, 0.8f);
particleEmitter_setAngularVelocityRange(p_ctrl, -800.0f, -800.0f, -800.0f, 800.0f, 800.0f, 800.0f);
@@ -126,7 +126,7 @@ void __chCrab_emitLegPiece(ParticleEmitter *p_ctrl, f32 position[3], enum asset_
void __chCrab_emitHeadPiece(ParticleEmitter *p_ctrl, f32 position[3], enum asset_e model_id) {
__chCrab_particleEmitterSetup(p_ctrl, position);
particleEmitter_setParticleAccelerationRange(p_ctrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setAccelerationRange(p_ctrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setModel(p_ctrl, model_id);
particleEmitter_setStartingScaleRange(p_ctrl, 1.0f, 1.0f);
particleEmitter_setAngularVelocityRange(p_ctrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
@@ -399,6 +399,6 @@ void chCrab_update(Actor *this) {
}
/* .data */
ActorInfo D_803670B8 = { MARKER_13_SNIPPET, ACTOR_67_SNIPPET, ASSET_358_SNIPPET, 0x1, chCrabAnimations, chCrab_update, func_80326224, actor_draw, 1900, 0, 0.8f, 0};
ActorInfo D_803670DC = { MARKER_DD_BLACK_SNIPPET, ACTOR_F2_BLACK_SNIPPET, ASSET_566_MODEL_BLACK_SNIPPET, 0x1, chCrabAnimations, chCrab_update, func_80326224, actor_draw, 1900, 0, 0.8f, 0};
ActorInfo D_80367100 = { MARKER_13_SNIPPET, ACTOR_F5_MUTIE_SNIPPET, ASSET_38F_MODEL_MUTIE_SNIPPET, 0x1, chCrabMutantAnimations, chCrab_update, func_80326224, actor_draw, 1900, 0, 0.8f, 0};
ActorInfo D_803670B8 = { MARKER_13_SNIPPET, ACTOR_67_SNIPPET, ASSET_358_SNIPPET, 0x1, chCrabAnimations, chCrab_update, actor_update_func_80326224, actor_draw, 1900, 0, 0.8f, 0};
ActorInfo D_803670DC = { MARKER_DD_BLACK_SNIPPET, ACTOR_F2_BLACK_SNIPPET, ASSET_566_MODEL_BLACK_SNIPPET, 0x1, chCrabAnimations, chCrab_update, actor_update_func_80326224, actor_draw, 1900, 0, 0.8f, 0};
ActorInfo D_80367100 = { MARKER_13_SNIPPET, ACTOR_F5_MUTIE_SNIPPET, ASSET_38F_MODEL_MUTIE_SNIPPET, 0x1, chCrabMutantAnimations, chCrab_update, actor_update_func_80326224, actor_draw, 1900, 0, 0.8f, 0};

8
src/core2/ch/drips.c
View File

@@ -19,7 +19,7 @@ void chdrips_update(Actor *this);
ActorInfo gChDripsInfo = {
0x246, ACTOR_354_DRIPS, 0,
0, NULL,
chdrips_update, func_80326224, func_80325340,
chdrips_update, actor_update_func_80326224, func_80325340,
5000, 0, 0.0f, 0
};
@@ -27,7 +27,7 @@ s32 D_80372AE4[3] = {0xff, 0xff, 0xfe};
struct_core2_D2AB0 D_80372AF0 = {0.0f, 0.0f, 1.0f, 1.4f};
struct43s D_80372B00 = {
ParticleSettingsVelocityAccelerationPosition D_80372B00 = {
{{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}},
{{0.0f, -650.0f, 0.0f}, {0.0f, -650.0f, 0.0f}},
{{-400.0f, 0.0f, -400.0f}, {400.0f, 0.0f, 400.0f}}
@@ -78,8 +78,8 @@ void chdrips_update(Actor *this){
pCtrl = partEmitMgr_newEmitter(1);
particleEmitter_setModel(pCtrl, ASSET_8A0_SPRITE_WATER_DROP);
particleEmitter_setPosition(pCtrl, this->position);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80372B00);
func_802EFA18(pCtrl, 1);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80372B00);
particleEmitter_func_802EFA18(pCtrl, 1);
particleEmitter_setParticleCallback(pCtrl, __chdrips_particleCallback);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 7.0f, 7.0f);

8
src/core2/ch/firefx.c
View File

@@ -10,7 +10,7 @@ void chfirefx_update(Actor *this);
ActorInfo gChFireFxInfo = {
MARKER_256_FIRE_FX, ACTOR_383_FIRE_FX, ASSET_526_SPRITE_FIRE,
0, NULL,
chfirefx_update, func_80326224, actor_draw,
chfirefx_update, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};
@@ -23,7 +23,7 @@ void __chfirefx_spawnSmoke(f32 position[3], f32 scale){
particleEmitter_setStartingFrameRange(pCtrl, 1, 6);
particleEmitter_setAlpha(pCtrl, 0x23);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setParticleSpawnPositionRange(pCtrl, 0.0f, 110.0f*scale, 0.0f, 0.0f, 110.0f*scale, 0.0f);
particleEmitter_setSpawnPositionRange(pCtrl, 0.0f, 110.0f*scale, 0.0f, 0.0f, 110.0f*scale, 0.0f);
particleEmitter_setParticleVelocityRange(pCtrl, 0.0f, 40.0f*scale, 0.0f, 0.0f, 90.0f*scale, 0.0f);
particleEmitter_setStartingScaleRange(pCtrl, 2.6*scale, 3.2*scale);
particleEmitter_setFinalScaleRange(pCtrl, 5.0*scale, 6.0*scale);
@@ -41,9 +41,9 @@ void __chfirefx_spawnSpark(f32 position[3], f32 scale){
particleEmitter_setSprite(pCtrl, ASSET_713_SPRITE_SPARKLE_YELLOW);
particleEmitter_setStartingFrameRange(pCtrl, 1, 6);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setParticleSpawnPositionRange(pCtrl, 0.0f, 20.0f*scale, 0.0f, 0.0f, 20.0f*scale, 0.0f);
particleEmitter_setSpawnPositionRange(pCtrl, 0.0f, 20.0f*scale, 0.0f, 0.0f, 20.0f*scale, 0.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -30.0f*scale, 120.0f*scale, -30.0f*scale, 60.0f*scale, 360.0f*scale, 60.0f*scale);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -50.0f, 0.0f, 0.0f, -90.0f, 0.0f);
particleEmitter_setAccelerationRange(pCtrl, 0.0f, -50.0f, 0.0f, 0.0f, -90.0f, 0.0f);
particleEmitter_setStartingScaleRange(pCtrl, 0.1*scale, 0.2*scale);
particleEmitter_setFinalScaleRange(pCtrl, 0.2*scale, 0.4*scale);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);

4
src/core2/ch/flotsam.c
View File

@@ -37,7 +37,7 @@ ParticleScaleAndLifetimeRanges D_80372CA4 = {
0.1f, 0.5f
};
struct43s D_80372CCC = {
ParticleSettingsVelocityAccelerationPosition D_80372CCC = {
{{-5.0f, 10.0f, -5.0f}, {5.0f, 50.0f, 5.0f}},
{{0.0f, 200.0f, 0.0f}, {0.0f, 1000.0f, 0.0f}},
{{-20.0f, -20.0f, -20.0f}, {20.0f, 20.0f, 20.0f}}
@@ -182,7 +182,7 @@ void func_8035C080(Actor *this, s32 next_state){
particleEmitter_setSprite(local->pCtrl_8, ASSET_70E_SPRITE_SMOKE_2);
particleEmitter_setStartingFrameRange(local->pCtrl_8, 0, 7);
particleEmitter_setPosition(local->pCtrl_8, this->position);
particleEmitter_setPositionVelocityAndAccelerationRanges(local->pCtrl_8, &D_80372CCC);
particleEmitter_setVelocityAccelerationAndPositionRanges(local->pCtrl_8, &D_80372CCC);
particleEmitter_setScaleAndLifetimeRanges(local->pCtrl_8, &D_80372CA4);
particleEmitter_setSpawnInterval(local->pCtrl_8, 4);
}//L8035C698

6
src/core2/ch/gameSelect.c
View File

@@ -55,7 +55,7 @@ ActorAnimationInfo D_80365E28[] = {
{0x24F, 0.6f},
{0x24D, 2.0f}
};
ActorInfo D_80365E58 = { 0xE4, 0x195, 0x532, 0x1, D_80365E28, func_802C5740, func_80326224, func_802C4464, 0, 0, 0.0f, 0};
ActorInfo D_80365E58 = { 0xE4, 0x195, 0x532, 0x1, D_80365E28, func_802C5740, actor_update_func_80326224, func_802C4464, 0, 0, 0.0f, 0};
ActorAnimationInfo D_80365E7C[] = {
{0x000, 0.0f},
@@ -65,7 +65,7 @@ ActorAnimationInfo D_80365E7C[] = {
{0x252, 0.67f},
{0x250, 4.5f},
};
ActorInfo D_80365EAC = { 0xE5, 0x196, 0x532, 0x1, D_80365E7C, func_802C4C14, func_80326224, func_802C4360, 0, 0, 0.0f, 0};
ActorInfo D_80365EAC = { 0xE5, 0x196, 0x532, 0x1, D_80365E7C, func_802C4C14, actor_update_func_80326224, func_802C4360, 0, 0, 0.0f, 0};
ActorAnimationInfo D_80365ED0[] = {
{0x000, 0.0f},
@@ -75,7 +75,7 @@ ActorAnimationInfo D_80365ED0[] = {
{0x24C, 1.0f},
{0x24A, 1.0f}
};
ActorInfo D_80365F00 = { 0xE6, 0x197, 0x532, 0x1, D_80365ED0, func_802C4C14, func_80326224, func_802C4360, 0, 0, 0.0f, 0};
ActorInfo D_80365F00 = { 0xE6, 0x197, 0x532, 0x1, D_80365ED0, func_802C4C14, actor_update_func_80326224, func_802C4360, 0, 0, 0.0f, 0};
/* .bss */

6
src/core2/ch/ghost.c
View File

@@ -26,7 +26,7 @@ ActorAnimationInfo D_80372BE0[] ={
ActorInfo D_80372C18 = { //TEEHEE
MARKER_99_TEEHEE, ACTOR_CA_TEEHEE, ASSET_3CB_MODEL_TEEHEE,
0x1, D_80372BE0,
func_8035B900, func_80326224, actor_draw,
func_8035B900, actor_update_func_80326224, actor_draw,
6500, 0, 0.9f, 0
};
@@ -48,11 +48,11 @@ void func_8035AFE0(f32 scale, f32 pos[3], s32 cnt, enum asset_e sprite_id, s32 a
particleEmitter_setSprite(pCtrl, sprite_id);
particleEmitter_setRGB(pCtrl, arg4);
particleEmitter_setPosition(pCtrl, pos);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
particleEmitter_setSpawnPositionRange(pCtrl,
-100.0f*scale, 20.0f*scale, -100.0f*scale,
100.0f*scale, 200.0f*scale, 100.0f*scale
);
particleEmitter_setParticleAccelerationRange(pCtrl,
particleEmitter_setAccelerationRange(pCtrl,
0.0f, -10.0f*scale, 0.0f,
0.0f, -10.0f*scale, 0.0f
);

2
src/core2/ch/gloop.c
View File

@@ -50,7 +50,7 @@ void chgloop_update(Actor *this){
this->marker->propPtr->unk8_3 = TRUE;
}
func_80326224(this);
actor_update_func_80326224(this);
switch(this->state){
case 2://L802D14DC

8
src/core2/ch/gravestone.c
View File

@@ -28,14 +28,14 @@ ActorAnimationInfo D_80372F80[] = {
ActorInfo D_80372FC0 = {
MARKER_96_GRAVESTONE, ACTOR_C7_GRAVESTONE, ASSET_3C9_MODEL_GRAVESTONE,
0x1, D_80372F80,
func_8035F138, func_80326224, func_8035ECA0,
func_8035F138, actor_update_func_80326224, func_8035ECA0,
3500, 0, 1.2f, 0
};
ActorInfo D_80372FE4 = {
MARKER_297_GIANT_GRAVESTONE, ACTOR_3C2_GIANT_GRAVESTONE, ASSET_3C9_MODEL_GRAVESTONE,
0x1, D_80372F80,
func_8035F138, func_80326224, func_8035ECA0,
func_8035F138, actor_update_func_80326224, func_8035ECA0,
14000, 0, 3.2f, 0
};
@@ -71,7 +71,7 @@ bool func_8035ED60(Actor *this) {
void func_8035EDB0(f32 position[3], s32 count, enum asset_e sprite) {
static s32 D_80373014[3] = {0xAA, 0xAA, 0xAA};
static ParticleScaleAndLifetimeRanges D_80373020 = {{0.4f, 0.8f}, {1.4f, 2.0f}, {0.0f, 0.01f}, {1.2f, 1.8f}, 0.0f, 0.01};
static struct43s D_80373048 = {
static ParticleSettingsVelocityAccelerationPosition D_80373048 = {
{{-200.0f, -200.0f, -200.0f}, { 200.0f, 200.0f, 200.0f}},
{{ 0.0f, -10.0f, 0.0f}, { 0.0f, -10.0f, 0.0f}},
{{ -50.0f, 0.0f, -50.0f}, { 50.0f, 200.0f, 50.0f}}
@@ -82,7 +82,7 @@ void func_8035EDB0(f32 position[3], s32 count, enum asset_e sprite) {
particleEmitter_setRGB(p_ctrl, D_80373014);
particleEmitter_setSprite(p_ctrl, sprite);
particleEmitter_setPosition(p_ctrl, position);
particleEmitter_setPositionVelocityAndAccelerationRanges(p_ctrl, &D_80373048);
particleEmitter_setVelocityAccelerationAndPositionRanges(p_ctrl, &D_80373048);
particleEmitter_setScaleAndLifetimeRanges(p_ctrl, &D_80373020);
particleEmitter_setDrawMode(p_ctrl, PART_EMIT_NO_DEPTH);
particleEmitter_emitN(p_ctrl, count);

14
src/core2/ch/icecube.c
View File

@@ -24,14 +24,14 @@ ActorAnimationInfo D_80372B50[] = {
ActorInfo D_80372B80 = {
MARKER_250_ICECUBE_A, ACTOR_37D_ICECUBE_A, ASSET_504_MODEL_ICECUBE,
1, D_80372B50,
chicecube_update, func_80326224, chicecube_draw,
chicecube_update, actor_update_func_80326224, chicecube_draw,
0, 0, 0.0f, 0
};
ActorInfo D_80372BA4 = {
MARKER_25F_ICECUBE_B, ACTOR_3A0_ICECUBE_B, ASSET_504_MODEL_ICECUBE,
1, D_80372B50,
chicecube_update, func_80326224, chicecube_draw,
chicecube_update, actor_update_func_80326224, chicecube_draw,
0, 0, 0.0f, 0
};
@@ -110,8 +110,8 @@ void func_8035A04C(f32 position[3], s32 cnt, enum asset_e model_id, f32 scale){
particleEmitter_setModel(pCtrl, model_id);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setParticleSpawnPositionRange(pCtrl, -100.0f*scale, 0.0f, -100.0f*scale, 100.0f*scale, 200.0f*scale, 100.0f*scale);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -1000.0f, 0.0f, 0.0f, -1000.0f, 0.0f);
particleEmitter_setSpawnPositionRange(pCtrl, -100.0f*scale, 0.0f, -100.0f*scale, 100.0f*scale, 200.0f*scale, 100.0f*scale);
particleEmitter_setAccelerationRange(pCtrl, 0.0f, -1000.0f, 0.0f, 0.0f, -1000.0f, 0.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -400.0f*scale, 450.0f*scale, -400.0f*scale, 400.0f*scale, 600.0f*scale, 400.0f*scale);
particleEmitter_setAngularVelocityRange(pCtrl, 100.0f*scale, 100.0f*scale, 100.0f*scale, 250.0f*scale, 250.0f*scale, 250.0f*scale);
particleEmitter_setStartingScaleRange(pCtrl, scale*0.2, scale*0.4);
@@ -127,8 +127,8 @@ void func_8035A228(f32 position[3], s32 cnt, enum asset_e sprite_id, f32 scale){
particleEmitter_setRGB(pCtrl, D_80372BC8);
particleEmitter_setSprite(pCtrl, sprite_id);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setParticleSpawnPositionRange(pCtrl, -50.0f*scale, 0.0f, -50.0f*scale, 50.0f*scale, 200.0f*scale, 50.0f*scale);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -10.0f, 0.0f, 0.0f, -10.0f, 0.0f);
particleEmitter_setSpawnPositionRange(pCtrl, -50.0f*scale, 0.0f, -50.0f*scale, 50.0f*scale, 200.0f*scale, 50.0f*scale);
particleEmitter_setAccelerationRange(pCtrl, 0.0f, -10.0f, 0.0f, 0.0f, -10.0f, 0.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -280.0f*scale, 0.0f, -280.0f*scale, 280.0f*scale, 280.0f*scale, 280.0f*scale);
particleEmitter_setStartingScaleRange(pCtrl, scale*0.6, scale*0.8);
particleEmitter_setFinalScaleRange(pCtrl, scale*1.0, scale*1.4);
@@ -144,7 +144,7 @@ void func_8035A3F8(f32 position[3], s32 cnt, enum asset_e sprite_id, f32 scale){
particleEmitter_setRGB(pCtrl, D_80372BD4);
particleEmitter_setSprite(pCtrl, sprite_id);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -10.0f, 0.0f, 0.0f, -10.0f, 0.0f);
particleEmitter_setAccelerationRange(pCtrl, 0.0f, -10.0f, 0.0f, 0.0f, -10.0f, 0.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -60.0f*scale, 0.0f, -60.0f*scale, 60.0f*scale, 60.0f*scale, 60.0f*scale);
particleEmitter_setStartingScaleRange(pCtrl, scale*0.4, scale*0.6);
particleEmitter_setFinalScaleRange(pCtrl, scale*0.8, scale*1.2);

2
src/core2/ch/jigsawdance.c
View File

@@ -20,7 +20,7 @@ ActorAnimationInfo chJigsawDanceAnimations[] = {
ActorInfo chJigsawDance = {MARKER_68_JIGSAW_DANCE, ACTOR_5A_JIGSAW_DANCE, ASSET_35E_MODEL_JIGSAW_DANCE,
1, chJigsawDanceAnimations,
__chJigsawDance_update, func_80326224, __chJigsawDance_draw,
__chJigsawDance_update, actor_update_func_80326224, __chJigsawDance_draw,
0, 0, 0.0f, 0
};

10
src/core2/ch/jinjo.c
View File

@@ -23,11 +23,11 @@ ActorAnimationInfo chJinjoAnimations[] = {
{ASSET_31_ANIM_JINJO_JUMP, 0.75f}
};
ActorInfo chJinjoBlue = { MARKER_5A_JINJO_BLUE, ACTOR_60_JINJO_BLUE, ASSET_3C0_MODEL_JINJO_BLUE, 0x1, chJinjoAnimations, chJinjo_update, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo chJinjoGreen = { MARKER_5B_JINJO_GREEN, ACTOR_62_JINJO_GREEN, ASSET_3C2_MODEL_JINJO_GREEN, 0x1, chJinjoAnimations, chJinjo_update, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo chJinjoYellow = { MARKER_5E_JINJO_YELLOW, ACTOR_5E_JINJO_YELLOW, ASSET_3BB_MODEL_JINJO_YELLOW, 0x1, chJinjoAnimations, chJinjo_update, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo chJinjoPink = { MARKER_5D_JINJO_PINK, ACTOR_61_JINJO_PINK, ASSET_3C1_MODEL_JINJO_PINK, 0x1, chJinjoAnimations, chJinjo_update, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo chJinjoOrange = { MARKER_5C_JINJO_ORANGE, ACTOR_5F_JINJO_ORANGE, ASSET_3BC_MODEL_JINJO_ORANGE, 0x1, chJinjoAnimations, chJinjo_update, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo chJinjoBlue = { MARKER_5A_JINJO_BLUE, ACTOR_60_JINJO_BLUE, ASSET_3C0_MODEL_JINJO_BLUE, 0x1, chJinjoAnimations, chJinjo_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo chJinjoGreen = { MARKER_5B_JINJO_GREEN, ACTOR_62_JINJO_GREEN, ASSET_3C2_MODEL_JINJO_GREEN, 0x1, chJinjoAnimations, chJinjo_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo chJinjoYellow = { MARKER_5E_JINJO_YELLOW, ACTOR_5E_JINJO_YELLOW, ASSET_3BB_MODEL_JINJO_YELLOW, 0x1, chJinjoAnimations, chJinjo_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo chJinjoPink = { MARKER_5D_JINJO_PINK, ACTOR_61_JINJO_PINK, ASSET_3C1_MODEL_JINJO_PINK, 0x1, chJinjoAnimations, chJinjo_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo chJinjoOrange = { MARKER_5C_JINJO_ORANGE, ACTOR_5F_JINJO_ORANGE, ASSET_3BC_MODEL_JINJO_ORANGE, 0x1, chJinjoAnimations, chJinjo_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
enum asset_e __chJinjo_getMeetDialogId(enum marker_e marker_id){
switch(marker_id){

2
src/core2/ch/mole.c
View File

@@ -26,7 +26,7 @@ ActorAnimationInfo moleAnimations[]= {
ActorInfo gChMole = {
0x1DF, ACTOR_37A_BOTTLES, ASSET_387_MODEL_BOTTLES,
1, moleAnimations,
chmole_update, func_80326224, func_802D94B4,
chmole_update, actor_update_func_80326224, func_802D94B4,
0, 0, 0.0f, 0
};

8
src/core2/ch/molehill.c
View File

@@ -24,7 +24,7 @@ ActorAnimationInfo D_80367E00[] = {
ActorInfo D_80367E20= {
0xB8, ACTOR_12C_MOLEHILL, ASSET_388_MODEL_MOLEHILL,
0, D_80367E00,
func_802DA740, func_80326224, func_802DA560,
func_802DA740, actor_update_func_80326224, func_802DA560,
0, 0, 0.0f, 0
};
@@ -54,14 +54,14 @@ Actor *func_802DA560(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
void func_802DA634(ParticleEmitter *pCtrl, f32 arg1[3], s32 cnt){
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -600.0f, 0.0f, 0.0f, -600.0f, 0.0f);
particleEmitter_setAccelerationRange(pCtrl, 0.0f, -600.0f, 0.0f, 0.0f, -600.0f, 0.0f);
particleEmitter_setModel(pCtrl, 0x344);
particleEmitter_setPosition(pCtrl, arg1);
particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -150.0f, 150.0f, -150.0f, 150.0f, 360.0f, 150.0f);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_80367E44);
func_802EF9F8(pCtrl, 0.01f);
func_802EFA18(pCtrl, 3);
particleEmitter_func_802EF9F8(pCtrl, 0.01f);
particleEmitter_func_802EFA18(pCtrl, 3);
particleEmitter_emitN(pCtrl, cnt);
}

2
src/core2/ch/musicnote.c
View File

@@ -7,7 +7,7 @@ void func_802C9C30(Actor* this);
/* .data */
ActorInfo D_80366C50 = {
MARKER_5F_MUSIC_NOTE, ACTOR_51_MUSIC_NOTE, ASSET_6D6_MODEL_MUSIC_NOTE, 0, NULL,
func_802C9C30, func_80326224, func_80325934,
func_802C9C30, actor_update_func_80326224, func_80325934,
0, 0, 0.6f, 0
};

2
src/core2/ch/overlaycopyright.c
View File

@@ -9,7 +9,7 @@ f32 D_803680D0[3] = {0.0f, 0.0f, 0.0f};
ActorInfo chOverlayCopyrightDescription = {
MARKER_176_COPYRIGHT_OVERLAY, ACTOR_1DD_COPYRIGHT_OVERLAY, ASSET_54E_MODEL_COPYRIGHT_OVERLAY,
0x1, NULL,
chOverlayCopyright_update, func_80326224, func_802DC7E0,
chOverlayCopyright_update, actor_update_func_80326224, func_802DC7E0,
0, 0, 0.0f, 0
};

2
src/core2/ch/overlaynocontroller.c
View File

@@ -21,7 +21,7 @@ f32 D_80368168[3] = {0.0f, 0.0f, 0.0f};
ActorInfo D_80368174 = {
MARKER_178_NO_CONTROLLER_OVERLAY, ACTOR_1DF_NO_CONTROLLER_OVERLAY, ASSET_55D_MODEL_NO_CONTROLLER_OVERLAY,
0x0, D_80368150,
chOverlayNoController_update, func_80326224, chOverlayNoController_draw,
chOverlayNoController_update, actor_update_func_80326224, chOverlayNoController_draw,
0, 0, 0.0f, 0
};

2
src/core2/ch/overlaypressstart.c
View File

@@ -27,7 +27,7 @@ f32 D_80368118[3] = {0.0f, 0.0f, 0.0f};
ActorInfo D_80368124 = {
MARKER_177_PRESS_START_OVERLAY, ACTOR_1DE_PRESS_START_OVERLAY, ASSET_55C_MODEL_PRESS_START_OVERLAY,
0x0, D_80368100,
chOverlayPressStart_update, func_80326224, chOverlayPressStart_draw,
chOverlayPressStart_update, actor_update_func_80326224, chOverlayPressStart_draw,
0, 0, 0.0f, 0
};

12
src/core2/ch/shrapnel.c
View File

@@ -63,7 +63,7 @@ void chShrapnel_emitExplosion(Actor *this) {
particleEmitter_setDrawMode(temp_v0, PART_EMIT_NO_LOOP);
particleEmitter_setStartingFrameRange(temp_v0, 0, 0);
particleEmitter_setParticleFramerateRange(temp_v0, 4.0f, 4.0f);
particleEmitter_setParticleSpawnPositionRange(temp_v0, 0.0f, 200.0f, 0.0f, 0.0f, 200.0f, 0.0f);
particleEmitter_setSpawnPositionRange(temp_v0, 0.0f, 200.0f, 0.0f, 0.0f, 200.0f, 0.0f);
particleEmitter_setPosition(temp_v0, this->position);
particleEmitter_setStartingScaleRange(temp_v0, 3.0f, 3.0f);
particleEmitter_setFinalScaleRange(temp_v0, 8.0f, 8.0f);
@@ -83,7 +83,7 @@ void chShrapnel_emitSmoke(Actor *this) {
particleEmitter_setPosition(temp_v0, this->position);
particleEmitter_setStartingScaleRange(temp_v0, 1.0f, 1.5f);
particleEmitter_setFinalScaleRange(temp_v0, 2.0f, 3.0f);
particleEmitter_setParticleSpawnPositionRange(temp_v0, -75.0f, 25.0f, -75.0f, 75.0f, 75.0f, 75.0f);
particleEmitter_setSpawnPositionRange(temp_v0, -75.0f, 25.0f, -75.0f, 75.0f, 75.0f, 75.0f);
particleEmitter_setParticleVelocityRange(temp_v0, -70.0f, 50.0f, -70.0f, 70.0f, 100.0f, 70.0f);
particleEmitter_setRGB(temp_v0, D_803673F8);
particleEmitter_setParticleLifeTimeRange(temp_v0, 3.0f, 4.0f);
@@ -94,9 +94,9 @@ void chShrapnel_emitBodyParts(Actor *this, enum asset_e model_id, s32 n) {
ParticleEmitter *temp_v0;
temp_v0 = partEmitMgr_newEmitter(n);
particleEmitter_setParticleAccelerationRange(temp_v0, 0.0f, -800.0f, 0.0f, 0.0f, -800.0f, 0.0f);
func_802EF9F8(temp_v0, 0.6f);
func_802EFA18(temp_v0, 1);
particleEmitter_setAccelerationRange(temp_v0, 0.0f, -800.0f, 0.0f, 0.0f, -800.0f, 0.0f);
particleEmitter_func_802EF9F8(temp_v0, 0.6f);
particleEmitter_func_802EFA18(temp_v0, 1);
particleEmitter_setModel(temp_v0, model_id);
particleEmitter_setPosition(temp_v0, this->position);
particleEmitter_setStartingScaleRange(temp_v0, 0.05f, 2.0f);
@@ -194,6 +194,6 @@ void chshrapnel_update(Actor *this) {
ActorInfo chShrapnelDescription = {
MARKER_65_SHRAPNEL, ACTOR_56_SHRAPNEL, ASSET_3EC_MODEL_SHRAPNEL,
0x1, chShrapnelAnimations,
chshrapnel_update, func_80326224, actor_draw,
chshrapnel_update, actor_update_func_80326224, actor_draw,
2500, 0x333, 0.0f, 0
};

2
src/core2/ch/snacker.c
View File

@@ -52,7 +52,7 @@ ActorAnimationInfo sChSnackerAnimations[] ={
ActorInfo gChSnacker = {
MARKER_14_SNACKER, ACTOR_68_SNACKER, ASSET_3B0_SNACKER,
0x1, sChSnackerAnimations,
chsnacker_update, func_80326224, actor_draw,
chsnacker_update, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};

6
src/core2/ch/snowball.c
View File

@@ -19,7 +19,7 @@ void chSnowball_update(Actor *this);
ActorInfo chSnowball = {
MARKER_B2_SNOWBALL, ACTOR_125_SNOWBALL, ASSET_378_MODEL_SNOWBALL,
0x1, NULL,
chSnowball_update, func_80326224, chSnowball_draw,
chSnowball_update, actor_update_func_80326224, chSnowball_draw,
0, 0x800, 0.8f, 0
};
@@ -40,7 +40,7 @@ Actor *chSnowball_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
void __chSnowball_spawnPieces(f32 position[3]) {
static ParticleScaleAndLifetimeRanges D_80368734 = {{0.65f, 1.1}, {0.0f, 0.0f}, {0.0f, 0.01f}, {0.8f, 0.8f}, 0.0f, 0.5f};
static struct43s D_8036875C = {
static ParticleSettingsVelocityAccelerationPosition D_8036875C = {
{{-220.0f, 210.0f, -220.0f}, {280.0f, 460.0f, 280.0f}},
{{ 0.0f, -800.0f, 0.0f}, { 0.0f, -800.0f, 0.0f}},
{{ -20.0f, -20.0f, -20.0f}, { 20.0f, 20.0f, 20.0f}}
@@ -51,7 +51,7 @@ void __chSnowball_spawnPieces(f32 position[3]) {
pCtrl = partEmitMgr_newEmitter(8);
particleEmitter_setModel(pCtrl, ASSET_37A_MODEL_TINY_SNOWBALL);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_8036875C);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8036875C);
particleEmitter_setAngularVelocityRange(pCtrl, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_80368734);
particleEmitter_emitN(pCtrl, 8);

10
src/core2/ch/snowman.c
View File

@@ -38,7 +38,7 @@ enum chsnowman_state_e{
ActorInfo chSnowman = {
MARKER_B1_SIR_SLUSH, ACTOR_124_SIR_SLUSH, ASSET_377_MODEL_SIR_SLUSH,
CHSNOWMAN_STATE_1_IDLE, chSnowmanAnimations,
chSnowman_update, func_80326224, chSnowman_draw,
chSnowman_update, actor_update_func_80326224, chSnowman_draw,
0, 0x199, 0.0f, 0
};
@@ -111,7 +111,7 @@ void __chSnowman_spawnSnowballParticles(f32 position[3], s32 count){
{4.0f, 4.0f},
0.0f, 0.3f
};
static struct43s D_803686BC = {
static ParticleSettingsVelocityAccelerationPosition D_803686BC = {
{{-250.0f, 600.0f, -250.0f}, {350.0f, 960.0f, 350.0f}},
{{0.0f, -1200.0f, 0.0f}, {0.0f, -1200.0f, 0.0f}},
{{-80.0f, 0.0f, -80.0f}, {80.0f, 200.0f, 80.0f}}
@@ -121,10 +121,10 @@ void __chSnowman_spawnSnowballParticles(f32 position[3], s32 count){
particleEmitter_setModel(particleSpawner, ASSET_378_MODEL_SNOWBALL);
particleEmitter_setPosition(particleSpawner, position);
particleEmitter_setPositionVelocityAndAccelerationRanges(particleSpawner, &D_803686BC);
particleEmitter_setVelocityAccelerationAndPositionRanges(particleSpawner, &D_803686BC);
particleEmitter_setAngularVelocityRange(particleSpawner, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
func_802EF9F8(particleSpawner, 0.01f);
func_802EFA18(particleSpawner, 3);
particleEmitter_func_802EF9F8(particleSpawner, 0.01f);
particleEmitter_func_802EFA18(particleSpawner, 3);
func_802EFA20(particleSpawner, 1.0f, 1.3f);
particleEmitter_setSfx(particleSpawner, SFX_2F_ORANGE_SPLAT, 16000);
particleEmitter_setScaleAndLifetimeRanges(particleSpawner, &D_80368694);

2
src/core2/ch/snowmanhat.c
View File

@@ -8,7 +8,7 @@ void chSnowmanHat_update(Actor *this);
ActorInfo chSnowmanHat = {
MARKER_B3_SIR_SLUSH_HAT, ACTOR_126_SIR_SLUSH_HAT, ASSET_379_MODEL_SIRSLUSH_HAT,
0x1, NULL,
chSnowmanHat_update, func_80326224, actor_draw,
chSnowmanHat_update, actor_update_func_80326224, actor_draw,
4500, 0, 1.0f, 0
};

14
src/core2/ch/termite.c
View File

@@ -73,8 +73,8 @@ void __chTermite_updateWalkSFX(Actor *this) {
void __chTermite_setupParticleEmitter(ParticleEmitter *pCtrl, f32 position[3]){
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setDrawMode(pCtrl, 2);
func_802EF9F8(pCtrl, 0.7f);
func_802EFA18(pCtrl, 5);
particleEmitter_func_802EF9F8(pCtrl, 0.7f);
particleEmitter_func_802EFA18(pCtrl, 5);
func_802EFA20(pCtrl, 0.8f, 1.0f);
particleEmitter_setSfx(pCtrl, SFX_1F_HITTING_AN_ENEMY_3, 10000);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
@@ -84,7 +84,7 @@ void __chTermite_setupParticleEmitter(ParticleEmitter *pCtrl, f32 position[3]){
void __chTermite_emitLegs(ParticleEmitter *pCtrl, f32 position[3]){
__chTermite_setupParticleEmitter(pCtrl, position);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setAccelerationRange(pCtrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setModel(pCtrl, ASSET_393_MODEL_TERMITE_LEG);
particleEmitter_setStartingScaleRange(pCtrl, 0.5f, 0.8f);
particleEmitter_setAngularVelocityRange(pCtrl, -800.0f, -800.0f, -800.0f, 800.0f, 800.0f, 800.0f);
@@ -94,7 +94,7 @@ void __chTermite_emitLegs(ParticleEmitter *pCtrl, f32 position[3]){
void __chTermite_emitHead(ParticleEmitter *pCtrl, f32 position[3]){
__chTermite_setupParticleEmitter(pCtrl, position);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setAccelerationRange(pCtrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setModel(pCtrl, ASSET_394_MODEL_TERMITE_HEAD);
particleEmitter_setStartingScaleRange(pCtrl, 1.0f, 1.0f);
particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
@@ -104,7 +104,7 @@ void __chTermite_emitHead(ParticleEmitter *pCtrl, f32 position[3]){
void __chTermite_emitBody(ParticleEmitter *pCtrl, f32 position[3]){
__chTermite_setupParticleEmitter(pCtrl, position);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setAccelerationRange(pCtrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setModel(pCtrl, ASSET_395_MODEL_TERMITE_BODY);
particleEmitter_setStartingScaleRange(pCtrl, 1.0f, 1.0f);
particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
@@ -114,7 +114,7 @@ void __chTermite_emitBody(ParticleEmitter *pCtrl, f32 position[3]){
void __chTermite_emitEyes(ParticleEmitter *pCtrl, f32 position[3]){
__chTermite_setupParticleEmitter(pCtrl, position);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -1400.0f, 0.0f, 0.0f, -1400.0f, 0.0f);
particleEmitter_setAccelerationRange(pCtrl, 0.0f, -1400.0f, 0.0f, 0.0f, -1400.0f, 0.0f);
particleEmitter_setModel(pCtrl, ASSET_396_MODEL_TERMITE_EYES);
particleEmitter_setStartingScaleRange(pCtrl, 1.0f, 1.0f);
particleEmitter_setAngularVelocityRange(pCtrl, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
@@ -242,6 +242,6 @@ void chTermite_update(Actor *this) {
ActorInfo chTermite = {
MARKER_4_TERMITE, ACTOR_5_TERMITE, ASSET_350_MODEL_TERMITE,
0x1, chTermiteAnimations,
chTermite_update, func_80326224, actor_draw,
chTermite_update, actor_update_func_80326224, actor_draw,
2000, 0, 0.0f, 0
};

2
src/core2/ch/trainers.c
View File

@@ -19,7 +19,7 @@ ActorAnimationInfo chTrainersAnimations[] = {
ActorInfo chTrainers = {
MARKER_38_TURBO_TALON_TRAINERS, ACTOR_2C_TURBO_TALON_TRAINERS, ASSET_367_MODEL_TURBO_TALON_TRAINERS,
0x0, chTrainersAnimations,
chtrainers_update, func_80326224, chtrainers_draw,
chtrainers_update, actor_update_func_80326224, chtrainers_draw,
0, 0, 0.0f, 0
};

2
src/core2/ch/wadingboots.c
View File

@@ -19,7 +19,7 @@ ActorAnimationInfo D_80367A00[] = {
ActorInfo D_80367A20 = {
MARKER_11_WADING_BOOTS, ACTOR_65_WADING_BOOTS, ASSET_366_MODEL_WADING_BOOTS,
0x0, D_80367A00,
chwadingboots_update, func_80326224, chwadingboots_draw,
chwadingboots_update, actor_update_func_80326224, chwadingboots_draw,
0, 0, 0.0f, 0
};

10
src/core2/ch/whipcrack.c
View File

@@ -18,16 +18,16 @@ s32 D_80373124[3] = {0xA0, 0x6B, 0x23};
void __chwhipcrack_spawnPieces(Actor *this, enum asset_e model_id, s32 cnt){
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
particleEmitter_setParticleAccelerationRange(pCtrl,
particleEmitter_setAccelerationRange(pCtrl,
0.0f, -1000.0f, 0.0f,
0.0f, -1000.0f, 0.0f
);
func_802EF9F8(pCtrl, 0.7f);
func_802EFA18(pCtrl, 3);
particleEmitter_func_802EF9F8(pCtrl, 0.7f);
particleEmitter_func_802EFA18(pCtrl, 3);
func_802EFA20(pCtrl, 0.5f, 1.0f);
particleEmitter_setSfx(pCtrl, SFX_1F_HITTING_AN_ENEMY_3, 10000);
particleEmitter_setModel(pCtrl, model_id);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
particleEmitter_setSpawnPositionRange(pCtrl,
-120.0f, 50.0f, -120.0f,
120.0f, 300.0f, 120.0f
);
@@ -54,7 +54,7 @@ void __chwhipcrack_spawnSmoke(Actor *this, s32 cnt){
particleEmitter_setPosition(pCtrl, this->position);
particleEmitter_setStartingScaleRange(pCtrl, 3.0f, 3.5f);
particleEmitter_setFinalScaleRange(pCtrl, 4.5f, 5.5f);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
particleEmitter_setSpawnPositionRange(pCtrl,
-50.0f, 50.0f, -50.0f,
50.0f, 200.0f, 50.0f
);

4
src/core2/code_3EAD0.c
View File

@@ -17,14 +17,14 @@ s32 D_80365F30[] = {
ActorInfo D_80365F60 = {
0x58, 0x4E, ASSET_7DE_SPRITE_SHOE_SPARKLES,
0, NULL,
func_802C5A60, func_80326224, func_80325934,
func_802C5A60, actor_update_func_80326224, func_80325934,
0, 0, 0.0f, 0
};
ActorInfo D_80365F84 = {
0x59, 0x4F, ASSET_7DE_SPRITE_SHOE_SPARKLES,
0, NULL,
func_802C5A60, func_80326224, func_80325934,
func_802C5A60, actor_update_func_80326224, func_80325934,
0, 0, 0.0f, 0
};

2
src/core2/code_3EC30.c
View File

@@ -5,7 +5,7 @@
void func_802C5BC0(Actor *this);
/* .data */
ActorInfo D_80365FB0 = { 0x65, 0xF3, 0x0, 0x0, 0x0, func_802C5BC0, func_80326224, func_80325340, 0, 0, 0.0f, 0};
ActorInfo D_80365FB0 = { 0x65, 0xF3, 0x0, 0x0, 0x0, func_802C5BC0, actor_update_func_80326224, func_80325340, 0, 0, 0.0f, 0};
/* .code */
void func_802C5BC0(Actor *this){

12
src/core2/code_41460.c
View File

@@ -32,12 +32,12 @@ f32 D_80366330 = 0.5f;
f32 D_80366334 = 30.0f;
f32 D_80366338 = 150.0f;
f32 D_8036633C = 25.0f;
ActorInfo D_80366340 = { 0x56, 0x4A, 0x0, 0x2, 0x0, func_802C8C5C, func_80326224, func_802C8484, 0, 0, 0.0f, 0};
ActorInfo D_80366364 = { 0x56, 0x4B, 0x0, 0x2, 0x0, func_802C8C5C, func_80326224, func_802C8484, 0, 0, 0.0f, 0};
ActorInfo D_80366388 = { 0x56, 0xD, 0x0, 0x2, 0x0, func_802C8C5C, func_80326224, func_802C8484, 0, 0, 0.0f, 0};
ActorInfo D_803663AC = { 0x56, 0x11F, 0x0, 0x2, 0x0, func_802C8C5C, func_80326224, func_802C8484, 0, 0, 0.0f, 0};
ActorInfo D_803663D0 = { 0x56, 0x14F, 0x0, 0x2, 0x0, func_802C8C5C, func_80326224, func_802C8484, 0, 0, 0.0f, 0};
ActorInfo D_803663F4 = { 0x56, 0x3AD, 0x0, 0x2, 0x0, func_802C8C5C, func_80326224, func_802C8484, 0, 0, 0.0f, 0};
ActorInfo D_80366340 = { 0x56, 0x4A, 0x0, 0x2, 0x0, func_802C8C5C, actor_update_func_80326224, func_802C8484, 0, 0, 0.0f, 0};
ActorInfo D_80366364 = { 0x56, 0x4B, 0x0, 0x2, 0x0, func_802C8C5C, actor_update_func_80326224, func_802C8484, 0, 0, 0.0f, 0};
ActorInfo D_80366388 = { 0x56, 0xD, 0x0, 0x2, 0x0, func_802C8C5C, actor_update_func_80326224, func_802C8484, 0, 0, 0.0f, 0};
ActorInfo D_803663AC = { 0x56, 0x11F, 0x0, 0x2, 0x0, func_802C8C5C, actor_update_func_80326224, func_802C8484, 0, 0, 0.0f, 0};
ActorInfo D_803663D0 = { 0x56, 0x14F, 0x0, 0x2, 0x0, func_802C8C5C, actor_update_func_80326224, func_802C8484, 0, 0, 0.0f, 0};
ActorInfo D_803663F4 = { 0x56, 0x3AD, 0x0, 0x2, 0x0, func_802C8C5C, actor_update_func_80326224, func_802C8484, 0, 0, 0.0f, 0};
s32 D_80366418[3] = {0,0,0};
/* .bss */

2
src/core2/code_41F30.c
View File

@@ -6,7 +6,7 @@ void chextralife_update(Actor *this);
ActorInfo chExtraLife = { MARKER_61_EXTRA_LIFE, ACTOR_49_EXTRA_LIFE, ASSET_36E_MODEL_EXTRA_LIFE,
0x0, NULL,
chextralife_update, func_80326224, func_80325934,
chextralife_update, actor_update_func_80326224, func_80325934,
0, 0, 0.7f, 0
};

4
src/core2/code_42CB0.c
View File

@@ -14,13 +14,13 @@ void chHoneycomb_update(Actor *this);
/* .data */
ActorInfo D_80366C80 = { MARKER_53_EMPTY_HONEYCOMB, ACTOR_47_EMPTY_HONEYCOMB, ASSET_361_MODEL_EMPTY_HONEYCOMB,
0, NULL,
chHoneycomb_update, func_80326224, actor_draw,
chHoneycomb_update, actor_update_func_80326224, actor_draw,
0, 0, 0.8f, 0
};
ActorInfo D_80366CA4 = { MARKER_55_HONEYCOMB, ACTOR_50_HONEYCOMB, ASSET_363_MODEL_HONEYCOMB,
0, NULL,
chHoneycomb_update, func_80326224, actor_draw,
chHoneycomb_update, actor_update_func_80326224, actor_draw,
0, 0, 0.8f, 0
};

2
src/core2/code_43250.c
View File

@@ -22,7 +22,7 @@ void func_802CA1E0(Actor *this);
ActorInfo D_80366CD0 = {
0x3D, 0x183, 0,
0, NULL,
func_802CA1E0, func_80326224, func_80325340,
func_802CA1E0, actor_update_func_80326224, func_80325340,
0, 0, 0.0f, 0
};

2
src/core2/code_43800.c
View File

@@ -13,7 +13,7 @@ void func_802CA92C(Actor *this);
ActorInfo D_80366EF0 = {
MARKER_32_PLAYER_SHADOW, ACTOR_17_PLAYER_SHADOW, ASSET_3BF_MODEL_PLAYER_SHADOW,
0x1, 0x0,
func_802CA92C, func_80326224, func_802CA7BC,
func_802CA92C, actor_update_func_80326224, func_802CA7BC,
0, 0, 0.0f, 0
};

12
src/core2/code_43A40.c
View File

@@ -10,21 +10,21 @@ void chFightFlightPad_update(Actor *this);
extern ActorInfo chShockJump = {
0x0D4, ACTOR_B_SHOCKSPRING_PAD, ASSET_489_MODEL_SHOCKSPRING_PAD,
0, NULL,
chShockJump_update, func_80326224, actor_draw,
chShockJump_update, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};
extern ActorInfo chFlightPad = {
MARKER_45_FLIGHT_PAD, ACTOR_E4_FLIGHT_PAD, ASSET_48A_MODEL_FLIGHT_PAD,
0, NULL,
chFlightPad_update, func_80326224, actor_draw,
chFlightPad_update, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};
extern ActorInfo chFightFlightPad = {
MARKER_261_FIGHT_FLIGHT_PAD, ACTOR_39F_FIGHT_FLIGHT_PAD, ASSET_48A_MODEL_FLIGHT_PAD,
0, NULL,
chFightFlightPad_update, func_80326224, actor_draw,
chFightFlightPad_update, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};
@@ -38,7 +38,7 @@ extern ParticleScaleAndLifetimeRanges chFightFlightPad_D_80366F8C = {
};
extern struct43s chFightFlightPad_D_80366FB4 = {
extern ParticleSettingsVelocityAccelerationPosition chFightFlightPad_D_80366FB4 = {
{{-360.0f, 360.0f, -360.0}, {360.0f, 660.0f, 360.0f}},
{{0.0f, -1200.0f, 0.0f}, {0.0f, -1200.0f, 0.0f}},
{{0.0f, 0.0f, 0.0f}, {0.0f, 40.0f, 0.0f}}
@@ -84,9 +84,9 @@ void chFightFlightPad_emitSparklesAtPosition(f32 position[3]){
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(0x18);
particleEmitter_setSprite(pCtrl, ASSET_715_SPRITE_SPARKLE_RED);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &chFightFlightPad_D_80366FB4);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &chFightFlightPad_D_80366FB4);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &chFightFlightPad_D_80366F8C);
func_802EFA78(pCtrl, 1);
particleEmitter_func_802EFA78(pCtrl, 1);
particleEmitter_emitN(pCtrl, 0x18);
}

6
src/core2/code_47BD0.c
View File

@@ -279,14 +279,14 @@ void chBeeSwarm_802CF610(Actor *this, ParticleEmitter *p_ctrl, f32 position[3])
func_8030E6A4(SFX_66_BIRD_AUUGHH, randf2(1.75f, 1.85f), 15000);
particleEmitter_setPosition(p_ctrl, position);
particleEmitter_setDrawMode(p_ctrl, 2);
func_802EF9F8(p_ctrl, 0.5f);
func_802EFA18(p_ctrl, 3);
particleEmitter_func_802EF9F8(p_ctrl, 0.5f);
particleEmitter_func_802EFA18(p_ctrl, 3);
func_802EFA20(p_ctrl, 0.8f, 1.0f);
particleEmitter_setSfx(p_ctrl, SFX_1F_HITTING_AN_ENEMY_3, 10000);
particleEmitter_setSpawnIntervalRange(p_ctrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(p_ctrl, 2.0f, 2.5f);
particleEmitter_setFade(p_ctrl, 0.0f, 0.65f);
particleEmitter_setParticleAccelerationRange(p_ctrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setAccelerationRange(p_ctrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setModel(p_ctrl,this->marker->modelId);
particleEmitter_setStartingScaleRange(p_ctrl, 0.25f, 0.25f);
particleEmitter_setAngularVelocityRange(p_ctrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);

2
src/core2/code_4A6F0.c
View File

@@ -28,7 +28,7 @@ ActorAnimationInfo D_80367490[] = {
ActorInfo D_803674E0 = {
MARKER_6_MUMBO, ACTOR_7_MUMBO, ASSET_3C6_MODEL_MUMBO,
0x1, D_80367490,
chMumbo_update, func_80326224, chMumbo_draw,
chMumbo_update, actor_update_func_80326224, chMumbo_draw,
0, 0, 0.0f, 0
};
s32 D_80367504[3] = {0.0f, 0.0f, 0.0f};

10
src/core2/code_4BD70.c
View File

@@ -5,11 +5,11 @@
void chMumboSign_update(Actor *this);
/* .data */
ActorInfo D_80367530 = { MARKER_1E9_MUMBO_COST_SIGN, ACTOR_368_5_MUMBO_TOKEN_SIGN, ASSET_301_MODEL_5_MUMBO_TOKEN_SIGN, 0x0, 0x0, chMumboSign_update, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_80367554 = { MARKER_1E9_MUMBO_COST_SIGN, ACTOR_36B_10_MUMBO_TOKEN_SIGN, ASSET_302_MODEL_10_MUMBO_TOKEN_SIGN, 0x0, 0x0, chMumboSign_update, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_80367578 = { MARKER_1E9_MUMBO_COST_SIGN, ACTOR_36A_15_MUMBO_TOKEN_SIGN, ASSET_303_MODEL_15_MUMBO_TOKEN_SIGN, 0x0, 0x0, chMumboSign_update, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_8036759C = { MARKER_1E9_MUMBO_COST_SIGN, ACTOR_369_20_MUMBO_TOKEN_SIGN, ASSET_304_MODEL_20_MUMBO_TOKEN_SIGN, 0x0, 0x0, chMumboSign_update, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_803675C0 = { MARKER_1E9_MUMBO_COST_SIGN, ACTOR_36C_25_MUMBO_TOKEN_SIGN, ASSET_305_MODEL_25_MUMBO_TOKEN_SIGN, 0x0, 0x0, chMumboSign_update, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_80367530 = { MARKER_1E9_MUMBO_COST_SIGN, ACTOR_368_5_MUMBO_TOKEN_SIGN, ASSET_301_MODEL_5_MUMBO_TOKEN_SIGN, 0x0, 0x0, chMumboSign_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_80367554 = { MARKER_1E9_MUMBO_COST_SIGN, ACTOR_36B_10_MUMBO_TOKEN_SIGN, ASSET_302_MODEL_10_MUMBO_TOKEN_SIGN, 0x0, 0x0, chMumboSign_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_80367578 = { MARKER_1E9_MUMBO_COST_SIGN, ACTOR_36A_15_MUMBO_TOKEN_SIGN, ASSET_303_MODEL_15_MUMBO_TOKEN_SIGN, 0x0, 0x0, chMumboSign_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_8036759C = { MARKER_1E9_MUMBO_COST_SIGN, ACTOR_369_20_MUMBO_TOKEN_SIGN, ASSET_304_MODEL_20_MUMBO_TOKEN_SIGN, 0x0, 0x0, chMumboSign_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_803675C0 = { MARKER_1E9_MUMBO_COST_SIGN, ACTOR_36C_25_MUMBO_TOKEN_SIGN, ASSET_305_MODEL_25_MUMBO_TOKEN_SIGN, 0x0, 0x0, chMumboSign_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
void chMumboSign_update(Actor *this) {
if (!this->volatile_initialized) {

2
src/core2/code_4BE10.c
View File

@@ -13,7 +13,7 @@ ActorInfo D_803675F0 = {
};
s16 D_80367614[] = {3,2,3,4,3,5,3,0};
ParticleScaleAndLifetimeRanges D_80367624 = {{0.7f, 0.3f}, {0.01f, 0.01f}, {0.05f, 0.05f}, {0.2f, 0.2f}, 0.0f, 0.01f};
struct42s D_8036764C = {
ParticleSettingsVelocityPosition D_8036764C = {
{{-100.0f, 400.0f, -100.0f}, { 100.0f, 800.0f, 100.0f}},
{{-100.0f, 0.0f, -100.0f}, { 100.0f, 0.0f, 100.0f}}
};

26
src/core2/code_4C020.c
View File

@@ -81,22 +81,22 @@ ActorAnimationInfo D_803676B0[] = {
{0x217, 0.3f}
};
ActorInfo D_80367760 = { 0x26E, 0x2D9, 0x3B4, 0x1, NULL, func_802D3D54, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
ActorInfo D_80367784 = { 0x26F, 0x2DA, 0x3B5, 0x1, NULL, func_802D3D54, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
ActorInfo D_803677A8 = { MARKER_168_ICE_KEY, ACTOR_25D_ICE_KEY, ASSET_50C_MODEL_ICE_KEY, 0x1, NULL, func_802D4250, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
ActorInfo D_803677CC = { 0x233, 0x23D, 0x4DD, 0x12, D_803676B0, func_802D4388, func_80326224, func_802D4588, 0, 0, 0.0f, 0};
ActorInfo D_80367760 = { 0x26E, 0x2D9, 0x3B4, 0x1, NULL, func_802D3D54, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
ActorInfo D_80367784 = { 0x26F, 0x2DA, 0x3B5, 0x1, NULL, func_802D3D54, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
ActorInfo D_803677A8 = { MARKER_168_ICE_KEY, ACTOR_25D_ICE_KEY, ASSET_50C_MODEL_ICE_KEY, 0x1, NULL, func_802D4250, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
ActorInfo D_803677CC = { 0x233, 0x23D, 0x4DD, 0x12, D_803676B0, func_802D4388, actor_update_func_80326224, func_802D4588, 0, 0, 0.0f, 0};
ActorInfo D_803677F0 = { 0x16A, 0x242, 0x0, 0x0, NULL, func_802D4680, NULL, func_80325340, 0, 0, 0.0f, 0};
ActorInfo D_80367814 = { MARKER_169_SNS_EGG, ACTOR_25E_SNS_EGG, ASSET_50D_MODEL_SNS_EGG, 0x1, NULL, func_802D3FD4, NULL, func_802D41C4, 0, 0, 0.0f, 0};
ActorInfo D_80367838 = { 0x265, 0x2E4, 0x55A, 0x1, NULL, func_802D3DA4, NULL, func_802D3F48, 0, 0, 0.0f, 0};
ActorInfo D_8036785C = { MARKER_103_MM_WITCH_SWITCH, ACTOR_204_MM_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4B94, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_80367880 = { MARKER_104_MMM_WITCH_SWITCH, ACTOR_206_MMM_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4C34, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_803678A4 = { MARKER_105_TTC_WITCH_SWITCH, ACTOR_208_TTC_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4C5C, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_803678C8 = { MARKER_106_RBB_WITCH_SWITCH, ACTOR_20B_RBB_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4C84, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_803678EC = { MARKER_22A_CCW_WITCH_SWITCH, ACTOR_237_CCW_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4CAC, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_80367910 = { MARKER_22B_FP_WITCH_SWITCH, ACTOR_239_FP_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4CD4, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_80367934 = { MARKER_166_CC_WITCH_SWITCH, ACTOR_25B_CC_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4BBC, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_80367958 = { MARKER_162_BGS_WITCH_SWITCH, ACTOR_257_BGS_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4BE4, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_8036797C = { MARKER_161_GV_WITCH_SWITCH, ACTOR_256_GV_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4C0C, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_8036785C = { MARKER_103_MM_WITCH_SWITCH, ACTOR_204_MM_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4B94, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_80367880 = { MARKER_104_MMM_WITCH_SWITCH, ACTOR_206_MMM_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4C34, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_803678A4 = { MARKER_105_TTC_WITCH_SWITCH, ACTOR_208_TTC_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4C5C, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_803678C8 = { MARKER_106_RBB_WITCH_SWITCH, ACTOR_20B_RBB_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4C84, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_803678EC = { MARKER_22A_CCW_WITCH_SWITCH, ACTOR_237_CCW_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4CAC, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_80367910 = { MARKER_22B_FP_WITCH_SWITCH, ACTOR_239_FP_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4CD4, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_80367934 = { MARKER_166_CC_WITCH_SWITCH, ACTOR_25B_CC_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4BBC, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_80367958 = { MARKER_162_BGS_WITCH_SWITCH, ACTOR_257_BGS_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4BE4, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo D_8036797C = { MARKER_161_GV_WITCH_SWITCH, ACTOR_256_GV_WITCH_SWITCH, ASSET_4DC_MODEL_WITCH_SWITCH, 0x1, D_803676B0, func_802D4C0C, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
s32 D_803679A0[4] = {0x87, 0x87, 0x87, 0xA0};
s16 D_803679B0[] = {0x5, 0x90, 0xA, 0x93, 0xF,0x92, 0x14, 0x91, 0x19, 0x94, -1};

6
src/core2/code_50490.c
View File

@@ -24,19 +24,19 @@ f32 D_80367AA4[3] = {0.0f, 0.0f, 0.0f};
ActorInfo D_80367AB0 = {
0x57, 0x4C, 0x0,
0, NULL,
func_802D766C, func_80326224, func_802D745C,
func_802D766C, actor_update_func_80326224, func_802D745C,
0, 0, 0.0f, 0
};
ActorInfo D_80367AD4 = {
0x57, 0x4D, 0x0,
0, NULL,
func_802D766C, func_80326224, func_802D745C,
func_802D766C, actor_update_func_80326224, func_802D745C,
0, 0, 0.0f, 0
};
ActorInfo D_80367AF8 = {
0x57, 0x58, 0x0,
0, NULL,
func_802D766C, func_80326224, func_802D745C,
func_802D766C, actor_update_func_80326224, func_802D745C,
0, 0, 0.0f, 0
};

16
src/core2/code_509D0.c
View File

@@ -21,35 +21,35 @@ ActorAnimationInfo D_80367B50[] = {
ActorInfo D_80367B80 = {
MARKER_36_ORANGE_COLLECTIBLE, ACTOR_29_ORANGE_COLLECTIBLE, ASSET_2D2_MODEL_ORANGE,
0x5, NULL,
chLevelCollectible_update, func_80326224, actor_draw,
chLevelCollectible_update, actor_update_func_80326224, actor_draw,
0, 0, 0.6f,0
};
ActorInfo D_80367BA4 = {
MARKER_37_GOLD_BULLION, ACTOR_2A_GOLD_BULLION, ASSET_3C7_MODEL_GOLD_BULLION,
0x5, NULL,
chLevelCollectible_update, func_80326224, actor_draw,
chLevelCollectible_update, actor_update_func_80326224, actor_draw,
0, 0, 0.6f, 0
};
ActorInfo D_80367BC8 = {
MARKER_1FD_BLUE_PRESENT_COLLECTIBLE, ACTOR_1ED_BLUE_PRESENT_COLLECTIBLE, ASSET_47F_MODEL_XMAS_GIFT_BLUE,
0x5, D_80367B50,
chLevelCollectible_update, func_80326224, actor_draw,
chLevelCollectible_update, actor_update_func_80326224, actor_draw,
0, 0, 1.8f, 0
};
ActorInfo D_80367BEC = {
MARKER_1FE_GREEN_PRESENT_COLLECTIBLE, ACTOR_1EF_GREEN_PRESENT_COLLECTIBLE, ASSET_480_MODEL_XMAS_GIFT_GREEN,
0x5, D_80367B50,
chLevelCollectible_update, func_80326224, actor_draw,
chLevelCollectible_update, actor_update_func_80326224, actor_draw,
0, 0, 1.4f, 0
};
ActorInfo D_80367C10 = {
MARKER_1FF_RED_PRESENT_COLLECTIBLE, ACTOR_1F1_RED_PRESENT_COLLECTIBLE, ASSET_481_MODEL_XMAS_GIFT_RED,
0x5, D_80367B50,
chLevelCollectible_update, func_80326224, actor_draw,
chLevelCollectible_update, actor_update_func_80326224, actor_draw,
0, 0, 1.4f, 0
};
@@ -62,8 +62,8 @@ void __chLevelCollectible_presentReturnEmitSparkles(f32 position[3], enum asset_
particleEmitter_setSprite(p_emitter, sprite_id);
particleEmitter_setStartingFrameRange(p_emitter, 0, 7);
particleEmitter_setPosition(p_emitter, position);
particleEmitter_setParticleSpawnPositionRange(p_emitter, -40.0f, 0.0f, -40.0f, 40.0f, 60.0f, 40.0f);
particleEmitter_setParticleAccelerationRange(p_emitter, 0.0f, -1000.0f, 0.0f, 0.0f, -1000.0f, 0.0f);
particleEmitter_setSpawnPositionRange(p_emitter, -40.0f, 0.0f, -40.0f, 40.0f, 60.0f, 40.0f);
particleEmitter_setAccelerationRange(p_emitter, 0.0f, -1000.0f, 0.0f, 0.0f, -1000.0f, 0.0f);
particleEmitter_setScaleAndLifetimeRanges(p_emitter, &D_80367C34);
particleEmitter_emitN(p_emitter, 1);
}
@@ -74,7 +74,7 @@ void __chLevelCollectible_presentCollectEmitSparkles(f32 position[3], enum asset
p_emitter = partEmitMgr_newEmitter(8);
particleEmitter_setSprite(p_emitter, sprite_id);
particleEmitter_setPosition(p_emitter, position);
particleEmitter_setParticleAccelerationRange(p_emitter, 0.0f, -250.0f, 0.0f, 0.0f, -250.0f, 0.0f);
particleEmitter_setAccelerationRange(p_emitter, 0.0f, -250.0f, 0.0f, 0.0f, -250.0f, 0.0f);
particleEmitter_setParticleVelocityRange(p_emitter, -100.0f, 200.0f, -100.0f, 100.0f, 350.0f, 100.0f);
particleEmitter_setAngularVelocityRange(p_emitter, 0.0f, 0.0f, 200.0f, 0.0f, 0.0f, 240.0f);
particleEmitter_setStartingScaleRange(p_emitter, 0.47f, 0.47f);

4
src/core2/code_517A0.c
View File

@@ -10,7 +10,7 @@ void func_802D8730(Actor *this);
ActorInfo D_80367C60 = {
0x15E, 0x188, 0x0,
0, NULL,
func_802D8730, func_80326224, func_80325340,
func_802D8730, actor_update_func_80326224, func_80325340,
0, 0, 0.0f, 0
};
@@ -46,7 +46,7 @@ void func_802D8730(Actor *this) {
this->velocity_y = 0.07f;
pCtrl = func_802F4094(this->position, 40.0f);
particleEmitter_setStartingScaleRange(pCtrl, 0.05f, 0.06f);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -3400.0f, 0.0f, 0.0f, -3400.0f, 0.0f);
particleEmitter_setAccelerationRange(pCtrl, 0.0f, -3400.0f, 0.0f, 0.0f, -3400.0f, 0.0f);
particleEmitter_setRGB(pCtrl, D_80367C84);
particleEmitter_setParticleVelocityRange(pCtrl, -180.0f, 200.0f, -180.0f, 180.0f, 400.0f, 180.0f);
particleEmitter_emitN(pCtrl, 9);

4
src/core2/code_51950.c
View File

@@ -10,14 +10,14 @@ void func_802D88E0(Actor *this);
ActorInfo D_80367C90 = {
0x100, 0x1FF, 0x580,
0x0, NULL,
func_802D88E0, func_80326224, func_80325934,
func_802D88E0, actor_update_func_80326224, func_80325934,
0, 0, 0.0f, 0
};
ActorInfo D_80367CB4 = {
0x101, 0x200, 0x6D1,
0x0, NULL,
func_802D88E0, func_80326224, func_80325934,
func_802D88E0, actor_update_func_80326224, func_80325934,
0, 0, 0.0f, 0
};

2
src/core2/code_53A10.c
View File

@@ -8,7 +8,7 @@ void func_802DAA14(Actor *this);
ActorInfo D_80367E70= {
0x21B, 0x351, 0,
0, NULL,
func_802DAA14, func_80326224, func_80325340,
func_802DAA14, actor_update_func_80326224, func_80325340,
0, 0, 0.0f, 0
};
//000E0F00

10
src/core2/code_53C10.c
View File

@@ -35,8 +35,8 @@ typedef struct {
void func_802DABA0(ParticleEmitter *pCtrl, f32 position[3], f32 scale, enum asset_e model_id) {
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setDrawMode(pCtrl, 2);
func_802EF9F8(pCtrl, 0.7f);
func_802EFA18(pCtrl, 5);
particleEmitter_func_802EF9F8(pCtrl, 0.7f);
particleEmitter_func_802EFA18(pCtrl, 5);
func_802EFA20(pCtrl, 0.8f, 1.0f);
particleEmitter_setSfx(pCtrl, SFX_1F_HITTING_AN_ENEMY_3, 6000);
particleEmitter_setStartingScaleRange(pCtrl, scale, scale);
@@ -47,7 +47,7 @@ void func_802DABA0(ParticleEmitter *pCtrl, f32 position[3], f32 scale, enum asse
}
void func_802DAC84(ParticleEmitter *pCtrl, Actor *this, enum asset_e model_id) {
static struct41s D_80367EA0 = {
static ParticleSettingsVelocityAcceleration D_80367EA0 = {
{{-200.0f, 850.0f, -200.0f}, { 400.0f, 1000.0f, 400.0f}},
{{ 0.0f, -1800.0f, 0.0f}, { 0.0f, -1800.0f, 0.0f}}
};
@@ -59,7 +59,7 @@ void func_802DAC84(ParticleEmitter *pCtrl, Actor *this, enum asset_e model_id) {
void func_802DAD08(ParticleEmitter *pCtrl, Actor *this, enum asset_e model_id) {
static struct41s D_80367ED0 = {
static ParticleSettingsVelocityAcceleration D_80367ED0 = {
{{ -50.0f, 750.0f, -50.0f}, { 120.0f, 900.0f, 120.0f}},
{{ 0.0f, -1800.0f, 0.0f}, { 0.0f, -1800.0f, 0.0f}}
};
@@ -70,7 +70,7 @@ void func_802DAD08(ParticleEmitter *pCtrl, Actor *this, enum asset_e model_id) {
}
void func_802DAD8C(ParticleEmitter *pCtrl, Actor *this, enum asset_e model_id) {
static struct41s D_80367F00 = {
static ParticleSettingsVelocityAcceleration D_80367F00 = {
{{ -80.0f, 400.0f, -80.0f}, { 160.0f, 860.0f, 160.0f}},
{{ 0.0f, -1400.0f, 0.0f}, { 0.0f, -1400.0f, 0.0f}}
};

10
src/core2/code_54D50.c
View File

@@ -18,19 +18,19 @@ void func_802DC018(Actor *this);
ActorInfo D_80367F30= {
0x1F5, 0x1E5, 0,
0, NULL,
func_802DC018, func_80326224, func_80325340,
func_802DC018, actor_update_func_80326224, func_80325340,
0, 0, 0.0f, 0
};
s32 D_80367F54[3] = {0xff, 0xff, 0xff};
struct40s D_80367F60 = {
ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_80367F60 = {
{ {0.1f, 0.5f}, {1.0f, 1.5f}, {0.0f, 0.01f}, {0.5f, 1.4f},
0.0f, 0.01f
},
4, 1
};
struct43s D_80367F90 ={
ParticleSettingsVelocityAccelerationPosition D_80367F90 ={
{{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}},
{{0.0f, -650.0f, 0.0f}, {0.0f, -650.0f, 0.0f}},
{{-200.0f, 0.0f, -200.0f}, {200.0f, 0.0f, 200.0f}}
@@ -63,12 +63,12 @@ void func_802DBCE0(ParticleEmitter *pCtrl, f32 arg1[3]){
}
void func_802DBE9C(Actor *this, ParticleEmitter *pCtrl){
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80367F90);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80367F90);
particleEmitter_setModel(pCtrl, 0x344);
particleEmitter_setPosition(pCtrl, this->position);
particleEmitter_setDrawMode(pCtrl, 4);
particleEmitter_setAngularVelocityRange(pCtrl, -450.0f, -450.0f, -450.0f, 450.0f, 450.0f, 450.0f);
func_802EFA18(pCtrl, 1);
particleEmitter_func_802EFA18(pCtrl, 1);
particleEmitter_setParticleCallback(pCtrl, func_802DBCE0);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 7.0f, 7.0f);

4
src/core2/code_55180.c
View File

@@ -10,11 +10,11 @@ void func_802DC208(Actor *this);
ActorInfo D_80367FE0 = {
0x1F6, 0x1E6, 0,
0, NULL,
func_802DC208, func_80326224, func_80325340,
func_802DC208, actor_update_func_80326224, func_80325340,
3000, 0, 0.0f, 0
};
struct40s D_80368004 = {
ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_80368004 = {
{{0.2f, 0.4f},
{0.8f, 1.0f},
{0.0f, 0.01f},

2
src/core2/code_55390.c
View File

@@ -14,7 +14,7 @@ f32 D_80368040[3] = {0.0f, 0.0f, 0.0f};
ActorInfo D_8036804C = {
MARKER_174_GAME_OVER, ACTOR_1DB_GAME_OVER, ASSET_54C_MODEL_GAME_OVER,
0x1, NULL,
func_802DC45C, func_80326224, func_802DC320,
func_802DC45C, actor_update_func_80326224, func_802DC320,
0, 0, 0.0f, 0
};

2
src/core2/code_556C0.c
View File

@@ -10,7 +10,7 @@ f32 D_80368070[3] = {0.0f, 0.0f, 0.0f};
ActorInfo D_8036807C = {
0x17C, 0x19C, 0x56C,
0x1, NULL,
func_802DC67C, func_80326224, func_802DC320,
func_802DC67C, actor_update_func_80326224, func_802DC320,
0, 0, 0.0f, 0
};

2
src/core2/code_55850.c
View File

@@ -13,7 +13,7 @@ f32 D_803680A0[3] = {0.0f, 0.0f, 0.0f};
ActorInfo D_803680AC = {
0x175, 0x1DC, 0x54D,
0x1, NULL,
func_802DC900, func_80326224, func_802DC7E0,
func_802DC900, actor_update_func_80326224, func_802DC7E0,
0, 0, 0.0f, 0
};

2
src/core2/code_57C70.c
View File

@@ -24,7 +24,7 @@ f32 D_80368330[3] = {0.0f, 0.0f, 0.0f};
ActorInfo D_8036833C = {
0x294, 0x19B, ASSET_56D_MUMBOS_HAND_WITH_PICTURE,
0x1, D_80368300,
func_802DEE1C, func_80326224, func_802DEC00,
func_802DEE1C, actor_update_func_80326224, func_802DEC00,
0, 0, 0.0f, 0
};

2
src/core2/code_581D0.c
View File

@@ -13,7 +13,7 @@ s32 D_8036837C[4] = {0xFF, 0xFF, 0xFF, 0xFF};
ActorInfo D_8036838C = {
0x17B, 0x2B5, 0x472,
0, NULL,
func_802DF2C4, func_80326224, func_80325340,
func_802DF2C4, actor_update_func_80326224, func_80325340,
0, 0, 0.0f, 0
};

2
src/core2/code_59780.c
View File

@@ -19,7 +19,7 @@ ActorAnimationInfo D_80368440[] = {
ActorInfo D_80368450 = {
MARKER_72_FIRE_SPARKLE, ACTOR_A2_FIRE_SPARKLE, ASSET_3AD_FIRE_SPARKLE,
0x1, D_80368440,
func_802E08F0, func_80326224, actor_draw,
func_802E08F0, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};

2
src/core2/code_59A80.c
View File

@@ -15,7 +15,7 @@ enum mumbotoken_e func_802E0CB0(Actor *this);
ActorInfo D_803685A0 = {
MARKER_39_MUMBO_TOKEN, ACTOR_2D_MUMBO_TOKEN, ASSET_41A_SPRITE_MUMBO_TOKEN,
0, NULL,
func_802E0B10, func_80326224, func_80325934,
func_802E0B10, actor_update_func_80326224, func_80325934,
2000, 0, 0.0f, 0
};

6
src/core2/code_66D90.c
View File

@@ -31,16 +31,16 @@ ParticleEmitter *func_802EDD8C(f32 pos[3], f32 xz_range, f32 arg2){
particleEmitter_setSprite(pCtrl, ASSET_70A_SPRITE_BUBBLE_1);
particleEmitter_setDrawMode(pCtrl, 4);
particleEmitter_setAlpha(pCtrl, 0xff);
particleEmitter_setParticleAccelerationRange( pCtrl,
particleEmitter_setAccelerationRange( pCtrl,
0.0f, 150.0f, 0.0f,
0.0f, 150.0f, 0.0f
);
func_802EFA18(pCtrl, 1);
particleEmitter_func_802EFA18(pCtrl, 1);
func_802EFA34(pCtrl, arg2);
particleEmitter_setParticleCallback(pCtrl, func_802EDD68);
particleEmitter_setFade(pCtrl, 0.0f, 0.8f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 4.0f, 4.0f);
particleEmitter_setParticleSpawnPositionRange( pCtrl,
particleEmitter_setSpawnPositionRange( pCtrl,
-xz_range, 0.0f, -xz_range,
xz_range, 0.0f, xz_range
);

8
src/core2/code_66FB0.c
View File

@@ -61,13 +61,13 @@ void func_802EDF40(f32 pos[3], s32 arg1, s32 cnt, f32 arg3, f32 arg4, f32 arg5,
particleEmitter_setAngularVelocityRange(pCtrl, 0, 0, 0, 0, 0, 0);
func_802EFF9C(pCtrl, 0);
}//L802EE0B4
particleEmitter_setParticleAccelerationRange(pCtrl,
particleEmitter_setAccelerationRange(pCtrl,
0, -800.0f, 0,
0, -800.0f, 0
);
func_802EF9F8(pCtrl, 0.6f);
func_802EFA18(pCtrl, 0);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
particleEmitter_func_802EF9F8(pCtrl, 0.6f);
particleEmitter_func_802EFA18(pCtrl, 0);
particleEmitter_setSpawnPositionRange(pCtrl,
-10.0f, -10.0f, -10.0f,
10.0f, 10.0f, 10.0f
);

2
src/core2/code_67650.c
View File

@@ -57,7 +57,7 @@ void func_802EE6CC(f32 position[3], f32 velocity[3], s32 color[4], s32 arg3, f32
particleEmitter_setFade(p_ctrl, 0.075f, 0.4f);
particleEmitter_setPosition(p_ctrl, position);
particleEmitter_setSpawnIntervalRange(p_ctrl, 0.0f, 0.0f);
func_802EFA78(p_ctrl, 1);
particleEmitter_func_802EFA78(p_ctrl, 1);
if (velocity != NULL) {
ml_vec3f_scale_copy(sp40, velocity, 30.0f);
} else {

4
src/core2/code_6CD20.c
View File

@@ -11,7 +11,7 @@ s16 D_80368D80[] = {
ASSET_719_SPRITE_SPARKLE_GREEN_2,
};
struct43s D_80368D88 = {
ParticleSettingsVelocityAccelerationPosition D_80368D88 = {
{{-300.0f, -300.0f, -300.0f}, {300.0f, 300.0f, 300.0f}},
{{0.0f, -100.0f, 0.0f}, {0.0f, -100.0f, 0.0f}},
{{-25.0f, -25.0f, -25.0f}, {25.0f, 25.0f, 25.0f}}
@@ -45,7 +45,7 @@ void func_802F3CF8(f32 arg0[3], s32 arg1, s32 arg2){
particleEmitter_setStartingScaleRange(pCtrl, 0.1f, 0.2f);
particleEmitter_setFinalScaleRange(pCtrl, 0.4f, 0.5f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 0.75f, 0.75f);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80368D88);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80368D88);
if(arg1 == 0){
particleEmitter_setDrawMode(pCtrl, PART_EMIT_NO_DEPTH);
}

2
src/core2/code_6CEC0.c
View File

@@ -19,7 +19,7 @@ ParticleEmitter *func_802F3E98(f32 pos[3], enum asset_e sprite_id){
this = func_802F0EF0(D_80380A80);
particleEmitter_setSprite(this, sprite_id);
particleEmitter_setParticleAccelerationRange(this,
particleEmitter_setAccelerationRange(this,
0.0f, -250.0f, 0.0f,
0.0f, -250.0f, 0.0f
);

6
src/core2/code_6D030.c
View File

@@ -39,15 +39,15 @@ ParticleEmitter *func_802F4094(f32 pos[3], f32 arg1){
pCtrl = func_802F0EF0(D_80380A90);
particleEmitter_setSprite(pCtrl, ASSET_70B_SPRITE_BUBBLE_2);
particleEmitter_setAlpha(pCtrl, 180);
particleEmitter_setParticleAccelerationRange(pCtrl,
particleEmitter_setAccelerationRange(pCtrl,
0.0f, -1300.0f, 0.0f,
0.0f, -1300.0f, 0.0f
);
func_802EFA18(pCtrl, 1);
particleEmitter_func_802EFA18(pCtrl, 1);
func_802EFA04(pCtrl, pos[1]);
particleEmitter_setParticleCallback(pCtrl, func_802F3FC0);
particleEmitter_setFade(pCtrl, 0.0f, 0.8f);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
particleEmitter_setSpawnPositionRange(pCtrl,
-arg1, 0.0f, -arg1,
arg1, 0.0f, arg1
);

2
src/core2/code_935F0.c
View File

@@ -26,7 +26,7 @@ enum chminigame_state_e {
ActorInfo chMinigame = {
MARKER_1E1_FF_MINIGAME, ACTOR_376_FF_MINIGAME, 0x0,
MINIGAME_STATE_1_INTRODUCE_GAME, NULL,
chMinigame_update, func_80326224, func_80325340,
chMinigame_update, actor_update_func_80326224, func_80325340,
0, 0, 0.0f, 0
};

2
src/core2/code_9E370.c
View File

@@ -439,7 +439,7 @@ s32 func_80326218(void){
return D_8036E564;
}
void func_80326224(Actor *this){
void actor_update_func_80326224(Actor *this){
func_80343DEC(this);
}

8
src/core2/code_D0CA0.c
View File

@@ -239,7 +239,7 @@ void func_803584BC(Actor *this) {
void func_80358524(f32 position[3], s32 count, enum asset_e model_id) {
static ParticleScaleAndLifetimeRanges D_803728C4 = { {1.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 0.01f}, {1.2f, 1.2f}, 0.0f, 0.1f};
static struct43s D_803728EC = {
static ParticleSettingsVelocityAccelerationPosition D_803728EC = {
{{-250.0f, 500.0f, -250.0f}, { 350.0f, 760.0f, 350.0f}},
{{ 0.0f, -1200.0f, 0.0f}, { 0.0f, -1200.0f, 0.0f}},
{{ -50.0f, 0.0f, -50.0f}, { 50.0f, 50.0f, 50.0f}}
@@ -252,11 +252,11 @@ void func_80358524(f32 position[3], s32 count, enum asset_e model_id) {
particleEmitter_setModel(temp_v0, model_id);
particleEmitter_setPosition(p_ctrl, position);
particleEmitter_setAngularVelocityRange(p_ctrl, -400.0f, -400.0f, -400.0f, 400.0f, 400.0f, 400.0f);
func_802EF9F8(p_ctrl, 0.01f);
func_802EFA18(p_ctrl, 3);
particleEmitter_func_802EF9F8(p_ctrl, 0.01f);
particleEmitter_func_802EFA18(p_ctrl, 3);
func_802EFA20(p_ctrl, 1.0f, 1.3f);
particleEmitter_setSfx(p_ctrl, SFX_2F_ORANGE_SPLAT, 16000);
particleEmitter_setPositionVelocityAndAccelerationRanges(p_ctrl, &D_803728EC);
particleEmitter_setVelocityAccelerationAndPositionRanges(p_ctrl, &D_803728EC);
particleEmitter_setScaleAndLifetimeRanges(p_ctrl, &D_803728C4);
particleEmitter_emitN(p_ctrl, count);
}

4
src/core2/code_D5D10.c
View File

@@ -50,14 +50,14 @@ ActorAnimationInfo D_80372D20[] = {
ActorInfo D_80372D78 = {
MARKER_218_LIMBO, ACTOR_34E_LIMBO, ASSET_4CC_MODEL_LIMBO,
0x1, D_80372D20,
chskeleton_update, func_80326224, actor_draw,
chskeleton_update, actor_update_func_80326224, actor_draw,
2500, 0, 1.0f, 0
};
/* .code */
void func_8035CCA0(ParticleEmitter *pCtrl, Actor *this, enum asset_e model_id) {
func_802DABA0(pCtrl, this->position, this->scale, model_id);
particleEmitter_setParticleAccelerationRange(pCtrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setAccelerationRange(pCtrl, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setParticleVelocityRange(pCtrl, -50.0f, 750.0f, -50.0f, 120.0f, 900.0f, 120.0f);
particleEmitter_emitN(pCtrl, 4);

2
src/core2/code_D5FD0.c
View File

@@ -51,7 +51,7 @@ ActorAnimationInfo D_80372DA0[] = {
ActorInfo D_80372DF8 = {
MARKER_21A_SEAMAN_GRUBLIN, ACTOR_350_SEAMAN_GRUBLIN, ASSET_49D_MODEL_SEAMAN_GRUBLIN,
0x1, D_80372DA0,
func_8035D058, func_80326224, actor_draw,
func_8035D058, actor_update_func_80326224, actor_draw,
2500, 0, 1.0f, 0
};

4
src/core2/code_D6180.c
View File

@@ -48,14 +48,14 @@ ActorAnimationInfo D_80372E20[] = {
ActorInfo D_80372E78 = {
MARKER_219_MUMMUM, ACTOR_34F_MUMMUM, ASSET_4C7_MODEL_MUMMUM,
0x1, D_80372E20,
func_8035D3D8, func_80326224, actor_draw,
func_8035D3D8, actor_update_func_80326224, actor_draw,
2500, 0, 1.0f, 0
};
/* .code */
void func_8035D110(ParticleEmitter *p_emitter, Actor *this, enum asset_e model_id) {
func_802DABA0(p_emitter, this->position, this->scale, model_id);
particleEmitter_setParticleAccelerationRange(p_emitter, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setAccelerationRange(p_emitter, 0.0f, -1800.0f, 0.0f, 0.0f, -1800.0f, 0.0f);
particleEmitter_setAngularVelocityRange(p_emitter, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setParticleVelocityRange(p_emitter, -50.0f, 750.0f, -50.0f, 120.0f, 900.0f, 120.0f);
particleEmitter_emitN(p_emitter, 1);

2
src/core2/code_D6600.c
View File

@@ -30,7 +30,7 @@ ActorAnimationInfo D_80372EA0[] = {
ActorInfo D_80372EE0 = {
MARKER_69_CHUMP_FISH, ACTOR_A_CHUMP_FISH, ASSET_36B_CHUMP_FISH,
0x2, D_80372EA0,
func_8035DA1C, func_80326224, actor_draw,
func_8035DA1C, actor_update_func_80326224, actor_draw,
3000, 0, 0.0f, 0
};

4
src/core2/code_DA3A0.c
View File

@@ -53,9 +53,9 @@ void func_80361330(Actor *this, s32 next_state){
ml_vec3f_roll_rotate_copy(sp40, sp40, this->roll);
ml_vec3f_yaw_rotate_copy(sp40, sp40, this->yaw);
particleEmitter_setSprite(pctrl, ASSET_70E_SPRITE_SMOKE_2);
particleEmitter_setParticleAccelerationRange(pctrl, 0.0f, 200.0f, 0.0f, 0.0f, 1000.0f, 0.0f);
particleEmitter_setAccelerationRange(pctrl, 0.0f, 200.0f, 0.0f, 0.0f, 1000.0f, 0.0f);
particleEmitter_setStartingFrameRange(pctrl, 0, 7);
particleEmitter_setParticleSpawnPositionRange(pctrl, -20.0f, -20.0f, -20.0f, 20.0f, 20.0f, 20.0f);
particleEmitter_setSpawnPositionRange(pctrl, -20.0f, -20.0f, -20.0f, 20.0f, 20.0f, 20.0f);
particleEmitter_setPosition(pctrl, this->position);
particleEmitter_setScaleAndLifetimeRanges(pctrl, &D_8037317C);
particleEmitter_setParticleVelocityRange(pctrl,

2
src/core2/code_DA760.c
View File

@@ -8,7 +8,7 @@ void func_80361870(Actor *this);
ActorInfo D_803731B0 = {
0x1E4, 0x373, 0,
0, NULL,
func_80361870, func_80326224, func_80325340,
func_80361870, actor_update_func_80326224, func_80325340,
0, 0, 0.0f, 0
};

142
src/core2/code_DB010.c
View File

@@ -30,8 +30,8 @@ ActorInfo D_803732E0 = {
/* .code */
void func_80361FA0(f32 arg0[3]) {
static struct40s D_80373304 = {{{0.4f, 1.4f}, {0.0f, 0.0f}, {0.0f, 0.01f}, {4.0f, 4.0f}, 0.5f, 0.7f}, 4.0f, 15.0f};
static struct43s D_80373334 = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_80373304 = {{{0.4f, 1.4f}, {0.0f, 0.0f}, {0.0f, 0.01f}, {4.0f, 4.0f}, 0.5f, 0.7f}, 4.0f, 15.0f};
static ParticleSettingsVelocityAccelerationPosition D_80373334 = {
{{-250.0f, 600.0f, -250.0f}, { 350.0f, 960.0f, 350.0f}},
{{ 0.0f, -1200.0f, 0.0f}, { 0.0f, -1200.0f, 0.0f}},
{{ -60.0f, -30.0f, -60.0f}, { 60.0f, 30.0f, 60.0f}}
@@ -42,19 +42,19 @@ void func_80361FA0(f32 arg0[3]) {
particleEmitter_setModel(pCtrl, 0x441);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setAngularVelocityRange(pCtrl, -200.0f, 200.0f, -200.0f, 200.0f, 200.0f, 200.0f);
func_802EF9F8(pCtrl, 0.01f);
func_802EFA18(pCtrl, 3);
particleEmitter_func_802EF9F8(pCtrl, 0.01f);
particleEmitter_func_802EFA18(pCtrl, 3);
func_802EFA20(pCtrl, 1.0f, 1.3f);
particleEmitter_setSfx(pCtrl, SFX_2F_ORANGE_SPLAT, 16000);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80373334);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80373334);
func_802EFC28(pCtrl, &D_80373304);
FUNC_8030E624(SFX_7C_CHEBOOF, 0.6f, 29000);
}
void func_80362084(f32 position[3]) {
static s32 D_8037337C[3] = {50, 255, 50};
static struct40s D_80373388 = {{{0.3f, 0.03f}, {0.5f, 0.5f}, {0.0f, 0.01f}, {1.5f, 2.0f}, 0.06f, 0.7f}, 4.0f, 1.0f};
static struct42s D_803733B8 = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_80373388 = {{{0.3f, 0.03f}, {0.5f, 0.5f}, {0.0f, 0.01f}, {1.5f, 2.0f}, 0.06f, 0.7f}, 4.0f, 1.0f};
static ParticleSettingsVelocityPosition D_803733B8 = {
{{ -5.0f, 100.0f, -5.0f}, { 5.0f, 100.0f, 5.0f}},
{{-60.0f, 0.0f, -60.0f}, { 60.0f, 5.0f, 60.0f}}
};
@@ -77,8 +77,8 @@ void func_80362084(f32 position[3]) {
void func_8036215C(f32 arg0[3]) {
static s32 D_803733E8[3] = {0xb4, 0xe6, 0xff};
static struct40s D_803733F4 = {{{1.0f, 1.8f}, {2.2f, 2.7f}, {0.0f, 0.01f}, {0.8f, 1.2f}, 0.41f, 0.73f}, 4.0f, 15.0f};
static struct43s D_80373424 = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_803733F4 = {{{1.0f, 1.8f}, {2.2f, 2.7f}, {0.0f, 0.01f}, {0.8f, 1.2f}, 0.41f, 0.73f}, 4.0f, 15.0f};
static ParticleSettingsVelocityAccelerationPosition D_80373424 = {
{{-300.0f, 600.0f, -300.0f}, { 300.0f, 1000.0f, 300.0f}},
{{ 0.0f, -1200.0f, 0.0f}, { 0.0f, -1600.0f, 0.0f}},
{{ -10.0f, 0.0f, -10.0f}, { 10.0f, 0.0f, 10.0f}}
@@ -91,13 +91,13 @@ void func_8036215C(f32 arg0[3]) {
particleEmitter_setRGB(pCtrl, D_803733E8);
particleEmitter_setAlpha(pCtrl, 0x28);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80373424);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80373424);
func_802EFC28(pCtrl, &D_803733F4);
}
void func_803621F0(f32 arg0[3]) {
static struct40s D_8037346C = {{{0.3f, 0.4f}, {0.5f, 0.5f}, {0.0f, 0.01f}, {0.8f, 1.2f}, 0.91f, 0.99f}, 4.0f, 18.0f};
static struct43s D_8037349C = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_8037346C = {{{0.3f, 0.4f}, {0.5f, 0.5f}, {0.0f, 0.01f}, {0.8f, 1.2f}, 0.91f, 0.99f}, 4.0f, 18.0f};
static ParticleSettingsVelocityAccelerationPosition D_8037349C = {
{{-200.0f, 900.0f, -200.0f}, { 200.0f, 1400.0f, 200.0f}},
{{ 0.0f, -1800.0f, 0.0f}, { 0.0f, -2400.0f, 0.0f}},
{{ -10.0f, -20.0f, -10.0f}, { 10.0f, -20.0f, 10.0f}}
@@ -109,13 +109,13 @@ void func_803621F0(f32 arg0[3]) {
particleEmitter_setStartingFrameRange(pCtrl, 3, 5);
particleEmitter_setAlpha(pCtrl, 0xD2);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_8037349C);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8037349C);
func_802EFC28(pCtrl, &D_8037346C);
}
void func_80362274(f32 arg0[3]) {
static struct40s D_803734E4 = {{{3.2f, 3.4f}, {0.0f, 0.0f}, {0.0f, 0.01f}, {2.0f, 2.0f}, 0.0f, 0.3f}, 4.0f, 15.0f};
static struct43s D_80373514 = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_803734E4 = {{{3.2f, 3.4f}, {0.0f, 0.0f}, {0.0f, 0.01f}, {2.0f, 2.0f}, 0.0f, 0.3f}, 4.0f, 15.0f};
static ParticleSettingsVelocityAccelerationPosition D_80373514 = {
{{-950.0f, 800.0f, -250.0f}, {-550.0f, 1360.0f, 50.0f}},
{{-700.0f, -1700.0f, 0.0f}, {-900.0f, -1700.0f, 0.0f}},
{{ -60.0f, 0.0f, -60.0f}, { 60.0f, 30.0f, 60.0f}}
@@ -126,16 +126,16 @@ void func_80362274(f32 arg0[3]) {
particleEmitter_setModel(pCtrl, 0x89B);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setAngularVelocityRange(pCtrl, -400.0f, -200.0f, -400.0f, 400.0f, -400.0f, 400.0f);
func_802EF9F8(pCtrl, 0.01f);
func_802EFA18(pCtrl, 3);
particleEmitter_func_802EF9F8(pCtrl, 0.01f);
particleEmitter_func_802EFA18(pCtrl, 3);
func_802EFA20(pCtrl, 1.0f, 1.3f);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80373514);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80373514);
func_802EFC28(pCtrl, &D_803734E4);
}
void func_8036233C(f32 arg0[3]) {
static struct40s D_8037355C = {{{3.0f, 3.4f}, {0.0f, 0.0f}, {0.0f, 0.01f}, {4.0f, 4.0f}, 0.0f, 0.3f}, 4.0f, 15.0f};
static struct43s D_8037358C = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_8037355C = {{{3.0f, 3.4f}, {0.0f, 0.0f}, {0.0f, 0.01f}, {4.0f, 4.0f}, 0.0f, 0.3f}, 4.0f, 15.0f};
static ParticleSettingsVelocityAccelerationPosition D_8037358C = {
{{-450.0f, 600.0f, -50.0f}, {-150.0f, 1100.0f, 50.0f}},
{{-700.0f, -1700.0f, 0.0f}, {-800.0f, -1700.0f, 0.0f}},
{{ -60.0f, 0.0f, -60.0f}, { 60.0f, 30.0f, 60.0f}}
@@ -146,16 +146,16 @@ void func_8036233C(f32 arg0[3]) {
particleEmitter_setModel(pCtrl, 0x89A);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setAngularVelocityRange(pCtrl, -200.0f, 200.0f, -200.0f, 200.0f, 200.0f, 200.0f);
func_802EF9F8(pCtrl, 0.01f);
func_802EFA18(pCtrl, 3);
particleEmitter_func_802EF9F8(pCtrl, 0.01f);
particleEmitter_func_802EFA18(pCtrl, 3);
func_802EFA20(pCtrl, 1.0f, 1.3f);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_8037358C);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8037358C);
func_802EFC28(pCtrl, &D_8037355C);
}
void func_80362404(f32 arg0[3]) {
static struct40s D_803735D4 = {{{1.1f, 1.1f}, {4.3f, 4.3f}, {0.0f, 0.05f}, {0.3f, 0.5f}, 0.06f, 0.3f}, 4.0f, 1.0f};
static struct42s D_80373604 = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_803735D4 = {{{1.1f, 1.1f}, {4.3f, 4.3f}, {0.0f, 0.05f}, {0.3f, 0.5f}, 0.06f, 0.3f}, 4.0f, 1.0f};
static ParticleSettingsVelocityPosition D_80373604 = {
{{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}},
{{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}
};
@@ -171,8 +171,8 @@ void func_80362404(f32 arg0[3]) {
void func_8036247C(f32 arg0[3]) {
static s32 D_80373634[3] = {0xA, 0xFF, 0xA};
static struct40s D_80373640 = {{{2.0f, 2.0f}, {3.0f, 3.5f}, {0.0f, 0.01f}, {2.0f, 2.5f}, 0.1f, 0.4}, 4.0f, 1.0f};
static struct42s D_80373670 = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_80373640 = {{{2.0f, 2.0f}, {3.0f, 3.5f}, {0.0f, 0.01f}, {2.0f, 2.5f}, 0.1f, 0.4}, 4.0f, 1.0f};
static ParticleSettingsVelocityPosition D_80373670 = {
{{ 0.0f, 40.0f, 0.0f}, { 0.0f, 90.0f, 0.0f}},
{{-400.0f, 0.0f, -400.0f}, { 400.0f, 0.0f, 400.0f}}
};
@@ -190,7 +190,7 @@ void func_8036247C(f32 arg0[3]) {
void func_80362510(Actor *actor) {
static s32 D_803736A0[3] = {0xFF, 0xFF, 0xFF};
static struct40s D_803736AC = {{{0.01f, 0.01f}, {1.5f, 1.6f}, {0.05f, 0.7f}, {0.7f, 1.3f}, 0.1f, 0.8f}, 4.0f, 25.0f};
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_803736AC = {{{0.01f, 0.01f}, {1.5f, 1.6f}, {0.05f, 0.7f}, {0.7f, 1.3f}, 0.1f, 0.8f}, 4.0f, 25.0f};
ParticleEmitter *pCtrl;
f32 sp30[3];
@@ -201,7 +201,7 @@ void func_80362510(Actor *actor) {
particleEmitter_setRGB(pCtrl, D_803736A0);
particleEmitter_setAlpha(pCtrl, 0x1E);
particleEmitter_setPosition(pCtrl, actor->position);
particleEmitter_setParticleSpawnPositionRange(pCtrl, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
particleEmitter_setSpawnPositionRange(pCtrl, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
sp30[0] = 1000.0f;
sp30[1] = 100.0f;
sp30[2] = 0.0f;
@@ -216,8 +216,8 @@ void func_80362510(Actor *actor) {
void func_80362680(f32 arg0[3]) {
static struct40s D_803736DC = {{{0.7f, 0.9f}, {0.4f, 0.5}, {0.0f, 0.01f}, {0.8f, 1.0f}, 0.15f, 0.3f}, 0.0f, 1.0f};
static struct42s D_8037370C = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_803736DC = {{{0.7f, 0.9f}, {0.4f, 0.5}, {0.0f, 0.01f}, {0.8f, 1.0f}, 0.15f, 0.3f}, 0.0f, 1.0f};
static ParticleSettingsVelocityPosition D_8037370C = {
{{-10.0f, -10.0f, -10.0f}, { 10.0f, 10.0f, 10.0f}},
{{ 0.0f, 30.0f, 0.0f}, { 0.0f, 30.0f, 0.0f}}
};
@@ -232,8 +232,8 @@ void func_80362680(f32 arg0[3]) {
}
void func_803626F8(f32 arg0[3]) {
static struct40s D_8037373C = {{{0.05f, 0.1f}, {0.1f, 0.2f}, {0.0f, 0.01f}, {1.4f, 1.5f}, 0.01f, 0.7f}, 0.0f, 1.0f};
static struct43s D_8037376C = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_8037373C = {{{0.05f, 0.1f}, {0.1f, 0.2f}, {0.0f, 0.01f}, {1.4f, 1.5f}, 0.01f, 0.7f}, 0.0f, 1.0f};
static ParticleSettingsVelocityAccelerationPosition D_8037376C = {
{{ -5.0f, -5.0f, -5.0f}, { 5.0f, 5.0f, 5.0f}},
{{ 0.0f, -50.0f, 0.0f}, { 0.0f, -90.0f, 0.0f}},
{{-30.0f, 30.0f, -30.0f}, { 30.0f, 60.0f, 30.0f}}
@@ -244,15 +244,15 @@ void func_803626F8(f32 arg0[3]) {
particleEmitter_setSprite(pCtrl, 0x713);
particleEmitter_setStartingFrameRange(pCtrl, 1, 6);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_8037376C);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8037376C);
func_802EFC28(pCtrl, &D_8037373C);
}
void func_80362770(f32 arg0[3]) {
static s32 D_803737B4[3] = {0xFF, 0xFF, 00};
static struct40s D_803737C0 = {{{0.1f, 0.3f}, {0.6f, 0.7f}, {0.0f, 0.01f}, {0.3f, 0.4f}, 0.01f, 0.3f}, 4.0f, 16.0f};
static struct42s D_803737F0 = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_803737C0 = {{{0.1f, 0.3f}, {0.6f, 0.7f}, {0.0f, 0.01f}, {0.3f, 0.4f}, 0.01f, 0.3f}, 4.0f, 16.0f};
static ParticleSettingsVelocityPosition D_803737F0 = {
{{-600.0f, -600.0f, -600.0f}, { 600.0f, 600.0f, 600.0f}},
{{ 0.0f, 30.0f, 0.0f}, { 0.0f, 30.0f, 0.0f}},
};
@@ -269,8 +269,8 @@ void func_80362770(f32 arg0[3]) {
void func_803627F8(f32 arg0[3]){
static s32 D_80373820[3] = {130, 155, 40};
static struct40s D_8037382C = {{{3.3f, 3.3f}, {4.5f, 4.7f}, {0.0f, 0.01f}, {1.8f, 3.2f}, 0.31f, 0.73f}, 4.0f, 11.0f};
static struct43s D_8037385C = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_8037382C = {{{3.3f, 3.3f}, {4.5f, 4.7f}, {0.0f, 0.01f}, {1.8f, 3.2f}, 0.31f, 0.73f}, 4.0f, 11.0f};
static ParticleSettingsVelocityAccelerationPosition D_8037385C = {
{{-200.0f, 120.0f, -200.0f}, { 200.0f, 130.0f, 200.0f}},
{{ 0.0f, -100.0f, 0.0f}, { 0.0f, -100.0f, 0.0f}},
{{ -30.0f, 0.0f, -30.0f}, { 30.0f, 0.0f, 30.0f}}
@@ -283,14 +283,14 @@ void func_803627F8(f32 arg0[3]){
particleEmitter_setRGB(pCtrl, D_80373820);
particleEmitter_setAlpha(pCtrl, 120);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_8037385C);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8037385C);
func_802EFC28(pCtrl, &D_8037382C);
}
void func_8036288C(f32 arg0[3]){
static s32 D_803738A4[3] = {91, 142, 0};
static struct40s D_803738B0 = {{{0.2f, 0.9f}, {0.4f, 0.9f}, {0.0f, 0.01f}, {1.8f, 4.2f}, 0.31f, 0.73f}, 4.0f, 13.0f};
static struct43s D_803738E0 = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_803738B0 = {{{0.2f, 0.9f}, {0.4f, 0.9f}, {0.0f, 0.01f}, {1.8f, 4.2f}, 0.31f, 0.73f}, 4.0f, 13.0f};
static ParticleSettingsVelocityAccelerationPosition D_803738E0 = {
{{-400.0f, 520.0f, -400.0f}, { 400.0f, 750.0f, 400.0f}},
{{ 0.0f, -1200.0f, 0.0f}, { 0.0f, -1600.0f, 0.0f}},
{{ -30.0f, 0.0f, -30.0f}, { 30.0f, 0.0f, 30.0f}}
@@ -303,14 +303,14 @@ void func_8036288C(f32 arg0[3]){
particleEmitter_setRGB(pCtrl, D_803738A4);
particleEmitter_setAlpha(pCtrl, 255);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_803738E0);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_803738E0);
func_802EFC28(pCtrl, &D_803738B0);
}
void func_80362920(f32 arg0[3]){
static s32 D_80373928[3] = {0, 255, 0};
static struct40s D_80373934 = {{{1.4f, 1.9f}, {2.4f, 2.9f}, {0.0f, 3.2f}, {8.8f, 9.2f}, 0.31f, 0.73f}, 4.0f, 13.0f};
static struct43s D_80373964 = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_80373934 = {{{1.4f, 1.9f}, {2.4f, 2.9f}, {0.0f, 3.2f}, {8.8f, 9.2f}, 0.31f, 0.73f}, 4.0f, 13.0f};
static ParticleSettingsVelocityAccelerationPosition D_80373964 = {
{{-60.0f, 100.0f, -60.0f}, { 60.0f, 170.0f, 60.0f}},
{{ 0.0f, 0.0f, 0.0f}, { 0.0f, 0.0f, 0.0f}},
{{-30.0f, 0.0f, -30.0f}, { 30.0f, 0.0f, 30.0f}}
@@ -321,14 +321,14 @@ void func_80362920(f32 arg0[3]){
particleEmitter_setRGB(pCtrl, D_80373928);
particleEmitter_setAlpha(pCtrl, 60);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80373964);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80373964);
func_802EFC28(pCtrl, &D_80373934);
}
void func_803629B4(f32 arg0[3]){
static s32 D_803739AC[3] = {255, 255, 255};
static struct40s D_803739B8 = {{{0.2f, 0.9f}, {0.3f, 0.4f}, {0.0f, 0.2f}, {1.0f, 1.2f}, 0.31f, 0.73f}, 4.0f, 13.0f};
static struct43s D_803739E8 = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_803739B8 = {{{0.2f, 0.9f}, {0.3f, 0.4f}, {0.0f, 0.2f}, {1.0f, 1.2f}, 0.31f, 0.73f}, 4.0f, 13.0f};
static ParticleSettingsVelocityAccelerationPosition D_803739E8 = {
{{-600.0f, 0.0f, -600.0f}, { 600.0f, 0.0f, 600.0f}},
{{ 0.0f, 0.0f, 0.0f}, { 0.0f, 0.0f, 0.0f}},
{{ 0.0f, 40.0f, 0.0f}, { 0.0f, 40.0f, 0.0f}}
@@ -341,14 +341,14 @@ void func_803629B4(f32 arg0[3]){
particleEmitter_setRGB(pCtrl, D_803739AC);
particleEmitter_setAlpha(pCtrl, 255);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_803739E8);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_803739E8);
func_802EFC28(pCtrl, &D_803739B8);
}
void func_80362A48(f32 arg0[3]){
static s32 D_80373A30[3] = {255, 255, 255};
static struct40s D_80373A3C = {{{1.5f, 1.6f}, {2.5f, 2.9f}, {0.0f, 0.01f}, {2.0f, 2.5f}, 0.1f, 0.4f}, 4.0f, 1.0f};
static struct43s D_80373A6C = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_80373A3C = {{{1.5f, 1.6f}, {2.5f, 2.9f}, {0.0f, 0.01f}, {2.0f, 2.5f}, 0.1f, 0.4f}, 4.0f, 1.0f};
static ParticleSettingsVelocityAccelerationPosition D_80373A6C = {
{{ 0.0f, 40.0f, 0.0f}, { 0.0f, 90.0f, 0.0f}},
{{ 0.0f, 0.0f, 0.0f}, { 0.0f, 0.0f, 0.0f}},
{{-5.0f, 0.0f, -5.0f}, { 5.0f, 0.0f, 5.0f}}
@@ -361,14 +361,14 @@ void func_80362A48(f32 arg0[3]){
particleEmitter_setRGB(pCtrl, D_80373A30);
particleEmitter_setAlpha(pCtrl, 40);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80373A6C);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80373A6C);
func_802EFC28(pCtrl, &D_80373A3C);
}
void func_80362ADC(f32 arg0[3]){
static s32 D_80373AB4[3] = {30, 30, 30};
static struct40s D_80373AC0 = {{{3.0f, 3.4f}, {3.9f, 4.1f}, {0.0f, 0.01f}, {2.0f, 2.5f}, 0.3f, 0.5f}, 4.0f, 1.0f};
static struct43s D_80373AF0 = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_80373AC0 = {{{3.0f, 3.4f}, {3.9f, 4.1f}, {0.0f, 0.01f}, {2.0f, 2.5f}, 0.3f, 0.5f}, 4.0f, 1.0f};
static ParticleSettingsVelocityAccelerationPosition D_80373AF0 = {
{{100.0f, 40.0f, 100.0f}, {100.0f, 90.0f, 100.0f}},
{{ 0.0f, 0.0f, 0.0f}, { 0.0f, 0.0f, 0.0f}},
{{ -5.0f, 0.0f, -5.0f}, { 5.0f, 0.0f, 5.0f}}
@@ -381,14 +381,14 @@ void func_80362ADC(f32 arg0[3]){
particleEmitter_setRGB(pCtrl, D_80373AB4);
particleEmitter_setAlpha(pCtrl, 40);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80373AF0);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80373AF0);
func_802EFC28(pCtrl, &D_80373AC0);
}
void func_80362B70(f32 arg0[3]){
static s32 D_80373B38[3] = {130, 130, 130};
static struct40s D_80373B44 = {{{2.0f, 2.4f}, {3.9f, 4.1f}, {0.0f, 0.01f}, {2.0f, 2.5f}, 0.2f, 0.7f}, 4.0f, 1.0f};
static struct43s D_80373B74 = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_80373B44 = {{{2.0f, 2.4f}, {3.9f, 4.1f}, {0.0f, 0.01f}, {2.0f, 2.5f}, 0.2f, 0.7f}, 4.0f, 1.0f};
static ParticleSettingsVelocityAccelerationPosition D_80373B74 = {
{{100.0f, 40.0f, 100.0f}, {100.0f, 90.0f, 100.0f}},
{{ 0.0f, 0.0f, 0.0f}, { 0.0f, 0.0f, 0.0f}},
{{ -5.0f, 0.0f, -5.0f}, { 5.0f, 0.0f, 5.0f}}
@@ -399,14 +399,14 @@ void func_80362B70(f32 arg0[3]){
particleEmitter_setRGB(pCtrl, D_80373B38);
particleEmitter_setAlpha(pCtrl, 110);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80373B74);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80373B74);
func_802EFC28(pCtrl, &D_80373B44);
}
void func_80362C04(f32 arg0[3]){
static s32 D_80373BBC[3] = {0xff, 0xff, 0xff};
static struct40s D_80373BC8 = {{{0.5f, 0.6f}, {1.5f, 1.9f}, {0.0f, 0.01f}, {4.0f, 4.5f}, 0.1f, 0.8f,}, 0.0f, 1.0f};
static struct43s D_80373BF8 = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_80373BC8 = {{{0.5f, 0.6f}, {1.5f, 1.9f}, {0.0f, 0.01f}, {4.0f, 4.5f}, 0.1f, 0.8f,}, 0.0f, 1.0f};
static ParticleSettingsVelocityAccelerationPosition D_80373BF8 = {
{{ 0.0f, 40.0f, 0.0f}, { 0.0f, 90.0f, 0.0f}},
{{ 0.0f, 0.0f, 0.0f}, { 0.0f, 0.0f, 0.0f}},
{{-5.0f, 0.0f, -5.0f}, { 5.0f, 0.0f, 5.0f}}
@@ -419,14 +419,14 @@ void func_80362C04(f32 arg0[3]){
particleEmitter_setRGB(pCtrl, D_80373BBC);
particleEmitter_setAlpha(pCtrl, 40);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80373BF8);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80373BF8);
func_802EFC28(pCtrl, &D_80373BC8);
}
void func_80362C98(f32 arg0[3]){
static s32 D_80373C40[3] = {160, 170, 170};
static struct40s D_80373C4C = {{{2.5f, 2.6f}, {3.5f, 3.9f}, {0.0f, 0.01f}, {0.3f, 0.5f}, 0.1f, 0.8f}, 4.0f, 1.0f};
static struct43s D_80373C7C = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_80373C4C = {{{2.5f, 2.6f}, {3.5f, 3.9f}, {0.0f, 0.01f}, {0.3f, 0.5f}, 0.1f, 0.8f}, 4.0f, 1.0f};
static ParticleSettingsVelocityAccelerationPosition D_80373C7C = {
{{-60.0f, -60.0f, -60.0f}, { 60.0f, 60.0f, 60.0f}},
{{ 0.0f, 0.0f, 0.0f}, { 0.0f, 0.0f, 0.0f}},
{{-50.0f, -50.0f, -50.0f}, { 50.0f, 50.0f, 50.0f}}
@@ -439,14 +439,14 @@ void func_80362C98(f32 arg0[3]){
particleEmitter_setRGB(pCtrl, D_80373C40);
particleEmitter_setAlpha(pCtrl, 140);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80373C7C);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80373C7C);
func_802EFC28(pCtrl, &D_80373C4C);
}
void func_80362D2C(f32 arg0[3]){
static s32 D_80373CC4[] = {90, 90, 90};
static struct40s D_80373CD0 = {{{1.5f, 1.6f}, {2.5f, 2.9f}, {0.0f, 0.01f}, {0.3f, 0.5f}, 0.1f, 0.8f}, 4.0f, 1.0f};
static struct43s D_80373D00 = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_80373CD0 = {{{1.5f, 1.6f}, {2.5f, 2.9f}, {0.0f, 0.01f}, {0.3f, 0.5f}, 0.1f, 0.8f}, 4.0f, 1.0f};
static ParticleSettingsVelocityAccelerationPosition D_80373D00 = {
{{-60.0f, -60.0f, -60.0f}, {60.0f, 60.0f, 60.0f}},
{{ 0.0f, 0.0f, 0.0f}, { 0.0f, 0.0f, 0.0f}},
{{-50.0f, -50.0f, -50.0f}, {50.0f, 50.0f, 50.0f}}
@@ -459,13 +459,13 @@ void func_80362D2C(f32 arg0[3]){
particleEmitter_setRGB(pCtrl, D_80373CC4);
particleEmitter_setAlpha(pCtrl, 140);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80373D00);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80373D00);
func_802EFC28(pCtrl, &D_80373CD0);
}
void func_80362DC0(f32 arg0[3]){
static struct40s D_80373D48 = {{ {1.8f, 3.5f}, {1.8f, 3.5f}, {0.0f, 0.01f}, {5.0f, 5.0f}, 0.0f, 0.9f}, 4.0f, 15.0f };
static struct43s D_80373D78 = {
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_80373D48 = {{ {1.8f, 3.5f}, {1.8f, 3.5f}, {0.0f, 0.01f}, {5.0f, 5.0f}, 0.0f, 0.9f}, 4.0f, 15.0f };
static ParticleSettingsVelocityAccelerationPosition D_80373D78 = {
{{-450.0f, 700.0f, -450.0f}, {450.0f, 1100.0f, 450.0f}},
{{ 0.0f, -900.0f, 0.0f}, { 0.0f, -900.0f, 0.0f}},
{{-150.0f, -100.0f, -150.0f}, {150.0f, 5.0f, 150.0f}}
@@ -475,11 +475,11 @@ void func_80362DC0(f32 arg0[3]){
particleEmitter_setModel(pCtrl, ASSET_47B_MODEL_ROCK);
particleEmitter_setPosition(pCtrl, arg0);
particleEmitter_setAngularVelocityRange(pCtrl, -200.0f, 200.0f, -200.0f, 200.0f, 200.0f, 200.0f);
func_802EF9F8(pCtrl, 0.4f);
func_802EFA18(pCtrl, 3);
particleEmitter_func_802EF9F8(pCtrl, 0.4f);
particleEmitter_func_802EFA18(pCtrl, 3);
func_802EFA20(pCtrl, 1.0f, 1.3f);
particleEmitter_setDrawMode(pCtrl, 2);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80373D78);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80373D78);
func_802EFC28(pCtrl, &D_80373D48);
}

2
src/core2/code_DC4B0.c
View File

@@ -8,7 +8,7 @@ void func_80363500(Actor *this);
ActorInfo D_80373DC0= {
0x1EE, ACTOR_3BA_UNKOWN, 0,
0, NULL,
func_80363500, func_80326224, func_80325340,
func_80363500, actor_update_func_80326224, func_80325340,
0, 0, 0.0f, 0
};

8
src/core2/eggshatter.c
View File

@@ -3,7 +3,7 @@
#include "variables.h"
/* .data */
struct43s D_803637A0 = {
ParticleSettingsVelocityAccelerationPosition D_803637A0 = {
{{-200.0f, 200.0f, -200.0f}, {200.0f, 400.0f, 200.0f}},
{{0.0f, -800.0, 0.0f}, {0.0f, -800.0f, 0.0f}},
{{-10.0f, -10.0f, -10.0f}, {10.0f, 10.0f, 10.0f}}
@@ -24,13 +24,13 @@ void eggShatter_free(void){
void eggShatter_init(void){
gEggShatter_controller = particleEmitter_new(20);
particleEmitter_setModel(gEggShatter_controller, 0x360);
func_802EF9F8(gEggShatter_controller, 0.6f);
func_802EFA18(gEggShatter_controller, 0);
particleEmitter_func_802EF9F8(gEggShatter_controller, 0.6f);
particleEmitter_func_802EFA18(gEggShatter_controller, 0);
particleEmitter_setStartingScaleRange(gEggShatter_controller, 0.8f, 1.0f);
particleEmitter_setAngularVelocityRange(gEggShatter_controller, 400.0f, 400.0f, 400.0f, 800.0f, 800.0f, 800.0f);
particleEmitter_setSpawnIntervalRange(gEggShatter_controller, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(gEggShatter_controller, 1.5f, 1.5f);
particleEmitter_setPositionVelocityAndAccelerationRanges(gEggShatter_controller, &D_803637A0);
particleEmitter_setVelocityAccelerationAndPositionRanges(gEggShatter_controller, &D_803637A0);
}
void eggShatter_update(void){

18
src/core2/fx/sparkle.c
View File

@@ -17,7 +17,7 @@ ParticleEmitter *__fxSparkle_create(s16 position[3], f32 height, enum asset_e sp
}
void fxSparkle_emptyHoneycomb(s16 position[3]){
static struct42s D_80368BD0 = {
static ParticleSettingsVelocityPosition D_80368BD0 = {
{{-100.0f, 100.0f, -100.0f}, { 100.0f, 250.0f, 100.0f}},
{{ -10.0f, 10.0f, -10.0f}, { 10.0f, 10.0f, 10.0f}}
};
@@ -29,7 +29,7 @@ void fxSparkle_emptyHoneycomb(s16 position[3]){
}
void fxSparkle_honeycomb(s16 position[3]){
static struct42s D_80368C00 = {
static ParticleSettingsVelocityPosition D_80368C00 = {
{{-100.0f, 100.0f, -100.0f}, { 100.0f, 250.0f, 100.0f}},
{{ -10.0f, 10.0f, -10.0f}, { 10.0f, 10.0f, 10.0f}}
};
@@ -59,7 +59,7 @@ void fxSparkle_blueEgg(s16 position[3]){
}
void fxSparkle_giantBlueEgg(s16 position[3]){
static struct42s D_80368C30 = {
static ParticleSettingsVelocityPosition D_80368C30 = {
{{-200.0f, 100.0f, -200.0f}, { 200.0f, 350.0f, 200.0f}}, /*position*/
{{ -30.0f, 100.0f, -30.0f}, { 30.0f, 100.0f, 30.0f}} /*velocity*/
};
@@ -81,7 +81,7 @@ void fxSparkle_redFeather(s16 position[3]){
}
void fxSparkle_giantRedFeather(s16 position[3]){
static struct42s D_80368C60 = {
static ParticleSettingsVelocityPosition D_80368C60 = {
{{-125.0f, 100.0f, -125.0f}, { 125.0f, 250.0f, 125.0f}}, /*position*/
{{ -15.0f, 100.0f, -15.0f}, { 15.0f, 100.0f, 15.0f}} /*velocity*/
};
@@ -102,7 +102,7 @@ void fxSparkle_goldFeather(s16 position[3]){
}
void fxSparkle_giantGoldFeather(s16 position[3]){
static struct42s D_80368C90 = {
static ParticleSettingsVelocityPosition D_80368C90 = {
{{-125.0f, 100.0f, -125.0f}, { 125.0f, 250.0f, 125.0f}}, /*position*/
{{ -15.0f, 100.0f, -15.0f}, { 15.0f, 100.0f, 15.0f}} /*velocity*/
};
@@ -113,7 +113,7 @@ void fxSparkle_giantGoldFeather(s16 position[3]){
}
void fxSparkle_mumboToken(s16 position[3]){
static struct42s D_80368CC0 = {
static ParticleSettingsVelocityPosition D_80368CC0 = {
{{-100.0f, 100.0f, -100.0f}, { 100.0f, 250.0f, 100.0f}}, /*position*/
{{ -15.0f, 15.0f, -15.0f}, { 15.0f, 15.0f, 15.0f}} /*velocity*/
};
@@ -125,7 +125,7 @@ void fxSparkle_mumboToken(s16 position[3]){
}
void fxSparkle_extraLife(s16 position[3]){
static struct42s D_80368CF0 = {
static ParticleSettingsVelocityPosition D_80368CF0 = {
{{ -75.0f, 100.0f, -75.0f}, { 75.0f, 250.0f, 75.0f}}, /*position*/
{{ -8.0f, 5.0f, -8.0f}, { -5.0f, 35.0f, 8.0f}} /*velocity*/
};
@@ -136,7 +136,7 @@ void fxSparkle_extraLife(s16 position[3]){
}
void fxSparkle_brentilda(s16 position[3]){
static struct42s D_80368D20 = {
static ParticleSettingsVelocityPosition D_80368D20 = {
{{ 0.0f, 0.0f, 0.0f}, { 0.0f, 0.0f, 0.0f}}, /*position*/
{{ -15.0f, -15.0f, -15.0f}, { 15.0f, 15.0f, 15.0f}} /*velocity*/
};
@@ -147,7 +147,7 @@ void fxSparkle_brentilda(s16 position[3]){
}
void fxSparkle_chTreasure(s16 position[3]){
static struct42s D_80368D50 = {
static ParticleSettingsVelocityPosition D_80368D50 = {
{{ 0.0f, 0.0f, 0.0f}, { 0.0f, 0.0f, 0.0f}}, /*position*/
{{ -25.0f, -5.0f, -25.0f}, { 25.0f, 5.0f, 25.0f}} /*velocity*/
};

107
src/core2/particle.c
View File

@@ -310,16 +310,16 @@ ParticleEmitter * particleEmitter_new(u32 capacity){
particleEmitter_setFade(this, 0.0f, 1.0f);
particleEmitter_setDrawMode(this, 0);
particleEmitter_setPosition(this, sp40);
particleEmitter_setParticleAccelerationRange(this, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
particleEmitter_setAccelerationRange(this, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
particleEmitter_setAlpha(this, 0xff);
particleEmitter_setParticleSpawnPositionRange(this, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
particleEmitter_setSpawnPositionRange(this, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
particleEmitter_setParticleVelocityRange(this, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
particleEmitter_setSfx(this, 0, 0);
func_802EF9F8(this, 0.9f);
particleEmitter_func_802EF9F8(this, 0.9f);
func_802EFA04(this, -100000.0f);
func_802EFA34(this, 100000.0f);
particleEmitter_setParticleCallback(this, 0);
func_802EFA18(this, 0);
particleEmitter_func_802EFA18(this, 0);
func_802EFA20(this, 1.0f, 1.0f);
particleEmitter_setStartingFrameRange(this, 0, 0);
particleEmitter_setParticleFramerateRange(this, 0.0f, 0.0f);
@@ -348,7 +348,7 @@ void particleEmitter_setSprite(ParticleEmitter *this, enum asset_e sprite_id){
}
}
void particleEmitter_setParticleAccelerationRange(ParticleEmitter *this, f32 min_x, f32 min_y, f32 min_z, f32 max_x, f32 max_y, f32 max_z){
void particleEmitter_setAccelerationRange(ParticleEmitter *this, f32 min_x, f32 min_y, f32 min_z, f32 max_x, f32 max_y, f32 max_z){
this->particleAccerationRange_4C_min_x = min_x;
this->particleAccerationRange_4C_min_y = min_y;
this->particleAccerationRange_4C_min_z = min_z;
@@ -366,7 +366,7 @@ void particleEmitter_setSfx(ParticleEmitter *this, enum sfx_e sfx_id, s32 arg2){
this->unk7C = arg2;
}
void func_802EF9F8(ParticleEmitter *this, f32 arg1){
void particleEmitter_func_802EF9F8(ParticleEmitter *this, f32 arg1){
this->unk68 = arg1;
}
@@ -378,7 +378,7 @@ void particleEmitter_setParticleCallback(ParticleEmitter *this, void (*arg1)(Par
this->particleCallback_80 = arg1;
}
void func_802EFA18(ParticleEmitter *this, s32 arg1){
void particleEmitter_func_802EFA18(ParticleEmitter *this, s32 arg1){
this->unk64 = arg1;
}
@@ -406,7 +406,7 @@ void particleEmitter_setDrawMode(ParticleEmitter *this, s32 arg1){
this->draw_mode = arg1;
}
void func_802EFA78(ParticleEmitter *this, s32 arg1){
void particleEmitter_func_802EFA78(ParticleEmitter *this, s32 arg1){
this->unk0_16 = arg1;
}
@@ -434,7 +434,7 @@ void particleEmitter_setModel(ParticleEmitter *this, enum asset_e model_id){
}
}
void particleEmitter_setParticleSpawnPositionRange(ParticleEmitter *this, f32 min_x, f32 min_y, f32 min_z, f32 max_x, f32 max_y, f32 max_z){
void particleEmitter_setSpawnPositionRange(ParticleEmitter *this, f32 min_x, f32 min_y, f32 min_z, f32 max_x, f32 max_y, f32 max_z){
this->particleSpawnPositionRange_94_min_x = min_x;
this->particleSpawnPositionRange_94_min_y = min_y;
this->particleSpawnPositionRange_94_min_z = min_z;
@@ -459,61 +459,68 @@ void particleEmitter_setFinalScaleRange(ParticleEmitter * this, f32 min, f32 max
this->particleFinalScaleRange_B4_max = max;
}
void particleEmitter_setScaleAndLifetimeRanges(ParticleEmitter *this, ParticleScaleAndLifetimeRanges *arg1){
this->particleStartingScaleRange_AC_min = arg1->unk0[0];
this->particleStartingScaleRange_AC_max = arg1->unk0[1];
if(-1.0f != arg1->unk8[0]){
this->particleFinalScaleRange_B4_min = arg1->unk8[0];
this->particleFinalScaleRange_B4_max = arg1->unk8[1];
void particleEmitter_setScaleAndLifetimeRanges(ParticleEmitter *this, ParticleScaleAndLifetimeRanges *settings) {
this->particleStartingScaleRange_AC_min = settings->unk0[0];
this->particleStartingScaleRange_AC_max = settings->unk0[1];
if(-1.0f != settings->unk8[0]){
this->particleFinalScaleRange_B4_min = settings->unk8[0];
this->particleFinalScaleRange_B4_max = settings->unk8[1];
}
particleEmitter_setSpawnIntervalRange(this, arg1->unk10[0], arg1->unk10[1]);
this->particleLifeTimeRange[0] = arg1->unk18[0];
this->particleLifeTimeRange[1] = arg1->unk18[1];
this->fade_in = arg1->unk20;
this->fade_out = arg1->unk24;
particleEmitter_setSpawnIntervalRange(this, settings->unk10[0], settings->unk10[1]);
this->particleLifeTimeRange[0] = settings->unk18[0];
this->particleLifeTimeRange[1] = settings->unk18[1];
this->fade_in = settings->unk20;
this->fade_out = settings->unk24;
}
void func_802EFC28(ParticleEmitter *this, struct40s *arg1){
particleEmitter_setScaleAndLifetimeRanges(this, &arg1->unk0);
particleEmitter_setDrawMode(this, (s32)arg1->unk28);
particleEmitter_emitN(this, (s32)arg1->unk2C);
void func_802EFC28(ParticleEmitter *this, ParticleSettingsScaleAndLifetimeDrawModeEmitCount *settings) {
particleEmitter_setScaleAndLifetimeRanges(this, &settings->scale_and_lifetime);
particleEmitter_setDrawMode(this, (s32)settings->drawmode);
particleEmitter_emitN(this, (s32)settings->count);
}
void particleEmitter_setVelocityAndAccelerationRanges(ParticleEmitter *this, struct41s *arg1){
void particleEmitter_setVelocityAndAccelerationRanges(ParticleEmitter *this, ParticleSettingsVelocityAcceleration *settings) {
particleEmitter_setParticleVelocityRange(this,
arg1->unk0.unk0[0], arg1->unk0.unk0[1], arg1->unk0.unk0[2],
arg1->unk0.unkC[0], arg1->unk0.unkC[1], arg1->unk0.unkC[2]
settings->velocity.min[0], settings->velocity.min[1], settings->velocity.min[2],
settings->velocity.max[0], settings->velocity.max[1], settings->velocity.max[2]
);
particleEmitter_setParticleAccelerationRange(this,
arg1->unk18.unk0[0], arg1->unk18.unk0[1], arg1->unk18.unk0[2],
arg1->unk18.unkC[0], arg1->unk18.unkC[1], arg1->unk18.unkC[2]
particleEmitter_setAccelerationRange(this,
settings->acceleration.min[0], settings->acceleration.min[1], settings->acceleration.min[2],
settings->acceleration.max[0], settings->acceleration.max[1], settings->acceleration.max[2]
);
}
void particleEmitter_setPositionAndVelocityRanges(ParticleEmitter *this, struct42s *arg1){
void particleEmitter_setPositionAndVelocityRanges(ParticleEmitter *this, ParticleSettingsVelocityPosition *settings) {
particleEmitter_setParticleVelocityRange(this,
arg1->unk0.unk0[0], arg1->unk0.unk0[1], arg1->unk0.unk0[2],
arg1->unk0.unkC[0], arg1->unk0.unkC[1], arg1->unk0.unkC[2]
settings->velocity.min[0], settings->velocity.min[1], settings->velocity.min[2],
settings->velocity.max[0], settings->velocity.max[1], settings->velocity.max[2]
);
particleEmitter_setParticleSpawnPositionRange( this,
arg1->unk18.unk0[0], arg1->unk18.unk0[1], arg1->unk18.unk0[2],
arg1->unk18.unkC[0], arg1->unk18.unkC[1], arg1->unk18.unkC[2]
particleEmitter_setSpawnPositionRange( this,
settings->spawn_position.min[0], settings->spawn_position.min[1], settings->spawn_position.min[2],
settings->spawn_position.max[0], settings->spawn_position.max[1], settings->spawn_position.max[2]
);
}
void particleEmitter_setPositionVelocityAndAccelerationRanges(ParticleEmitter *this, struct43s* arg1){
void particleEmitter_setVelocityAccelerationAndPositionRanges(ParticleEmitter *this, ParticleSettingsVelocityAccelerationPosition *settings) {
particleEmitter_setParticleVelocityRange(this,
arg1->unk0.unk0[0], arg1->unk0.unk0[1], arg1->unk0.unk0[2],
arg1->unk0.unkC[0], arg1->unk0.unkC[1], arg1->unk0.unkC[2]
settings->velocity.min[0], settings->velocity.min[1], settings->velocity.min[2],
settings->velocity.max[0], settings->velocity.max[1], settings->velocity.max[2]
);
particleEmitter_setParticleAccelerationRange(this,
arg1->unk18.unk0[0], arg1->unk18.unk0[1], arg1->unk18.unk0[2],
arg1->unk18.unkC[0], arg1->unk18.unkC[1], arg1->unk18.unkC[2]
particleEmitter_setAccelerationRange(this,
settings->acceleration.min[0], settings->acceleration.min[1], settings->acceleration.min[2],
settings->acceleration.max[0], settings->acceleration.max[1], settings->acceleration.max[2]
);
particleEmitter_setParticleSpawnPositionRange( this,
arg1->unk30.unk0[0], arg1->unk30.unk0[1], arg1->unk30.unk0[2],
arg1->unk30.unkC[0], arg1->unk30.unkC[1], arg1->unk30.unkC[2]
particleEmitter_setSpawnPositionRange( this,
settings->spawn_position.min[0], settings->spawn_position.min[1], settings->spawn_position.min[2],
settings->spawn_position.max[0], settings->spawn_position.max[1], settings->spawn_position.max[2]
);
}
@@ -710,7 +717,7 @@ void func_802F053C(ParticleEmitter *this, f32 arg1[3]){
particleEmitter_setRGB(this, D_803689B8);
particleEmitter_setFade(this, 0.0f, 0.1f);
particleEmitter_setStartingFrameRange(this, 0, 7);
particleEmitter_setParticleSpawnPositionRange(this, -80.0f, 0.0f, -80.0f, 80.0f, 60.0f, 80.0f);
particleEmitter_setSpawnPositionRange(this, -80.0f, 0.0f, -80.0f, 80.0f, 60.0f, 80.0f);
particleEmitter_setPosition(this, arg1);
particleEmitter_setStartingScaleRange(this, 1.0f, 1.0f);
particleEmitter_setFinalScaleRange(this, 2.0f, 3.0f);
@@ -720,11 +727,11 @@ void func_802F053C(ParticleEmitter *this, f32 arg1[3]){
}
void func_802F066C(ParticleEmitter *this, f32 position[3]){
particleEmitter_setParticleAccelerationRange(this, 0.0f, -800.0f, 0.0f, 0.0f, -800.0f, 0.0f);
func_802EF9F8(this, 0.6f);
func_802EFA18(this, 3);
particleEmitter_setAccelerationRange(this, 0.0f, -800.0f, 0.0f, 0.0f, -800.0f, 0.0f);
particleEmitter_func_802EF9F8(this, 0.6f);
particleEmitter_func_802EFA18(this, 3);
particleEmitter_setModel(this, ASSET_896_MODEL_GOLD_ROCK);
particleEmitter_setParticleSpawnPositionRange(this,
particleEmitter_setSpawnPositionRange(this,
-120.0f, -60.0f, -120.0f,
120.0f, 60.0f, 120.0f
);

2
src/core2/spawnqueue.c
View File

@@ -356,7 +356,7 @@ void spawnQueue_reset(void){
lair_func_8038A0C4();
break;
case OVERLAY_E_BATTLE:
fight_func_803863F0();
fight_addSpawnableActors();
break;
case OVERLAY_C_INTRO:
cutscene_func_8038C4E0();