Merge branch 'develop-rachael' into rachael-to-zhora

2022-08-03 23:01:11 -04:00
parent bd86c792c3 78ad282056
commit 739434e3e4
78 changed files with 506 additions and 46 deletions
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -203,7 +203,8 @@ void GivePlayerRandoRewardSongOfTime(GlobalContext* globalCtx, RandomizerCheck c
        !Flags_GetTreasure(globalCtx, 0x1F) && gSaveContext.nextTransition == 0xFF) {
        GetItemID getItemId = Randomizer_GetItemIdFromKnownCheck(check, GI_SONG_OF_TIME);
        GiveItemWithoutActor(globalCtx, getItemId);
-        Flags_SetTreasure(globalCtx, 0x1F);
+        player->pendingFlag.flagID = 0x1F;
+        player->pendingFlag.flagType = FLAG_SCENE_TREASURE;
    }
 }