From 4b0564779f5a864a03051b2e5b4275e1810112a5 Mon Sep 17 00:00:00 2001
From: gymnast86 <stock.joann@gmail.com>
Date: Sun, 3 May 2026 01:13:47 -0700
Subject: [PATCH] underwater goron check

---
 src/d/actor/d_a_npc_gra.cpp                       | 12 ++++++++++++
 src/dusk/randomizer/generator/data/locations.yaml |  5 ++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp
index e1db3b4568..6d85f23a73 100644
--- a/src/d/actor/d_a_npc_gra.cpp
+++ b/src/d/actor/d_a_npc_gra.cpp
@@ -14,6 +14,10 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include <cstring>
 
+#if TARGET_PC
+#include "dusk/randomizer/game/verify_item_functions.h"
+#endif
+
 const daNpc_grA_HIOParam daNpc_grA_Param_c::m = {
     {90.0f,  -4.0f,  1.0f,   850.0f,  255.0f, 280.0f, 40.0f, 100.0f, 0.0f, 0.0f, 20.0f,
      -20.0f, 40.0f,  -30.0f, 40.0f,   -40.0f, 0.4f,   12.0f, 4,      6,    6,    6,
@@ -4018,6 +4022,14 @@ BOOL daNpc_grA_c::talk(void*) {
         }
         if (r26 && talkProc(NULL, TRUE, NULL)) {
             if (mFlow.getEventId(&sp8) == 1) {
+#if TARGET_PC
+                if (randomizer_IsActive()) {
+                    // Give the randomized underwater goron item
+                    if (sp8 == dItemNo_Randomizer_BOMB_IN_BAG_e) {
+                        sp8 = verifyProgressiveItem(randomizer_getItemAtLocation("Zoras Domain Underwater Goron"));
+                    }
+                }
+#endif
                 field_0x1480 =
                     fopAcM_createItemForPresentDemo(&current.pos, sp8, 0, -1, -1, NULL, NULL);
                 if (field_0x1480 != fpcM_ERROR_PROCESS_ID_e) {
diff --git a/src/dusk/randomizer/generator/data/locations.yaml b/src/dusk/randomizer/generator/data/locations.yaml
index 89b89e07ab..c9a7b0215a 100644
--- a/src/dusk/randomizer/generator/data/locations.yaml
+++ b/src/dusk/randomizer/generator/data/locations.yaml
@@ -3685,7 +3685,6 @@
     - Tbox ID: 19
       Stage: 50
 
-# TODO
 - Name: Zoras Domain Underwater Goron
   Original Item: Bomb Bag
   Categories:
@@ -3693,8 +3692,8 @@
     - Npc
     - Zoras Domain
     - ARC
-  Metadata:
-    - None
+    - Location Name Lookup
+  Metadata: Zoras Domain Underwater Goron
 
 - Name: Zoras Domain Throne East Gate Underwater Rupee
   Original Item: Yellow Rupee