diff --git a/src/BGS/ch/bigalligator.c b/src/BGS/ch/bigalligator.c index 548614af..e50ff1f2 100644 --- a/src/BGS/ch/bigalligator.c +++ b/src/BGS/ch/bigalligator.c @@ -20,5 +20,5 @@ void func_8038FCB0(Actor *this){ return; this->marker->propPtr->unk8_3 = 1; actor_collisionOff(this); - this->initialized = 1; + this->initialized = TRUE; } diff --git a/src/BGS/ch/mudhut.c b/src/BGS/ch/mudhut.c index 8b960673..76d09be0 100644 --- a/src/BGS/ch/mudhut.c +++ b/src/BGS/ch/mudhut.c @@ -74,8 +74,8 @@ void chmudhut_update(Actor *this){ if(func_80334904() == 2){ if(!this->initialized){ - this->marker->collidable = 0; - this->initialized = 1; + this->marker->collidable = FALSE; + this->initialized = TRUE; } switch(this->state){ diff --git a/src/BGS/ch/pinkegg.c b/src/BGS/ch/pinkegg.c index 8f1193d9..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); @@ -101,13 +101,13 @@ void chpinkegg_update(Actor *this){ if(!this->initialized){ this->marker->propPtr->unk8_3 = 1; marker_setCollisionScripts(this->marker, NULL, NULL, chpinkegg_collision); - this->initialized = 1; + this->initialized = TRUE; } 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/ch/tanktup.c b/src/BGS/ch/tanktup.c index 005ea00c..dcbdd133 100644 --- a/src/BGS/ch/tanktup.c +++ b/src/BGS/ch/tanktup.c @@ -112,7 +112,7 @@ void func_8038F6A4(Actor *this) nodeprop_getPosition(temp_v0, local->unk18); } this->unk138_24 = 0; - this->initialized = 1; + this->initialized = TRUE; } if (!this->unk16C_4) { diff --git a/src/BGS/code_9750.c b/src/BGS/code_9750.c index 5c38e2d3..d16a805c 100644 --- a/src/BGS/code_9750.c +++ b/src/BGS/code_9750.c @@ -74,12 +74,12 @@ 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){ if(!this->initialized){ - this->initialized = 1; + this->initialized = TRUE; this->marker->propPtr->unk8_3 = 1; marker_setCollisionScripts(this->marker, NULL, NULL, BGS_func_8038FB84); } diff --git a/src/MM/ch/chimpystump.c b/src/MM/ch/chimpystump.c index d0f9c536..60efb6e8 100644 --- a/src/MM/ch/chimpystump.c +++ b/src/MM/ch/chimpystump.c @@ -35,7 +35,7 @@ void _chchimpystump_80386CA0(Actor *this){ void chchimpystump_update(Actor *this){ if(!this->initialized){ actor_collisionOff(this); - this->initialized = 1; + this->initialized = TRUE; this->unk28 = this->position_y; this->position_y -= 134.0f; this->marker->propPtr->unk8_3 = 1; diff --git a/src/MM/ch/conga.c b/src/MM/ch/conga.c index c7ad0e01..6b44aaff 100644 --- a/src/MM/ch/conga.c +++ b/src/MM/ch/conga.c @@ -222,7 +222,7 @@ void func_803876D0(Actor *this){ if(!this->initialized){ ((ActorLocal_Conga *)&this->local)->unkC = 1; this->unk16C_0 = 1; - this->initialized = 1; + this->initialized = TRUE; this->velocity_x = 0.0f; this->unk28 = 0.0f; node_prop = func_80304C38(0x150, this); diff --git a/src/MM/ch/hut.c b/src/MM/ch/hut.c index a93748ab..fad21843 100644 --- a/src/MM/ch/hut.c +++ b/src/MM/ch/hut.c @@ -73,8 +73,8 @@ void chhut_update(Actor *this){ return; if(!this->initialized){ - this->marker->collidable = 0; - this->initialized = 1; + this->marker->collidable = FALSE; + this->initialized = TRUE; } switch(this->state){ case HUT_STATE_INTACT: diff --git a/src/MM/ch/juju.c b/src/MM/ch/juju.c index c953c75a..f1c3999b 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 = func_8032813C(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/jujuhitbox.c b/src/MM/ch/jujuhitbox.c index 0a55b44a..53ddb7af 100644 --- a/src/MM/ch/jujuhitbox.c +++ b/src/MM/ch/jujuhitbox.c @@ -120,7 +120,7 @@ void func_80388E20(Actor *this){ jujuCtlPtr = (ActorLocal_JujuHitbox *)&this->local; if(!this->initialized){ - this->initialized = 1; + this->initialized = TRUE; this->unk138_24 = 0; jujuCtlPtr->unk18 = 0.5f; } diff --git a/src/MM/ch/orange.c b/src/MM/ch/orange.c index 66e35e57..24deb071 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->unk60 < 324.0){ - this->marker->collidable = 0; + this->marker->collidable = FALSE; } this->unk60 -= 4.0; if(this->unk60 < 4.0){ diff --git a/src/MM/ch/orangepad.c b/src/MM/ch/orangepad.c index e3e0a585..ad357211 100644 --- a/src/MM/ch/orangepad.c +++ b/src/MM/ch/orangepad.c @@ -104,7 +104,7 @@ void func_80386768(Actor * this){ if(!this->initialized){ this->marker->propPtr->unk8_3 = 1; actor_collisionOff(this); - this->initialized = 1; + this->initialized = TRUE; }//L803867B0 if(!this->unk16C_4){ diff --git a/src/SM/ch/attacktutorial.c b/src/SM/ch/attacktutorial.c index 08ca4e08..d6f4b6a6 100644 --- a/src/SM/ch/attacktutorial.c +++ b/src/SM/ch/attacktutorial.c @@ -124,7 +124,7 @@ void chAttackTutorial_update(Actor *this){ this->unk1C_z = this->position_z;} } this->unk10_12 = (ability_isUnlocked(ABILITY_C_ROLL))? 2 : (ability_isUnlocked(ABILITY_4_CLAW_SWIPE)? 1:0); - this->initialized = 1; + this->initialized = TRUE; } switch(this->state){ diff --git a/src/SM/ch/vegetables.c b/src/SM/ch/vegetables.c index 3d2be419..902dae15 100644 --- a/src/SM/ch/vegetables.c +++ b/src/SM/ch/vegetables.c @@ -323,7 +323,7 @@ void func_80388080(Actor *this){ this->unk138_24 = 1; this->unk138_23 = 0; this->unk38_0 = 0; - this->initialized = 1; + this->initialized = TRUE; this->scale = 0.5; }//L80388278 switch (this->state) diff --git a/src/SM/code_2990.c b/src/SM/code_2990.c index 352b315a..9cb3c57e 100644 --- a/src/SM/code_2990.c +++ b/src/SM/code_2990.c @@ -406,7 +406,7 @@ void chsmmole_Update(Actor * this){ if(!this->initialized){ this->marker->propPtr->unk8_3 = 0; actor_collisionOff(this); - this->initialized = 1; + this->initialized = TRUE; marker_setFreeMethod(this->marker, func_80389984); if(this->unkF4_8 == 1 || this->unkF4_8 == 8){//L80389A30 sp40 = func_80304C38(0x349, this); diff --git a/src/SM/code_4070.c b/src/SM/code_4070.c index d3a1cdb5..e81fe197 100644 --- a/src/SM/code_4070.c +++ b/src/SM/code_4070.c @@ -74,7 +74,7 @@ void SM_func_8038A5D8(Actor *this){ this->unk1C_y = this->position_y; this->unk1C_z = this->position_z; }//L8038A644 - this->initialized = 1; + this->initialized = TRUE; }//L8038A650 func_8024E55C(0, sp44); diff --git a/src/core2/ba/marker.c b/src/core2/ba/marker.c index eb6baa5d..20520dd0 100644 --- a/src/core2/ba/marker.c +++ b/src/core2/ba/marker.c @@ -938,11 +938,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 bbe3b848..7b222f7c 100644 --- a/src/core2/ch/badShad.c +++ b/src/core2/ch/badShad.c @@ -24,8 +24,8 @@ f32 D_8037DE20[3]; void chBadShad_update(Actor *this){ s32 iVar1; if(!this->initialized){ - this->initialized = 1; - this->marker->collidable = 0; + this->initialized = TRUE; + 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 8f5a7fed..151cffe2 100644 --- a/src/core2/ch/code_468E0.c +++ b/src/core2/ch/code_468E0.c @@ -34,7 +34,7 @@ void func_802CD8C0(Actor *this){ if(!this->unk16C_4){ this->unk16C_4 = 1; 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 26aee375..dd18cd9e 100644 --- a/src/core2/ch/jigsawdance.c +++ b/src/core2/ch/jigsawdance.c @@ -30,7 +30,7 @@ Actor *__chJigsawDance_draw(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3 Actor *thisActor = marker_getActor(this); if(!thisActor->initialized){ - thisActor->initialized = 1; + thisActor->initialized = TRUE; return thisActor; } else{ @@ -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 1ede67d8..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; } } @@ -104,7 +104,7 @@ void chJinjo_update(Actor * this){ local = &this->jinjo; if(!this->initialized){ - this->initialized = 1; + this->initialized = TRUE; local->unk0 = 1; local->unk4 = 0; local->unk8 = (this->position_y < func_80309B24(this->position)); diff --git a/src/core2/ch/overlaypressstart.c b/src/core2/ch/overlaypressstart.c index 68722cc3..e1386f64 100644 --- a/src/core2/ch/overlaypressstart.c +++ b/src/core2/ch/overlaypressstart.c @@ -69,7 +69,7 @@ void chOverlayPressStart_func_802DCC78(ActorMarker *this){ void chOverlayPressStart_update(Actor *this){ if(!this->initialized){ - this->initialized = 1; + this->initialized = TRUE; this->depth_mode = MODEL_RENDER_DEPTH_NONE; actor_collisionOff(this); subaddie_set_state_with_direction(this, 1, 0.0f, 1); diff --git a/src/core2/code_53A10.c b/src/core2/code_53A10.c index 5d2d3b0f..0a31b9f5 100644 --- a/src/core2/code_53A10.c +++ b/src/core2/code_53A10.c @@ -59,7 +59,7 @@ void func_802DAA14(Actor *this){ if(!this->initialized){ this->unk60 = 0.5f; - this->initialized = 1; + this->initialized = TRUE; } if(0.0f < this->unk60){ diff --git a/src/core2/code_9E370.c b/src/core2/code_9E370.c index 36e015a2..07bc1aee 100644 --- a/src/core2/code_9E370.c +++ b/src/core2/code_9E370.c @@ -1971,11 +1971,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 26ce0b6f..5c0d660d 100644 --- a/src/core2/code_A5BC0.c +++ b/src/core2/code_A5BC0.c @@ -1155,7 +1155,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);