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

Renaming LMonkey

Browse Source
This commit is contained in:
Nabnut
2024-09-19 12:32:08 +02:00
parent 6cf31d1df0
commit 3127ba4a68
13 changed files with 123 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core2/code_7060.c
View File

@@ -660,9 +660,9 @@ bool func_8028F2FC(void){
}
//sets carry actor if player is within a horizantal radius around a point
bool func_8028F31C(f32 position[3], f32 radius, enum actor_e actor_id, Actor **arg3){
if(player_isInHorizontalRadius(position, radius)){
return func_8028DD60(actor_id, arg3);
bool player_setCarryObjectPoseInHorizontalRadius(f32 position[3], f32 radius, enum actor_e actor_id, Actor **arg3){
if (player_isInHorizontalRadius(position, radius)) {
return player_setCarryObjectPose(actor_id, arg3);
}
return FALSE;
}
@@ -670,7 +670,7 @@ bool func_8028F31C(f32 position[3], f32 radius, enum actor_e actor_id, Actor **a
//sets carry actor if player is within a cylinder around a point
bool func_8028F364(f32 position[3], f32 radius, f32 vert_range, enum actor_e actor_id, Actor **arg4) {
if (player_isInVerticalRange(position, vert_range)) {
return func_8028F31C(position, radius, actor_id, arg4);
return player_setCarryObjectPoseInHorizontalRadius(position, radius, actor_id, arg4);
}
return FALSE;
}
@@ -933,9 +933,11 @@ bool func_8028FBD4(f32 arg0[3]) {
return bs_checkInterrupt(BS_INTR_8) == 2;
}
bool func_8028FC34(void){
if (func_8028E86C() && bscarry_inSet(bs_getState()))
bool player_throwCarriedObject(void){
if (func_8028E86C() && bscarry_inSet(bs_getState())) {
return bs_checkInterrupt(BS_INTR_16_THROW_CARRIED_OBJ) == 2;
}
return FALSE;
}