From cfc24b16caaf37431251dcbf58c054f4398abc73 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Fri, 9 Sep 2022 19:07:37 -0400 Subject: [PATCH 1/2] crash on pause menu on linux (only in appimage) Fixes #1437 --- soh/src/code/z_sram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c index 2fdaff7c8..0464cf902 100644 --- a/soh/src/code/z_sram.c +++ b/soh/src/code/z_sram.c @@ -104,7 +104,7 @@ void GiveLinksPocketItem() { gSaveContext.bgsFlag = true; } Item_Give(NULL, getItemEntry.itemId); - } else if (getItemEntry.modIndex == MOD_RANDOMIZER) { + } else if (getItemEntry.modIndex == MOD_RANDOMIZER && getItemEntry.getItemId != RG_ICE_TRAP) { Randomizer_Item_Give(NULL, getItemEntry); } } From 944d5344dc5ddfbbe0d516213b0606452b83aa93 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Fri, 9 Sep 2022 19:10:43 -0400 Subject: [PATCH 2/2] Applies fix to Song from Impa as well. --- soh/src/code/z_sram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c index 0464cf902..8c8ac2711 100644 --- a/soh/src/code/z_sram.c +++ b/soh/src/code/z_sram.c @@ -406,7 +406,7 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) { gSaveContext.bgsFlag = true; } Item_Give(NULL, getItem.itemId); - } else if (getItem.modIndex == MOD_RANDOMIZER) { + } else if (getItem.modIndex == MOD_RANDOMIZER && getItem.getItemId != RG_ICE_TRAP) { Randomizer_Item_Give(NULL, getItem); }