From 7fb8902e7fce15d86c29d11790bada85e9fd352a Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Tue, 27 Sep 2022 12:44:52 -0500 Subject: [PATCH] [#1613] Resolve double message issue for gold skulltula tokens after you've spoken to skulltula parent (#1616) --- soh/src/code/z_message_PAL.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c index c004d8656..ad6e3fd12 100644 --- a/soh/src/code/z_message_PAL.c +++ b/soh/src/code/z_message_PAL.c @@ -1716,7 +1716,7 @@ void Message_OpenText(GlobalContext* globalCtx, u16 textId) { textId += (gSaveContext.inventory.questItems & 0xF0000000 & 0xF0000000) >> 0x1C; } else if (!gSaveContext.n64ddFlag && (msgCtx->textId == 0xC && CHECK_OWNED_EQUIP(EQUIP_SWORD, 2))) { textId = 0xB; // Traded Giant's Knife for Biggoron Sword - } else if (msgCtx->textId == 0xB4 && (gSaveContext.eventChkInf[9] & 0x40)) { + } else if (!gSaveContext.n64ddFlag && (msgCtx->textId == 0xB4 && (gSaveContext.eventChkInf[9] & 0x40))) { textId = 0xB5; // Destroyed Gold Skulltula } // Ocarina Staff + Dialog