summaryrefslogtreecommitdiff
path: root/soh/src/code
diff options
context:
space:
mode:
authorGarrett Cox <garrettjcox@gmail.com>2022-09-27 12:44:52 -0500
committerGitHub <noreply@github.com>2022-09-27 19:44:52 +0200
commit7fb8902e7fce15d86c29d11790bada85e9fd352a (patch)
tree39c498983aa0dad81940260e4692b24e7a5fabab /soh/src/code
parent58c097cfb9fbcfc3bf3dce63d01e802d334a13d3 (diff)
[#1613] Resolve double message issue for gold skulltula tokens after you've spoken to skulltula parent (#1616)
Diffstat (limited to 'soh/src/code')
-rw-r--r--soh/src/code/z_message_PAL.c2
1 files changed, 1 insertions, 1 deletions
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