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

Merge branch 'mr-origin-76'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-28 13:31:37 -05:00
parent 87b9bb398f bb58ae66e9
commit acbedad7fa
31 changed files with 220 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lair/code_9C40.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern bool func_80259384(f32[3], f32[3], f32);
extern bool ml_vec3f_within_distance(f32[3], f32[3], f32);
void func_803902B8(Actor *this);
Actor *func_80390030(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
@@ -95,7 +95,7 @@ void func_803902B8(Actor *this) {
this->initialized = TRUE;
}
_player_getPosition(sp5C);
sp58 = func_80259384(this->position, sp5C, 1750.0f) && !this->has_met_before;
sp58 = ml_vec3f_within_distance(this->position, sp5C, 1750.0f) && !this->has_met_before;
if (sp58 && !this->unk38_0) {
func_8032BB88(this, 0, 0x1F4);
func_8025A6EC(COMUSIC_79_CHEATO, 0);
@@ -105,7 +105,7 @@ void func_803902B8(Actor *this) {
func_8039024C(this);
}
this->unk38_0 = sp58;
sp58 = func_80259384(this->position, sp5C, 400.0f);
sp58 = ml_vec3f_within_distance(this->position, sp5C, 400.0f);
if (fileProgressFlag_get(sp54 + 0xAD)) {
func_8024E55C(0, sp3C);
sp58 &= (sp3C[FACE_BUTTON(BUTTON_B)] == 1) || func_8028EC04();