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{