Fight and other docu

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

View File

@@ -23,7 +23,7 @@ enum chchimpystump_state_e {
ActorInfo chchimpystump = {
MARKER_95_CHIMPY_STUMP, ACTOR_C5_CHIMPY_STUMP, ASSET_3C8_MODEL_CHIMPY_STUMP,
1, NULL,
chchimpystump_update, func_80326224, actor_drawFullDepth,
chchimpystump_update, actor_update_func_80326224, actor_drawFullDepth,
0, 0, 0.0f, 0
};

View File

@@ -46,7 +46,7 @@ ActorAnimationInfo chCongaAnimations[9] = {
ActorInfo chcongaInfo = { MARKER_7_CONGA, ACTOR_8_CONGA, ASSET_35C_MODEL_CONGA,
1, chCongaAnimations,
func_803876D0, func_80326224, actor_draw,
func_803876D0, actor_update_func_80326224, actor_draw,
0, 0x333, 0.0f, 0
};

View File

@@ -42,7 +42,7 @@ ActorAnimationInfo chGrublinAnimations[11] = {
ActorInfo chgrublinInfo = { MARKER_5_GRUBLIN, ACTOR_6_GRUBLIN, ASSET_3C5_MODEL_GRUBLIN,
1, chGrublinAnimations,
func_80388A80, func_80326224, actor_draw,
func_80388A80, actor_update_func_80326224, actor_draw,
2500, 0, 1.0f, 0
};

View File

@@ -117,6 +117,6 @@ void mm_resetHuts(void) {
ActorInfo chhutInfo = {
MARKER_51_MM_HUT, ACTOR_9_MM_HUT, ASSET_7D7_MODEL_MM_HUT,
0, chhutAnimations,
chhut_update, func_80326224, chhut_draw,
chhut_update, actor_update_func_80326224, chhut_draw,
0, 0x100, 0.0f, 0
};

View File

@@ -34,7 +34,7 @@ enum chjuju_animation_state_e {
ActorInfo chjujuInfo = {
MARKER_67_JUJU, ACTOR_59_JUJU, ASSET_2E6_MODEL_JUJU,
0, NULL,
chjuju_update, func_80326224, chjuju_draw,
chjuju_update, actor_update_func_80326224, chjuju_draw,
0, 0, 0.0f, 0
};

View File

@@ -24,7 +24,7 @@ void chjujuhitbox_setJuju(Actor *this, s32 slave_id, Actor *slavePtr);
ActorInfo chjujuhitboxInfo = {
MARKER_67_JUJU, ACTOR_11_JUJU_CTRL, 0,
3, NULL,
chjujuhitbox_update, func_80326224, chjujuhitbox_draw,
chjujuhitbox_update, actor_update_func_80326224, chjujuhitbox_draw,
0, 0, 0.0f, 0
};

View File

@@ -19,7 +19,7 @@ enum chorange_state_e {
ActorInfo chorangeInfo = {
MARKER_C_ORANGE_PROJECTILE, ACTOR_14_ORANGE_PROJECTILE, ASSET_2D2_MODEL_ORANGE,
1, NULL,
chorange_update, func_80326224, chorange_draw,
chorange_update, actor_update_func_80326224, chorange_draw,
0, 0, 0.6f, 0
};

View File

@@ -3,7 +3,7 @@
#include "variables.h"
/* extern functions */
void func_80326224(Actor *);
void actor_update_func_80326224(Actor *);
void func_80329904(ActorMarker *, s32, void *);
extern void func_802EFA20(ParticleEmitter *, f32, f32);
@@ -14,7 +14,7 @@ void chorangepad_update(Actor *);
ActorInfo chorangepadInfo = {
MARKER_66_ORANGE_PAD, ACTOR_57_ORANGE_PAD, ASSET_2EB_MODEL_ORANGE_PAD,
0, NULL,
chorangepad_update, func_80326224, actor_draw,
chorangepad_update, actor_update_func_80326224, actor_draw,
0, 0, 0.0f, 0
};
@@ -66,12 +66,12 @@ void func_80386444(ActorMarker *marker) {
particleEmitter_setStartingScaleRange(p_ctrl, 0.09f, 0.19f);
particleEmitter_setFinalScaleRange(p_ctrl, 0.0f, 0.0f);
particleEmitter_setParticleVelocityRange(p_ctrl, -200.0f, 500.0f, -200.0f, 200.0f, 700.0f, 200.0f);
particleEmitter_setParticleAccelerationRange(p_ctrl, 0.0f, -1200.0f, 0.0f, 0.0f, -1200.0f, 0.0f);
particleEmitter_setAccelerationRange(p_ctrl, 0.0f, -1200.0f, 0.0f, 0.0f, -1200.0f, 0.0f);
particleEmitter_setAngularVelocityRange(p_ctrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
particleEmitter_setSpawnIntervalRange(p_ctrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(p_ctrl, 4.0f, 4.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_emitN(p_ctrl, 30);
}