From e0d6445f245e0cb9afd4e760b1d5cd46eba651a3 Mon Sep 17 00:00:00 2001
From: briaguya <briaguya@alice>
Date: Sat, 6 Aug 2022 18:14:01 -0400
Subject: [PATCH] remove unused cow stuff

---
 soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c | 36 ++-----------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
index 4921acb7db..4af4f4d255 100644
--- a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
+++ b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
@@ -20,7 +20,6 @@ void func_809DF494(EnCow* this, GlobalContext* globalCtx);
 void func_809DF6BC(EnCow* this, GlobalContext* globalCtx);
 CowInfo EnCow_GetInfo(EnCow* this, GlobalContext* globalCtx);
 void EnCow_MoveForRandomizer(EnCow* this, GlobalContext* globalCtx);
-GetItemID EnCow_GetRandomizerItem(EnCow* this, GlobalContext* globalCtx);
 void func_809DF778(EnCow* this, GlobalContext* globalCtx);
 void func_809DF7D8(EnCow* this, GlobalContext* globalCtx);
 void func_809DF870(EnCow* this, GlobalContext* globalCtx);
@@ -296,35 +295,12 @@ void EnCow_SetCowMilked(EnCow* this, GlobalContext* globalCtx) {
     // gSaveContext.cowsMilked[cowInfo.cowId] = 1;
 }
 
-GetItemID EnCow_GetRandomizerItem(EnCow* this, GlobalContext* globalCtx) {
-    GetItemID itemId = ITEM_NONE;
-    CowInfo cowInfo = EnCow_GetInfo(this, globalCtx);
-
-    if (!gSaveContext.cowsMilked[cowInfo.cowId]) {
-        itemId = Randomizer_GetItemIdFromKnownCheck(cowInfo.randomizerCheck, GI_MILK);
-    } else if (Inventory_HasEmptyBottle()) {
-        itemId = GI_MILK;
-    }
-
-    return itemId;
-}
-
 void func_809DF778(EnCow* this, GlobalContext* globalCtx) {
     if (Actor_HasParent(&this->actor, globalCtx)) {
         this->actor.parent = NULL;
         this->actionFunc = func_809DF730;
     } else {
-        if (gSaveContext.n64ddFlag) {
-            GetItemID itemId = EnCow_GetRandomizerItem(this, globalCtx);
-            // func_8002F434(&this->actor, globalCtx, itemId, 10000.0f, 100.0f);
-            Item_Give(globalCtx, itemId);
-            EnCow_SetCowMilked(this, globalCtx);
-            if (itemId == GI_ICE_TRAP) {
-                Message_StartTextbox(globalCtx, 0xF8, &this->actor);
-            }
-        } else {
-            func_8002F434(&this->actor, globalCtx, GI_MILK, 10000.0f, 100.0f);
-        }
+        func_8002F434(&this->actor, globalCtx, GI_MILK, 10000.0f, 100.0f);
     }
 }
 
@@ -333,19 +309,13 @@ void func_809DF7D8(EnCow* this, GlobalContext* globalCtx) {
         this->actor.flags &= ~ACTOR_FLAG_16;
         Message_CloseTextbox(globalCtx);
         this->actionFunc = func_809DF778;
-        if (!gSaveContext.n64ddFlag) {
-            func_8002F434(&this->actor, globalCtx, GI_MILK, 10000.0f, 100.0f);
-        }
+        func_8002F434(&this->actor, globalCtx, GI_MILK, 10000.0f, 100.0f);
     }
 }
 
 void func_809DF870(EnCow* this, GlobalContext* globalCtx) {
     if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(globalCtx)) {
-        if (Inventory_HasEmptyBottle() || 
-                (gSaveContext.n64ddFlag && 
-                Randomizer_GetSettingValue(RSK_SHUFFLE_COWS) && 
-                EnCow_GetRandomizerItem(this, globalCtx) != ITEM_NONE)
-        ) {
+        if (Inventory_HasEmptyBottle()) {
             Message_ContinueTextbox(globalCtx, 0x2007);
             this->actionFunc = func_809DF7D8;
         } else {