From 005fd64e41a633e00a1fd8117de903889bd5edda Mon Sep 17 00:00:00 2001
From: Lucas Shaw <49287729+shawlucas@users.noreply.github.com>
Date: Tue, 4 Jan 2022 00:10:13 -0500
Subject: [PATCH] ovl_Obj_Dowsing ok (#504)

* ovl_Obj_Dowsing OK

* update spec

* params pack

* made suggested changes
---
 spec                                          |  3 +-
 .../actors/ovl_Obj_Dowsing/z_obj_dowsing.c    | 44 ++++++++++++++++---
 .../actors/ovl_Obj_Dowsing/z_obj_dowsing.h    |  9 ++++
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/spec b/spec
index 63775dadf4..692495809c 100644
--- a/spec
+++ b/spec
@@ -3980,8 +3980,7 @@ beginseg
     name "ovl_Obj_Dowsing"
     compress
     include "build/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.o"
-    include "build/data/ovl_Obj_Dowsing/ovl_Obj_Dowsing.data.o"
-    include "build/data/ovl_Obj_Dowsing/ovl_Obj_Dowsing.reloc.o"
+    include "build/src/overlays/actors/ovl_Obj_Dowsing/ovl_Obj_Dowsing_reloc.o"
 endseg
 
 beginseg
diff --git a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c
index 98f66c014d..60da4d5b58 100644
--- a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c
+++ b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c
@@ -14,7 +14,9 @@ void ObjDowsing_Init(Actor* thisx, GlobalContext* globalCtx);
 void ObjDowsing_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void ObjDowsing_Update(Actor* thisx, GlobalContext* globalCtx);
 
-#if 0
+s32 ObjDowsing_GetFlag(ObjDowsing* this, GlobalContext* globalCtx);
+s32 ObjDowsing_CheckValidSpawn(ObjDowsing* this, GlobalContext* globalCtx);
+
 const ActorInit Obj_Dowsing_InitVars = {
     ACTOR_OBJ_DOWSING,
     ACTORCAT_ITEMACTION,
@@ -27,14 +29,42 @@ const ActorInit Obj_Dowsing_InitVars = {
     (ActorFunc)NULL,
 };
 
-#endif
+s32 ObjDowsing_GetFlag(ObjDowsing* this, GlobalContext* globalCtx) {
+    s32 type = DOWSING_GET_TYPE(&this->actor);
+    s32 flag = DOWSING_GET_FLAG(&this->actor);
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Dowsing/func_80B23D50.s")
+    if (type == DOWSING_COLLECTIBLE) {
+        return Actor_GetCollectibleFlag(globalCtx, flag);
+    } else if (type == DOWSING_CHEST) {
+        return Actor_GetChestFlag(globalCtx, flag);
+    } else if (type == DOWSING_SWITCH) {
+        return Flags_GetSwitch(globalCtx, flag);
+    } else {
+        return 0;
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Dowsing/func_80B23DD0.s")
+s32 ObjDowsing_CheckValidSpawn(ObjDowsing* this, GlobalContext* globalCtx) {
+    if (ObjDowsing_GetFlag(this, globalCtx)) {
+        Actor_MarkForDeath(&this->actor);
+        return true;
+    }
+    return false;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Dowsing/ObjDowsing_Init.s")
+void ObjDowsing_Init(Actor* thisx, GlobalContext* globalCtx) {
+    ObjDowsing* this = THIS;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Dowsing/ObjDowsing_Destroy.s")
+    ObjDowsing_CheckValidSpawn(this, globalCtx);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Dowsing/ObjDowsing_Update.s")
+void ObjDowsing_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+}
+
+void ObjDowsing_Update(Actor* thisx, GlobalContext* globalCtx) {
+    ObjDowsing* this = THIS;
+
+    if (!ObjDowsing_CheckValidSpawn(this, globalCtx)) {
+        func_800B8C50(thisx, globalCtx);
+    }
+}
diff --git a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h
index 5a2982cab7..7b1125a283 100644
--- a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h
+++ b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h
@@ -3,8 +3,17 @@
 
 #include "global.h"
 
+#define DOWSING_GET_TYPE(thisx) ((thisx)->params >> 7)
+#define DOWSING_GET_FLAG(thisx) ((thisx)->params & 0x7F)
+
 struct ObjDowsing;
 
+typedef enum {
+    /* 1 */ DOWSING_COLLECTIBLE = 1,
+    /* 2 */ DOWSING_CHEST,
+    /* 3 */ DOWSING_SWITCH
+} DowsingType;
+
 typedef struct ObjDowsing {
     /* 0x000 */ Actor actor;
 } ObjDowsing; // size = 0x144