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

8
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -1574,7 +1574,7 @@ void func_80AEE568(EnRu1* this, PlayState* play) {
if ((this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) && (this->actor.speedXZ == 0.0f) &&
(this->actor.minVelocityY == 0.0f)) {
func_80AEE02C(this);
func_8002F580(&this->actor, play);
Actor_OfferCarry(&this->actor, play);
this->action = 27;
func_80AEADD8(this);
} else if (this->actor.yDistToWater > 0.0f) {
@ -1675,7 +1675,7 @@ void func_80AEE7C4(EnRu1* this, PlayState* play) {
s32 func_80AEEAC8(EnRu1* this, PlayState* play) {
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) {
func_80AEE02C(this);
func_8002F580(&this->actor, play);
Actor_OfferCarry(&this->actor, play);
this->action = 27;
func_80AEADD8(this);
return true;
@ -1693,7 +1693,7 @@ void func_80AEEB24(EnRu1* this, PlayState* play) {
}
void func_80AEEBB4(EnRu1* this, PlayState* play) {
func_8002F580(&this->actor, play);
Actor_OfferCarry(&this->actor, play);
}
void func_80AEEBD4(EnRu1* this, PlayState* play) {
@ -1845,7 +1845,7 @@ void func_80AEF1F0(EnRu1* this, PlayState* play, UNK_TYPE arg2) {
Message_CloseTextbox(play);
SET_INFTABLE(INFTABLE_143);
func_80AED6DC(this, play);
func_8002F580(&this->actor, play);
Actor_OfferCarry(&this->actor, play);
this->action = 27;
func_80AEADD8(this);
}