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

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

6
src/overlays/actors/ovl_En_Am/z_en_am.c
View file

@ -379,7 +379,7 @@ void EnAm_Sleep(EnAm* this, PlayState* play) {
if (this->textureBlend == 0) {
Audio_PlayActorSfx2(&this->dyna.actor, NA_SE_EN_AMOS_WAVE);
Audio_PlayActorSfx2(&this->dyna.actor, NA_SE_EN_AMOS_VOICE);
Actor_SetColorFilter(&this->dyna.actor, 0x4000, 255, 0, 8);
Actor_SetColorFilter(&this->dyna.actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 8);
}
if (this->textureBlend >= 240) {
@ -717,7 +717,7 @@ void EnAm_SetupStunned(EnAm* this, PlayState* play) {
this->dyna.actor.speedXZ = -6.0f;
}
Actor_SetColorFilter(&this->dyna.actor, 0, 120, 0, 100);
Actor_SetColorFilter(&this->dyna.actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 100);
if (this->damageEffect == AM_DMGEFF_ICE) {
this->iceTimer = 48;
@ -881,7 +881,7 @@ void EnAm_Update(Actor* thisx, PlayState* play) {
}
if ((this->deathTimer % 4) == 0) {
Actor_SetColorFilter(&this->dyna.actor, 0x4000, 255, 0, 4);
Actor_SetColorFilter(&this->dyna.actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 4);
}
}