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

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);