diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-11-21 12:36:02 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 12:36:02 +1100 |
| commit | 0e441520cc586d35de9ede578d85aa8de99bf4a1 (patch) | |
| tree | 04c8f846915d5ee4b6630ab6c78bda845ce5b81d /docs/tutorial | |
| parent | 28706d798d9e1662b2059bf78e07c5b4f9b577b7 (diff) | |
Document `Actor_TalkOfferAccepted` (#1502)
* rename
* PR Review
Diffstat (limited to 'docs/tutorial')
| -rw-r--r-- | docs/tutorial/advanced_control_flow.md | 4 | ||||
| -rw-r--r-- | docs/tutorial/documenting.md | 6 | ||||
| -rw-r--r-- | docs/tutorial/other_functions.md | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/docs/tutorial/advanced_control_flow.md b/docs/tutorial/advanced_control_flow.md index 896edcb1d..0265152a6 100644 --- a/docs/tutorial/advanced_control_flow.md +++ b/docs/tutorial/advanced_control_flow.md @@ -87,7 +87,7 @@ void func_80952734(EnMs* this, PlayState* play) { this->actor.textId = 0x932; } - if (Actor_ProcessTalkRequest(&this->actor, &play->state) != 0) { + if (Actor_TalkOfferAccepted(&this->actor, &play->state) != 0) { this->actionFunc = func_809527F8; return; } @@ -112,7 +112,7 @@ void func_809529AC(EnMs* this, PlayState* play) { } void func_80952A1C(EnMs* this, PlayState* play) { - if (Actor_ProcessTalkRequest(&this->actor, &play->state)) { + if (Actor_TalkOfferAccepted(&this->actor, &play->state)) { Message_ContinueTextbox(play, 0x936U); this->actionFunc = func_809527F8; } else { diff --git a/docs/tutorial/documenting.md b/docs/tutorial/documenting.md index 619b30c06..8bc205b9e 100644 --- a/docs/tutorial/documenting.md +++ b/docs/tutorial/documenting.md @@ -134,7 +134,7 @@ void func_80C1019C(EnRecepgirl* this, PlayState* play) { } } - if (Actor_ProcessTalkRequest(&this->actor, &play->state) != 0) { + if (Actor_TalkOfferAccepted(&this->actor, &play->state) != 0) { func_80C10290(this); } else if (Actor_IsFacingPlayer(&this->actor, 0x2000)) { Actor_OfferTalk(&this->actor, play, 60.0f); @@ -470,7 +470,7 @@ void func_80C1019C(EnRecepgirl* this, PlayState* play) { } } - if (Actor_ProcessTalkRequest(&this->actor, &play->state) != 0) { + if (Actor_TalkOfferAccepted(&this->actor, &play->state) != 0) { func_80C10290(this); } else if (Actor_IsFacingPlayer(&this->actor, 0x2000)) { Actor_OfferTalk(&this->actor, play, 60.0f); @@ -540,7 +540,7 @@ void func_80C102D4(EnRecepgirl* this, PlayState* play) { } } ``` -All this branching is to make the conversation look more diverse and interesting. Notably, though, `func_80C1019C` is set to start with, and is only changed when `Actor_ProcessTalkRequest(&this->actor, &play->state) != 0`. This is something to do with talking. The other function handles the rest of the conversation, and hands back to the first if `Message_GetState(&play->msgCtx) == 2`. This function is *something* to do with the text state, which will require `z_message` to be decomped. However, observation in-game will reveal this is something to do with ending dialogue. So we can conclude that the action functions are `EnRecepgirl_Wait` and `EnRecepgirl_Talk`. The setup functions are thus `EnRecepgirl_SetupWait` and `EnRecepgirl_SetupTalk`. +All this branching is to make the conversation look more diverse and interesting. Notably, though, `func_80C1019C` is set to start with, and is only changed when `Actor_TalkOfferAccepted(&this->actor, &play->state) != 0`. This is something to do with talking. The other function handles the rest of the conversation, and hands back to the first if `Message_GetState(&play->msgCtx) == 2`. This function is *something* to do with the text state, which will require `z_message` to be decomped. However, observation in-game will reveal this is something to do with ending dialogue. So we can conclude that the action functions are `EnRecepgirl_Wait` and `EnRecepgirl_Talk`. The setup functions are thus `EnRecepgirl_SetupWait` and `EnRecepgirl_SetupTalk`. For more complex actors, we have a tool called `graphovl.py` that can produce function flow graphs for actors: running diff --git a/docs/tutorial/other_functions.md b/docs/tutorial/other_functions.md index dd2de5538..0ebf19b96 100644 --- a/docs/tutorial/other_functions.md +++ b/docs/tutorial/other_functions.md @@ -130,7 +130,7 @@ void func_80C1019C(EnRecepgirl* this, PlayState* play) { Animation_ChangeTransitionRepeat(temp_a0, &D_06009890, -4.0f); } } - if (Actor_ProcessTalkRequest((Actor *) this, play) != 0) { + if (Actor_TalkOfferAccepted((Actor *) this, play) != 0) { func_80C10290(this); return; } @@ -185,7 +185,7 @@ void func_80C1019C(EnRecepgirl* this, PlayState* play) { Animation_ChangeTransitionRepeat(&this->skelAnime, &D_06009890, -4.0f); } } - if (Actor_ProcessTalkRequest(&this->actor, &play->state) != 0) { + if (Actor_TalkOfferAccepted(&this->actor, &play->state) != 0) { func_80C10290(this); return; } @@ -223,7 +223,7 @@ void func_80C1019C(EnRecepgirl* this, PlayState* play) { } } - if (Actor_ProcessTalkRequest(&this->actor, &play->state) != 0) { + if (Actor_TalkOfferAccepted(&this->actor, &play->state) != 0) { func_80C10290(this); } else if (Actor_IsFacingPlayer(&this->actor, 0x2000)) { Actor_OfferTalk(&this->actor, play, 60.0f); |
