Move it all to VB hook

JordanLongstaff · Oct 21, 2024 · d0d393f · d0d393f
1 parent 2cad361
commit d0d393f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
@@ -205,6 +205,9 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
                     case 4100:
                         *should = false;
                         RateLimitedSuccessChime();
+                        BgSpot03Taki* taki = (BgSpot03Taki*)Actor_FindNearby(gPlayState, &GET_PLAYER(gPlayState)->actor,
+                                                                             ACTOR_BG_SPOT03_TAKI, ACTORCAT_BG, 999.0f);
+                        func_8003EBF8(gPlayState, &gPlayState->colCtx.dyna, taki->dyna.bgId);
                         break;
                     default:
                         SPDLOG_INFO("VB_PLAY_ONEPOINT_CS {}", *csId);

diff --git a/soh/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/soh/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c
@@ -73,9 +73,7 @@ void func_808ADEF0(BgSpot03Taki* this, PlayState* play) {
         if (Flags_GetSwitch(play, this->switchFlag)) {
             this->state = WATERFALL_OPENING_ANIMATED;
             this->timer = 40;
-            if (OnePointCutscene_Init(play, 4100, -99, NULL, MAIN_CAM) == SUBCAM_NONE) {
-                func_8003EBF8(play, &play->colCtx.dyna, this->dyna.bgId);
-            }
+            OnePointCutscene_Init(play, 4100, -99, NULL, MAIN_CAM);
         }
     } else if (this->state == WATERFALL_OPENING_IDLE) {
         this->timer--;