From c987a286e4e9e250b7991caa23e54e023d6a2f90 Mon Sep 17 00:00:00 2001
From: briaguya <briaguya@alice>
Date: Sat, 28 May 2022 14:37:49 -0400
Subject: [PATCH] remove temporary code from testing

---
 soh/soh/OTRGlobals.cpp                        |  2 +-
 soh/src/overlays/actors/ovl_En_Box/z_en_box.c | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index cd6af51fb..055891ae5 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -1012,7 +1012,7 @@ extern "C" GetItemID GetItemFromSceneAndParams(s16 sceneNum, s16 actorParams, Ge
     return OTRGlobals::Instance->gRandomizer->GetItemFromSceneAndParams(sceneNum, actorParams, ogItemId);
 }
 
+// use an explicit (s32) cast on the position values from the Vec3f when calling
 extern "C" GetItemID GetItemFromSceneParamsAndHomePos(s16 sceneNum, s16 actorParams, s32 homePosX, s32 homePosY, s32 homePosZ, GetItemID ogItemId) {
-    // the position values are broken here
     return OTRGlobals::Instance->gRandomizer->GetItemFromSceneParamsAndHomePos(sceneNum, actorParams, homePosX, homePosY, homePosZ, ogItemId);
 }
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
index 7da8af4ad..5bca0367a 100644
--- a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
+++ b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
@@ -388,17 +388,6 @@ s32 EnBox_GetRandomizedItemId(s16 actorParams, s16 sceneNum) {
     return 0 - itemId;
 }
 
-s32 EnBox_GetRandomizedItemIdTestDefinitelyDeleteThis(s16 actorParams, s16 sceneNum, Vec3f homePos) {
-    // KF_MIDOS_TOP_LEFT_CHEST
-    if(actorParams == 22944) {
-        s32 itemId = GetItemFromSceneParamsAndHomePos(sceneNum, actorParams, (s32)homePos.x, (s32)homePos.y, (s32)homePos.z, actorParams >> 5 & 0x7F);
-        return 0 - itemId;
-    } else {
-        s32 itemId = GetItemFromSceneAndParams(sceneNum, actorParams, actorParams >> 5 & 0x7F);
-        return 0 - itemId;
-    }
-}
-
 /**
  * Chest is ready to be open
  */
@@ -440,11 +429,8 @@ void EnBox_WaitOpen(EnBox* this, GlobalContext* globalCtx) {
         func_8002DBD0(&this->dyna.actor, &sp4C, &player->actor.world.pos);
         if (sp4C.z > -50.0f && sp4C.z < 0.0f && fabsf(sp4C.y) < 10.0f && fabsf(sp4C.x) < 20.0f &&
             Player_IsFacingActor(&this->dyna.actor, 0x3000, globalCtx)) {
-            // func_8002F554(&this->dyna.actor, globalCtx,
-            //               EnBox_GetRandomizedItemId(this->dyna.actor.params, globalCtx->sceneNum));
             func_8002F554(&this->dyna.actor, globalCtx,
-                          EnBox_GetRandomizedItemIdTestDefinitelyDeleteThis(this->dyna.actor.params, globalCtx->sceneNum, this->dyna.actor.home.pos));
- 
+                          EnBox_GetRandomizedItemId(this->dyna.actor.params, globalCtx->sceneNum)); 
         }
         if (Flags_GetTreasure(globalCtx, this->dyna.actor.params & 0x1F)) {
             EnBox_SetupAction(this, EnBox_Open);