mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-01-14 07:28:15 -05:00
Fix cows giving free bottles, too generous
This commit is contained in:
parent
1ee89c50e2
commit
e274530073
@ -342,7 +342,11 @@ void func_809DF7D8(EnCow* this, GlobalContext* globalCtx) {
|
|||||||
|
|
||||||
void func_809DF870(EnCow* this, GlobalContext* globalCtx) {
|
void func_809DF870(EnCow* this, GlobalContext* globalCtx) {
|
||||||
if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(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);
|
Message_ContinueTextbox(globalCtx, 0x2007);
|
||||||
this->actionFunc = func_809DF7D8;
|
this->actionFunc = func_809DF7D8;
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user