mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-26 19:32:17 -05:00
Code Issues Projects Releases Wiki Activity

Backports a fix for sheik checks from rando-next (#1340)

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

* Removes duplicate switch case from cherry-pick
This commit is contained in:
Christopher Leggett 2022-08-31 09:25:47 -04:00 committed by GitHub
parent a572c11f4f
commit 776219fb52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 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) { } else if (check != RC_SHEIK_AT_TEMPLE) {
if (GiveItemEntryFromActor(&sheik->actor, globalCtx, getItemEntry, 10000.0f, 100.0f)) { 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; player->pendingFlag.flagType = FLAG_EVENT_CHECK_INF;
} }
} }