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/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){