Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2024-11-23 04:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Name Talking Related Actor Flags (#1733)

Browse Source 
* talk actor flags

* fix order

* remove comment
This commit is contained in:
engineer124 2024-10-24 11:12:41 +11:00 committed by GitHub
parent 19495ba8e9
commit 5a958cad4d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
51 changed files with 199 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/z64actor.h
View File

@ -489,14 +489,20 @@ typedef enum DoorLockType {
#define ACTOR_FLAG_4000 (1 << 14)
//! Carried by arrow
#define ACTOR_FLAG_8000 (1 << 15)
//
#define ACTOR_FLAG_10000 (1 << 16)
// Player automatically accepts a Talk Offer without needing to press the A button.
// Player still has to meet all conditions to be able to receive a talk offer (for example, being in range).
#define ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED (1 << 16)
// Actor can press and hold down heavy switches.
// See usages of `DynaPolyActor_SetHeavySwitchPressed` and `DynaPolyActor_IsHeavySwitchPressed` for more context on how switches work.
#define ACTOR_FLAG_CAN_PRESS_HEAVY_SWITCHES (1 << 17)
//
#define ACTOR_FLAG_40000 (1 << 18)
// When locked onto an actor with this flag set, the C-Up button can be used to talk to this actor.
// A C-Up button labeled "Tatl" will appear on the HUD when locked on which indicates the actor can be checked with Tatl.
// With this flag Player talks directly to the actor with C-Up. It is expected that the resulting dialog should appear
// to be coming from Tatl, even though she is not involved at all with this interaction.
#define ACTOR_FLAG_TALK_WITH_C_UP (1 << 18)
//
#define ACTOR_FLAG_80000 (1 << 19)
//

6
src/code/z_msgevent.c
View File

@ -175,7 +175,7 @@ s32 MsgEvent_Autotalk(Actor* actor, PlayState* play, u8** script, MsgScriptCallb
if (Actor_TalkOfferAccepted(actor, &play->state)) {
*script += skip;
} else {
actor->flags |= ACTOR_FLAG_10000;
actor->flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
xzDist = actor->xzDistToPlayer;
actor->xzDistToPlayer = 0.0f;
Actor_OfferTalkExchange(actor, play, xzRange, yRange, PLAYER_IA_NONE);
@ -471,14 +471,14 @@ s32 MsgEvent_Pause(Actor* actor, PlayState* play, u8** script, MsgScriptCallback
}
/**
* Unsets ACTOR_FLAG_10000 for the actor executing the cmd
* Unsets ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED for the actor executing the cmd
*
* Command structure:
* 0:(u8) cmd
* Command size: 1
*/
s32 MsgEvent_UnsetAutotalk(Actor* actor, PlayState* play, u8** script, MsgScriptCallback callback, s32* endScript) {
actor->flags &= ~ACTOR_FLAG_10000;
actor->flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
return false;
}

6
src/code/z_sub_s.c
View File

@ -861,7 +861,7 @@ s32 SubS_Offer(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, s32 itemI
xzRange = actor->xzDistToPlayer + 1.0f;
xzDistToPlayerTemp = actor->xzDistToPlayer;
actor->xzDistToPlayer = 0.0f;
actor->flags |= ACTOR_FLAG_10000;
actor->flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
canAccept = Actor_OfferTalkExchange(actor, play, xzRange, yRange, itemId);
actor->xzDistToPlayer = xzDistToPlayerTemp;
break;
@ -871,7 +871,7 @@ s32 SubS_Offer(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, s32 itemI
if (((screenPosX >= 0) || (screenPosX < SCREEN_WIDTH)) &&
((screenPosY >= 0) || (screenPosY < SCREEN_HEIGHT)) && (fabsf(actor->playerHeightRel) <= yRange) &&
(actor->xzDistToPlayer <= xzRange) && actor->isLockedOn) {
actor->flags |= ACTOR_FLAG_10000;
actor->flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
canAccept = Actor_OfferTalkExchange(actor, play, xzRange, yRange, itemId);
}
break;
@ -881,7 +881,7 @@ s32 SubS_Offer(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, s32 itemI
if (((screenPosX >= 0) || (screenPosX < SCREEN_WIDTH)) &&
((screenPosY >= 0) || (screenPosY < SCREEN_HEIGHT)) && (fabsf(actor->playerHeightRel) <= yRange) &&
(actor->xzDistToPlayer <= xzRange)) {
actor->flags |= ACTOR_FLAG_10000;
actor->flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
canAccept = Actor_OfferTalkExchange(actor, play, xzRange, yRange, itemId);
}
break;

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

@ -83,7 +83,7 @@ void ElfMsg2_Init(Actor* thisx, PlayState* play) {
ElfMsg2_SetupAction(this, func_8096EFD0);
} else {
ElfMsg2_SetupAction(this, func_8096EF98);
this->actor.flags |= (ACTOR_FLAG_40000 | ACTOR_FLAG_ATTENTION_ENABLED);
this->actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_TALK_WITH_C_UP);
this->actor.textId = func_8096EE50(this);
}
this->actor.shape.rot.z = 0;
@ -137,7 +137,7 @@ void func_8096EFD0(ElfMsg2* this, PlayState* play) {
if ((this->actor.home.rot.y < 0) && (this->actor.home.rot.y >= -0x80) &&
Flags_GetSwitch(play, -this->actor.home.rot.y - 1)) {
ElfMsg2_SetupAction(this, func_8096EF98);
this->actor.flags |= (ACTOR_FLAG_40000 | ACTOR_FLAG_ATTENTION_ENABLED);
this->actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_TALK_WITH_C_UP);
this->actor.textId = func_8096EE50(this);
}
}

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

@ -576,7 +576,7 @@ void EnAob01_BeforeRace_Idle(EnAob01* this, PlayState* play) {
if (EnAob01_ProcessIdleAnim(this)) {
if (EnAob01_PlayerIsHoldingDog(this, play) && !(this->stateFlags & ENAOB01_FLAG_PLAYER_CAN_TALK)) {
if (this->collider.base.ocFlags2 & OC2_HIT_PLAYER) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 100.0f);
this->stateFlags |= ENAOB01_FLAG_TALKING_TO_PLAYER_HOLDING_DOG;
this->actionFunc = EnAob01_BeforeRace_Talk;
@ -621,7 +621,7 @@ void EnAob01_BeforeRace_Talk(EnAob01* this, PlayState* play) {
this->actor.textId = 0;
this->stateFlags &= ~ENAOB01_FLAG_TALKING_TO_PLAYER_HOLDING_DOG;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = EnAob01_BeforeRace_Idle;
return;
}
@ -636,7 +636,7 @@ void EnAob01_BeforeRace_Talk(EnAob01* this, PlayState* play) {
if (this->stateFlags & ENAOB01_FLAG_TALKING_TO_PLAYER_HOLDING_DOG) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Player_SetAutoLockOnActor(play, &this->actor);
if (this->stateFlags & ENAOB01_FLAG_PLAYER_TOLD_TO_PICK_A_DOG) {
EnAob01_BeforeRace_HandleConversation(this, play);
@ -846,7 +846,7 @@ void EnAob01_Race_StartCutscene(EnAob01* this, PlayState* play) {
*/
void EnAob01_AfterRace_GiveRaceResult(EnAob01* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Player_SetAutoLockOnActor(play, &this->actor);
this->rupeesBet = gSaveContext.unk_3F5C;
switch (GET_EVENTINF_DOG_RACE_RACE_STANDING) {
@ -1135,7 +1135,7 @@ void EnAob01_Init(Actor* thisx, PlayState* play) {
EnAob01_InitializeDogTextOffsets();
EnAob01_SpawnDogs(this, play);
this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = EnAob01_AfterRace_GiveRaceResult;
break;
}

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

@ -323,7 +323,8 @@ void EnAz_Init(Actor* thisx, PlayState* play2) {
case ENTRANCE(WATERFALL_RAPIDS, 3):
this->unk_2FA = 0;
if (!(this->unk_374 & 2)) {
this->actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10000);
this->actor.flags |=
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED);
}
if (gSaveContext.save.entrance == ENTRANCE(WATERFALL_RAPIDS, 3)) {
this->unk_2FA = 0xA;
@ -379,7 +380,8 @@ void EnAz_Init(Actor* thisx, PlayState* play2) {
if (this->unk_2FA == 2) {
if (!(this->unk_374 & 2)) {
this->unk_374 |= 0x20;
this->actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10000);
this->actor.flags |=
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED);
this->actionFunc = func_80A97C24;
} else {
this->actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY);
@ -388,7 +390,8 @@ void EnAz_Init(Actor* thisx, PlayState* play2) {
} else {
if (this->unk_374 & 2) {
this->unk_374 |= 0x20;
this->actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10000);
this->actor.flags |=
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED);
} else {
this->actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY);
}
@ -1224,7 +1227,7 @@ void func_80A97114(EnAz* this, PlayState* play) {
EnAz* brother = this->brother;
s32 sp20 = false;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
switch (this->actor.textId) {
case 0x10DA:
case 0x10DD:
@ -1382,7 +1385,7 @@ void func_80A97410(EnAz* this, PlayState* play) {
if (this->unk_378 == 2) {
this->unk_378 = func_80A9617C(this, play);
if (this->unk_378 == 0) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
}
if (this->unk_378 == 3) {

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

@ -571,12 +571,12 @@ void EnBaba_Idle(EnBaba* this, PlayState* play) {
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;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
this->actionFunc = EnBaba_Talk;
} else if (this->actor.xzDistToPlayer < 100.0f) {
if (this->stateFlags & BOMB_SHOP_LADY_STATE_AUTOTALK) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
Actor_OfferTalk(&this->actor, play, 100.0f);
}

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

@ -1043,7 +1043,7 @@ void EnBal_ThankYou(EnBal* this, PlayState* play) {
this->eyeTexIndex = TINGLE_EYETEX_OPEN;
Message_StartTextbox(play, 0x1D17, &this->picto.actor);
this->textId = 0x1D17;
this->picto.actor.flags &= ~ACTOR_FLAG_10000;
this->picto.actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
EnBal_SetupTalk(this);
} else {
Actor_OfferTalkExchangeEquiCylinder(&this->picto.actor, play, 200.0f, PLAYER_IA_MINUS1);

2
src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
View File

@ -840,7 +840,7 @@ void EnBigpo_ScoopSoulIdle(EnBigpo* this, PlayState* play) {
}
void EnBigpo_SetupScoopSoulLeaving(EnBigpo* this) {
this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_10000); // unknown OFF
this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED);
this->actionFunc = EnBigpo_ScoopSoulFadingAway;
}

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

@ -95,9 +95,9 @@ void func_809CCEE8(EnBji01* this, PlayState* play) {
Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.home.rot.y, 0x444);
if (this->actor.params == SHIKASHI_TYPE_DEFAULT) {
if ((this->actor.xzDistToPlayer <= 60.0f) && (this->actor.playerHeightRel <= 10.0f)) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
}
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
@ -228,7 +228,7 @@ void EnBji01_DialogueHandler(EnBji01* this, PlayState* play) {
case TEXT_STATE_CHOICE:
if (Message_ShouldAdvance(play)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actor.params = SHIKASHI_TYPE_FINISHED_CONVERSATION;
switch (play->msgCtx.choiceIndex) {
case 0:
@ -266,7 +266,7 @@ void EnBji01_DialogueHandler(EnBji01* this, PlayState* play) {
case TEXT_STATE_EVENT:
if (Message_ShouldAdvance(play)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
switch (play->msgCtx.currentTextId) {
case 0x5DE:
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationSpeedInfo,
@ -313,7 +313,7 @@ void EnBji01_DialogueHandler(EnBji01* this, PlayState* play) {
case 0x5F7:
case 0x5F8:
Message_CloseTextbox(play);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actor.params = SHIKASHI_TYPE_FINISHED_CONVERSATION;
func_809CCE98(this, play);
break;
@ -326,7 +326,7 @@ void EnBji01_DialogueHandler(EnBji01* this, PlayState* play) {
case TEXT_STATE_DONE:
this->actor.params = SHIKASHI_TYPE_FINISHED_CONVERSATION;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
func_809CCE98(this, play);
break;
@ -397,7 +397,7 @@ void EnBji01_Init(Actor* thisx, PlayState* play) {
break;
case ENTRANCE(ASTRAL_OBSERVATORY, 2): /* Telescope entrance */
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
AudioSfx_MuteBanks(0);
SEQCMD_DISABLE_PLAY_SEQUENCES(false);
this->actor.params = SHIKASHI_TYPE_LOOKED_THROUGH_TELESCOPE;

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

@ -207,7 +207,7 @@ void EnCow_UpdateAnimation(EnCow* this, PlayState* play) {
void EnCow_TalkEnd(EnCow* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Message_CloseTextbox(play);
this->actionFunc = EnCow_Idle;
}
@ -215,7 +215,7 @@ void EnCow_TalkEnd(EnCow* this, PlayState* play) {
void EnCow_GiveMilkEnd(EnCow* this, PlayState* play) {
if (Actor_TextboxIsClosing(&this->actor, play)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = EnCow_Idle;
}
}
@ -231,7 +231,7 @@ void EnCow_GiveMilkWait(EnCow* this, PlayState* play) {
void EnCow_GiveMilk(EnCow* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Message_CloseTextbox(play);
this->actionFunc = EnCow_GiveMilkWait;
Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 100.0f);
@ -260,7 +260,7 @@ void EnCow_Talk(EnCow* this, PlayState* play) {
this->actionFunc = EnCow_TalkEnd;
}
} else {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 170.0f);
this->actor.textId = 0x32C8; //! @bug textId is reset to this no matter the intial value
}
@ -278,7 +278,7 @@ void EnCow_Idle(EnCow* this, PlayState* play) {
ABS_ALT(BINANG_SUB(this->actor.yawTowardsPlayer, this->actor.shape.rot.y)) < 25000) {
gHorsePlayedEponasSong = false;
this->actionFunc = EnCow_Talk;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 170.0f);
this->actor.textId = 0x32C8; // Text to give milk after playing Epona's Song.
@ -302,7 +302,7 @@ void EnCow_Idle(EnCow* this, PlayState* play) {
} else {
this->actor.textId = 0x32CA; // Text if you don't have an empty bottle.
}
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 170.0f);
this->actionFunc = EnCow_Talk;
}

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

@ -496,7 +496,7 @@ void EnDg_TryPickUp(EnDg* this, PlayState* play) {
this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
this->actor.speed = 0.0f;
if (Player_GetMask(play) == PLAYER_MASK_TRUTH) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 100.0f);
this->actionFunc = EnDg_SetupTalk;
} else {
@ -1286,7 +1286,7 @@ void EnDg_Thrown(EnDg* this, PlayState* play) {
void EnDg_SetupTalk(EnDg* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
EnDg_StartTextBox(this, play);
this->actionFunc = EnDg_Talk;
} else {

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

@ -1472,7 +1472,7 @@ void func_8089010C(Actor* thisx, PlayState* play) {
}
if (player->tatlTextId < 0) {
thisx->flags |= ACTOR_FLAG_10000;
thisx->flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
if (Actor_TalkOfferAccepted(thisx, &play->state)) {
@ -1501,7 +1501,7 @@ void func_8089010C(Actor* thisx, PlayState* play) {
} else {
thisx->csId = CS_ID_NONE;
}
thisx->flags &= ~ACTOR_FLAG_10000;
thisx->flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else if (this->unk_264 & 4) {
thisx->focus.pos = thisx->world.pos;
this->fairyFlags |= 0x10;

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

@ -602,7 +602,7 @@ void func_80A3A7FC(EnElfgrp* this, PlayState* play) {
EnElfgrp_SetFountainFairiesCount(play, this->type, curTotalFairies);
} else if (this->actor.xzDistToPlayer < 280.0f) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 300.0f);
}
}
@ -626,18 +626,18 @@ void func_80A3A8F8(EnElfgrp* this, PlayState* play) {
if (this->actor.xzDistToPlayer < 30.0f) {
if (GET_PLAYER_FORM == PLAYER_FORM_DEKU) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
player->actor.freezeTimer = 100;
player->stateFlags1 |= PLAYER_STATE1_20000000;
Message_StartTextbox(play, this->actor.textId, &this->actor);
this->actionFunc = func_80A3A77C;
gSaveContext.save.saveInfo.weekEventReg[9] |= this->talkedOnceFlag;
} else {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 100.0f);
}
} else {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
}

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

@ -398,7 +398,7 @@ void func_80962340(EnFu* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (this->unk_54A == 2) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
@ -428,7 +428,7 @@ void func_80962340(EnFu* this, PlayState* play) {
Message_StartTextbox(play, 0x2889, &this->actor);
this->unk_552 = 0x2889;
}
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
player->stateFlags1 &= ~PLAYER_STATE1_20;
this->unk_54A = 1;
} else {
@ -939,7 +939,7 @@ void func_80963630(EnFu* this, PlayState* play) {
this->unk_552 = 0x287F;
}
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actor.child->freezeTimer = 0;
func_809628BC(this);

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

@ -553,10 +553,10 @@ void func_80B10344(EnGb2* this, PlayState* play) {
void func_80B10584(EnGb2* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_StartTextbox(play, this->unk_26E, &this->actor);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = func_80B10634;
} else if (this->actor.xzDistToPlayer < 300.0f) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 300.0f);
}
}
@ -722,7 +722,7 @@ void func_80B10B5C(EnGb2* this, PlayState* play) {
} else {
this->unk_26C &= ~0x40;
if (Actor_TalkOfferAccepted(&this->actor, &play->state) && (this->unk_26C & 0x20)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Message_StartTextbox(play, this->unk_26E, &this->actor);
if (this->unk_26E == 0x14EB) {
SET_WEEKEVENTREG(WEEKEVENTREG_80_40);
@ -735,7 +735,7 @@ void func_80B10B5C(EnGb2* this, PlayState* play) {
this->actionFunc = func_80B10DAC;
} else if (this->actor.xzDistToPlayer < 300.0f) {
if (!(this->unk_26C & 0x80)) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->unk_26C |= 0x20;
Actor_OfferTalk(&this->actor, play, 300.0f);
}
@ -799,11 +799,11 @@ void func_80B10E98(EnGb2* this, PlayState* play) {
void func_80B11048(EnGb2* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Message_StartTextbox(play, this->unk_26E, &this->actor);
this->actionFunc = func_80B10DAC;
} else if (this->actor.xzDistToPlayer < 300.0f) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 200.0f);
}
}

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

@ -485,10 +485,10 @@ void func_80BB221C(EnGeg* this, PlayState* play) {
}
Message_StartTextbox(play, this->unk_496, &this->actor);
this->actionFunc = func_80BB2520;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else if (this->actor.xzDistToPlayer < 300.0f) {
this->unk_230 |= 4;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 300.0f);
}
} else {
@ -510,9 +510,9 @@ void func_80BB221C(EnGeg* this, PlayState* play) {
Message_StartTextbox(play, this->unk_496, &this->actor);
this->actionFunc = func_80BB2520;
this->unk_230 &= ~8;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else if (this->actor.xzDistToPlayer < 300.0f) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 300.0f);
this->unk_230 |= 8;
}
@ -820,9 +820,9 @@ void func_80BB30B4(EnGeg* this, PlayState* play) {
}
Message_StartTextbox(play, this->unk_496, &this->actor);
this->actionFunc = func_80BB27D4;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else if (this->actor.xzDistToPlayer < 150.0f) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 150.0f);
}
}

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

@ -964,9 +964,9 @@ void func_80B52340(EnGk* this, PlayState* play) {
this->actionFunc = func_80B52430;
}
Message_StartTextbox(play, this->unk_31C, &this->actor);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 100.0f);
}
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 5, 0x1000, 0x100);

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

@ -83,7 +83,7 @@ void EnHs_Init(Actor* thisx, PlayState* play) {
this->actionFunc = func_8095345C;
if (play->curSpawn == 1) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
this->stateFlags = 0;
@ -160,7 +160,7 @@ void func_80953098(EnHs* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
this->actionFunc = func_8095345C;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->stateFlags |= 0x10;
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
} else {
@ -183,14 +183,14 @@ void func_80953180(EnHs* this, PlayState* play) {
break;
case 0x33F7: // notice his chicks are grown up, happy, wants to give you bunny hood
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Message_CloseTextbox(play);
this->actionFunc = func_80953098;
func_80953098(this, play);
break;
case 0x33F9: // laughing that they are all roosters (.)
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Message_CloseTextbox(play);
this->actionFunc = func_8095345C;
break;
@ -263,7 +263,7 @@ void func_8095345C(EnHs* this, PlayState* play) {
} else if (this->actor.home.rot.x >= 20) { // chicks turned adult >= 10
this->actionFunc = func_80953354;
this->stateTimer = 40;
} else if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_10000)) {
} else if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED)) {
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
this->stateFlags |= 1;
} else if ((this->actor.xzDistToPlayer < 120.0f) && Player_IsFacingActor(&this->actor, 0x2000, play)) {

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

@ -349,7 +349,7 @@ void func_808F395C(EnIn* this, PlayState* play) {
this->actionFunc = func_808F5A94;
}
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = func_808F5A34;
this->unk48C = 1;
} else {
@ -389,7 +389,7 @@ void func_808F39DC(EnIn* this, PlayState* play) {
}
SET_WEEKEVENTREG_HORSE_RACE_STATE(WEEKEVENTREG_HORSE_RACE_STATE_END);
}
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actor.textId = textId;
this->actionFunc = func_808F395C;
if (this->unk4B0 == WEEKEVENTREG_HORSE_RACE_STATE_2) {
@ -401,7 +401,7 @@ void func_808F39DC(EnIn* this, PlayState* play) {
void func_808F3AD4(EnIn* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->unk48C = 1;
this->actionFunc = func_808F5A94;
} else {
@ -414,7 +414,7 @@ void func_808F3B40(EnIn* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = func_808F3AD4;
textId = (gSaveContext.save.day != 3) ? 0x3481 : 0x34A4;
this->actor.textId = textId;
@ -425,7 +425,7 @@ void func_808F3B40(EnIn* this, PlayState* play) {
void func_808F3BD4(EnIn* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->unk48C = 1;
this->actionFunc = func_808F5A94;
} else {
@ -438,7 +438,7 @@ void func_808F3C40(EnIn* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = func_808F3BD4;
textId = gSaveContext.save.day != 3 ? 0x346A : 0x3492;
this->actor.textId = textId;
@ -449,7 +449,7 @@ void func_808F3C40(EnIn* this, PlayState* play) {
void func_808F3CD4(EnIn* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->unk48C = 1;
this->actionFunc = func_808F5A94;
} else {
@ -465,7 +465,7 @@ void func_808F3D40(EnIn* this, PlayState* play) {
this->actionFunc = func_808F3CD4;
textId = gSaveContext.save.day != 3 ? 0x347D : 0x34A0;
this->actor.textId = textId;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else {
Actor_OfferGetItem(&this->actor, play, GI_MASK_GARO, 500.0f, 100.0f);
}

2
src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c
View File

@ -4072,7 +4072,7 @@ void EnInvadepoh_RewardRomani_WaitForSuccess(EnInvadepoh* this, PlayState* play)
}
void EnInvadepoh_RewardRomani_SetupStartTalking(EnInvadepoh* this) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = EnInvadepoh_RewardRomani_StartTalking;
}

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

@ -103,7 +103,7 @@ void EnJgameTsn_Init(Actor* thisx, PlayState* play) {
this->actor.velocity.y = 0.0f;
if (gSaveContext.save.entrance == ENTRANCE(GREAT_BAY_COAST, 13)) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
this->unk_2F8 = 0;
@ -161,8 +161,8 @@ void func_80C13BB8(EnJgameTsn* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (this->actor.flags & ACTOR_FLAG_10000) {
this->actor.flags &= ~ACTOR_FLAG_10000;
if (this->actor.flags & ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED) {
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
if (gSaveContext.timerCurTimes[TIMER_ID_MINIGAME_2] > SECONDS_TO_TIMER(0)) {
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, ENJGAMETSN_ANIM_1);
Message_StartTextbox(play, 0x10A2, &this->actor);
@ -191,7 +191,7 @@ void func_80C13BB8(EnJgameTsn* this, PlayState* play) {
this->unk_300 = 0x1096;
}
func_80C14030(this);
} else if (this->actor.flags & ACTOR_FLAG_10000) {
} else if (this->actor.flags & ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED) {
Actor_OfferTalk(&this->actor, play, 200.0f);
} else {
Actor_OfferTalk(&this->actor, play, 80.0f);
@ -210,13 +210,13 @@ void func_80C13BB8(EnJgameTsn* this, PlayState* play) {
}
void func_80C13E6C(EnJgameTsn* this) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = func_80C13E90;
}
void func_80C13E90(EnJgameTsn* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
if (((CURRENT_TIME > CLOCK_TIME(4, 0)) && (CURRENT_TIME < CLOCK_TIME(7, 0))) ||
((CURRENT_TIME > CLOCK_TIME(16, 0)) && (CURRENT_TIME < CLOCK_TIME(19, 0)))) {
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, ENJGAMETSN_ANIM_2);

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

@ -892,7 +892,7 @@ void func_8096A1E8(EnJs* this, PlayState* play) {
Animation_MorphToLoop(&this->skelAnime, &gMoonChildStandingAnim, 0.0f);
}
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = func_8096A38C;
Message_StartTextbox(play, 0x2208, &this->actor);
SET_WEEKEVENTREG(WEEKEVENTREG_84_20);
@ -908,7 +908,7 @@ void func_8096A2C0(EnJs* this, PlayState* play) {
}
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = func_8096A1E8;
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
} else {

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

@ -326,13 +326,13 @@ void EnKakasi_TimeSkipDialogue(EnKakasi* this, PlayState* play) {
CLEAR_WEEKEVENTREG(WEEKEVENTREG_83_01);
this->talkState = TEXT_STATE_EVENT;
player->stateFlags1 |= PLAYER_STATE1_20;
this->picto.actor.flags |= ACTOR_FLAG_10000;
this->picto.actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
player->stateFlags1 &= ~PLAYER_STATE1_20;
this->unkState196 = 2;
this->picto.actor.flags &= ~ACTOR_FLAG_10000;
this->picto.actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = EnKakasi_RegularDialogue;
} else {
Actor_OfferTalkExchange(&this->picto.actor, play, 9999.9f, 9999.9f, PLAYER_IA_MINUS1);

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

@ -515,9 +515,9 @@ void func_80B27030(EnKendoJs* this, PlayState* play) {
sp20.z += 200.0f;
if (EnKendoJs_MovePlayerToPos(play, sp20)) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
player->stateFlags1 &= ~PLAYER_STATE1_20;
func_80B279F0(this, play, 0);
Message_StartTextbox(play, 0x271A, &this->actor);

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

@ -613,7 +613,7 @@ void func_80B41C54(EnKgy* this, PlayState* play) {
void func_80B41CBC(EnKgy* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
func_80B40E18(this, this->actor.textId);
this->actionFunc = func_80B41E18;
func_80B411DC(this, play, 4);
@ -626,7 +626,7 @@ void func_80B41D64(EnKgy* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (Actor_HasParent(&this->actor, play)) {
this->actionFunc = func_80B41CBC;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
} else {
Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
@ -995,9 +995,9 @@ void func_80B4296C(EnKgy* this, PlayState* play) {
}
func_80B411DC(this, play, 0);
func_80B40E18(this, this->actor.textId);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_NONE);
}
}

4
src/overlays/actors/ovl_En_Kitan/z_en_kitan.c
View File

@ -166,7 +166,7 @@ void EnKitan_TalkAfterGivingPrize(EnKitan* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = EnKitan_Talk;
Message_ContinueTextbox(play, 0x04B5);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Animation_MorphToLoop(&this->skelAnime, &gKeatonChuckleAnim, -5.0f);
} else {
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
@ -177,7 +177,7 @@ void EnKitan_WaitForPrizeTextboxClosed(EnKitan* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (Actor_TextboxIsClosing(&this->actor, play)) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = EnKitan_TalkAfterGivingPrize;
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
}

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

@ -379,7 +379,7 @@ void EnLiftNuts_Idle(EnLiftNuts* this, PlayState* play) {
if ((EnLiftNuts_MinigameState(ENLIFTNUTS_MINIGAME_STATE_MODE_CHECK, ENLIFTNUTS_MINIGAME_STATE_AFTER) ||
EnLiftNuts_MinigameState(ENLIFTNUTS_MINIGAME_STATE_MODE_CHECK, ENLIFTNUTS_MINIGAME_STATE_STARTING)) &&
(this->autotalk == true)) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else if (this->actor.xzDistToPlayer > 120.0f) {
EnLiftNuts_SetupBurrow(this);
}
@ -473,7 +473,7 @@ void EnLiftNuts_Idle(EnLiftNuts* this, PlayState* play) {
}
}
Flags_UnsetSwitch(play, 0x41);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else if (!Flags_GetSwitch(play, 0x42)) { // Explain Rules
Flags_SetSwitch(play, 0x42);
Message_StartTextbox(play, 0x27E6, &this->actor);
@ -954,7 +954,7 @@ void EnLiftNuts_ResumeConversation(EnLiftNuts* this, PlayState* play) {
Message_StartTextbox(play, 0x27F1, &this->actor);
this->textId = 0x27F1;
}
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
EnLiftNuts_SetupStartConversation(this);
switch (CURRENT_DAY) {
case 1:

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

@ -359,7 +359,7 @@ void EnMa4_Wait(EnMa4* this, PlayState* play) {
s16 yaw = this->actor.shape.rot.y - this->actor.yawTowardsPlayer;
if ((this->state == MA4_STATE_AFTERHORSEBACKGAME) || (this->state == MA4_STATE_AFTERDESCRIBETHEMCS)) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else if (this->type != MA4_TYPE_ALIENS_WON) {
EnMa4_RunInCircles(this, play);
} else if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
@ -882,12 +882,12 @@ void EnMa4_SetupEndEponasSongCs(EnMa4* this) {
void EnMa4_EndEponasSongCs(EnMa4* this, PlayState* play) {
Player* player = GET_PLAYER(play);
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
player->stateFlags1 &= ~PLAYER_STATE1_20;
Message_StartTextbox(play, 0x334C, &this->actor);
this->textId = 0x334C;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
EnMa4_SetupDialogueHandler(this);
} else {
Actor_OfferTalkExchangeEquiCylinder(&this->actor, play, 200.0f, PLAYER_IA_MINUS1);
@ -958,12 +958,12 @@ void EnMa4_StartDialogue(EnMa4* this, PlayState* play) {
}
}
this->state = MA4_STATE_DEFAULT;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else if (this->state == MA4_STATE_AFTERDESCRIBETHEMCS) {
// "Cremia doesn't believe me..."
Message_StartTextbox(play, 0x3340, &this->actor);
this->textId = 0x3340;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
break;
@ -1000,7 +1000,7 @@ void EnMa4_StartDialogue(EnMa4* this, PlayState* play) {
}
}
this->state = MA4_STATE_DEFAULT;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
break;
@ -1028,7 +1028,7 @@ void EnMa4_StartDialogue(EnMa4* this, PlayState* play) {
}
}
this->state = MA4_STATE_DEFAULT;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
break;

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

@ -922,10 +922,10 @@ void EnMaYto_SetupAfterMilkRunInit(EnMaYto* this) {
}
void EnMaYto_AfterMilkRunInit(EnMaYto* this, PlayState* play) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_ESCORTED_CREMIA)) {
Message_StartTextbox(play, 0x33C1, &this->actor);

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

@ -126,7 +126,7 @@ void EnMinifrog_Init(Actor* thisx, PlayState* play) {
this->actionFunc = EnMinifrog_SetupYellowFrogDialog;
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_34_01)) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
this->actor.home.rot.x = this->actor.home.rot.z = 0;
@ -486,7 +486,7 @@ void EnMinifrog_GetFrogHP(EnMinifrog* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
this->actionFunc = EnMinifrog_EndChoir;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_NONE);
} else {
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 10000.0f, 50.0f);
@ -523,7 +523,7 @@ void EnMinifrog_YellowFrogDialog(EnMinifrog* this, PlayState* play) {
switch (play->msgCtx.currentTextId) {
case 0xD76:
Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
SET_WEEKEVENTREG(WEEKEVENTREG_34_01);
break;
@ -559,7 +559,7 @@ void EnMinifrog_YellowFrogDialog(EnMinifrog* this, PlayState* play) {
default:
Message_CloseTextbox(play);
this->actionFunc = EnMinifrog_SetupYellowFrogDialog;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
break;
}
}
@ -585,7 +585,7 @@ void EnMinifrog_SetupYellowFrogDialog(EnMinifrog* this, PlayState* play) {
}
} else if ((this->actor.xzDistToPlayer < 150.0f) &&
(Player_IsFacingActor(&this->actor, 0x3000, play) ||
CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_10000)) &&
CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED)) &&
Player_GetMask(play) == PLAYER_MASK_DON_GERO) {
Actor_OfferTalk(&this->actor, play, 160.0f);
}

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

@ -357,7 +357,7 @@ void func_80959A24(EnMk* this, PlayState* play) {
case 0xFB4:
Message_CloseTextbox(play);
this->actionFunc = func_80959E18;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
break;
case 0xFB5:
@ -381,7 +381,7 @@ void func_80959C94(EnMk* this, PlayState* play) {
this->unk_27A &= ~2;
Message_StartTextbox(play, 0xFB3, &this->actor);
} else {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, 350.0f, 1000.0f, PLAYER_IA_MINUS1);
}
}

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

@ -404,7 +404,7 @@ void func_80A6FBFC(EnMm3* this, PlayState* play) {
if (gSaveContext.timerStates[TIMER_ID_POSTMAN] == TIMER_STATE_POSTMAN_END) {
player->stateFlags1 &= ~PLAYER_STATE1_20;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
if (gSaveContext.timerCurTimes[TIMER_ID_POSTMAN] > SECONDS_TO_TIMER(15)) {
gSaveContext.timerCurTimes[TIMER_ID_POSTMAN] = SECONDS_TO_TIMER(15);
} else if ((((void)0, gSaveContext.timerCurTimes[TIMER_ID_POSTMAN]) >=
@ -425,7 +425,7 @@ void func_80A6FBFC(EnMm3* this, PlayState* play) {
this->unk_2B4 = 0x2791;
this->unk_2AC = 7;
gSaveContext.timerStates[TIMER_ID_POSTMAN] = TIMER_STATE_OFF;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Audio_PlaySfx(NA_SE_SY_START_SHOT);
func_80A6F9C8(this);
} else {
@ -470,7 +470,7 @@ void func_80A6FEEC(EnMm3* this, PlayState* play) {
this->unk_2B4 = 0x2794;
Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_MET_POSTMAN);
Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_RECEIVED_POSTMAN_HP);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
func_80A6F9C8(this);
} else {
Actor_OfferTalkExchangeEquiCylinder(&this->actor, play, 200.0f, PLAYER_IA_MINUS1);

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

@ -769,7 +769,7 @@ void func_80AB64B8(EnMnk* this, PlayState* play) {
}
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
this->picto.actor.flags &= ~ACTOR_FLAG_10000;
this->picto.actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = func_80AB63CC;
EnMnk_Monkey_ChangeAnim(this, 9, ANIMMODE_ONCE, -5.0f);
this->picto.actor.velocity.y = 3.6f;
@ -778,10 +778,10 @@ void func_80AB64B8(EnMnk* this, PlayState* play) {
this->flags &= ~MONKEY_FLAGS_1;
this->flags &= ~MONKEY_FLAGS_4;
} else if (this->picto.actor.xzDistToPlayer < 100.0f) {
this->picto.actor.flags |= ACTOR_FLAG_10000;
this->picto.actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->picto.actor, play, 120.0f);
} else {
this->picto.actor.flags &= ~ACTOR_FLAG_10000;
this->picto.actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
}
@ -1518,7 +1518,7 @@ void EnMnk_MonkeyTiedUp_TalkAfterCutRope(EnMnk* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->picto.actor, &play->state)) {
this->actionFunc = EnMnk_MonkeyTiedUp_TransitionAfterTalk;
this->picto.actor.flags &= ~ACTOR_FLAG_10000;
this->picto.actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else {
Actor_OfferTalk(&this->picto.actor, play, 150.0f);
}
@ -1541,7 +1541,7 @@ void EnMnk_MonkeyTiedUp_WaitForCutRope(EnMnk* this, PlayState* play) {
this->actionFunc = EnMnk_MonkeyTiedUp_TalkAfterCutRope;
this->picto.actor.textId = 0x8D2;
EnMnk_MonkeyTiedUp_SetAnim(this, MONKEY_TIEDUP_ANIM_SHAKEHEAD);
this->picto.actor.flags |= ACTOR_FLAG_10000;
this->picto.actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else if (EnMnk_PlayerIsInTalkRange(this, play)) {
if ((gSaveContext.save.playerForm != PLAYER_FORM_FIERCE_DEITY) &&
(gSaveContext.save.playerForm != PLAYER_FORM_HUMAN)) {

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

@ -629,7 +629,7 @@ void func_80B5CB0C(EnOt* this, PlayState* play) {
}
void func_80B5CBA0(EnOt* this, PlayState* play) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel,
PLAYER_IA_NONE);
this->actionFunc = func_80B5CBEC;
@ -637,7 +637,7 @@ void func_80B5CBA0(EnOt* this, PlayState* play) {
void func_80B5CBEC(EnOt* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
func_80B5CC88(this, play);
} else {
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0xE38, 0x38E);
@ -725,11 +725,11 @@ void func_80B5CEC8(EnOt* this, PlayState* play) {
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0xE38, 0x38E);
if (this->unk_32C & 0x800) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel,
PLAYER_IA_NONE);
} else {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
if ((player->actor.bgCheckFlags & BGCHECKFLAG_GROUND) && !func_801242B4(player) &&
(this->actor.xzDistToPlayer < 130.0f)) {
Actor_OfferTalk(&this->actor, play, 130.0f);

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

@ -230,7 +230,7 @@ s32 func_8095A978(EnOwl* this, PlayState* play, u16 textId, f32 targetDist, f32
this->actor.textId = textId;
if (this->actor.xzDistToPlayer < targetDist) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, targetDist, arg4, PLAYER_IA_NONE);
}
@ -296,7 +296,7 @@ void func_8095ABF0(EnOwl* this, PlayState* play) {
if (Actor_TextboxIsClosing(&this->actor, play)) {
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 0);
func_8095AAD0(this, play);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
}
@ -311,7 +311,7 @@ void func_8095AC50(EnOwl* this, PlayState* play) {
func_8095ABA8(this);
this->actionFunc = func_8095AB1C;
}
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
}
@ -512,10 +512,10 @@ void func_8095B574(EnOwl* this, PlayState* play) {
this->actionFlags |= 0x40;
this->csIdIndex = 2;
} else if (this->actor.xzDistToPlayer < 200.0f) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, 200.0f, 400.0f, PLAYER_IA_NONE);
} else {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
func_8095B480(this, play);
}
@ -689,7 +689,7 @@ void func_8095BA84(EnOwl* this, PlayState* play) {
this->eyeTexIndex = 0;
this->blinkTimer = Rand_S16Offset(60, 60);
this->actionFlags |= 8;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actor.home.rot.x = 0;
func_8095ACEC(this);
this->csIdIndex = 0;
@ -701,7 +701,7 @@ void func_8095BA84(EnOwl* this, PlayState* play) {
Message_CloseTextbox(play);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 0);
func_8095ACEC(this);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actor.textId = 0xBF0;
this->actionFunc = func_8095BE0C;
break;
@ -713,7 +713,7 @@ void func_8095BA84(EnOwl* this, PlayState* play) {
case 0xBF5:
Message_CloseTextbox(play);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 0);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
EnOwl_ChangeMode(this, func_8095B3DC, func_8095C484, &this->skelAnimeFlying,
&gOwlUnfoldWingsAnim, 0.0f);
this->eyeTexIndex = 0;
@ -745,10 +745,10 @@ void func_8095BE0C(EnOwl* this, PlayState* play) {
Actor_OfferTalkExchange(&this->actor, play, 200.0f, 200.0f, PLAYER_IA_NONE);
}
} else if (this->actor.xzDistToPlayer < 200.0f) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, 200.0f, 200.0f, PLAYER_IA_NONE);
} else {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
}
}

8
src/overlays/actors/ovl_En_Rz/z_en_rz.c
View File

@ -529,10 +529,10 @@ void func_80BFC3F8(EnRz* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_80BFC078;
if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_10000)) {
if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED)) {
this->actionFunc = func_80BFC36C;
this->actor.csId = this->csIdList[0];
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else if (Player_GetMask(play) == PLAYER_MASK_KAMARO) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_77_04)) {
Message_StartTextbox(play, 0x2925, &this->actor);
@ -548,10 +548,10 @@ void func_80BFC3F8(EnRz* this, PlayState* play) {
} else if (EnRz_CanTalk(this, play)) {
if (func_80BFBCEC(this, play) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_77_04) && this->sister != NULL) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
} else {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 120.0f);
}
}

6
src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c
View File

@ -736,7 +736,7 @@ void func_80ADC5A4(EnSellnuts* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
player->speedXZ = 0.0f;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Message_StartTextbox(play, this->unk_340, &this->actor);
if (this->unk_340 == 0x625) {
this->unk_338 |= 1;
@ -749,7 +749,7 @@ void func_80ADC5A4(EnSellnuts* this, PlayState* play) {
this->actionFunc = func_80ADC6D0;
}
} else if (func_80ADB08C(play) < 80.0f) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, this->actor.xzDistToPlayer);
}
}
@ -896,7 +896,7 @@ void func_80ADCC04(EnSellnuts* this, PlayState* play) {
func_80ADAFC0(this);
if (curFrame == 0) {
if (func_80ADB08C(play) < 9999.0f) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 9999.0f);
}
this->unk_340 = 0x626;

8
src/overlays/actors/ovl_En_Sth/z_en_sth.c
View File

@ -286,7 +286,7 @@ void EnSth_PostOceanspiderhouseReward(EnSth* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = EnSth_HandleOceansideSpiderHouseConversation;
switch (STH_GI_ID(&this->actor)) {
@ -328,7 +328,7 @@ void EnSth_GiveOceansideSpiderHouseReward(EnSth* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
this->actionFunc = EnSth_PostOceanspiderhouseReward;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
if (CURRENT_DAY == 3) {
EnSth_ChangeAnim(this, STH_ANIM_PLEAD);
@ -528,7 +528,7 @@ void EnSth_SwampSpiderHouseGiveMask(EnSth* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
this->actionFunc = EnSth_TalkAfterSwampSpiderHouseGiveMask;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
} else {
this->sthFlags &= ~STH_FLAG_DRAW_MASK_OF_TRUTH;
@ -585,7 +585,7 @@ void EnSth_HandleSwampSpiderHouseConversation(EnSth* this, PlayState* play) {
EnSth_ChangeAnim(this, STH_ANIM_WAIT);
FALLTHROUGH;
default:
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Message_CloseTextbox(play);
this->actionFunc = EnSth_SwampSpiderHouseIdle;
break;

8
src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
View File

@ -1349,11 +1349,11 @@ void func_80BAD7F8(EnSuttari* this, PlayState* play) {
void func_80BADA08(EnSuttari* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
func_80BAAB78(this, play);
SET_WEEKEVENTREG(WEEKEVENTREG_81_04);
} else if (this->actor.xzDistToPlayer < 500.0f) {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 500.0f);
}
}
@ -1454,11 +1454,11 @@ void func_80BADE8C(EnSuttari* this, PlayState* play) {
this->unk3F2 = this->headRot.y;
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 1, 0xBB8, 0);
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Message_StartTextbox(play, 0x2A3A, &this->actor);
this->actionFunc = func_80BAD130;
} else {
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 500.0f);
}
}

4
src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
View File

@ -930,7 +930,7 @@ void EnSyatekiMan_Swamp_GiveReward(EnSyatekiMan* this, PlayState* play) {
}
player->stateFlags1 &= ~PLAYER_STATE1_20;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->score = 0;
this->shootingGameState = SG_GAME_STATE_NONE;
this->actionFunc = EnSyatekiMan_Swamp_Talk;
@ -995,7 +995,7 @@ void EnSyatekiMan_Town_GiveReward(EnSyatekiMan* this, PlayState* play) {
Message_StartTextbox(play, 0x408, &this->actor);
this->prevTextId = 0x408;
player->stateFlags1 &= ~PLAYER_STATE1_20;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->score = 0;
this->shootingGameState = SG_GAME_STATE_NONE;
this->actionFunc = EnSyatekiMan_Town_Talk;

4
src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c
View File

@ -348,14 +348,14 @@ void func_80ADF654(EnTakaraya* this, PlayState* play) {
void func_80ADF6DC(EnTakaraya* this) {
Animation_PlayLoop(&this->skelAnime, &object_bg_Anim_001384);
this->eyeTexIndex = 0;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = func_80ADF730;
}
void func_80ADF730(EnTakaraya* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
func_80ADF7B8(this);
} else {
this->formSwitchFlag = GET_PLAYER_FORM + this->switchFlag;

4
src/overlays/actors/ovl_En_Tk/z_en_tk.c
View File

@ -710,7 +710,7 @@ void func_80AED940(EnTk* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->unk_2CA &= ~0x80;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
play->msgCtx.msgMode = MSGMODE_NONE;
play->msgCtx.msgLength = 0;
func_80AEDE10(this, play);
@ -763,7 +763,7 @@ void func_80AEDD4C(EnTk* this, PlayState* play) {
void func_80AEDDA0(EnTk* this, PlayState* play) {
this->actor.speed = 0.0f;
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationSpeedInfo, ENTK_ANIM_2, &this->animIndex);
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->unk_2CA |= 0x80;
this->actionFunc = func_80AED940;
}

4
src/overlays/actors/ovl_En_Toto/z_en_toto.c
View File

@ -242,10 +242,10 @@ void func_80BA39C8(EnToto* this, PlayState* play) {
((play->sceneId != SCENE_MILK_BAR) && func_80BA397C(this, 0x2000))) {
if (this->unk2B6 != 0) {
this->text = &D_80BA502C[6];
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, 9999.9f, 9999.9f, PLAYER_IA_NONE);
} else {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 50.0f);
if (play->sceneId == SCENE_SONCHONOIE) {
if (player->transformation == PLAYER_FORM_DEKU) {

8
src/overlays/actors/ovl_En_Yb/z_en_yb.c
View File

@ -262,7 +262,7 @@ void EnYb_Disappear(EnYb* this, PlayState* play) {
void EnYb_SetupLeaving(EnYb* this, PlayState* play) {
EnYb_UpdateAnimation(this, play);
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actionFunc = EnYb_Talk;
// I am counting on you
Message_StartTextbox(play, 0x147D, &this->actor);
@ -279,7 +279,7 @@ void EnYb_ReceiveMask(EnYb* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
this->actionFunc = EnYb_SetupLeaving;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
} else {
Actor_OfferGetItem(&this->actor, play, GI_MASK_KAMARO, 10000.0f, 100.0f);
@ -331,7 +331,7 @@ void EnYb_TeachingDanceFinish(EnYb* this, PlayState* play) {
this->actionFunc = EnYb_Talk;
// Spread my dance across the world
Message_StartTextbox(play, 0x147C, &this->actor);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else {
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
}
@ -347,7 +347,7 @@ void EnYb_TeachingDance(EnYb* this, PlayState* play) {
} else {
EnYb_FinishTeachingCutscene(this);
this->actionFunc = EnYb_TeachingDanceFinish;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
}
EnYb_EnableProximityMusic(this);

4
src/overlays/actors/ovl_En_Zob/z_en_zob.c
View File

@ -536,7 +536,7 @@ void func_80BA0374(EnZob* this, PlayState* play) {
void func_80BA0610(EnZob* this, PlayState* play) {
func_80B9F86C(this);
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Message_StartTextbox(play, 0x120D, &this->actor);
this->unk_304 = 3;
func_80B9F7E4(this, 5, ANIMMODE_ONCE);
@ -551,7 +551,7 @@ void func_80BA06BC(EnZob* this, PlayState* play) {
func_80B9FD24(this, play);
if (!Cutscene_IsCueInChannel(play, CS_CMD_ACTOR_CUE_500)) {
this->actionFunc = func_80BA0610;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
func_80BA0610(this, play);
}
}

6
src/overlays/actors/ovl_En_Zog/z_en_zog.c
View File

@ -230,7 +230,7 @@ void EnZog_Init(Actor* thisx, PlayState* play) {
}
}
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actor.home.rot.z = 0;
if (ENZOG_GET_F(&this->actor) != ENZOG_F_2) {
for (i = 0; i < 5; i++) {
@ -243,7 +243,7 @@ void EnZog_Init(Actor* thisx, PlayState* play) {
this->unk_302 = this->unk_300 = 0;
this->unk_2FC = this->unk_2FE = 3;
this->actor.flags |= ACTOR_FLAG_UPDATE_DURING_OCARINA;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->unk_31C = 2;
this->unk_31E = 0;
@ -911,7 +911,7 @@ void func_80B95128(EnZog* this, PlayState* play) {
break;
}
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
SET_WEEKEVENTREG(WEEKEVENTREG_91_01);
} else {
Actor_OfferTalk(&this->actor, play, 150.0f);

12
src/overlays/actors/ovl_En_Zos/z_en_zos.c
View File

@ -253,7 +253,7 @@ void func_80BBB2C4(EnZos* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
Message_StartTextbox(play, 0x124F, &this->actor);
this->actionFunc = func_80BBB8AC;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
} else {
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
}
@ -266,7 +266,7 @@ void func_80BBB354(EnZos* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = func_80BBB2C4;
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_EVAN_HEART_PIECE);
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
} else {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_EVAN_HEART_PIECE)) {
@ -499,7 +499,7 @@ void func_80BBB8AC(EnZos* this, PlayState* play) {
void func_80BBBB84(EnZos* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
if (GET_PLAYER_FORM == PLAYER_FORM_ZORA) {
Message_StartTextbox(play, 0x1248, &this->actor);
this->actionFunc = func_80BBB8AC;
@ -523,7 +523,7 @@ void func_80BBBB84(EnZos* this, PlayState* play) {
void func_80BBBCBC(EnZos* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
EnZos_ChangeAnim(this, EN_ZOS_ANIM_TALK_ARMS_OUT, ANIMMODE_LOOP);
Message_StartTextbox(play, 0x124D, &this->actor);
this->actionFunc = func_80BBB574;
@ -536,7 +536,7 @@ void func_80BBBD5C(EnZos* this, PlayState* play) {
func_80BBB414(this, play);
if (!Cutscene_IsCueInChannel(play, CS_CMD_ACTOR_CUE_501)) {
this->actionFunc = func_80BBBCBC;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
}
}
@ -559,7 +559,7 @@ void func_80BBBDE0(EnZos* this, PlayState* play) {
if (play->msgCtx.ocarinaMode == OCARINA_MODE_PLAYED_FULL_EVAN_SONG) {
play->msgCtx.ocarinaMode = OCARINA_MODE_END;
this->actionFunc = func_80BBBB84;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 120.0f);
return;
}

12
src/overlays/actors/ovl_En_Zot/z_en_zot.c
View File

@ -487,7 +487,7 @@ void func_80B973BC(EnZot* this, PlayState* play) {
case 0x1279:
Message_CloseTextbox(play);
func_80B965D0(this, play);
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
this->actor.textId = 0;
this->actionFunc = func_80B97708;
if ((this->actor.csId != CS_ID_NONE) && !(this->unk_2F2 & 1)) {
@ -564,7 +564,7 @@ void func_80B97708(EnZot* this, PlayState* play) {
if (phi_v1 != 0) {
SET_WEEKEVENTREG(WEEKEVENTREG_29_10);
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
if (phi_v1 == 5) {
if (GET_PLAYER_FORM == PLAYER_FORM_ZORA) {
this->actor.textId = 0x126E;
@ -946,7 +946,7 @@ void func_80B9854C(EnZot* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
this->actionFunc = func_80B9849C;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalkExchange(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1);
} else {
Actor_OfferGetItem(&this->actor, play, this->unk_2D4, 10000.0f, 50.0f);
@ -1060,7 +1060,7 @@ void func_80B98728(EnZot* this, PlayState* play) {
default:
Message_CloseTextbox(play);
this->actionFunc = func_80B98998;
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
break;
}
}
@ -1132,7 +1132,7 @@ void func_80B98AD0(EnZot* this, PlayState* play) {
void func_80B98BF4(EnZot* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_41_20)) {
Message_StartTextbox(play, 0x12B7, &this->actor);
this->actionFunc = func_80B98AD0;
@ -1150,7 +1150,7 @@ void func_80B98CA8(EnZot* this, PlayState* play) {
play->msgCtx.ocarinaMode = OCARINA_MODE_END;
AudioOcarina_StartDefault(0xFFFF);
this->actionFunc = func_80B98BF4;
this->actor.flags |= ACTOR_FLAG_10000;
this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
Actor_OfferTalk(&this->actor, play, 120.0f);
} else if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
this->actionFunc = func_80B98AD0;

5
src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c
View File

@ -413,7 +413,8 @@ void func_80BA3230(ObjNozoki* this, PlayState* play) {
if ((test3 != NULL) && (test3->draw != NULL)) {
if ((play->curSpawn == 3) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_64_40)) {
this->dyna.actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10000);
this->dyna.actor.flags |=
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED);
this->dyna.actor.textId = 0x297A;
} else {
this->dyna.actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY);
@ -437,7 +438,7 @@ void func_80BA3344(ObjNozoki* this, PlayState* play) {
if ((play->curSpawn == 3) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_64_40)) {
if (Actor_TextboxIsClosing(&this->dyna.actor, play)) {
SET_WEEKEVENTREG(WEEKEVENTREG_64_40);
this->dyna.actor.flags &= ~ACTOR_FLAG_10000;
this->dyna.actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED;
ObjNozoki_SetupAction(this, func_80BA3230);
}
} else if ((this->dyna.actor.textId == 0) || Actor_TextboxIsClosing(&this->dyna.actor, play)) {

12
src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -7165,7 +7165,7 @@ s32 func_8083784C(Player* this) {
((this->ageProperties->unk_2C - this->actor.depthInWater) < sPlayerYDistToFloor)) {
if ((this->remainingHopsCounter != 0) && (gSaveContext.save.saveInfo.playerData.health != 0) &&
!(this->stateFlags1 & PLAYER_STATE1_4000000)) {
if (((this->talkActor == NULL) || !(this->talkActor->flags & ACTOR_FLAG_10000))) {
if (((this->talkActor == NULL) || !(this->talkActor->flags & ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED))) {
return true;
}
}
@ -7891,7 +7891,7 @@ s32 Player_ActionHandler_4(Player* this, PlayState* play) {
if (this->tatlActor != NULL) {
var_t2 = (lockOnActor != NULL) &&
(CHECK_FLAG_ALL(lockOnActor->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_40000) ||
(CHECK_FLAG_ALL(lockOnActor->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_TALK_WITH_C_UP) ||
(lockOnActor->hintId != TATL_HINT_ID_NONE));
if (var_t2 || (this->tatlTextId != 0)) {
@ -7915,7 +7915,7 @@ s32 Player_ActionHandler_4(Player* this, PlayState* play) {
if (!(this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) ||
((this->heldActor != NULL) &&
(var_t1 || (talkActor == this->heldActor) || (var_a1 == this->heldActor) ||
((talkActor != NULL) && (talkActor->flags & ACTOR_FLAG_10000))))) {
((talkActor != NULL) && (talkActor->flags & ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED))))) {
if (((this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) ||
(this->stateFlags1 & PLAYER_STATE1_800000) || func_801242B4(this))) {
if (talkActor != NULL) {
@ -7928,7 +7928,7 @@ s32 Player_ActionHandler_4(Player* this, PlayState* play) {
}
if (CHECK_BTN_ALL(sPlayerControlInput->press.button, BTN_A) ||
(talkActor->flags & ACTOR_FLAG_10000)) {
(talkActor->flags & ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED)) {
var_a1 = NULL;
} else if (var_a1 == NULL) {
return false;
@ -7972,7 +7972,7 @@ s32 Player_ActionHandler_0(Player* this, PlayState* play) {
Player_ActionHandler_13(this, play);
return true;
} else if ((this->focusActor != NULL) &&
(CHECK_FLAG_ALL(this->focusActor->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_40000) ||
(CHECK_FLAG_ALL(this->focusActor->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_TALK_WITH_C_UP) ||
(this->focusActor->hintId != TATL_HINT_ID_NONE))) {
this->stateFlags2 |= PLAYER_STATE2_200000;
} else if ((this->tatlTextId == 0) && !Player_CheckHostileLockOn(this) &&
@ -20910,7 +20910,7 @@ void Player_TalkWithPlayer(PlayState* play, Actor* actor) {
func_808323C0(player, CS_ID_GLOBAL_TALK);
if ((player->talkActor != NULL) || (actor == player->tatlActor) ||
CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_40000)) {
CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_TALK_WITH_C_UP)) {
actor->flags |= ACTOR_FLAG_TALK;
}