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

12
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -1493,17 +1493,17 @@ void func_80AEE050(EnRu1* this) {
}
s32 func_80AEE264(EnRu1* this, PlayState* play) {
if (!Actor_ProcessTalkRequest(&this->actor, play)) {
if (!Actor_TalkOfferAccepted(&this->actor, play)) {
this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_3;
if (GET_INFTABLE(INFTABLE_143)) {
this->actor.textId = 0x404E;
func_8002F2F4(&this->actor, play);
Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play);
} else if (GET_INFTABLE(INFTABLE_142)) {
this->actor.textId = 0x404D;
func_8002F2F4(&this->actor, play);
Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play);
} else {
this->actor.textId = 0x404C;
func_8002F2F4(&this->actor, play);
Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play);
}
return false;
}
@ -2126,13 +2126,13 @@ void func_80AEFD38(EnRu1* this, PlayState* play) {
}
s32 func_80AEFDC0(EnRu1* this, PlayState* play) {
if (!Actor_ProcessTalkRequest(&this->actor, play)) {
if (!Actor_TalkOfferAccepted(&this->actor, play)) {
this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_3;
this->actor.textId = Text_GetFaceReaction(play, 0x1F);
if (this->actor.textId == 0) {
this->actor.textId = 0x402C;
}
func_8002F2F4(&this->actor, play);
Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play);
return false;
}
return true;