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

Merge branch 'mr-origin-96'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-19 23:10:46 -05:00
parent 9443a276c5 0ba0a22549
commit a59e1abddf
291 changed files with 2238 additions and 2204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SM/ch/smbottles.c
View File

@@ -495,7 +495,7 @@ void chSmBottles_update(Actor *this) {
(this->unkF4_8 == 8 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_2)) ||
(this->unkF4_8 == 8 && mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_F))
) {//L80389C50
if (((ml_distance_vec3f(plyr_pos, this->unk1C) < this->actor_specific_1_f) && func_8028F20C()) ||
if (((ml_vec3f_distance(plyr_pos, this->unk1C) < this->actor_specific_1_f) && func_8028F20C()) ||
mapSpecificFlags_get(SM_SPECIFIC_FLAG_10)
) {//L80389C8C
if (func_80329530(this, 0x96)) {

2
src/SM/ch/vegetables.c
View File

@@ -475,7 +475,7 @@ void chVegetablesUpdate(Actor *this) {
ml_vec3f_set_length(this->velocity, 50.0f);
}
if (ml_distance_vec3f(this->position, this->unk1C) < 20.0f) {
if (ml_vec3f_distance(this->position, this->unk1C) < 20.0f) {
func_80387E64(this);
}