github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-26 16:15:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Correctly sets BEANS_BOUGHT as a "flag" for the bean salesman

Browse source
This commit is contained in:
Christopher Leggett 2022-08-24 17:24:50 -04:00
commit c4de29b7f1
No known key found for this signature in database
GPG key ID: 7093AE5FF7037D79
2 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
soh/src/code/z_parameter.c
View file

@ -2181,7 +2181,6 @@ u16 Randomizer_Item_Give(GlobalContext* globalCtx, GetItemEntry giEntry) {
if (gSaveContext.inventory.items[SLOT(ITEM_BEAN)] == ITEM_NONE) { if (gSaveContext.inventory.items[SLOT(ITEM_BEAN)] == ITEM_NONE) {
INV_CONTENT(ITEM_BEAN) = ITEM_BEAN; INV_CONTENT(ITEM_BEAN) = ITEM_BEAN;
AMMO(ITEM_BEAN) = 10; AMMO(ITEM_BEAN) = 10;
BEANS_BOUGHT = 10;
} }
} }

1
soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c
View file

@ -157,6 +157,7 @@ void EnMs_Sell(EnMs* this, GlobalContext* globalCtx) {
if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SHUFFLE_MAGIC_BEANS)) { if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SHUFFLE_MAGIC_BEANS)) {
GiveItemEntryFromActor(&this->actor, globalCtx, GiveItemEntryFromActor(&this->actor, globalCtx,
Randomizer_GetItemFromKnownCheck(RC_ZR_MAGIC_BEAN_SALESMAN, GI_BEAN), 90.0f, 10.0f); Randomizer_GetItemFromKnownCheck(RC_ZR_MAGIC_BEAN_SALESMAN, GI_BEAN), 90.0f, 10.0f);
BEANS_BOUGHT = 10;
} else { } else {
func_8002F434(&this->actor, globalCtx, GI_BEAN, 90.0f, 10.0f); func_8002F434(&this->actor, globalCtx, GI_BEAN, 90.0f, 10.0f);
} }