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

13
src/overlays/actors/ovl_En_Rd/z_en_rd.c
View file

@ -729,12 +729,13 @@ void EnRd_SetupStunned(EnRd* this) {
this->stunnedBySunsSong = true;
this->sunsSongStunTimer = 600;
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_LIGHT_ARROW_HIT);
Actor_SetColorFilter(&this->actor, -0x8000, -0x7F38, 0, 0xFF);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, COLORFILTER_INTENSITY_FLAG | 200,
COLORFILTER_BUFFLAG_OPA, 255);
} else if (this->damageEffect == REDEAD_DMGEFF_HOOKSHOT) {
Actor_SetColorFilter(&this->actor, 0, 0xC8, 0, 0x50);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 200, COLORFILTER_BUFFLAG_OPA, 80);
} else {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_LIGHT_ARROW_HIT);
Actor_SetColorFilter(&this->actor, -0x8000, 0xC8, 0, 0x50);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 200, COLORFILTER_BUFFLAG_OPA, 80);
}
EnRd_SetupAction(this, EnRd_Stunned);
@ -744,7 +745,7 @@ void EnRd_Stunned(EnRd* this, PlayState* play) {
if (this->stunnedBySunsSong && (this->sunsSongStunTimer != 0)) {
this->sunsSongStunTimer--;
if (this->sunsSongStunTimer >= 255) {
Actor_SetColorFilter(&this->actor, -0x8000, 0xC8, 0, 0xFF);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 200, COLORFILTER_BUFFLAG_OPA, 255);
}
if (this->sunsSongStunTimer == 0) {
@ -818,10 +819,10 @@ void EnRd_UpdateDamage(EnRd* this, PlayState* play) {
this->sunsSongStunTimer = 0;
if (this->damageEffect == REDEAD_DMGEFF_FIRE_MAGIC) {
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 0x50);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 80);
this->fireTimer = 40;
} else {
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 8);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 8);
}
Actor_ApplyDamage(&this->actor);