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

8
src/TTC/ch/clam.c
View File

@@ -58,9 +58,7 @@ bool __chClam_updateTarget(Actor *this, f32 arg1) {
&& (egg != 0)
&& func_80307258(egg->position, this->unk10_25 - 1, this->unk10_18 - 1) != -1
) {
target_position[0] = egg->position[0];
target_position[1] = egg->position[1];
target_position[2] = egg->position[2];
TUPLE_COPY(target_position, egg->position)
phi_f2 = red_feather_dist;
}
else if(
@@ -69,9 +67,7 @@ bool __chClam_updateTarget(Actor *this, f32 arg1) {
&& (red_feather != 0)
&& func_80307258(red_feather->position, this->unk10_25 - 1, this->unk10_18 - 1) != -1
){
target_position[0] = red_feather->position[0];
target_position[1] = red_feather->position[1];
target_position[2] = red_feather->position[2];
TUPLE_COPY(target_position, red_feather->position)
phi_f2 = egg_dist;
}
else if ((func_80329530(this, 1200) != 0) && (func_803292E0(this) != 0)) {