Skip to content

Commit

Permalink
Merge pull request HarbourMasters#58 from briaguya-ai/deku-theater
Browse files Browse the repository at this point in the history
deku theater
  • Loading branch information
briaguya-ai authored Jun 5, 2022
2 parents 3ce9c1c + 55e802b commit fe13875
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions soh/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,24 @@ void EnDntDemo_Judge(EnDntDemo* this, GlobalContext* globalCtx) {
this->judgeTimer = 0;
}
} else {
if (gSaveContext.n64ddFlag) {
switch (Player_GetMask(globalCtx)) {
case PLAYER_MASK_SKULL:
if (!Flags_GetTreasure(globalCtx, 0x1F)) {
GiveItemWithoutActor(globalCtx, GetRandomizedItemIdFromKnownCheck(RC_DEKU_THEATER_SKULL_MASK, GI_STICK_UPGRADE_30));
Flags_SetTreasure(globalCtx, 0x1F);
}
break;
case PLAYER_MASK_TRUTH:
if (!Flags_GetTreasure(globalCtx, 0x1E)) {
GiveItemWithoutActor(globalCtx, GetRandomizedItemIdFromKnownCheck(RC_DEKU_THEATER_MASK_OF_TRUTH, GI_NUT_UPGRADE_40));
Flags_SetTreasure(globalCtx, 0x1E);
}
break;
}
return;
}

if ((Player_GetMask(globalCtx) != 0) && (this->subCamera == SUBCAM_FREE)) {
this->subCamera = OnePointCutscene_Init(globalCtx, 2220, -99, &this->scrubs[3]->actor, MAIN_CAM);
}
Expand Down

0 comments on commit fe13875

Please sign in to comment.