diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-11-20 03:11:59 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-19 11:11:59 -0500 |
| commit | 3d1ee33d7b7799cd84c3bbe1fc8d4f69ec3f58d9 (patch) | |
| tree | 21178a693db198c0ca04a3fe3d0061c3c6915de5 /include | |
| parent | c11ce9c99473be1ff1eba565e7eae920612586c3 (diff) | |
Document Actor "OfferTalk" (#1567)
* 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
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 10 | ||||
| -rw-r--r-- | include/z64actor.h | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/functions.h b/include/functions.h index 011d0d0c2..adb31bb37 100644 --- a/include/functions.h +++ b/include/functions.h @@ -395,11 +395,11 @@ PosRot* Actor_GetFocus(PosRot* dest, Actor* actor); PosRot* Actor_GetWorld(PosRot* dest, Actor* actor); PosRot* Actor_GetWorldPosShapeRot(PosRot* arg0, Actor* actor); s32 func_8002F0C8(Actor* actor, Player* player, s32 flag); -u32 Actor_ProcessTalkRequest(Actor* actor, PlayState* play); -s32 func_8002F1C4(Actor* actor, PlayState* play, f32 arg2, f32 arg3, u32 exchangeItemId); -s32 func_8002F298(Actor* actor, PlayState* play, f32 arg2, u32 exchangeItemId); -s32 func_8002F2CC(Actor* actor, PlayState* play, f32 arg2); -s32 func_8002F2F4(Actor* actor, PlayState* play); +s32 Actor_TalkOfferAccepted(Actor* actor, PlayState* play); +s32 Actor_OfferTalkExchange(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, u32 exchangeItemId); +s32 Actor_OfferTalkExchangeEquiCylinder(Actor* actor, PlayState* play, f32 radius, u32 exchangeItemId); +s32 Actor_OfferTalk(Actor* actor, PlayState* play, f32 radius); +s32 Actor_OfferTalkNearColChkInfoCylinder(Actor* actor, PlayState* play); u32 Actor_TextboxIsClosing(Actor* actor, PlayState* play); s8 func_8002F368(PlayState* play); void Actor_GetScreenPos(PlayState* play, Actor* actor, s16* x, s16* y); diff --git a/include/z64actor.h b/include/z64actor.h index 8fdbbf1db..fd38b002b 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -147,7 +147,10 @@ typedef struct { #define ACTOR_FLAG_5 (1 << 5) #define ACTOR_FLAG_6 (1 << 6) #define ACTOR_FLAG_7 (1 << 7) -#define ACTOR_FLAG_8 (1 << 8) +// Signals that player has accepted an offer to talk to an actor +// Player will retain this flag until the player is finished talking +// Actor will retain this flag until `Actor_TalkOfferAccepted` is called or manually turned off by the actor +#define ACTOR_FLAG_TALK (1 << 8) #define ACTOR_FLAG_9 (1 << 9) #define ACTOR_FLAG_10 (1 << 10) #define ACTOR_FLAG_ENKUSA_CUT (1 << 11) |