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

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_Elf/z_en_elf.c
View file

@ -1394,7 +1394,7 @@ void func_80A053F0(Actor* thisx, PlayState* play) {
thisx->flags |= ACTOR_FLAG_16;
}
if (Actor_ProcessTalkRequest(thisx, play)) {
if (Actor_TalkOfferAccepted(thisx, play)) {
func_800F4524(&gSfxDefaultPos, NA_SE_VO_SK_LAUGH, 0x20);
thisx->focus.pos = thisx->world.pos;
@ -1409,7 +1409,7 @@ void func_80A053F0(Actor* thisx, PlayState* play) {
func_80A01C38(this, 3);
if (this->elfMsg != NULL) {
this->elfMsg->actor.flags |= ACTOR_FLAG_8;
this->elfMsg->actor.flags |= ACTOR_FLAG_TALK;
}
thisx->flags &= ~ACTOR_FLAG_16;