Merge pull request #28 from PurpleHato/anchor-purple

[Synch] Water Temple Bombables Wall, Fire Temple Hammer and Bomb
PurpleHato · Sep 2, 2023 · 6f5d41d · 6f5d41d
2 parents 3511c76 + bf2c009
commit 6f5d41d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c
@@ -127,7 +127,7 @@ void BgHidanDalm_Wait(BgHidanDalm* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     if ((this->collider.base.acFlags & AC_HIT) && !Player_InCsMode(play) &&
-        (player->meleeWeaponAnimation == 22 || player->meleeWeaponAnimation == 23)) {
+            (player->meleeWeaponAnimation == 22 || player->meleeWeaponAnimation == 23) || Flags_GetSwitch(play, this->switchFlag)) {
         this->collider.base.acFlags &= ~AC_HIT;
         if ((this->collider.elements[0].info.bumperFlags & BUMP_HIT) ||
             (this->collider.elements[1].info.bumperFlags & BUMP_HIT)) {

diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
@@ -278,7 +278,7 @@ void func_80888734(BgHidanHamstep* this) {
 }
 
 void func_808887C4(BgHidanHamstep* this, PlayState* play) {
-    if (this->collider.base.acFlags & AC_HIT) {
+    if (this->collider.base.acFlags & AC_HIT || Flags_GetSwitch(play, (this->dyna.actor.params >> 8) & 0xFF)) {
         OnePointCutscene_Init(play, 3310, 100, &this->dyna.actor, MAIN_CAM);
         Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_HAMMER_SWITCH);
         this->collider.base.acFlags = AC_NONE;

diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c
@@ -201,7 +201,7 @@ void func_8088960C(BgHidanHrock* this, PlayState* play) {
 }
 
 void func_808896B8(BgHidanHrock* this, PlayState* play) {
-    if (this->collider.base.acFlags & 2) {
+    if (this->collider.base.acFlags & 2 || Flags_GetSwitch(play, this->unk_16A)) {
         this->collider.base.acFlags &= ~2;
         this->actionFunc = func_808894B0;
         this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_WHILE_CULLED;

diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c
@@ -303,7 +303,7 @@ void BgHidanKowarerukabe_Update(Actor* thisx, PlayState* play) {
     BgHidanKowarerukabe* this = (BgHidanKowarerukabe*)thisx;
     s32 pad;
 
-    if (Actor_GetCollidedExplosive(play, &this->collider.base) != NULL) {
+    if (Actor_GetCollidedExplosive(play, &this->collider.base) != NULL || Flags_GetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F)) {
         BgHidanKowarerukabe_Break(this, play);
         Flags_SetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F);
 

diff --git a/soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
@@ -467,7 +467,7 @@ void BgMizuBwall_SpawnDebris(BgMizuBwall* this, PlayState* play) {
 
 void BgMizuBwall_Idle(BgMizuBwall* this, PlayState* play) {
     BgMizuBwall_SetAlpha(this, play);
-    if (this->collider.base.acFlags & AC_HIT) {
+    if (this->collider.base.acFlags & AC_HIT || Flags_GetSwitch(play, ((u16)this->dyna.actor.params >> 8) & 0x3F)) {
         this->collider.base.acFlags &= ~AC_HIT;
         Flags_SetSwitch(play, ((u16)this->dyna.actor.params >> 8) & 0x3F);
         this->breakTimer = 1;