diff --git a/src/BGS/ch/mudhut.c b/src/BGS/ch/mudhut.c index 95ff9cd8..d0f5d8d1 100644 --- a/src/BGS/ch/mudhut.c +++ b/src/BGS/ch/mudhut.c @@ -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; } diff --git a/src/BGS/ch/pinkegg.c b/src/BGS/ch/pinkegg.c index 3a47cec1..8da61052 100644 --- a/src/BGS/ch/pinkegg.c +++ b/src/BGS/ch/pinkegg.c @@ -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{ diff --git a/src/BGS/code_9750.c b/src/BGS/code_9750.c index 56f54e3e..d16a805c 100644 --- a/src/BGS/code_9750.c +++ b/src/BGS/code_9750.c @@ -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){ diff --git a/src/MM/ch/hut.c b/src/MM/ch/hut.c index 8a4abb15..c6615639 100644 --- a/src/MM/ch/hut.c +++ b/src/MM/ch/hut.c @@ -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){ diff --git a/src/MM/ch/juju.c b/src/MM/ch/juju.c index 30fbb84b..6865adbe 100644 --- a/src/MM/ch/juju.c +++ b/src/MM/ch/juju.c @@ -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); diff --git a/src/MM/ch/orange.c b/src/MM/ch/orange.c index 17898123..1260a3f4 100644 --- a/src/MM/ch/orange.c +++ b/src/MM/ch/orange.c @@ -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){ diff --git a/src/core2/ba/marker.c b/src/core2/ba/marker.c index 081d7f6a..be331dff 100644 --- a/src/core2/ba/marker.c +++ b/src/core2/ba/marker.c @@ -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 diff --git a/src/core2/ch/badShad.c b/src/core2/ch/badShad.c index 2470d14c..f2cf4eb2 100644 --- a/src/core2/ch/badShad.c +++ b/src/core2/ch/badShad.c @@ -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 diff --git a/src/core2/ch/code_468E0.c b/src/core2/ch/code_468E0.c index 64187280..b1cb9007 100644 --- a/src/core2/ch/code_468E0.c +++ b/src/core2/ch/code_468E0.c @@ -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); diff --git a/src/core2/ch/jigsawdance.c b/src/core2/ch/jigsawdance.c index 3d5a6964..dd18cd9e 100644 --- a/src/core2/ch/jigsawdance.c +++ b/src/core2/ch/jigsawdance.c @@ -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; diff --git a/src/core2/ch/jinjo.c b/src/core2/ch/jinjo.c index 4d4e88be..45fc9eed 100644 --- a/src/core2/ch/jinjo.c +++ b/src/core2/ch/jinjo.c @@ -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; } } diff --git a/src/core2/code_9E370.c b/src/core2/code_9E370.c index b091f414..7cbf85e1 100644 --- a/src/core2/code_9E370.c +++ b/src/core2/code_9E370.c @@ -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){ diff --git a/src/core2/code_A5BC0.c b/src/core2/code_A5BC0.c index d2330292..a786617b 100644 --- a/src/core2/code_A5BC0.c +++ b/src/core2/code_A5BC0.c @@ -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; diff --git a/src/core2/code_CC1E0.c b/src/core2/code_CC1E0.c index 5efeb409..0506f919 100644 --- a/src/core2/code_CC1E0.c +++ b/src/core2/code_CC1E0.c @@ -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);