From 49b48fb7a4db1d334a62c9cc6d3241e81a5c8848 Mon Sep 17 00:00:00 2001
From: aMannus <mannusmenting@gmail.com>
Date: Thu, 25 Aug 2022 19:56:34 +0200
Subject: [PATCH] Fix BGS and maps/keys textboxes

---
 soh/src/overlays/actors/ovl_En_Si/z_en_si.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
index aa07c1450..87a3b854c 100644
--- a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
+++ b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c
@@ -205,13 +205,13 @@ void Randomizer_UpdateSkullReward(EnSi* this, GlobalContext* globalCtx) {
     getItem = Randomizer_GetRandomizedItem(GI_SKULL_TOKEN, this->actor.id, this->actor.params, globalCtx->sceneNum);
     getItemId = getItem.getItemId;
     if (getItemId == RG_ICE_TRAP) {
-        player->getItemEntry = getItem;
         player->pendingIceTrap = true;
         textId = 0xF8;
     } else {
         textId = getItem.textId;
         giveItemId = getItem.itemId;
     }
+    player->getItemEntry = getItem;
 }
 
 void Randomizer_GiveSkullReward(EnSi* this, GlobalContext* globalCtx) {
@@ -222,5 +222,7 @@ void Randomizer_GiveSkullReward(EnSi* this, GlobalContext* globalCtx) {
     } else if (getItem.modIndex == MOD_RANDOMIZER) {
         Randomizer_Item_Give(globalCtx, getItem);
     }
-    player->getItemEntry = getItem;
+    if (getItem.getItemId == GI_SWORD_BGS) {
+        gSaveContext.bgsFlag = true;
+    }
 }