From 7c331fdb2cc8828500580bce67f1b8c978e8ae78 Mon Sep 17 00:00:00 2001
From: gymnast86 <stock.joann@gmail.com>
Date: Sun, 26 Apr 2026 02:00:11 -0700
Subject: [PATCH] coro bottle check

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

diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp
index e4687ac2c2..ff80ad4abf 100644
--- a/src/d/actor/d_a_npc_kkri.cpp
+++ b/src/d/actor/d_a_npc_kkri.cpp
@@ -9,6 +9,8 @@
 #include "d/actor/d_a_e_ym.h"
 #include <cstring>
 
+#include "dusk/randomizer/game/verify_item_functions.h"
+
 static int l_bmdData[2][2] = {
     {35, 1},
     {18, 2},
@@ -1181,6 +1183,15 @@ int daNpc_Kkri_c::talk(void*) {
                     switch (eventId) {
                     case 1:
                         if (mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) {
+#if TARGET_PC
+                            if (randomizer_IsActive()) {
+                                if (item_no == dItemNo_OIL_BOTTLE3_e) {
+                                    item_no = verifyProgressiveItem(randomizer_getItemAtLocation("Coro Bottle"));
+                                } /*else if (item_no == dItemNo_SMALL_KEY_e) { // Might be Small Key 2
+                                    item_no = verifyProgressiveItem(randomizer_getItemAtLocation("Coro Gate Key"));
+                                }*/
+                            }
+#endif
                             mItemPartnerId = fopAcM_createItemForPresentDemo(&current.pos, item_no, 0, -1, -1, NULL, NULL);
                         }
 
diff --git a/src/dusk/randomizer/generator/data/locations.yaml b/src/dusk/randomizer/generator/data/locations.yaml
index 9d44675455..4329e12265 100644
--- a/src/dusk/randomizer/generator/data/locations.yaml
+++ b/src/dusk/randomizer/generator/data/locations.yaml
@@ -428,7 +428,6 @@
   Metadata:
     - None
 
-# TODO
 - Name: Coro Bottle
   Original Item: Bottle with Lantern Oil
   Categories:
@@ -436,8 +435,8 @@
     - Npc
     - Faron Woods
     - ARC
-  Metadata:
-    - None
+    - Location Name Lookup
+  Metadata: Coro Bottle
 
 # TODO
 - Name: Faron Woods Coro Boulder Rupee 1