mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 14:01:15 +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_Test/z_en_test.c
View file

@ -1211,7 +1211,7 @@ void func_80862154(EnTest* this) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_STAL_DAMAGE);
this->unk_7C8 = 8;
this->actor.speedXZ = -2.0f;
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 8);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 8);
EnTest_SetupAction(this, func_808621D4);
}
@ -1255,7 +1255,7 @@ void func_80862398(EnTest* this) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_STAL_DAMAGE);
this->unk_7C8 = 9;
this->actor.speedXZ = -2.0f;
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 8);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 8);
EnTest_SetupAction(this, func_80862418);
}
@ -1298,9 +1298,9 @@ void EnTest_SetupStunned(EnTest* this) {
this->actor.speedXZ = -4.0f;
if (this->lastDamageEffect == STALFOS_DMGEFF_LIGHT) {
Actor_SetColorFilter(&this->actor, -0x8000, 0x78, 0, 0x50);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 120, COLORFILTER_BUFFLAG_OPA, 80);
} else {
Actor_SetColorFilter(&this->actor, 0, 0x78, 0, 0x50);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 80);
if (this->lastDamageEffect == STALFOS_DMGEFF_FREEZE) {
this->iceTimer = 36;