diff options
| author | Archez <Archez@users.noreply.github.com> | 2025-01-07 18:54:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-07 18:54:48 -0500 |
| commit | a00df04ffd7ec3c20dbccafef69210255d3936f6 (patch) | |
| tree | 68a56fa64d197ef8e2dfa4b8ae2387c8fca393b9 /soh/src/code | |
| parent | 47ba5123516f3bb09c46e16236d36887a39eebad (diff) | |
Fix Naborru fight CS for child and with entrance skips (#4821)
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_demo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/soh/src/code/z_demo.c b/soh/src/code/z_demo.c index 9247be6aa..4943b8390 100644 --- a/soh/src/code/z_demo.c +++ b/soh/src/code/z_demo.c @@ -2176,7 +2176,7 @@ void Cutscene_HandleEntranceTriggers(PlayState* play) { for (i = 0; i < ARRAY_COUNT(sEntranceCutsceneTable); i++) { entranceCutscene = &sEntranceCutsceneTable[i]; requiredAge = entranceCutscene->ageRestriction; - if (requiredAge == 2) { + if (GameInteractor_Should(VB_ALLOW_ENTRANCE_CS_FOR_EITHER_AGE, requiredAge == 2, entranceCutscene->entrance)) { requiredAge = gSaveContext.linkAge; } @@ -2185,7 +2185,7 @@ void Cutscene_HandleEntranceTriggers(PlayState* play) { (gSaveContext.cutsceneIndex < 0xFFF0) && ((u8)gSaveContext.linkAge == requiredAge) && (gSaveContext.respawnFlag <= 0)) { Flags_SetEventChkInf(entranceCutscene->flag); - if (GameInteractor_Should(VB_PLAY_ENTRANCE_CS, true, &entranceCutscene->flag)) { + if (GameInteractor_Should(VB_PLAY_ENTRANCE_CS, true, entranceCutscene->flag, entranceCutscene->entrance)) { Cutscene_SetSegment(play, entranceCutscene->segAddr); gSaveContext.cutsceneTrigger = 2; gSaveContext.showTitleCard = false; |