mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 14:34:32 +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

8
src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
View file

@ -241,7 +241,7 @@ void func_80A56874(EnHeishi4* this, PlayState* play) {
if (this->unk_284 != 0) {
SkelAnime_Update(&this->skelAnime);
}
if (Actor_ProcessTalkRequest(&this->actor, play)) {
if (Actor_TalkOfferAccepted(&this->actor, play)) {
if (this->unk_284 == 0) {
this->actionFunc = func_80A5673C;
@ -249,7 +249,7 @@ void func_80A56874(EnHeishi4* this, PlayState* play) {
this->actionFunc = func_80A56900;
}
} else {
func_8002F2CC(&this->actor, play, 100.0f);
Actor_OfferTalk(&this->actor, play, 100.0f);
}
}
@ -323,7 +323,7 @@ void func_80A56B40(EnHeishi4* this, PlayState* play) {
}
}
}
if (Actor_ProcessTalkRequest(&this->actor, play)) {
if (Actor_TalkOfferAccepted(&this->actor, play)) {
if ((this->type == HEISHI4_AT_KAKRIKO_ENTRANCE) || (this->type == HEISHI4_AT_IMPAS_HOUSE)) {
this->unk_284 = 1;
this->actionFunc = func_80A563BC;
@ -334,7 +334,7 @@ void func_80A56B40(EnHeishi4* this, PlayState* play) {
return;
}
}
func_8002F2F4(&this->actor, play);
Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play);
}
void EnHeishi4_Update(Actor* thisx, PlayState* play) {