From e6d84e2ddeb242537963827e3ac8aec703e5c5e5 Mon Sep 17 00:00:00 2001
From: lil David <1337lilDavid@gmail.com>
Date: Wed, 20 Dec 2023 23:50:10 -0600
Subject: [PATCH 1/2] Fix z_en_bom.h include capitalization

---
 soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
index db1f0fd13bb..f50448348ec 100644
--- a/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+++ b/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
@@ -5,7 +5,7 @@
  */
 
 #include "z_en_arrow.h"
-#include "overlays/actors/ovl_en_bom/z_en_bom.h"
+#include "overlays/actors/ovl_En_Bom/z_en_bom.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "objects/object_gi_nuts/object_gi_nuts.h"
 

From ed831a81528eef1c3d6a0cd1ea4130d7e5cc4554 Mon Sep 17 00:00:00 2001
From: lil David <1337lilDavid@gmail.com>
Date: Thu, 21 Dec 2023 00:12:34 -0600
Subject: [PATCH 2/2] Duplicate function in z_en_bom.c to remove implicit
 declaration

---
 soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c
index 7d53d7942fb..a34ca45ddd2 100644
--- a/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c
+++ b/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c
@@ -528,6 +528,12 @@ void ArrowBomb_Charge(EnBom* this, PlayState* play) {
     }
 }
 
+void ArrowBomb_80865ECC(Vec3f* unkPos, Vec3f* firePos, f32 scale) {
+    unkPos->x += ((firePos->x - unkPos->x) * scale);
+    unkPos->y += ((firePos->y - unkPos->y) * scale);
+    unkPos->z += ((firePos->z - unkPos->z) * scale);
+}
+
 void ArrowBomb_Fly(EnBom* this, PlayState* play) {
     EnArrow* arrow;
     f32 distanceScaled;
@@ -545,7 +551,7 @@ void ArrowBomb_Fly(EnBom* this, PlayState* play) {
     if (distanceScaled < 1.0f) {
         this->unk_158 = 1.0f;
     }
-    func_80865ECC(&this->unkPos, &this->actor.world.pos, 0.05f);
+    ArrowBomb_80865ECC(&this->unkPos, &this->actor.world.pos, 0.05f);
 
     if (arrow->hitFlags & 1) {
         this->timer = 0;