mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +00:00
Code Issues Projects Releases Wiki Activity

Target Mode Enum [Target Docs 7/?] (#2133)

Browse source 
* TargetMode Enum

* format

* add default comment

* bss

* bss 2

* fix bss 3
This commit is contained in:
fig02 2024-09-04 23:46:03 -04:00 • committed by GitHub
parent 6051251c92
commit dbb059c6a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
112 changed files with 154 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
View file

@ -138,21 +138,21 @@ void EnGe2_Init(Actor* thisx, PlayState* play) {
EnGe2_ChangeAction(this, GE2_ACTION_WALK);
if (EnGe2_CheckCarpentersFreed()) {
this->actor.update = EnGe2_UpdateFriendly;
this->actor.targetMode = 6;
this->actor.targetMode = TARGET_MODE_6;
}
break;
case GE2_TYPE_STATIONARY:
EnGe2_ChangeAction(this, GE2_ACTION_STAND);
if (EnGe2_CheckCarpentersFreed()) {
this->actor.update = EnGe2_UpdateFriendly;
this->actor.targetMode = 6;
this->actor.targetMode = TARGET_MODE_6;
}
break;
case GE2_TYPE_GERUDO_CARD_GIVER:
EnGe2_ChangeAction(this, GE2_ACTION_WAITLOOKATPLAYER);
this->actor.update = EnGe2_UpdateAfterTalk;
this->actionFunc = EnGe2_ForceTalk;
this->actor.targetMode = 6;
this->actor.targetMode = TARGET_MODE_6;
break;
default:
ASSERT(0, "0", "../z_en_ge2.c", 418);
@ -595,7 +595,7 @@ void EnGe2_Update(Actor* thisx, PlayState* play) {
if (EnGe2_CheckCarpentersFreed() && !(this->stateFlags & GE2_STATE_KO)) {
this->actor.update = EnGe2_UpdateFriendly;
this->actor.targetMode = 6;
this->actor.targetMode = TARGET_MODE_6;
}
}
@ -621,7 +621,7 @@ void EnGe2_UpdateStunned(Actor* thisx, PlayState* play2) {
if (EnGe2_CheckCarpentersFreed()) {
this->actor.update = EnGe2_UpdateFriendly;
this->actor.targetMode = 6;
this->actor.targetMode = TARGET_MODE_6;
this->actor.colorFilterTimer = 0;
} else if (this->actor.colorFilterTimer == 0) {
this->actor.update = EnGe2_Update;