mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-26 01:58:51 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1067 from garrettjoecox/shuffleCowsFix

Browse Source 
Fix cows giving free bottles, too generous
This commit is contained in:
briaguya 2022-08-06 04:50:59 -04:00 committed by GitHub
commit 1b8168cfbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
View File

@ -342,7 +342,11 @@ void func_809DF7D8(EnCow* this, GlobalContext* globalCtx) {
void func_809DF870(EnCow* this, GlobalContext* globalCtx) {
if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(globalCtx)) {
if (Inventory_HasEmptyBottle() || (gSaveContext.n64ddFlag && EnCow_GetRandomizerItem(this, globalCtx) != ITEM_NONE)) {
if (Inventory_HasEmptyBottle() ||
(gSaveContext.n64ddFlag &&
Randomizer_GetSettingValue(RSK_SHUFFLE_COWS) &&
EnCow_GetRandomizerItem(this, globalCtx) != ITEM_NONE)
) {
Message_ContinueTextbox(globalCtx, 0x2007);
this->actionFunc = func_809DF7D8;
} else {