From cfc5d1d4e3fc18a149391adc897645aac7d50cd9 Mon Sep 17 00:00:00 2001 From: Sarge-117 Date: Tue, 6 Sep 2022 14:05:29 -0700 Subject: [PATCH] Fix merge error Didn't mean to have Zhora changes in here yet --- soh/src/code/z_play.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index 1612db28f..d40a0de7a 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -218,8 +218,7 @@ void GivePlayerRandoRewardNocturne(GlobalContext* globalCtx, RandomizerCheck che !Player_InBlockingCsMode(globalCtx, player) && !Flags_GetEventChkInf(0xAA)) { GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_NOCTURNE_OF_SHADOW); GiveItemEntryWithoutActor(globalCtx, getItemEntry); - player->pendingFlag.flagID = 0xAA; - player->pendingFlag.flagType = FLAG_EVENT_CHECK_INF; + Flags_SetEventChkInf(0xAA); } } @@ -231,8 +230,7 @@ void GivePlayerRandoRewardRequiem(GlobalContext* globalCtx, RandomizerCheck chec !Player_InBlockingCsMode(globalCtx, player)) { GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_SONG_OF_TIME); GiveItemEntryWithoutActor(globalCtx, getItemEntry); - player->pendingFlag.flagID = 0xAC; - player->pendingFlag.flagType = FLAG_EVENT_CHECK_INF; + Flags_SetEventChkInf(0xAC); } } }