From 5a9540585a24f4aa2c193dcbc63931b628af5098 Mon Sep 17 00:00:00 2001
From: Sarge-117 <adam_branston@outlook.com>
Date: Sat, 3 Sep 2022 11:35:19 -0700
Subject: [PATCH] Simplify mudwall collision check

---
 .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c  | 31 +++++++++----------
 .../actors/ovl_Bg_Breakwall/z_bg_breakwall.h  |  1 -
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
index e25e80751..aff800c53 100644
--- a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
+++ b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
@@ -59,20 +59,20 @@ static ColliderQuadInit sQuadInit = {
     { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } },
 };
 
-// This quad only used for "Blue Fire Arrows" enhancement
+// Replacement quad used for "Blue Fire Arrows" enhancement
 static ColliderQuadInit sIceArrowQuadInit = {
     {
         COLTYPE_NONE,
         AT_NONE,
-        AC_ON | AC_TYPE_PLAYER,
+        AC_ON | AC_TYPE_PLAYER | AC_TYPE_OTHER,
         OC1_NONE,
         OC2_TYPE_2,
         COLSHAPE_QUAD,
     },
     {
         ELEMTYPE_UNK0,
-        { 0x00000000, 0x00, 0x00 },
-        { 0xFFCFFFFF, 0x00, 0x00 },
+        { 0x00000048, 0x00, 0x00 },
+        { 0x00001048, 0x00, 0x00 },
         TOUCH_NONE,
         BUMP_ON,
         OCELEM_NONE,
@@ -123,12 +123,14 @@ void BgBreakwall_Init(Actor* thisx, GlobalContext* globalCtx) {
         }
 
         ActorShape_Init(&this->dyna.actor.shape, 0.0f, NULL, 0.0f);
-        Collider_InitQuad(globalCtx, &this->collider);
-        Collider_SetQuad(globalCtx, &this->collider, &this->dyna.actor, &sQuadInit);
+
         // If "Blue Fire Arrows" are enabled, set up this collider for them
         if (blueFireArrowsDC) {
-            Collider_InitQuad(globalCtx, &this->colliderIceArrow);
-            Collider_SetQuad(globalCtx, &this->colliderIceArrow, &this->dyna.actor, &sIceArrowQuadInit);
+            Collider_InitQuad(globalCtx, &this->collider);
+            Collider_SetQuad(globalCtx, &this->collider, &this->dyna.actor, &sIceArrowQuadInit);
+        } else {
+            Collider_InitQuad(globalCtx, &this->collider);
+            Collider_SetQuad(globalCtx, &this->collider, &this->dyna.actor, &sQuadInit);
         }
     } else {
         this->dyna.actor.world.pos.y -= 40.0f;
@@ -260,12 +262,11 @@ void BgBreakwall_Wait(BgBreakwall* this, GlobalContext* globalCtx) {
     bool blueFireArrowHit = false;
     // If "Blue Fire Arrows" enabled, check this collider for a hit
     if (blueFireArrowsDC) {
-        if (this->colliderIceArrow.base.acFlags & AC_HIT) {
-            this->colliderIceArrow.base.acFlags &= ~AC_HIT;
-            if ((this->colliderIceArrow.base.ac != NULL) && (this->colliderIceArrow.base.ac->id == ACTOR_EN_ARROW)) {
+        if (this->collider.base.acFlags & AC_HIT) {
+            if ((this->collider.base.ac != NULL) && (this->collider.base.ac->id == ACTOR_EN_ARROW)) {
 
-                if (this->colliderIceArrow.base.ac->child != NULL &&
-                    this->colliderIceArrow.base.ac->child->id == ACTOR_ARROW_ICE) {
+                if (this->collider.base.ac->child != NULL &&
+                    this->collider.base.ac->child->id == ACTOR_ARROW_ICE) {
                     blueFireArrowHit = true;
                 }
             }
@@ -358,10 +359,6 @@ void BgBreakwall_Draw(Actor* thisx, GlobalContext* globalCtx) {
 
             Collider_SetQuadVertices(&this->collider, &colQuad[0], &colQuad[1], &colQuad[2], &colQuad[3]);
             CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
-            if (blueFireArrowsDC) {
-                Collider_SetQuadVertices(&this->colliderIceArrow, &colQuad[0], &colQuad[1], &colQuad[2], &colQuad[3]);
-                CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colliderIceArrow.base);
-            }
         }
 
         CLOSE_DISPS(globalCtx->state.gfxCtx);
diff --git a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
index 09089469e..43fd4ee93 100644
--- a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
+++ b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
@@ -14,7 +14,6 @@ typedef struct BgBreakwall {
     /* 0x0168 */ s8 colType;
     /* 0x0169 */ s8 bankIndex;
     /* 0x016C */ ColliderQuad collider;
-                 ColliderQuad colliderIceArrow; // For "Blue Fire Arrows" enhancement
     /* 0x01EC */ BgBreakwallActionFunc actionFunc;
 } BgBreakwall; // size = 0x01F0