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

Fixes some Sheik checks I had accidentally set the wrong flag for.

Browse Source
This commit is contained in:
Christopher Leggett 2022-08-17 01:07:28 -04:00
parent 1184a35480
commit 525dcca499
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
View File

@ -298,7 +298,7 @@ void GivePlayerRandoRewardSheikSong(EnXc* sheik, GlobalContext* globalCtx, Rando
}
} else if (check != RC_SHEIK_AT_TEMPLE) {
if (GiveItemEntryFromActor(&sheik->actor, globalCtx, getItemEntry, 10000.0f, 100.0f)) {
player->pendingFlag.flagID = 0x55;
player->pendingFlag.flagID = (0x5 << 4) | (sheikType & 0xF) >> 1;
player->pendingFlag.flagType = FLAG_EVENT_CHECK_INF;
}
}

3
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -6087,6 +6087,9 @@ void Player_SetPendingFlag(Player* this, GlobalContext* globalCtx) {
case FLAG_COW_MILKED:
gSaveContext.cowsMilked[this->pendingFlag.flagID] = 1;
break;
case FLAG_EVENT_CHECK_INF:
Flags_SetEventChkInf(this->pendingFlag.flagID);
break;
case FLAG_NONE:
default:
break;