mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +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_Bb/z_en_bb.c
View file

@ -516,7 +516,7 @@ void EnBb_SetupDamage(EnBb* this) {
if (this->actor.params == ENBB_RED) {
EnBb_KillFlameTrail(this);
}
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 0xC);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 12);
this->timer = 5;
EnBb_SetupAction(this, EnBb_Damage);
}
@ -1083,14 +1083,14 @@ void EnBb_SetupStunned(EnBb* this) {
}
switch (this->dmgEffect) {
case 8:
Actor_SetColorFilter(&this->actor, -0x8000, 0xC8, 0, 0x50);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_GRAY, 200, COLORFILTER_BUFFLAG_OPA, 80);
break;
case 9:
this->fireIceTimer = 0x30;
FALLTHROUGH;
case 15:
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
Actor_SetColorFilter(&this->actor, 0, 0xB4, 0, 0x50);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 180, COLORFILTER_BUFFLAG_OPA, 80);
break;
}
this->actor.bgCheckFlags &= ~BGCHECKFLAG_GROUND;
@ -1205,7 +1205,7 @@ void EnBb_CollisionCheck(EnBb* this, PlayState* play) {
//! the bug in EnBb_Draw below to crash the game.
} else if ((this->actor.params == ENBB_WHITE) &&
((this->action == BB_WHITE) || (this->action == BB_STUNNED))) {
Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 0xC);
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 12);
this->actor.speedXZ = -8.0f;
this->maxSpeed = 0.0f;
this->actor.world.rot.y = this->actor.yawTowardsPlayer;