mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-13 15:08:03 -05:00
Code Issues Projects Releases Wiki Activity

remove unused cow stuff

Browse Source
This commit is contained in:
briaguya 2022-08-06 18:14:01 -04:00
parent 46c3541458
commit e0d6445f24
1 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,6 @@ void func_809DF494(EnCow* this, GlobalContext* globalCtx);
void func_809DF6BC(EnCow* this, GlobalContext* globalCtx); void func_809DF6BC(EnCow* this, GlobalContext* globalCtx);
CowInfo EnCow_GetInfo(EnCow* this, GlobalContext* globalCtx); CowInfo EnCow_GetInfo(EnCow* this, GlobalContext* globalCtx);
void EnCow_MoveForRandomizer(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_809DF778(EnCow* this, GlobalContext* globalCtx);
void func_809DF7D8(EnCow* this, GlobalContext* globalCtx); void func_809DF7D8(EnCow* this, GlobalContext* globalCtx);
void func_809DF870(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; // 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) { void func_809DF778(EnCow* this, GlobalContext* globalCtx) {
if (Actor_HasParent(&this->actor, globalCtx)) { if (Actor_HasParent(&this->actor, globalCtx)) {
this->actor.parent = NULL; this->actor.parent = NULL;
this->actionFunc = func_809DF730; this->actionFunc = func_809DF730;
} else { } else {
if (gSaveContext.n64ddFlag) { func_8002F434(&this->actor, globalCtx, GI_MILK, 10000.0f, 100.0f);
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);
}
} }
} }
@ -333,19 +309,13 @@ void func_809DF7D8(EnCow* this, GlobalContext* globalCtx) {
this->actor.flags &= ~ACTOR_FLAG_16; this->actor.flags &= ~ACTOR_FLAG_16;
Message_CloseTextbox(globalCtx); Message_CloseTextbox(globalCtx);
this->actionFunc = func_809DF778; 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) { 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() || 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 {