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

z_actor documentation pass (#1445)

Browse source 
* Actor_Offer* and Actor_SetClosestSecretDistance

* color filter stuff

* KillAll

* format

* comment

* Update src/code/z_actor.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* review

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* format

* COLORFILTER_INTENSITY_FLAG

* Remove -

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* yeet COLORFILTER_GET_XLUFLAG

* bug

* frug

* Undo Actor_KillAllFromUnloadedRooms

* update Actor_OfferGetItem comment

* Update Actor_OfferGetItem description

* diving

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
Anghelo Carvajal 2022-12-12 23:23:14 -03:00 • committed by GitHub
parent 83163f4d4b
commit c420885513
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
120 changed files with 385 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
View file

@ -497,7 +497,7 @@ void EnDodongo_SwallowBomb(EnDodongo* this, PlayState* play) {
&this->bombSmokeEnvColor, 400, 10, 10);
}
Audio_PlayActorSfx2(&this->actor, NA_SE_IT_BOMB_EXPLOSION);
Actor_SetColorFilter(&this->actor, 0x4000, 0x78, 0, 8);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 120, COLORFILTER_BUFFLAG_OPA, 8);
}
}
}
@ -676,7 +676,7 @@ void EnDodongo_Death(EnDodongo* this, PlayState* play) {
EnDodongo_SpawnBombSmoke(this, play);
}
} else if (this->actor.colorFilterTimer == 0) {
Actor_SetColorFilter(&this->actor, 0x4000, 0x78, 0, 4);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 120, COLORFILTER_BUFFLAG_OPA, 4);
}
if (SkelAnime_Update(&this->skelAnime)) {
if (this->timer == 0) {
@ -721,12 +721,12 @@ void EnDodongo_CollisionCheck(EnDodongo* this, PlayState* play) {
this->damageEffect = this->actor.colChkInfo.damageEffect;
if ((this->actor.colChkInfo.damageEffect == 1) || (this->actor.colChkInfo.damageEffect == 0xF)) {
if (this->actionState != DODONGO_STUNNED) {
Actor_SetColorFilter(&this->actor, 0, 0x78, 0, 0x50);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80);
Actor_ApplyDamage(&this->actor);
EnDodongo_SetupStunned(this);
}
} else {
Actor_SetColorFilter(&this->actor, 0x4000, 0x78, 0, 8);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 120, COLORFILTER_BUFFLAG_OPA, 8);
if (Actor_ApplyDamage(&this->actor) == 0) {
EnDodongo_SetupDeath(this, play);
} else {