mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 23:41:24 +00:00
Code Issues Projects Releases Wiki Activity

Document Actor "OfferTalk" (#1567)

Browse source 
* OfferTalk

* rm comment

* exch to offer in comment

* reword again

* Partial PR Review

* Actor_AcknowledgeTalking

* Actor_TalkOfferAccepted

* PR Review

* rm part of comment

* rm comment
This commit is contained in:
engineer124 2023-11-20 03:11:59 +11:00 • committed by GitHub
parent c11ce9c994
commit 3d1ee33d7b
No account linked to committer's email address
74 changed files with 297 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Js/z_en_js.c
View file

@ -80,7 +80,7 @@ void EnJs_Destroy(Actor* thisx, PlayState* play) {
u8 func_80A88F64(EnJs* this, PlayState* play, u16 textId) {
s16 yawDiff;
if (Actor_ProcessTalkRequest(&this->actor, play)) {
if (Actor_TalkOfferAccepted(&this->actor, play)) {
return 1;
} else {
this->actor.textId = textId;
@ -88,7 +88,7 @@ u8 func_80A88F64(EnJs* this, PlayState* play, u16 textId) {
if (ABS(yawDiff) <= 0x1800 && this->actor.xzDistToPlayer < 100.0f) {
this->unk_284 |= 1;
func_8002F2CC(&this->actor, play, 100.0f);
Actor_OfferTalk(&this->actor, play, 100.0f);
}
return 0;
}
@ -108,10 +108,10 @@ void func_80A89078(EnJs* this, PlayState* play) {
}
void func_80A890C0(EnJs* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, play)) {
if (Actor_TalkOfferAccepted(&this->actor, play)) {
En_Js_SetupAction(this, func_80A89078);
} else {
func_8002F2CC(&this->actor, play, 1000.0f);
Actor_OfferTalk(&this->actor, play, 1000.0f);
}
}