Fix

JordanLongstaff · Dec 7, 2024 · 135e3c5 · 135e3c5
1 parent df81567
commit 135e3c5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -334,6 +334,7 @@ typedef enum {
     VB_PLAY_SLOW_CHEST_CS,
     // Opt: *ShotSun
     VB_PLAY_FIRE_ARROW_CS,
+    VB_SPAWN_FIRE_ARROW,
     //*Opt f32 sFishOnHandLength
     // Vanilla condition: (s16)sFishingRecordLength < (s16)sFishOnHandLength
     VB_SHOULD_CHECK_FOR_FISHING_RECORD,

diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -799,6 +799,9 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
             *should = false;
             break;
         }
+        case VB_SPAWN_FIRE_ARROW:
+            *should = !Flags_GetTreasure(gPlayState, 0x1F);
+            break;
         case VB_PLAY_NABOORU_CAPTURED_CS:
             // This behavior is replicated for randomizer in RandomizerOnItemReceiveHandler
             *should = false;

diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -517,8 +517,6 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
         case VB_PLAY_FIRE_ARROW_CS: {
             if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), 0)) {
                 *should = false;
-            } else if (IS_RANDO) {
-                *should = !Flags_GetTreasure(gPlayState, 0x1F);
             }
             break;
         }

diff --git a/soh/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/soh/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
@@ -163,10 +163,12 @@ void ShotSun_UpdateHyliaSun(ShotSun* this, PlayState* play) {
     if (this->collider.base.acFlags & AC_HIT) {
         Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
         osSyncPrintf(VT_FGCOL(CYAN) "SHOT_SUN HIT!!!!!!!\n" VT_RST);
-        if (GameInteractor_Should(VB_PLAY_FIRE_ARROW_CS, INV_CONTENT(ITEM_ARROW_FIRE) == ITEM_NONE, this)) {
+        if (GameInteractor_Should(VB_SPAWN_FIRE_ARROW, INV_CONTENT(ITEM_ARROW_FIRE) == ITEM_NONE)) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_ETCETERA, 700.0f, -800.0f, 7261.0f, 0, 0, 0, 7, true);
-            play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gLakeHyliaFireArrowsCS);
-            gSaveContext.cutsceneTrigger = 1;
+            if (GameInteractor_Should(VB_PLAY_FIRE_ARROW_CS, true)) {
+                play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gLakeHyliaFireArrowsCS);
+                gSaveContext.cutsceneTrigger = 1;
+            }
         } else {
             spawnPos.x = 700.0f;
             spawnPos.y = -800.0f;