mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 14:01:15 +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_Go/z_en_go.c
View file

@ -338,10 +338,10 @@ s32 EnGo_UpdateTalking(PlayState* play, Actor* thisx, s16* talkState, f32 intera
if (*talkState != NPC_TALK_STATE_IDLE) {
*talkState = updateTalkState(play, thisx);
return false;
} else if (Actor_ProcessTalkRequest(thisx, play)) {
} else if (Actor_TalkOfferAccepted(thisx, play)) {
*talkState = NPC_TALK_STATE_TALKING;
return true;
} else if (!func_8002F2CC(thisx, play, interactRange)) {
} else if (!Actor_OfferTalk(thisx, play, interactRange)) {
return false;
} else {
thisx->textId = getTextId(play, thisx);