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

6
src/lair/ch/brentilda.c
View File

@@ -143,10 +143,10 @@ void chBrentilda_update(Actor *this) {
if (phi_f2 < 500.0) {
if (sp74 < 0xFF) {
sp74 = (sp74 + 0xC < 0xFF) ? sp74 + 0xC : 0xFF;
if (!this->unk138_24) {
if (!this->is_first_encounter) {
func_8025A70C(COMUSIC_81_ACTIVATING_BRENTILDA);
func_80324D2C(1.0f, COMUSIC_81_ACTIVATING_BRENTILDA);
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
this->unk138_23 = FALSE;
}
}
@@ -159,7 +159,7 @@ void chBrentilda_update(Actor *this) {
func_8025A70C(COMUSIC_8B_DEACTIVATE_BRENTILDA);
func_80324D2C(1.0f, COMUSIC_8B_DEACTIVATE_BRENTILDA);
this->unk138_23 = TRUE;
this->unk138_24 = FALSE;
this->is_first_encounter = FALSE;
}
}
}

8
src/lair/ch/cauldron.c
View File

@@ -180,13 +180,13 @@ void func_8038AC7C(Actor *this) {
&& func_80329530(this, 1200)
&& !fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY)
) {
this->unk60 += time_getDelta();
if (35.0 < this->unk60) {
this->lifetime_value += time_getDelta();
if (35.0 < this->lifetime_value) {
sp2C = (fileProgressFlag_get(FILEPROG_CF_HAS_ENTERED_FINAL_FIGHT)) ? 0xFB7 : 0xFAE;
sp28 = (fileProgressFlag_get(FILEPROG_CF_HAS_ENTERED_FINAL_FIGHT)) ? 0xFBC : 0xFB7;
if (func_80311480(sp2C + this->unk38_31, 0, NULL, NULL, NULL, NULL)) {
this->unk38_31++;
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
if (sp2C + this->unk38_31 >= sp28) {
this->unk38_31 = 0;
}
@@ -231,7 +231,7 @@ void chWarpCauldron_update(Actor *this) {
if (fileProgressFlag_get(FILEPROG_F3_MET_DINGPOT)) {
sp4C = (fileProgressFlag_get(FILEPROG_CF_HAS_ENTERED_FINAL_FIGHT)) ? 0xFB7 : 0xFAE;
phi_v0 = (fileProgressFlag_get(FILEPROG_CF_HAS_ENTERED_FINAL_FIGHT)) ? 0xFBC : 0xFB7;
this->unk60 = 35.0f;
this->lifetime_value = 35.0f;
this->unk38_31 = randi2(0, phi_v0 - sp4C);
}
this->scale = 1.8f;

70
src/lair/code_0.c
View File

@@ -353,7 +353,7 @@ void func_803867A8(Actor *this) {
this->initialized = TRUE;
this->alpha_124_19 = 0;
this->unk60 = this->yaw;
this->lifetime_value = this->yaw;
this->yaw = 0.0f;
this->velocity[0] = 0.0f;
return;
@@ -394,20 +394,20 @@ void func_803867A8(Actor *this) {
}
}
this->unk60 += 2.5;
while(this->unk60 >= 360.0f){ this->unk60 -= 360.0f;}
this->lifetime_value += 2.5;
while(this->lifetime_value >= 360.0f){ this->lifetime_value -= 360.0f;}
this->position_y = this->unk1C[1];
sp5C[1] = sp5C[2] =0.0f;
sp5C[0] = this->unkF4_8*2;
ml_vec3f_yaw_rotate_copy(sp5C, sp5C, this->unk60);
ml_vec3f_yaw_rotate_copy(sp5C, sp5C, this->lifetime_value);
this->position[0] = this->unk1C[0] + sp5C[0];
this->position[2] = this->unk1C[2] + sp5C[2];
if (this->marker->unk14_21) {
sp44 = this->unk158[globalTimer_getTime() & 1];
if (sp44 != NULL) {
particleEmitter_setAlpha(sp44, this->alpha_124_19);
phi_f0 = this->unk60 - 10.0f;
phi_f0 = this->lifetime_value - 10.0f;
while(phi_f0 < 0.0f) {phi_f0 += 360.0f;}
sp50[1] = this->unk1C[1];
@@ -466,16 +466,16 @@ void func_80386D78(Actor *this) {
if (volatileFlag_get(VOLATILE_FLAG_8A_SANDCASTLE_FLIGHT_UNLOCKED)) {
ability_unlock(ABILITY_9_FLIGHT);
mapSpecificFlags_set(0, TRUE);
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
this->position[1] = this->unk1C[1];
this->scale = 1.0f;
}
}
if ((this->unk1C[1] - 150.0f) <= this->position[1]) {
if (!volatileFlag_get(VOLATILE_FLAG_8A_SANDCASTLE_FLIGHT_UNLOCKED)) {
if (this->unk60 != 0.0f) {
this->unk60 -= 1.0f;
if (this->unk60 == 0.0f) {
if (this->lifetime_value != 0.0f) {
this->lifetime_value -= 1.0f;
if (this->lifetime_value == 0.0f) {
FUNC_8030E624(SFX_25_METAL_SLIDING_OVER_SMTH, 0.8f, 32000);
}
} else {
@@ -505,7 +505,7 @@ void func_80386D78(Actor *this) {
}
} else if (mapSpecificFlags_get(0)) {
this->scale = 0.0001f;
this->unk60 = 26.0f;
this->lifetime_value = 26.0f;
this->position[1] = this->unk1C[1];
func_802BAFE4(0x80);
timedFunc_set_0(3.0f, func_80386D40);
@@ -537,13 +537,13 @@ void func_803870DC(Actor *this) {
}
if ((this->alpha_124_19 == 0) && (phi_v1)) {
this->alpha_124_19 = 1;
this->unk60 = 23.0f;
this->lifetime_value = 23.0f;
}
phi_a0 = this->alpha_124_19;
if (phi_a0 == 1) {
this->unk60 -= 1.0f;
if (this->unk60 == 0.0f) {
this->lifetime_value -= 1.0f;
if (this->lifetime_value == 0.0f) {
this->alpha_124_19 = 2;
func_80324CFC(0, COMUSIC_43_ENTER_LEVEL_GLITTER, 32700);
func_80324D2C(1.3f, COMUSIC_43_ENTER_LEVEL_GLITTER);
@@ -563,8 +563,8 @@ void func_803870DC(Actor *this) {
func_8034A174(func_80329934(), 5, sp90);
func_8034A174(func_80329934(), 6, sp84);
particleEmitter_setSprite(temp_s5, ASSET_710_SPRITE_SPARKLE_PURPLE);
func_802EFB70(temp_s5, 0.13f, 0.18f);
func_802EFB84(temp_s5, 0.08f, 0.13f);
particleEmitter_setStartingScaleRange(temp_s5, 0.13f, 0.18f);
particleEmitter_setFinalScaleRange(temp_s5, 0.08f, 0.13f);
particleEmitter_setParticleAccelerationRange(temp_s5, -500.0f, -1800.0f, -500.0f, 500.0f, 1800.0f, 500.0f);
particleEmitter_setSpawnIntervalRange(temp_s5, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(temp_s5, 0.9f, 0.9f);
@@ -721,8 +721,8 @@ void func_80387730(Actor *this) {
temp_s5 = partEmitMgr_newEmitter((s32)((f32) this->alpha_124_19 / 11.0));
sp6C[2] = 0;
particleEmitter_setSprite(temp_s5, ASSET_710_SPRITE_SPARKLE_PURPLE);
func_802EFB70(temp_s5, 0.13f, 0.18f);
func_802EFB84(temp_s5, 0.08f, 0.13f);
particleEmitter_setStartingScaleRange(temp_s5, 0.13f, 0.18f);
particleEmitter_setFinalScaleRange(temp_s5, 0.08f, 0.13f);
particleEmitter_setParticleAccelerationRange(temp_s5, -10.0f, 0.0f, -10.0f, 10.0f, 1600.0f, 10.0f);
particleEmitter_setSpawnIntervalRange(temp_s5, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(temp_s5, 1.4f, 1.4f);
@@ -799,7 +799,7 @@ void func_80387E94(s32 arg0)
marker = reinterpret_cast(ActorMarker *, arg0);
actor1 = marker_getActor(marker);
actorNew = func_8032813C(0x25A, actor1->position, actor1->yaw);
actorNew = spawn_actor_f32(0x25A, actor1->position, actor1->yaw);
// Grab the same pointer again for good measure :^)
actor2 = marker_getActor(marker);
@@ -941,7 +941,7 @@ void func_803882B0(Actor *this)
if (fileProgressFlag_get(FILEPROG_48_FP_WITCH_SWITCH_ADVENT_DOOR_OPEN))
this->pitch = 90.f;
this->unk60 = 0;
this->lifetime_value = 0;
}
if (this->pitch == 90.f || !volatileFlag_get(VOLATILE_FLAG_BB_WITCH_SWITCH_PRESSED_FP))
@@ -952,9 +952,9 @@ void func_803882B0(Actor *this)
this->pitch += 1.1;
if (this->unk60 == 0 && this->pitch > 42.f)
if (this->lifetime_value == 0 && this->pitch > 42.f)
{
this->unk60 = 1.f;
this->lifetime_value = 1.f;
func_8025A6EC(COMUSIC_3D_JIGGY_SPAWN, 0x7FFF);
}
@@ -1298,16 +1298,16 @@ void func_80388FC8(Actor *this)
this->unk1C[1] = this->position_y;
this->position_y -= 500.f;
this->unk60 = 0;
this->lifetime_value = 0;
if (volatileFlag_get(VOLATILE_FLAG_7D_SANDCASTLE_RAISE_PIPES_TO_CC))
{
this->position_y = this->unk1C[1];
this->unk60 = 1.f;
this->lifetime_value = 1.f;
}
}
if (this->unk60)
if (this->lifetime_value)
return;
if (!this->unk16C_4)
@@ -1360,7 +1360,7 @@ void func_80388FC8(Actor *this)
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
}
this->unk60 = 1.f;
this->lifetime_value = 1.f;
}
}
}
@@ -1375,16 +1375,16 @@ void lair_func_80389204(Actor *this)
this->unk1C[1] = this->position_y;
this->position_y -= 280.f;
this->unk60 = 0;
this->lifetime_value = 0;
if (volatileFlag_get(VOLATILE_FLAG_7E_SANDCASTLE_RAISE_PIPE_TO_BRENTILDA))
{
this->position_y = this->unk1C[1];
this->unk60 = 1.f;
this->lifetime_value = 1.f;
}
}
if (this->unk60)
if (this->lifetime_value)
return;
if (!this->unk16C_4)
@@ -1425,7 +1425,7 @@ void lair_func_80389204(Actor *this)
func_802D48B8(this);
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
this->unk60 = 1.f;
this->lifetime_value = 1.f;
}
}
}
@@ -1544,7 +1544,7 @@ void func_803897D4(s32 arg0)
marker1 = reinterpret_cast(ActorMarker *, arg0);
actor1 = marker_getActor(marker1);
actor1 = func_8032813C(0x258, actor1->position, actor1->yaw);
actor1 = spawn_actor_f32(0x258, actor1->position, actor1->yaw);
// Grab the same pointer again for good measure
actor2 = marker_getActor(marker1);
@@ -1710,7 +1710,7 @@ f32 func_80389AAC(Actor *this, f32 a1)
func_8030E878(SFX_82_METAL_BREAK, randf2(0.93f, 1.07f), 32760, this->position, 100, 1350.0f);
this->unk60 = 1;
this->lifetime_value = 1;
}
a1 -= 4.5; // f64
@@ -1728,7 +1728,7 @@ void func_80389D08(Actor *this)
func_802D3CE8(this);
this->unk16C_4 = TRUE;
this->unk60 = 0;
this->lifetime_value = 0;
if (fileProgressFlag_get(0xA5))
{
@@ -1741,12 +1741,12 @@ void func_80389D08(Actor *this)
{
case 1:
{
if (this->unk60)
if (this->lifetime_value)
{
subaddie_set_state_forward(this, 4);
this->unk38_31 = 0;
this->unk60 = 0;
this->lifetime_value = 0;
}
break;
@@ -1779,7 +1779,7 @@ Actor *func_80389E10(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
this = actor_drawFullDepth(marker, gfx, mtx, vtx);
if (marker->unk14_21 && (this->unk60 != 0.0f)) {
if (marker->unk14_21 && (this->lifetime_value != 0.0f)) {
func_8034A174((struct5Bs *) marker->unk44, 5, sp84);
func_8034A174((struct5Bs *) marker->unk44, 6, sp78);

26
src/lair/code_86F0.c
View File

@@ -197,7 +197,7 @@ void func_8038EFD8(Actor *this) {
f32 sp30[3];
f32 sp24[3];
this->unk138_24 = FALSE;
this->is_first_encounter = FALSE;
player_getPosition(sp30);
sp24[0] = this->position[0];
sp24[1] = this->position[1];
@@ -312,7 +312,7 @@ void func_8038F350(Actor *this, s32 next_state){
case 8: //L8038F4AC
if (local->unk4 > 0) {
func_8025A70C(SFX_REMOVE_JIGGY);
this->unk60 = 1.0f;
this->lifetime_value = 1.0f;
temp_s1 = func_8038F0EC(this);
func_8038F1EC(this, temp_s1, 0);
local->unk4--;
@@ -325,7 +325,7 @@ void func_8038F350(Actor *this, s32 next_state){
case 5: //L8038F550
if (local->unk4 < func_8038EB24(this)) {
func_8025A70C(COMUSIC_67_INSERTING_JIGGY);
this->unk60 = 1.0f;
this->lifetime_value = 1.0f;
local->unk4++;
temp_s1 = func_8038F0EC(this);
func_8038F1EC(this, temp_s1, 1);
@@ -345,7 +345,7 @@ void func_8038F350(Actor *this, s32 next_state){
sp4C = item_getCount(ITEM_26_JIGGY_TOTAL);
}
func_8025A70C(COMUSIC_67_INSERTING_JIGGY);
this->unk60 = 1.0f;
this->lifetime_value = 1.0f;
for(phi_s0 = 0; phi_s0 < sp4C; phi_s0++){
local->unk4++;
temp_s1 = func_8038F0EC(this);
@@ -366,7 +366,7 @@ void func_8038F350(Actor *this, s32 next_state){
func_80324DBC(1.0f, 0xFAC, 4, NULL, this->marker, func_8038F0C0, NULL);
}
timedFunc_set_1(2.0f, (GenFunction_1) func_8038EBEC, (s32) this->marker);
this->unk60 = 3.0f;
this->lifetime_value = 3.0f;
break;
}
subaddie_set_state(this, next_state);
@@ -421,7 +421,7 @@ void lair_func_8038F924(Actor *this) {
local->unk0 = 0;
local->unk4 = 0;
local->unk8 = (func_8038ECA8(this->marker)) ? 0xff : 1;
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
for(phi_v1 = 0; phi_v1 < sp64; phi_v1 ++){
local->unk4++;
local->unk0 |= (1 << func_8038F0EC(this));
@@ -473,8 +473,8 @@ void lair_func_8038F924(Actor *this) {
func_8038EDBC(this);
switch(this->state){
case 1://L8038FCD0
if (!this->unk138_24 && (!func_8028F20C() || !func_8028FB48(0x08000000))) {
this->unk138_24 = TRUE;
if (!this->is_first_encounter && (!func_8028F20C() || !func_8028FB48(0x08000000))) {
this->is_first_encounter = TRUE;
}
if (func_80329530(this, 300)) {
if ((this->unkF4_8 == 0xA) && !fileProgressFlag_get(FILEPROG_F6_SEEN_DOOR_OF_GRUNTY_PUZZLE_PODIUM)) {
@@ -486,7 +486,7 @@ void lair_func_8038F924(Actor *this) {
func_8035644C(FILEPROG_A7_NEAR_PUZZLE_PODIUM_TEXT);
}
}
if (func_8038ECA8(this->marker) && this->unk138_24 && !func_8038EB58(this) && (func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT)) {
if (func_8038ECA8(this->marker) && this->is_first_encounter && !func_8038EB58(this) && (func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT)) {
func_8038F350(this, 2);
}
break;
@@ -513,16 +513,16 @@ void lair_func_8038F924(Actor *this) {
case 5: //L8038FF00
case 6: //L8038FF00
case 8: //L8038FF00
if (this->unk60 > 0.0f) {
this->unk60 -= sp68;
if (this->lifetime_value > 0.0f) {
this->lifetime_value -= sp68;
} else {
func_8038F350(this, func_8038EB58(this) ? 7 :4);
}
break;
case 7: //L8038FF50
if (this->unk60 > 0.0f) {
this->unk60 -= sp68;
if (this->lifetime_value > 0.0f) {
this->lifetime_value -= sp68;
} else {
func_8038F350(this, 1);
}

4
src/lair/code_9C40.c
View File

@@ -91,11 +91,11 @@ void func_803902B8(Actor *this) {
sp54 = this->marker->id - 0x16D;
if (!this->initialized) {
marker_setFreeMethod(this->marker, func_80390298);
this->unk138_24 = volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE);
this->is_first_encounter = volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE);
this->initialized = TRUE;
}
_player_getPosition(sp5C);
sp58 = func_80259384(this->position, sp5C, 1750.0f) && !this->unk138_24;
sp58 = func_80259384(this->position, sp5C, 1750.0f) && !this->is_first_encounter;
if (sp58 && !this->unk38_0) {
func_8032BB88(this, 0, 0x1F4);
func_8025A6EC(COMUSIC_79_CHEATO, 0);

2
src/lair/code_A4A0.c
View File

@@ -56,7 +56,7 @@ void func_80390890(ActorMarker *marker, ActorMarker *other_marker) {
func_8030E878(SFX_C2_GRUBLIN_EGH, local->unkC_27*0.1 + 0.8, 32000, this->position, 1250.0f, 2500.0f);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
actor_collisionOff(this);
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
}
void func_80390994(Actor *this) {

34
src/lair/code_AD70.c
View File

@@ -76,8 +76,8 @@ void lair_func_80391254(f32 pos[3], u32 count, enum asset_e sprite)
particleEmitter_setParticleSpawnPositionRange(p, -80, 0, -80, 80, 0, 80);
particleEmitter_setPosition(p, pos);
particleEmitter_setFade(p, 0.6f, 0.7f);
func_802EFB70(p, 3, 3);
func_802EFB84(p, 4, 4);
particleEmitter_setStartingScaleRange(p, 3, 3);
particleEmitter_setFinalScaleRange(p, 4, 4);
particleEmitter_setParticleLifeTimeRange(p, 1, 1);
particleEmitter_emitN(p, count);
}
@@ -106,8 +106,8 @@ void func_8039144C(f32 pos[3], u32 count)
particleEmitter_setAngularVelocityRange(p, 0, 0, 200, 0, 0, 300);
particleEmitter_setFade(p, 0.1f, 0.2f);
particleEmitter_setParticleLifeTimeRange(p, 0.75f, 0.75f);
func_802EFB70(p, 0.5f, 0.5f);
func_802EFB84(p, 0.2f, 0.2f);
particleEmitter_setStartingScaleRange(p, 0.5f, 0.5f);
particleEmitter_setFinalScaleRange(p, 0.2f, 0.2f);
particleEmitter_setParticleAccelerationRange(p, 0, -50, 0, 0, -100, 0);
particleEmitter_emitN(p, count);
}
@@ -121,8 +121,8 @@ void func_803915A4(f32 pos[3], s32 count, f32 scale)
particleEmitter_setStartingFrameRange(p, 2, 8);
particleEmitter_setParticleFramerateRange(p, 8, 8);
particleEmitter_setPosition(p, pos);
func_802EFB70(p, scale * 2.0, scale * 2.0);
func_802EFB84(p, scale * 0.4, scale * 0.4);
particleEmitter_setStartingScaleRange(p, scale * 2.0, scale * 2.0);
particleEmitter_setFinalScaleRange(p, scale * 0.4, scale * 0.4);
particleEmitter_setParticleLifeTimeRange(p, 0.5f, 0.5f);
particleEmitter_emitN(p, count);
}
@@ -136,8 +136,8 @@ void func_803916BC(f32 position[3], s32 cnt){
particleEmitter_setStartingFrameRange(pCtrl, 0, 6);
particleEmitter_setParticleFramerateRange(pCtrl, 5.0f, 8.0f);
particleEmitter_setPosition(pCtrl, position);
func_802EFB70(pCtrl, 2.0f, 2.0f);
func_802EFB84(pCtrl, 4.0f, 4.0f);
particleEmitter_setStartingScaleRange(pCtrl, 2.0f, 2.0f);
particleEmitter_setFinalScaleRange(pCtrl, 4.0f, 4.0f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 1.0f, 1.5f);
particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80394B78);
particleEmitter_emitN(pCtrl, cnt);
@@ -173,7 +173,7 @@ void func_80391810(Actor *this, s32 next_state) {
this->velocity[0] /= local->unk0;
this->velocity[2] /= local->unk0;
local->unk4 *= local->unk0;
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
local->unk8 = this->position[1] * 0.5;
sp38[0] = this->position[0];
sp38[1] = this->position[1];
@@ -190,7 +190,7 @@ void func_80391810(Actor *this, s32 next_state) {
func_8039137C(this->position, 4, 0x712);
func_803917B0(this);
timedFunc_set_0(4.0f, func_803917DC);
this->unk60 = 4.0f;
this->lifetime_value = 4.0f;
break;
case 3:
FUNC_8030E8B4(SFX_96_HOTSAND_EEL_HISS, 0.8f, 25000, this->position, 1500, 3000);
@@ -258,14 +258,14 @@ void func_80391B04(Actor *this) {
func_8039144C(sp34, 1);
}
if (local->unk4 > 0.0) {
this->unk60 += sp44;
if (local->unk4 < this->unk60) {
this->lifetime_value += sp44;
if (local->unk4 < this->lifetime_value) {
func_80391810(this, 2);
}
}
if ((local->unk8 < this->position[1]) && !this->unk138_24) {
if ((local->unk8 < this->position[1]) && !this->is_first_encounter) {
FUNC_8030E8B4(SFX_14E_SOFT_EXPLOSION, 1.0f, 20000, this->position, 1500, 3000);
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
}
break;
case 3:
@@ -273,9 +273,9 @@ void func_80391B04(Actor *this) {
marker_despawn(this->marker);
break;
case 2:
this->unk60 -= sp44;
if (this->unk60 > 0.0f) {
temp_f0_2 = (f32) ((f64) this->unk60 * 0.25);
this->lifetime_value -= sp44;
if (this->lifetime_value > 0.0f) {
temp_f0_2 = (f32) ((f64) this->lifetime_value * 0.25);
D_80394BD4[0] = (s32) ((f32) D_80394BD4[0] * temp_f0_2);
D_80394BD4[1] = (s32) ((f32) D_80394BD4[1] * temp_f0_2);
D_80394BD4[2] = (s32) ((f32) D_80394BD4[2] * temp_f0_2);

8
src/lair/code_BBD0.c
View File

@@ -130,9 +130,9 @@ void func_8039217C(Actor *this) {
}
if ((randf() < 0.1) || mapSpecificFlags_get(5)) {
this->unk38_0 = mapSpecificFlags_get(5);
this->unk60 = randf2(2.0f, 4.0f);
this->lifetime_value = randf2(2.0f, 4.0f);
subaddie_set_state(this, 6U);
func_803920E0(this, SFX_134_FREEZING_SHIVER, 1.1f, 1.2f, 15000, this->unk60);
func_803920E0(this, SFX_134_FREEZING_SHIVER, 1.1f, 1.2f, 15000, this->lifetime_value);
break;
}
if (randf() < 0.1) {
@@ -141,8 +141,8 @@ void func_8039217C(Actor *this) {
break;
case 6: //L803924EC
if (this->unk60 > 0.0f) {
this->unk60 -= time_getDelta();
if (this->lifetime_value > 0.0f) {
this->lifetime_value -= time_getDelta();
break;
}
if (actor_animationIsAt(this, 0.999f) || (mapSpecificFlags_get(5) != this->unk38_0)) {

4
src/lair/code_C1C0.c
View File

@@ -104,8 +104,8 @@ void func_80392918(Actor *this) {
return;
}
func_80326224(this);
if ((this->unk48 > 0.5) && !this->unk138_24) {
this->unk138_24 = TRUE;
if ((this->unk48 > 0.5) && !this->is_first_encounter) {
this->is_first_encounter = TRUE;
ncStaticCamera_setToNode(0x1E);
}
if ((0.999 < this->unk48) && !this->unk38_0) {