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

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 known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
74 changed files with 297 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Mm/z_en_mm.c
View file

@ -288,7 +288,7 @@ void func_80AADCD0(EnMm* this, PlayState* play) {
} else if (this->unk_1E0 == 1) {
this->unk_1E0 = func_80AADAA0(this, play);
} else {
if (Actor_ProcessTalkRequest(&this->actor, play)) {
if (Actor_TalkOfferAccepted(&this->actor, play)) {
this->unk_1E0 = 1;
if (this->curAnimIndex != 5) {
@ -302,7 +302,7 @@ void func_80AADCD0(EnMm* this, PlayState* play) {
yawDiff = ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y));
if ((sp26 >= 0) && (sp26 <= 0x140) && (sp24 >= 0) && (sp24 <= 0xF0) && (yawDiff <= 17152.0f) &&
(this->unk_1E0 != 3) && func_8002F2CC(&this->actor, play, 100.0f)) {
(this->unk_1E0 != 3) && Actor_OfferTalk(&this->actor, play, 100.0f)) {
this->actor.textId = EnMm_GetTextId(this, play);
}
}