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

Merge branch 'mr-origin-86'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-08 01:58:19 -05:00
parent 06204d3b68 7f41a49ef8
commit 680cf7a950
34 changed files with 568 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/TTC/ch/clam.c
View File

@@ -6,41 +6,41 @@ extern Actor *spawnQueue_bundle_f32(s32, s32, s32, s32);
extern f32 func_80257204(f32, f32, f32, f32);
extern ActorProp * func_80320EB0(ActorMarker *, f32, s32);
void chClam_update(Actor *this);
static void __chClam_updateFunc(Actor *this);
/* .data */
ActorAnimationInfo chClamAnimations[] = {
{0x00, 0.0f},
ActorAnimationInfo gChClamAnimations[4] = {
{NULL, NULL},
{ASSET_AA_ANIM_CLAM_IDLE, 2.0f},
{ASSET_24_ANIM_CLAM_HOP, 1.0f},
{ASSET_AB_ANIM_CLAM_EAT, 0.6f}
};
ActorInfo chClam = {
ActorInfo gChClam = {
MARKER_15_CLAM, ACTOR_69_CLAM, ASSET_351_MODEL_CLAM,
0x1, chClamAnimations,
chClam_update, actor_update_func_80326224, actor_draw,
0x1, gChClamAnimations,
__chClam_updateFunc, actor_update_func_80326224, actor_draw,
4500, 0x366, 1.6f, 0
};
/* .code */
void __chClam_func_803863F0(enum sfx_e sfx_id, f32 arg1, s32 arg2, f32 position[3], f32 arg4, f32 arg5){
static void __chClam_playSfx(enum sfx_e sfx_id, f32 volume, s32 sampleRate, f32 position[3], f32 minFadeDistance, f32 maxFadeDistance){
if(func_803114B0()){
arg2 -= 10000;
if(arg2 < 0)
arg2 = 0;
sampleRate -= 10000;
if(sampleRate < 0)
sampleRate = 0;
}
func_8030E878(sfx_id, arg1, arg2, position, arg4, arg5);
func_8030E878(sfx_id, volume, sampleRate, position, minFadeDistance, maxFadeDistance);
}
void __chClam_func_80386454(Actor *this){
static void __chClam_func_80386454(Actor *this){
subaddie_set_state_with_direction(this, 1, 0.01f, 1);
actor_loopAnimation(this);
animctrl_setDuration(this->animctrl, randf2(1.9f, 2.1f));
}
bool __chClam_updateTarget(Actor *this, f32 arg1) {
static bool __chClam_updateFuncTarget(Actor *this, f32 arg1) {
f32 egg_dist;
f32 red_feather_dist;
f32 pad;
@@ -84,13 +84,13 @@ bool __chClam_updateTarget(Actor *this, f32 arg1) {
if ((volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11) < this->actor_specific_1_f) {
this->actor_specific_1_f = (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) != 0) ? 0.0f : 17.0f;
} else if (sp38 == 0) {
__chClam_func_803863F0(SFX_AE_YUMYUM_TALKING, randf2(0.9f, 1.0f), 22000, this->position, 500.0f, 2000.0f);
__chClam_playSfx(SFX_AE_YUMYUM_TALKING, randf2(0.9f, 1.0f), 22000, this->position, 500.0f, 2000.0f);
}
return TRUE;
}
bool __chClam_rotateTowardTarget(Actor *this, s32 arg1) {
static bool __chClam_rotateTowardTarget(Actor *this, s32 arg1) {
f32 temp_f0_2;
s32 position;
s32 sp2C;
@@ -100,7 +100,7 @@ bool __chClam_rotateTowardTarget(Actor *this, s32 arg1) {
animctrl_setDuration(this->animctrl, 1.0f);
sp2C = (s32) ((f64) (60.0f / (f32) func_8033DD90()) * 0.5);
if ((this->unk1C[0] != 0.0f) || !__chClam_updateTarget(this, sp2C)) {
if ((this->unk1C[0] != 0.0f) || !__chClam_updateFuncTarget(this, sp2C)) {
if (((f64) animctrl_getAnimTimer(this->animctrl) < 0.1) && ((f64) randf() < 0.5)) {
if (this->unk1C[0] != 0.0f) {
arg1 *= 2;
@@ -132,7 +132,7 @@ bool __chClam_rotateTowardTarget(Actor *this, s32 arg1) {
}
void __chClam_particalEmitterInit(ParticleEmitter *pCtrl, f32 position[3]){
static void __chClam_particalEmitterInit(ParticleEmitter *pCtrl, f32 position[3]){
particleEmitter_setPosition(pCtrl, position);
particleEmitter_func_802EF9F8(pCtrl, 0.7f);
particleEmitter_func_802EFA18(pCtrl, 3);
@@ -144,7 +144,7 @@ void __chClam_particalEmitterInit(ParticleEmitter *pCtrl, f32 position[3]){
particleEmitter_setDrawMode(pCtrl, 2);
}
void __chClam_emitLargeShellParticles(f32 position[3], s32 count){
static void __chClam_emitLargeShellParticles(f32 position[3], s32 count){
static ParticleSettingsVelocityAcceleration D_8038C3F4 = {
{{-50.0f, 750.0f, -50.0f}, {120.0f, 900.0f, 120.0f}},
{{ 0.0f, -1800.0f, 0.0f}, { 0.0f, -1800.0f, 0.0f}}
@@ -160,7 +160,7 @@ void __chClam_emitLargeShellParticles(f32 position[3], s32 count){
particleEmitter_emitN(pCtrl, count);
}
void __chClam_emitEyeParticles(f32 position[3], s32 count){
static void __chClam_emitEyeParticles(f32 position[3], s32 count){
static ParticleSettingsVelocityAcceleration D_8038C424 = {
{{-80.0f, 400.0f, -80.0f}, {160.0f, 860.0f, 160.0f}},
{{ 0.0f, -1400.0f, 0.0f}, { 0.0f, -1400.0f, 0.0f}}
@@ -176,7 +176,7 @@ void __chClam_emitEyeParticles(f32 position[3], s32 count){
particleEmitter_emitN(pCtrl, count);
}
void __chClam_emitSmallShellParticles(f32 position[3], s32 count){
static void __chClam_emitSmallShellParticles(f32 position[3], s32 count){
static ParticleSettingsVelocityAcceleration D_8038C454 = {
{{-200.0f, 850.0f, -200.0f}, {400.0f, 1000.0f, 400.0f}},
{{ 0.0f, -1800.0f, 0.0f}, { 0.0f, -1800.0f, 0.0f}}
@@ -192,7 +192,7 @@ void __chClam_emitSmallShellParticles(f32 position[3], s32 count){
particleEmitter_emitN(pCtrl, count);
}
void __chClam_emitEatencollectibleParticles(f32 position[3], enum asset_e sprite_id, s32 count){
static void __chClam_emitEatencollectibleParticles(f32 position[3], enum asset_e sprite_id, s32 count){
static ParticleScaleAndLifetimeRanges D_8038C484 = {
{0.2f, 0.35f},
{0.0f, 0.0f},
@@ -217,14 +217,14 @@ void __chClam_emitEatencollectibleParticles(f32 position[3], enum asset_e sprite
particleEmitter_emitN(pCtrl, count);
}
void __chClam_takeDamage(ActorMarker *this_marker, ActorMarker *other_marker){
static void __chClam_takeDamage(ActorMarker *this_marker, ActorMarker *other_marker){
Actor *this;
this = marker_getActor(this_marker);
this->marker->collidable = FALSE;
this->unk138_27 = TRUE;
__chClam_func_803863F0(SFX_1D_HITTING_AN_ENEMY_1, 1.0f, 26000, this->position, 1500.0f, 2000.0f);
__chClam_func_803863F0(SFX_115_BUZZBOMB_DEATH, 1.2f, 26000, this->position, 1500.0f, 2000.0f);
__chClam_playSfx(SFX_1D_HITTING_AN_ENEMY_1, 1.0f, 26000, this->position, 1500.0f, 2000.0f);
__chClam_playSfx(SFX_115_BUZZBOMB_DEATH, 1.2f, 26000, this->position, 1500.0f, 2000.0f);
__chClam_emitLargeShellParticles(this->position, 2);
__chClam_emitEyeParticles(this->position, 2);
__chClam_emitSmallShellParticles(this->position, 0xC);
@@ -232,7 +232,7 @@ void __chClam_takeDamage(ActorMarker *this_marker, ActorMarker *other_marker){
marker_despawn(this->marker);
}
void __chClam_playerDropsItem(enum bundle_e bundle_id, enum item_e item_id){
static void __chClam_playerDropsItem(enum bundle_e bundle_id, enum item_e item_id){
f32 position[3];
player_getPosition(position);
@@ -241,12 +241,12 @@ void __chClam_playerDropsItem(enum bundle_e bundle_id, enum item_e item_id){
item_dec(item_id);
}
void __chClam_attackOther(ActorMarker *this_marker, ActorMarker *other_marker){
static void __chClam_attackOther(ActorMarker *this_marker, ActorMarker *other_marker){
if(func_80297C6C() == 3) return;
if( !mapSpecificFlags_get(5) && gcdialog_showText(ASSET_A14_TEXT_UNKNOWN, 0, NULL, NULL, NULL, NULL)){
mapSpecificFlags_set(5, TRUE);
if( !mapSpecificFlags_get(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN) && gcdialog_showText(ASSET_A14_TEXT_CLAM_TAUNT, 0, NULL, NULL, NULL, NULL)){
mapSpecificFlags_set(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN, TRUE);
}
if (item_getCount(ITEM_D_EGGS) != 0) {
@@ -258,7 +258,7 @@ void __chClam_attackOther(ActorMarker *this_marker, ActorMarker *other_marker){
}
}
void chClam_update(Actor *this){
static void __chClam_updateFunc(Actor *this){
ActorProp *sp4C = func_80320EB0(this->marker, 30.0f, 1);
f32 sp48;
s32 sp44;
@@ -290,8 +290,8 @@ void chClam_update(Actor *this){
animctrl_setDuration(this->animctrl, 0.6f);
marker_despawn(sp4C->marker);
}
}//L80387140
}//L80387144
}
}
switch(this->state){
case 1://L80387170
@@ -299,7 +299,7 @@ void chClam_update(Actor *this){
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
actor_playAnimationOnce(this);
animctrl_setDuration(this->animctrl, 1.0f);
__chClam_func_803863F0(SFX_3F2_UNKNOWN, randf2(1.0f, 1.1f), 22000, this->position, 1500.0f, 2000.0f);
__chClam_playSfx(SFX_3F2_UNKNOWN, randf2(1.0f, 1.1f), 22000, this->position, 1500.0f, 2000.0f);
}
else{
animctrl_setDuration(this->animctrl, 2.0f);
@@ -310,7 +310,7 @@ void chClam_update(Actor *this){
this->position_y += this->velocity_y;
this->velocity_y += -5.0f;
if(actor_animationIsAt(this, 0.63f)){
__chClam_func_803863F0(SFX_80_YUMYUM_CLACK, 1.0f, 20000, this->position, 1500.0f, 2000.0f);
__chClam_playSfx(SFX_80_YUMYUM_CLACK, 1.0f, 20000, this->position, 1500.0f, 2000.0f);
}
if(this->position_y <= sp48){
@@ -337,7 +337,7 @@ void chClam_update(Actor *this){
}
if(actor_animationIsAt(this, 0.8f) && 2.0f == this->velocity_x){
__chClam_func_803863F0(SFX_4B_GULPING, randf2(0.8f, 0.9f), 22000, this->position, 700.0f, 2000.0f);
__chClam_playSfx(SFX_4B_GULPING, randf2(0.8f, 0.9f), 22000, this->position, 700.0f, 2000.0f);
break;
}//L803873C4
@@ -345,7 +345,7 @@ void chClam_update(Actor *this){
if(!this->marker->unk14_21) break;
__chClam_func_803863F0(SFX_4C_LIP_SMACK, 1.0f, 20000, this->position, 500.0f, 2000.0f);
__chClam_playSfx(SFX_4C_LIP_SMACK, 1.0f, 20000, this->position, 500.0f, 2000.0f);
func_8034A174(this->marker->unk44, 5, sp38);
switch(this->unk38_31){