mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-19 22:22:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add ganon dating sim PoC (#4510)

Browse Source
This commit is contained in:
Garrett Cox
2024-11-02 11:38:17 -05:00
committed by Malkierian
parent 0488f359ed
commit 10f8768bca
3 changed files with 151 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
+4 -1
View File
@@ -573,7 +573,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
Play_ChangeCameraStatus(play, this->csCamIndex, CAM_STAT_ACTIVE);
this->csCamFov = 60.0f;
if (Flags_GetEventChkInf(EVENTCHKINF_BEGAN_GANONDORF_BATTLE) || IS_RANDO || IS_BOSS_RUSH) {
if (Flags_GetEventChkInf(EVENTCHKINF_BEGAN_GANONDORF_BATTLE) || IS_RANDO || IS_BOSS_RUSH || CVarGetInteger("gHoliday.NotProxySaw.GanonDatingSim", 0)) {
// watched cutscene already, skip most of it
this->csState = 17;
this->csTimer = 0;
@@ -927,6 +927,9 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
if ((this->csTimer <= 50) || (Message_GetState(&play->msgCtx) != TEXT_STATE_NONE)) {
break;
}
if (!GameInteractor_Should(VB_GANONDORF_DECIDE_TO_FIGHT, true)) {
break;
}
this->csState = 19;
this->csTimer = 0;