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/lair/ch/brentilda.c
View File

@@ -2,8 +2,6 @@
#include "functions.h"
#include "variables.h"
extern f32 ml_vec3f_horizontal_distance_zero_likely(f32[3], f32[3]);
typedef struct {
s32 unk0;
} ActorLocal_lair_5640;

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);
}
}

2
src/lair/code_5ED0.c
View File

@@ -67,8 +67,6 @@ extern s32 ability_getAllLearned(void); // get unlocked moves bitfield
extern s32 item_getCount(s32); // item count get
extern void item_adjustByDiffWithoutHud(s32, s32); // item count set
extern void func_80250530(s32, u16, f32);
extern void func_8025A55C(s32, s32, s32);
extern void func_80324CFC(f32, s16, s16);

3
src/lair/code_86F0.c
View File

@@ -2,7 +2,6 @@
#include "functions.h"
#include "variables.h"
extern f32 ml_distanceSquared_vec3f(f32[3], f32[3]);
extern void func_8028F3D8(f32[3], f32, void(*)(ActorMarker *), ActorMarker *);
extern void func_80324CFC(f32, enum comusic_e, s32);
extern void rand_seed(s32);
@@ -203,7 +202,7 @@ void func_8038EFD8(Actor *this) {
sp24[1] = this->position[1];
sp24[2] = this->position[2];
sp24[1] += 50.0f;
func_8028F3D8(sp24, ml_distance_vec3f(sp30, sp24) / 150.0, func_8038EF58, this->marker);
func_8028F3D8(sp24, ml_vec3f_distance(sp30, sp24) / 150.0, func_8038EF58, this->marker);
}
void func_8038F078(ActorMarker *marker, enum asset_e text_id, s32 arg2){

2
src/lair/code_9C40.c
View File

@@ -2,8 +2,6 @@
#include "functions.h"
#include "variables.h"
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);

2
src/lair/code_A810.c
View File

@@ -111,7 +111,7 @@ void func_80390E28(Actor *this) {
}
this->unk10_12 = 0;
for(i = 0; (i < D_80395460) && (this->unk10_12 < 4); i++){
temp_f0 = ml_distance_vec3f(this->position, D_80395370[i]);
temp_f0 = ml_vec3f_distance(this->position, D_80395370[i]);
if ((temp_f0 > 400.0f) && (temp_f0 < 1200.0f)) {
local->unk0[this->unk10_12][0] = D_80395370[i][0];
local->unk0[this->unk10_12][1] = D_80395370[i][1];

2
src/lair/code_C6C0.c
View File

@@ -45,7 +45,7 @@ void func_80392B6C(Actor *this) {
}
}
if (mapSpecificFlags_get(7) != 0) {
sp28 = ml_distance_vec3f(this->position, this->unk1C) / 350.0;
sp28 = ml_vec3f_distance(this->position, this->unk1C) / 350.0;
comusic_playTrack(COMUSIC_A9_TOOTY);
mapSpecificFlags_set(7, 0);
mapSpecificFlags_set(9, 1);