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;