Hookify Mweep cutscene options (#7199)

1 files changed, 12 insertions, 22 deletions

diff --git a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
index 395209620..45b37141e 100644
--- a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
+++ b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
@@ -328,7 +328,7 @@ s32 EnKz_FollowPath(EnKz* this, PlayState* play) {
     pathDiffZ = pointPos->z - this->actor.world.pos.z;
     Math_SmoothStepToS(&this->actor.world.rot.y, (Math_FAtan2F(pathDiffX, pathDiffZ) * (0x8000 / M_PI)), 0xA, 0x3E8, 1);
 
-    if ((SQ(pathDiffX) + SQ(pathDiffZ)) < 10.0f * CVarGetFloat(CVAR_ENHANCEMENT("MweepSpeed"), 1.0f)) {
+    if ((SQ(pathDiffX) + SQ(pathDiffZ)) < 10.0f) {
         this->waypoint++;
         if (this->waypoint >= path->count) {
             this->waypoint = 0;
@@ -407,24 +407,18 @@ void EnKz_SetupMweep(EnKz* this, PlayState* play) {
     Vec3f pos;
     Vec3f initPos;
 
-    bool shouldPlayCutscene = GameInteractor_Should(VB_PLAY_MWEEP_CS, true);
-
-    if (shouldPlayCutscene) {
-        this->cutsceneCamera = Play_CreateSubCamera(play);
-        this->gameplayCamera = play->activeCamera;
-        Play_ChangeCameraStatus(play, this->gameplayCamera, CAM_STAT_WAIT);
-        Play_ChangeCameraStatus(play, this->cutsceneCamera, CAM_STAT_ACTIVE);
-    }
+    this->cutsceneCamera = Play_CreateSubCamera(play);
+    this->gameplayCamera = play->activeCamera;
+    Play_ChangeCameraStatus(play, this->gameplayCamera, CAM_STAT_WAIT);
+    Play_ChangeCameraStatus(play, this->cutsceneCamera, CAM_STAT_ACTIVE);
     pos = this->actor.world.pos;
     initPos = this->actor.home.pos;
     pos.y += 60.0f;
     initPos.y += -100.0f;
     initPos.z += 260.0f;
-    if (shouldPlayCutscene) {
-        Play_CameraSetAtEye(play, this->cutsceneCamera, &pos, &initPos);
-        Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
-    }
-    this->actor.speedXZ = 0.1f * CVarGetFloat(CVAR_ENHANCEMENT("MweepSpeed"), 1.0f);
+    Play_CameraSetAtEye(play, this->cutsceneCamera, &pos, &initPos);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
+    this->actor.speedXZ = 0.1f;
     this->actionFunc = EnKz_Mweep;
 }
 
@@ -438,9 +432,7 @@ void EnKz_Mweep(EnKz* this, PlayState* play) {
     pos.y += 60.0f;
     initPos.y += -100.0f;
     initPos.z += 260.0f;
-    if (GameInteractor_Should(VB_PLAY_MWEEP_CS, true)) {
-        Play_CameraSetAtEye(play, this->cutsceneCamera, &pos, &initPos);
-    }
+    Play_CameraSetAtEye(play, this->cutsceneCamera, &pos, &initPos);
     if ((EnKz_FollowPath(this, play) == 1) && (this->waypoint == 0)) {
         Animation_ChangeByInfo(&this->skelanime, sAnimationInfo, ENKZ_ANIM_1);
         Inventory_ReplaceItem(play, ITEM_LETTER_RUTO, ITEM_BOTTLE);
@@ -455,11 +447,9 @@ void EnKz_Mweep(EnKz* this, PlayState* play) {
 }
 
 void EnKz_StopMweep(EnKz* this, PlayState* play) {
-    if (GameInteractor_Should(VB_PLAY_MWEEP_CS, true)) {
-        Play_ChangeCameraStatus(play, this->gameplayCamera, CAM_STAT_ACTIVE);
-        Play_ClearCamera(play, this->cutsceneCamera);
-        Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
-    }
+    Play_ChangeCameraStatus(play, this->gameplayCamera, CAM_STAT_ACTIVE);
+    Play_ClearCamera(play, this->cutsceneCamera);
+    Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
     this->actionFunc = EnKz_Wait;
 }