mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-08-13 17:03:47 -04:00
Code Issues Projects Releases Wiki Activity

Use 454+cowId to identify cows in randomizer.cpp

Browse Source
This commit is contained in:
Garrett Cox 2022-08-03 11:26:14 -05:00
parent 25a272ce0c
commit 8c2feb537d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -2970,22 +2970,22 @@ RandomizerCheck Randomizer::GetCheckFromActor(s16 sceneNum, s16 actorId, s16 act
break;
case 52:
switch (actorParams) {
case -161:
case 4546:
return RC_KF_LINKS_HOUSE_COW;
}
break;
case 54:
switch (actorParams) {
case -376:
case 4543:
return RC_LLR_STABLES_LEFT_COW;
case -138:
case 4542:
return RC_LLR_STABLES_RIGHT_COW;
}
case 55:
switch (actorParams) {
case 262:
return RC_KAK_IMPAS_HOUSE_FREESTANDING_POH;
case -115:
case 4547:
return RC_KAK_IMPAS_HOUSE_COW;
}
break;
@ -3023,9 +3023,9 @@ RandomizerCheck Randomizer::GetCheckFromActor(s16 sceneNum, s16 actorId, s16 act
return RC_HF_DEKU_SCRUB_GROTTO;
case 10:
return RC_LW_DEKU_SCRUB_GROTTO_FRONT;
case 1973:
case 4544:
return RC_DMT_COW_GROTTO_COW;
case 3194:
case 4545:
return RC_HF_COW_GROTTO_COW;
case 22988:
return RC_KF_STORMS_GROTTO_CHEST;
@ -3113,9 +3113,9 @@ RandomizerCheck Randomizer::GetCheckFromActor(s16 sceneNum, s16 actorId, s16 act
break;
case 76:
switch (actorParams) {
case -72:
case 4540:
return RC_LLR_TOWER_LEFT_COW;
case -282:
case 4541:
return RC_LLR_TOWER_RIGHT_COW;
case 262:
return RC_LLR_FREESTANDING_POH;
@ -3275,7 +3275,7 @@ RandomizerCheck Randomizer::GetCheckFromActor(s16 sceneNum, s16 actorId, s16 act
break;
case 90:
switch (actorParams) {
case -421:
case 4548:
return RC_GV_COW;
case 23200:
return RC_GV_CHEST;

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

@ -274,7 +274,7 @@ GetItemID EnCow_GetRandomizerItemFromCow(EnCow* this, GlobalContext* globalCtx,
int cowId = EnCow_GetCowId(this, globalCtx);
if (!gSaveContext.cowsMilked[cowId]) {
itemId = Randomizer_GetRandomizedItemId(GI_MILK, this->actor.id, this->actor.world.pos.x + this->actor.world.pos.z, globalCtx->sceneNum);
itemId = Randomizer_GetRandomizedItemId(GI_MILK, this->actor.id, 4540 + cowId, globalCtx->sceneNum);
if (setFlag) {
gSaveContext.cowsMilked[cowId] = 1;