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

Seperate and document ba/carriedobj

Browse Source 
PAL: sync ba/carriedobj.
This commit is contained in:
Banjo Kazooie
2024-09-26 20:40:42 -05:00
parent 5fd7e7f3cc
commit 86b22d6d09
10 changed files with 126 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/core2/ba/carriedobj.c Normal file
View File

@@ -0,0 +1,83 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "core2/ba/carry.h"
bool player_setCarryObjectPose(enum actor_e actor_id, Actor **arg1){
ActorMarker *m1;
ActorMarker *m2;
Actor *actor;
m1 = (*arg1)->marker;
m2 = bacarry_get_marker();
if(m2){
actor = marker_getActor(m2);
}
if(m2 && actor->modelCacheIndex != actor_id)
return 0;
baMarker_setCarriedObject(actor_id);
if(!item_empty(carriedobj_actorId2ItemId(actor_id))){
func_8028F66C(BS_INTR_12);
}
*arg1 = marker_getActor(m1);
return 1;
}
void __bscarriedobj_spawnMethod(enum actor_e actor_id){
Actor *actor;
f32 sp20[3];
baModel_getPosition(sp20);
actor = actor_spawnWithYaw_f32(actor_id, sp20, (s32) yaw_get());
actor->unk138_22 = TRUE;
bacarry_set_marker(actor->marker);
bs_setState(BS_3A_CARRY_IDLE);
}
void bacarriedobj_spawn(enum actor_e actor_id){
ActorMarker *marker;
Actor *actor;
marker = bacarry_get_marker();
if(marker){
actor = marker_getActor(marker);
}
if(marker && actor->modelCacheIndex == actor_id){
bacarry_set_marker(marker);
}
else{
__spawnQueue_add_1((GenFunction_1)__bscarriedobj_spawnMethod, baMarker_getCarriedObjectActorId());
}
}
void func_8028DEEC(enum actor_e actor_id, Actor *actor){
f32 sp1C[3];
nodeprop_getPosition(func_80304C38(actor_id, actor), sp1C);
set_throw_target_position(sp1C);
}
void bacarriedobj_inc(enum actor_e actor_id){
item_inc(carriedobj_actorId2ItemId(actor_id));
}
void bacarriedobj_dec(enum actor_e actor_id){
ActorMarker *marker;
Actor* actor;
marker = bacarry_get_marker();
if(marker)
actor = marker_getActor(marker);
if(marker && actor->modelCacheIndex == actor_id){
bacarry_reset_marker();
}
item_dec(carriedobj_actorId2ItemId(actor_id));
}
void bacarriedobj_displayOnHud(enum actor_e actor_id){
item_adjustByDiffWithHud(carriedobj_actorId2ItemId(actor_id), 0);
}

2
src/core2/bs/bPeck.c
View File

@@ -20,7 +20,7 @@ u8 D_8037D376;
u8 D_8037D377;
/* .code */
s32 func_802A6510(void){
s32 bsbpeck_hitboxActive(void){
return D_8037D376;
}

2
src/core2/bs/carry.c
View File

@@ -101,7 +101,7 @@ void bscarry_interrupt(void){
bs_setState(BS_3C_TALK);
break;
case 0x12:
func_8028DE6C(baMarker_getCarriedObjectActorId());
bacarriedobj_spawn(baMarker_getCarriedObjectActorId());
break;
case BS_INTR_16_THROW_CARRIED_OBJ:
if(stateTimer_isDone(STATE_TIMER_1_THROW)){

2
src/core2/bs/stand.c
View File

@@ -324,7 +324,7 @@ void func_802B5350(void){
else if(sp1C == 0x12){//L802B53D0
func_8029A86C(1);
if( bsStoredState_getTransformation() == TRANSFORM_1_BANJO && !miscFlag_isTrue(MISC_FLAG_F) && stateTimer_isDone(STATE_TIMER_0_UNKNOWN)){
func_8028DE6C(baMarker_getCarriedObjectActorId());
bacarriedobj_spawn(baMarker_getCarriedObjectActorId());
func_8029A86C(2);
}
}

2
src/core2/bs/throw.c
View File

@@ -67,7 +67,7 @@ void bsthrow_end(void){
void bsthrow_interrupt(void){
if(bs_getInterruptType() == BS_INTR_12){
if(D_8037D580 == 0){
func_8028DE6C(baMarker_getCarriedObjectActorId());
bacarriedobj_spawn(baMarker_getCarriedObjectActorId());
}
else{
func_8029A86C(1);

83
src/core2/code_6B30.c
View File

@@ -1,7 +1,6 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "core2/ba/carry.h"
#include "core2/ba/physics.h"
extern Actor *actor_spawnWithYaw_f32(enum actor_e, f32[3], s32);
@@ -57,7 +56,7 @@ enum hitbox_e hitbox_getHitboxForActor(ActorMarker *arg0){
case BS_11_BPECK://8028DC50
if(arg0 && !func_8028AED4(marker_getActor(arg0)->position, 60.0f))
return HITBOX_0_NONE;
return __maybe(func_802A6510(),HITBOX_5_PECK);
return __maybe(bsbpeck_hitboxActive(),HITBOX_5_PECK);
break;
case BS_1A_WONDERWING_ENTER:
case BS_1B_WONDERWING_IDLE:
@@ -87,83 +86,3 @@ enum hitbox_e hitbox_getHitboxForActor(ActorMarker *arg0){
break;
}
}
// break ?? //
bool player_setCarryObjectPose(enum actor_e actor_id, Actor **arg1){
ActorMarker *m1;
ActorMarker *m2;
Actor *actor;
m1 = (*arg1)->marker;
m2 = bacarry_get_marker();
if(m2){
actor = marker_getActor(m2);
}
if(m2 && actor->modelCacheIndex != actor_id)
return 0;
baMarker_setCarriedObject(actor_id);
if(!item_empty(carriedobj_actorId2ItemId(actor_id))){
func_8028F66C(BS_INTR_12);
}
*arg1 = marker_getActor(m1);
return 1;
}
void func_8028DE0C(enum actor_e actor_id){
Actor *actor;
f32 sp20[3];
baModel_getPosition(sp20);
actor = actor_spawnWithYaw_f32(actor_id, sp20, (s32) yaw_get());
actor->unk138_22 = TRUE;
bacarry_set_marker(actor->marker);
bs_setState(BS_3A_CARRY_IDLE);
}
void func_8028DE6C(enum actor_e actor_id){
ActorMarker *marker;
Actor *actor;
marker = bacarry_get_marker();
if(marker){
actor = marker_getActor(marker);
}
if(marker && actor->modelCacheIndex == actor_id){
bacarry_set_marker(marker);
}
else{
__spawnQueue_add_1((GenFunction_1)func_8028DE0C, baMarker_getCarriedObjectActorId());
}
}
void func_8028DEEC(enum actor_e actor_id, Actor *actor){
f32 sp1C[3];
nodeprop_getPosition(func_80304C38(actor_id, actor), sp1C);
set_throw_target_position(sp1C);
}
void func_8028DF20(enum actor_e actor_id){
item_inc(carriedobj_actorId2ItemId(actor_id));
}
void func_8028DF48(enum actor_e actor_id){
ActorMarker *marker;
Actor* actor;
marker = bacarry_get_marker();
if(marker)
actor = marker_getActor(marker);
if(marker && actor->modelCacheIndex == actor_id){
bacarry_reset_marker();
}
item_dec(carriedobj_actorId2ItemId(actor_id));
}
void func_8028DFB8(enum actor_e actor_id){
item_adjustByDiffWithHud(carriedobj_actorId2ItemId(actor_id), 0);
}

6
src/core2/code_7060.c
View File

@@ -559,15 +559,15 @@ bool func_8028EFEC(void){
}
void func_8028F010(enum actor_e actor_id){
func_8028DF48(actor_id);
bacarriedobj_dec(actor_id);
}
void func_8028F030(enum actor_e actor_id){
func_8028DF20(actor_id);
bacarriedobj_inc(actor_id);
}
void func_8028F050(enum actor_e actor_id){
func_8028DFB8(actor_id);
bacarriedobj_displayOnHud(actor_id);
}
bool func_8028F070(void){