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

Merge branch 'mr-origin-72'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-13 20:43:08 -05:00
parent 351f4e9fea 6307691657
commit 0d83006835
14 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BGS/ch/mudhut.c
View File

@@ -74,7 +74,7 @@ void chmudhut_update(Actor *this){
if(func_80334904() == 2){
if(!this->initialized){
this->marker->collidable = 0;
this->marker->collidable = FALSE;
this->initialized = TRUE;
}

6
src/BGS/ch/pinkegg.c
View File

@@ -63,7 +63,7 @@ void chpinkegg_spawn_next(ActorMarker * arg0, u32 arg1){
((ActorLocal_PinkEgg *) &unkActor->local)->unk0 = arg1 + 1;
((ActorLocal_PinkEgg *) &unkActor->local)->unk4 = 5;
unkActor->marker->collidable = 0;
unkActor->marker->collidable = FALSE;
}
@@ -87,7 +87,7 @@ void chpinkegg_collision(ActorMarker *this, ActorMarker *other_marker){
sfxsource_play(SFX_AA_BGS_EGG_BREAKING_1, 28000);
subaddie_set_state(thisActor, 3);
actor_playAnimationOnce(thisActor);
this->collidable = 0;
this->collidable = FALSE;
thisActor->unk124_6 = 0;
if(D_803906C4[(tmp = (ActorLocal_PinkEgg *) &thisActor->local)->unk0] != 0){
__spawnQueue_add_2(chpinkegg_spawn_next, thisActor->marker, tmp->unk0);
@@ -107,7 +107,7 @@ void chpinkegg_update(Actor *this){
switch(this->state){
case 1:
if(!((ActorLocal_PinkEgg *) &this->local)->unk4){
this->marker->collidable = 1;
this->marker->collidable = TRUE;
subaddie_set_state(this,2);
}else{

2
src/BGS/code_9750.c
View File

@@ -74,7 +74,7 @@ void BGS_func_8038FB84(ActorMarker *this, ActorMarker *other_marker){
FUNC_8030E8B4( SFX_87_TANKTUP_OOOHW, 1.0f, 32750, thisActor->position, 1000, 3000);
timedFunc_set_2(0.65f, (GenFunction_2) func_8038FB40, (s32) this, (s32) other_marker);
func_8038F51C(thisActor);
this->collidable = 0;
this->collidable = FALSE;
}
void func_8038FBF8(Actor *this){

2
src/MM/ch/hut.c
View File

@@ -73,7 +73,7 @@ void chhut_update(Actor *this){
return;
if(!this->initialized){
this->marker->collidable = 0;
this->marker->collidable = FALSE;
this->initialized = TRUE;
}
switch(this->state){

2
src/MM/ch/juju.c
View File

@@ -71,7 +71,7 @@ void func_803890A0(ActorMarker *marker, s32 arg1){
position[2] = actorPtr->position_z;
for(i = 0; i < 4; i++){
jujuPtr = spawn_actor_f32(ACTOR_59_JUJU, actorPtr->position, actorPtr->yaw);
jujuPtr->marker->collidable = 0;
jujuPtr->marker->collidable = FALSE;
actorPtr = marker_getActor(marker);
func_80388DE8(actorPtr, i, jujuPtr);

2
src/MM/ch/orange.c
View File

@@ -73,7 +73,7 @@ void MM_func_80387FF4(Actor * this){
break;
case ORANGE_LANDED_STATE:
if(this->lifetime_value < 324.0){
this->marker->collidable = 0;
this->marker->collidable = FALSE;
}
this->lifetime_value -= 4.0;
if(this->lifetime_value < 4.0){

4
src/core2/ba/marker.c
View File

@@ -937,11 +937,11 @@ ActorMarker *baMarker_get(void){ //baMarker_get
}
void baMarker_collisionOff(void){ //player_collisionOff
playerMarker->collidable = 0;
playerMarker->collidable = FALSE;
}
void baMarker_collisionOn(void){ //player_collisionOn
playerMarker->collidable = 1;
playerMarker->collidable = TRUE;
}
bool baMarker_isCollidable(void){ //player_isCollidable

2
src/core2/ch/badShad.c
View File

@@ -27,7 +27,7 @@ void chBadShad_update(Actor *this){
s32 iVar1;
if(!this->initialized){
this->initialized = TRUE;
this->marker->collidable = 0;
this->marker->collidable = FALSE;
}
if(!this->despawn_flag && this->unk1C_x < (f32)(globalTimer_getTime() - 1) ){
//unlink

2
src/core2/ch/code_468E0.c
View File

@@ -35,7 +35,7 @@ void func_802CD8C0(Actor *this){
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->marker->unk2C_1 = 1;
this->marker->collidable = 0;
this->marker->collidable = FALSE;
*(s32*)this->unkBC = 0; //TODO Make struct
if(volatileFlag_get(VOLATILE_FLAG_1) || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){
marker_despawn(this->marker);

2
src/core2/ch/jigsawdance.c
View File

@@ -41,7 +41,7 @@ Actor *__chJigsawDance_draw(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3
void __chJigsawDance_update(Actor * this){
AnimCtrl *plyrMvmt;
this->marker->collidable = 0;
this->marker->collidable = FALSE;
switch(this->state){
case 1:
break;

2
src/core2/ch/jinjo.c
View File

@@ -53,7 +53,7 @@ void __chJinjo_802CDBA8(ActorMarker *this, ActorMarker *other){
if(item_adjustByDiffWithHud(ITEM_12_JINJOS, 1 << (this->id + 6) ) == 0x1f)
localPtr->unk4 = 1;
actor_loopAnimation(actorPtr);
this->collidable = 0;
this->collidable = FALSE;
}
}

4
src/core2/code_9E370.c
View File

@@ -1974,11 +1974,11 @@ void func_8032AA58(Actor *this, f32 arg1){
}
void actor_collisionOff(Actor* this){
this->marker->collidable = 0;
this->marker->collidable = FALSE;
}
void actor_collisionOn(Actor* this){
this->marker->collidable = 1;
this->marker->collidable = TRUE;
}
void func_8032AA9C(void){

2
src/core2/code_A5BC0.c
View File

@@ -1158,7 +1158,7 @@ ActorMarker * marker_init(s32 *pos, MarkerDrawFunc draw_func, int arg2, int mark
marker->roll = 0;
marker->unk2C_2 = 0;
marker->unk2C_1 = 0;
marker->collidable = 1;
marker->collidable = TRUE;
marker->unk3E_0 = 0;
marker->unk40_22 = 0;
marker->unk40_19 = 0;

2
src/core2/code_CC1E0.c
View File

@@ -168,7 +168,7 @@ void fxegg_head_spawn(void){
f32 tmp_f8 = 20.0f;
marker->unk2C_1 = 1;
marker->collidable = 1;
marker->collidable = TRUE;
func_803300B8(marker, fxegg_collide);
func_8033EA40(0, 20.0f);
func_8033EA40(1, 0.0f);