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

6
src/FP/ch/bearcub.c
View File

@@ -23,19 +23,19 @@ ActorAnimationInfo D_80391DF0[] = {
ActorInfo D_80391E08 = { MARKER_1FA_POLAR_BEAR_CUB_BLUE, ACTOR_1EA_POLAR_BEAR_CUB_BLUE, ASSET_44C_MODEL_POLAR_BEAR_CUB_BLUE,
0x1, D_80391DF0,
func_8038A384, func_80326224, actor_draw,
func_8038A384, actor_update_func_80326224, actor_draw,
2500, 0, 1.2f, 0
};
ActorInfo FP_D_80391E2C = { MARKER_1FB_POLAR_BEAR_CUB_GREEN, ACTOR_1EB_POLAR_BEAR_CUB_GREEN, ASSET_44D_MODEL_POLAR_BEAR_CUB_GREEN,
0x1, D_80391DF0,
func_8038A384, func_80326224, actor_draw,
func_8038A384, actor_update_func_80326224, actor_draw,
2500, 0, 1.2f, 0
};
ActorInfo D_80391E50 = { MARKER_1FC_POLAR_BEAR_CUB_RED, ACTOR_1EC_POLAR_BEAR_CUB_RED, ASSET_44E_MODEL_POLAR_BEAR_CUB_RED,
0x1, D_80391DF0,
func_8038A384, func_80326224, actor_draw,
func_8038A384, actor_update_func_80326224, actor_draw,
2500, 0, 1.2f, 0
};

2
src/FP/ch/boggy2.c
View File

@@ -237,7 +237,7 @@ void func_80388EE8(ParticleEmitter *pCtrl){
{0.3f, 0.45f},
0.0f, 0.01f
};
static struct42s D_80391D58 = {
static ParticleSettingsVelocityPosition D_80391D58 = {
{{-10.0f, 10.0f, -10.0f}, {10.0f, 240.0f, 10.0f}}, /*position*/
{{0.0f, 0.0f, 0.0f}, {0.0f, 20.0f, 0.0f}} /*velocity*/
};

2
src/FP/ch/boggy3.c
View File

@@ -13,7 +13,7 @@ ActorAnimationInfo D_80392680[] = {
ActorInfo D_80392690 = { 0x20D, 0x33D, 0x38A,
0x1, D_80392680,
func_80390388, func_80326224, func_80390290,
func_80390388, actor_update_func_80326224, func_80390290,
2500, 0, 1.0f, 0
};

2
src/FP/ch/cavewozza.c
View File

@@ -14,7 +14,7 @@ extern ActorAnimationInfo D_803926F0[]= {
extern ActorInfo D_80392700 = { MARKER_20F_WOZZA_IN_CAVE, ACTOR_33F_WOZZA_IN_CAVE, ASSET_494_MODEL_WOZZA,
0x1, D_803926F0,
func_80390630, func_80326224, actor_draw,
func_80390630, actor_update_func_80326224, actor_draw,
2500, 0, 1.6f, 0
};

6
src/FP/ch/present.c
View File

@@ -12,19 +12,19 @@ ActorAnimationInfo D_803924A0[] = {
ActorInfo D_803924B0 = { MARKER_208_BLUE_PRESENT, ACTOR_33A_BLUE_PRESENT, ASSET_47F_MODEL_XMAS_GIFT_BLUE,
0x1, D_803924A0,
func_8038F144, func_80326224, func_8038F0F0,
func_8038F144, actor_update_func_80326224, func_8038F0F0,
2500, 0, 1.2f, 0
};
ActorInfo D_803924D4 = { MARKER_209_GREEN_PRESENT, ACTOR_33B_GREEN_PRESENT, ASSET_480_MODEL_XMAS_GIFT_GREEN,
0x1, D_803924A0,
func_8038F144, func_80326224, func_8038F0F0,
func_8038F144, actor_update_func_80326224, func_8038F0F0,
2500, 0, 1.2f, 0
};
ActorInfo D_803924F8 = { MARKER_20A_RED_PRESENT, ACTOR_33C_RED_PRESENT, ASSET_481_MODEL_XMAS_GIFT_RED,
0x1, D_803924A0,
func_8038F144, func_80326224, func_8038F0F0,
func_8038F144, actor_update_func_80326224, func_8038F0F0,
2500, 0, 1.2f, 0
};

6
src/FP/ch/snowmanbutton.c
View File

@@ -16,7 +16,7 @@ ActorAnimationInfo FP_D_80391A90[] ={
ActorInfo FP_D_80391AB0 = {
MARKER_B9_FP_SNOWMAN_BUTTON, ACTOR_116_FP_SNOWMAN_BUTTON, ASSET_421_MODEL_FP_SNOWMAN_BUTTON,
0x1, FP_D_80391A90,
FP_func_80386CF8, func_80326224, func_80386B80,
FP_func_80386CF8, actor_update_func_80326224, func_80386B80,
0, 0x800, 0.0f, 0
};
@@ -28,7 +28,7 @@ ParticleScaleAndLifetimeRanges D_80391AD4 = {
0.0f, 0.01f,
};
struct43s D_80391AFC = {
ParticleSettingsVelocityAccelerationPosition D_80391AFC = {
{{-300.0f, 350.0f, -300.0f}, {300.0f, 800.0f, 300.0f}},
{{0.0f, -800.0f, 0.0f}, {0.0f, -800.0f, 0.0f}},
{{-50.0f, -50.0f, -50.0f}, {50.0f, 50.0f, 50.0f}}
@@ -58,7 +58,7 @@ void FP_func_80386BEC(Actor *this){
particleEmitter_setRGB(pCtrl, D_80391B44);
particleEmitter_setSprite(pCtrl, ASSET_700_SPRITE_DUST);
particleEmitter_setPosition(pCtrl, plyr_pos);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80391AFC);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80391AFC);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_80391AD4);
particleEmitter_emitN(pCtrl, 12);
}

16
src/FP/ch/twinkly.c
View File

@@ -21,30 +21,30 @@ ActorAnimationInfo D_80391F50[] = {
ActorInfo D_80391F88 = { MARKER_200_TWINKLY_BLUE, ACTOR_332_TWINKLY_BLUE, ASSET_448_MODEL_TWINKLY_BLUE,
0x1, D_80391F50,
func_8038C9A0, func_80326224, func_8038C1F8,
func_8038C9A0, actor_update_func_80326224, func_8038C1F8,
0, 0, 1.0f, 0
};
ActorInfo D_80391FAC = { MARKER_201_TWINKLY_GREEN, ACTOR_333_TWINKLY_GREEN, ASSET_449_MODEL_TWINKLY_GREEN,
0x1, D_80391F50,
func_8038C9A0, func_80326224, func_8038C1F8,
func_8038C9A0, actor_update_func_80326224, func_8038C1F8,
0, 0, 1.0f, 0
};
ActorInfo D_80391FD0 = { MARKER_202_TWINKLY_ORANGE, ACTOR_334_TWINKLY_ORANGE, ASSET_44A_MODEL_TWINKLY_ORANGE,
0x1, D_80391F50,
func_8038C9A0, func_80326224, func_8038C1F8,
func_8038C9A0, actor_update_func_80326224, func_8038C1F8,
0, 0, 1.0f, 0
};
ActorInfo D_80391FF4 = { MARKER_203_TWINKLY_RED, ACTOR_335_TWINKLY_RED, ASSET_44B_MODEL_TWINKLY_RED,
0x1, D_80391F50,
func_8038C9A0, func_80326224, func_8038C1F8,
func_8038C9A0, actor_update_func_80326224, func_8038C1F8,
0, 0, 1.0f, 0
};
Struct6Cs FP_D_80392018 = {NULL, NULL, NULL, (void*)func_8038C0B0};
struct43s D_80392028 = {
ParticleSettingsVelocityAccelerationPosition D_80392028 = {
{{-200.0f, 200.0f, -200.0f}, {200.0f, 400.0f, 200.0f}},
{{ 0.0f, -800.0f, 0.0f}, { 0.0f, -800.0f, 0.0f}},
{{ -15.0f, -15.0f, -15.0f}, { 15.0f, 15.0f, 15.0f}}
@@ -95,7 +95,7 @@ void func_8038C260(f32 position[3], s32 count, enum asset_e model_id){
pCtrl = partEmitMgr_newEmitter(count);
particleEmitter_setModel(pCtrl, model_id);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80392028);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80392028);
particleEmitter_setAngularVelocityRange(pCtrl,
400.0f, 400.0f, 400.0f,
800.0f, 800.0f, 800.0f
@@ -104,8 +104,8 @@ void func_8038C260(f32 position[3], s32 count, enum asset_e model_id){
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.02f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 1.5f, 1.5f);
particleEmitter_setFade(pCtrl, 0.0f, 0.3f);
func_802EF9F8(pCtrl, 0.6f);
func_802EFA18(pCtrl, 0);
particleEmitter_func_802EF9F8(pCtrl, 0.6f);
particleEmitter_func_802EFA18(pCtrl, 0);
func_802EFA20(pCtrl, 1.0f, 1.3f);
particleEmitter_setSfx(pCtrl, SFX_7B_ICE_BREAKING_1, 8000);
particleEmitter_emitN(pCtrl, count);

34
src/FP/ch/twinklybox.c
View File

@@ -19,7 +19,7 @@ ActorAnimationInfo D_803920C0[] ={
ActorInfo D_803920E8 = { 0x204, 0x336, 0x442,
0x1, D_803920C0,
func_8038D6C8, func_80326224, FP_func_8038CED0,
func_8038D6C8, actor_update_func_80326224, FP_func_8038CED0,
0, 0, 0.0f, 0
};
@@ -42,7 +42,7 @@ void func_8038CF54(f32 position[3], s32 count, enum asset_e model_id){
0.0f,
0.7f
};
static struct43s D_80392134 = {
static ParticleSettingsVelocityAccelerationPosition D_80392134 = {
{{-200.0f, 200.0f, -200.0f}, {200.0f, 400.0f, 200.0f}},
{{ 0.0f, -800.0f, 0.0f}, { 0.0f, -800.0f, 0.0f}},
{{-100.0f, 0.0f, -100.0f}, {100.0f, 100.0f, 100.0f}}
@@ -52,14 +52,14 @@ void func_8038CF54(f32 position[3], s32 count, enum asset_e model_id){
pCtrl = partEmitMgr_newEmitter(count);
particleEmitter_setModel(pCtrl, model_id);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80392134);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80392134);
particleEmitter_setAngularVelocityRange(pCtrl,
100.0f, 100.0f, 100.0f,
200.0f, 200.0f, 200.0f
);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8039210C);
func_802EF9F8(pCtrl, 0.6f);
func_802EFA18(pCtrl, 3);
particleEmitter_func_802EF9F8(pCtrl, 0.6f);
particleEmitter_func_802EFA18(pCtrl, 3);
particleEmitter_emitN(pCtrl, count);
}
@@ -73,7 +73,7 @@ void func_8038D01C(f32 position[3], s32 count, enum asset_e sprite_id){
0.01f
};
static s32 D_803921A4[3] = { 0xDC, 0xDC, 0xE6};
static struct43s D_803921B0 = {
static ParticleSettingsVelocityAccelerationPosition D_803921B0 = {
{{-200.0f, 0.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}}
@@ -85,7 +85,7 @@ void func_8038D01C(f32 position[3], s32 count, enum asset_e sprite_id){
particleEmitter_setRGB(pCtrl, D_803921A4);
particleEmitter_setSprite(pCtrl, sprite_id);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_803921B0);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_803921B0);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8039217C);
particleEmitter_emitN(pCtrl, count);
}
@@ -99,7 +99,7 @@ void func_8038D0A8(f32 position[3], s32 count, enum asset_e model_id){
0.0f, 0.3f
};
static struct43s D_80392220 = {
static ParticleSettingsVelocityAccelerationPosition D_80392220 = {
{{-300.0f, 400.0f, -300.0f}, {300.0f, 800.0f, 300.0f}},
{{ 0.0f, -800.0f, 0.0f}, { 0.0f, -800.0f, 0.0f}},
{{-80.0f, 80.0f, -80.0f}, {80.0f, 80.0f, 80.0f}}
@@ -109,14 +109,14 @@ void func_8038D0A8(f32 position[3], s32 count, enum asset_e model_id){
pCtrl = partEmitMgr_newEmitter(count);
particleEmitter_setModel(pCtrl, model_id);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80392220);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80392220);
particleEmitter_setAngularVelocityRange(pCtrl,
200.0f, 200.0f, 200.0f,
300.0f, 300.0f, 300.0f
);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_803921F8);
func_802EF9F8(pCtrl, 0.2f);
func_802EFA18(pCtrl, 2);
particleEmitter_func_802EF9F8(pCtrl, 0.2f);
particleEmitter_func_802EFA18(pCtrl, 2);
particleEmitter_emitN(pCtrl, count);
}
@@ -129,7 +129,7 @@ void func_8038D170(f32 position[3], s32 count, enum asset_e sprite_id){
0.0f,
0.3f
};
static struct43s D_80392290 = {
static ParticleSettingsVelocityAccelerationPosition D_80392290 = {
{{-300.0f, 400.0f, -300.0f}, {300.0f, 800.0f, 300.0f}},
{{ 0.0f, -800.0f, 0.0f}, { 0.0f, -800.0f, 0.0f}},
{{-80.0f, 80.0f, -80.0f}, {80.0f, 80.0f, 80.0f}}
@@ -139,10 +139,10 @@ void func_8038D170(f32 position[3], s32 count, enum asset_e sprite_id){
pCtrl = partEmitMgr_newEmitter(count);
particleEmitter_setSprite(pCtrl, sprite_id);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80392290);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80392290);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_80392268);
func_802EF9F8(pCtrl, 0.2f);
func_802EFA18(pCtrl, 2);
particleEmitter_func_802EF9F8(pCtrl, 0.2f);
particleEmitter_func_802EFA18(pCtrl, 2);
particleEmitter_emitN(pCtrl, count);
}
@@ -155,7 +155,7 @@ void func_8038D208(f32 position[3], s32 count, enum asset_e sprite_id){
0.0f, 0.01f
};
static s32 D_80392300[3] = { 0xDC, 0xDC, 0xE6};
static struct43s D_8039230C = {
static ParticleSettingsVelocityAccelerationPosition D_8039230C = {
{{-100.0f, 0.0f, -100.0f}, {100.0f, 100.0f, 100.0f}},
{{0.0f, -10.0f, 0.0f}, {0.0f, -10.0f, 0.0f}},
{{-80.0f, 0.0f, -80.0f}, {50.0f, 200.0f, 80.0f}}
@@ -166,7 +166,7 @@ void func_8038D208(f32 position[3], s32 count, enum asset_e sprite_id){
particleEmitter_setRGB(pCtrl, D_80392300);
particleEmitter_setSprite(pCtrl, sprite_id);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_8039230C);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8039230C);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_803922D8);
particleEmitter_emitN(pCtrl, count);
}

2
src/FP/ch/twinklymuncher.c
View File

@@ -21,7 +21,7 @@ extern ActorAnimationInfo D_80392390[] ={
extern ActorInfo D_803923D0 = { MARKER_205_TWINKLY_MUNCHER, ACTOR_337_TWINKLY_MUNCHER, ASSET_496_MODEL_TWINKLY_MUNCHER,
0x1, D_80392390,
func_8038E094, func_80326224, func_8038DD70,
func_8038E094, actor_update_func_80326224, func_8038DD70,
2500, 0, 1.0f, 0
};

2
src/FP/ch/wozza.c
View File

@@ -32,7 +32,7 @@ ActorAnimationInfo D_80392520[] ={
ActorInfo D_80392588 = { MARKER_20B_WOZZA, ACTOR_1F3_WOZZA, ASSET_494_MODEL_WOZZA,
0x1, D_80392520,
FP_func_8038F7AC, func_80326224, func_8038F210,
FP_func_8038F7AC, actor_update_func_80326224, func_8038F210,
0, 0, 1.6f, 0
};

6
src/FP/ch/wozzasjig.c
View File

@@ -24,7 +24,7 @@ ActorAnimationInfo D_803925C0[] = {
ActorInfo D_80392628 = { MARKER_20C_WOZZAS_JIGGY, ACTOR_1F4_WOZZAS_JIGGY, ASSET_495_MODEL_WOZZAS_JIGGY,
0x1, D_803925C0,
func_8038FF54, func_80326224, func_8038FF00,
func_8038FF54, actor_update_func_80326224, func_8038FF00,
0, 0, 0.0f, 0
};
@@ -85,7 +85,7 @@ void func_8038FF54(Actor *this){
particleEmitter_setSprite(sp3C, ASSET_713_SPRITE_SPARKLE_YELLOW);
particleEmitter_setStartingFrameRange(sp3C, 1, 6);
particleEmitter_setPosition(sp3C, sp40);
particleEmitter_setParticleSpawnPositionRange(sp3C,
particleEmitter_setSpawnPositionRange(sp3C,
0.0f, 20.0f, 0.0f,
0.0f, 20.0f, 0.0f
);
@@ -93,7 +93,7 @@ void func_8038FF54(Actor *this){
-180.0f, 0.0f, -180.0f,
180.0f, 280.0f, 180.0f
);
particleEmitter_setParticleAccelerationRange(sp3C,
particleEmitter_setAccelerationRange(sp3C,
0.0f, -60.0f, 0.0f,
0.0f, -90.0f, 0.0f
);

2
src/FP/ch/xmastree.c
View File

@@ -9,7 +9,7 @@ void chXmasTree_update(Actor *this);
ActorInfo chXmasTree = {
MARKER_BA_XMAS_TREE, ACTOR_15F_XMAS_TREE, ASSET_488_MODEL_XMAS_TREE,
0x1, NULL,
chXmasTree_update, func_80326224, chXmasTree_draw,
chXmasTree_update, actor_update_func_80326224, chXmasTree_draw,
0, 0, 0.0f, 0
};

12
src/FP/ch/xmastreeeggtoll.c
View File

@@ -8,13 +8,13 @@ void func_80390EB0(Actor *this);
/* .data */
ActorInfo FP_D_80392840 = { MARKER_245_XMAS_TREE_EGG_TOLL, ACTOR_353_XMAS_TREE_EGG_TOLL, ASSET_402_MODEL_EGG_TOLL,
0x0, NULL,
func_80390EB0, func_80326224, func_80325340,
func_80390EB0, actor_update_func_80326224, func_80325340,
2000, 0, 0.0f, 0
};
/* .code */
void func_80390C70(f32 position[3]){
static struct40s FP_D_80392864 = {{{1.7f, 2.0f}, {2.4f, 2.7f}, {0.0f, 0.01f}, {4.0f, 7.0f}, 0.3f, 0.7f}, 4.0f, 1.0f};
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount FP_D_80392864 = {{{1.7f, 2.0f}, {2.4f, 2.7f}, {0.0f, 0.01f}, {4.0f, 7.0f}, 0.3f, 0.7f}, 4.0f, 1.0f};
static s32 D_80392894[3] = {0xFF, 0XFF, 0xFF};
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(1);
@@ -23,7 +23,7 @@ void func_80390C70(f32 position[3]){
particleEmitter_setRGB(pCtrl, D_80392894);
particleEmitter_setAlpha(pCtrl, 0x41);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
particleEmitter_setSpawnPositionRange(pCtrl,
-40.0f, 110.0f, -40.0f,
40.0f, 110.0f, 40.0f
);
@@ -35,7 +35,7 @@ void func_80390C70(f32 position[3]){
}
void func_80390D58(f32 position[3]){
static struct40s D_803928A0 = {{{0.05f, 0.1f}, {0.1f, 0.2f}, {0.0f, 0.01f}, {0.9f, 1.3f}, 0.3f, 0.7f}, 4.0f, 1.0f};
static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_803928A0 = {{{0.05f, 0.1f}, {0.1f, 0.2f}, {0.0f, 0.01f}, {0.9f, 1.3f}, 0.3f, 0.7f}, 4.0f, 1.0f};
static s32 D_803928D0[3] = {0xFF, 0xFF, 0xFF};
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(1);
@@ -44,7 +44,7 @@ void func_80390D58(f32 position[3]){
particleEmitter_setRGB(pCtrl, D_803928D0);
particleEmitter_setAlpha(pCtrl, 0xFF);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
particleEmitter_setSpawnPositionRange(pCtrl,
-40.0f, 50.0,-40.0f,
40.0f, 70.0, 40.0f
);
@@ -52,7 +52,7 @@ void func_80390D58(f32 position[3]){
-40.0f, 120.0,-40.0f,
40.0f, 180.0, 40.0f
);
particleEmitter_setParticleAccelerationRange(pCtrl,
particleEmitter_setAccelerationRange(pCtrl,
0.0f, -60.0f, 0.0f,
0.0f, -100.0f, 0.0f
);

14
src/FP/ch/xmastreeice.c
View File

@@ -8,7 +8,7 @@ void func_80390BDC(Actor *this);
/* .data */
ActorInfo D_80392730 = { 0x210, 0x340, 0x4D2,
0x0, NULL,
func_80390BDC, func_80326224, func_803908F0,
func_80390BDC, actor_update_func_80326224, func_803908F0,
0, 0, 1.0f, 0
};
@@ -22,7 +22,7 @@ Actor *func_803908F0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void func_80390944(f32 position[3], s32 cnt, enum asset_e model_id){
static ParticleScaleAndLifetimeRanges D_80392754 = {{0.2f, 0.4f}, {-1.0f, -1.0f}, {0.0f, 0.02f}, {2.2f, 2.2f}, 0.0f, 0.3f};
static struct43s D_8039277C = {
static ParticleSettingsVelocityAccelerationPosition D_8039277C = {
{{-300.0f, 350.0f, -300.0f}, {300.0f, 600.0f, 300.0f}}, /*position*/
{{ 0.0f, -1000.0f, 0.0f}, { 0.0f, -1000.0f, 0.0f}}, /*velocitcy*/
{{-100.0f, 0.0f, -100.0f}, {100.0f, 200.0f, 100.0f}} /*acceleration*/
@@ -30,14 +30,14 @@ void func_80390944(f32 position[3], s32 cnt, enum asset_e model_id){
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
particleEmitter_setModel(pCtrl, model_id);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_8039277C);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8039277C);
particleEmitter_setAngularVelocityRange(pCtrl,
100.0f, 100.0f, 100.0f,
250.0f, 250.0f, 250.0f
);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_80392754);
func_802EF9F8(pCtrl, 0.6f);
func_802EFA18(pCtrl, 0);
particleEmitter_func_802EF9F8(pCtrl, 0.6f);
particleEmitter_func_802EFA18(pCtrl, 0);
func_802EFA20(pCtrl, 1.0f, 1.3f);
particleEmitter_setSfx(pCtrl, SFX_7B_ICE_BREAKING_1, 8000);
particleEmitter_emitN(pCtrl, cnt);
@@ -45,7 +45,7 @@ void func_80390944(f32 position[3], s32 cnt, enum asset_e model_id){
void func_80390A30(f32 position[3], s32 cnt, enum asset_e sprite_id){
static ParticleScaleAndLifetimeRanges D_803927C4 = {{0.6f, 0.8f}, {1.0f, 1.4f}, {0.0f, 0.01f}, {1.2f, 1.8f}, 0.0f, 0.01f};
static struct43s D_803927EC = {
static ParticleSettingsVelocityAccelerationPosition D_803927EC = {
{{-200.0f, 0.0f, -200.0f}, {200.0f, 200.0f, 200.0f}}, /*position*/
{{ 0.0f, -10.0f, 0.0f}, { 0.0f, -10.0f, 0.0f}}, /*velocitcy*/
{{ -50.0f, 0.0f, -50.0f}, { 50.0f, 200.0f, 50.0f}} /*acceleration*/
@@ -55,7 +55,7 @@ void func_80390A30(f32 position[3], s32 cnt, enum asset_e sprite_id){
particleEmitter_setRGB(pCtrl, D_80392834);
particleEmitter_setSprite(pCtrl, sprite_id);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_803927EC);
particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_803927EC);
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_803927C4);
particleEmitter_emitN(pCtrl, cnt);
}

2
src/FP/ch/xmastreestar.c
View File

@@ -17,7 +17,7 @@ void func_8038ECD8(Actor *this);
/* .data */
ActorInfo D_80392470 = { 0x207, 0x339, 0x426,
0x1, NULL,
func_8038ECD8, func_80326224, func_8038EBD0,
func_8038ECD8, actor_update_func_80326224, func_8038EBD0,
0, 0, 0.0f, 0
};

6
src/FP/ch/xmastreeswitch.c
View File

@@ -15,7 +15,7 @@ ActorAnimationInfo D_80392400[] = {
ActorInfo D_80392420 = { 0x206, 0x338, 0x486,
0x1, D_80392400,
func_8038E940, func_80326224, func_8038E720,
func_8038E940, actor_update_func_80326224, func_8038E720,
4500, 0, 0.0f, 0
};
@@ -50,11 +50,11 @@ void func_8038E840(f32 position[3], s32 cnt, enum asset_e sprite_id){
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
particleEmitter_setSprite(pCtrl, sprite_id);
particleEmitter_setPosition(pCtrl, position);
particleEmitter_setParticleSpawnPositionRange(pCtrl,
particleEmitter_setSpawnPositionRange(pCtrl,
-100.0f, -80.0f, -70.0f,
100.0f, 100.0f, 70.0f
);
particleEmitter_setParticleAccelerationRange(pCtrl,
particleEmitter_setAccelerationRange(pCtrl,
0.0f, -200.0f, 0.0f,
0.0f, -200.0f, 0.0f
);