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

2
src/CC/code_0.c
View File

@@ -68,7 +68,7 @@ void func_803864D4(Actor *this){
if(!CC_func_80388CA0()){
local->unk4 = 2.0f;
}
else if(60.0f < gu_sqrtf(sp30[0]*sp30[0] + sp30[1]*sp30[1] + sp30[2]*sp30[2])){
else if(60.0f < LENGTH_VEC3F(sp30)){
local->unk4 = 0.05f;
}
else{

2
src/CC/code_13C0.c
View File

@@ -136,7 +136,7 @@ void CC_func_80387A40(Struct_CC_13C0_1* arg0, Struct68s* arg1, f32 arg2) {
sp50[2] -= sp38[2];
sp28 = ((sp50[0]*sp44[0] + sp50[1]*sp44[1] + sp50[2]*sp44[2]) >= 0.0f) ? 1 : -1;
if (sp28 == -arg0->unk8) {
if (gu_sqrtf(sp50[0]*sp50[0] + sp50[1]*sp50[1] + sp50[2] * sp50[2]) < (func_80351830(arg1) * 250.0f)) {
if (LENGTH_VEC3F(sp50) < (func_80351830(arg1) * 250.0f)) {
func_8038803C(arg0->unk0);
}
}