ADD: Spirit Temple Bombable wall and Bomchu wall

PurpleHato · Sep 2, 2023 · 4ea0f2a · 4ea0f2a
1 parent ad151b8
commit 4ea0f2a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/soh/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
@@ -142,7 +142,7 @@ void BgJyaBombchuiwa_SetupWaitForExplosion(BgJyaBombchuiwa* this, PlayState* pla
 }
 
 void BgJyaBombchuiwa_WaitForExplosion(BgJyaBombchuiwa* this, PlayState* play) {
-    if ((this->collider.base.acFlags & AC_HIT) || (this->timer > 0)) {
+    if ((this->collider.base.acFlags & AC_HIT) || (this->timer > 0) || Flags_GetSwitch(play, this->actor.params & 0x3F)) {
         if (this->timer == 0) {
             OnePointCutscene_Init(play, 3410, -99, &this->actor, MAIN_CAM);
         }

diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/soh/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c
@@ -163,7 +163,7 @@ void BgJyaBombiwa_Break(BgJyaBombiwa* this, PlayState* play) {
 void BgJyaBombiwa_Update(Actor* thisx, PlayState* play) {
     BgJyaBombiwa* this = (BgJyaBombiwa*)thisx;
 
-    if (this->collider.base.acFlags & AC_HIT) {
+    if (this->collider.base.acFlags & AC_HIT || Flags_GetSwitch(play, this->dyna.actor.params & 0x3F)) {
         BgJyaBombiwa_Break(this, play);
         Flags_SetSwitch(play, this->dyna.actor.params & 0x3F);
         SoundSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 40, NA_SE_EV_WALL_BROKEN);