falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Document `Actor_TalkOfferAccepted` (#1502) 

* rename

* PR Review
This commit is contained in:
engineer124 2023-11-21 12:36:02 +11:00 committed by GitHub
parent 28706d798d
commit 0e441520cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
154 changed files with 376 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/tutorial/advanced_control_flow.md
View File

@ -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 {

6
docs/tutorial/documenting.md
View File

@ -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

6
docs/tutorial/other_functions.md
View File

@ -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);

2
include/functions.h
View File

@ -324,7 +324,7 @@ PosRot Actor_GetWorld(Actor* actor);
PosRot Actor_GetWorldPosShapeRot(Actor* actor);
s32 Target_OutsideLeashRange(Actor* actor, Player* player, s32 ignoreLeash);
s32 Actor_ProcessTalkRequest(Actor* actor, GameState* gameState);
s32 Actor_TalkOfferAccepted(Actor* actor, GameState* gameState);
s32 Actor_OfferTalkExchange(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, PlayerItemAction exchangeItemAction);
s32 Actor_OfferTalkExchangeEquiCylinder(Actor* actor, PlayState* play, f32 radius, PlayerItemAction exchangeItemAction);
s32 Actor_OfferTalk(Actor* actor, PlayState* play, f32 radius);

6
include/z64actor.h
View File

@ -486,8 +486,10 @@ typedef enum {
#define ACTOR_FLAG_40 (1 << 6)
// hidden or revealed by Lens of Truth (depending on room lensMode)
#define ACTOR_FLAG_REACT_TO_LENS (1 << 7)
// Player has requested to talk to the actor; Player uses this flag differently than every other actor
#define ACTOR_FLAG_TALK_REQUESTED (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_200 (1 << 9)
//

22
src/code/z_actor.c
View File

@ -1934,9 +1934,16 @@ s16 D_801AED48[] = {
HALFDAYBIT_DAY4_NIGHT,
};
s32 Actor_ProcessTalkRequest(Actor* actor, GameState* gameState) {
if (actor->flags & ACTOR_FLAG_TALK_REQUESTED) {
actor->flags &= ~ACTOR_FLAG_TALK_REQUESTED;
/**
* When a given talk offer is accepted, Player will set `ACTOR_FLAG_TALK` for that actor.
* This function serves to acknowledge that the offer was accepted by Player, and notifies the actor
* that it should proceed with its own internal processes for handling dialogue.
*
* @return true if the talk offer was accepted, false otherwise
*/
s32 Actor_TalkOfferAccepted(Actor* actor, GameState* gameState) {
if (actor->flags & ACTOR_FLAG_TALK) {
actor->flags &= ~ACTOR_FLAG_TALK;
return true;
}
@ -1973,8 +1980,7 @@ s32 Actor_OfferTalkExchange(Actor* actor, PlayState* play, f32 xzRange, f32 yRan
PlayerItemAction exchangeItemAction) {
Player* player = GET_PLAYER(play);
if ((player->actor.flags & ACTOR_FLAG_TALK_REQUESTED) ||
((exchangeItemAction > PLAYER_IA_NONE) && Player_InCsMode(play)) ||
if ((player->actor.flags & ACTOR_FLAG_TALK) || ((exchangeItemAction > PLAYER_IA_NONE) && Player_InCsMode(play)) ||
(!actor->isLockedOn &&
((fabsf(actor->playerHeightRel) > fabsf(yRange)) || (actor->xzDistToPlayer > player->talkActorDistance) ||
(xzRange < actor->xzDistToPlayer)))) {
@ -2016,7 +2022,7 @@ s32 Actor_OfferTalkNearColChkInfoCylinder(Actor* actor, PlayState* play) {
s32 Actor_TextboxIsClosing(Actor* actor, PlayState* play) {
if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
actor->flags &= ~ACTOR_FLAG_TALK_REQUESTED;
actor->flags &= ~ACTOR_FLAG_TALK;
return true;
}
@ -2033,7 +2039,7 @@ s32 Actor_ChangeFocus(Actor* actor1, PlayState* play, Actor* actor2) {
talkActor = player->talkActor;
if ((player->actor.flags & ACTOR_FLAG_TALK_REQUESTED) && (talkActor != NULL)) {
if ((player->actor.flags & ACTOR_FLAG_TALK) && (talkActor != NULL)) {
player->talkActor = actor2;
player->lockOnActor = actor2;
return true;
@ -4260,7 +4266,7 @@ void Actor_GetClosestPosOnPath(Vec3s* points, s32 numPoints, Vec3f* srcPos, Vec3
*/
s32 Npc_UpdateTalking(PlayState* play, Actor* actor, s16* talkState, f32 interactRange, NpcGetTextIdFunc getTextId,
NpcUpdateTalkStateFunc updateTalkState) {
if (Actor_ProcessTalkRequest(actor, &play->state)) {
if (Actor_TalkOfferAccepted(actor, &play->state)) {
*talkState = NPC_TALK_STATE_TALKING;
return true;
}

2
src/code/z_en_a_keep.c
View File

@ -71,7 +71,7 @@ void EnAObj_Destroy(Actor* thisx, PlayState* play) {
void EnAObj_Idle(EnAObj* this, PlayState* play) {
s32 yawDiff;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = EnAObj_Talk;
} else {
yawDiff = ABS_ALT((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y));

2
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View File

@ -109,7 +109,7 @@ s32 ArmsHook_CheckForCancel(ArmsHook* this) {
Player* player = (Player*)this->actor.parent;
if (Player_IsHoldingHookshot(player)) {
if ((player->itemAction != player->heldItemAction) || (player->actor.flags & ACTOR_FLAG_TALK_REQUESTED) ||
if ((player->itemAction != player->heldItemAction) || (player->actor.flags & ACTOR_FLAG_TALK) ||
(player->stateFlags1 & (PLAYER_STATE1_80 | PLAYER_STATE1_4000000))) {
this->timer = 0;
ArmsHook_DetachHookFromActor(this);

2
src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
View File

@ -1024,7 +1024,7 @@ void DmChar08_Update(Actor* thisx, PlayState* play) {
this->dyna.actor.focus.rot.y = this->dyna.actor.world.rot.y;
this->dyna.actor.focus.rot.z = this->dyna.actor.world.rot.z;
if (Actor_ProcessTalkRequest(&this->dyna.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->dyna.actor, &play->state)) {
this->unk_206 = 1;
}

2
src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c
View File

@ -211,7 +211,7 @@ s32 func_80C2291C(DmTag* this, PlayState* play) {
s32 ret = false;
if (((this->unk_18C & SUBS_OFFER_MODE_MASK) != SUBS_OFFER_MODE_NONE) &&
Actor_ProcessTalkRequest(&this->actor, &play->state)) {
Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_18C |= 8;
SubS_SetOfferMode(&this->unk_18C, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK);
this->msgEventScript = func_80C22880(this, play);

2
src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
View File

@ -135,7 +135,7 @@ void ElfMsg_Update(Actor* thisx, PlayState* play) {
ElfMsg* this = THIS;
if (func_8092DF9C(this, play) == 0) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (ELFMSG_GET_SWITCH_FLAG(thisx) != 0x7F) {
Flags_SetSwitch(play, ELFMSG_GET_SWITCH_FLAG(thisx));
}

2
src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
View File

@ -128,7 +128,7 @@ void func_8096EE64(ElfMsg2* this, PlayState* play) {
}
void func_8096EF98(ElfMsg2* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
ElfMsg2_SetupAction(this, func_8096EE64);
}
}

2
src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c
View File

@ -133,7 +133,7 @@ void ElfMsg3_Update(Actor* thisx, PlayState* play) {
ElfMsg3* this = THIS;
if (!func_80A2CD1C(this, play)) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (ELFMSG3_GET_SWITCH_FLAG(thisx) != 0x7F) {
Flags_SetSwitch(play, ELFMSG3_GET_SWITCH_FLAG(thisx));
}

2
src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c
View File

@ -159,7 +159,7 @@ void ElfMsg4_Update(Actor* thisx, PlayState* play) {
return;
}
if ((bgActor != NULL) && Actor_ProcessTalkRequest(bgActor, &play->state)) {
if ((bgActor != NULL) && Actor_TalkOfferAccepted(bgActor, &play->state)) {
if (ELFMSG4_GET_SWITCH_FLAG(thisx) != 0x7F) {
Flags_SetSwitch(play, ELFMSG4_GET_SWITCH_FLAG(thisx));
}

10
src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c
View File

@ -262,7 +262,7 @@ void func_80BA1CF8(ElfMsg6* this, PlayState* play) {
return;
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
switch (this->actor.textId) {
case 0x224:
SET_WEEKEVENTREG(WEEKEVENTREG_79_10);
@ -296,7 +296,7 @@ void func_80BA1E30(ElfMsg6* this, PlayState* play) {
return;
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
switch (this->actor.textId) {
case 0x216:
SET_WEEKEVENTREG(WEEKEVENTREG_31_04);
@ -351,7 +351,7 @@ void func_80BA2038(ElfMsg6* this, PlayState* play) {
}
void func_80BA2048(ElfMsg6* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
EnElf* sp20 = (EnElf*)GET_PLAYER(play)->tatlActor;
sp20->unk_264 |= 0x20;
@ -375,7 +375,7 @@ void func_80BA2048(ElfMsg6* this, PlayState* play) {
}
void func_80BA215C(ElfMsg6* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Actor_Kill(&this->actor);
return;
}
@ -386,7 +386,7 @@ void func_80BA215C(ElfMsg6* this, PlayState* play) {
}
void func_80BA21C4(ElfMsg6* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
EnElf* sp20 = (EnElf*)GET_PLAYER(play)->tatlActor;
sp20->unk_264 |= 0x20;

2
src/overlays/actors/ovl_En_Ah/z_en_ah.c
View File

@ -172,7 +172,7 @@ s32 func_80BD2BE8(EnAh* this, PlayState* play) {
s32 ret = false;
if (((this->unk_2D8 & SUBS_OFFER_MODE_MASK) != SUBS_OFFER_MODE_NONE) &&
Actor_ProcessTalkRequest(&this->actor, &play->state)) {
Actor_TalkOfferAccepted(&this->actor, &play->state)) {
SubS_SetOfferMode(&this->unk_2D8, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK);
ret = true;
this->unk_2D8 |= 8;

4
src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c
View File

@ -1313,7 +1313,7 @@ void func_80BEEE10(EnAkindonuts* this, PlayState* play) {
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 2000, 0);
this->actor.world.rot.y = this->actor.shape.rot.y;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_2DC(this, play);
this->actionFunc = func_80BEEFA8;
} else if (((this->actor.xzDistToPlayer < 100.0f) &&
@ -1440,7 +1440,7 @@ void func_80BEF450(EnAkindonuts* this, PlayState* play) {
}
void func_80BEF4B8(EnAkindonuts* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_2DC(this, play);
this->actionFunc = func_80BEEFA8;
} else {

2
src/overlays/actors/ovl_En_Al/z_en_al.c
View File

@ -503,7 +503,7 @@ s32 func_80BDEC2C(EnAl* this, PlayState* play) {
s32 ret = false;
if (((this->unk_4C2 & SUBS_OFFER_MODE_MASK) != SUBS_OFFER_MODE_NONE) &&
Actor_ProcessTalkRequest(&this->actor, &play->state)) {
Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_4C2 &= ~0x1800;
if (player->exchangeItemAction == PLAYER_IA_LETTER_MAMA) {
this->unk_4C2 |= 0x800;

3
src/overlays/actors/ovl_En_An/z_en_an.c
View File

@ -1746,7 +1746,8 @@ s32* EnAn_GetMsgEventScript(EnAn* this, PlayState* play) {
s32 EnAn_CheckTalk(EnAn* this, PlayState* play) {
s32 ret = false;
if ((this->stateFlags & SUBS_OFFER_MODE_MASK) && Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (((this->stateFlags & SUBS_OFFER_MODE_MASK) != SUBS_OFFER_MODE_NONE) &&
Actor_TalkOfferAccepted(&this->actor, &play->state)) {
SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK);
this->unk_3C4 = 0;
this->msgEventState = 0;

2
src/overlays/actors/ovl_En_Ani/z_en_ani.c
View File

@ -182,7 +182,7 @@ void EnAni_Talk(EnAni* this, PlayState* play) {
void EnAni_IdleInPain(EnAni* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = EnAni_Talk;
} else {
// telling you not to take his rupees you knocked from the tree

8
src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
View File

@ -580,7 +580,7 @@ void EnAob01_BeforeRace_Idle(EnAob01* this, PlayState* play) {
this->stateFlags |= ENAOB01_FLAG_TALKING_TO_PLAYER_HOLDING_DOG;
this->actionFunc = EnAob01_BeforeRace_Talk;
}
} else if (Actor_ProcessTalkRequest(&this->actor, &play->state) &&
} else if (Actor_TalkOfferAccepted(&this->actor, &play->state) &&
(this->stateFlags & ENAOB01_FLAG_PLAYER_CAN_TALK)) {
this->stateFlags &= ~ENAOB01_FLAG_PLAYER_CAN_TALK;
this->prevTrackTarget = this->trackTarget;
@ -634,7 +634,7 @@ void EnAob01_BeforeRace_Talk(EnAob01* this, PlayState* play) {
}
if (this->stateFlags & ENAOB01_FLAG_TALKING_TO_PLAYER_HOLDING_DOG) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
func_80123E90(play, &this->actor);
if (this->stateFlags & ENAOB01_FLAG_PLAYER_TOLD_TO_PICK_A_DOG) {
@ -844,7 +844,7 @@ void EnAob01_Race_StartCutscene(EnAob01* this, PlayState* play) {
* receive the same number of rupees they bet.
*/
void EnAob01_AfterRace_GiveRaceResult(EnAob01* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
func_80123E90(play, &this->actor);
this->rupeesBet = gSaveContext.unk_3F5C;
@ -951,7 +951,7 @@ void EnAob01_AfterRace_AfterGivingReward(EnAob01* this, PlayState* play) {
* the player has won the 150 rupee reward.
*/
void EnAob01_AfterRace_AskToPlayAgain(EnAob01* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->textId = 0x354C; // Want to play again?
Message_ContinueTextbox(play, this->textId);
this->actionFunc = EnAob01_BeforeRace_RespondToPlayAgainQuestion;

4
src/overlays/actors/ovl_En_Az/z_en_az.c
View File

@ -1431,7 +1431,7 @@ void func_80A97410(EnAz* this, PlayState* play) {
}
} else if (((this->unk_378 == 0) || (this->unk_378 == 1)) && (this->unk_374 & 0x20)) {
if (this->unk_378 == 1) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
func_80A97114(this, play);
this->unk_378 = 2;
} else if (Actor_OfferTalkExchange(&this->actor, play, this->actor.xzDistToPlayer,
@ -1459,7 +1459,7 @@ void func_80A97410(EnAz* this, PlayState* play) {
Math_SmoothStepToS(&this->unk_3D6, 0, 3, 0x71C, 0);
}
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
func_80A97114(this, play);
this->unk_378 = 2;
if ((this->unk_3D2 == 0x10CE) || (this->unk_3D2 == 0x10D4)) {

6
src/overlays/actors/ovl_En_Baba/z_en_baba.c
View File

@ -577,7 +577,7 @@ void EnBaba_FinishInit(EnBaba* this, PlayState* play) {
void EnBaba_Idle(EnBaba* this, PlayState* play) {
if ((this->stateFlags & BOMB_SHOP_LADY_STATE_AUTOTALK) || (this->bombShopkeeper != NULL) ||
EnBaba_FindBombShopkeeper(this, play)) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
EnBaba_HandleConversation(this, play);
if (this->stateFlags & BOMB_SHOP_LADY_STATE_AUTOTALK) {
this->actor.flags &= ~ACTOR_FLAG_10000;
@ -655,7 +655,7 @@ void EnBaba_GiveBlastMask(EnBaba* this, PlayState* play) {
}
void EnBaba_GaveBlastMask(EnBaba* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
EnBaba_HandleConversation(this, play);
this->actionFunc = EnBaba_Talk;
} else {
@ -683,7 +683,7 @@ void EnBaba_FollowSchedule(EnBaba* this, PlayState* play) {
EnBaba_HandleSchedule(this, play);
if (this->stateFlags & BOMB_SHOP_LADY_STATE_VISIBLE) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_StartTextbox(play, 0x2A39, &this->actor); // "I'm sorry"
this->actionFunc = EnBaba_FollowSchedule_Talk;
} else if ((this->actor.xzDistToPlayer < 100.0f) || this->actor.isLockedOn) {

2
src/overlays/actors/ovl_En_Baisen/z_en_baisen.c
View File

@ -163,7 +163,7 @@ void func_80BE87FC(EnBaisen* this) {
}
void func_80BE887C(EnBaisen* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
func_80BE895C(this, play);
} else {
if (this->paramCopy != 0) {

4
src/overlays/actors/ovl_En_Bal/z_en_bal.c
View File

@ -507,7 +507,7 @@ void EnBal_GroundIdle(EnBal* this, PlayState* play) {
this->timer++;
}
if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
this->forceEyesShut = false;
this->eyeTexIndex = TINGLE_EYETEX_OPEN;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_TALKED_TINGLE)) {
@ -1036,7 +1036,7 @@ void EnBal_SetupThankYou(EnBal* this) {
void EnBal_ThankYou(EnBal* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
player->stateFlags1 &= ~PLAYER_STATE1_20;
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, TINGLE_ANIM_TWIST);
this->forceEyesShut = false;

2
src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c
View File

@ -130,7 +130,7 @@ void EnBba01_UpdateModel(EnBba01* this, PlayState* play) {
s32 EnBba01_TestIsTalking(EnBba01* this, PlayState* play) {
s32 isTalking = false;
if (Actor_ProcessTalkRequest(&this->enHy.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->enHy.actor, &play->state)) {
isTalking = true;
this->enHy.textId = 0x10B9; // Invalid textId, produces empty textbox
this->enHy.prevTrackTarget = this->enHy.trackTarget;

2
src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
View File

@ -100,7 +100,7 @@ void func_809CCEE8(EnBji01* this, PlayState* play) {
this->actor.flags &= ~ACTOR_FLAG_10000;
}
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
play->msgCtx.msgMode = MSGMODE_NONE;
play->msgCtx.msgLength = 0;
func_809CD028(this, play);

4
src/overlays/actors/ovl_En_Bjt/z_en_bjt.c
View File

@ -321,7 +321,7 @@ s32 EnBjt_CheckTalk(EnBjt* this, PlayState* play) {
s32 ret = false;
if (((this->stateFlags & SUBS_OFFER_MODE_MASK) != SUBS_OFFER_MODE_NONE) &&
Actor_ProcessTalkRequest(&this->actor, &play->state)) {
Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->stateFlags |= TOILET_HAND_STATE_TALKING;
SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK);
this->msgEventCallback = EnBjt_ChooseBehaviour;
@ -365,7 +365,7 @@ void EnBjt_Talk(EnBjt* this, PlayState* play) {
s16 yaw = this->actor.yawTowardsPlayer;
if (func_8010BF58(&this->actor, play, sMsgEventScript, this->msgEventCallback, &this->msgEventArg4)) {
this->actor.flags &= ~ACTOR_FLAG_TALK_REQUESTED;
this->actor.flags &= ~ACTOR_FLAG_TALK;
SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_ONSCREEN, SUBS_OFFER_MODE_MASK);
this->stateFlags &= ~TOILET_HAND_STATE_TALKING;
this->msgEventArg4 = 0;

2
src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
View File

@ -580,7 +580,7 @@ void func_809C59F0(EnBomBowlMan* this, PlayState* play) {
}
void func_809C5AA4(EnBomBowlMan* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (this->unk_2F6 == ENBOMBOWLMAN_F0_0) {
this->actionFunc = func_809C4DA4;
} else {

4
src/overlays/actors/ovl_En_Bombers/z_en_bombers.c
View File

@ -355,7 +355,7 @@ void func_80C03AF4(EnBombers* this, PlayState* play) {
this->actor.textId = Text_GetFaceReaction(play, FACE_REACTION_SET_BOMBERS);
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_2A4 = this->actor.yawTowardsPlayer;
this->collider.dim.radius = 20;
this->collider.dim.height = 60;
@ -500,7 +500,7 @@ void func_80C042F8(EnBombers* this) {
void func_80C04354(EnBombers* this, PlayState* play) {
Math_SmoothStepToS(&this->unk_288, this->unk_28E, 1, 0x3E8, 0);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_28E = 0;
this->actionFunc = func_80C043C8;
} else {

2
src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c
View File

@ -189,7 +189,7 @@ void func_80C04BA0(EnBombers2* this, PlayState* play) {
this->actor.textId = Text_GetFaceReaction(play, FACE_REACTION_SET_BOMBERS_HIDEOUT_GUARD);
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_2B6 = this->actor.world.rot.y;
SET_WEEKEVENTREG(WEEKEVENTREG_86_02);
func_80C04D00(this);

6
src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c
View File

@ -442,7 +442,7 @@ void func_80BFEB64(EnBomjima* this, PlayState* play) {
this->actor.textId = Text_GetFaceReaction(play, FACE_REACTION_SET_JIM);
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_2DC = this->actor.yawTowardsPlayer;
func_80C00234(this);
return;
@ -561,7 +561,7 @@ void func_80BFF174(EnBomjima* this, PlayState* play) {
this->actor.textId = Text_GetFaceReaction(play, FACE_REACTION_SET_JIM);
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_2DC = this->actor.yawTowardsPlayer;
func_80C00234(this);
return;
@ -944,7 +944,7 @@ void func_80C00168(EnBomjima* this, PlayState* play) {
this->actor.textId = Text_GetFaceReaction(play, FACE_REACTION_SET_JIM);
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_2DC = this->actor.yawTowardsPlayer;
func_80C00234(this);
} else {

2
src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c
View File

@ -571,7 +571,7 @@ void func_80C0201C(EnBomjimb* this, PlayState* play) {
}
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_2CA = 10;
this->actionFunc = func_80C02A14;
} else {

2
src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c
View File

@ -122,7 +122,7 @@ void EnCne01_UpdateModel(EnCne01* this, PlayState* play) {
s32 EnCne01_TestIsTalking(EnCne01* this, PlayState* play) {
s32 isTalking = false;
if (Actor_ProcessTalkRequest(&this->enHy.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->enHy.actor, &play->state)) {
isTalking = true;
this->enHy.textId = 0x10B9; // Invalid textId, produces empty textbox
this->enHy.prevTrackTarget = this->enHy.trackTarget;

2
src/overlays/actors/ovl_En_Cow/z_en_cow.c
View File

@ -251,7 +251,7 @@ void EnCow_CheckForEmptyBottle(EnCow* this, PlayState* play) {
}
void EnCow_Talk(EnCow* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (this->actor.textId == 0x32C8) { // Text to give milk after playing Epona's Song.
this->actionFunc = EnCow_CheckForEmptyBottle;
} else if (this->actor.textId == 0x32C9) { // Text to give milk.

2
src/overlays/actors/ovl_En_Dai/z_en_dai.c
View File

@ -216,7 +216,7 @@ s32 func_80B3E7C8(EnDai* this, PlayState* play) {
s32 ret = false;
if (((this->unk_1CE & SUBS_OFFER_MODE_MASK) != SUBS_OFFER_MODE_NONE) &&
Actor_ProcessTalkRequest(&this->actor, &play->state)) {
Actor_TalkOfferAccepted(&this->actor, &play->state)) {
SubS_SetOfferMode(&this->unk_1CE, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK);
this->actionFunc = func_80B3EF90;
ret = true;

2
src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
View File

@ -216,7 +216,7 @@ void func_809438F8(EnDaiku* this, PlayState* play) {
this->actor.textId = sTextIds[this->unk_28C];
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
func_80943BC0(this);
return;
}

6
src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c
View File

@ -261,7 +261,7 @@ void func_80BE66E4(EnDaiku2* this, PlayState* play) {
this->actor.textId = sTextIds[this->unk_28A];
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
func_80BE6B40(this, play);
return;
}
@ -374,7 +374,7 @@ void func_80BE6D40(EnDaiku2* this, PlayState* play) {
s32 pad[3];
s16 sp3A = Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_268);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_80BE6BC0;
return;
}
@ -408,7 +408,7 @@ void func_80BE6EF0(EnDaiku2* this, PlayState* play) {
Vec3f sp40;
s16 var;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_80BE6BC0;
return;
}

2
src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c
View File

@ -136,7 +136,7 @@ void EnDemoheishi_Idle(EnDemoheishi* this, PlayState* play) {
yawDiff = this->actor.yawTowardsPlayer - this->actor.world.rot.y;
absYawDiff = ABS_ALT(yawDiff);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
EnDemoheishi_SetupTalk(this);
} else if (absYawDiff <= 0x4BB8) {
Actor_OfferTalk(&this->actor, play, 70.0f);

2
src/overlays/actors/ovl_En_Dg/z_en_dg.c
View File

@ -1283,7 +1283,7 @@ void EnDg_Thrown(EnDg* this, PlayState* play) {
}
void EnDg_SetupTalk(EnDg* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
EnDg_StartTextBox(this, play);
this->actionFunc = EnDg_Talk;

2
src/overlays/actors/ovl_En_Dnh/z_en_dnh.c
View File

@ -101,7 +101,7 @@ void* func_80A50DF8(EnDnh* this, PlayState* play) {
s32 func_80A50E40(EnDnh* this, PlayState* play) {
if (((this->unk18C & SUBS_OFFER_MODE_MASK) == SUBS_OFFER_MODE_NONE) ||
!Actor_ProcessTalkRequest(&this->actor, &play->state)) {
!Actor_TalkOfferAccepted(&this->actor, &play->state)) {
return 0;
}
SubS_SetOfferMode(&this->unk18C, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK);

6
src/overlays/actors/ovl_En_Dno/z_en_dno.c
View File

@ -371,7 +371,7 @@ void func_80A71C3C(EnDno* this, PlayState* play) {
Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.home.rot.y, 0x222);
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
play->msgCtx.msgMode = MSGMODE_NONE;
play->msgCtx.msgLength = 0;
func_80A71E54(this, play);
@ -589,7 +589,7 @@ void func_80A724B8(EnDno* this, PlayState* play) {
func_80A71424(&this->unk_466, 0, this->actor.yawTowardsPlayer, this->actor.home.rot.y, 0x2000, 0x2D8);
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
func_80A725E0(this, play);
} else if (this->actor.xzDistToPlayer < 60.0f) {
Actor_OfferTalk(&this->actor, play, 60.0f);
@ -602,7 +602,7 @@ void func_80A7256C(EnDno* this, PlayState* play) {
}
void func_80A72598(EnDno* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
func_80A725E0(this, play);
} else {
func_80A7256C(this, play);

4
src/overlays/actors/ovl_En_Dnp/z_en_dnp.c
View File

@ -248,7 +248,7 @@ s32 func_80B3CF60(EnDnp* this, PlayState* play) {
s32 ret = false;
if (((this->unk_322 & SUBS_OFFER_MODE_MASK) != SUBS_OFFER_MODE_NONE) &&
Actor_ProcessTalkRequest(&this->actor, &play->state)) {
Actor_TalkOfferAccepted(&this->actor, &play->state)) {
SubS_SetOfferMode(&this->unk_322, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK);
this->unk_322 |= 8;
this->actionFunc = func_80B3D3F8;
@ -356,7 +356,7 @@ void func_80B3D338(EnDnp* this, PlayState* play) {
}
if (this->unk_32E == 0) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_32E = 1;
} else {
this->actor.textId = 0x971;

2
src/overlays/actors/ovl_En_Dnq/z_en_dnq.c
View File

@ -356,7 +356,7 @@ s32 func_80A52D44(EnDnq* this, PlayState* play) {
s32 ret = false;
if (((this->unk_37C & SUBS_OFFER_MODE_MASK) != SUBS_OFFER_MODE_NONE) &&
Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
SubS_SetOfferMode(&this->unk_37C, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK);
this->unk_380 = func_80A52CF8(this, play);
this->actionFunc = func_80A52FB8;

2
src/overlays/actors/ovl_En_Dns/z_en_dns.c
View File

@ -230,7 +230,7 @@ s32 func_8092CAD0(EnDns* this, PlayState* play) {
s32 ret = false;
if (((this->unk_2C6 & SUBS_OFFER_MODE_MASK) != SUBS_OFFER_MODE_NONE) &&
Actor_ProcessTalkRequest(&this->actor, &play->state)) {
Actor_TalkOfferAccepted(&this->actor, &play->state)) {
SubS_SetOfferMode(&this->unk_2C6, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK);
this->unk_2C6 &= ~0x10;
if (ENDNS_GET_4000(&this->actor)) {

2
src/overlays/actors/ovl_En_Door/z_en_door.c
View File

@ -501,7 +501,7 @@ void func_80866B20(EnDoor* this, PlayState* play) {
static s32 D_80867BC0;
Player* player = GET_PLAYER(play);
if (Actor_ProcessTalkRequest(&this->knobDoor.dyna.actor, &play->state) &&
if (Actor_TalkOfferAccepted(&this->knobDoor.dyna.actor, &play->state) &&
(this->knobDoor.dyna.actor.textId == 0x1821)) {
D_80867BC0 = true;
}

4
src/overlays/actors/ovl_En_Elf/z_en_elf.c
View File

@ -1473,7 +1473,7 @@ void func_8089010C(Actor* thisx, PlayState* play) {
thisx->flags |= ACTOR_FLAG_10000;
}
if (Actor_ProcessTalkRequest(thisx, &play->state)) {
if (Actor_TalkOfferAccepted(thisx, &play->state)) {
Audio_PlaySfx_AtPosWithReverb(&gSfxDefaultPos, NA_SE_VO_NA_LISTEN, 0x20);
thisx->focus.pos = thisx->world.pos;
@ -1487,7 +1487,7 @@ void func_8089010C(Actor* thisx, PlayState* play) {
thisx->update = func_8088FE64;
func_8088C51C(this, 3);
if (this->elfMsg != NULL) {
this->elfMsg->flags |= ACTOR_FLAG_TALK_REQUESTED;
this->elfMsg->flags |= ACTOR_FLAG_TALK;
thisx->csId = this->elfMsg->csId;
if (thisx->csId != CS_ID_NONE) {
func_8088FD04(this);

4
src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c
View File

@ -589,7 +589,7 @@ void func_80A3A77C(EnElfgrp* this, PlayState* play) {
void func_80A3A7FC(EnElfgrp* this, PlayState* play) {
s32 curTotalFairies;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
gSaveContext.save.saveInfo.weekEventReg[9] |= this->talkedOnceFlag;
this->actionFunc = func_80A3A6F4;
@ -611,7 +611,7 @@ void func_80A3A8F8(EnElfgrp* this, PlayState* play) {
s32 pad;
Player* player = GET_PLAYER(play);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
gSaveContext.save.saveInfo.weekEventReg[9] |= this->talkedOnceFlag;
this->actionFunc = func_80A3A6F4;
return;

2
src/overlays/actors/ovl_En_Fish2/z_en_fish2.c
View File

@ -350,7 +350,7 @@ void func_80B28C14(EnFish2* this, PlayState* play) {
Actor* itemAction = play->actorCtx.actorLists[ACTORCAT_ITEMACTION].first;
WaterBox* waterbox;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
func_80B29128(this);
return;
}

4
src/overlays/actors/ovl_En_Fishing/z_en_fishing.c
View File

@ -2820,7 +2820,7 @@ void EnFishing_HandleAquariumDialog(EnFishing* this, PlayState* play) {
if (this->unk_1CC == 0) {
this->actor.flags |= ACTOR_FLAG_TARGETABLE;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
D_8090CCF8 = D_809171CC;
this->unk_1CB = 1;
} else {
@ -4707,7 +4707,7 @@ void EnFishing_HandleOwnerDialog(EnFishing* this, PlayState* play) {
this->actor.textId = 0x4097;
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (D_809171FC == 0) {
this->unk_154 = 1;
if (sLinkAge != 1) {

12
src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
View File

@ -223,7 +223,7 @@ void EnFsn_HandleConversationBackroom(EnFsn* this, PlayState* play) {
void EnFsn_HandleSetupResumeInteraction(EnFsn* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play) &&
(this->cutsceneState == ENFSN_CUTSCENESTATE_STOPPED)) {
Actor_ProcessTalkRequest(&this->actor, &play->state);
Actor_TalkOfferAccepted(&this->actor, &play->state);
Actor_OfferTalkExchangeEquiCylinder(&this->actor, play, 400.0f, PLAYER_IA_MINUS1);
if (ENFSN_IS_SHOP(&this->actor)) {
this->actor.textId = 0;
@ -409,7 +409,7 @@ void EnFsn_EndInteraction(EnFsn* this, PlayState* play) {
CutsceneManager_Stop(this->csId);
this->cutsceneState = ENFSN_CUTSCENESTATE_STOPPED;
}
Actor_ProcessTalkRequest(&this->actor, &play->state);
Actor_TalkOfferAccepted(&this->actor, &play->state);
play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
play->msgCtx.stateTimer = 4;
Interface_SetHudVisibility(HUD_VISIBILITY_ALL);
@ -759,7 +759,7 @@ void EnFsn_Idle(EnFsn* this, PlayState* play) {
return;
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (this->cutsceneState == ENFSN_CUTSCENESTATE_STOPPED) {
if (CutsceneManager_GetCurrentCsId() == CS_ID_GLOBAL_TALK) {
CutsceneManager_Stop(CS_ID_GLOBAL_TALK);
@ -946,7 +946,7 @@ void EnFsn_AskBuyOrSell(EnFsn* this, PlayState* play) {
}
void EnFsn_SetupDeterminePrice(EnFsn* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.textId = 0xFF;
Message_StartTextbox(play, this->actor.textId, &this->actor);
this->actionFunc = EnFsn_DeterminePrice;
@ -1066,7 +1066,7 @@ void EnFsn_SetupResumeInteraction(EnFsn* this, PlayState* play) {
}
void EnFsn_ResumeInteraction(EnFsn* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (ENFSN_IS_SHOP(&this->actor)) {
if (!this->isSelling) {
this->csId = this->lookToShopkeeperBuyingCsId;
@ -1420,7 +1420,7 @@ void EnFsn_SetupEndInteractionImmediately(EnFsn* this, PlayState* play) {
}
void EnFsn_IdleBackroom(EnFsn* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->textId = 0;
EnFsn_HandleConversationBackroom(this, play);
this->actionFunc = EnFsn_ConverseBackroom;

4
src/overlays/actors/ovl_En_Fu/z_en_fu.c
View File

@ -400,7 +400,7 @@ void func_80962340(EnFu* this, PlayState* play) {
this->actor.flags |= ACTOR_FLAG_10000;
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (this->unk_54A == 2) {
if (this->unk_552 == 0x287D) {
if (GET_PLAYER_FORM == PLAYER_FORM_DEKU) {
@ -919,7 +919,7 @@ void func_80963610(EnFu* this) {
void func_80963630(EnFu* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_22_10) && CHECK_WEEKEVENTREG(WEEKEVENTREG_22_20) && (CURRENT_DAY == 3) &&
(GET_PLAYER_FORM == PLAYER_FORM_HUMAN)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_22_40)) {

12
src/overlays/actors/ovl_En_Gb2/z_en_gb2.c
View File

@ -386,7 +386,7 @@ void func_80B0FEBC(EnGb2* this, PlayState* play) {
this->unk_288 = 10;
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_StartTextbox(play, this->unk_26E, &this->actor);
this->actionFunc = func_80B0FFA8;
} else if ((this->actor.xzDistToPlayer < 300.0f) || this->actor.isLockedOn) {
@ -552,7 +552,7 @@ void func_80B10344(EnGb2* this, PlayState* play) {
}
void func_80B10584(EnGb2* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_StartTextbox(play, this->unk_26E, &this->actor);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actionFunc = func_80B10634;
@ -655,7 +655,7 @@ void func_80B10924(EnGb2* this, PlayState* play) {
}
void func_80B109DC(EnGb2* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_StartTextbox(play, this->unk_26E, &this->actor);
this->actionFunc = func_80B10634;
} else {
@ -710,7 +710,7 @@ void func_80B10B5C(EnGb2* this, PlayState* play) {
if (func_80B0FA48(this, play)) {
this->unk_26C &= ~0x20;
if (Actor_ProcessTalkRequest(&this->actor, &play->state) && (this->unk_26C & 0x40)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state) && (this->unk_26C & 0x40)) {
if ((this->unk_26E == 0x14EE) || (this->unk_26E == 0x14F4)) {
this->unk_26C |= 2;
}
@ -724,7 +724,7 @@ void func_80B10B5C(EnGb2* this, PlayState* play) {
}
} else {
this->unk_26C &= ~0x40;
if (Actor_ProcessTalkRequest(&this->actor, &play->state) && (this->unk_26C & 0x20)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state) && (this->unk_26C & 0x20)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
Message_StartTextbox(play, this->unk_26E, &this->actor);
if (this->unk_26E == 0x14EB) {
@ -801,7 +801,7 @@ void func_80B10E98(EnGb2* this, PlayState* play) {
}
void func_80B11048(EnGb2* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
Message_StartTextbox(play, this->unk_26E, &this->actor);
this->actionFunc = func_80B10DAC;

10
src/overlays/actors/ovl_En_Geg/z_en_geg.c
View File

@ -472,7 +472,7 @@ void func_80BB221C(EnGeg* this, PlayState* play) {
if (sp27 != 0) {
this->unk_230 &= ~8;
if (Actor_ProcessTalkRequest(&this->actor, &play->state) && (this->unk_230 & 4)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state) && (this->unk_230 & 4)) {
if (sp27 == 1) {
this->unk_496 = 0xD66;
this->nextCsId = this->csIdList[3];
@ -497,7 +497,7 @@ void func_80BB221C(EnGeg* this, PlayState* play) {
} else {
this->unk_230 &= ~4;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_35_40)) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state) && (this->unk_230 & 8)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state) && (this->unk_230 & 8)) {
this->unk_496 = 0xD62;
Message_StartTextbox(play, this->unk_496, &this->actor);
this->unk_230 &= ~8;
@ -506,7 +506,7 @@ void func_80BB221C(EnGeg* this, PlayState* play) {
Actor_OfferTalk(&this->actor, play, 300.0f);
this->unk_230 |= 8;
}
} else if (Actor_ProcessTalkRequest(&this->actor, &play->state) && (this->unk_230 & 8)) {
} else if (Actor_TalkOfferAccepted(&this->actor, &play->state) && (this->unk_230 & 8)) {
SET_WEEKEVENTREG(WEEKEVENTREG_35_40);
this->unk_496 = 0xD5E;
this->nextCsId = this->csIdList[0];
@ -813,7 +813,7 @@ void func_80BB2F7C(EnGeg* this, PlayState* play) {
void func_80BB30B4(EnGeg* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (player->transformation == PLAYER_FORM_GORON) {
this->unk_496 = 0xD6A;
} else if (Player_GetMask(play) == PLAYER_MASK_DON_GERO) {
@ -858,7 +858,7 @@ void func_80BB31B8(EnGeg* this, PlayState* play) {
}
void func_80BB32AC(EnGeg* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_StartTextbox(play, this->unk_496, &this->actor);
this->actionFunc = func_80BB27D4;
} else {

2
src/overlays/actors/ovl_En_Gg/z_en_gg.c
View File

@ -258,7 +258,7 @@ void func_80B35450(EnGg* this, PlayState* play) {
func_80B359DC(this, play);
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) {
Actor_DeactivateLens(play);
}

2
src/overlays/actors/ovl_En_Gg2/z_en_gg2.c
View File

@ -183,7 +183,7 @@ void func_80B3AE60(EnGg2* this, PlayState* play) {
}
void func_80B3AFB0(EnGg2* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_2F0 = 1;
this->actionFunc = func_80B3AE60;
} else if ((this->actor.xzDistToPlayer < 100.0f) && (this->actor.xzDistToPlayer > 50.0f) &&

4
src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
View File

@ -88,7 +88,7 @@ void EnGinkoMan_Idle(EnGinkoMan* this, PlayState* play) {
s32 yaw = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
EnGinkoMan_SwitchAnimation(this, play);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (HS_GET_BANK_RUPEES() == 0) {
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, GINKO_ANIM_LEGSMACKING);
Message_StartTextbox(play, 0x44C, &this->actor);
@ -565,7 +565,7 @@ void EnGinkoMan_SetupBankAward2(EnGinkoMan* this) {
// separate function to handle bank rewards... called while the player is receiving the award
void EnGinkoMan_BankAward2(EnGinkoMan* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_10_08) && (this->curTextId == 0x45B)) {
SET_WEEKEVENTREG(WEEKEVENTREG_10_08);
Message_StartTextbox(play, 0x47A, &this->actor);

8
src/overlays/actors/ovl_En_Gk/z_en_gk.c
View File

@ -679,7 +679,7 @@ void func_80B51760(EnGk* this, PlayState* play) {
return;
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_1E4 |= 4;
this->unk_31C = func_80B50410(this, play);
Message_StartTextbox(play, this->unk_31C, &this->actor);
@ -893,7 +893,7 @@ void func_80B5202C(EnGk* this, PlayState* play) {
}
if (!func_80B50854(this, play)) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
SET_WEEKEVENTREG(WEEKEVENTREG_24_80);
this->actionFunc = func_80B51698;
} else if ((this->actor.xzDistToPlayer < 100.0f) || this->actor.isLockedOn) {
@ -952,7 +952,7 @@ void func_80B5227C(EnGk* this, PlayState* play) {
}
void func_80B52340(EnGk* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_1E4 |= 4;
if (CHECK_EVENTINF(EVENTINF_11)) {
this->unk_31C = 0xE90;
@ -1024,7 +1024,7 @@ void func_80B5253C(EnGk* this, PlayState* play) {
}
void func_80B525E0(EnGk* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_31C = 0xE92;
Message_StartTextbox(play, this->unk_31C, &this->actor);
this->actionFunc = func_80B52430;

2
src/overlays/actors/ovl_En_Gm/z_en_gm.c
View File

@ -757,7 +757,7 @@ s32 func_8094EE84(EnGm* this, PlayState* play) {
s32 ret = false;
if (((this->unk_3A4 & SUBS_OFFER_MODE_MASK) != SUBS_OFFER_MODE_NONE) &&
Actor_ProcessTalkRequest(&this->actor, &play->state)) {
Actor_TalkOfferAccepted(&this->actor, &play->state)) {
SubS_SetOfferMode(&this->unk_3A4, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK);
this->unk_3E0 = 0;
this->unk_3E4 = NULL;

2
src/overlays/actors/ovl_En_Go/z_en_go.c
View File

@ -891,7 +891,7 @@ void EnGo_UpdateCollider(EnGo* this, PlayState* play) {
*/
s32 EnGo_UpdateTalking(EnGo* this, PlayState* play) {
if (((this->actionFlags & SUBS_OFFER_MODE_MASK) == SUBS_OFFER_MODE_NONE) ||
!Actor_ProcessTalkRequest(&this->actor, &play->state)) {
!Actor_TalkOfferAccepted(&this->actor, &play->state)) {
return false;
}

2
src/overlays/actors/ovl_En_Gs/z_en_gs.c
View File

@ -1030,7 +1030,7 @@ void EnGs_Update(Actor* thisx, PlayState* play) {
s32 pad;
EnGs* this = THIS;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
play->msgCtx.msgMode = MSGMODE_NONE;
play->msgCtx.msgLength = 0;
this->collider.base.acFlags &= ~AC_HIT;

2
src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c
View File

@ -155,7 +155,7 @@ void EnGuardNuts_Wait(EnGuardNuts* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
yawDiff = ABS_ALT(BINANG_SUB(this->actor.yawTowardsPlayer, this->actor.home.rot.y));
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
func_80ABB540(this);
return;
}

4
src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c
View File

@ -181,7 +181,7 @@ void func_80BC6F14(EnGuruguru* this, PlayState* play) {
yawTemp = this->actor.yawTowardsPlayer - this->actor.world.rot.y;
yaw = ABS_ALT(yawTemp);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
func_80BC701C(this, play);
} else if (yaw <= 0x2890) {
Actor_OfferTalk(&this->actor, play, 60.0f);
@ -323,7 +323,7 @@ void func_80BC7440(EnGuruguru* this, PlayState* play) {
void func_80BC7520(EnGuruguru* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_80BC7068;
} else {
Actor_OfferTalkExchange(&this->actor, play, 400.0f, 400.0f, PLAYER_IA_MINUS1);

2
src/overlays/actors/ovl_En_Hg/z_en_hg.c
View File

@ -233,7 +233,7 @@ void EnHg_ReactToHit(EnHg* this, PlayState* play) {
void EnHg_HandleTatlDialog(EnHg* this, PlayState* play) {
if (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_StartTextbox(play, 0x24F, &this->actor);
} else {
Actor_OfferTalk(&this->actor, play, 80.0f);

2
src/overlays/actors/ovl_En_Hgo/z_en_hgo.c
View File

@ -150,7 +150,7 @@ void EnHgo_SetupTalk(EnHgo* this) {
}
void EnHgo_Talk(EnHgo* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (Player_GetMask(play) == PLAYER_MASK_GIBDO) {
if (!(this->talkFlags & TALK_FLAG_HAS_SPOKEN_WITH_GIBDO_MASK)) {
this->talkFlags |= TALK_FLAG_HAS_SPOKEN_WITH_GIBDO_MASK;

2
src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c
View File

@ -184,7 +184,7 @@ void func_80BDB2B8(EnHiddenNuts* this, PlayState* play) {
this->unk_20A = false;
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
func_80BDB580(this);
return;
}

2
src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c
View File

@ -411,7 +411,7 @@ void func_80C2075C(EnHintSkb* this) {
}
void func_80C2077C(EnHintSkb* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_3E0 = 1;
if (this->unk_3DC == 0) {
this->unk_3DC = 1;

4
src/overlays/actors/ovl_En_Horse/z_en_horse.c
View File

@ -691,7 +691,7 @@ s32 EnHorse_PlayerCanMove(EnHorse* this, PlayState* play) {
if ((player->stateFlags1 & PLAYER_STATE1_1) || (func_800B7128(GET_PLAYER(play)) == true) ||
(player->stateFlags1 & PLAYER_STATE1_100000) ||
(((this->stateFlags & ENHORSE_FLAG_19) || (this->stateFlags & ENHORSE_FLAG_29)) && !this->inRace) ||
(this->action == ENHORSE_ACTION_HBA) || (player->actor.flags & ACTOR_FLAG_TALK_REQUESTED) ||
(this->action == ENHORSE_ACTION_HBA) || (player->actor.flags & ACTOR_FLAG_TALK) ||
(play->csCtx.state != CS_STATE_IDLE) || (CutsceneManager_GetCurrentCsId() != CS_ID_NONE) ||
(player->stateFlags1 & PLAYER_STATE1_20) || (player->csAction != PLAYER_CSACTION_NONE)) {
return false;
@ -1662,7 +1662,7 @@ void EnHorse_Reverse(EnHorse* this, PlayState* play) {
} else if (stickMag < 10.0f) {
stickAngle = -0x7FFF;
}
} else if ((player->actor.flags & ACTOR_FLAG_TALK_REQUESTED) || (play->csCtx.state != CS_STATE_IDLE) ||
} else if ((player->actor.flags & ACTOR_FLAG_TALK) || (play->csCtx.state != CS_STATE_IDLE) ||
(CutsceneManager_GetCurrentCsId() != CS_ID_NONE) || (player->stateFlags1 & PLAYER_STATE1_20)) {
EnHorse_StartMountedIdleResetAnim(this);
this->actor.speed = 0.0f;

2
src/overlays/actors/ovl_En_Hs/z_en_hs.c
View File

@ -253,7 +253,7 @@ void func_809533A0(EnHs* this, PlayState* play) {
}
void func_8095345C(EnHs* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_80953180;
func_809533A0(this, play);
if (this->stateFlags & 8) {

2
src/overlays/actors/ovl_En_Ig/z_en_ig.c
View File

@ -440,7 +440,7 @@ s32 func_80BF19A0(EnIg* this, PlayState* play) {
s32 ret = false;
if (((this->unk_3D0 & SUBS_OFFER_MODE_MASK) != SUBS_OFFER_MODE_NONE) &&
Actor_ProcessTalkRequest(&this->actor, &play->state)) {
Actor_TalkOfferAccepted(&this->actor, &play->state)) {
SubS_SetOfferMode(&this->unk_3D0, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK);
this->unk_3F6 = 0;
this->unk_3F8 = NULL;

10
src/overlays/actors/ovl_En_In/z_en_in.c
View File

@ -348,7 +348,7 @@ void func_808F395C(EnIn* this, PlayState* play) {
if (this->unk4B0 == WEEKEVENTREG_HORSE_RACE_STATE_END) {
this->actionFunc = func_808F5A94;
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actionFunc = func_808F5A34;
this->unk48C = 1;
@ -400,7 +400,7 @@ void func_808F39DC(EnIn* this, PlayState* play) {
}
void func_808F3AD4(EnIn* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->unk48C = 1;
this->actionFunc = func_808F5A94;
@ -424,7 +424,7 @@ void func_808F3B40(EnIn* this, PlayState* play) {
}
void func_808F3BD4(EnIn* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->unk48C = 1;
this->actionFunc = func_808F5A94;
@ -448,7 +448,7 @@ void func_808F3C40(EnIn* this, PlayState* play) {
}
void func_808F3CD4(EnIn* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->unk48C = 1;
this->actionFunc = func_808F5A94;
@ -1352,7 +1352,7 @@ s32 func_808F5728(PlayState* play, EnIn* this, s32 arg2, s32* arg3) {
*arg3 = 1;
return 0;
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
*arg3 = 1;
return 1;
}

2
src/overlays/actors/ovl_En_Ja/z_en_ja.c
View File

@ -137,7 +137,7 @@ s32 func_80BC19FC(EnJa* this, PlayState* play) {
s32 ret = false;
if (((this->unk_340 & SUBS_OFFER_MODE_MASK) != SUBS_OFFER_MODE_NONE) &&
Actor_ProcessTalkRequest(&this->actor, &play->state)) {
Actor_TalkOfferAccepted(&this->actor, &play->state)) {
SubS_SetOfferMode(&this->unk_340, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK);
this->actionFunc = func_80BC22F4;
ret = true;

6
src/overlays/actors/ovl_En_Jg/z_en_jg.c
View File

@ -351,7 +351,7 @@ void EnJg_Idle(EnJg* this, PlayState* play) {
}
void EnJg_GoronShrineIdle(EnJg* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->flags |= FLAG_LOOKING_AT_PLAYER;
Message_StartTextbox(play, this->textId, &this->actor);
this->actionFunc = EnJg_GoronShrineTalk;
@ -594,7 +594,7 @@ void EnJg_FrozenIdle(EnJg* this, PlayState* play) {
}
}
} else {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_StartTextbox(play, 0x236, &this->actor); // The old Goron is frozen solid!
this->actionFunc = EnJg_EndFrozenInteraction;
} else if (this->actor.isLockedOn) {
@ -904,7 +904,7 @@ void EnJg_CheckIfTalkingToPlayerAndHandleFreezeTimer(EnJg* this, PlayState* play
s16 curFrame = this->skelAnime.curFrame;
s16 endFrame = Animation_GetLastFrame(sAnimationInfo[this->animIndex].animation);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->flags |= FLAG_LOOKING_AT_PLAYER;
this->actor.speed = 0.0f;

6
src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c
View File

@ -160,7 +160,7 @@ void func_80C13B74(EnJgameTsn* this) {
void func_80C13BB8(EnJgameTsn* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (this->actor.flags & ACTOR_FLAG_10000) {
this->actor.flags &= ~ACTOR_FLAG_10000;
if (gSaveContext.timerCurTimes[TIMER_ID_MINIGAME_2] > SECONDS_TO_TIMER(0)) {
@ -215,7 +215,7 @@ void func_80C13E6C(EnJgameTsn* this) {
}
void func_80C13E90(EnJgameTsn* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
if (((gSaveContext.save.time > CLOCK_TIME(4, 0)) && (gSaveContext.save.time < CLOCK_TIME(7, 0))) ||
((gSaveContext.save.time > CLOCK_TIME(16, 0)) && (gSaveContext.save.time < CLOCK_TIME(19, 0)))) {
@ -407,7 +407,7 @@ void func_80C145FC(EnJgameTsn* this) {
}
void func_80C14610(EnJgameTsn* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_StartTextbox(play, 0x10A4, &this->actor);
this->unk_300 = 0x10A4;
func_80C14030(this);

14
src/overlays/actors/ovl_En_Js/z_en_js.c
View File

@ -485,19 +485,19 @@ void func_80969400(s32 arg0) {
void func_80969494(EnJs* this, PlayState* play) {
func_80968A5C(this);
Message_CloseTextbox(play);
this->actor.flags &= ~ACTOR_FLAG_TALK_REQUESTED;
this->actor.flags &= ~ACTOR_FLAG_TALK;
this->actionFunc = func_80969B5C;
}
void func_809694E8(EnJs* this, PlayState* play) {
Message_CloseTextbox(play);
this->actor.flags &= ~ACTOR_FLAG_TALK_REQUESTED;
this->actor.flags &= ~ACTOR_FLAG_TALK;
this->actionFunc = func_8096A104;
}
void func_80969530(EnJs* this, PlayState* play) {
Message_CloseTextbox(play);
this->actor.flags &= ~ACTOR_FLAG_TALK_REQUESTED;
this->actor.flags &= ~ACTOR_FLAG_TALK;
this->actionFunc = func_8096A6F4;
if ((this->actor.home.rot.y == this->actor.shape.rot.y) && (this->unk_2B8 & 0x10)) {
Animation_Change(&this->skelAnime, &gMoonChildGettingUpAnim, -1.0f,
@ -686,7 +686,7 @@ void func_80969B5C(EnJs* this, PlayState* play) {
}
}
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_80969898;
this->actor.speed = 0.0f;
this->unk_2B4 = 0.0f;
@ -865,7 +865,7 @@ void func_8096A080(EnJs* this, PlayState* play) {
void func_8096A104(EnJs* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_80969DA4;
func_8096A080(this, play);
} else if (func_80968DD0(this, play)) {
@ -890,7 +890,7 @@ void func_8096A1E8(EnJs* this, PlayState* play) {
if (SkelAnime_Update(&this->skelAnime)) {
Animation_MorphToLoop(&this->skelAnime, &gMoonChildStandingAnim, 0.0f);
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actionFunc = func_8096A38C;
Message_StartTextbox(play, 0x2208, &this->actor);
@ -1055,7 +1055,7 @@ void func_8096A6F4(EnJs* this, PlayState* play) {
Animation_MorphToLoop(&this->skelAnime, &gMoonChildSittingAnim, -10.0f);
this->unk_2B8 &= ~8;
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_8096A38C;
this->unk_2B8 &= ~2;
func_8096A184(this, play);

6
src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
View File

@ -327,7 +327,7 @@ void EnKakasi_TimeSkipDialogue(EnKakasi* this, PlayState* play) {
this->picto.actor.flags |= ACTOR_FLAG_10000;
}
if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
player->stateFlags1 &= ~PLAYER_STATE1_20;
this->unkState196 = 2;
this->picto.actor.flags &= ~ACTOR_FLAG_10000;
@ -356,7 +356,7 @@ void EnKakasi_IdleStanding(EnKakasi* this, PlayState* play) {
EnKakasi_SetupSongTeach(this, play);
return;
}
if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
this->skelAnime.playSpeed = 1.0f;
EnKakasi_SetupDialogue(this);
return;
@ -1111,7 +1111,7 @@ void EnKakasi_SetupIdleRisen(EnKakasi* this) {
void EnKakasi_IdleRisen(EnKakasi* this, PlayState* play) {
Math_SmoothStepToS(&this->picto.actor.shape.rot.y, this->picto.actor.yawTowardsPlayer, 5, 1000, 0);
if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
this->actionFunc = EnKakasi_RisenDialogue;
} else {
Actor_OfferTalk(&this->picto.actor, play, 70.0f);

2
src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
View File

@ -184,7 +184,7 @@ void func_80954BE8(EnKanban* this, PlayState* play) {
if (this->msgTimer == 0) {
yaw = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
if (ABS_ALT(yaw) < 0x2800) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->msgFlag = true;
} else {
Actor_OfferTalk(&this->actor, play, 68.0f);

2
src/overlays/actors/ovl_En_Kbt/z_en_kbt.c
View File

@ -281,7 +281,7 @@ void func_80B3415C(EnKbt* this) {
void func_80B34314(EnKbt* this, PlayState* play) {
func_80B34078(this);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_80B34598;
Actor_ChangeFocus(&this->actor, play, this->unk_278);
this->unk_278->textId = this->actor.textId;

6
src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c
View File

@ -168,7 +168,7 @@ void func_80B2654C(EnKendoJs* this, PlayState* play) {
s32 phi_v0;
s32 sp30;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (CURRENT_DAY != 0) {
sp30 = CURRENT_DAY - 1;
} else {
@ -514,7 +514,7 @@ void func_80B27030(EnKendoJs* this, PlayState* play) {
if (EnKendoJs_MovePlayerToPos(play, sp20)) {
this->actor.flags |= ACTOR_FLAG_10000;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
player->stateFlags1 &= ~PLAYER_STATE1_20;
func_80B279F0(this, play, 0);
@ -686,7 +686,7 @@ void func_80B27760(EnKendoJs* this) {
void func_80B27774(EnKendoJs* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_63_20)) {
SET_WEEKEVENTREG(WEEKEVENTREG_63_20);
Message_StartTextbox(play, 0x272F, &this->actor);

22
src/overlays/actors/ovl_En_Kgy/z_en_kgy.c
View File

@ -489,7 +489,7 @@ void func_80B417B8(EnKgy* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) {
Message_CloseTextbox(play);
func_80B413C8(this);
this->actor.flags &= ~ACTOR_FLAG_TALK_REQUESTED;
this->actor.flags &= ~ACTOR_FLAG_TALK;
this->actionFunc = func_80B419B0;
func_80B40E18(this, 7);
}
@ -517,7 +517,7 @@ void func_80B418C4(EnKgy* this, PlayState* play) {
func_80B413C8(this);
CutsceneManager_Queue(this->csIdList[5]);
this->actionFunc = func_80B41858;
this->actor.flags &= ~ACTOR_FLAG_TALK_REQUESTED;
this->actor.flags &= ~ACTOR_FLAG_TALK;
}
func_80B40EE8(this, play);
}
@ -527,7 +527,7 @@ void func_80B419B0(EnKgy* this, PlayState* play) {
Player* player = GET_PLAYER(play);
func_80B4163C(this, play);
if (Actor_ProcessTalkRequest(&this->actor, &play->state) || (&this->actor == player->talkActor)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state) || (&this->actor == player->talkActor)) {
func_80B411DC(this, play, 4);
func_80B40E18(this, this->actor.textId);
if (this->actor.textId == 0xC37) {
@ -604,14 +604,14 @@ void func_80B41C54(EnKgy* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (Actor_TextboxIsClosing(&this->actor, play)) {
this->actionFunc = func_80B41C30;
this->actor.flags &= ~ACTOR_FLAG_TALK_REQUESTED;
this->actor.flags &= ~ACTOR_FLAG_TALK;
}
func_80B40EE8(this, play);
}
void func_80B41CBC(EnKgy* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
func_80B40E18(this, this->actor.textId);
this->actionFunc = func_80B41E18;
@ -877,7 +877,7 @@ void func_80B42508(EnKgy* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
this->actor.focus.pos = this->unk_2A8;
if (Actor_ProcessTalkRequest(&this->actor, &play->state) || (&this->actor == player->talkActor)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state) || (&this->actor == player->talkActor)) {
this->actionFunc = func_80B41E18;
func_80B411DC(this, play, 4);
func_80B40E18(this, this->actor.textId);
@ -887,7 +887,7 @@ void func_80B42508(EnKgy* this, PlayState* play) {
void func_80B425A0(EnKgy* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
this->actor.focus.pos = this->unk_2A8;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_80B41E18;
EnKgy_ChangeAnimLoopMorph(this, ENKGY_ANIM_1);
func_80B411DC(this, play, 0);
@ -903,7 +903,7 @@ void func_80B42660(EnKgy* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) {
Message_CloseTextbox(play);
func_80B413C8(this);
this->actor.flags &= ~ACTOR_FLAG_TALK_REQUESTED;
this->actor.flags &= ~ACTOR_FLAG_TALK;
this->actionFunc = func_80B42714;
func_80B40E18(this, 7);
}
@ -916,7 +916,7 @@ void func_80B42714(EnKgy* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
this->actor.focus.pos = this->unk_2A8;
if (Actor_ProcessTalkRequest(&this->actor, &play->state) || (&this->actor == player->talkActor)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state) || (&this->actor == player->talkActor)) {
func_80B411DC(this, play, 4);
func_80B40E18(this, this->actor.textId);
if (this->actor.textId == 0xC37) {
@ -985,7 +985,7 @@ void func_80B4296C(EnKgy* this, PlayState* play) {
}
this->actor.focus.pos = this->unk_2A8;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_80B427C8;
if (this->animIndex == ENKGY_ANIM_4) {
EnKgy_ChangeAnimLoopMorph(this, ENKGY_ANIM_7);
@ -1100,7 +1100,7 @@ void func_80B42D28(EnKgy* this, PlayState* play) {
}
this->actor.focus.pos = this->unk_2A8;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_80B42A8C;
if (this->actor.textId == 0xC2D) {
EnKgy_ChangeAnimLoopMorph(this, ENKGY_ANIM_1);

2
src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c
View File

@ -82,7 +82,7 @@ void EnKujiya_SetupWait(EnKujiya* this) {
}
void EnKujiya_Wait(EnKujiya* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if ((gSaveContext.save.time >= CLOCK_TIME(6, 0)) && (gSaveContext.save.time < CLOCK_TIME(18, 0))) {
if (EnKujiya_CheckBoughtTicket()) {
Message_StartTextbox(play, 0x2B61, &this->actor);

4
src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c
View File

@ -383,7 +383,7 @@ void EnLiftNuts_Idle(EnLiftNuts* this, PlayState* play) {
} else if (this->actor.xzDistToPlayer > 120.0f) {
EnLiftNuts_SetupBurrow(this);
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (GET_PLAYER_FORM == PLAYER_FORM_DEKU) {
if (EnLiftNuts_MinigameState(ENLIFTNUTS_MINIGAME_STATE_MODE_CHECK, ENLIFTNUTS_MINIGAME_STATE_NONE)) {
switch (CURRENT_DAY) {
@ -944,7 +944,7 @@ void EnLiftNuts_SetupResumeConversation(EnLiftNuts* this) {
* Resumes the current conversation after giving player the reward for winning the minigame.
*/
void EnLiftNuts_ResumeConversation(EnLiftNuts* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_WON_DEKU_PLAYGROUND_DAY_1) &&
CHECK_WEEKEVENTREG(WEEKEVENTREG_WON_DEKU_PLAYGROUND_DAY_2) && (CURRENT_DAY == 3)) {
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, ENLIFTNUTS_ANIM_SHOCKED_END);

6
src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
View File

@ -370,7 +370,7 @@ void EnMa4_Wait(EnMa4* this, PlayState* play) {
}
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
EnMa4_StartDialogue(this, play);
EnMa4_SetupDialogueHandler(this);
} else if (this->type != MA4_TYPE_ALIENS_WON || ABS_ALT(yaw) < 0x4000) {
@ -703,7 +703,7 @@ void EnMa4_BeginHorsebackGame(EnMa4* this, PlayState* play) {
}
void EnMa4_HorsebackGameCheckPlayerInteractions(EnMa4* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
// "You're feeling confident"
Message_StartTextbox(play, 0x336E, &this->actor);
this->actionFunc = EnMa4_HorsebackGameTalking;
@ -880,7 +880,7 @@ void EnMa4_EndEponasSongCs(EnMa4* this, PlayState* play) {
Player* player = GET_PLAYER(play);
this->actor.flags |= ACTOR_FLAG_10000;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
player->stateFlags1 &= ~PLAYER_STATE1_20;
Message_StartTextbox(play, 0x334C, &this->actor);
this->textId = 0x334C;

14
src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c
View File

@ -431,7 +431,7 @@ void EnMaYto_DefaultWait(EnMaYto* this, PlayState* play) {
EnMaYto_ChangeAnim(this, CREMIA_ANIM_11);
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
EnMaYto_DefaultStartDialogue(this, play);
EnMaYto_SetupDefaultDialogueHandler(this);
} else if (ABS_ALT(direction) < 0x1555) {
@ -543,13 +543,13 @@ void EnMaYto_SetupDinnerWait(EnMaYto* this) {
void EnMaYto_DinnerWait(EnMaYto* this, PlayState* play) {
s16 direction = this->actor.shape.rot.y - this->actor.yawTowardsPlayer;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
EnMaYto_DinnerStartDialogue(this, play);
EnMaYto_SetupDinnerDialogueHandler(this);
} else {
Actor* child = this->actor.child;
if ((child != NULL) && Actor_ProcessTalkRequest(child, &play->state)) {
if ((child != NULL) && Actor_TalkOfferAccepted(child, &play->state)) {
Actor_ChangeFocus(&this->actor, play, &this->actor);
EnMaYto_DinnerStartDialogue(this, play);
EnMaYto_SetupDinnerDialogueHandler(this);
@ -740,13 +740,13 @@ void EnMaYto_BarnWait(EnMaYto* this, PlayState* play) {
s16 direction = this->actor.shape.rot.y + 0x471C;
direction -= this->actor.yawTowardsPlayer;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
EnMaYto_BarnStartDialogue(this, play);
EnMaYto_SetupBarnDialogueHandler(this);
} else {
Actor* child = this->actor.child;
if ((child != NULL) && Actor_ProcessTalkRequest(child, &play->state)) {
if ((child != NULL) && Actor_TalkOfferAccepted(child, &play->state)) {
Actor_ChangeFocus(&this->actor, play, &this->actor);
EnMaYto_BarnStartDialogue(this, play);
EnMaYto_SetupBarnDialogueHandler(this);
@ -922,7 +922,7 @@ void EnMaYto_SetupAfterMilkRunInit(EnMaYto* this) {
void EnMaYto_AfterMilkRunInit(EnMaYto* this, PlayState* play) {
this->actor.flags |= ACTOR_FLAG_10000;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_ESCORTED_CREMIA)) {
@ -1013,7 +1013,7 @@ void EnMaYto_SetupPostMilkRunExplainReward(EnMaYto* this) {
}
void EnMaYto_PostMilkRunExplainReward(EnMaYto* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (this->unk310 == 1) {
// Romani's mask explanation
EnMaYto_SetFaceExpression(this, 0, 1);

2
src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c
View File

@ -328,7 +328,7 @@ void EnMaYts_SetupStartDialogue(EnMaYts* this) {
void EnMaYts_StartDialogue(EnMaYts* this, PlayState* play) {
s16 sp26 = this->actor.shape.rot.y - this->actor.yawTowardsPlayer;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (GET_PLAYER_FORM != PLAYER_FORM_HUMAN) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_65_80)) {
// Saying to non-human Link: "Cremia went to town."

6
src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c
View File

@ -324,7 +324,7 @@ void EnMinifrog_Idle(EnMinifrog* this, PlayState* play) {
EnMinifrog_TurnToPlayer(this);
EnMinifrog_Jump(this);
EnMinifrog_JumpTimer(this);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = EnMinifrog_ReturnFrogCutscene;
if (this->actor.csId != CS_ID_NONE) {
this->flags |= 1;
@ -472,7 +472,7 @@ void EnMinifrog_BeginChoirCutscene(EnMinifrog* this, PlayState* play) {
void EnMinifrog_EndChoir(EnMinifrog* this, PlayState* play) {
EnMinifrog_TurnToPlayer(this);
EnMinifrog_Jump(this);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_StartTextbox(play, 0xD7E, &this->actor);
this->actionFunc = EnMinifrog_YellowFrogDialog;
} else {
@ -576,7 +576,7 @@ void EnMinifrog_SetupYellowFrogDialog(EnMinifrog* this, PlayState* play) {
EnMinifrog_TurnToPlayer(this);
EnMinifrog_Jump(this);
EnMinifrog_JumpTimer(this);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = EnMinifrog_YellowFrogDialog;
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_34_01)) {
Message_StartTextbox(play, 0xD76, &this->actor);

6
src/overlays/actors/ovl_En_Mk/z_en_mk.c
View File

@ -204,7 +204,7 @@ void func_80959774(EnMk* this, PlayState* play) {
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.home.rot.y, 3, 0x400, 0x80);
this->actor.world.rot.y = this->actor.shape.rot.y;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
func_80959624(this, play);
this->actionFunc = func_809596A0;
} else if ((this->actor.xzDistToPlayer < 120.0f) && Player_IsFacingActor(&this->actor, 0x3000, play)) {
@ -376,7 +376,7 @@ void func_80959A24(EnMk* this, PlayState* play) {
}
void func_80959C94(EnMk* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_80959A24;
this->unk_27A &= ~2;
Message_StartTextbox(play, 0xFB3, &this->actor);
@ -436,7 +436,7 @@ void func_80959E18(EnMk* this, PlayState* play) {
this->actor.csId = this->csIdList[1];
}
CutsceneManager_Queue(this->actor.csId);
} else if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
} else if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
func_80959844(this, play);
this->actionFunc = func_80959A24;
this->unk_27A |= 1;

2
src/overlays/actors/ovl_En_Mm2/z_en_mm2.c
View File

@ -68,7 +68,7 @@ void EnMm2_Reading(EnMm2* this, PlayState* play) {
* so (and facing the letter).
*/
void EnMm2_WaitForRead(EnMm2* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_StartTextbox(play, 0x277B, &this->actor);
this->actionFunc = EnMm2_Reading;
} else if ((this->actor.xzDistToPlayer < 60.0f) && Player_IsFacingActor(&this->actor, 0x3000, play)) {

6
src/overlays/actors/ovl_En_Mm3/z_en_mm3.c
View File

@ -139,7 +139,7 @@ void func_80A6F270(EnMm3* this) {
}
void func_80A6F2C8(EnMm3* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_StartTextbox(play, 0x278A, &this->actor);
this->unk_2B4 = 0x278A;
func_80A6F9C8(this);
@ -418,7 +418,7 @@ void func_80A6FBFC(EnMm3* this, PlayState* play) {
gSaveContext.postmanTimerStopOsTime = osGetTime();
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
AudioSfx_MuteBanks(0);
Audio_SetMainBgmVolume(0x7F, 5);
Message_StartTextbox(play, 0x2791, &this->actor);
@ -464,7 +464,7 @@ void func_80A6FED8(EnMm3* this) {
void func_80A6FEEC(EnMm3* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
player->stateFlags1 &= ~PLAYER_STATE1_20;
Message_StartTextbox(play, 0x2794, &this->actor);
this->unk_2B4 = 0x2794;

24
src/overlays/actors/ovl_En_Mnk/z_en_mnk.c
View File

@ -768,7 +768,7 @@ void func_80AB64B8(EnMnk* this, PlayState* play) {
Math_SmoothStepToS(&this->picto.actor.shape.rot.y, this->picto.actor.world.rot.y, 2, 0xBB8, 0xC8);
}
if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
this->picto.actor.flags &= ~ACTOR_FLAG_10000;
this->actionFunc = func_80AB63CC;
EnMnk_Monkey_ChangeAnim(this, 9, ANIMMODE_ONCE, -5.0f);
@ -876,7 +876,7 @@ void EnMnk_Monkey_WaitToTalkAfterRun(EnMnk* this, PlayState* play) {
this->picto.actor.shape.rot.y = this->picto.actor.yawTowardsPlayer;
this->picto.actor.world.rot.y = this->picto.actor.yawTowardsPlayer;
SkelAnime_Update(&this->skelAnime);
if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
Animation_PlayOnce(&this->skelAnime, &object_mnk_Anim_009CC0);
this->actionFunc = EnMnk_Monkey_TalkAfterRun;
this->flags &= ~MONKEY_FLAGS_4;
@ -1057,7 +1057,7 @@ void EnMnk_Monkey_WaitToTalkAfterApproach(EnMnk* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
EnMnk_Monkey_MoveRelativeToPlayer(this, play);
if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
if (MONKEY_GET_TYPE(&this->picto.actor) == MONKEY_OUTSIDECHAMBER) {
EnMnk_Monkey_SetAnim(this, 2);
} else {
@ -1451,7 +1451,7 @@ void EnMnk_MonkeyTiedUp_WaitUnused(EnMnk* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
SkelAnime_Update(&this->propSkelAnime);
if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
this->actionFunc = EnMnk_MonkeyTiedUp_TalkUnused;
this->unk_3E0 = 0;
} else if (EnMnk_PlayerIsInTalkRange(this, play)) {
@ -1502,7 +1502,7 @@ void EnMnk_MonkeyTiedUp_WaitForInstrument(EnMnk* this, PlayState* play) {
this->picto.actor.csId = this->csIdList[0];
Message_StartTextbox(play, this->picto.actor.textId, NULL);
CutsceneManager_Queue(this->picto.actor.csId);
} else if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
} else if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
this->actionFunc = EnMnk_MonkeyTiedUp_TransitionAfterTalk;
EnMnk_MonkeyTiedUp_SetAnim(this, MONKEY_TIEDUP_ANIM_KICKAROUND);
} else if (EnMnk_PlayerIsInTalkRange(this, play)) {
@ -1516,7 +1516,7 @@ void EnMnk_MonkeyTiedUp_TalkAfterCutRope(EnMnk* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
SkelAnime_Update(&this->propSkelAnime);
if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
this->actionFunc = EnMnk_MonkeyTiedUp_TransitionAfterTalk;
this->picto.actor.flags &= ~ACTOR_FLAG_10000;
} else {
@ -1528,7 +1528,7 @@ void EnMnk_MonkeyTiedUp_WaitForCutRope(EnMnk* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
SkelAnime_Update(&this->propSkelAnime);
if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
if ((gSaveContext.save.playerForm == PLAYER_FORM_FIERCE_DEITY) ||
(gSaveContext.save.playerForm == PLAYER_FORM_HUMAN)) {
EnMnk_MonkeyTiedUp_SetAnim(this, MONKEY_TIEDUP_ANIM_SHH);
@ -1579,7 +1579,7 @@ void EnMnk_MonkeyTiedUp_Wait(EnMnk* this, PlayState* play) {
this->picto.actor.csId = this->csIdList[2];
play->msgCtx.ocarinaMode = OCARINA_MODE_END;
CutsceneManager_Queue(this->csIdList[2]);
} else if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
} else if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
if (gSaveContext.save.playerForm == PLAYER_FORM_DEKU) {
if (this->picto.actor.textId == 0x8EC) {
EnMnk_MonkeyTiedUp_SetAnim(this, MONKEY_TIEDUP_ANIM_SHAKEHEAD);
@ -1718,7 +1718,7 @@ void EnMnk_MonkeyHanging_WaitAfterDunk(EnMnk* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
SkelAnime_Update(&this->propSkelAnime);
if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
this->actionFunc = EnMnk_MonkeyHanging_Plead;
CutsceneManager_Queue(this->picto.actor.csId);
SET_WEEKEVENTREG(WEEKEVENTREG_83_08);
@ -1788,7 +1788,7 @@ void EnMnk_MonkeyHanging_StruggleBeforeDunk(EnMnk* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
SkelAnime_Update(&this->propSkelAnime);
if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
this->actionFunc = EnMnk_MonkeyHanging_Plead;
CutsceneManager_Queue(this->picto.actor.csId);
SET_WEEKEVENTREG(WEEKEVENTREG_83_08);
@ -1861,7 +1861,7 @@ void EnMnk_Monkey_SetupTalkBeforeGuideThroughWoods(EnMnk* this) {
void EnMnk_Monkey_WaitToGuideThroughWoods(EnMnk* this, PlayState* play) {
func_80AB5F6C(this);
if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
EnMnk_Monkey_SetupTalkBeforeGuideThroughWoods(this);
} else if (this->picto.actor.isLockedOn || (this->picto.actor.xzDistToPlayer < 100.0f)) {
Actor_OfferTalk(&this->picto.actor, play, 120.0f);
@ -1903,7 +1903,7 @@ void EnMnk_Monkey_WaitToTalkAfterSaved(EnMnk* this, PlayState* play) {
this->picto.actor.world.rot.y = this->picto.actor.yawTowardsPlayer;
SkelAnime_Update(&this->skelAnime);
if (Actor_ProcessTalkRequest(&this->picto.actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
this->actionFunc = EnMnk_Monkey_TalkAfterSaved;
EnMnk_Monkey_SetAnim(this, 7);
} else if ((this->picto.actor.xzDistToPlayer < 100.0f) && Player_IsFacingActor(&this->picto.actor, 0x3000, play)) {

4
src/overlays/actors/ovl_En_Ms/z_en_ms.c
View File

@ -88,7 +88,7 @@ void EnMs_Wait(EnMs* this, PlayState* play) {
this->actor.textId = 0x932;
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = EnMs_Talk;
} else if ((this->actor.xzDistToPlayer < 90.0f) && (ABS_ALT(yawDiff) < 0x2000)) {
Actor_OfferTalk(&this->actor, play, 90.0f);
@ -157,7 +157,7 @@ void EnMs_Sell(EnMs* this, PlayState* play) {
}
void EnMs_TalkAfterPurchase(EnMs* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_ContinueTextbox(play, 0x936);
this->actionFunc = EnMs_Talk;
} else {

2
src/overlays/actors/ovl_En_Muto/z_en_muto.c
View File

@ -162,7 +162,7 @@ void EnMuto_Idle(EnMuto* this, PlayState* play) {
this->actor.textId = 0x2363;
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
EnMuto_SetupDialogue(this, play);
return;
}

2
src/overlays/actors/ovl_En_Nb/z_en_nb.c
View File

@ -402,7 +402,7 @@ s32 func_80BC04FC(EnNb* this, PlayState* play) {
s32 ret = false;
if (((this->stateFlags & SUBS_OFFER_MODE_MASK) != SUBS_OFFER_MODE_NONE) &&
Actor_ProcessTalkRequest(&this->actor, &play->state)) {
Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->stateFlags |= EN_NB_FLAG_20;
SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK);
this->behaviour = ENNB_BEHAVIOUR_0;

2
src/overlays/actors/ovl_En_Nnh/z_en_nnh.c
View File

@ -76,7 +76,7 @@ void EnNnh_SetupWaitForDialogue(EnNnh* this) {
}
void EnNnh_WaitForDialogue(EnNnh* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_StartTextbox(play, 0x228, &this->actor);
EnNnh_SetupDialogue(this);
} else {

2
src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c
View File

@ -151,7 +151,7 @@ void func_80B121D8(EnOnpuman* this, PlayState* play) {
this->actionFunc = func_80B1202C;
Message_StartTextbox(play, 0x8D4, NULL);
this->unk_2A0 = func_80B11F44(play);
} else if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
} else if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_80B1217C;
} else {
yaw = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;

4
src/overlays/actors/ovl_En_Osn/z_en_osn.c
View File

@ -722,14 +722,14 @@ void EnOsn_Idle(EnOsn* this, PlayState* play) {
if ((gSaveContext.save.saveInfo.inventory.items[SLOT_OCARINA] != ITEM_NONE) &&
!CHECK_QUEST_ITEM(QUEST_SONG_HEALING)) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = EnOsn_StartCutscene;
} else if (((this->actor.xzDistToPlayer < 100.0f) || this->actor.isLockedOn) && (yaw < 0x4000) &&
(yaw > -0x4000)) {
Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play);
this->actor.textId = 0xFFFF;
}
} else if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
} else if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->textId = EnOsn_GetInitialText(this, play);
Message_StartTextbox(play, this->textId, &this->actor);
this->actionFunc = EnOsn_Talk;

6
src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
View File

@ -303,7 +303,7 @@ void EnOssan_UpdateCursorPos(PlayState* play, EnOssan* this) {
void EnOssan_EndInteraction(PlayState* play, EnOssan* this) {
Player* player = GET_PLAYER(play);
Actor_ProcessTalkRequest(&this->actor, &play->state);
Actor_TalkOfferAccepted(&this->actor, &play->state);
play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
play->msgCtx.stateTimer = 4;
Interface_SetHudVisibility(HUD_VISIBILITY_ALL);
@ -369,7 +369,7 @@ void EnOssan_Idle(EnOssan* this, PlayState* play) {
Player* player = GET_PLAYER(play);
SubS_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, ENOSSAN_LIMB_MAX);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
player->stateFlags2 |= PLAYER_STATE2_20000000;
EnOssan_SetupAction(this, EnOssan_BeginInteraction);
if (this->cutsceneState == ENOSSAN_CUTSCENESTATE_STOPPED) {
@ -1197,7 +1197,7 @@ void EnOssan_ItemPurchased(EnOssan* this, PlayState* play) {
CutsceneManager_Queue(this->csId);
}
}
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_ContinueTextbox(play, 0x642);
} else {
Actor_OfferTalkExchangeEquiCylinder(&this->actor, play, 400.0f, PLAYER_IA_MINUS1);

6
src/overlays/actors/ovl_En_Ot/z_en_ot.c
View File

@ -534,7 +534,7 @@ void func_80B5C6DC(EnOt* this, PlayState* play) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_84_10) && (this->type == SEAHORSE_TYPE_1)) {
this->actor.textId = 0;
this->unk_384 = 1;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_3A0 = BINANG_ADD(sp3E, 0x4000);
this->unk_360->unk_3A0 = this->unk_3A0;
func_80B5C9A8(this, play);
@ -616,7 +616,7 @@ void func_80B5CBA0(EnOt* this, PlayState* play) {
}
void func_80B5CBEC(EnOt* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
func_80B5CC88(this, play);
} else {
@ -694,7 +694,7 @@ void func_80B5CEC8(EnOt* this, PlayState* play) {
s32 pad;
this->actor.textId = 0;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
func_80B5D114(this, play);
return;
}

8
src/overlays/actors/ovl_En_Owl/z_en_owl.c
View File

@ -224,7 +224,7 @@ void func_8095A920(EnOwl* this, PlayState* play) {
}
s32 func_8095A978(EnOwl* this, PlayState* play, u16 textId, f32 targetDist, f32 arg4) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
return true;
}
@ -238,7 +238,7 @@ s32 func_8095A978(EnOwl* this, PlayState* play, u16 textId, f32 targetDist, f32
}
s32 func_8095A9FC(EnOwl* this, PlayState* play, u16 textId) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
return true;
}
@ -506,7 +506,7 @@ void func_8095B480(EnOwl* this, PlayState* play) {
void func_8095B574(EnOwl* this, PlayState* play) {
func_8095A920(this, play);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_8095BA84;
Audio_PlayFanfare(NA_BGM_OWL);
this->actionFlags |= 0x40;
@ -734,7 +734,7 @@ void func_8095BA84(EnOwl* this, PlayState* play) {
void func_8095BE0C(EnOwl* this, PlayState* play) {
func_8095A920(this, play);
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_8095BA84;
Audio_PlayFanfare(NA_BGM_OWL);
this->csIdIndex = 1;

2
src/overlays/actors/ovl_En_Pamera/z_en_pamera.c
View File

@ -597,7 +597,7 @@ void func_80BD9938(EnPamera* this) {
}
void func_80BD994C(EnPamera* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (Player_GetMask(play) == PLAYER_MASK_GIBDO) {
func_80BD93CC(this, 0, 1);
Message_StartTextbox(play, 0x15A8, &this->actor);

Some files were not shown because too many files have changed in this diff Show More