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

Merge branch 'master' of https://gitlab.com/banjo.decomp/banjo-kazooie into contrib

Browse Source
This commit is contained in:
Bl00D4NGEL
2024-09-29 03:13:01 +02:00
parent 9b427eb379 65951ae11e
commit ca83d8f36c
50 changed files with 484 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/TTC/ch/blubber.c
View File

@@ -126,7 +126,7 @@ void func_8038771C(Actor *this){
void func_80387774(Actor **this_ptr){
ActorLocal_Blubber *local = (ActorLocal_Blubber *)&(*this_ptr)->local;
func_8028F364(local->throw_target_position, local->throw_target_radius, 100.0f, ACTOR_2A_GOLD_BULLION, this_ptr);
player_setCarryObjectPoseInCylinder(local->throw_target_position, local->throw_target_radius, 100.0f, ACTOR_2A_GOLD_BULLION, this_ptr);
if( func_80329530(*this_ptr, 200)
&& bacarry_get_markerId() == MARKER_37_GOLD_BULLION
&& player_throwCarriedObject()

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

@@ -58,9 +58,7 @@ bool chClam_updateFuncTarget(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_updateFuncTarget(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)) {