izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

small cleanup

Browse Source
This commit is contained in:
engineer124
2023-06-13 12:02:48 +10:00
parent db5335c42a
commit 6ef3cefb9f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Cow/z_en_cow.c
+6 -6
View File
@@ -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;
src/overlays/actors/ovl_En_Gs/z_en_gs.c
+1 -1
View File
@@ -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);