github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-24 07:05:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge error

Browse source 
Didn't mean to have Zhora changes in here yet
This commit is contained in:
Sarge-117 2022-09-06 14:05:29 -07:00
commit cfc5d1d4e3
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
soh/src/code/z_play.c
View file

@ -218,8 +218,7 @@ void GivePlayerRandoRewardNocturne(GlobalContext* globalCtx, RandomizerCheck che
!Player_InBlockingCsMode(globalCtx, player) && !Flags_GetEventChkInf(0xAA)) { !Player_InBlockingCsMode(globalCtx, player) && !Flags_GetEventChkInf(0xAA)) {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_NOCTURNE_OF_SHADOW); GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_NOCTURNE_OF_SHADOW);
GiveItemEntryWithoutActor(globalCtx, getItemEntry); GiveItemEntryWithoutActor(globalCtx, getItemEntry);
player->pendingFlag.flagID = 0xAA; Flags_SetEventChkInf(0xAA);
player->pendingFlag.flagType = FLAG_EVENT_CHECK_INF;
} }
} }
@ -231,8 +230,7 @@ void GivePlayerRandoRewardRequiem(GlobalContext* globalCtx, RandomizerCheck chec
!Player_InBlockingCsMode(globalCtx, player)) { !Player_InBlockingCsMode(globalCtx, player)) {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_SONG_OF_TIME); GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_SONG_OF_TIME);
GiveItemEntryWithoutActor(globalCtx, getItemEntry); GiveItemEntryWithoutActor(globalCtx, getItemEntry);
player->pendingFlag.flagID = 0xAC; Flags_SetEventChkInf(0xAC);
player->pendingFlag.flagType = FLAG_EVENT_CHECK_INF;
} }
} }
} }