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

Renaming functions

Browse Source
This commit is contained in:
Adrien Bonnin
2024-09-09 19:51:23 +02:00
parent b77274c9ea
commit 1861ce5c0e
173 changed files with 752 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/fight/chbossjinjo.c
View File

@@ -82,8 +82,8 @@ void fight_func_8038C2C0(f32 position[3], s32 count, enum asset_e id, f32 arg3){
particleEmitter_setStartingFrameRange(temp_s0, 1, 6);
particleEmitter_setPosition(temp_s0, position);
particleEmitter_setAngularVelocityRange(temp_s0, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
func_802EFB70(temp_s0, arg3*0.35, arg3*0.65);
func_802EFB84(temp_s0, 0.0f, 0.0f);
particleEmitter_setStartingScaleRange(temp_s0, arg3*0.35, arg3*0.65);
particleEmitter_setFinalScaleRange(temp_s0, 0.0f, 0.0f);
func_802EF9F8(temp_s0, 0.5f);
func_802EFA18(temp_s0, 3);
particleEmitter_setSpawnIntervalRange(temp_s0, 0.0f, 0.01f);
@@ -104,8 +104,8 @@ void func_8038C424(f32 position[3], s32 count, enum asset_e id, f32 arg3){
particleEmitter_setPosition(temp_s0, position);
particleEmitter_setPositionAndVelocityRanges(temp_s0, &D_80391918);
sp24 = arg3 * 5.0;
func_802EFB70(temp_s0, sp24, sp24);
func_802EFB84(temp_s0, sp24, sp24);
particleEmitter_setStartingScaleRange(temp_s0, sp24, sp24);
particleEmitter_setFinalScaleRange(temp_s0, sp24, sp24);
particleEmitter_setSpawnIntervalRange(temp_s0, 0.0f, 0.0f);
particleEmitter_setParticleLifeTimeRange(temp_s0, (arg3*0.5), (arg3*0.5)*1.5);
particleEmitter_setFade(temp_s0, 0.7f, 0.8f);
@@ -199,7 +199,7 @@ void chBossJinjo_update(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = 1;
func_80324CFC(0.0f, SFX_JINJO_STATUE_POWERUP, 32000);
func_80324D2C(this->unk60 + 2.26, SFX_JINJO_STATUE_POWERUP);
func_80324D2C(this->lifetime_value + 2.26, SFX_JINJO_STATUE_POWERUP);
}//L8038C8A4
func_8028E964(sp68);
func_80257F18(this->position, sp68, &sp4C);
@@ -208,10 +208,10 @@ void chBossJinjo_update(Actor *this){
switch(this->state){
case 1: //8038C92C
animctrl_setAnimTimer(this->animctrl, 0.0f);
if(this->unk60 < 0.0)
if(this->lifetime_value < 0.0)
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
else//L8038C974
this->unk60 -= sp74;
this->lifetime_value -= sp74;
break;

4
src/fight/chbossjinjobase.c
View File

@@ -130,8 +130,8 @@ void chBossJinjoBase_update(Actor *this) {
func_8038D3DC(this, 0x19a, 0.0f, -200.0f, 0.0f);
TUPLE_COPY(this->unk1C, this->position);
this->position_y = -400.0f;
if(0.0f != this->unk60)
this->velocity_y = 400.0f/this->unk60;
if(0.0f != this->lifetime_value)
this->velocity_y = 400.0f/this->lifetime_value;
else
this->velocity_y = 100.0f;

78
src/fight/chfinalboss.c
View File

@@ -299,8 +299,8 @@ void func_8038679C(f32 arg0[3], s32 arg1, f32 arg2[4]) {
particleEmitter_setStartingFrameRange(temp_s0, 0, 7);
particleEmitter_setPosition(temp_s0, arg0);
particleEmitter_setPositionAndVelocityRanges(temp_s0, &D_803915B8);
func_802EFB70(temp_s0, arg2[0], arg2[1]);
func_802EFB84(temp_s0, arg2[2], arg2[3]);
particleEmitter_setStartingScaleRange(temp_s0, arg2[0], arg2[1]);
particleEmitter_setFinalScaleRange(temp_s0, arg2[2], arg2[3]);
particleEmitter_setSpawnIntervalRange(temp_s0, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(temp_s0, 2.8f, 3.2f);
particleEmitter_setFade(temp_s0, 0.3f, 0.4f);
@@ -447,7 +447,7 @@ void chfinalboss_spawnFlightPad(s32 arg0) {
s16 *temp_v1;
Actor *flight_pad;
flight_pad = func_8032813C(ACTOR_39F_FIGHT_FLIGHT_PAD, D_80391700, D_8039170C);
flight_pad = spawn_actor_f32(ACTOR_39F_FIGHT_FLIGHT_PAD, D_80391700, D_8039170C);
flight_pad->alpha_124_19 = 0;
flight_pad->unk38_31 = 6;
__chFinalBossFlightPadMarker = flight_pad->marker;
@@ -456,7 +456,7 @@ void chfinalboss_spawnFlightPad(s32 arg0) {
void func_80386EC0(s32 arg0) {
ActorMarker *marker;
marker = func_8032813C(0x38A, D_80392758, 0)->marker;
marker = spawn_actor_f32(0x38A, D_80392758, 0)->marker;
func_8030E878(SFX_147_GRUNTY_SPELL_ATTACK_2, randf2(0.95f, 1.05f), 32000, D_80392758, 5000.0f, 12000.0f);
fight_func_803900DC(marker, D_80392758, D_80392768[1], D_80392768[2]);
}
@@ -474,7 +474,7 @@ void func_80386F5C(ActorMarker * arg0, f32 arg1[3], f32 arg2, f32 arg3) {
void func_80386FD8(s32 arg0) {
ActorMarker *marker;
marker = func_8032813C(0x389, D_80392758, 0)->marker;
marker = spawn_actor_f32(0x389, D_80392758, 0)->marker;
func_8030E878(SFX_146_GRUNTY_SPELL_ATTACK_1, randf2(0.95f, 1.05f), 32000, D_80392758, 5000.0f, 12000.0f);
fight_func_8038FB84(marker, D_80392758, D_80392768, D_80392778);
}
@@ -482,7 +482,7 @@ void func_80386FD8(s32 arg0) {
void func_80387074(s32 arg0) {
ActorMarker *marker;
marker = func_8032813C(0x3AA, D_80392758, 0)->marker;
marker = spawn_actor_f32(0x3AA, D_80392758, 0)->marker;
func_8030E878(SFX_146_GRUNTY_SPELL_ATTACK_1, randf2(0.95f, 1.05f), 32000, D_80392758, 5000.0f, 12000.0f);
fight_func_8038FB84(marker, D_80392758, D_80392768, D_80392778);
}
@@ -681,7 +681,7 @@ void chfinalboss_setPhase(ActorMarker *this, u32 phase_id)
actor->unk1C_x = D_803927D0[(local->unk5)][0];
actor->unk1C_y = D_803927D0[(local->unk5)][1];
actor->unk1C_z = D_803927D0[(local->unk5)][2];
actor->unk60 = 15.0f;
actor->lifetime_value = 15.0f;
return;
case 4:
@@ -876,7 +876,7 @@ void chfinalboss_phase1_setState(Actor *this, s32 next_state) {
func_8030E878(SFX_14B_GRUNTY_LAUGH_4, randf2(0.95f, 1.05f), 32000, this->position, 5000.0f, 12000.0f);
}
this->unk28 = 0.0f;
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
break;
case 6:
local = local;
@@ -1011,16 +1011,16 @@ void chfinalboss_phase1_update(ActorMarker *marker) {
break;
case 5:
func_80387B00(this);
this->unk60 += sp54;
if (this->unk60 < 0.3333333333333333) {
this->lifetime_value += sp54;
if (this->lifetime_value < 0.3333333333333333) {
this->unk28 += 3300.0 * sp54;
} else if (0.7333333333333334 < this->unk60) {
} else if (0.7333333333333334 < this->lifetime_value) {
this->unk28 -= 3300.0 * sp54;
}
local->unk20 += this->unk28 * sp54;
func_80387BFC(this, 45.0f * sp54);
func_80328FB0(this, 30.0f * sp54);
if (this->unk60 > 1.0) {
if (this->lifetime_value > 1.0) {
chfinalboss_phase1_setState(this, 6);
}
break;
@@ -1085,13 +1085,13 @@ void chfinalboss_phase1_update(ActorMarker *marker) {
if (this->unk28 < 0) {
chfinalboss_phase1_setState(this, 9);
func_80386654(2.0f, fight_D_80391390, fight_D_80391380);
this->unk60 = 4.0f;
this->lifetime_value = 4.0f;
}
break;
case 9:
func_803885DC(this);
if (this->unk60 > 0.0) {
this->unk60 -= sp54;
if (this->lifetime_value > 0.0) {
this->lifetime_value -= sp54;
}
else{
if (actor_animationIsAt(this, 0.9999f)) {
@@ -1215,10 +1215,10 @@ void chfinalboss_phase2_update(ActorMarker *marker) {
local->unk3++;
if (local->unk3 >= 4) {
local->unk3 = 0U;
this->unk60 = D_80391748[sp48] * 3.0f;
this->lifetime_value = D_80391748[sp48] * 3.0f;
}
else{
this->unk60 = D_80391748[sp48];
this->lifetime_value = D_80391748[sp48];
}
}
break;
@@ -1231,8 +1231,8 @@ void chfinalboss_phase2_update(ActorMarker *marker) {
break;
case 18:
fight_func_80386BEC(this, 3.0f);
if (this->unk60 > 0.0) {
this->unk60 = this->unk60 - sp4C;
if (this->lifetime_value > 0.0) {
this->lifetime_value = this->lifetime_value - sp4C;
break;
}
if (fight_func_80386BEC(this, 3.0f)) {
@@ -1270,31 +1270,31 @@ void __chfinalboss_spawnStatue(enum bossjinjo_e statue_id) {
switch (statue_id) {
case BOSSJINJO_ORANGE:
sp1C = func_8032813C(ACTOR_3A2_JINJO_STATUE_BASE, D_80391768, 135);
sp1C = spawn_actor_f32(ACTOR_3A2_JINJO_STATUE_BASE, D_80391768, 135);
__chFinalBossJinjoStatueMarker[0] = sp1C->marker;
break;
case BOSSJINJO_GREEN:
sp1C = func_8032813C(ACTOR_3A2_JINJO_STATUE_BASE, D_80391774, 45);
sp1C = spawn_actor_f32(ACTOR_3A2_JINJO_STATUE_BASE, D_80391774, 45);
__chFinalBossJinjoStatueMarker[1] = sp1C->marker;
break;
case BOSSJINJO_PINK:
sp1C = func_8032813C(ACTOR_3A2_JINJO_STATUE_BASE, D_80391780, 315);
sp1C = spawn_actor_f32(ACTOR_3A2_JINJO_STATUE_BASE, D_80391780, 315);
__chFinalBossJinjoStatueMarker[2] = sp1C->marker;
break;
case BOSSJINJO_YELLOW:
sp1C = func_8032813C(ACTOR_3A2_JINJO_STATUE_BASE, D_8039178C, 225);
sp1C = spawn_actor_f32(ACTOR_3A2_JINJO_STATUE_BASE, D_8039178C, 225);
__chFinalBossJinjoStatueMarker[3] = sp1C->marker;
break;
case BOSSJINJO_JINJONATOR:
*D_80392750_ptr = ((local->mirror_phase5) ? 0.0f : 180.0f);
sp1C = func_8032813C(ACTOR_3A9_JINJONATOR_STATUE_BASE, D_80391798, (s32)*D_80392750_ptr);
sp1C = spawn_actor_f32(ACTOR_3A9_JINJONATOR_STATUE_BASE, D_80391798, (s32)*D_80392750_ptr);
break;
}
sp1C->unk60 = (statue_id == BOSSJINJO_JINJONATOR) ? 5.25f : 1.54f;
sp1C->lifetime_value = (statue_id == BOSSJINJO_JINJONATOR) ? 5.25f : 1.54f;
sp1C->unkF4_8 = statue_id;
}
@@ -1382,13 +1382,13 @@ void chfinalboss_phase3_update(ActorMarker *marker) {
switch (this->state) {
case 21:
func_803869BC(this);
this->unk60 -= sp3C;
if (this->unk60 < 0.0) {
this->lifetime_value -= sp3C;
if (this->lifetime_value < 0.0) {
if (local->unkA) {
chfinalboss_phase3_setState(this, 0x17);
} else {
chfinalboss_phase3_setState(this, 0x16);
this->unk60 = D_803917B4[local->hits];
this->lifetime_value = D_803917B4[local->hits];
}
local->unkA = NOT(local->unkA);
break;
@@ -1402,10 +1402,10 @@ void chfinalboss_phase3_update(ActorMarker *marker) {
}
break;
case 22:
this->unk60 -= sp3C;
if (this->unk60 < 0.0) {
this->lifetime_value -= sp3C;
if (this->lifetime_value < 0.0) {
chfinalboss_phase3_setState(this, 0x15);
this->unk60 = 5.0f;
this->lifetime_value = 5.0f;
}
break;
case 23:
@@ -1424,7 +1424,7 @@ void chfinalboss_phase3_update(ActorMarker *marker) {
chfinalboss_phase3_setState(this, 0x1A);
}
else{
this->unk60 = 5.0f;
this->lifetime_value = 5.0f;
chfinalboss_phase3_setState(this, 0x15);
}
}
@@ -1668,7 +1668,7 @@ void chfinalboss_phase4_update(ActorMarker *marker) {
if (actor_animationIsAt(this, 0.9999f)) {
local->unk3++;
chfinalboss_phase4_setState(this, 0x1F);
this->unk60 = D_803917D0[sp70];
this->lifetime_value = D_803917D0[sp70];
}
} else {
chfinalboss_phase4_setState(this, 0x1D);
@@ -1677,8 +1677,8 @@ void chfinalboss_phase4_update(ActorMarker *marker) {
case 31:
fight_func_80386BEC(this, 3.0f);
if (this->unk60 > 0.0) {
this->unk60 -= sp74;
if (this->lifetime_value > 0.0) {
this->lifetime_value -= sp74;
break;
}
if (fight_func_80386BEC(this, 3.0f)) {
@@ -1697,7 +1697,7 @@ void chfinalboss_phase4_update(ActorMarker *marker) {
sp5C[0] = this->position[0] + (this->velocity[0] * sp74);
sp5C[1] = this->position[1] + (this->velocity[1] * sp74);
sp5C[2] = this->position[2] + (this->velocity[2] * sp74);
temp_f2 = func_80309724(sp5C);
temp_f2 = mapModel_getFloorY(sp5C);
if (sp5C[1] < temp_f2) {
this->position[0] = sp5C[0];
this->position[1] = sp5C[1];
@@ -1920,7 +1920,7 @@ void chfinalboss_phase5_update(ActorMarker *marker) {
func_803873DC(this, 700.0f, 2400.0f);
if (actor_animationIsAt(this, 0.9999f)) {
chfinalboss_phase5_setState(this, 0x27);
this->unk60 = 4.0f;
this->lifetime_value = 4.0f;
}
break;
@@ -1930,8 +1930,8 @@ void chfinalboss_phase5_update(ActorMarker *marker) {
} else {
fight_func_80386BEC(this, 3.0f);
}
if (this->unk60 > 0.0) {
this->unk60 -= dt;
if (this->lifetime_value > 0.0) {
this->lifetime_value -= dt;
break;
}
if (local->unk8 == 0) {

6
src/fight/chgreenblast.c
View File

@@ -105,7 +105,7 @@ void chGreenBlast_update(Actor *this){
marker_setCollisionScripts(this->marker, NULL, NULL, chGreenBlast_collisionDie);
this->marker->propPtr->unk8_3 = 0;
actor_collisionOn(this);
this->unk60 = 10.0f;
this->lifetime_value = 10.0f;
this->scale = (f64)this->scale + this->scale;
}
@@ -134,8 +134,8 @@ void chGreenBlast_update(Actor *this){
chGreenBlast_collisionDie(this->marker, 0);
}
else {
if(0.0 <= this->unk60) {
this->unk60 -= delta_time;
if(0.0 <= this->lifetime_value) {
this->lifetime_value -= delta_time;
}
else {
chGreenBlast_collisionDie(this->marker, 0);

10
src/fight/chjinjonator.c
View File

@@ -76,8 +76,8 @@ void chjinjonator_80390130(f32 position[3], int count, enum asset_e sprite_id){
particleEmitter_setPosition(s0, position);
particleEmitter_setParticleAccelerationRange(s0, 0.0f, -200.0f, 0.0f, 0.0f, -200.0f, 0.0f);
particleEmitter_setParticleVelocityRange(s0, -100.0f, -100.0f, -100.0f, 100.0f, 100.0f, 100.0f);
func_802EFB70(s0, 0.5f, 0.65f);
func_802EFB84(s0, 0.0f, 0.0f);
particleEmitter_setStartingScaleRange(s0, 0.5f, 0.65f);
particleEmitter_setFinalScaleRange(s0, 0.0f, 0.0f);
particleEmitter_setSpawnIntervalRange(s0, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(s0, 0.65f, 0.85f);
particleEmitter_setFade(s0, 0.0f, 0.35f);
@@ -161,7 +161,7 @@ void chjinjonator_update(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = 1;
local->unk18 = 0.40000000000000013 / (this->unk60 + 3.3);
local->unk18 = 0.40000000000000013 / (this->lifetime_value + 3.3);
local->unk14 = 0.7f;
func_8025A6EC(JINGLE_MENACING_GRUNTILDA_B, 20000);
func_8025A58C(0, 0x7fff);
@@ -182,8 +182,8 @@ void chjinjonator_update(Actor *this){
case 1: //803905D4
chjinjonator_8039040C(this);
animctrl_setAnimTimer(this->animctrl, 0.0f);
this->unk60 -= sp58;
if(this->unk60 < 0.0){
this->lifetime_value -= sp58;
if(this->lifetime_value < 0.0){
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
actor_playAnimationOnce(this);
}

14
src/fight/chjinjonatorbase.c
View File

@@ -136,7 +136,7 @@ void chjinjonatorbase_update(Actor *this){
temp_s0 = func_802F9AA8(0x3EC);
func_802F9DB8(temp_s0, 0.5f, 0.5f, 0.0f);
func_802F9EC4(temp_s0, this->position, 5000, 15000);
func_802F9FD0(temp_s0, 0.25f, this->unk60 - 1.0, 1);
func_802F9FD0(temp_s0, 0.25f, this->lifetime_value - 1.0, 1);
func_802FA060(temp_s0, 17000, 17000, 0.0f);
func_8025A6EC(JINGLE_MENACING_GRUNTILDA_A, 15000);
func_8032BB88(this, 0, 0x7fff);
@@ -146,15 +146,15 @@ void chjinjonatorbase_update(Actor *this){
this->unk1C[2] = this->position_z;
this->position_y = -600.0f;
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.6f, 25000);
if(0.0f != this->unk60){
this->velocity_y = 600.0f/this->unk60;
if(0.0f != this->lifetime_value){
this->velocity_y = 600.0f/this->lifetime_value;
}else{
this->velocity_y = 100.0f;
}
timedFunc_set_1(this->unk60* 0.05, (GenFunction_1)func_8038E260, reinterpret_cast(s32,this->marker));
timedFunc_set_1(this->unk60* 0.28, (GenFunction_1) func_8038E260, reinterpret_cast(s32,this->marker));
timedFunc_set_1(this->unk60* 0.46, (GenFunction_1) func_8038E260, reinterpret_cast(s32,this->marker));
timedFunc_set_1(this->unk60* 0.58, (GenFunction_1) func_8038E260, reinterpret_cast(s32,this->marker));
timedFunc_set_1(this->lifetime_value* 0.05, (GenFunction_1)func_8038E260, reinterpret_cast(s32,this->marker));
timedFunc_set_1(this->lifetime_value* 0.28, (GenFunction_1) func_8038E260, reinterpret_cast(s32,this->marker));
timedFunc_set_1(this->lifetime_value* 0.46, (GenFunction_1) func_8038E260, reinterpret_cast(s32,this->marker));
timedFunc_set_1(this->lifetime_value* 0.58, (GenFunction_1) func_8038E260, reinterpret_cast(s32,this->marker));
SPAWNQUEUE_ADD_1(chjinjonatorbase_spawnStoneJinjo, this->marker);
}

8
src/fight/chspellbarrier.c
View File

@@ -98,7 +98,7 @@ void chspellbarrier_update(Actor *this){
local->unk4 = 1;
actor_setOpacity(this, 0);
this->unk58_0 = 0;
this->unk60 = 2.0f;
this->lifetime_value = 2.0f;
}
} //L8038E9F4
if(this->state == 1){
@@ -107,9 +107,9 @@ void chspellbarrier_update(Actor *this){
this->scale = MIN(1.0, this->scale + ((f64)sp38 + (f64)sp38));
}//L8038EA68
if(0.0 < this->unk60){
if(0.0 < this->lifetime_value){
this->unk58_0 = 0;
this->unk60 -= sp38;
this->lifetime_value -= sp38;
}
else{ //L8038EAA4
this->unk58_0 = 1;
@@ -125,7 +125,7 @@ void chspellbarrier_update(Actor *this){
if(local->unk0 <= 0){
local->unk0 = 0;
local->unk4 = 1;
this->unk60 = 0.25f;
this->lifetime_value = 0.25f;
}
}//L8038EB74
actor_setOpacity(this, local->unk0);

18
src/fight/chspellfireball.c
View File

@@ -109,8 +109,8 @@ void chSpellFireball_emitSparkles(f32 position[3], u32 count, enum asset_e sprit
particleEmitter_setParticleAccelerationRange(pe, acceleration_range[0], acceleration_range[1], acceleration_range[2], acceleration_range[3], acceleration_range[4], acceleration_range[5]);
particleEmitter_setParticleVelocityRange(pe, velocity_range[0], velocity_range[1], velocity_range[2], velocity_range[3], velocity_range[4], velocity_range[5]);
particleEmitter_setAngularVelocityRange(pe, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
func_802EFB70(pe, scale_range[0], scale_range[1]);
func_802EFB84(pe, scale_range[2], scale_range[3]);
particleEmitter_setStartingScaleRange(pe, scale_range[0], scale_range[1]);
particleEmitter_setFinalScaleRange(pe, scale_range[2], scale_range[3]);
func_802EF9F8(pe, 0.5f);
func_802EFA18(pe, 3);
particleEmitter_setSpawnIntervalRange(pe, lifetime_range[0], lifetime_range[1]);
@@ -130,8 +130,8 @@ void chSpellFireball_emitExplosion(f32 position[3], enum asset_e sprite, s32 cou
particleEmitter_setPosition(pe, position);
particleEmitter_setParticleSpawnPositionRange(pe, position_range[0], position_range[1], position_range[2], position_range[3], position_range[4], position_range[5]);
particleEmitter_setParticleVelocityRange(pe, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
func_802EFB70(pe, scale_range[0], scale_range[1]);
func_802EFB84(pe, scale_range[2], scale_range[3]);
particleEmitter_setStartingScaleRange(pe, scale_range[0], scale_range[1]);
particleEmitter_setFinalScaleRange(pe, scale_range[2], scale_range[3]);
particleEmitter_setSpawnIntervalRange(pe, lifetime_range[0], lifetime_range[1]);
particleEmitter_setParticleLifeTimeRange(pe, lifetime_range[2], lifetime_range[3]);
particleEmitter_setFade(pe, fade[0], fade[1]);
@@ -149,8 +149,8 @@ void chSpellFireball_emitSmoke(f32 position[3], u32 count, f32 *lifetime_and_spa
particleEmitter_setStartingFrameRange(pe, 0, 7);
particleEmitter_setPosition(pe, position);
particleEmitter_setPositionAndVelocityRanges(pe, &D_80391B54);
func_802EFB70(pe, 0.1f, 0.2f);
func_802EFB84(pe, 3.6f, 4.6f);
particleEmitter_setStartingScaleRange(pe, 0.1f, 0.2f);
particleEmitter_setFinalScaleRange(pe, 3.6f, 4.6f);
particleEmitter_setSpawnIntervalRange(pe, lifetime_and_spawn_range[0], lifetime_and_spawn_range[1]);
particleEmitter_setParticleLifeTimeRange(pe, lifetime_and_spawn_range[2], lifetime_and_spawn_range[3]);
particleEmitter_setFade(pe, 0.05f, 0.1f);
@@ -281,7 +281,7 @@ void func_8038F620(Actor *this){
marker_setCollisionScripts(this->marker, NULL, NULL, func_8038F3B4);
this->marker->propPtr->unk8_3 = 0;
actor_collisionOn(this);
this->unk60 = 8.0f;
this->lifetime_value = 8.0f;
this->scale = 0.1f;
if( this->marker->id == MARKER_280_GRUNTY_SPELL_GREEN_ATTACK){
actor_collisionOff(this);
@@ -365,8 +365,8 @@ void func_8038F620(Actor *this){
func_8038F084(this->marker);
}
else {
if(0.0 <= this->unk60){
this->unk60 -= sp40;
if(0.0 <= this->lifetime_value){
this->lifetime_value -= sp40;
}else{
func_8038F084(this->marker);
}

2
src/fight/chstonejinjo.c
View File

@@ -35,7 +35,7 @@ void chstonejinjo_spawnJinjo(ActorMarker *marker) {
jinjo = spawn_child_actor((this->unkF4_8) + 0x3A4, &this);
}
jinjo->unkF4_8 = this->unkF4_8;
jinjo->unk60 = this->unk1C[0];
jinjo->lifetime_value = this->unk1C[0];
jinjo->scale = this->scale;
}