From 11092b0dd3ebf511e93a63f734755be46a7e9310 Mon Sep 17 00:00:00 2001 From: Demur Rumed Date: Sat, 2 Aug 2025 17:06:31 +0000 Subject: [PATCH] don't prevent auto accepted speech came across this where Dampe race wouldn't begin, whereas intended behavior is that people can rant at Link, he just can't use Speak command this fixes it so instead Dampe race happens, but at end can't speak with him, so are unable to get his two prizes --- soh/soh/Enhancements/randomizer/ShuffleSpeak.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/randomizer/ShuffleSpeak.cpp b/soh/soh/Enhancements/randomizer/ShuffleSpeak.cpp index 59111e569..1b2612dcd 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleSpeak.cpp +++ b/soh/soh/Enhancements/randomizer/ShuffleSpeak.cpp @@ -11,7 +11,7 @@ void RegisterShuffleSpeak() { COND_VB_SHOULD(VB_SPEAK, shouldRegister, { Actor* talkActor = GET_PLAYER(gPlayState)->talkActor; - if (talkActor != NULL && talkActor->category == ACTORCAT_NPC) { + if (talkActor != NULL && talkActor->category == ACTORCAT_NPC && !(talkActor->flags & ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED)) { RandomizerInf inf = RAND_INF_MAX; switch (talkActor->id) { case ACTOR_EN_DNS: