From c4de29b7f1aeeeb96a1337b1020b7558c0e21022 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Wed, 24 Aug 2022 17:24:50 -0400 Subject: [PATCH] Correctly sets `BEANS_BOUGHT` as a "flag" for the bean salesman --- soh/src/code/z_parameter.c | 1 - soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index acad4d874..7548c0fa7 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -2181,7 +2181,6 @@ u16 Randomizer_Item_Give(GlobalContext* globalCtx, GetItemEntry giEntry) { if (gSaveContext.inventory.items[SLOT(ITEM_BEAN)] == ITEM_NONE) { INV_CONTENT(ITEM_BEAN) = ITEM_BEAN; AMMO(ITEM_BEAN) = 10; - BEANS_BOUGHT = 10; } } diff --git a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c index dc4dc61ca..5c8a1807b 100644 --- a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -157,6 +157,7 @@ void EnMs_Sell(EnMs* this, GlobalContext* globalCtx) { if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SHUFFLE_MAGIC_BEANS)) { GiveItemEntryFromActor(&this->actor, globalCtx, Randomizer_GetItemFromKnownCheck(RC_ZR_MAGIC_BEAN_SALESMAN, GI_BEAN), 90.0f, 10.0f); + BEANS_BOUGHT = 10; } else { func_8002F434(&this->actor, globalCtx, GI_BEAN, 90.0f, 10.0f); }