Restore Goron walking out animation

JordanLongstaff · Dec 7, 2024 · bd69b02 · bd69b02
1 parent dc4e9ea
commit bd69b02
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -509,9 +509,6 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
         }
         case VB_PLAY_GORON_FREE_CS: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), 0)) {
-                Audio_PlayFanfare(NA_BGM_APPEAR);
-                EnGo2* enGo2 = va_arg(args, EnGo2*);
-                Actor_Kill(&enGo2->actor);
                 *should = false;
             }
             break;

diff --git a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
@@ -1919,10 +1919,9 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, PlayState* play) {
     switch (this->goronState) {
         case 0: // Wake up
             if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
-                if (!GameInteractor_Should(VB_PLAY_GORON_FREE_CS, true, this)) {
-                    return;
+                if (GameInteractor_Should(VB_PLAY_GORON_FREE_CS, true)) {
+                    EnGo2_GoronFireCamera(this, play);
                 }
-                EnGo2_GoronFireCamera(this, play);
                 play->msgCtx.msgMode = MSGMODE_PAUSED;
                 Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENGO2_ANIM_2);
                 this->waypoint = 1;
@@ -1942,7 +1941,9 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, PlayState* play) {
                     (f32)((Math_SinS(this->actor.world.rot.y) * -30.0f) + this->actor.world.pos.x);
                 player->actor.world.pos.z =
                     (f32)((Math_CosS(this->actor.world.rot.y) * -30.0f) + this->actor.world.pos.z);
-                Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
+                if (GameInteractor_Should(VB_PLAY_GORON_FREE_CS, true)) {
+                    Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
+                }
                 Audio_PlayFanfare(NA_BGM_APPEAR);
             }
             break;
@@ -1978,8 +1979,10 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, PlayState* play) {
             }
         case 4: // Finalize walking away
             Message_CloseTextbox(play);
-            EnGo2_GoronFireClearCamera(this, play);
-            Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
+            if (GameInteractor_Should(VB_PLAY_GORON_FREE_CS, true)) {
+                EnGo2_GoronFireClearCamera(this, play);
+                Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
+            }
             Actor_Kill(&this->actor);
             break;
         case 1: