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

2
src/SM/ch/attacktutorial.c
View File

@@ -17,7 +17,7 @@ void chAttackTutorial_update(Actor *);
/* .data */
ActorInfo D_8038AC20 = { MARKER_12B_ATTACK_TUTORIAL, ACTOR_167_ATTACK_TUTORIAL, 0,
1, NULL,
chAttackTutorial_update, func_80326224, func_80325340,
chAttackTutorial_update, actor_update_func_80326224, func_80325340,
0, 0, 0.0f, 0
};

38
src/SM/ch/vegetables.c
View File

@@ -33,12 +33,12 @@ ActorAnimationInfo chCarrotAnimations[5] = {
};
ActorInfo D_8038AC78 = { MARKER_12A_TOPPER_A, ACTOR_166_TOPPER_A, MODEL_TOPPER, 1, chCarrotAnimations,
func_80388080, func_80326224, func_80387DF4,
func_80388080, actor_update_func_80326224, func_80387DF4,
2000, 0, 1.0f, 0
};
ActorInfo D_8038AC9C = { MARKER_1E6_TOPPER_B, ACTOR_TOPPER_B, MODEL_TOPPER, 1, chCarrotAnimations,
func_80388080, func_80326224, func_80387DF4,
func_80388080, actor_update_func_80326224, func_80387DF4,
2000, 0, 1.0f, 0
};
@@ -51,12 +51,12 @@ ActorAnimationInfo chOnionAnimations[5] = {
};
ActorInfo D_8038ACE8 = { MARKER_129_BAWL_A, ACTOR_165_BAWL_A, MODEL_BAWL, 1, chOnionAnimations,
func_80388080, func_80326224, func_80387DF4,
func_80388080, actor_update_func_80326224, func_80387DF4,
0, 0, 1.0f, 0
};
ActorInfo D_8038AD0C = { MARKER_1E7_BAWL_B, ACTOR_BAWL_B, MODEL_BAWL, 1, chOnionAnimations,
func_80388080, func_80326224, func_80387DF4,
func_80388080, actor_update_func_80326224, func_80387DF4,
0, 0, 1.0f, 0
};
@@ -69,12 +69,12 @@ ActorAnimationInfo chCauliflowerAnimations[5] = {
};
ActorInfo D_8038AD58 = { MARKER_128_COLLYWOBBLE_A, ACTOR_164_COLLYWOBBLE_A, MODEL_COLLYWOBBLE, 1, chCauliflowerAnimations,
func_80388080, func_80326224, func_80387DF4,
func_80388080, actor_update_func_80326224, func_80387DF4,
0, 0, 2.0f, 0
};
ActorInfo D_8038AD7C = { MARKER_1E8_COLLYWOBBLE_B, ACTOR_COLLYWOBBLE_B, MODEL_COLLYWOBBLE, 1, chCauliflowerAnimations,
func_80388080, func_80326224, func_80387DF4,
func_80388080, actor_update_func_80326224, func_80387DF4,
0, 0, 2.0f, 0
};
@@ -88,7 +88,7 @@ ParticleScaleAndLifetimeRanges D_8038ADAC = {
0.0f, 0.01f,
};
struct42s D_8038ADD4 = {
ParticleSettingsVelocityPosition D_8038ADD4 = {
{{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}},
{{-40.0f, -40.0f, -40.0f}, {40.0f, 40.0f, 40.0f}}
};
@@ -101,7 +101,7 @@ ParticleScaleAndLifetimeRanges D_8038AE04 = {
0.0f, 0.2f
};
struct43s D_8038AE2C = {
ParticleSettingsVelocityAccelerationPosition D_8038AE2C = {
{{-100.0f, 200.0f, -100.0f}, {100.0f, 400.0f, 100.0f}},
{{0.0f, -600.0f, 0.0f}, {0.0f, -600.0f, 0.0f}},
{{-80.0f, -80.0f, -80.0f}, {80.0f, 80.0f, 80.0f}}
@@ -115,7 +115,7 @@ ParticleScaleAndLifetimeRanges D_8038AE74 = {
0.0f, 0.5f
};
struct43s D_8038AE9C = {
ParticleSettingsVelocityAccelerationPosition D_8038AE9C = {
{{-100.0f, 400.0f, -100.0f}, {100.0f, 600.0f, 100.0f}},
{{0.0f, -600.0f, 0.0f}, {0.0f, -600.0f, 0.0f}},
{{-20.0f, -20.0f, -20.0f}, {20.0f, 20.0f, 20.0f}}
@@ -129,7 +129,7 @@ ParticleScaleAndLifetimeRanges D_8038AEE4 = {
0.0f, 0.5f
};
struct43s D_8038AF0C ={
ParticleSettingsVelocityAccelerationPosition D_8038AF0C ={
{{-200.0f, 200.0f, -200.0f}, {200.0f, 600.0f, 200.0f}},
{{0.0f, -900.0f, 0.0f}, {0.0f, -900.0f, 0.0f}},
{{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}},
@@ -148,39 +148,39 @@ void func_80387910(ParticleEmitter *arg0, f32 *arg1, s32 arg2){
}
void func_803879B8(ParticleEmitter *arg0, f32 *arg1, s32 arg2, enum asset_e model_id){
func_802EF9F8(arg0, 0.6f);
func_802EFA18(arg0, 2);
particleEmitter_func_802EF9F8(arg0, 0.6f);
particleEmitter_func_802EFA18(arg0, 2);
particleEmitter_setModel(arg0, model_id);
particleEmitter_setPosition(arg0, arg1);
particleEmitter_setDrawMode(arg0, 2);
particleEmitter_setAngularVelocityRange(arg0, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
particleEmitter_setScaleAndLifetimeRanges(arg0, &D_8038AE04);
particleEmitter_setPositionVelocityAndAccelerationRanges(arg0, &D_8038AE2C);
particleEmitter_setVelocityAccelerationAndPositionRanges(arg0, &D_8038AE2C);
particleEmitter_emitN(arg0, arg2);
}
void func_80387A80(ParticleEmitter *arg0, f32 *arg1, s32 arg2, enum asset_e model_id){
func_802EF9F8(arg0, 0.6f);
func_802EFA18(arg0, 3);
particleEmitter_func_802EF9F8(arg0, 0.6f);
particleEmitter_func_802EFA18(arg0, 3);
particleEmitter_setModel(arg0, model_id);
particleEmitter_setPosition(arg0, arg1);
particleEmitter_setDrawMode(arg0, 2);
particleEmitter_setAngularVelocityRange(arg0, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
particleEmitter_setScaleAndLifetimeRanges(arg0, &D_8038AE74);
particleEmitter_setPositionVelocityAndAccelerationRanges(arg0, &D_8038AE9C);
particleEmitter_setVelocityAccelerationAndPositionRanges(arg0, &D_8038AE9C);
particleEmitter_emitN(arg0, arg2);
}
void func_80387B48(ParticleEmitter *arg0, f32 arg1[3], s32 arg2, enum asset_e model_id){
func_802EF9F8(arg0, 0.7f);
func_802EFA18(arg0, 4);
particleEmitter_func_802EF9F8(arg0, 0.7f);
particleEmitter_func_802EFA18(arg0, 4);
particleEmitter_setModel(arg0, model_id);
particleEmitter_setPosition(arg0, arg1);
particleEmitter_setDrawMode(arg0, 2);
particleEmitter_setAngularVelocityRange(arg0, 150.0f, -300.0f, -300.0f, 300.0f, 300.0f, -150.0f);
particleEmitter_setSfx(arg0, SFX_1F_HITTING_AN_ENEMY_3, 8000);
particleEmitter_setScaleAndLifetimeRanges(arg0, &D_8038AEE4);
particleEmitter_setPositionVelocityAndAccelerationRanges(arg0, &D_8038AF0C);
particleEmitter_setVelocityAccelerationAndPositionRanges(arg0, &D_8038AF0C);
particleEmitter_emitN(arg0, arg2);
}

2
src/SM/code_2990.c
View File

@@ -35,7 +35,7 @@ ActorAnimationInfo smMoleAnimations[6] = {
ActorInfo chSmMole = {
MARKER_B7_TUTORIAL_BOTTLES, ACTOR_12B_TUTORIAL_BOTTLES, ASSET_387_MODEL_BOTTLES,
1, smMoleAnimations,
chsmmole_Update, func_80326224, func_802D94B4,
chsmmole_Update, actor_update_func_80326224, func_802D94B4,
0, 0, 0.0f, 0
};

6
src/SM/code_3FC0.c
View File

@@ -17,7 +17,7 @@ ActorAnimationInfo D_8038AFF0[] = {
ActorInfo D_8038B008 = {
0xE1, 0x198, 0x530,
2, D_8038AFF0,
func_8038A3B0, func_80326224, actor_draw,
func_8038A3B0, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};//chBanjosBed
@@ -30,7 +30,7 @@ ActorAnimationInfo D_8038B02C[] = {
ActorInfo D_8038B044 ={
0xE2, 0x199, 0x52F,
2, D_8038B02C,
func_8038A3B0, func_80326224, actor_draw,
func_8038A3B0, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};//chBanjosChair
@@ -43,7 +43,7 @@ ActorAnimationInfo D_8038B068[] = {
ActorInfo D_8038B080 ={
0xE3, 0x19A, 0x337,
2, D_8038B068,
func_8038A3B0, func_80326224, actor_draw,
func_8038A3B0, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};//chBanjosStove

2
src/SM/code_4070.c
View File

@@ -12,7 +12,7 @@ void func_8038A4DC(Actor *this, s32 arg1);
/* .data */
ActorInfo D_8038B0B0 = { 0x1ED, 0x3B9, 0, 1, NULL,
SM_func_8038A5D8, func_80326224, func_80325340,
SM_func_8038A5D8, actor_update_func_80326224, func_80325340,
0, 0, 0.0f, 0
};

2
src/SM/code_44D0.c
View File

@@ -11,7 +11,7 @@ void func_8038A8F8(Actor *this);
/* .data */
ActorInfo D_8038B0E0 = { 0x1F0, 0x3BD, 0, 0, NULL,
func_8038A8F8, func_80326224, func_80325340,
func_8038A8F8, actor_update_func_80326224, func_80325340,
0, 0, 0.0f, 0
};

16
src/SM/code_5B0.c
View File

@@ -18,18 +18,18 @@ ActorAnimationInfo D_8038AAF0[] = {
ActorInfo D_8038AB00 = {
MARKER_135_QUARRIE, ACTOR_16F_QUARRIE, ASSET_42D_MODEL_QUARRIE,
1, NULL,
SM_func_80386EF4, func_80326224, actor_drawFullDepth,
SM_func_80386EF4, actor_update_func_80326224, actor_drawFullDepth,
2000, 0, 5.0f, 0
};
ActorInfo D_8038AB24 = {
MARKER_29D_ROCK_TRAPPING_GRUNTY, ACTOR_3CA_ROCK_TRAPPING_GRUNTY, ASSET_47B_MODEL_ROCK,
1, D_8038AAF0,
SM_func_80386A00, func_80326224, actor_drawFullDepth,
SM_func_80386A00, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};
struct43s D_8038AB48 = {
ParticleSettingsVelocityAccelerationPosition D_8038AB48 = {
{{-200.0f, 600.0f, -200.0f}, {200.0f, 800.0f, 200.0f}},
{{0.0f, -1800.0f, 0.0f}, {0.0f, -1800.0f, 0.0f}},
{{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}}
@@ -37,7 +37,7 @@ struct43s D_8038AB48 = {
s32 D_8038AB90[3] = {0xFF, 0xFF, 0xFF};
struct43s D_8038AB9C = {
ParticleSettingsVelocityAccelerationPosition D_8038AB9C = {
{{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}},
{{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}},
{{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}}
@@ -70,8 +70,8 @@ void SM_func_80386A00(Actor *this) {
}
void func_80386B04(ParticleEmitter *p_ctrl, f32 *arg1, s32 arg2, f32 arg3) {
func_802EF9F8(p_ctrl, 0.6f);
func_802EFA18(p_ctrl, 4);
particleEmitter_func_802EF9F8(p_ctrl, 0.6f);
particleEmitter_func_802EFA18(p_ctrl, 4);
particleEmitter_setFade(p_ctrl, 0.00f, 0.75f);
particleEmitter_setModel(p_ctrl, 0x42E);
particleEmitter_setPosition(p_ctrl, arg1);
@@ -81,7 +81,7 @@ void func_80386B04(ParticleEmitter *p_ctrl, f32 *arg1, s32 arg2, f32 arg3) {
particleEmitter_setAngularVelocityRange(p_ctrl, -100.0f, -100.0f, -100.0f, 100.0f, 100.0f, 100.0f);
particleEmitter_setSpawnIntervalRange(p_ctrl, 0.00f, 0.01f);
particleEmitter_setParticleLifeTimeRange(p_ctrl, 2.0f, 2.0f);
particleEmitter_setPositionVelocityAndAccelerationRanges(p_ctrl, &D_8038AB48);
particleEmitter_setVelocityAccelerationAndPositionRanges(p_ctrl, &D_8038AB48);
particleEmitter_emitN(p_ctrl, arg2);
}
@@ -95,7 +95,7 @@ void func_80386C2C(ParticleEmitter *p_ctrl, f32 *arg1, s32 arg2, f32 arg3) {
particleEmitter_setFinalScaleRange(p_ctrl, (arg3 * 1.5), (arg3 * 3.0));
particleEmitter_setSpawnIntervalRange(p_ctrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(p_ctrl, 1.5f, 2.0f);
particleEmitter_setPositionVelocityAndAccelerationRanges(p_ctrl, &D_8038AB9C);
particleEmitter_setVelocityAccelerationAndPositionRanges(p_ctrl, &D_8038AB9C);
particleEmitter_emitN(p_ctrl, arg2);
}

2
src/SM/code_BF0.c
View File

@@ -8,7 +8,7 @@ void SM_func_80386FE0(Actor *this);
ActorInfo D_8038ABF0 = {
0x134, 0x16E, 0,
1, NULL,
SM_func_80386FE0, func_80326224, func_80325340,
SM_func_80386FE0, actor_update_func_80326224, func_80325340,
2000, 0, 0.0f, 0
};