mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 22:41:14 +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

10
src/overlays/actors/ovl_En_Ta/z_en_ta.c
View file

@ -945,9 +945,9 @@ void EnTa_GiveItemInLonLonHouse(EnTa* this, PlayState* play) {
}
this->stateFlags &= ~TALON_STATE_FLAG_GIVING_MILK_REFILL;
} else if (this->stateFlags & TALON_STATE_FLAG_GIVING_MILK_REFILL) {
func_8002F434(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
} else {
func_8002F434(&this->actor, play, GI_BOTTLE_MILK_FULL, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_BOTTLE_MILK_FULL, 10000.0f, 50.0f);
}
this->stateFlags |= TALON_STATE_FLAG_TRACKING_PLAYER;
}
@ -957,7 +957,7 @@ void EnTa_TalkAfterCuccoGameFirstWon(EnTa* this, PlayState* play) {
Message_CloseTextbox(play);
this->stateFlags &= ~TALON_STATE_FLAG_GIVING_MILK_REFILL;
EnTa_SetupAction(this, EnTa_GiveItemInLonLonHouse, EnTa_AnimRunToEnd);
func_8002F434(&this->actor, play, GI_BOTTLE_MILK_FULL, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_BOTTLE_MILK_FULL, 10000.0f, 50.0f);
}
}
@ -980,7 +980,7 @@ void EnTa_WaitBuyMilkOrPlayCuccoGameResponse(EnTa* this, PlayState* play) {
this->stateFlags |= TALON_STATE_FLAG_GIVING_MILK_REFILL;
EnTa_SetupAction(this, EnTa_GiveItemInLonLonHouse, EnTa_AnimRunToEnd);
Rupees_ChangeBy(-30);
func_8002F434(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
break;
}
break;
@ -1077,7 +1077,7 @@ void EnTa_TalkAfterCuccoGameWon(EnTa* this, PlayState* play) {
Message_CloseTextbox(play);
this->stateFlags |= TALON_STATE_FLAG_GIVING_MILK_REFILL;
EnTa_SetupAction(this, EnTa_GiveItemInLonLonHouse, EnTa_AnimRunToEnd);
func_8002F434(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
} else {
Message_ContinueTextbox(play, 0x208A);
EnTa_SetupAction(this, EnTa_TalkGeneralInLonLonHouse, EnTa_AnimRunToEnd);