diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index c9621e420..28f37897f 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -292,8 +292,8 @@ void EnCow_Idle(EnCow* this, PlayState* play) { } } - if (this->actor.xzDistToPlayer < 150.0f && - ABS_ALT((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) < 25000) { + if ((this->actor.xzDistToPlayer < 150.0f) && + (ABS_ALT((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) < 0x61A8)) { if (AudioVoice_GetWord() == VOICE_WORD_ID_MILK) { if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_TALKING_TO_COW_WITH_VOICE)) { SET_WEEKEVENTREG(WEEKEVENTREG_TALKING_TO_COW_WITH_VOICE); @@ -323,8 +323,8 @@ void EnCow_DoTail(EnCow* this, PlayState* play) { Animation_GetLastFrame(&gCowTailIdleAnim), ANIMMODE_ONCE, 1.0f); } - if (this->actor.xzDistToPlayer < 150.0f && - ABS_ALT((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) > 25000) { + if ((this->actor.xzDistToPlayer < 150.0f) && + (ABS_ALT((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) > 0x61A8)) { if (!(this->flags & EN_COW_FLAG_PLAYER_HAS_APPROACHED)) { this->flags |= EN_COW_FLAG_PLAYER_HAS_APPROACHED; if (this->skelAnime.animation == &gCowTailIdleAnim) { @@ -361,8 +361,8 @@ void EnCow_Update(Actor* thisx, PlayState* play2) { this->actionFunc(this, play); - if (this->actor.xzDistToPlayer < 150.0f && - ABS_ALT(Math_Vec3f_Yaw(&thisx->world.pos, &player->actor.world.pos)) < 0xC000) { + if ((this->actor.xzDistToPlayer < 150.0f) && + (ABS_ALT(Math_Vec3f_Yaw(&thisx->world.pos, &player->actor.world.pos)) < 0xC000)) { targetX = Math_Vec3f_Pitch(&thisx->focus.pos, &player->actor.focus.pos); targetY = Math_Vec3f_Yaw(&thisx->focus.pos, &player->actor.focus.pos) - this->actor.shape.rot.y; diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index 125f92ad3..846b90a2f 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -925,7 +925,7 @@ void func_80999BC8(Actor* thisx, PlayState* play2) { EnGs* this = THIS; s32 pad; - if (this->actor.isTargeted && AudioVoice_GetWord() == VOICE_WORD_ID_HOURS) { + if (this->actor.isTargeted && (AudioVoice_GetWord() == VOICE_WORD_ID_HOURS)) { this->unk_19D = 0; this->unk_19A |= 1; func_80999AC0(this);