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

src/core1/ml.c: more consistent function names

Browse Source
This commit is contained in:
mariob92
2024-10-17 16:45:16 +02:00
parent bc6680d618
commit e19c5f75d0
78 changed files with 216 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lair/code_0.c
View File

@@ -683,7 +683,7 @@ void func_80387730(Actor *this) {
}
if (!fileProgressFlag_get(this->unkF4_8 + FILEPROG_39_CCW_OPEN) && ability_isUnlocked(ABILITY_13_1ST_NOTEDOOR)) {
player_getPosition(spAC);
if ((ml_distance_vec3f(spAC, this->position) < 500.0f) && (func_803114C4() != 0xF64)) {
if ((ml_vec3f_distance(spAC, this->position) < 500.0f) && (func_803114C4() != 0xF64)) {
func_802FACA4(0xC);
}
if (itemscore_noteScores_getTotal() >= D_8039347C[this->unkF4_8 - 1]) {
@@ -699,7 +699,7 @@ void func_80387730(Actor *this) {
phi_f20 = 290.0f;
}
sp9C[1] = this->position[1];
if ((ml_distance_vec3f(spAC, sp9C) < phi_f20) || (this->alpha_124_19 != 0xFF)) {
if ((ml_vec3f_distance(spAC, sp9C) < phi_f20) || (this->alpha_124_19 != 0xFF)) {
if (this->alpha_124_19 == 0xFF) {
func_80324CFC(0.0f, COMUSIC_43_ENTER_LEVEL_GLITTER, 32700);
func_80324D2C(2.4f, COMUSIC_43_ENTER_LEVEL_GLITTER);
@@ -740,7 +740,7 @@ void func_80387730(Actor *this) {
}
}
}
} else if ((this->unkF4_8 >= 2) && (ml_distance_vec3f(spAC, this->position) < 290.0f)) {
} else if ((this->unkF4_8 >= 2) && (ml_vec3f_distance(spAC, this->position) < 290.0f)) {
volatileFlag_setAndTriggerDialog_0(VOLATILE_FLAG_B0_NOT_ENOUGH_NOTES);
}
}